diff --git a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index a68812a8d..c65350484 100644 --- a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -366,10 +366,10 @@ namespace TBF.BenchControl.TestMethods.LeakTest tstRslt.FlowSetTime = 0; tstRslt.TestTime = Convert.ToDouble(testParams.DurationPMax); /// [s] measurement time tstRslt.PulsesMaster = 0; /// Pulses of the master flow meter (test total) - tstRslt.MassStartRaw = 0; - tstRslt.MassStart = 0; - tstRslt.MassEndRaw = 0; - tstRslt.MassEnd = 0; + tstRslt.MassStartRaw = StartMass.Val; + tstRslt.MassStart = StartMass.Val; + tstRslt.MassEndRaw = EndMass.Val; + tstRslt.MassEnd = EndMass.Val; tstRslt.FlowMass = 0; /// [kg/h] tstRslt.FlowVolume = 0; /// [m3/h] tstRslt.Buoyancy = Config.Formulas.Buoyancy(); @@ -383,12 +383,11 @@ namespace TBF.BenchControl.TestMethods.LeakTest tstRslt.ErrorFlags = 0; - bool pressureDropPassed = (testParams.MaxPressureDrop != 0) ? ((testParams.MaxPressureDrop > 0) ? (PressDownStat.First - PressDownStat.Last < testParams.MaxPressureDrop) - : (PressDownStat.First - PressDownStat.Last > testParams.MaxPressureDrop)) - : true; - bool massIncreasePassed = (testParams.MaxMassIncrease > 0) ? (EndMass.Val - StartMass.Val < testParams.MaxMassIncrease) : true; - bool leakPassed = pressureDropPassed && massIncreasePassed; + bool pressureDropPassed = (testParams.MaxPressureDrop == 0) ? true : ((testParams.MaxPressureDrop > 0) ? (PressDownStat.First - PressDownStat.Last < testParams.MaxPressureDrop) + : (PressDownStat.First - PressDownStat.Last > testParams.MaxPressureDrop)); + bool massIncreasePassed = (testParams.MaxMassIncrease == 0) ? true : (EndMass.Val - StartMass.Val < testParams.MaxMassIncrease); + bool leakPassed = pressureDropPassed && massIncreasePassed; for (int i = 0; i < BatchRslts.WMPositionsCount; i++) {