From 8115ec4ac5b2f47d72c42c5e0aa0bb4bf1d56ed3 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 20 Aug 2021 13:11:05 +0200 Subject: [PATCH] Effor flags do not stop a cycle in case test.Evaluate = false --- TBF/BenchControl/Various/ErrorFlags/Errors.cs | 103 +++++++++--------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/TBF/BenchControl/Various/ErrorFlags/Errors.cs b/TBF/BenchControl/Various/ErrorFlags/Errors.cs index b0f2716d4..03436acbc 100644 --- a/TBF/BenchControl/Various/ErrorFlags/Errors.cs +++ b/TBF/BenchControl/Various/ErrorFlags/Errors.cs @@ -95,66 +95,65 @@ namespace TBF.BenchControl.Various.ErrorFlags bool E36 = ProcessData.ConductStat.Min < errorsCfg.TestParams.Conductivity_min || ProcessData.ConductStat.Max > errorsCfg.TestParams.Conductivity_max; - const sbyte info = (sbyte)ErrorFlagsMode.Info; - const sbyte on = (sbyte)ErrorFlagsMode.On; - const sbyte stop = (sbyte)ErrorFlagsMode.Stop; + const sbyte INFO = (sbyte)ErrorFlagsMode.Info; + const sbyte ON = (sbyte)ErrorFlagsMode.On; + const sbyte STOP = (sbyte)ErrorFlagsMode.Stop; long errorFlags = 0; - if (E1 && (errorsCfg.TestParams.E1 == on || errorsCfg.TestParams.E1 == stop)) errorFlags |= (long)ErrorFlagMask.E1; - if (E2 && (errorsCfg.TestParams.E2 == on || errorsCfg.TestParams.E2 == stop)) errorFlags |= (long)ErrorFlagMask.E2; - if (E3 && (errorsCfg.TestParams.E3 == on || errorsCfg.TestParams.E3 == stop)) errorFlags |= (long)ErrorFlagMask.E3; - if (E4 && (errorsCfg.TestParams.E4 == on || errorsCfg.TestParams.E4 == stop)) errorFlags |= (long)ErrorFlagMask.E4; - if (E5 && (errorsCfg.TestParams.E5 == on || errorsCfg.TestParams.E5 == stop)) errorFlags |= (long)ErrorFlagMask.E5; - if (E6 && (errorsCfg.TestParams.E6 == on || errorsCfg.TestParams.E6 == stop)) errorFlags |= (long)ErrorFlagMask.E6; - if (E7 && (errorsCfg.TestParams.E7 == on || errorsCfg.TestParams.E7 == stop)) errorFlags |= (long)ErrorFlagMask.E7; - if (E8 && (errorsCfg.TestParams.E8 == on || errorsCfg.TestParams.E8 == stop)) errorFlags |= (long)ErrorFlagMask.E8; - if (E9 && (errorsCfg.TestParams.E9 == on || errorsCfg.TestParams.E9 == stop)) errorFlags |= (long)ErrorFlagMask.E9; - if (E10 && (errorsCfg.TestParams.E10 == on || errorsCfg.TestParams.E10 == stop)) errorFlags |= (long)ErrorFlagMask.E10; - if (E11 && (errorsCfg.TestParams.E11 == on || errorsCfg.TestParams.E11 == stop)) errorFlags |= (long)ErrorFlagMask.E11; - if (E12 && (errorsCfg.TestParams.E12 == on || errorsCfg.TestParams.E12 == stop)) errorFlags |= (long)ErrorFlagMask.E12; - if (E13 && (errorsCfg.TestParams.E13 == on || errorsCfg.TestParams.E13 == stop)) errorFlags |= (long)ErrorFlagMask.E13; - if (E14 && (errorsCfg.TestParams.E14 == on || errorsCfg.TestParams.E14 == stop)) errorFlags |= (long)ErrorFlagMask.E14; + if (E1 && (errorsCfg.TestParams.E1 == ON || errorsCfg.TestParams.E1 == STOP)) errorFlags |= (long)ErrorFlagMask.E1; + if (E2 && (errorsCfg.TestParams.E2 == ON || errorsCfg.TestParams.E2 == STOP)) errorFlags |= (long)ErrorFlagMask.E2; + if (E3 && (errorsCfg.TestParams.E3 == ON || errorsCfg.TestParams.E3 == STOP)) errorFlags |= (long)ErrorFlagMask.E3; + if (E4 && (errorsCfg.TestParams.E4 == ON || errorsCfg.TestParams.E4 == STOP)) errorFlags |= (long)ErrorFlagMask.E4; + if (E5 && (errorsCfg.TestParams.E5 == ON || errorsCfg.TestParams.E5 == STOP)) errorFlags |= (long)ErrorFlagMask.E5; + if (E6 && (errorsCfg.TestParams.E6 == ON || errorsCfg.TestParams.E6 == STOP)) errorFlags |= (long)ErrorFlagMask.E6; + if (E7 && (errorsCfg.TestParams.E7 == ON || errorsCfg.TestParams.E7 == STOP)) errorFlags |= (long)ErrorFlagMask.E7; + if (E8 && (errorsCfg.TestParams.E8 == ON || errorsCfg.TestParams.E8 == STOP)) errorFlags |= (long)ErrorFlagMask.E8; + if (E9 && (errorsCfg.TestParams.E9 == ON || errorsCfg.TestParams.E9 == STOP)) errorFlags |= (long)ErrorFlagMask.E9; + if (E10 && (errorsCfg.TestParams.E10 == ON || errorsCfg.TestParams.E10 == STOP)) errorFlags |= (long)ErrorFlagMask.E10; + if (E11 && (errorsCfg.TestParams.E11 == ON || errorsCfg.TestParams.E11 == STOP)) errorFlags |= (long)ErrorFlagMask.E11; + if (E12 && (errorsCfg.TestParams.E12 == ON || errorsCfg.TestParams.E12 == STOP)) errorFlags |= (long)ErrorFlagMask.E12; + if (E13 && (errorsCfg.TestParams.E13 == ON || errorsCfg.TestParams.E13 == STOP)) errorFlags |= (long)ErrorFlagMask.E13; + if (E14 && (errorsCfg.TestParams.E14 == ON || errorsCfg.TestParams.E14 == STOP)) errorFlags |= (long)ErrorFlagMask.E14; /// E15, E16, E17, E18, E19, E20 skipped - if (E21 && (errorsCfg.TestParams.E21 == on || errorsCfg.TestParams.E21 == stop)) errorFlags |= (long)ErrorFlagMask.E21; - if (E36 && (errorsCfg.TestParams.E36 == on || errorsCfg.TestParams.E36 == stop)) errorFlags |= (long)ErrorFlagMask.E36; + if (E21 && (errorsCfg.TestParams.E21 == ON || errorsCfg.TestParams.E21 == STOP)) errorFlags |= (long)ErrorFlagMask.E21; + if (E36 && (errorsCfg.TestParams.E36 == ON || errorsCfg.TestParams.E36 == STOP)) errorFlags |= (long)ErrorFlagMask.E36; long _infoFlags = 0; - if (E1 && (errorsCfg.TestParams.E1 == info)) _infoFlags |= (long)ErrorFlagMask.E1; - if (E2 && (errorsCfg.TestParams.E2 == info)) _infoFlags |= (long)ErrorFlagMask.E2; - if (E3 && (errorsCfg.TestParams.E3 == info)) _infoFlags |= (long)ErrorFlagMask.E3; - if (E4 && (errorsCfg.TestParams.E4 == info)) _infoFlags |= (long)ErrorFlagMask.E4; - if (E5 && (errorsCfg.TestParams.E5 == info)) _infoFlags |= (long)ErrorFlagMask.E5; - if (E6 && (errorsCfg.TestParams.E6 == info)) _infoFlags |= (long)ErrorFlagMask.E6; - if (E7 && (errorsCfg.TestParams.E7 == info)) _infoFlags |= (long)ErrorFlagMask.E7; - if (E8 && (errorsCfg.TestParams.E8 == info)) _infoFlags |= (long)ErrorFlagMask.E8; - if (E9 && (errorsCfg.TestParams.E9 == info)) _infoFlags |= (long)ErrorFlagMask.E9; - if (E10 && (errorsCfg.TestParams.E10 == info)) _infoFlags |= (long)ErrorFlagMask.E10; - if (E11 && (errorsCfg.TestParams.E11 == info)) _infoFlags |= (long)ErrorFlagMask.E11; - if (E12 && (errorsCfg.TestParams.E12 == info)) _infoFlags |= (long)ErrorFlagMask.E12; - if (E13 && (errorsCfg.TestParams.E13 == info)) _infoFlags |= (long)ErrorFlagMask.E13; - if (E14 && (errorsCfg.TestParams.E14 == info)) _infoFlags |= (long)ErrorFlagMask.E14; + if (E1 && (errorsCfg.TestParams.E1 == INFO)) _infoFlags |= (long)ErrorFlagMask.E1; + if (E2 && (errorsCfg.TestParams.E2 == INFO)) _infoFlags |= (long)ErrorFlagMask.E2; + if (E3 && (errorsCfg.TestParams.E3 == INFO)) _infoFlags |= (long)ErrorFlagMask.E3; + if (E4 && (errorsCfg.TestParams.E4 == INFO)) _infoFlags |= (long)ErrorFlagMask.E4; + if (E5 && (errorsCfg.TestParams.E5 == INFO)) _infoFlags |= (long)ErrorFlagMask.E5; + if (E6 && (errorsCfg.TestParams.E6 == INFO)) _infoFlags |= (long)ErrorFlagMask.E6; + if (E7 && (errorsCfg.TestParams.E7 == INFO)) _infoFlags |= (long)ErrorFlagMask.E7; + if (E8 && (errorsCfg.TestParams.E8 == INFO)) _infoFlags |= (long)ErrorFlagMask.E8; + if (E9 && (errorsCfg.TestParams.E9 == INFO)) _infoFlags |= (long)ErrorFlagMask.E9; + if (E10 && (errorsCfg.TestParams.E10 == INFO)) _infoFlags |= (long)ErrorFlagMask.E10; + if (E11 && (errorsCfg.TestParams.E11 == INFO)) _infoFlags |= (long)ErrorFlagMask.E11; + if (E12 && (errorsCfg.TestParams.E12 == INFO)) _infoFlags |= (long)ErrorFlagMask.E12; + if (E13 && (errorsCfg.TestParams.E13 == INFO)) _infoFlags |= (long)ErrorFlagMask.E13; + if (E14 && (errorsCfg.TestParams.E14 == INFO)) _infoFlags |= (long)ErrorFlagMask.E14; /// E15, E16, E17, E18, E19, E20 skipped - if (E21 && (errorsCfg.TestParams.E21 == info)) _infoFlags |= (long)ErrorFlagMask.E21; - if (E36 && (errorsCfg.TestParams.E36 == info)) _infoFlags |= (long)ErrorFlagMask.E36; + if (E21 && (errorsCfg.TestParams.E21 == INFO)) _infoFlags |= (long)ErrorFlagMask.E21; + if (E36 && (errorsCfg.TestParams.E36 == INFO)) _infoFlags |= (long)ErrorFlagMask.E36; - stopCycle = false; - if (E1 && (errorsCfg.TestParams.E1 == stop)) stopCycle = true; - if (E2 && (errorsCfg.TestParams.E2 == stop)) stopCycle = true; - if (E3 && (errorsCfg.TestParams.E3 == stop)) stopCycle = true; - if (E4 && (errorsCfg.TestParams.E4 == stop)) stopCycle = true; - if (E5 && (errorsCfg.TestParams.E5 == stop)) stopCycle = true; - if (E6 && (errorsCfg.TestParams.E6 == stop)) stopCycle = true; - if (E7 && (errorsCfg.TestParams.E7 == stop)) stopCycle = true; - if (E8 && (errorsCfg.TestParams.E8 == stop)) stopCycle = true; - if (E9 && (errorsCfg.TestParams.E9 == stop)) stopCycle = true; - if (E10 && (errorsCfg.TestParams.E10 == stop)) stopCycle = true; - if (E11 && (errorsCfg.TestParams.E11 == stop)) stopCycle = true; - if (E12 && (errorsCfg.TestParams.E12 == stop)) stopCycle = true; - if (E13 && (errorsCfg.TestParams.E13 == stop)) stopCycle = true; - if (E14 && (errorsCfg.TestParams.E14 == stop)) stopCycle = true; /// E15, E16, E17, E18, E19, E20 skipped - if (E21 && (errorsCfg.TestParams.E21 == stop)) stopCycle = true; - if (E36 && (errorsCfg.TestParams.E36 == stop)) stopCycle = true; + stopCycle = testRslt.TestData.Evaluate && ((E1 && errorsCfg.TestParams.E1 == STOP) || + (E2 && errorsCfg.TestParams.E2 == STOP) || + (E3 && errorsCfg.TestParams.E3 == STOP) || + (E4 && errorsCfg.TestParams.E4 == STOP) || + (E5 && errorsCfg.TestParams.E5 == STOP) || + (E6 && errorsCfg.TestParams.E6 == STOP) || + (E7 && errorsCfg.TestParams.E7 == STOP) || + (E8 && errorsCfg.TestParams.E8 == STOP) || + (E9 && errorsCfg.TestParams.E9 == STOP) || + (E10 && errorsCfg.TestParams.E10 == STOP) || + (E11 && errorsCfg.TestParams.E11 == STOP) || + (E12 && errorsCfg.TestParams.E12 == STOP) || + (E13 && errorsCfg.TestParams.E13 == STOP) || + (E14 && errorsCfg.TestParams.E14 == STOP) || + (E21 && errorsCfg.TestParams.E21 == STOP) || + (E36 && errorsCfg.TestParams.E36 == STOP)); infoFlags = _infoFlags; return errorFlags;