Bug fix : Updating water meters results in case of test with 'parts'.

This commit is contained in:
Milan Hanajik
2016-06-30 12:55:35 +02:00
parent 9d56836c80
commit 799fda63e9
10 changed files with 47 additions and 17 deletions
@@ -298,8 +298,11 @@ namespace TBF.BenchControl.TestMethods.Adjustment
tstRslt.VolumeCTV = tstRslt.ConstMaster * tstRslt.PulsesMaster; /// [l] 1000.0f is because density is in [kg/m3]
tstRslt.ErrorMaster = 0.0f; /// Cannot be determined without the collected water mass measurement
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
@@ -394,7 +394,10 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter
tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
@@ -570,7 +570,10 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter
tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
@@ -526,8 +526,11 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter
tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
BenchControl.Elde.FixedStartRegisterReader.RegisterReader regReader =
sensPath.RegisterReaders[i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
@@ -536,8 +536,11 @@ namespace TBF.BenchControl.TestMethods.FixedStartCombinedMeters
tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter
tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
@@ -525,8 +525,11 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter
tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
BenchControl.Elde.FixedStartRegisterReader.RegisterReader regReader =
sensPath.RegisterReaders[i] as BenchControl.Elde.FixedStartRegisterReader.RegisterReader;
@@ -273,8 +273,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
tstRslt.VolumeCTV = tstRslt.ConstMaster * tstRslt.PulsesMaster; /// [l] 1000.0f is because density is in [kg/m3]
tstRslt.ErrorMaster = 0.0; /// Cannot be determined without a mass measurement
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
WaterMeters.iPerl.WaterMeter iPerl = regReader as WaterMeters.iPerl.WaterMeter;
@@ -503,8 +503,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter
tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
WaterMeters.iPerl.WaterMeter iPerl = regReader as WaterMeters.iPerl.WaterMeter;
@@ -324,7 +324,10 @@ namespace TBF.BenchControl.TestMethods.LeakTest
tstRslt.ConstMaster = 0; /// Convert the flow to [m3/h]
tstRslt.ErrorMaster = 0;
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
if (StateMachine.Procedure.MetersKind == MetersKind.Single)
{
@@ -238,8 +238,11 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
tstRslt.ConstMaster = 0; /// Convert the flow to [m3/h]
tstRslt.ErrorMaster = 0;
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
{
int from = (test.Part == 0) ? 0 : (test.Part - 1);
int to = (test.Part == 0) ? (BatchRslts.WMPositionsCount - 1) : (test.Part - 1);
///
for (int i = from; i <= to; i++)
{
if (StateMachine.Procedure.MetersKind == MetersKind.Single)
{
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);