From 3603d31add34a56db6d8d1d902056a95987ffed6 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 13 Apr 2021 10:42:02 +0200 Subject: [PATCH] SensusTestInfo changes as in v. 2.26.1608 (Australia 169 MHz). --- Results/Output/SensusTestInfo.cs | 54 ++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/Results/Output/SensusTestInfo.cs b/Results/Output/SensusTestInfo.cs index 3d7e7302c..fdeebe9a9 100644 --- a/Results/Output/SensusTestInfo.cs +++ b/Results/Output/SensusTestInfo.cs @@ -9,21 +9,23 @@ namespace Results.Output { public enum LogType { - Just_Q3Q2Q1, /// pNrs = 3,2,1 - Just_Q3Q2Q1_Alt, /// pNrs = 5,2,1 - Just_Q3Q2adjQ1, /// pNrs = 3,2,1 - Just_Q3Q2adjQ1_Alt, /// pNrs = 5,2,1 - DEWA, /// Q4, Q3, Q2adj, Q2, Q1 - DEWA_wo_Q2, /// Q4, Q3, Q2adj, Q1 - Suez, /// Two directions, with Q2 and Q2ac - Suez_smart, /// There is only Q2ac in both directions - Suez_Repeatability, /// 3xQ3, 3xQ2, 3xQ1 - Suez_EMP_DN15, /// EMP: 12 flow rates - Suez_EMP_DN20, /// EMP: 12 flow rates - Suez_EMP_DN32, /// EMP: 12 flow rates - Suez_EMP_DN40, /// EMP: 12 flow rates - Greece, /// Q3, Q2adj, Q2, Q1 - S620, /// Q3, Q100, Q2, Q1 + Just_Q3Q2Q1, /// pNrs = -1,3,2,1 + Just_Q3Q2Q1_Alt, /// pNrs = -1,5,2,1 + Just_Q3Q2adjQ1, /// pNrs = -1,3,2,1 + Just_Q3Q2adjQ1_Alt, /// pNrs = -1,5,2,1 + JustA0A4_Q3Q2adjQ1, /// pNrs = -2,-1,3,2,1 (Australia 169 MHz, raw data pNrs: -2,-1,4,3,2,1) + DEWA, /// Q4, Q3, Q2adj, Q2, Q1 + DEWA_wo_Q2, /// Q4, Q3, Q2adj, Q1 + Suez, /// Two directions, with Q2 and Q2ac + Suez_smart, /// There is only Q2ac in both directions + Suez_Repeatability, /// 3xQ3, 3xQ2, 3xQ1 + Suez_EMP_DN15, /// EMP: 12 flow rates + Suez_EMP_DN20, /// EMP: 12 flow rates + Suez_EMP_DN32, /// EMP: 12 flow rates + Suez_EMP_DN40, /// EMP: 12 flow rates + Greece, /// Q3, Q2adj, Q2, Q1 + S620, /// Q3, Q100, Q2, Q1 + S620_Alt, /// Q3, Q100, Q2, Q1 Count, None, } @@ -264,6 +266,18 @@ namespace Results.Output new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), }; + case LogType.JustA0A4_Q3Q2adjQ1: /// Australia 169 MHz + return new SensusTestInfo[] + { + /// TBF Oracle DB Opto RAW LU logfiles + new SensusTestInfo("Q2adj", 0, "", 3, "03", 3,"Q2adj", Range.R100_110), + new SensusTestInfo("Qjust_A0", -1, "Just", -1, "-1", -1, "Q-1", Range.R95_105), + new SensusTestInfo("Qjust_A4", -2, "Just", -2, "-2", -2, "Q-2", Range.R95_105), + new SensusTestInfo("Q3", 3, "Q3", 4, "04", 4, "Q3", Range.R90_100), + new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), + new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), + }; + case LogType.DEWA: /// DEWA (with Q4 and Q2 after correction) return new SensusTestInfo[] { @@ -417,11 +431,19 @@ namespace Results.Output }; case LogType.S620: + return new SensusTestInfo[] + { + /// TBF Oracle DB Opto RAW LU logfiles + new SensusTestInfo("Q3", 3, "Q3", 3, "04", 3, "Q3", Range.R90_100), + new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), + new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), + }; + + case LogType.S620_Alt: return new SensusTestInfo[] { /// TBF Oracle DB Opto RAW LU logfiles new SensusTestInfo("Q3", 5, "Q3", 5, "04", 5, "Q3", Range.R90_100), - new SensusTestInfo("Q100", 4, "Q100l", 4, "03", 4,"Q100l", Range.R100_110), new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110), new SensusTestInfo("Q1", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110), };