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

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

Browse Source 
This reverts commit be52e2df96.
This commit is contained in:
Milan Hanajik 2016-12-16 13:07:54 +01:00
parent 8a73968f41
commit 89901c75f7
11 changed files with 17 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
View File

@ -43,8 +43,7 @@ namespace TBF.BenchControl.Elde
public StatusP StatusP { get { return controlCom.StatusP; } }
public double ReferenceFreq { get { return controlCom.ReferenceFreq; } } /// In [Hz] 0..2500, nom.=2000
public int EtPulses(int wmNr0) { return (int)controlCom.EtPulses(wmNr0); }
public int EtPulses2 { get { return controlCom.EtPulses2; } }
public UInt16 WMeterPulses(int wmNr0) { return controlCom.WMeterPulses(wmNr0); }
public UInt16 WMeterPulses(int wmNr0) { return controlCom.WMeterPulses(wmNr0); }
public int WMeterReference(int wmNr0) { return controlCom.WMeterReference(wmNr0); }
public uint RegulValveDAC { get { return controlCom.RegulValveDAC; } }
public float Pressure(int prsNr0) { return controlCom.Pressure(prsNr0); }

1
TestBenchFramework/BenchControl/Elde/ControlComSim.cs
View File

@ -25,7 +25,6 @@ namespace TBF.BenchControl.Elde
{
return etPulses[wmNr1and0];
}
public int EtPulses2 { get { return 0; } }
float[] errFactor = new float[Config.Data.WMsCount + 1]; /// Internal
float[] wMeterPulsesF = new float[Config.Data.WMsCount + 1]; /// Internal

5
TestBenchFramework/BenchControl/Elde/IControlCom.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System;
using Dirichlet.Numerics;
@ -11,8 +11,7 @@ namespace TBF.BenchControl.Elde
StatusP StatusP { get; }
float ReferenceFreq { get; }
int EtPulses(int wmNr0);
int EtPulses2 { get; }
UInt16 WMeterPulses(int wmNr0);
UInt16 WMeterPulses(int wmNr0);
int WMeterReference(int wmNr0);
uint RegulValveDAC { get; }
float Pressure(int prsNr0);

10
TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
View File

@ -316,14 +316,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
/// 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.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStart = 0;
tstRslt.MassEnd = 0;
tstRslt.FlowMass = 0; /// [kg/h]
tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * cBrd.EtPulses(0) / tstRslt.TestTime; /// [m3/h]

10
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
View File

@ -630,14 +630,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
/// 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.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
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);

8
TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
View File

@ -331,13 +331,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
/// 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.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = 0;
tstRslt.MassStart = 0;
tstRslt.MassEndRaw = 0;

10
TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
View File

@ -534,14 +534,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
/// 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.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
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

8
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
View File

@ -721,13 +721,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
/// 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.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = StartMass.Val;
tstRslt.MassStart = massStart;
tstRslt.MassEndRaw = EndMass.Val;

10
TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
View File

@ -442,14 +442,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
/// 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.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
tstRslt.MassStartRaw = 0;
tstRslt.MassStart = 0;
tstRslt.MassEndRaw = 0;
tstRslt.MassEnd = 0;

10
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -699,14 +699,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
/// 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.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
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);

10
TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
View File

@ -360,14 +360,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
tstRslt.EndTime = TestEndTime;
tstRslt.FlowSetTime = flowSetTime;
tstRslt.TestTime = cBrd.TTime; /// [s] measurement time
/// 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.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total)
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);