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

DEWA : (1) Modification of SensusTestInfo, (2) Minor Q2 correction change, ver. 2.18.1194

Browse Source
This commit is contained in:
Milan Hanajik 2019-04-15 08:24:37 +02:00
parent 51d28fc5a9
commit 208510921a
3 changed files with 99 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
TBF/BenchControl/Output/SensusTestInfo.cs
View File

@ -171,6 +171,7 @@ namespace TBF.BenchControl.Output
case LogType.Just_Q3Q2Q1: /// Standard R160, R250, R400
return new SensusTestInfo[]
{
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Adjustment", -1, "Just", -1, "-1", -1, "Just", Range.R95_105),
new SensusTestInfo("Q3", 3, "Q3", 3, "03", 3, "Q3", Range.R90_100),
new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110),
@ -180,6 +181,7 @@ namespace TBF.BenchControl.Output
case LogType.Just_Q3Q2Q1_Alt: /// Alternative R160, R250, R400
return new SensusTestInfo[]
{
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Adjustment", -1, "Just", -1, "-1", -1, "Just", Range.R95_105),
new SensusTestInfo("Q3", 5, "Q3", 5, "05", 5, "Q3", Range.R90_100),
new SensusTestInfo("Q2", 2, "Q2", 2, "02", 2, "Q2", Range.R100_110),
@ -189,6 +191,7 @@ namespace TBF.BenchControl.Output
case LogType.Just_Q3Q2adjQ1: /// Standard R800
return new SensusTestInfo[]
{
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Q2adj", 0, "", 2, "02", 0, "", Range.R100_110),
new SensusTestInfo("Adjustment", -1, "Just", -1, "-1", -1, "Just", Range.R95_105),
new SensusTestInfo("Q3", 3, "Q3", 3, "03", 3, "Q3", Range.R90_100),
@ -199,6 +202,7 @@ namespace TBF.BenchControl.Output
case LogType.Just_Q3Q2adjQ1_Alt: /// Alternative R800
return new SensusTestInfo[]
{
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Q2adj", 0, "", 2, "02", 0, "", Range.R100_110),
new SensusTestInfo("Adjustment", -1, "Just", -1, "-1", -1, "Just", Range.R95_105),
new SensusTestInfo("Q3", 5, "Q3", 5, "05", 5, "Q3", Range.R90_100),
@ -209,122 +213,130 @@ namespace TBF.BenchControl.Output
case LogType.DEWA: /// DEWA (with Q4 and Q2 after correction)
return new SensusTestInfo[]
{
new SensusTestInfo("Adjustment", -1, "Just", -1, "-1", -1, "Just", Range.R95_105),
new SensusTestInfo("Q4", 5, "Q4", 5, "05", 5, "Q4", Range.R90_100),
new SensusTestInfo("Q3", 4, "Q3", 4, "04", 4, "Q3", Range.R90_100),
new SensusTestInfo("Q2adj", 3, "Q2", 3, "03", 3, "Q2", 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),
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Adjustment", -1, "Just", -1, "-1", -1, "Q-1", Range.R95_105),
new SensusTestInfo("Q4", 5, "Q4", 5, "05", 10, "Q10", Range.R90_100),
new SensusTestInfo("Q3", 4, "Q3", 4, "04", 9, "Q9", Range.R90_100),
new SensusTestInfo("Q2adj", 3, "Q2", 3, "03", 8, "Q8", Range.R100_110),
new SensusTestInfo("Q2", 2, "Q2ac", 2, "02", 7, "Q7", Range.R100_110),
new SensusTestInfo("Q1", 1, "Q1", 1, "01", 6, "Q6", Range.R100_110),
};
case LogType.Suez:
return new SensusTestInfo[] /// SUEZ (2 directions)
{
new SensusTestInfo("Qjust_A0", -1, "Just", -1, "-1", -1, "Just", Range.R95_105),
new SensusTestInfo("Qjust_A4", -2, "Just", -2, "-2", -2, "Just", Range.R95_105),
new SensusTestInfo("Q3_rl", 10, "Q3", 10, "10", 10, "Q3", Range.R90_100),
new SensusTestInfo("Q2_rl", 8, "Q2", 8, "08", 8, "Q2", Range.R100_110),
new SensusTestInfo("Q2ac_rl", 7, "Q2ac", 7, "07", 7, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_rl", 6, "Q1", 6, "06", 6, "Q1", Range.R100_110),
new SensusTestInfo("Q3_lr", 5, "Q3", 5, "05", 5, "Q3", Range.R90_100),
new SensusTestInfo("Q2_lr", 3, "Q2", 3, "03", 3, "Q2", Range.R100_110),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Qjust_A0", -1, "Just", -1, "-1", -1, "Just", Range.R95_105),
new SensusTestInfo("Qjust_A4", -2, "Just", -2, "-2", -2, "Just", Range.R95_105),
new SensusTestInfo("Q3_rl", 10, "Q3", 10, "10", 10, "Q3", Range.R90_100),
new SensusTestInfo("Q2_rl", 8, "Q2", 8, "08", 8, "Q2", Range.R100_110),
new SensusTestInfo("Q2ac_rl", 7, "Q2ac", 7, "07", 7, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_rl", 6, "Q1", 6, "06", 6, "Q1", Range.R100_110),
new SensusTestInfo("Q3_lr", 5, "Q3", 5, "05", 5, "Q3", Range.R90_100),
new SensusTestInfo("Q2_lr", 3, "Q2", 3, "03", 3, "Q2", Range.R100_110),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_smart:
return new SensusTestInfo[] /// SUEZ (2 directions)
{
new SensusTestInfo("Qjust_A0", -1, "Just", -1, "-1", -1, "Just", Range.R95_105),
new SensusTestInfo("Qjust_A4", -2, "Just", -2, "-2", -2, "Just", Range.R95_105),
new SensusTestInfo("Q3_rl", 10, "Q3", 10, "10", 10, "Q3", Range.R90_100),
new SensusTestInfo("Q2ac_rl", 7, "Q2ac", 7, "07", 7, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_rl", 6, "Q1", 6, "06", 6, "Q1", Range.R100_110),
new SensusTestInfo("Q3_lr", 5, "Q3", 5, "05", 5, "Q3", Range.R90_100),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Qjust_A0", -1, "Just", -1, "-1", -1, "Just", Range.R95_105),
new SensusTestInfo("Qjust_A4", -2, "Just", -2, "-2", -2, "Just", Range.R95_105),
new SensusTestInfo("Q3_rl", 10, "Q3", 10, "10", 10, "Q3", Range.R90_100),
new SensusTestInfo("Q2ac_rl", 7, "Q2ac", 7, "07", 7, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_rl", 6, "Q1", 6, "06", 6, "Q1", Range.R100_110),
new SensusTestInfo("Q3_lr", 5, "Q3", 5, "05", 5, "Q3", Range.R90_100),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_Repeatability:
return new SensusTestInfo[]
{
new SensusTestInfo("Q3_lr (1/3)", 5, "Q3", 9, "09", 9, "Q3", Range.R90_100),
new SensusTestInfo("Q3_lr (2/3)", 5, "Q3", 8, "08", 8, "Q3", Range.R90_100),
new SensusTestInfo("Q3_lr (3/3)", 5, "Q3", 7, "07", 7, "Q3", Range.R90_100),
new SensusTestInfo("Q2ac_lr (1/3)", 2, "Q2ac", 6, "06", 6, "Q2ac", Range.R100_110),
new SensusTestInfo("Q2ac_lr (2/3)", 2, "Q2ac", 5, "05", 5, "Q2ac", Range.R100_110),
new SensusTestInfo("Q2ac_lr (3/3)", 2, "Q2ac", 4, "04", 4, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_lr (1/3)", 1, "Q1", 3, "03", 3, "Q1", Range.R100_110),
new SensusTestInfo("Q1_lr (2/3)", 1, "Q1", 2, "02", 2, "Q1", Range.R100_110),
new SensusTestInfo("Q1_lr (3/3)", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Q3_lr (1/3)", 5, "Q3", 9, "09", 9, "Q3", Range.R90_100),
new SensusTestInfo("Q3_lr (2/3)", 5, "Q3", 8, "08", 8, "Q3", Range.R90_100),
new SensusTestInfo("Q3_lr (3/3)", 5, "Q3", 7, "07", 7, "Q3", Range.R90_100),
new SensusTestInfo("Q2ac_lr (1/3)", 2, "Q2ac", 6, "06", 6, "Q2ac", Range.R100_110),
new SensusTestInfo("Q2ac_lr (2/3)", 2, "Q2ac", 5, "05", 5, "Q2ac", Range.R100_110),
new SensusTestInfo("Q2ac_lr (3/3)", 2, "Q2ac", 4, "04", 4, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_lr (1/3)", 1, "Q1", 3, "03", 3, "Q1", Range.R100_110),
new SensusTestInfo("Q1_lr (2/3)", 1, "Q1", 2, "02", 2, "Q1", Range.R100_110),
new SensusTestInfo("Q1_lr (3/3)", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_EMP_DN15:
return new SensusTestInfo[]
{
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q1.35", 0, "", 10, "10", 10, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.7", 0, "", 9, "09", 9, "Q0.7", Range.R95_105),
new SensusTestInfo("Q0.28", 0, "", 8, "08", 8, "Q0.28", Range.R95_105),
new SensusTestInfo("Q0.15", 0, "", 7, "07", 7, "Q0.15", Range.R95_105),
new SensusTestInfo("Q0.08", 0, "", 6, "06", 6, "Q0.08", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 5, "05", 5, "Q0.04", Range.R95_105),
new SensusTestInfo("Q0.0236", 0, "", 4, "04", 4, "Q0.0236", Range.R95_105),
new SensusTestInfo("Q0.010", 0, "", 3, "03", 3, "Q0.010", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q1.35", 0, "", 10, "10", 10, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.7", 0, "", 9, "09", 9, "Q0.7", Range.R95_105),
new SensusTestInfo("Q0.28", 0, "", 8, "08", 8, "Q0.28", Range.R95_105),
new SensusTestInfo("Q0.15", 0, "", 7, "07", 7, "Q0.15", Range.R95_105),
new SensusTestInfo("Q0.08", 0, "", 6, "06", 6, "Q0.08", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 5, "05", 5, "Q0.04", Range.R95_105),
new SensusTestInfo("Q0.0236", 0, "", 4, "04", 4, "Q0.0236", Range.R95_105),
new SensusTestInfo("Q0.010", 0, "", 3, "03", 3, "Q0.010", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_EMP_DN20:
return new SensusTestInfo[]
{
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q2.16", 0, "", 10, "10", 10, "Q2.16", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 9, "09", 9, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.7", 0, "", 8, "08", 8, "Q0.7", Range.R95_105),
new SensusTestInfo("Q0.28", 0, "", 7, "07", 7, "Q0.28", Range.R95_105),
new SensusTestInfo("Q0.15", 0, "", 6, "06", 6, "Q0.15", Range.R95_105),
new SensusTestInfo("Q0.08", 0, "", 5, "05", 5, "Q0.08", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 4, "04", 4, "Q0.04", Range.R95_105),
new SensusTestInfo("Q0.02", 0, "", 3, "03", 3, "Q0.02", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q2.16", 0, "", 10, "10", 10, "Q2.16", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 9, "09", 9, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.7", 0, "", 8, "08", 8, "Q0.7", Range.R95_105),
new SensusTestInfo("Q0.28", 0, "", 7, "07", 7, "Q0.28", Range.R95_105),
new SensusTestInfo("Q0.15", 0, "", 6, "06", 6, "Q0.15", Range.R95_105),
new SensusTestInfo("Q0.08", 0, "", 5, "05", 5, "Q0.08", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 4, "04", 4, "Q0.04", Range.R95_105),
new SensusTestInfo("Q0.02", 0, "", 3, "03", 3, "Q0.02", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_EMP_DN32:
return new SensusTestInfo[]
{
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q5", 0, "", 10, "10", 10, "Q5", Range.R95_105),
new SensusTestInfo("Q2.5", 0, "", 9, "09", 9, "Q2.5", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 8, "08", 8, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.65", 0, "", 7, "07", 7, "Q0.65", Range.R95_105),
new SensusTestInfo("Q0.35", 0, "", 6, "06", 6, "Q0.35", Range.R95_105),
new SensusTestInfo("Q0.16", 0, "", 5, "05", 5, "Q0.16", Range.R95_105),
new SensusTestInfo("Q0.09", 0, "", 4, "04", 4, "Q0.09", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 3, "03", 3, "Q0.04", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q5", 0, "", 10, "10", 10, "Q5", Range.R95_105),
new SensusTestInfo("Q2.5", 0, "", 9, "09", 9, "Q2.5", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 8, "08", 8, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.65", 0, "", 7, "07", 7, "Q0.65", Range.R95_105),
new SensusTestInfo("Q0.35", 0, "", 6, "06", 6, "Q0.35", Range.R95_105),
new SensusTestInfo("Q0.16", 0, "", 5, "05", 5, "Q0.16", Range.R95_105),
new SensusTestInfo("Q0.09", 0, "", 4, "04", 4, "Q0.09", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 3, "03", 3, "Q0.04", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_EMP_DN40:
return new SensusTestInfo[]
{
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q8", 0, "", 10, "10", 10, "Q8", Range.R95_105),
new SensusTestInfo("Q5", 0, "", 9, "09", 9, "Q5", Range.R95_105),
new SensusTestInfo("Q2.5", 0, "", 8, "08", 8, "Q2.5", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 7, "07", 7, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.65", 0, "", 6, "06", 6, "Q0.65", Range.R95_105),
new SensusTestInfo("Q0.35", 0, "", 5, "05", 5, "Q0.35", Range.R95_105),
new SensusTestInfo("Q0.16", 0, "", 4, "04", 4, "Q0.16", Range.R95_105),
new SensusTestInfo("Q0.09", 0, "", 3, "03", 3, "Q0.09", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
/// TBF Oracle DB Opto RAW LU logfiles
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q8", 0, "", 10, "10", 10, "Q8", Range.R95_105),
new SensusTestInfo("Q5", 0, "", 9, "09", 9, "Q5", Range.R95_105),
new SensusTestInfo("Q2.5", 0, "", 8, "08", 8, "Q2.5", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 7, "07", 7, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.65", 0, "", 6, "06", 6, "Q0.65", Range.R95_105),
new SensusTestInfo("Q0.35", 0, "", 5, "05", 5, "Q0.35", Range.R95_105),
new SensusTestInfo("Q0.16", 0, "", 4, "04", 4, "Q0.16", Range.R95_105),
new SensusTestInfo("Q0.09", 0, "", 3, "03", 3, "Q0.09", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
}
}

15
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
View File

@ -2039,22 +2039,15 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
///
/// Process for DEWA
///
if ((q2adjResult.Error >= 0) && (q2adjResult.Error <= 1.0))
if (Math.Abs(q2adjResult.Error - targetError) <= 0.5)
{
resultStr = string.Format("Q2 correction = 0 (writing bypassed)");
return CommErr.None;
}
if (q2adjResult.Error < 0)
{
q2CorrRL = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF);
q2CorrLR = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF);
}
else /// if (q2adjResult.Error > 1.0)
{
q2CorrRL = (byte)((int)Math.Round(0.5 * q2Correction) & 0x000000FF);
q2CorrLR = (byte)((int)Math.Round(0.5 * q2Correction) & 0x000000FF);
}
/// Use the same correction factor in both directions
q2CorrRL = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF);
q2CorrLR = (byte)((int)Math.Round(1.1 * q2Correction) & 0x000000FF);
}
else if (q2CorrType == Q2CorrType.Greece)
{

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.1193.0")]
[assembly: AssemblyFileVersion("2.18.1193.0")]
[assembly: AssemblyVersion("2.18.1194.0")]
[assembly: AssemblyFileVersion("2.18.1194.0")]