TestMethods.LeakTest : Start and End mass saved to test result.

This commit is contained in:
Milan Hanajik
2019-05-30 08:32:37 +02:00
parent 0c72e76ecc
commit 2382ceea73
@@ -366,10 +366,10 @@ namespace TBF.BenchControl.TestMethods.LeakTest
tstRslt.FlowSetTime = 0; tstRslt.FlowSetTime = 0;
tstRslt.TestTime = Convert.ToDouble(testParams.DurationPMax); /// [s] measurement time tstRslt.TestTime = Convert.ToDouble(testParams.DurationPMax); /// [s] measurement time
tstRslt.PulsesMaster = 0; /// Pulses of the master flow meter (test total) tstRslt.PulsesMaster = 0; /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = 0; tstRslt.MassStartRaw = StartMass.Val;
tstRslt.MassStart = 0; tstRslt.MassStart = StartMass.Val;
tstRslt.MassEndRaw = 0; tstRslt.MassEndRaw = EndMass.Val;
tstRslt.MassEnd = 0; tstRslt.MassEnd = EndMass.Val;
tstRslt.FlowMass = 0; /// [kg/h] tstRslt.FlowMass = 0; /// [kg/h]
tstRslt.FlowVolume = 0; /// [m3/h] tstRslt.FlowVolume = 0; /// [m3/h]
tstRslt.Buoyancy = Config.Formulas.Buoyancy(); tstRslt.Buoyancy = Config.Formulas.Buoyancy();
@@ -383,12 +383,11 @@ namespace TBF.BenchControl.TestMethods.LeakTest
tstRslt.ErrorFlags = 0; tstRslt.ErrorFlags = 0;
bool pressureDropPassed = (testParams.MaxPressureDrop != 0) ? ((testParams.MaxPressureDrop > 0) ? (PressDownStat.First - PressDownStat.Last < testParams.MaxPressureDrop) bool pressureDropPassed = (testParams.MaxPressureDrop == 0) ? true : ((testParams.MaxPressureDrop > 0) ? (PressDownStat.First - PressDownStat.Last < testParams.MaxPressureDrop)
: (PressDownStat.First - PressDownStat.Last > testParams.MaxPressureDrop)) : (PressDownStat.First - PressDownStat.Last > testParams.MaxPressureDrop));
: true; bool massIncreasePassed = (testParams.MaxMassIncrease == 0) ? true : (EndMass.Val - StartMass.Val < testParams.MaxMassIncrease);
bool massIncreasePassed = (testParams.MaxMassIncrease > 0) ? (EndMass.Val - StartMass.Val < testParams.MaxMassIncrease) : true;
bool leakPassed = pressureDropPassed && massIncreasePassed;
bool leakPassed = pressureDropPassed && massIncreasePassed;
for (int i = 0; i < BatchRslts.WMPositionsCount; i++) for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{ {