|
17 | 17 | /// \author Diana Maria Krupova |
18 | 18 | /// \author David Grund |
19 | 19 | /// \author Sara Haidlova |
| 20 | +/// \author Jakub Juracka |
20 | 21 | /// |
21 | 22 |
|
22 | 23 | // C++ |
@@ -407,18 +408,15 @@ void QcMFTDigitCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR |
407 | 408 | } |
408 | 409 | } |
409 | 410 | // quality of a noise scan |
410 | | - bool isTotalNoiseGood = (mTotalNoisy < mNoiseTotalMediumMax) && (mTotalNoisy > mNoiseTotalMediumMin); |
411 | | - bool isNewNoiseGood = (mNewNoisy < mNoiseNewMediumMax) && (mNewNoisy > mNoiseNewMediumMin); |
412 | | - bool isDisNoiseGood = (mDisNoisy < mNoiseDisMediumMax) && (mDisNoisy > mNoiseDisMediumMin); |
413 | | - bool isTotalNoiseMedium = (mTotalNoisy > mNoiseTotalMediumMax && mTotalNoisy < mNoiseTotalBadMax) || |
414 | | - (mTotalNoisy > mNoiseTotalBadMin && mTotalNoisy < mNoiseTotalMediumMin); |
415 | | - bool isNewNoiseMedium = (mNewNoisy < mNoiseNewMediumMin) || |
416 | | - (mNewNoisy > mNoiseNewMediumMax && mNewNoisy < mNoiseNewBadMax); |
417 | | - bool isDisNoiseMedium = (mDisNoisy < mNoiseDisMediumMin) || |
418 | | - (mDisNoisy > mNoiseDisMediumMax && mDisNoisy < mNoiseDisBadMax); |
419 | | - bool isTotalNoiseBad = (mTotalNoisy > mNoiseTotalBadMax) || (mTotalNoisy < mNoiseTotalBadMin); |
420 | | - bool isNewNoiseBad = mNewNoisy > mNoiseNewBadMax; |
421 | | - bool isDisNoiseBad = mDisNoisy > mNoiseDisBadMax; |
| 411 | + bool isTotalNoiseGood = (mNoiseTotalMediumMin <= mTotalNoisy) && (mTotalNoisy <= mNoiseTotalMediumMax); |
| 412 | + bool isNewNoiseGood = (mNoiseNewMediumMin <= mNewNoisy) && (mNewNoisy <= mNoiseNewMediumMax); |
| 413 | + bool isDisNoiseGood = (mNoiseDisMediumMin <= mDisNoisy) && (mDisNoisy <= mNoiseDisMediumMax); |
| 414 | + bool isTotalNoiseMedium = (mNoiseTotalBadMin <= mTotalNoisy && mTotalNoisy < mNoiseTotalMediumMin) || (mNoiseTotalMediumMax < mTotalNoisy && mTotalNoisy <= mNoiseTotalBadMax); |
| 415 | + bool isNewNoiseMedium = (mNewNoisy < mNoiseNewMediumMin) || (mNoiseNewMediumMax < mNewNoisy && mNewNoisy <= mNoiseNewBadMax); |
| 416 | + bool isDisNoiseMedium = (mDisNoisy < mNoiseDisMediumMin) || (mNoiseDisMediumMax < mDisNoisy && mDisNoisy <= mNoiseDisBadMax); |
| 417 | + bool isTotalNoiseBad = (mTotalNoisy < mNoiseTotalBadMin) || (mNoiseTotalBadMax < mTotalNoisy); |
| 418 | + bool isNewNoiseBad = mNoiseNewBadMax < mNewNoisy; |
| 419 | + bool isDisNoiseBad = mNoiseDisBadMax < mDisNoisy; |
422 | 420 |
|
423 | 421 | if (isTotalNoiseGood && isNewNoiseGood && isDisNoiseGood) { |
424 | 422 | mQualityGood = true; |
|
0 commit comments