diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs index 0a2514a86..18a8c3de4 100644 --- a/Results/Entities/TestRslt.cs +++ b/Results/Entities/TestRslt.cs @@ -89,6 +89,7 @@ namespace Results.Entities public virtual float FlowStart { get; set; } /// [m3/h] flow at the start of test from the reference flowmeter public virtual float FlowEnd { get; set; } /// [m3/h] flow at the end of test from the reference flowmeter public virtual float FlowMean { get; set; } /// [m3/h] mean flow from the reference flowmeter + public virtual float FlowMin { get; set; } /// [m3/h] not mapped to DB public virtual float FlowMax { get; set; } /// [m3/h] public virtual float Custom1 { get; set; } /// [°C] T ref hi mean diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index c004d21f7..6db063a11 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -307,7 +307,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment tstRslt.ErrorMaster = 0.0f; /// Cannot be determined without the collected water mass measurement tstRslt.FlowMean = (float)RefFlowStat.Average; - tstRslt.FlowMax = (float)RefFlowStat.Max; + tstRslt.FlowMin = (float)RefFlowStat.Min; + tstRslt.FlowMax = (float)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 c3867c07d..97d2cf1d6 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -623,7 +623,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); tstRslt.FlowMean = (float)RefFlowStat.Average; - tstRslt.FlowMax = (float)RefFlowStat.Max; + tstRslt.FlowMin = (float)RefFlowStat.Min; + tstRslt.FlowMax = (float)RefFlowStat.Max; for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index 31a87ccf2..7b224e7a6 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -324,7 +324,8 @@ namespace TBF.BenchControl.TestMethods.Endurance tstRslt.ErrorMaster = 0.0; /// Cannot be determined without a mass measurement tstRslt.FlowMean = (float)RefFlowStat.Average; - tstRslt.FlowMax = (float)RefFlowStat.Max; + tstRslt.FlowMin = (float)RefFlowStat.Min; + tstRslt.FlowMax = (float)RefFlowStat.Max; /// /// Single meters diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index e7bb906b6..0057d0587 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -523,7 +523,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); tstRslt.FlowMean = (float)RefFlowStat.Average; - tstRslt.FlowMax = (float)RefFlowStat.Max; + tstRslt.FlowMin = (float)RefFlowStat.Min; + tstRslt.FlowMax = (float)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 da0af1d14..7acddc95f 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -771,7 +771,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); tstRslt.FlowMean = (float)RefFlowStat.Average; - tstRslt.FlowMax = (float)RefFlowStat.Max; + tstRslt.FlowMin = (float)RefFlowStat.Min; + tstRslt.FlowMax = (float)RefFlowStat.Max; if (compound) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index b079c7d48..a19e12e85 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -434,7 +434,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart tstRslt.ErrorMaster = 0.0; /// Cannot be determined without a mass measurement tstRslt.FlowMean = (float)RefFlowStat.Average; - tstRslt.FlowMax = (float)RefFlowStat.Max; + tstRslt.FlowMin = (float)RefFlowStat.Min; + tstRslt.FlowMax = (float)RefFlowStat.Max; if (compoundTestParams != null) { diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 1b1d87a8e..947a90dbc 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -730,7 +730,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); tstRslt.FlowMean = (float)RefFlowStat.Average; - tstRslt.FlowMax = (float)RefFlowStat.Max; + tstRslt.FlowMin = (float)RefFlowStat.Min; + tstRslt.FlowMax = (float)RefFlowStat.Max; if (compoundTestParams != null) { diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index 5b95710bc..8654fe72e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -325,7 +325,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); tstRslt.FlowMean = (float)RefFlowStat.Average; - tstRslt.FlowMax = (float)RefFlowStat.Max; + tstRslt.FlowMin = (float)RefFlowStat.Min; + tstRslt.FlowMax = (float)RefFlowStat.Max; /// Update flowmeter constant with the measured one if (outPath.FlowMeter.Idx1 > 0 && outPath.FlowMeter.Idx1 <= ReferenceFlowmetersCount)