diff --git a/Config/Entities/Test.cs b/Config/Entities/Test.cs
index e91fd1cd4..dedbbbff3 100644
--- a/Config/Entities/Test.cs
+++ b/Config/Entities/Test.cs
@@ -34,10 +34,10 @@ namespace Config.Entities
public virtual int Repeats { get; set; }
public virtual bool DoDraining { get; set; }
public virtual bool DoDrainingAfter { get; set; }
- public virtual bool DoControlWaterTemp { get; set; }
public virtual float TempLimLo { get; set; } /// Lower limit for the controlled temperature
public virtual float TempLimHi { get; set; } /// Upper limit for the controlled temperature
- public virtual float PumpPower { get; set; } /// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
+ public virtual string TempControl { get; set; } /// Water temperature controller, null or empty = Do not control water temp
+ public virtual float PumpPower { get; set; } /// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
public virtual int MassRepeats { get; set; } /// Number of mass. measurements at the beginning/end of test, 0 = default (=5)
public virtual float MassSpread { get; set; } /// Max spread of mass. measurements at the beginning/end of test, 0 = default
public virtual MassMethod MassMethod { get; set; } /// method of mass. measurement at the beginning/end of test: false=slow (precise), true=using immediate mass measurement and evaluation
@@ -90,15 +90,15 @@ namespace Config.Entities
Profile = TestProfile.UserDefined;
Publish = (sbyte)Common.Publish.Always;
DoEvaluate = true;
- Repeats = 1;
+ ErrLimLo = -2.0f; /// [%] lower error limit
+ ErrLimHi = 2.0f; /// [%] upper error limit
+ Uncertainty = 0;
+ Repeats = 1;
DoDraining = false;
DoDrainingAfter = false;
- DoControlWaterTemp = false;
TempLimLo = 15.0f;
TempLimHi = 25.0f;
- ErrLimLo = -2.0f; /// [%] lower error limit
- ErrLimHi = 2.0f; /// [%] upper error limit
- Uncertainty = 0;
+ TempControl = string.Empty;
PumpPower = 60.0f; /// [%]
MassRepeats = 0; /// default
MassSpread = 0; /// default
@@ -168,10 +168,10 @@ namespace Config.Entities
result.Repeats = Repeats;
result.DoDraining = DoDraining;
result.DoDrainingAfter = DoDrainingAfter;
- result.DoControlWaterTemp = DoControlWaterTemp;
result.TempLimLo = TempLimLo;
result.TempLimHi = TempLimHi;
- result.PumpPower = PumpPower;
+ result.TempControl = TempControl;
+ result.PumpPower = PumpPower;
result.MassRepeats = MassRepeats;
result.MassSpread = MassSpread;
result.MassMethod = MassMethod;
@@ -221,10 +221,10 @@ namespace Config.Entities
output.WriteLine(Repeats.ToString(ci));
output.WriteLine(DoDraining.ToString());
output.WriteLine(DoDrainingAfter.ToString());
- output.WriteLine(DoControlWaterTemp.ToString());
output.WriteLine(TempLimLo.ToString(ci));
output.WriteLine(TempLimHi.ToString(ci));
- output.WriteLine(PumpPower.ToString(ci));
+ output.WriteLine(TempControl);
+ output.WriteLine(PumpPower.ToString(ci));
output.WriteLine(MassRepeats.ToString(ci));
output.WriteLine(MassSpread.ToString(ci));
output.WriteLine(((byte)MassMethod).ToString(ci));
@@ -273,10 +273,10 @@ namespace Config.Entities
tst.Repeats = int.Parse(input.ReadLine(), ci);
tst.DoDraining = bool.Parse(input.ReadLine());
tst.DoDrainingAfter = bool.Parse(input.ReadLine());
- tst.DoControlWaterTemp = bool.Parse(input.ReadLine());
tst.TempLimLo = float.Parse(input.ReadLine(), ci);
tst.TempLimHi = float.Parse(input.ReadLine(), ci);
- tst.PumpPower = float.Parse(input.ReadLine(), ci);
+ tst.TempControl = input.ReadLine();
+ tst.PumpPower = float.Parse(input.ReadLine(), ci);
tst.MassRepeats = int.Parse(input.ReadLine(), ci);
tst.MassSpread = float.Parse(input.ReadLine(), ci);
tst.MassMethod = (MassMethod)byte.Parse(input.ReadLine(), ci);
@@ -336,9 +336,9 @@ namespace Config.Entities
ln = inp.ReadLine(); if (ln != Repeats.ToString(ci)) { diff.AppendFormat(fmt, "Repeats", Repeats.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != DoDraining.ToString(ci)) { diff.AppendFormat(fmt, "DoDraining", DoDraining.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != DoDrainingAfter.ToString(ci)) { diff.AppendFormat(fmt, "DoDrainingAfter", DoDrainingAfter.ToString(ci), ln); };
- ln = inp.ReadLine(); if (ln != DoControlWaterTemp.ToString()) { diff.AppendFormat(fmt, "DoControlWaterTemp", DoControlWaterTemp.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TempLimLo.ToString(ci)) { diff.AppendFormat(fmt, "TempLimLo", TempLimLo.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != TempLimHi.ToString(ci)) { diff.AppendFormat(fmt, "TempLimHi", TempLimHi.ToString(ci), ln); };
+ ln = inp.ReadLine(); if (ln != TempControl) { diff.AppendFormat(fmt, "TempController", TempControl, ln); };
ln = inp.ReadLine(); if (ln != PumpPower.ToString(ci)) { diff.AppendFormat(fmt, "PumpPower", PumpPower.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != MassRepeats.ToString(ci)) { diff.AppendFormat(fmt, "MassRepeats", MassRepeats.ToString(ci), ln); };
ln = inp.ReadLine(); if (ln != MassSpread.ToString(ci)) { diff.AppendFormat(fmt, "MassSpread", MassSpread.ToString(ci), ln); };
diff --git a/Config/Mappings/TestMap.cs b/Config/Mappings/TestMap.cs
index ebba9a11b..ecbce94d4 100644
--- a/Config/Mappings/TestMap.cs
+++ b/Config/Mappings/TestMap.cs
@@ -25,10 +25,10 @@ namespace Config.Mappings
Map(x => x.Repeats);
Map(x => x.DoDraining);
Map(x => x.DoDrainingAfter);
- Map(x => x.DoControlWaterTemp);
Map(x => x.TempLimLo);
Map(x => x.TempLimHi);
- Map(x => x.PumpPower);
+ Map(x => x.TempControl);
+ Map(x => x.PumpPower);
Map(x => x.MassRepeats);
Map(x => x.MassSpread);
Map(x => x.MassMethod)
diff --git a/Results/Entities/TestData.cs b/Results/Entities/TestData.cs
index d86193e94..d15de7dc5 100644
--- a/Results/Entities/TestData.cs
+++ b/Results/Entities/TestData.cs
@@ -26,10 +26,10 @@ namespace Results.Entities
public virtual double ErrLimLo { get; set; } /// [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
public virtual double ErrLimHi { get; set; } /// [%] usually > 0, in case of heat meters: -Qn in m3/h
public virtual double ErrLimMargin { get; set; } /// [%] makes error limits tighter: 0 <= ErrLimMargin <= abs(ErrLimXx)
- public virtual bool DoControlWaterTemp { get; set; }
public virtual float TempLimLo { get; set; }
public virtual float TempLimHi { get; set; }
- public virtual sbyte Publish { get; set; } /// 0=no, 1=in all protocols, 2=on screen, 3=internal
+ public virtual string TempControl { get; set; }
+ public virtual sbyte Publish { get; set; } /// 0=no, 1=in all protocols, 2=on screen, 3=internal
public virtual bool Evaluate { get; set; }
@@ -45,22 +45,22 @@ namespace Results.Entities
public TestData(Test test)
: this()
{
- Name = test.Name;
- Repeats = test.Repeats;
- Qtg = (double)test.Qtg;
- Qfrom = (double)test.Qfrom;
- Qto = (double)test.Qto;
- TargetVolume = (double)test.Volume;
- TargetTime = (double)test.TestTime;
- Method = test.Method;
- ErrLimLo = (double)test.ErrLimLo;
- ErrLimHi = (double)test.ErrLimHi;
- ErrLimMargin = (double)test.Uncertainty;
- DoControlWaterTemp = test.DoControlWaterTemp;
- TempLimLo = test.TempLimLo;
- TempLimHi = test.TempLimHi;
- Publish = test.Publish;
- Evaluate = test.DoEvaluate;
+ Name = test.Name;
+ Repeats = test.Repeats;
+ Qtg = test.Qtg;
+ Qfrom = test.Qfrom;
+ Qto = test.Qto;
+ TargetVolume = test.Volume;
+ TargetTime = test.TestTime;
+ Method = test.Method;
+ ErrLimLo = test.ErrLimLo;
+ ErrLimHi = test.ErrLimHi;
+ ErrLimMargin = test.Uncertainty;
+ TempLimLo = test.TempLimLo;
+ TempLimHi = test.TempLimHi;
+ TempControl = test.TempControl;
+ Publish = test.Publish;
+ Evaluate = test.DoEvaluate;
}
///
@@ -68,22 +68,22 @@ namespace Results.Entities
///
public TestData(TestData oriTestData)
{
- Name = oriTestData.Name;
- Repeats = oriTestData.Repeats;
- Qtg = oriTestData.Qtg;
- Qfrom = oriTestData.Qfrom;
- Qto = oriTestData.Qto;
- TargetVolume = oriTestData.TargetVolume;
- TargetTime = oriTestData.TargetTime;
- Method = oriTestData.Method;
- ErrLimLo = oriTestData.ErrLimLo;
- ErrLimHi = oriTestData.ErrLimHi;
- ErrLimMargin = oriTestData.ErrLimMargin;
- DoControlWaterTemp = oriTestData.DoControlWaterTemp;
- TempLimLo = oriTestData.TempLimLo;
- TempLimHi = oriTestData.TempLimHi;
- Publish = oriTestData.Publish;
- Evaluate = oriTestData.Evaluate;
+ Name = oriTestData.Name;
+ Repeats = oriTestData.Repeats;
+ Qtg = oriTestData.Qtg;
+ Qfrom = oriTestData.Qfrom;
+ Qto = oriTestData.Qto;
+ TargetVolume = oriTestData.TargetVolume;
+ TargetTime = oriTestData.TargetTime;
+ Method = oriTestData.Method;
+ ErrLimLo = oriTestData.ErrLimLo;
+ ErrLimHi = oriTestData.ErrLimHi;
+ ErrLimMargin = oriTestData.ErrLimMargin;
+ TempLimLo = oriTestData.TempLimLo;
+ TempLimHi = oriTestData.TempLimHi;
+ TempControl = oriTestData.TempControl;
+ Publish = oriTestData.Publish;
+ Evaluate = oriTestData.Evaluate;
}
@@ -105,13 +105,10 @@ namespace Results.Entities
if (ErrLimLo != td.ErrLimLo) return false;
if (ErrLimHi != td.ErrLimHi) return false;
if (ErrLimMargin != td.ErrLimMargin) return false;
- if (DoControlWaterTemp != td.DoControlWaterTemp) return false;
- if (DoControlWaterTemp)
- {
- if (TempLimLo != td.TempLimLo) return false;
- if (TempLimHi != td.TempLimHi) return false;
- }
- if (Publish != td.Publish) return false;
+ if (TempLimLo != td.TempLimLo) return false;
+ if (TempLimHi != td.TempLimHi) return false;
+ if (TempControl != td.TempControl) return false;
+ if (Publish != td.Publish) return false;
if (Evaluate != td.Evaluate) return false;
return true;
@@ -150,9 +147,9 @@ namespace Results.Entities
writer.Write(ErrLimLo);
writer.Write(ErrLimHi);
writer.Write(ErrLimMargin);
- writer.Write(DoControlWaterTemp);
writer.Write(TempLimLo);
writer.Write(TempLimHi);
+ writer.Write(TempControl);
writer.Write(Publish);
writer.Write(Evaluate);
}
@@ -171,9 +168,9 @@ namespace Results.Entities
ErrLimLo = reader.ReadDouble();
ErrLimHi = reader.ReadDouble();
ErrLimMargin = reader.ReadDouble();
- DoControlWaterTemp = reader.ReadBoolean();
TempLimLo = reader.ReadSingle();
TempLimHi = reader.ReadSingle();
+ TempControl = reader.ReadString();
Publish = reader.ReadSByte();
Evaluate = reader.ReadBoolean();
}
diff --git a/SharedDatabase/Entities/TestData.cs b/SharedDatabase/Entities/TestData.cs
index 5c839301b..644cdafe0 100644
--- a/SharedDatabase/Entities/TestData.cs
+++ b/SharedDatabase/Entities/TestData.cs
@@ -26,10 +26,10 @@ namespace SharedDatabase.Entities
public virtual double ErrLimLo { get; set; } /// [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
public virtual double ErrLimHi { get; set; } /// [%] usually > 0, in case of heat meters: -Qn in m3/h
public virtual double ErrLimMargin { get; set; } /// [%] makes error limits tighter: 0 <= ErrLimMargin <= abs(ErrLimXx)
- public virtual bool DoControlWaterTemp { get; set; }
- public virtual float TempLimLo { get; set; }
+ public virtual float TempLimLo { get; set; }
public virtual float TempLimHi { get; set; }
- public virtual sbyte Publish { get; set; } /// 0=no, 1=in all protocols, 2=on screen, 3=internal
+ public virtual string TempControl { get; set; }
+ public virtual sbyte Publish { get; set; } /// 0=no, 1=in all protocols, 2=on screen, 3=internal
public virtual bool Evaluate { get; set; }
@@ -45,22 +45,22 @@ namespace SharedDatabase.Entities
public TestData(Config.Entities.Test test)
: this()
{
- Name = test.Name;
- Repeats = test.Repeats;
- Qtg = (double)test.Qtg;
- Qfrom = (double)test.Qfrom;
- Qto = (double)test.Qto;
- TargetVolume = (double)test.Volume;
- TargetTime = (double)test.TestTime;
- Method = test.Method;
- ErrLimLo = (double)test.ErrLimLo;
- ErrLimHi = (double)test.ErrLimHi;
- ErrLimMargin = (double)test.Uncertainty;
- DoControlWaterTemp = test.DoControlWaterTemp;
- TempLimLo = test.TempLimLo;
- TempLimHi = test.TempLimHi;
- Publish = test.Publish;
- Evaluate = test.DoEvaluate;
+ Name = test.Name;
+ Repeats = test.Repeats;
+ Qtg = test.Qtg;
+ Qfrom = test.Qfrom;
+ Qto = test.Qto;
+ TargetVolume = test.Volume;
+ TargetTime = test.TestTime;
+ Method = test.Method;
+ ErrLimLo = test.ErrLimLo;
+ ErrLimHi = test.ErrLimHi;
+ ErrLimMargin = test.Uncertainty;
+ TempLimLo = test.TempLimLo;
+ TempLimHi = test.TempLimHi;
+ TempControl = test.TempControl;
+ Publish = test.Publish;
+ Evaluate = test.DoEvaluate;
}
///
@@ -68,22 +68,22 @@ namespace SharedDatabase.Entities
///
public TestData(TestData oriTestData)
{
- Name = oriTestData.Name;
- Repeats = oriTestData.Repeats;
- Qtg = oriTestData.Qtg;
- Qfrom = oriTestData.Qfrom;
- Qto = oriTestData.Qto;
- TargetVolume = oriTestData.TargetVolume;
- TargetTime = oriTestData.TargetTime;
- Method = oriTestData.Method;
- ErrLimLo = oriTestData.ErrLimLo;
- ErrLimHi = oriTestData.ErrLimHi;
- ErrLimMargin = oriTestData.ErrLimMargin;
- DoControlWaterTemp = oriTestData.DoControlWaterTemp;
- TempLimLo = oriTestData.TempLimLo;
- TempLimHi = oriTestData.TempLimHi;
- Publish = oriTestData.Publish;
- Evaluate = oriTestData.Evaluate;
+ Name = oriTestData.Name;
+ Repeats = oriTestData.Repeats;
+ Qtg = oriTestData.Qtg;
+ Qfrom = oriTestData.Qfrom;
+ Qto = oriTestData.Qto;
+ TargetVolume = oriTestData.TargetVolume;
+ TargetTime = oriTestData.TargetTime;
+ Method = oriTestData.Method;
+ ErrLimLo = oriTestData.ErrLimLo;
+ ErrLimHi = oriTestData.ErrLimHi;
+ ErrLimMargin = oriTestData.ErrLimMargin;
+ TempLimLo = oriTestData.TempLimLo;
+ TempLimHi = oriTestData.TempLimHi;
+ TempControl = oriTestData.TempControl;
+ Publish = oriTestData.Publish;
+ Evaluate = oriTestData.Evaluate;
}
@@ -105,13 +105,10 @@ namespace SharedDatabase.Entities
if (ErrLimLo != td.ErrLimLo) return false;
if (ErrLimHi != td.ErrLimHi) return false;
if (ErrLimMargin != td.ErrLimMargin) return false;
- if (DoControlWaterTemp != td.DoControlWaterTemp) return false;
- if (DoControlWaterTemp)
- {
- if (TempLimLo != td.TempLimLo) return false;
- if (TempLimHi != td.TempLimHi) return false;
- }
- if (Publish != td.Publish) return false;
+ if (TempLimLo != td.TempLimLo) return false;
+ if (TempLimHi != td.TempLimHi) return false;
+ if (TempControl != td.TempControl) return false;
+ if (Publish != td.Publish) return false;
if (Evaluate != td.Evaluate) return false;
return true;
@@ -150,9 +147,9 @@ namespace SharedDatabase.Entities
writer.Write(ErrLimLo);
writer.Write(ErrLimHi);
writer.Write(ErrLimMargin);
- writer.Write(DoControlWaterTemp);
writer.Write(TempLimLo);
writer.Write(TempLimHi);
+ writer.Write(TempControl);
writer.Write(Publish);
writer.Write(Evaluate);
}
@@ -171,9 +168,9 @@ namespace SharedDatabase.Entities
ErrLimLo = reader.ReadDouble();
ErrLimHi = reader.ReadDouble();
ErrLimMargin = reader.ReadDouble();
- DoControlWaterTemp = reader.ReadBoolean();
TempLimLo = reader.ReadSingle();
TempLimHi = reader.ReadSingle();
+ TempControl = reader.ReadString();
Publish = reader.ReadSByte();
Evaluate = reader.ReadBoolean();
}
diff --git a/TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs
index 6f8c02a0f..21d617adf 100644
--- a/TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs
+++ b/TBF/Rig/TestMethods/Adjustment/AdjustmentSeq.cs
@@ -262,7 +262,7 @@ namespace TBF.Rig.TestMethods.Adjustment
flowSetTime = StateMachine.Time - flowSetTime0;
- if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs b/TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
index f59d47bd1..66d4d136a 100644
--- a/TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
+++ b/TBF/Rig/TestMethods/DiverterTest/DiverterTestSeq.cs
@@ -291,7 +291,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
int flowSetTime = StateMachine.Time - flowSetTime0;
double currentFlow = RefFlow.Val;
- if (test.DoControlWaterTemp && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
+ if (!string.IsNullOrEmpty(test.TempControl) && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs b/TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs
index a4e63f930..920175251 100644
--- a/TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs
+++ b/TBF/Rig/TestMethods/Endurance/EnduranceSeq.cs
@@ -199,7 +199,7 @@ namespace TBF.Rig.TestMethods.Endurance
double currentFlow = RefFlow.Val;
- if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs
index 22fe7ecef..5c1aed994 100644
--- a/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs
+++ b/TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs
@@ -330,7 +330,7 @@ namespace TBF.Rig.TestMethods.FixedStart
}
while (true);
}
- else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs b/TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
index 6fa083d13..0fbd4ec71 100644
--- a/TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
+++ b/TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
@@ -349,7 +349,7 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval
}
while (true);
}
- else if (test.DoControlWaterTemp && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
+ else if (!string.IsNullOrEmpty(test.TempControl) && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs b/TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
index b956eaf03..f3a427439 100644
--- a/TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
+++ b/TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
@@ -410,7 +410,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
}
while (true);
}
- else if (test.DoControlWaterTemp && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
+ else if (!string.IsNullOrEmpty(test.TempControl) && (benchPath.TempMtrUp != null) && (benchPath.TempMtrDown != null))
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
index 1895383ab..98000dc6c 100644
--- a/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
+++ b/TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
@@ -305,7 +305,7 @@ namespace TBF.Rig.TestMethods.FixedStartTankCollection
int flowSetTime = StateMachine.Time - flowSetTime0;
- if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs b/TBF/Rig/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs
index 6e7f4f17c..4ced5d49a 100644
--- a/TBF/Rig/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs
+++ b/TBF/Rig/TestMethods/FlowAdjustment/FlowAdjustmentSeq.cs
@@ -233,7 +233,7 @@ namespace TBF.Rig.TestMethods.FlowAdjustment
TestEndTime = DateTime.Now;
double currentFlow = RefFlow.Val;
- if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs
index 93979f2d2..b5a066a2d 100644
--- a/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TBF/Rig/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -294,7 +294,7 @@ namespace TBF.Rig.TestMethods.FlyingStart
}
while (true);
}
- else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
index 4c4e9743a..0e7dad1cc 100644
--- a/TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
+++ b/TBF/Rig/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
@@ -372,7 +372,7 @@ namespace TBF.Rig.TestMethods.FlyingStartFirstRepetWithMassColl
}
while (true);
}
- else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
index 9bc3bb346..d1b4ee5f3 100644
--- a/TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
+++ b/TBF/Rig/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
@@ -393,7 +393,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollComparative
}
while (true);
}
- else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
index a193eea81..ccd1c1854 100644
--- a/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+++ b/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
@@ -372,7 +372,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
}
while (true);
}
- else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
index 93e5fbc58..04e72f766 100644
--- a/TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+++ b/TBF/Rig/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
@@ -372,7 +372,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollection
}
while (true);
}
- else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs b/TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
index 0a2ed2c28..8fb0cb3b0 100644
--- a/TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
+++ b/TBF/Rig/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
@@ -287,7 +287,7 @@ namespace TBF.Rig.TestMethods.FlyingStartTankCollection
int flowSetTime = StateMachine.Time - flowSetTime0;
double currentFlow = RefFlow.Val;
- if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs
index 3e70f28e5..d572da440 100644
--- a/TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs
+++ b/TBF/Rig/TestMethods/PulsesTest/PulsesTestSeq.cs
@@ -222,7 +222,7 @@ namespace TBF.Rig.TestMethods.PulsesTest
int flowSetTime = StateMachine.Time - flowSetTime0;
- if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
index bc0664d5d..95a085dc9 100644
--- a/TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
+++ b/TBF/Rig/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
@@ -222,7 +222,7 @@ namespace TBF.Rig.TestMethods.PulsesTestManual
int flowSetTime = StateMachine.Time - flowSetTime0;
- if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs b/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
index 8ae2ba9a1..57d36be57 100644
--- a/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
+++ b/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
@@ -339,7 +339,7 @@ namespace TBF.Rig.TestMethods.StandingStart
}
while (true);
}
- else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);
diff --git a/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
index 24ee69c85..1459ea87b 100644
--- a/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
+++ b/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
@@ -390,7 +390,7 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
}
while (true);
}
- else if (test.DoControlWaterTemp && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
+ else if (!string.IsNullOrEmpty(test.TempControl) && benchPath.TempMtrUp != null && benchPath.TempMtrDown != null)
{
//---------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_temperature);