diff --git a/TestBenchFramework/BenchControl/Formulas.cs b/TestBenchFramework/BenchControl/Formulas.cs index 22a414069..e6dd93597 100644 --- a/TestBenchFramework/BenchControl/Formulas.cs +++ b/TestBenchFramework/BenchControl/Formulas.cs @@ -91,9 +91,8 @@ namespace TBF.BenchControl /// /// Temperature in [degC] /// Density in [kg/m3] - public static double DistilledWaterDensityFromTemp(float t) + public static double DistilledWaterDensityFromTemp(double t) { - double tt = (double)t; const double a0 = 999.842594; const double a1 = 0.06793952; const double a2 = -0.00909529; @@ -101,7 +100,7 @@ namespace TBF.BenchControl const double a4 = -0.000001120083; const double a5 = 6.536332e-09; - return ((((a5 * tt + a4) * tt + a3) * tt + a2) * tt + a1) * tt + a0; + return ((((a5 * t + a4) * t + a3) * t + a2) * t + a1) * t + a0; } /// @@ -109,10 +108,10 @@ namespace TBF.BenchControl /// /// Temperature in [degC] /// Density in [kg/m3] - public static double WaterDensityFromTemp(float t) + public static double WaterDensityFromTemp(double t) { double realDensity = Program.LocalSettings.RealDensity; - float atTemperature = Program.LocalSettings.AtTemperature; + double atTemperature = Program.LocalSettings.AtTemperature; double c_rho = realDensity / DistilledWaterDensityFromTemp(atTemperature); diff --git a/TestBenchFramework/BenchControl/Sequences/Statistics.cs b/TestBenchFramework/BenchControl/Sequences/Statistics.cs index 3d1e0af1b..1a2214fbb 100644 --- a/TestBenchFramework/BenchControl/Sequences/Statistics.cs +++ b/TestBenchFramework/BenchControl/Sequences/Statistics.cs @@ -11,11 +11,11 @@ namespace TBF.BenchControl.Sequences double sum; UInt32 count; - public float First { get { return (float)first; } } - public float Last { get { return (float)last; } } - public float Min { get { return (float)min; } } - public float Max { get { return (float)max; } } - public float Average { get { if (Count > 0) return (float)(sum / (double)count); else return 0; } } + public double First { get { return first; } } + public double Last { get { return last; } } + public double Min { get { return min; } } + public double Max { get { return max; } } + public double Average { get { if (Count > 0) return (sum / (double)count); else return 0; } } public UInt32 Count { get { return count; } } public double Sum { get { return sum; } } diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index 8d2eb4fbe..3463fc5b7 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -251,46 +251,46 @@ namespace TBF.BenchControl.TestMethods.Adjustment if (tstRslt != null) { /// Auxiliary results - tstRslt.AmbientTempAve = AmbientTempStat.Average; - tstRslt.AmbTempStart = AmbientTempStat.First; - tstRslt.AmbTempEnd = AmbientTempStat.Last; - tstRslt.AmbTempMin = AmbientTempStat.Min; - tstRslt.AmbTempMax = AmbientTempStat.Max; - tstRslt.AmbientPressAve = AmbientPressureStat.Average; - tstRslt.AmbPressStart = AmbientPressureStat.First; - tstRslt.AmbPressEnd = AmbientPressureStat.Last; - tstRslt.AmbPressMin = AmbientPressureStat.Min; - tstRslt.AmbPressMax = AmbientPressureStat.Max; - tstRslt.AmbientHumiAve = AmbientHumidityStat.Average; - tstRslt.AmbHumiStart = AmbientHumidityStat.First; - tstRslt.AmbHumiEnd = AmbientHumidityStat.Last; - tstRslt.AmbHumiMin = AmbientHumidityStat.Min; - tstRslt.AmbHumiMax = AmbientHumidityStat.Max; - tstRslt.PressUpAvrg = PressureUpStat.Average; - tstRslt.PressUpStart = PressureUpStat.First; - tstRslt.PressUpEnd = PressureUpStat.Last; - tstRslt.PressUpMin = PressureUpStat.Min; - tstRslt.PressUpMax = PressureUpStat.Max; - tstRslt.PressDownAvrg = PressureDownStat.Average; - tstRslt.PressDownStart = PressureDownStat.First; - tstRslt.PressDownEnd = PressureDownStat.Last; - tstRslt.PressDownMin = PressureDownStat.Min; - tstRslt.PressDownMax = PressureDownStat.Max; - tstRslt.TempInAvrg = TempInStat.Average; - tstRslt.TempInStart = TempInStat.First; - tstRslt.TempInEnd = TempInStat.Last; - tstRslt.TempInMin = TempInStat.Min; - tstRslt.TempInMax = TempInStat.Max; - tstRslt.TempOutAvrg = TempOutStat.Average; - tstRslt.TempOutStart = TempOutStat.First; - tstRslt.TempOutEnd = TempOutStat.Last; - tstRslt.TempOutMin = TempOutStat.Min; - tstRslt.TempOutMax = TempOutStat.Max; - tstRslt.TempDivAvrg = TempDivStat.Average; - tstRslt.TempDivStart = TempDivStat.First; - tstRslt.TempDivEnd = TempDivStat.Last; - tstRslt.TempDivMin = TempDivStat.Min; - tstRslt.TempDivMax = TempDivStat.Max; + tstRslt.AmbientTempAve = (float)AmbientTempStat.Average; + tstRslt.AmbTempStart = (float)AmbientTempStat.First; + tstRslt.AmbTempEnd = (float)AmbientTempStat.Last; + tstRslt.AmbTempMin = (float)AmbientTempStat.Min; + tstRslt.AmbTempMax = (float)AmbientTempStat.Max; + tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average; + tstRslt.AmbPressStart = (float)AmbientPressureStat.First; + tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last; + tstRslt.AmbPressMin = (float)AmbientPressureStat.Min; + tstRslt.AmbPressMax = (float)AmbientPressureStat.Max; + tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average; + tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First; + tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last; + tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min; + tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max; + tstRslt.PressUpAvrg = (float)PressureUpStat.Average; + tstRslt.PressUpStart = (float)PressureUpStat.First; + tstRslt.PressUpEnd = (float)PressureUpStat.Last; + tstRslt.PressUpMin = (float)PressureUpStat.Min; + tstRslt.PressUpMax = (float)PressureUpStat.Max; + tstRslt.PressDownAvrg = (float)PressureDownStat.Average; + tstRslt.PressDownStart = (float)PressureDownStat.First; + tstRslt.PressDownEnd = (float)PressureDownStat.Last; + tstRslt.PressDownMin = (float)PressureDownStat.Min; + tstRslt.PressDownMax = (float)PressureDownStat.Max; + tstRslt.TempInAvrg = (float)TempInStat.Average; + tstRslt.TempInStart = (float)TempInStat.First; + tstRslt.TempInEnd = (float)TempInStat.Last; + tstRslt.TempInMin = (float)TempInStat.Min; + tstRslt.TempInMax = (float)TempInStat.Max; + tstRslt.TempOutAvrg = (float)TempOutStat.Average; + tstRslt.TempOutStart = (float)TempOutStat.First; + tstRslt.TempOutEnd = (float)TempOutStat.Last; + tstRslt.TempOutMin = (float)TempOutStat.Min; + tstRslt.TempOutMax = (float)TempOutStat.Max; + tstRslt.TempDivAvrg = (float)TempDivStat.Average; + tstRslt.TempDivStart = (float)TempDivStat.First; + tstRslt.TempDivEnd = (float)TempDivStat.Last; + tstRslt.TempDivMin = (float)TempDivStat.Min; + tstRslt.TempDivMax = (float)TempDivStat.Max; tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3] tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3] tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivAvrg); /// [kg/m3] @@ -310,8 +310,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment tstRslt.VolumeCTV = tstRslt.ConstMaster * tstRslt.PulsesMaster; /// [l] 1000.0f is because density is in [kg/m3] tstRslt.ErrorMaster = 0.0f; /// Cannot be determined without the collected water mass measurement - tstRslt.FlowMin = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min; - tstRslt.FlowMax = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max; + tstRslt.FlowMin = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min); + tstRslt.FlowMax = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max); for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 695f978cc..a22e1babc 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -521,46 +521,46 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection if (tstRslt != null) { /// Auxiliary results - tstRslt.AmbientTempAve = AmbientTempStat.Average; - tstRslt.AmbTempStart = AmbientTempStat.First; - tstRslt.AmbTempEnd = AmbientTempStat.Last; - tstRslt.AmbTempMin = AmbientTempStat.Min; - tstRslt.AmbTempMax = AmbientTempStat.Max; - tstRslt.AmbientPressAve = AmbientPressureStat.Average; - tstRslt.AmbPressStart = AmbientPressureStat.First; - tstRslt.AmbPressEnd = AmbientPressureStat.Last; - tstRslt.AmbPressMin = AmbientPressureStat.Min; - tstRslt.AmbPressMax = AmbientPressureStat.Max; - tstRslt.AmbientHumiAve = AmbientHumidityStat.Average; - tstRslt.AmbHumiStart = AmbientHumidityStat.First; - tstRslt.AmbHumiEnd = AmbientHumidityStat.Last; - tstRslt.AmbHumiMin = AmbientHumidityStat.Min; - tstRslt.AmbHumiMax = AmbientHumidityStat.Max; - tstRslt.PressUpAvrg = PressureUpStat.Average; - tstRslt.PressUpStart = PressureUpStat.First; - tstRslt.PressUpEnd = PressureUpStat.Last; - tstRslt.PressUpMin = PressureUpStat.Min; - tstRslt.PressUpMax = PressureUpStat.Max; - tstRslt.PressDownAvrg = PressureDownStat.Average; - tstRslt.PressDownStart = PressureDownStat.First; - tstRslt.PressDownEnd = PressureDownStat.Last; - tstRslt.PressDownMin = PressureDownStat.Min; - tstRslt.PressDownMax = PressureDownStat.Max; - tstRslt.TempInAvrg = TempInStat.Average; - tstRslt.TempInStart = TempInStat.First; - tstRslt.TempInEnd = TempInStat.Last; - tstRslt.TempInMin = TempInStat.Min; - tstRslt.TempInMax = TempInStat.Max; - tstRslt.TempOutAvrg = TempOutStat.Average; - tstRslt.TempOutStart = TempOutStat.First; - tstRslt.TempOutEnd = TempOutStat.Last; - tstRslt.TempOutMin = TempOutStat.Min; - tstRslt.TempOutMax = TempOutStat.Max; - tstRslt.TempDivAvrg = TempDivStat.Average; - tstRslt.TempDivStart = TempDivStat.First; - tstRslt.TempDivEnd = TempDivStat.Last; - tstRslt.TempDivMin = TempDivStat.Min; - tstRslt.TempDivMax = TempDivStat.Max; + tstRslt.AmbientTempAve = (float)AmbientTempStat.Average; + tstRslt.AmbTempStart = (float)AmbientTempStat.First; + tstRslt.AmbTempEnd = (float)AmbientTempStat.Last; + tstRslt.AmbTempMin = (float)AmbientTempStat.Min; + tstRslt.AmbTempMax = (float)AmbientTempStat.Max; + tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average; + tstRslt.AmbPressStart = (float)AmbientPressureStat.First; + tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last; + tstRslt.AmbPressMin = (float)AmbientPressureStat.Min; + tstRslt.AmbPressMax = (float)AmbientPressureStat.Max; + tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average; + tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First; + tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last; + tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min; + tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max; + tstRslt.PressUpAvrg = (float)PressureUpStat.Average; + tstRslt.PressUpStart = (float)PressureUpStat.First; + tstRslt.PressUpEnd = (float)PressureUpStat.Last; + tstRslt.PressUpMin = (float)PressureUpStat.Min; + tstRslt.PressUpMax = (float)PressureUpStat.Max; + tstRslt.PressDownAvrg = (float)PressureDownStat.Average; + tstRslt.PressDownStart = (float)PressureDownStat.First; + tstRslt.PressDownEnd = (float)PressureDownStat.Last; + tstRslt.PressDownMin = (float)PressureDownStat.Min; + tstRslt.PressDownMax = (float)PressureDownStat.Max; + tstRslt.TempInAvrg = (float)TempInStat.Average; + tstRslt.TempInStart = (float)TempInStat.First; + tstRslt.TempInEnd = (float)TempInStat.Last; + tstRslt.TempInMin = (float)TempInStat.Min; + tstRslt.TempInMax = (float)TempInStat.Max; + tstRslt.TempOutAvrg = (float)TempOutStat.Average; + tstRslt.TempOutStart = (float)TempOutStat.First; + tstRslt.TempOutEnd = (float)TempOutStat.Last; + tstRslt.TempOutMin = (float)TempOutStat.Min; + tstRslt.TempOutMax = (float)TempOutStat.Max; + tstRslt.TempDivAvrg = (float)TempDivStat.Average; + tstRslt.TempDivStart = (float)TempDivStat.First; + tstRslt.TempDivEnd = (float)TempDivStat.Last; + tstRslt.TempDivMin = (float)TempDivStat.Min; + tstRslt.TempDivMax = (float)TempDivStat.Max; tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3] tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3] tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivAvrg); /// [kg/m3] @@ -582,8 +582,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); - tstRslt.FlowMin = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min; - tstRslt.FlowMax = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max; + tstRslt.FlowMin = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min); + tstRslt.FlowMax = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max); for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index ad43833eb..bd9cb795e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -477,46 +477,46 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced if (tstRslt != null) { /// Auxiliary results - tstRslt.AmbientTempAve = AmbientTempStat.Average; - tstRslt.AmbTempStart = AmbientTempStat.First; - tstRslt.AmbTempEnd = AmbientTempStat.Last; - tstRslt.AmbTempMin = AmbientTempStat.Min; - tstRslt.AmbTempMax = AmbientTempStat.Max; - tstRslt.AmbientPressAve = AmbientPressureStat.Average; - tstRslt.AmbPressStart = AmbientPressureStat.First; - tstRslt.AmbPressEnd = AmbientPressureStat.Last; - tstRslt.AmbPressMin = AmbientPressureStat.Min; - tstRslt.AmbPressMax = AmbientPressureStat.Max; - tstRslt.AmbientHumiAve = AmbientHumidityStat.Average; - tstRslt.AmbHumiStart = AmbientHumidityStat.First; - tstRslt.AmbHumiEnd = AmbientHumidityStat.Last; - tstRslt.AmbHumiMin = AmbientHumidityStat.Min; - tstRslt.AmbHumiMax = AmbientHumidityStat.Max; - tstRslt.PressUpAvrg = PressureUpStat.Average; - tstRslt.PressUpStart = PressureUpStat.First; - tstRslt.PressUpEnd = PressureUpStat.Last; - tstRslt.PressUpMin = PressureUpStat.Min; - tstRslt.PressUpMax = PressureUpStat.Max; - tstRslt.PressDownAvrg = PressureDownStat.Average; - tstRslt.PressDownStart = PressureDownStat.First; - tstRslt.PressDownEnd = PressureDownStat.Last; - tstRslt.PressDownMin = PressureDownStat.Min; - tstRslt.PressDownMax = PressureDownStat.Max; - tstRslt.TempInAvrg = TempInStat.Average; - tstRslt.TempInStart = TempInStat.First; - tstRslt.TempInEnd = TempInStat.Last; - tstRslt.TempInMin = TempInStat.Min; - tstRslt.TempInMax = TempInStat.Max; - tstRslt.TempOutAvrg = TempOutStat.Average; - tstRslt.TempOutStart = TempOutStat.First; - tstRslt.TempOutEnd = TempOutStat.Last; - tstRslt.TempOutMin = TempOutStat.Min; - tstRslt.TempOutMax = TempOutStat.Max; - tstRslt.TempDivAvrg = TempDivStat.Average; - tstRslt.TempDivStart = TempDivStat.First; - tstRslt.TempDivEnd = TempDivStat.Last; - tstRslt.TempDivMin = TempDivStat.Min; - tstRslt.TempDivMax = TempDivStat.Max; + tstRslt.AmbientTempAve = (float)AmbientTempStat.Average; + tstRslt.AmbTempStart = (float)AmbientTempStat.First; + tstRslt.AmbTempEnd = (float)AmbientTempStat.Last; + tstRslt.AmbTempMin = (float)AmbientTempStat.Min; + tstRslt.AmbTempMax = (float)AmbientTempStat.Max; + tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average; + tstRslt.AmbPressStart = (float)AmbientPressureStat.First; + tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last; + tstRslt.AmbPressMin = (float)AmbientPressureStat.Min; + tstRslt.AmbPressMax = (float)AmbientPressureStat.Max; + tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average; + tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First; + tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last; + tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min; + tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max; + tstRslt.PressUpAvrg = (float)PressureUpStat.Average; + tstRslt.PressUpStart = (float)PressureUpStat.First; + tstRslt.PressUpEnd = (float)PressureUpStat.Last; + tstRslt.PressUpMin = (float)PressureUpStat.Min; + tstRslt.PressUpMax = (float)PressureUpStat.Max; + tstRslt.PressDownAvrg = (float)PressureDownStat.Average; + tstRslt.PressDownStart = (float)PressureDownStat.First; + tstRslt.PressDownEnd = (float)PressureDownStat.Last; + tstRslt.PressDownMin = (float)PressureDownStat.Min; + tstRslt.PressDownMax = (float)PressureDownStat.Max; + tstRslt.TempInAvrg = (float)TempInStat.Average; + tstRslt.TempInStart = (float)TempInStat.First; + tstRslt.TempInEnd = (float)TempInStat.Last; + tstRslt.TempInMin = (float)TempInStat.Min; + tstRslt.TempInMax = (float)TempInStat.Max; + tstRslt.TempOutAvrg = (float)TempOutStat.Average; + tstRslt.TempOutStart = (float)TempOutStat.First; + tstRslt.TempOutEnd = (float)TempOutStat.Last; + tstRslt.TempOutMin = (float)TempOutStat.Min; + tstRslt.TempOutMax = (float)TempOutStat.Max; + tstRslt.TempDivAvrg = (float)TempDivStat.Average; + tstRslt.TempDivStart = (float)TempDivStat.First; + tstRslt.TempDivEnd = (float)TempDivStat.Last; + tstRslt.TempDivMin = (float)TempDivStat.Min; + tstRslt.TempDivMax = (float)TempDivStat.Max; tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3] tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3] tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivAvrg); /// [kg/m3] @@ -538,8 +538,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); - tstRslt.FlowMin = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min; - tstRslt.FlowMax = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max; + tstRslt.FlowMin = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min); + tstRslt.FlowMax = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max); for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 5d155f8a5..0d7d57fbb 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -623,46 +623,46 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (tstRslt != null) { /// Auxiliary results - tstRslt.AmbientTempAve = AmbientTempStat.Average; - tstRslt.AmbTempStart = AmbientTempStat.First; - tstRslt.AmbTempEnd = AmbientTempStat.Last; - tstRslt.AmbTempMin = AmbientTempStat.Min; - tstRslt.AmbTempMax = AmbientTempStat.Max; - tstRslt.AmbientPressAve = AmbientPressureStat.Average; - tstRslt.AmbPressStart = AmbientPressureStat.First; - tstRslt.AmbPressEnd = AmbientPressureStat.Last; - tstRslt.AmbPressMin = AmbientPressureStat.Min; - tstRslt.AmbPressMax = AmbientPressureStat.Max; - tstRslt.AmbientHumiAve = AmbientHumidityStat.Average; - tstRslt.AmbHumiStart = AmbientHumidityStat.First; - tstRslt.AmbHumiEnd = AmbientHumidityStat.Last; - tstRslt.AmbHumiMin = AmbientHumidityStat.Min; - tstRslt.AmbHumiMax = AmbientHumidityStat.Max; - tstRslt.PressUpAvrg = PressureUpStat.Average; - tstRslt.PressUpStart = PressureUpStat.First; - tstRslt.PressUpEnd = PressureUpStat.Last; - tstRslt.PressUpMin = PressureUpStat.Min; - tstRslt.PressUpMax = PressureUpStat.Max; - tstRslt.PressDownAvrg = PressureDownStat.Average; - tstRslt.PressDownStart = PressureDownStat.First; - tstRslt.PressDownEnd = PressureDownStat.Last; - tstRslt.PressDownMin = PressureDownStat.Min; - tstRslt.PressDownMax = PressureDownStat.Max; - tstRslt.TempInAvrg = TempInStat.Average; - tstRslt.TempInStart = TempInStat.First; - tstRslt.TempInEnd = TempInStat.Last; - tstRslt.TempInMin = TempInStat.Min; - tstRslt.TempInMax = TempInStat.Max; - tstRslt.TempOutAvrg = TempOutStat.Average; - tstRslt.TempOutStart = TempOutStat.First; - tstRslt.TempOutEnd = TempOutStat.Last; - tstRslt.TempOutMin = TempOutStat.Min; - tstRslt.TempOutMax = TempOutStat.Max; - tstRslt.TempDivAvrg = TempDivStat.Average; - tstRslt.TempDivStart = TempDivStat.First; - tstRslt.TempDivEnd = TempDivStat.Last; - tstRslt.TempDivMin = TempDivStat.Min; - tstRslt.TempDivMax = TempDivStat.Max; + tstRslt.AmbientTempAve = (float)AmbientTempStat.Average; + tstRslt.AmbTempStart = (float)AmbientTempStat.First; + tstRslt.AmbTempEnd = (float)AmbientTempStat.Last; + tstRslt.AmbTempMin = (float)AmbientTempStat.Min; + tstRslt.AmbTempMax = (float)AmbientTempStat.Max; + tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average; + tstRslt.AmbPressStart = (float)AmbientPressureStat.First; + tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last; + tstRslt.AmbPressMin = (float)AmbientPressureStat.Min; + tstRslt.AmbPressMax = (float)AmbientPressureStat.Max; + tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average; + tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First; + tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last; + tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min; + tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max; + tstRslt.PressUpAvrg = (float)PressureUpStat.Average; + tstRslt.PressUpStart = (float)PressureUpStat.First; + tstRslt.PressUpEnd = (float)PressureUpStat.Last; + tstRslt.PressUpMin = (float)PressureUpStat.Min; + tstRslt.PressUpMax = (float)PressureUpStat.Max; + tstRslt.PressDownAvrg = (float)PressureDownStat.Average; + tstRslt.PressDownStart = (float)PressureDownStat.First; + tstRslt.PressDownEnd = (float)PressureDownStat.Last; + tstRslt.PressDownMin = (float)PressureDownStat.Min; + tstRslt.PressDownMax = (float)PressureDownStat.Max; + tstRslt.TempInAvrg = (float)TempInStat.Average; + tstRslt.TempInStart = (float)TempInStat.First; + tstRslt.TempInEnd = (float)TempInStat.Last; + tstRslt.TempInMin = (float)TempInStat.Min; + tstRslt.TempInMax = (float)TempInStat.Max; + tstRslt.TempOutAvrg = (float)TempOutStat.Average; + tstRslt.TempOutStart = (float)TempOutStat.First; + tstRslt.TempOutEnd = (float)TempOutStat.Last; + tstRslt.TempOutMin = (float)TempOutStat.Min; + tstRslt.TempOutMax = (float)TempOutStat.Max; + tstRslt.TempDivAvrg = (float)TempDivStat.Average; + tstRslt.TempDivStart = (float)TempDivStat.First; + tstRslt.TempDivEnd = (float)TempDivStat.Last; + tstRslt.TempDivMin = (float)TempDivStat.Min; + tstRslt.TempDivMax = (float)TempDivStat.Max; tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3] tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3] tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivAvrg); /// [kg/m3] @@ -684,8 +684,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); - tstRslt.FlowMin = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min; - tstRslt.FlowMax = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max; + tstRslt.FlowMin = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min); + tstRslt.FlowMax = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max); if (compound) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 7dd13c262..3c6af4f3d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -314,46 +314,46 @@ namespace TBF.BenchControl.TestMethods.FlyingStart if (tstRslt != null) { /// Auxiliary results - tstRslt.AmbientTempAve = AmbientTempStat.Average; - tstRslt.AmbTempStart = AmbientTempStat.First; - tstRslt.AmbTempEnd = AmbientTempStat.Last; - tstRslt.AmbTempMin = AmbientTempStat.Min; - tstRslt.AmbTempMax = AmbientTempStat.Max; - tstRslt.AmbientPressAve = AmbientPressureStat.Average; - tstRslt.AmbPressStart = AmbientPressureStat.First; - tstRslt.AmbPressEnd = AmbientPressureStat.Last; - tstRslt.AmbPressMin = AmbientPressureStat.Min; - tstRslt.AmbPressMax = AmbientPressureStat.Max; - tstRslt.AmbientHumiAve = AmbientHumidityStat.Average; - tstRslt.AmbHumiStart = AmbientHumidityStat.First; - tstRslt.AmbHumiEnd = AmbientHumidityStat.Last; - tstRslt.AmbHumiMin = AmbientHumidityStat.Min; - tstRslt.AmbHumiMax = AmbientHumidityStat.Max; - tstRslt.PressUpAvrg = PressureUpStat.Average; - tstRslt.PressUpStart = PressureUpStat.First; - tstRslt.PressUpEnd = PressureUpStat.Last; - tstRslt.PressUpMin = PressureUpStat.Min; - tstRslt.PressUpMax = PressureUpStat.Max; - tstRslt.PressDownAvrg = PressureDownStat.Average; - tstRslt.PressDownStart = PressureDownStat.First; - tstRslt.PressDownEnd = PressureDownStat.Last; - tstRslt.PressDownMin = PressureDownStat.Min; - tstRslt.PressDownMax = PressureDownStat.Max; - tstRslt.TempInAvrg = TempInStat.Average; - tstRslt.TempInStart = TempInStat.First; - tstRslt.TempInEnd = TempInStat.Last; - tstRslt.TempInMin = TempInStat.Min; - tstRslt.TempInMax = TempInStat.Max; - tstRslt.TempOutAvrg = TempOutStat.Average; - tstRslt.TempOutStart = TempOutStat.First; - tstRslt.TempOutEnd = TempOutStat.Last; - tstRslt.TempOutMin = TempOutStat.Min; - tstRslt.TempOutMax = TempOutStat.Max; - tstRslt.TempDivAvrg = TempDivStat.Average; - tstRslt.TempDivStart = TempDivStat.First; - tstRslt.TempDivEnd = TempDivStat.Last; - tstRslt.TempDivMin = TempDivStat.Min; - tstRslt.TempDivMax = TempDivStat.Max; + tstRslt.AmbientTempAve = (float)AmbientTempStat.Average; + tstRslt.AmbTempStart = (float)AmbientTempStat.First; + tstRslt.AmbTempEnd = (float)AmbientTempStat.Last; + tstRslt.AmbTempMin = (float)AmbientTempStat.Min; + tstRslt.AmbTempMax = (float)AmbientTempStat.Max; + tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average; + tstRslt.AmbPressStart = (float)AmbientPressureStat.First; + tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last; + tstRslt.AmbPressMin = (float)AmbientPressureStat.Min; + tstRslt.AmbPressMax = (float)AmbientPressureStat.Max; + tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average; + tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First; + tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last; + tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min; + tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max; + tstRslt.PressUpAvrg = (float)PressureUpStat.Average; + tstRslt.PressUpStart = (float)PressureUpStat.First; + tstRslt.PressUpEnd = (float)PressureUpStat.Last; + tstRslt.PressUpMin = (float)PressureUpStat.Min; + tstRslt.PressUpMax = (float)PressureUpStat.Max; + tstRslt.PressDownAvrg = (float)PressureDownStat.Average; + tstRslt.PressDownStart = (float)PressureDownStat.First; + tstRslt.PressDownEnd = (float)PressureDownStat.Last; + tstRslt.PressDownMin = (float)PressureDownStat.Min; + tstRslt.PressDownMax = (float)PressureDownStat.Max; + tstRslt.TempInAvrg = (float)TempInStat.Average; + tstRslt.TempInStart = (float)TempInStat.First; + tstRslt.TempInEnd = (float)TempInStat.Last; + tstRslt.TempInMin = (float)TempInStat.Min; + tstRslt.TempInMax = (float)TempInStat.Max; + tstRslt.TempOutAvrg = (float)TempOutStat.Average; + tstRslt.TempOutStart = (float)TempOutStat.First; + tstRslt.TempOutEnd = (float)TempOutStat.Last; + tstRslt.TempOutMin = (float)TempOutStat.Min; + tstRslt.TempOutMax = (float)TempOutStat.Max; + tstRslt.TempDivAvrg = (float)TempDivStat.Average; + tstRslt.TempDivStart = (float)TempDivStat.First; + tstRslt.TempDivEnd = (float)TempDivStat.Last; + tstRslt.TempDivMin = (float)TempDivStat.Min; + tstRslt.TempDivMax = (float)TempDivStat.Max; tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3] tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3] tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivAvrg); /// [kg/m3] @@ -375,8 +375,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart tstRslt.VolumeCTV = tstRslt.ConstMaster * tstRslt.PulsesMaster; /// [l] 1000.0f is because density is in [kg/m3] tstRslt.ErrorMaster = 0.0; /// Cannot be determined without a mass measurement - tstRslt.FlowMin = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min; - tstRslt.FlowMax = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max; + tstRslt.FlowMin = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min); + tstRslt.FlowMax = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max); if (compoundTestParams != null) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 200e6448b..450034b4b 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -536,46 +536,46 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (tstRslt != null) { /// Auxiliary results - tstRslt.AmbientTempAve = AmbientTempStat.Average; - tstRslt.AmbTempStart = AmbientTempStat.First; - tstRslt.AmbTempEnd = AmbientTempStat.Last; - tstRslt.AmbTempMin = AmbientTempStat.Min; - tstRslt.AmbTempMax = AmbientTempStat.Max; - tstRslt.AmbientPressAve = AmbientPressureStat.Average; - tstRslt.AmbPressStart = AmbientPressureStat.First; - tstRslt.AmbPressEnd = AmbientPressureStat.Last; - tstRslt.AmbPressMin = AmbientPressureStat.Min; - tstRslt.AmbPressMax = AmbientPressureStat.Max; - tstRslt.AmbientHumiAve = AmbientHumidityStat.Average; - tstRslt.AmbHumiStart = AmbientHumidityStat.First; - tstRslt.AmbHumiEnd = AmbientHumidityStat.Last; - tstRslt.AmbHumiMin = AmbientHumidityStat.Min; - tstRslt.AmbHumiMax = AmbientHumidityStat.Max; - tstRslt.PressUpAvrg = PressureUpStat.Average; - tstRslt.PressUpStart = PressureUpStat.First; - tstRslt.PressUpEnd = PressureUpStat.Last; - tstRslt.PressUpMin = PressureUpStat.Min; - tstRslt.PressUpMax = PressureUpStat.Max; - tstRslt.PressDownAvrg = PressureDownStat.Average; - tstRslt.PressDownStart = PressureDownStat.First; - tstRslt.PressDownEnd = PressureDownStat.Last; - tstRslt.PressDownMin = PressureDownStat.Min; - tstRslt.PressDownMax = PressureDownStat.Max; - tstRslt.TempInAvrg = TempInStat.Average; - tstRslt.TempInStart = TempInStat.First; - tstRslt.TempInEnd = TempInStat.Last; - tstRslt.TempInMin = TempInStat.Min; - tstRslt.TempInMax = TempInStat.Max; - tstRslt.TempOutAvrg = TempOutStat.Average; - tstRslt.TempOutStart = TempOutStat.First; - tstRslt.TempOutEnd = TempOutStat.Last; - tstRslt.TempOutMin = TempOutStat.Min; - tstRslt.TempOutMax = TempOutStat.Max; - tstRslt.TempDivAvrg = TempDivStat.Average; - tstRslt.TempDivStart = TempDivStat.First; - tstRslt.TempDivEnd = TempDivStat.Last; - tstRslt.TempDivMin = TempDivStat.Min; - tstRslt.TempDivMax = TempDivStat.Max; + tstRslt.AmbientTempAve = (float)AmbientTempStat.Average; + tstRslt.AmbTempStart = (float)AmbientTempStat.First; + tstRslt.AmbTempEnd = (float)AmbientTempStat.Last; + tstRslt.AmbTempMin = (float)AmbientTempStat.Min; + tstRslt.AmbTempMax = (float)AmbientTempStat.Max; + tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average; + tstRslt.AmbPressStart = (float)AmbientPressureStat.First; + tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last; + tstRslt.AmbPressMin = (float)AmbientPressureStat.Min; + tstRslt.AmbPressMax = (float)AmbientPressureStat.Max; + tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average; + tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First; + tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last; + tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min; + tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max; + tstRslt.PressUpAvrg = (float)PressureUpStat.Average; + tstRslt.PressUpStart = (float)PressureUpStat.First; + tstRslt.PressUpEnd = (float)PressureUpStat.Last; + tstRslt.PressUpMin = (float)PressureUpStat.Min; + tstRslt.PressUpMax = (float)PressureUpStat.Max; + tstRslt.PressDownAvrg = (float)PressureDownStat.Average; + tstRslt.PressDownStart = (float)PressureDownStat.First; + tstRslt.PressDownEnd = (float)PressureDownStat.Last; + tstRslt.PressDownMin = (float)PressureDownStat.Min; + tstRslt.PressDownMax = (float)PressureDownStat.Max; + tstRslt.TempInAvrg = (float)TempInStat.Average; + tstRslt.TempInStart = (float)TempInStat.First; + tstRslt.TempInEnd = (float)TempInStat.Last; + tstRslt.TempInMin = (float)TempInStat.Min; + tstRslt.TempInMax = (float)TempInStat.Max; + tstRslt.TempOutAvrg = (float)TempOutStat.Average; + tstRslt.TempOutStart = (float)TempOutStat.First; + tstRslt.TempOutEnd = (float)TempOutStat.Last; + tstRslt.TempOutMin = (float)TempOutStat.Min; + tstRslt.TempOutMax = (float)TempOutStat.Max; + tstRslt.TempDivAvrg = (float)TempDivStat.Average; + tstRslt.TempDivStart = (float)TempDivStat.First; + tstRslt.TempDivEnd = (float)TempDivStat.Last; + tstRslt.TempDivMin = (float)TempDivStat.Min; + tstRslt.TempDivMax = (float)TempDivStat.Max; tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3] tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3] tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivAvrg); /// [kg/m3] @@ -597,8 +597,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); - tstRslt.FlowMin = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min; - tstRslt.FlowMax = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max; + tstRslt.FlowMin = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min); + tstRslt.FlowMax = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max); if (compoundTestParams != null) { diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index 9167b9eb9..23589bb59 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -275,46 +275,46 @@ namespace TBF.BenchControl.TestMethods.LeakTest if (tstRslt != null) { /// Auxiliary results - tstRslt.AmbientTempAve = AmbientTempStat.Average; - tstRslt.AmbTempStart = AmbientTempStat.First; - tstRslt.AmbTempEnd = AmbientTempStat.Last; - tstRslt.AmbTempMin = AmbientTempStat.Min; - tstRslt.AmbTempMax = AmbientTempStat.Max; - tstRslt.AmbientPressAve = AmbientPressureStat.Average; - tstRslt.AmbPressStart = AmbientPressureStat.First; - tstRslt.AmbPressEnd = AmbientPressureStat.Last; - tstRslt.AmbPressMin = AmbientPressureStat.Min; - tstRslt.AmbPressMax = AmbientPressureStat.Max; - tstRslt.AmbientHumiAve = AmbientHumidityStat.Average; - tstRslt.AmbHumiStart = AmbientHumidityStat.First; - tstRslt.AmbHumiEnd = AmbientHumidityStat.Last; - tstRslt.AmbHumiMin = AmbientHumidityStat.Min; - tstRslt.AmbHumiMax = AmbientHumidityStat.Max; - tstRslt.PressUpAvrg = PressureUpStat.Average; - tstRslt.PressUpStart = PressureUpStat.First; - tstRslt.PressUpEnd = PressureUpStat.Last; - tstRslt.PressUpMin = PressureUpStat.Min; - tstRslt.PressUpMax = PressureUpStat.Max; - tstRslt.PressDownAvrg = PressureDownStat.Average; - tstRslt.PressDownStart = PressureDownStat.First; - tstRslt.PressDownEnd = PressureDownStat.Last; - tstRslt.PressDownMin = PressureDownStat.Min; - tstRslt.PressDownMax = PressureDownStat.Max; - tstRslt.TempInAvrg = TempInStat.Average; - tstRslt.TempInStart = TempInStat.First; - tstRslt.TempInEnd = TempInStat.Last; - tstRslt.TempInMin = TempInStat.Min; - tstRslt.TempInMax = TempInStat.Max; - tstRslt.TempOutAvrg = TempOutStat.Average; - tstRslt.TempOutStart = TempOutStat.First; - tstRslt.TempOutEnd = TempOutStat.Last; - tstRslt.TempOutMin = TempOutStat.Min; - tstRslt.TempOutMax = TempOutStat.Max; - tstRslt.TempDivAvrg = TempDivStat.Average; - tstRslt.TempDivStart = TempDivStat.First; - tstRslt.TempDivEnd = TempDivStat.Last; - tstRslt.TempDivMin = TempDivStat.Min; - tstRslt.TempDivMax = TempDivStat.Max; + tstRslt.AmbientTempAve = (float)AmbientTempStat.Average; + tstRslt.AmbTempStart = (float)AmbientTempStat.First; + tstRslt.AmbTempEnd = (float)AmbientTempStat.Last; + tstRslt.AmbTempMin = (float)AmbientTempStat.Min; + tstRslt.AmbTempMax = (float)AmbientTempStat.Max; + tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average; + tstRslt.AmbPressStart = (float)AmbientPressureStat.First; + tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last; + tstRslt.AmbPressMin = (float)AmbientPressureStat.Min; + tstRslt.AmbPressMax = (float)AmbientPressureStat.Max; + tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average; + tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First; + tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last; + tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min; + tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max; + tstRslt.PressUpAvrg = (float)PressureUpStat.Average; + tstRslt.PressUpStart = (float)PressureUpStat.First; + tstRslt.PressUpEnd = (float)PressureUpStat.Last; + tstRslt.PressUpMin = (float)PressureUpStat.Min; + tstRslt.PressUpMax = (float)PressureUpStat.Max; + tstRslt.PressDownAvrg = (float)PressureDownStat.Average; + tstRslt.PressDownStart = (float)PressureDownStat.First; + tstRslt.PressDownEnd = (float)PressureDownStat.Last; + tstRslt.PressDownMin = (float)PressureDownStat.Min; + tstRslt.PressDownMax = (float)PressureDownStat.Max; + tstRslt.TempInAvrg = (float)TempInStat.Average; + tstRslt.TempInStart = (float)TempInStat.First; + tstRslt.TempInEnd = (float)TempInStat.Last; + tstRslt.TempInMin = (float)TempInStat.Min; + tstRslt.TempInMax = (float)TempInStat.Max; + tstRslt.TempOutAvrg = (float)TempOutStat.Average; + tstRslt.TempOutStart = (float)TempOutStat.First; + tstRslt.TempOutEnd = (float)TempOutStat.Last; + tstRslt.TempOutMin = (float)TempOutStat.Min; + tstRslt.TempOutMax = (float)TempOutStat.Max; + tstRslt.TempDivAvrg = (float)TempDivStat.Average; + tstRslt.TempDivStart = (float)TempDivStat.First; + tstRslt.TempDivEnd = (float)TempDivStat.Last; + tstRslt.TempDivMin = (float)TempDivStat.Min; + tstRslt.TempDivMax = (float)TempDivStat.Max; tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3] tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3] tstRslt.DensityDiv = 0; diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index 1dc50971c..a969a99df 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -189,46 +189,46 @@ namespace TBF.BenchControl.TestMethods.PMaxTest if (tstRslt != null) { /// Auxiliary results - tstRslt.AmbientTempAve = AmbientTempStat.Average; - tstRslt.AmbTempStart = AmbientTempStat.First; - tstRslt.AmbTempEnd = AmbientTempStat.Last; - tstRslt.AmbTempMin = AmbientTempStat.Min; - tstRslt.AmbTempMax = AmbientTempStat.Max; - tstRslt.AmbientPressAve = AmbientPressureStat.Average; - tstRslt.AmbPressStart = AmbientPressureStat.First; - tstRslt.AmbPressEnd = AmbientPressureStat.Last; - tstRslt.AmbPressMin = AmbientPressureStat.Min; - tstRslt.AmbPressMax = AmbientPressureStat.Max; - tstRslt.AmbientHumiAve = AmbientHumidityStat.Average; - tstRslt.AmbHumiStart = AmbientHumidityStat.First; - tstRslt.AmbHumiEnd = AmbientHumidityStat.Last; - tstRslt.AmbHumiMin = AmbientHumidityStat.Min; - tstRslt.AmbHumiMax = AmbientHumidityStat.Max; - tstRslt.PressUpAvrg = PressureUpStat.Average; - tstRslt.PressUpStart = PressureUpStat.First; - tstRslt.PressUpEnd = PressureUpStat.Last; - tstRslt.PressUpMin = PressureUpStat.Min; - tstRslt.PressUpMax = PressureUpStat.Max; - tstRslt.PressDownAvrg = PressureDownStat.Average; - tstRslt.PressDownStart = PressureDownStat.First; - tstRslt.PressDownEnd = PressureDownStat.Last; - tstRslt.PressDownMin = PressureDownStat.Min; - tstRslt.PressDownMax = PressureDownStat.Max; - tstRslt.TempInAvrg = TempInStat.Average; - tstRslt.TempInStart = TempInStat.First; - tstRslt.TempInEnd = TempInStat.Last; - tstRslt.TempInMin = TempInStat.Min; - tstRslt.TempInMax = TempInStat.Max; - tstRslt.TempOutAvrg = TempOutStat.Average; - tstRslt.TempOutStart = TempOutStat.First; - tstRslt.TempOutEnd = TempOutStat.Last; - tstRslt.TempOutMin = TempOutStat.Min; - tstRslt.TempOutMax = TempOutStat.Max; - tstRslt.TempDivAvrg = TempDivStat.Average; - tstRslt.TempDivStart = TempDivStat.First; - tstRslt.TempDivEnd = TempDivStat.Last; - tstRslt.TempDivMin = TempDivStat.Min; - tstRslt.TempDivMax = TempDivStat.Max; + tstRslt.AmbientTempAve = (float)AmbientTempStat.Average; + tstRslt.AmbTempStart = (float)AmbientTempStat.First; + tstRslt.AmbTempEnd = (float)AmbientTempStat.Last; + tstRslt.AmbTempMin = (float)AmbientTempStat.Min; + tstRslt.AmbTempMax = (float)AmbientTempStat.Max; + tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average; + tstRslt.AmbPressStart = (float)AmbientPressureStat.First; + tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last; + tstRslt.AmbPressMin = (float)AmbientPressureStat.Min; + tstRslt.AmbPressMax = (float)AmbientPressureStat.Max; + tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average; + tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First; + tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last; + tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min; + tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max; + tstRslt.PressUpAvrg = (float)PressureUpStat.Average; + tstRslt.PressUpStart = (float)PressureUpStat.First; + tstRslt.PressUpEnd = (float)PressureUpStat.Last; + tstRslt.PressUpMin = (float)PressureUpStat.Min; + tstRslt.PressUpMax = (float)PressureUpStat.Max; + tstRslt.PressDownAvrg = (float)PressureDownStat.Average; + tstRslt.PressDownStart = (float)PressureDownStat.First; + tstRslt.PressDownEnd = (float)PressureDownStat.Last; + tstRslt.PressDownMin = (float)PressureDownStat.Min; + tstRslt.PressDownMax = (float)PressureDownStat.Max; + tstRslt.TempInAvrg = (float)TempInStat.Average; + tstRslt.TempInStart = (float)TempInStat.First; + tstRslt.TempInEnd = (float)TempInStat.Last; + tstRslt.TempInMin = (float)TempInStat.Min; + tstRslt.TempInMax = (float)TempInStat.Max; + tstRslt.TempOutAvrg = (float)TempOutStat.Average; + tstRslt.TempOutStart = (float)TempOutStat.First; + tstRslt.TempOutEnd = (float)TempOutStat.Last; + tstRslt.TempOutMin = (float)TempOutStat.Min; + tstRslt.TempOutMax = (float)TempOutStat.Max; + tstRslt.TempDivAvrg = (float)TempDivStat.Average; + tstRslt.TempDivStart = (float)TempDivStat.First; + tstRslt.TempDivEnd = (float)TempDivStat.Last; + tstRslt.TempDivMin = (float)TempDivStat.Min; + tstRslt.TempDivMax = (float)TempDivStat.Max; tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3] tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3] tstRslt.DensityDiv = 0; diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index e1c53a924..41aadf61f 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -303,46 +303,46 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration if (tstRslt != null) { /// Auxiliary results - tstRslt.AmbientTempAve = AmbientTempStat.Average; - tstRslt.AmbTempStart = AmbientTempStat.First; - tstRslt.AmbTempEnd = AmbientTempStat.Last; - tstRslt.AmbTempMin = AmbientTempStat.Min; - tstRslt.AmbTempMax = AmbientTempStat.Max; - tstRslt.AmbientPressAve = AmbientPressureStat.Average; - tstRslt.AmbPressStart = AmbientPressureStat.First; - tstRslt.AmbPressEnd = AmbientPressureStat.Last; - tstRslt.AmbPressMin = AmbientPressureStat.Min; - tstRslt.AmbPressMax = AmbientPressureStat.Max; - tstRslt.AmbientHumiAve = AmbientHumidityStat.Average; - tstRslt.AmbHumiStart = AmbientHumidityStat.First; - tstRslt.AmbHumiEnd = AmbientHumidityStat.Last; - tstRslt.AmbHumiMin = AmbientHumidityStat.Min; - tstRslt.AmbHumiMax = AmbientHumidityStat.Max; - tstRslt.PressUpAvrg = PressureUpStat.Average; - tstRslt.PressUpStart = PressureUpStat.First; - tstRslt.PressUpEnd = PressureUpStat.Last; - tstRslt.PressUpMin = PressureUpStat.Min; - tstRslt.PressUpMax = PressureUpStat.Max; - tstRslt.PressDownAvrg = PressureDownStat.Average; - tstRslt.PressDownStart = PressureDownStat.First; - tstRslt.PressDownEnd = PressureDownStat.Last; - tstRslt.PressDownMin = PressureDownStat.Min; - tstRslt.PressDownMax = PressureDownStat.Max; - tstRslt.TempInAvrg = TempInStat.Average; - tstRslt.TempInStart = TempInStat.First; - tstRslt.TempInEnd = TempInStat.Last; - tstRslt.TempInMin = TempInStat.Min; - tstRslt.TempInMax = TempInStat.Max; - tstRslt.TempOutAvrg = TempOutStat.Average; - tstRslt.TempOutStart = TempOutStat.First; - tstRslt.TempOutEnd = TempOutStat.Last; - tstRslt.TempOutMin = TempOutStat.Min; - tstRslt.TempOutMax = TempOutStat.Max; - tstRslt.TempDivAvrg = TempDivStat.Average; - tstRslt.TempDivStart = TempDivStat.First; - tstRslt.TempDivEnd = TempDivStat.Last; - tstRslt.TempDivMin = TempDivStat.Min; - tstRslt.TempDivMax = TempDivStat.Max; + tstRslt.AmbientTempAve = (float)AmbientTempStat.Average; + tstRslt.AmbTempStart = (float)AmbientTempStat.First; + tstRslt.AmbTempEnd = (float)AmbientTempStat.Last; + tstRslt.AmbTempMin = (float)AmbientTempStat.Min; + tstRslt.AmbTempMax = (float)AmbientTempStat.Max; + tstRslt.AmbientPressAve = (float)AmbientPressureStat.Average; + tstRslt.AmbPressStart = (float)AmbientPressureStat.First; + tstRslt.AmbPressEnd = (float)AmbientPressureStat.Last; + tstRslt.AmbPressMin = (float)AmbientPressureStat.Min; + tstRslt.AmbPressMax = (float)AmbientPressureStat.Max; + tstRslt.AmbientHumiAve = (float)AmbientHumidityStat.Average; + tstRslt.AmbHumiStart = (float)AmbientHumidityStat.First; + tstRslt.AmbHumiEnd = (float)AmbientHumidityStat.Last; + tstRslt.AmbHumiMin = (float)AmbientHumidityStat.Min; + tstRslt.AmbHumiMax = (float)AmbientHumidityStat.Max; + tstRslt.PressUpAvrg = (float)PressureUpStat.Average; + tstRslt.PressUpStart = (float)PressureUpStat.First; + tstRslt.PressUpEnd = (float)PressureUpStat.Last; + tstRslt.PressUpMin = (float)PressureUpStat.Min; + tstRslt.PressUpMax = (float)PressureUpStat.Max; + tstRslt.PressDownAvrg = (float)PressureDownStat.Average; + tstRslt.PressDownStart = (float)PressureDownStat.First; + tstRslt.PressDownEnd = (float)PressureDownStat.Last; + tstRslt.PressDownMin = (float)PressureDownStat.Min; + tstRslt.PressDownMax = (float)PressureDownStat.Max; + tstRslt.TempInAvrg = (float)TempInStat.Average; + tstRslt.TempInStart = (float)TempInStat.First; + tstRslt.TempInEnd = (float)TempInStat.Last; + tstRslt.TempInMin = (float)TempInStat.Min; + tstRslt.TempInMax = (float)TempInStat.Max; + tstRslt.TempOutAvrg = (float)TempOutStat.Average; + tstRslt.TempOutStart = (float)TempOutStat.First; + tstRslt.TempOutEnd = (float)TempOutStat.Last; + tstRslt.TempOutMin = (float)TempOutStat.Min; + tstRslt.TempOutMax = (float)TempOutStat.Max; + tstRslt.TempDivAvrg = (float)TempDivStat.Average; + tstRslt.TempDivStart = (float)TempDivStat.First; + tstRslt.TempDivEnd = (float)TempDivStat.Last; + tstRslt.TempDivMin = (float)TempDivStat.Min; + tstRslt.TempDivMax = (float)TempDivStat.Max; tstRslt.DensityIn = Formulas.WaterDensityFromTemp(tstRslt.TempInAvrg); /// [kg/m3] tstRslt.DensityOut = Formulas.WaterDensityFromTemp(tstRslt.TempOutAvrg); /// [kg/m3] tstRslt.DensityDiv = Formulas.WaterDensityFromTemp(tstRslt.TempDivAvrg); /// [kg/m3] @@ -364,8 +364,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); - tstRslt.FlowMin = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min; - tstRslt.FlowMax = (tstRslt.VolumeMaster != 0) ? (float)(RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max; + tstRslt.FlowMin = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Min * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Min); + tstRslt.FlowMax = (float)((tstRslt.VolumeMaster != 0) ? (RefFlowStat.Max * tstRslt.VolumeCTV / tstRslt.VolumeMaster) : RefFlowStat.Max); /// Update flowmeter constant with the measured one if (outPath.FlowMeter.Idx1 > 0 && outPath.FlowMeter.Idx1 <= ReferenceFlowmetersCount)