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

MeterTestRslt.CalibFactor / CalibFactorLNA / Q2CorrRL / Q2CorrLR / FlowDirection added and mapped to results database

Browse Source
This commit is contained in:
Milan Hanajik 2021-07-29 12:30:47 +02:00
parent c4ca299ce2
commit 7d1d9b1051
5 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Results/Entities/MeterTestRslt.cs
View File

@ -30,6 +30,11 @@ namespace Results.Entities
public virtual bool TestDone { get; set; } /// true = test was completed
public virtual bool Passed { get; set; } /// true = test passed, water meter is OK
#if IPERL
public virtual int CalibFactor { get; set; }
public virtual int CalibFactorLNA { get; set; }
public virtual int Q2CorrRL { get; set; }
public virtual int Q2CorrLR { get; set; }
public virtual int FlowDirection { get; set; } /// 0=unknown, 1=RL, 2=LR
public virtual string ExtraDataPath { get; set; } /// Relative path to a file with opto-data/raw-data
public virtual float X1 { get; set; }
public virtual float X2 { get; set; }
@ -152,7 +157,12 @@ namespace Results.Entities
TestDone = oriMTR.TestDone;
Passed = oriMTR.Passed;
#if IPERL
ExtraDataPath = oriMTR.ExtraDataPath;
CalibFactor = oriMTR.CalibFactor;
CalibFactorLNA = oriMTR.CalibFactorLNA;
Q2CorrRL = oriMTR.Q2CorrRL;
Q2CorrLR = oriMTR.Q2CorrLR;
FlowDirection = oriMTR.FlowDirection;
ExtraDataPath = oriMTR.ExtraDataPath;
X1 = oriMTR.X1;
X2 = oriMTR.X2;
X3 = oriMTR.X3;
@ -191,7 +201,12 @@ namespace Results.Entities
TestDone = src.TestDone;
Passed = src.Passed;
#if IPERL
ExtraDataPath = src.ExtraDataPath;
CalibFactor = src.CalibFactor;
CalibFactorLNA = src.CalibFactorLNA;
Q2CorrRL = src.Q2CorrRL;
Q2CorrLR = src.Q2CorrLR;
FlowDirection = src.FlowDirection;
ExtraDataPath = src.ExtraDataPath;
X1 = src.X1;
X2 = src.X2;
X3 = src.X3;
@ -234,6 +249,11 @@ namespace Results.Entities
writer.Write(TestDone);
writer.Write(Passed);
#if IPERL
writer.Write(CalibFactor);
writer.Write(CalibFactorLNA);
writer.Write(Q2CorrRL);
writer.Write(Q2CorrLR);
writer.Write(FlowDirection);
writer.Write((ExtraDataPath != null) ? ExtraDataPath : string.Empty);
writer.Write(X1);
writer.Write(X2);
@ -274,6 +294,11 @@ namespace Results.Entities
TestDone = reader.ReadBoolean();
Passed = reader.ReadBoolean();
#if IPERL
CalibFactor = reader.ReadInt32();
CalibFactorLNA = reader.ReadInt32();
Q2CorrRL = reader.ReadInt32();
Q2CorrLR = reader.ReadInt32();
FlowDirection = reader.ReadInt32();
ExtraDataPath = reader.ReadString();
X1 = reader.ReadSingle();
X2 = reader.ReadSingle();

5
Results/Mappings/MeterTestRsltMap.cs
View File

@ -27,6 +27,11 @@ namespace Results.Mappings
Map(x => x.TestDone);
Map(x => x.Passed);
#if IPERL
Map(x => x.CalibFactor);
Map(x => x.CalibFactorLNA);
Map(x => x.Q2CorrRL);
Map(x => x.Q2CorrLR);
Map(x => x.FlowDirection);
Map(x => x.ExtraDataPath);
Map(x => x.X1);
Map(x => x.X2);

4
TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
View File

@ -619,6 +619,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
}
#if IPERL
meterRslt.WaterMeter.CalibFactor = iPerl.CalibFactor;
meterRslt.CalibFactor = iPerl.CalibFactor;
meterRslt.CalibFactorLNA = iPerl.CalibFactorLNA;
meterRslt.Q2CorrRL = iPerl.Q2CorrRL;
meterRslt.Q2CorrLR = iPerl.Q2CorrLR;
meterRslt.ExtraDataPath = iPerl.ExtraDataPath;
if (TestMethods.iPerlCommunication.iPerlHead.IperlHead.FeatureVectorSize >= 1) meterRslt.X1 = iPerl.X[0];
if (TestMethods.iPerlCommunication.iPerlHead.IperlHead.FeatureVectorSize >= 2) meterRslt.X2 = iPerl.X[1];

4
TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
View File

@ -1028,6 +1028,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
}
#if IPERL
meterRslt.WaterMeter.CalibFactor = iPerl.CalibFactor;
meterRslt.CalibFactor = iPerl.CalibFactor;
meterRslt.CalibFactorLNA = iPerl.CalibFactorLNA;
meterRslt.Q2CorrRL = iPerl.Q2CorrRL;
meterRslt.Q2CorrLR = iPerl.Q2CorrLR;
meterRslt.ExtraDataPath = iPerl.ExtraDataPath;
if (TestMethods.iPerlCommunication.iPerlHead.IperlHead.FeatureVectorSize >= 1) meterRslt.X1 = iPerl.X[0];
if (TestMethods.iPerlCommunication.iPerlHead.IperlHead.FeatureVectorSize >= 2) meterRslt.X2 = iPerl.X[1];

6
TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -954,7 +954,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
}
#if IPERL
meterRslt.WaterMeter.CalibFactor = iPerl.CalibFactor;
meterRslt.ExtraDataPath = iPerl.ExtraDataPath;
meterRslt.CalibFactor = iPerl.CalibFactor;
meterRslt.CalibFactorLNA = iPerl.CalibFactorLNA;
meterRslt.Q2CorrRL = iPerl.Q2CorrRL;
meterRslt.Q2CorrLR = iPerl.Q2CorrLR;
meterRslt.ExtraDataPath = iPerl.ExtraDataPath;
if (TestMethods.iPerlCommunication.iPerlHead.IperlHead.FeatureVectorSize >= 1) meterRslt.X1 = iPerl.X[0];
if (TestMethods.iPerlCommunication.iPerlHead.IperlHead.FeatureVectorSize >= 2) meterRslt.X2 = iPerl.X[1];
if (TestMethods.iPerlCommunication.iPerlHead.IperlHead.FeatureVectorSize >= 3) meterRslt.X3 = iPerl.X[2];