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

Conductivity bug fixes, DB import/export works OK with root user password.

Browse Source
This commit is contained in:
Milan Hanajik
2020-05-11 14:31:54 +02:00
parent 3cbc845183
commit 435261831a
12 changed files with 93 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Sequences/ProcessData.cs
+1 -1
View File
@@ -182,7 +182,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 FloatBox Conductivity = new FloatBox(750) { Name = "Conductivity", Format = "F0" }; /// [uS/cm], default is 750
public static double LtrPerRefPulse; /// to calculate the ref.volume
public static int RefPulses;
TBF/BenchControl/Sequences/SequenceBase.cs
+6
View File
@@ -1503,6 +1503,8 @@ namespace TBF.BenchControl.Sequences
tstRslt.TempUpMax = 20.0f;
tstRslt.TempDownMax = 20.0f;
tstRslt.TempDivMax = 20.0f;
tstRslt.ConductMin = Conductivity.Val;
tstRslt.ConductMax = Conductivity.Val;
tstRslt.DensityIn = Config.Formulas.RealDensity();
tstRslt.DensityLine = Config.Formulas.RealDensity();
@@ -1638,6 +1640,8 @@ namespace TBF.BenchControl.Sequences
tstRslt.TempUpMax = 20.0f;
tstRslt.TempDownMax = 20.0f;
tstRslt.TempDivMax = 20.0f;
tstRslt.ConductMin = Conductivity.Val;
tstRslt.ConductMax = Conductivity.Val;
tstRslt.FlowMean = (float)RefFlowStat.Average;
tstRslt.FlowStart = (float)RefFlowStat.First;
@@ -1767,6 +1771,8 @@ namespace TBF.BenchControl.Sequences
tstRslt.TempUpMax = 20.0f;
tstRslt.TempDownMax = 20.0f;
tstRslt.TempDivMax = 20.0f;
tstRslt.ConductMin = Conductivity.Val;
tstRslt.ConductMax = Conductivity.Val;
tstRslt.FlowMean = 0; /// TODO
tstRslt.FlowMax = 0; /// TODO