Bug-fixes in FlyingStart and FlyingStartMassCollection heat meters, T ref warm and T ref cold statistics, ver. 2.10.362

This commit is contained in:
Milan Hanajik
2016-10-12 01:23:38 +02:00
parent 2057cc6b73
commit dddfc4bed5
8 changed files with 209 additions and 49 deletions
@@ -259,6 +259,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
.AddOperation(outPath.TempDiv.ReadTempOp(ref TempDiv))
.AddOperation(benchPath.PressIn.ReadPressureOp(ref PressureUp))
.AddOperation(benchPath.PressOut.ReadPressureOp(ref PressureDown))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefWarm1))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefWarm2))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefCold1))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefCold2))
.AddOperation((StateMachine.Ambient != null)
? StateMachine.Ambient.ReadAmbientOp(AmbientTemp, AmbientPressure, AmbientHumidity) : null)
.AddOperations(measureOperations)
@@ -298,6 +302,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
.AddOperation(outPath.TempDiv.ReadTempOp(ref TempDiv))
.AddOperation(benchPath.PressIn.ReadPressureOp(ref PressureUp))
.AddOperation(benchPath.PressOut.ReadPressureOp(ref PressureDown))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm1.ReadTempOp(ref TempRefWarm1))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefWarm2.ReadTempOp(ref TempRefWarm2))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold1.ReadTempOp(ref TempRefCold1))
.AddOperation(heatMetersPath == null ? null : heatMetersPath.TMeterRefCold2.ReadTempOp(ref TempRefCold2))
.AddOperation((StateMachine.Ambient != null)
? StateMachine.Ambient.ReadAmbientOp(AmbientTemp, AmbientPressure, AmbientHumidity)
: null)
@@ -453,6 +461,17 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
///
tstRslt.RefEnergy = Energy.Sum * tstRslt.VolumeCTV / VolumeForEnergy.Sum; /// [J] = [J] * [l] / [l]
tstRslt.Custom1 = (float)TempRefWarmStat.Average;
tstRslt.Custom2 = (float)TempRefWarmStat.First;
tstRslt.Custom3 = (float)TempRefWarmStat.Last;
tstRslt.Custom4 = (float)TempRefWarmStat.Min;
tstRslt.Custom5 = (float)TempRefWarmStat.Max;
tstRslt.Custom6 = (float)TempRefColdStat.Average;
tstRslt.Custom7 = (float)TempRefColdStat.First;
tstRslt.Custom8 = (float)TempRefColdStat.Last;
tstRslt.Custom9 = (float)TempRefColdStat.Min;
tstRslt.Custom10 = (float)TempRefColdStat.Max;
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{
if (test.Part != 0 && test.Part != Utils.PartNr(i + 1, BatchRslts.Batch.Compound)) continue;