feat: BC-based approach to ref channel fitting

Author: mvishiu11

Modules/FIT/FT0/etc/ft0-aging-laser-postproc.json

@@ -22,11 +22,11 @@
           "query": "digits:FT0/DIGITSBC/0;channels:FT0/DIGITSCH/0"
         },
         "taskParameters": {
-          "referenceChannelIDs":      "208,209,210",
+          "referenceChannelIDs":      "208,209,210,211",
           "laserTriggerBCs":          "0,1783",
           "detectorBCdelay":          "131",
-          "referencePeak1BCdelays":   "115,115,115",
-          "referencePeak2BCdelays":   "136,142,135",
+          "referencePeak1BCdelays":   "115,115,115,115",
+          "referencePeak2BCdelays":   "136,142,135,141",
           "debug": "false"
         }
       }
@@ -42,8 +42,6 @@
           "default": {
             "default": {
               "agingTaskSourcePath": "FT0/MO/AgingLaser",
-              "refPeakWindowMin":        "150",
-              "refPeakWindowMax":        "600",
               "fracWindowLow":         "0.30",
               "fracWindowHigh":         "0.30",
               "ignoreDetectorChannels":  "",

Modules/FIT/FT0/include/FT0/AgingLaserPostProcTask.h

@@ -52,8 +52,6 @@ class AgingLaserPostProcTask final : public quality_control::postprocessing::Pos
   std::vector<uint8_t> mDetectorChIDs;  ///< Detector (target) channels
   std::vector<uint8_t> mReferenceChIDs; ///< Reference channels
 
-  double mADCSearchMin = 150.; ///< lower edge of peak-search window (ADC) for ref channels
-  double mADCSearchMax = 600.; ///< upper edge of peak-search window (ADC) for ref channels
   double mFracWindowA = 0.25;  ///< low fractional window parameter a
   double mFracWindowB = 0.25;  ///< high fractional window parameter b
 

Modules/FIT/FT0/src/AgingLaserPostProcTask.cxx

@@ -66,8 +66,6 @@ void AgingLaserPostProcTask::configure(const boost::property_tree::ptree& cfg)
     }
   }
 
-  mADCSearchMin = o2::quality_control_modules::common::getFromConfig<double>(mCustomParameters, "refPeakWindowMin", mADCSearchMin);
-  mADCSearchMax = o2::quality_control_modules::common::getFromConfig<double>(mCustomParameters, "refPeakWindowMax", mADCSearchMax);
   mFracWindowA = o2::quality_control_modules::common::getFromConfig<double>(mCustomParameters, "fracWindowLow", mFracWindowA);
   mFracWindowB = o2::quality_control_modules::common::getFromConfig<double>(mCustomParameters, "fracWindowHigh", mFracWindowB);
 }
@@ -77,7 +75,6 @@ void AgingLaserPostProcTask::initialize(Trigger, framework::ServiceRegistryRef)
   ILOG(Debug, Devel) << "initialize AgingLaserPostProcTask" << ENDM;
 
   ILOG(Debug, Devel) << "agingTaskSourcePath : " << mAmpMoPath << ENDM;
-  ILOG(Debug, Devel) << "ADC search window : [" << mADCSearchMin << ", " << mADCSearchMax << "]" << ENDM;
   ILOG(Debug, Devel) << "fractional window : a=" << mFracWindowA << "  b=" << mFracWindowB << ENDM;
 
   mAmpVsChNormWeightedMeanA = fit::helper::registerHist<TH1F>(
@@ -101,30 +98,44 @@ void AgingLaserPostProcTask::update(Trigger t, framework::ServiceRegistryRef srv
   /* ---- fetch source histogram ---- */
   auto& qcdb = srv.get<quality_control::repository::DatabaseInterface>();
   auto moIn = qcdb.retrieveMO(mAmpMoPath, "AmpPerChannel", t.timestamp, t.activity);
+  auto moIn0 = qcdb.retrieveMO(mAmpMoPath, "AmpPerChannelPeak1ADC0", t.timestamp, t.activity);
+  auto moIn1 = qcdb.retrieveMO(mAmpMoPath, "AmpPerChannelPeak1ADC1", t.timestamp, t.activity);
   TH2* h2amp = moIn ? dynamic_cast<TH2*>(moIn->getObject()) : nullptr;
+  TH2* h2amp0 = moIn0 ? dynamic_cast<TH2*>(moIn0->getObject()) : nullptr;
+  TH2* h2amp1 = moIn1 ? dynamic_cast<TH2*>(moIn1->getObject()) : nullptr;
+  TH2* h2ampMerged = nullptr;
+  if (h2amp0 && h2amp1) {
+    h2ampMerged = new TH2F("h2ampMerged", "h2ampMerged", 96, 0, 96, 112, 96, 208);
+    h2ampMerged->Add(h2amp0);
+    h2ampMerged->Add(h2amp1);
+  }
 
   if (!h2amp) {
     ILOG(Error) << "Could not retrieve " << mAmpMoPath << "/AmpPerChannel for timestamp "
                 << t.timestamp << ENDM;
     return;
   }
 
+  if (!h2amp0 || !h2amp1) {
+    ILOG(Error) << "Could not retrieve " << mAmpMoPath << "/AmpPerChannelPeak1ADC0 or " << mAmpMoPath << "/AmpPerChannelPeak1ADC1 for timestamp "
+                << t.timestamp << ENDM;
+    return;
+  }
+
+  if (!h2ampMerged) {
+    ILOG(Error) << "Could not create merged histogram from " << mAmpMoPath << "/AmpPerChannelPeak1ADC0 and " << mAmpMoPath << "/AmpPerChannelPeak1ADC1 for timestamp "
+                << t.timestamp << ENDM;
+    return;
+  }
+
   /* ---- 1. Reference-channel Gaussian fits ---- */
   std::vector<double> refMus;
 
   for (auto chId : mReferenceChIDs) {
-    auto h1 = std::unique_ptr<TH1>(h2amp->ProjectionY(
+    auto h1 = std::unique_ptr<TH1>(h2ampMerged->ProjectionY(
       Form("ref_%d", chId), chId + 1, chId + 1));
 
-    const int binLow = h1->FindBin(mADCSearchMin);
-    const int binHigh = h1->FindBin(mADCSearchMax);
-
-    int binMax = binLow;
-    for (int b = binLow + 1; b <= binHigh; ++b) {
-      if (h1->GetBinContent(b) > h1->GetBinContent(binMax)) {
-        binMax = b;
-      }
-    }
+    int binMax = h1->GetMaximumBin();
     const double xMax = h1->GetBinCenter(binMax);
     const double winLo = TMath::Max(0., (1. - mFracWindowA) * xMax);
     const double winHi = (1. + mFracWindowB) * xMax;