From 7d1d9b10514759f34a177af464d3ab28c15b8f21 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 29 Jul 2021 12:30:47 +0200 Subject: [PATCH] MeterTestRslt.CalibFactor / CalibFactorLNA / Q2CorrRL / Q2CorrLR / FlowDirection added and mapped to results database --- Results/Entities/MeterTestRslt.cs | 29 +++++++++++++++++-- Results/Mappings/MeterTestRsltMap.cs | 5 ++++ .../TestMethods/FlyingStart/FlyingStartSeq.cs | 4 +++ .../FlyingStartMassCollProlongedSeq.cs | 4 +++ .../FlyingStartMassCollectionSeq.cs | 6 +++- 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/Results/Entities/MeterTestRslt.cs b/Results/Entities/MeterTestRslt.cs index 03ebb92fb..82afdf9dc 100644 --- a/Results/Entities/MeterTestRslt.cs +++ b/Results/Entities/MeterTestRslt.cs @@ -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(); diff --git a/Results/Mappings/MeterTestRsltMap.cs b/Results/Mappings/MeterTestRsltMap.cs index 1bb53fb5d..6a3568340 100644 --- a/Results/Mappings/MeterTestRsltMap.cs +++ b/Results/Mappings/MeterTestRsltMap.cs @@ -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); diff --git a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index feb22365d..a92e8783b 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -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]; diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs index ad9fbc6eb..03eae7630 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs @@ -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]; diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 3420f078a..21b7b79a5 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -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];