Skip to content

Commit f4928f7

Browse files
authored
[MFT] update of comparator logic for noise map quality checks (#2625)
* add author * fixed quality threshold comparisons and unified comparator logic
1 parent c6e3c2c commit f4928f7

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

Modules/MFT/src/QcMFTDigitCheck.cxx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/// \author Diana Maria Krupova
1818
/// \author David Grund
1919
/// \author Sara Haidlova
20+
/// \author Jakub Juracka
2021
///
2122

2223
// C++
@@ -407,18 +408,15 @@ void QcMFTDigitCheck::beautify(std::shared_ptr<MonitorObject> mo, Quality checkR
407408
}
408409
}
409410
// 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;
422420

423421
if (isTotalNoiseGood && isNewNoiseGood && isDisNoiseGood) {
424422
mQualityGood = true;

0 commit comments

Comments
 (0)