bug fix in TOF diagnostics

noferini · shahor02 · commit a093fa823de9 · 2022-01-07T23:16:32.000+04:00
diff --git a/Detectors/TOF/reconstruction/src/Clusterer.cxx b/Detectors/TOF/reconstruction/src/Clusterer.cxx
@@ -51,6 +51,7 @@ void Clusterer::calibrateStrip()
   for (int idig = 0; idig < mStripData.digits.size(); idig++) {
     //    LOG(debug) << "Checking digit " << idig;
     Digit* dig = &mStripData.digits[idig];
+    //    LOG(info) << "channel = " << dig->getChannel();
     dig->setBC(dig->getBC() - mBCOffset); // RS Don't use raw BC, always start from the beginning of the TF
     double calib = mCalibApi->getTimeCalibration(dig->getChannel(), dig->getTOT() * Geo::TOTBIN_NS);
     //printf("channel %d) isProblematic = %d, fractionUnderPeak = %f\n",dig->getChannel(),mCalibApi->isProblematic(dig->getChannel()),mCalibApi->getFractionUnderPeak(dig->getChannel())); // toberem
diff --git a/Detectors/TOF/simulation/src/Digitizer.cxx b/Detectors/TOF/simulation/src/Digitizer.cxx
@@ -857,7 +857,7 @@ void Digitizer::fillOutputContainer(std::vector<Digit>& digits)
               // add diagnostic if needed
               if (trmProg[itrm].second > p) {
                 // fill diagnostic
-                mCalibApi->processError(crate, itrm, trmErr[itrm]);
+                mCalibApi->processError(crate, slot, trmErr[itrm]);
                 mPatterns.push_back(slot + 28); // add slot
                 info.addedDiagnostic(crate);
                 uint32_t cbit = 1;
diff --git a/Detectors/TOF/workflow/src/TOFClusterizerSpec.cxx b/Detectors/TOF/workflow/src/TOFClusterizerSpec.cxx
@@ -186,6 +186,11 @@ class TOFDPLClustererTask
             }
             slot = patterns[kw] - 28;
             eword = 0;
+
+            if (slot < 3 || slot > 12) { // not a valid slot -> don't fill otherwise mapping fails (slot 1 crate 0 is a bad condition)
+              slot = -1;
+              //              LOG(info) << "not a valid slot in diagnostic words: slot  = " << slot << " for crate " << crate;
+            }
           } else if (slot > -1) { // process error in this slot
             eword += 1 << patterns[kw];
           }

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,11 @@ class TOFDPLClustererTask`
`186`	`186`	`}`
`187`	`187`	`slot = patterns[kw] - 28;`
`188`	`188`	`eword = 0;`
	`189`	`+`
	`190`	`+ if (slot < 3 \|\| slot > 12) { // not a valid slot -> don't fill otherwise mapping fails (slot 1 crate 0 is a bad condition)`
	`191`	`+ slot = -1;`
	`192`	`+ // LOG(info) << "not a valid slot in diagnostic words: slot = " << slot << " for crate " << crate;`
	`193`	`+ }`
`189`	`194`	`} else if (slot > -1) { // process error in this slot`
`190`	`195`	`eword += 1 << patterns[kw];`
`191`	`196`	`}`