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

Conductivity is monitored.

Browse Source
This commit is contained in:
Milan Hanajik
2020-05-04 15:15:43 +02:00
parent e7431ce6e2
commit 05f72bc9f7
10 changed files with 459 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Sequences/ProcessData.cs
+5
View File
@@ -181,6 +181,7 @@ namespace TBF.BenchControl.Sequences
public static FloatBox PressUp = new FloatBox() { Name = "Pressure Up", Format = "F2" }; /// [bar]
public static FloatBox PressDown = new FloatBox() { Name = "Pressure Dn", Format = "F2" }; /// [bar]
public static FloatBox PressDelta = new FloatBox() { Name = "Pressure Delta", Format = "F2" }; /// [bar]
public static FloatBox Conductivity = new FloatBox() { Name = "Conductivity", Format = "F0" }; /// [uS/cm]
public static double LtrPerRefPulse; /// to calculate the ref.volume
public static int RefPulses;
@@ -238,6 +239,7 @@ namespace TBF.BenchControl.Sequences
public static Statistics PressUpStat = new Statistics(3, 4, true, new Plotter("Pressure up"));
public static Statistics PressDownStat = new Statistics(3, 4, true, new Plotter("Pressure down"));
public static Statistics PressDeltaStat = new Statistics(3, 4, true);
public static Statistics ConductStat = new Statistics(0, 4, true, new Plotter("Conductivity"));
public static Statistics RefFlowStat = new Statistics(5, 7, true, new Plotter("Flow"));
public static Statistics TempRefHiStat = new Statistics();
@@ -268,6 +270,7 @@ namespace TBF.BenchControl.Sequences
PressUpStat.Start (batchNr, testName, repetition, skippedSamplesCount);
PressDownStat.Start (batchNr, testName, repetition, skippedSamplesCount);
PressDeltaStat.Start(batchNr, testName, repetition, skippedSamplesCount);
ConductStat.Start (batchNr, testName, repetition, skippedSamplesCount);
RefFlowStat.Start (batchNr, testName, repetition, skippedSamplesCount);
TempRefHiStat.Start (batchNr, testName, repetition);
@@ -292,6 +295,7 @@ namespace TBF.BenchControl.Sequences
PressUpStat.Update(PressUp);
PressDownStat.Update(PressDown);
PressDeltaStat.Update(PressDelta);
ConductStat.Update(Conductivity);
RefFlowStat.Update(RefFlow);
if (BatchRslts.Batch.HeatMeter)
@@ -316,6 +320,7 @@ namespace TBF.BenchControl.Sequences
PressUpStat.Stop();
PressDownStat.Stop();
PressDeltaStat.Stop();
ConductStat.Stop();
RefFlowStat.Stop();
TempRefHiStat.Stop();
TBF/BenchControl/Sequences/SequenceBase.cs
+5
View File
@@ -1145,6 +1145,11 @@ namespace TBF.BenchControl.Sequences
tstRslt.PressDeltaEnd = (float)PressDeltaStat.Last;
tstRslt.PressDeltaMin = (float)PressDeltaStat.Min;
tstRslt.PressDeltaMax = (float)PressDeltaStat.Max;
tstRslt.ConductMean = (float)ConductStat.Average;
tstRslt.ConductStart = (float)ConductStat.First;
tstRslt.ConductEnd = (float)ConductStat.Last;
tstRslt.ConductMin = (float)ConductStat.Min;
tstRslt.ConductMax = (float)ConductStat.Max;
tstRslt.TempUpMean = (float)TempUpStat.Average;
tstRslt.TempUpStart = (float)TempUpStat.First;
tstRslt.TempUpEnd = (float)TempUpStat.Last;