add multilevel TOF noisy thresholds

noferini · shahor02 · commit e39cb68b444c · 2021-10-23T23:10:26.000+02:00
diff --git a/DataFormats/Detectors/TOF/include/DataFormatsTOF/Diagnostic.h b/DataFormats/Detectors/TOF/include/DataFormatsTOF/Diagnostic.h
@@ -59,6 +59,7 @@ class Diagnostic
   int getSlot(ULong64_t pattern) const;
   int getCrate(ULong64_t pattern) const;
   int getChannel(ULong64_t pattern) const;
+  int getNoisyLevel(ULong64_t pattern) const;
 
  private:
   std::map<ULong64_t, uint32_t> mVector; // diagnostic frequency vector (key/pattern , frequency)
diff --git a/DataFormats/Detectors/TOF/src/Diagnostic.cxx b/DataFormats/Detectors/TOF/src/Diagnostic.cxx
@@ -98,12 +98,26 @@ int Diagnostic::getCrate(ULong64_t pattern) const
 
 int Diagnostic::getChannel(ULong64_t pattern) const
 {
-  if (getSlot(pattern) == 14 && getCrate(pattern) == 0 && pattern != 0) {
+  if (getSlot(pattern) == 14) {
     return (pattern & 262143);
   }
   return -1;
 }
 
+int Diagnostic::getNoisyLevel(ULong64_t pattern) const
+{
+  if (getChannel(pattern)) {
+    if (pattern & (1 << 20)) {
+      return 3;
+    } else if (pattern & (1 << 19)) {
+      return 2;
+    } else {
+      return 1;
+    }
+  }
+  return 0;
+}
+
 void Diagnostic::fill(const Diagnostic& diag)
 {
   LOG(DEBUG) << "Filling diagnostic word";
diff --git a/Detectors/TOF/base/src/WindowFiller.cxx b/Detectors/TOF/base/src/WindowFiller.cxx
@@ -486,8 +486,17 @@ void WindowFiller::fillDiagnosticFrequency()
 
   for (int i = 0; i < Geo::NCHANNELS; i++) {
     if (mChannelCounts[i] >= masknoise) {
+      int additionalMask = 0;
+
+      if (mChannelCounts[i] >= masknoise * 10) {
+        additionalMask += (1 << 19); // > 10 kHZ (if masknoise = 1 kHz)
+        if (mChannelCounts[i] >= masknoise * 100) {
+          additionalMask += (1 << 20); // > 100 kHZ (if masknoise = 1 kHz)
+        }
+      }
+
       //Fill noisy in diagnostic
-      mDiagnosticFrequency.fillNoisy(i);
+      mDiagnosticFrequency.fillNoisy(i + additionalMask);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -486,8 +486,17 @@ void WindowFiller::fillDiagnosticFrequency()`
`486`	`486`
`487`	`487`	`for (int i = 0; i < Geo::NCHANNELS; i++) {`
`488`	`488`	`if (mChannelCounts[i] >= masknoise) {`
	`489`	`+ int additionalMask = 0;`
	`490`	`+`
	`491`	`+ if (mChannelCounts[i] >= masknoise * 10) {`
	`492`	`+ additionalMask += (1 << 19); // > 10 kHZ (if masknoise = 1 kHz)`
	`493`	`+ if (mChannelCounts[i] >= masknoise * 100) {`
	`494`	`+ additionalMask += (1 << 20); // > 100 kHZ (if masknoise = 1 kHz)`
	`495`	`+ }`
	`496`	`+ }`
	`497`	`+`
`489`	`498`	`//Fill noisy in diagnostic`
`490`		`- mDiagnosticFrequency.fillNoisy(i);`
	`499`	`+ mDiagnosticFrequency.fillNoisy(i + additionalMask);`
`491`	`500`	`}`
`492`	`501`	`}`
`493`	`502`	`}`