Combined meters measurement corrections, Q_rise and Q_fall in results
This commit is contained in:
@@ -321,8 +321,11 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
|
||||
/// Optionally supress pulses from the large water meter
|
||||
if (testParams.SupressTrills)
|
||||
{
|
||||
WMPulses[0] = 0;
|
||||
tstRslt.Meters[0].PulsesMeter = 0;
|
||||
for (int i = 0; i < tstRslt.Meters.Count; i += 2)
|
||||
{
|
||||
WMPulses[i] = 0;
|
||||
tstRslt.Meters[i].PulsesMeter = 0;
|
||||
}
|
||||
}
|
||||
|
||||
///
|
||||
|
||||
+8
-3
@@ -225,7 +225,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
|
||||
}
|
||||
|
||||
int time = StateMachine.Time;
|
||||
int diff = WMPulses[1] - lastWMPulses[1];
|
||||
int diff = WMPulses[(test.Part - 1) * 2 + 1] - lastWMPulses[(test.Part - 1) * 2 + 1];
|
||||
flowsForDetection[0] = cBrd.ReferenceFreq * outPath.FlowMeter.NominalFlow / 2000.0f;
|
||||
pulseFreqsForDetection[0] = (float)diff / (float)(time - lastTime);
|
||||
lastTime = StateMachine.Time;
|
||||
@@ -300,10 +300,12 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
|
||||
if (rvPulse > 0)
|
||||
{
|
||||
Qrise = detectedFlow;
|
||||
tstRslt.QRise = detectedFlow;
|
||||
}
|
||||
else
|
||||
{
|
||||
Qfall = detectedFlow;
|
||||
tstRslt.QFall = detectedFlow;
|
||||
}
|
||||
|
||||
UiBridge.Bridge.OnLog(this, string.Format("detected flow={0}\r\n", detectedFlow.ToString("F2")));
|
||||
@@ -533,8 +535,11 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
|
||||
/// Optionally supress pulses from the large water meter
|
||||
if (testParams.SupressTrills)
|
||||
{
|
||||
WMPulses[0] = 0;
|
||||
tstRslt.Meters[0].PulsesMeter = 0;
|
||||
for (int i = 0; i < tstRslt.Meters.Count; i += 2)
|
||||
{
|
||||
WMPulses[i] = 0;
|
||||
tstRslt.Meters[i].PulsesMeter = 0;
|
||||
}
|
||||
}
|
||||
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user