flag also TOF noisy channel in diagnostic

noferini · shahor02 · commit d5c05d4ef6d8 · 2021-09-30T21:23:25.000+02:00
diff --git a/DataFormats/Detectors/TOF/include/DataFormatsTOF/Diagnostic.h b/DataFormats/Detectors/TOF/include/DataFormatsTOF/Diagnostic.h
@@ -36,9 +36,11 @@ class Diagnostic
   int getFrequency(ULong64_t pattern);                                                    // Get frequency
   int getFrequencyROW() { return getFrequency(0); }                                       // Readout window frequency
   int getFrequencyEmptyCrate(int crate) { return getFrequency(getEmptyCrateKey(crate)); } // empty crate frequency
+  int fillNoisy(int channel, int frequency = 1) { return fill(getNoisyChannelKey(channel), frequency); }
   int fillROW() { return fill(0); }
   int fillEmptyCrate(int crate, int frequency = 1) { return fill(getEmptyCrateKey(crate), frequency); }
-  ULong64_t getEmptyCrateKey(int crate);
+  static ULong64_t getEmptyCrateKey(int crate);
+  static ULong64_t getNoisyChannelKey(int channel);
   void print() const;
   void clear() { mVector.clear(); }
   void fill(const Diagnostic& diag);                       // for calibration
diff --git a/DataFormats/Detectors/TOF/src/Diagnostic.cxx b/DataFormats/Detectors/TOF/src/Diagnostic.cxx
@@ -74,6 +74,12 @@ ULong64_t Diagnostic::getEmptyCrateKey(int crate)
   return key;
 }
 
+ULong64_t Diagnostic::getNoisyChannelKey(int channel)
+{
+  ULong64_t key = (ULong64_t(12) << 32) + channel; // slot=12 means noisy channels
+  return key;
+}
+
 void Diagnostic::fill(const Diagnostic& diag)
 {
   LOG(DEBUG) << "Filling diagnostic word";
diff --git a/Detectors/TOF/base/include/TOFBase/WindowFiller.h b/Detectors/TOF/base/include/TOFBase/WindowFiller.h
@@ -94,7 +94,7 @@ class WindowFiller
   bool mFutureToBeSorted = false;
 
   // only needed from Decoder
-  int mMaskNoiseRate = -1;
+  int mMaskNoiseRate = -999999999;
   int mChannelCounts[o2::tof::Geo::NCHANNELS]; // count of channel hits in the current TF (if MaskNoiseRate enabled)
 
   // digit info
diff --git a/Detectors/TOF/base/src/WindowFiller.cxx b/Detectors/TOF/base/src/WindowFiller.cxx
@@ -477,4 +477,17 @@ void WindowFiller::fillDiagnosticFrequency()
       }
     }
   }
+
+  // fill also noise diagnostic if the counts within the TF is larger than a threashold (default >=11, -> 1 kHZ)
+  int masknoise = mMaskNoiseRate;
+  if (masknoise < 0) {
+    masknoise = -masknoise;
+  }
+
+  for (int i = 0; i < Geo::NCHANNELS; i++) {
+    if (mChannelCounts[i] >= masknoise) {
+      //Fill noisy in diagnostic
+      mDiagnosticFrequency.fillNoisy(i);
+    }
+  }
 }
diff --git a/Detectors/TOF/reconstruction/src/Decoder.cxx b/Detectors/TOF/reconstruction/src/Decoder.cxx
@@ -114,9 +114,7 @@ bool Decoder::close()
 void Decoder::clear()
 {
   reset();
-  if (mMaskNoiseRate > 0) {
-    clearCounts();
-  }
+  clearCounts();
 
   mPatterns.clear();
   mCratePatterns.clear();
@@ -140,9 +138,7 @@ void Decoder::InsertDigit(int icrate, int itrm, int itdc, int ichain, int channe
     return;
   }
 
-  if (mMaskNoiseRate > 0) {
-    mChannelCounts[digitInfo.channel]++;
-  }
+  mChannelCounts[digitInfo.channel]++;
 
   mHitDecoded++;
 
@@ -204,9 +200,7 @@ void Decoder::readTRM(int icru, int icrate, uint32_t orbit, uint16_t bunchid)
       continue;
     }
 
