michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Elde.FlowMeterTwins bug-fix in calculation of ref. pulses and flow.

Browse Source
This commit is contained in:
Milan Hanajik
2016-12-12 16:43:04 +01:00
parent 72418d802c
commit be52e2df96
12 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+8 -2
View File
@@ -316,8 +316,14 @@ namespace TBF.BenchControl.TestMethods.Adjustment
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStart = 0;
/// Pulses of the master flow meter (test total)
if (outPath.FlowMeter is Elde.FlowMeterTwins.FlowMeter)
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0) + cBrd.EtPulses2);
else
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0));
tstRslt.MassStart = 0;
tstRslt.MassEnd = 0;
tstRslt.FlowMass = 0; /// [kg/h]
tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * cBrd.EtPulses(0) / tstRslt.TestTime; /// [m3/h]
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+8 -2
View File
@@ -630,8 +630,14 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = StartMass.Val;
/// Pulses of the master flow meter (test total)
if (outPath.FlowMeter is Elde.FlowMeterTwins.FlowMeter)
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0) + cBrd.EtPulses2);
else
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0));
tstRslt.MassStartRaw = StartMass.Val;
tstRslt.MassStart = Formulas.CorrectedValue(tstRslt.MassStartRaw, outPath.Balance.Corrections);
tstRslt.MassEndRaw = EndMass.Val;
tstRslt.MassEnd = Formulas.CorrectedValue(tstRslt.MassEndRaw, outPath.Balance.Corrections);
TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
+7 -1
View File
@@ -331,7 +331,13 @@ namespace TBF.BenchControl.TestMethods.Endurance
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
/// Pulses of the master flow meter (test total)
if (outPath.FlowMeter is Elde.FlowMeterTwins.FlowMeter)
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0) + cBrd.EtPulses2);
else
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0));
tstRslt.MassStartRaw = 0;
tstRslt.MassStart = 0;
tstRslt.MassEndRaw = 0;
TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
+8 -2
View File
@@ -534,8 +534,14 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = StartMass.Val;
/// Pulses of the master flow meter (test total)
if (outPath.FlowMeter is Elde.FlowMeterTwins.FlowMeter)
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0) + cBrd.EtPulses2);
else
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0));
tstRslt.MassStartRaw = StartMass.Val;
tstRslt.MassStart = massStart; /// [kg] calculated before displaying 'End state' dialog
tstRslt.MassEndRaw = EndMass.Val;
tstRslt.MassEnd = massEnd; /// [kg] calculated before displaying 'End state' dialog
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+7 -1
View File
@@ -721,7 +721,13 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
/// Pulses of the master flow meter (test total)
if (outPath.FlowMeter is Elde.FlowMeterTwins.FlowMeter)
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0) + cBrd.EtPulses2);
else
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0));
tstRslt.MassStartRaw = StartMass.Val;
tstRslt.MassStart = massStart;
tstRslt.MassEndRaw = EndMass.Val;
TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+8 -2
View File
@@ -442,8 +442,14 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = 0;
/// Pulses of the master flow meter (test total)
if (outPath.FlowMeter is Elde.FlowMeterTwins.FlowMeter)
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0) + cBrd.EtPulses2);
else
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0));
tstRslt.MassStartRaw = 0;
tstRslt.MassStart = 0;
tstRslt.MassEndRaw = 0;
tstRslt.MassEnd = 0;
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+8 -2
View File
@@ -699,8 +699,14 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = StartMass.Val;
/// Pulses of the master flow meter (test total)
if (outPath.FlowMeter is Elde.FlowMeterTwins.FlowMeter)
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0) + cBrd.EtPulses2);
else
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0));
tstRslt.MassStartRaw = StartMass.Val;
tstRslt.MassStart = Formulas.CorrectedValue(tstRslt.MassStartRaw, outPath.Balance.Corrections);
tstRslt.MassEndRaw = EndMass.Val;
tstRslt.MassEnd = Formulas.CorrectedValue(tstRslt.MassEndRaw, outPath.Balance.Corrections);
TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+8 -2
View File
@@ -360,8 +360,14 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = StartMass.Val;
/// Pulses of the master flow meter (test total)
if (outPath.FlowMeter is Elde.FlowMeterTwins.FlowMeter)
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0) + cBrd.EtPulses2);
else
tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0));
tstRslt.MassStartRaw = StartMass.Val;
tstRslt.MassStart = Formulas.CorrectedValue(tstRslt.MassStartRaw, outPath.Balance.Corrections);
tstRslt.MassEndRaw = EndMass.Val;
tstRslt.MassEnd = Formulas.CorrectedValue(tstRslt.MassEndRaw, outPath.Balance.Corrections);