-    if (mMaskNoiseRate > 0) {
-      mChannelCounts[digitInfo.channel]++;
-    }
+    mChannelCounts[digitInfo.channel]++;
 
     mHitDecoded++;
 
diff --git a/Detectors/TOF/workflow/src/CompressedDecodingTask.cxx b/Detectors/TOF/workflow/src/CompressedDecodingTask.cxx
@@ -48,6 +48,8 @@ void CompressedDecodingTask::init(InitContext& ic)
 
   if (mMaskNoise) {
     mDecoder.maskNoiseRate(mNoiseRate);
+  } else {
+    mDecoder.maskNoiseRate(-mNoiseRate); // negative means -> flag but not filter
   }
 
   auto finishFunction = [this]() {
@@ -420,7 +422,7 @@ DataProcessorSpec getCompressedDecodingSpec(const std::string& inputDesc, bool c
     Options{
       {"row-filter", VariantType::Bool, false, {"Filter empty row"}},
       {"mask-noise", VariantType::Bool, false, {"Flag to mask noisy digits"}},
-      {"noise-counts", VariantType::Int, 1000, {"Counts in a single (TF) payload"}}}};
+      {"noise-counts", VariantType::Int, 11, {"Counts in a single (TF) payload"}}}};
 }
 
 } // namespace tof

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,12 @@ ULong64_t Diagnostic::getEmptyCrateKey(int crate)`
`74`	`74`	`return key;`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ULong64_t Diagnostic::getNoisyChannelKey(int channel)`
	`78`	`+{`
	`79`	`+ ULong64_t key = (ULong64_t(12) << 32) + channel; // slot=12 means noisy channels`
	`80`	`+ return key;`
	`81`	`+}`
	`82`	`+`
`77`	`83`	`void Diagnostic::fill(const Diagnostic& diag)`
`78`	`84`	`{`
`79`	`85`	`LOG(DEBUG) << "Filling diagnostic word";`
Original file line number	Diff line number	Diff line change
`@@ -477,4 +477,17 @@ void WindowFiller::fillDiagnosticFrequency()`
`477`	`477`	`}`
`478`	`478`	`}`
`479`	`479`	`}`
	`480`	`+`
	`481`	`+ // fill also noise diagnostic if the counts within the TF is larger than a threashold (default >=11, -> 1 kHZ)`
	`482`	`+ int masknoise = mMaskNoiseRate;`
	`483`	`+ if (masknoise < 0) {`
	`484`	`+ masknoise = -masknoise;`
	`485`	`+ }`
	`486`	`+`
	`487`	`+ for (int i = 0; i < Geo::NCHANNELS; i++) {`
	`488`	`+ if (mChannelCounts[i] >= masknoise) {`
	`489`	`+ //Fill noisy in diagnostic`
	`490`	`+ mDiagnosticFrequency.fillNoisy(i);`
	`491`	`+ }`
	`492`	`+ }`
`480`	`493`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@ void CompressedDecodingTask::init(InitContext& ic)`
`48`	`48`
`49`	`49`	`if (mMaskNoise) {`
`50`	`50`	`mDecoder.maskNoiseRate(mNoiseRate);`
	`51`	`+ } else {`
	`52`	`+ mDecoder.maskNoiseRate(-mNoiseRate); // negative means -> flag but not filter`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`auto finishFunction = [this]() {`
`@@ -420,7 +422,7 @@ DataProcessorSpec getCompressedDecodingSpec(const std::string& inputDesc, bool c`
`420`	`422`	`Options{`
`421`	`423`	`{"row-filter", VariantType::Bool, false, {"Filter empty row"}},`
`422`	`424`	`{"mask-noise", VariantType::Bool, false, {"Flag to mask noisy digits"}},`
`423`		`- {"noise-counts", VariantType::Int, 1000, {"Counts in a single (TF) payload"}}}};`
	`425`	`+ {"noise-counts", VariantType::Int, 11, {"Counts in a single (TF) payload"}}}};`
`424`	`426`	`}`
`425`	`427`
`426`	`428`	`} // namespace tof`