Updaed FDD reco

Author: wpierozak

Detectors/FIT/FDD/reconstruction/include/FDDReconstruction/Reconstructor.h

@@ -17,6 +17,7 @@
 #include <vector>
 #include "DataFormatsFDD/Digit.h"
 #include "DataFormatsFDD/RecPoint.h"
+#include "DataFormatsFIT/DeadChannelMap.h"
 namespace o2
 {
 namespace fdd
@@ -30,10 +31,12 @@ class Reconstructor
                gsl::span<const o2::fdd::ChannelData> inChData,
                std::vector<o2::fdd::RecPoint>& RecPoints,
                std::vector<o2::fdd::ChannelDataFloat>& outChData);
-
   void finish();
 
+  void setDeadChannelMap(const o2::fit::DeadChannelMap* deadChannelMap) {mDeadChannelMap = deadChannelMap;}
+
  private:
+  const o2::fit::DeadChannelMap* mDeadChannelMap;
   ClassDefNV(Reconstructor, 3);
 };
 } // namespace fdd

Detectors/FIT/FDD/reconstruction/src/Reconstructor.cxx

@@ -34,6 +34,10 @@ void Reconstructor::process(o2::fdd::Digit const& digitBC, gsl::span<const o2::f
   int nStored = 0;
   int nch = inChData.size();
   for (int ich = 0; ich < nch; ich++) {
+    if(mDeadChannelMap && !mDeadChannelMap->isChannelAlive(ich)) {
+      LOG(debug) << "Channel " << ich << " is dead - discarding data";
+      continue;
+    }
     bool inTime = inChData[ich].getFlag(ChannelData::EEventDataBit::kIsEventInTVDC);
     bool inAdcGate = inChData[ich].getFlag(ChannelData::EEventDataBit::kIsCFDinADCgate);
     if (inAdcGate) {

Detectors/FIT/FDD/workflow/include/FDDWorkflow/RecoWorkflow.h

@@ -20,7 +20,7 @@ namespace o2
 {
 namespace fdd
 {
-framework::WorkflowSpec getRecoWorkflow(bool useMC, bool disableRootInp, bool disableRootOut);
+framework::WorkflowSpec getRecoWorkflow(bool useMC, bool disableRootInp, bool disableRootOut, bool useDeadChannelMap);
 } // namespace fdd
 } // namespace o2
 #endif

Detectors/FIT/FDD/workflow/src/RecoWorkflow.cxx

@@ -22,14 +22,14 @@ namespace o2
 namespace fdd
 {
 
-framework::WorkflowSpec getRecoWorkflow(bool useMC, bool disableRootInp, bool disableRootOut)
+framework::WorkflowSpec getRecoWorkflow(bool useMC, bool disableRootInp, bool disableRootOut, bool useDeadChannelMap)
 {
   framework::WorkflowSpec specs;
 
   if (!disableRootInp) {
     specs.emplace_back(o2::fdd::getFDDDigitReaderSpec(useMC));
   }
-  specs.emplace_back(o2::fdd::getFDDReconstructorSpec(useMC));
+  specs.emplace_back(o2::fdd::getFDDReconstructorSpec(useMC, useDeadChannelMap));
   if (!disableRootOut) {
     specs.emplace_back(o2::fdd::getFDDRecPointWriterSpec(useMC));
   }

Detectors/FIT/FDD/workflow/src/ReconstructorSpec.cxx

@@ -18,6 +18,7 @@
 #include "FDDWorkflow/ReconstructorSpec.h"
 #include "DataFormatsFDD/Digit.h"
 #include "DataFormatsFDD/MCLabel.h"
+#include "Framework/CCDBParamSpec.h"
 
 using namespace o2::framework;
 
@@ -28,6 +29,7 @@ namespace fdd
 
 void FDDReconstructorDPL::init(InitContext& ic)
 {
+
 }
 
 void FDDReconstructorDPL::run(ProcessingContext& pc)
@@ -44,6 +46,10 @@ void FDDReconstructorDPL::run(ProcessingContext& pc)
     // lblPtr = labels.get();
     LOG(info) << "Ignoring MC info";
   }
+  if(mUseDeadChannelMap) {
+    auto deadChannelMap = pc.inputs().get<o2::fit::DeadChannelMap*>("deadChannelMap");
+    mReco.setDeadChannelMap(deadChannelMap.get());
+  }
   int nDig = digitsBC.size();
   mRecPoints.reserve(nDig);
   mRecChData.reserve(digitsCh.size());
@@ -70,7 +76,8 @@ DataProcessorSpec getFDDReconstructorSpec(bool useMC, bool useDeadChannelMap)
     // inputSpec.emplace_back("labels", o2::header::gDataOriginFDD, "DIGITSMCTR", 0, Lifetime::Timeframe);
   }
   if (useDeadChannelMap) {
-    inputSpec.emplace_back("deadChannelMap", o2::header::gDataOriginFDD, "DeadChannelMap", 0, LifeTime::Condition, ccdbParamSpec("FDD/Calib/DeadChannelMap"));
+    LOG(info) << "Dead channel map will be applied during reconstruction";
+    inputSpec.emplace_back("deadChannelMap", o2::header::gDataOriginFDD, "DeadChannelMap", 0, Lifetime::Condition, ccdbParamSpec("FDD/Calib/DeadChannelMap"));
   }
   outputSpec.emplace_back(o2::header::gDataOriginFDD, "RECPOINTS", 0, Lifetime::Timeframe);
   outputSpec.emplace_back(o2::header::gDataOriginFDD, "RECCHDATA", 0, Lifetime::Timeframe);

Detectors/FIT/FDD/workflow/src/fdd-reco-workflow.cxx

@@ -38,6 +38,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
     {"disable-mc", o2::framework::VariantType::Bool, false, {"disable MC propagation even if available"}},
     {"disable-root-input", o2::framework::VariantType::Bool, false, {"disable root-files input readers"}},
     {"disable-root-output", o2::framework::VariantType::Bool, false, {"disable root-files output writers"}},
+    {"disable-dead-channel-map", o2::framework::VariantType::Bool, false, {"disable dead channel map"}},
     {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings"}}};
   o2::raw::HBFUtilsInitializer::addConfigOption(options);
   std::swap(workflowOptions, options);
@@ -57,8 +58,9 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   auto useMC = !configcontext.options().get<bool>("disable-mc");
   auto disableRootInp = configcontext.options().get<bool>("disable-root-input");
   auto disableRootOut = configcontext.options().get<bool>("disable-root-output");
+  bool useDeadChannelMap = !configcontext.options().get<bool>("disable-dead-channel-map");
 
-  auto wf = o2::fdd::getRecoWorkflow(useMC, disableRootInp, disableRootOut);
+  auto wf = o2::fdd::getRecoWorkflow(useMC, disableRootInp, disableRootOut, useDeadChannelMap);
 
   // configure dpl timer to inject correct firstTForbit: start from the 1st orbit of TF containing 1st sampled orbit
   o2::raw::HBFUtilsInitializer hbfIni(configcontext, wf);

Detectors/FIT/FT0/reconstruction/include/FT0Reconstruction/CollisionTimeRecoTask.h

@@ -58,7 +58,11 @@ class CollisionTimeRecoTask
     LOG(info) << "Init for slewing calib object";
     mCalibSlew = calibSlew->makeSlewingPlots();
   };
-  void SetDeadChannelMap(const o2::fit::DeadChannelMap * deadChannelMap) { mDeadChannelMap = deadChannelMap; }
+  void SetDeadChannelMap(const o2::fit::DeadChannelMap * deadChannelMap) 
+  {
+    LOG(debug) << "Updated dead channel map for CollisionTimeRecoTask"; 
+    mDeadChannelMap = deadChannelMap; 
+  }
   float getTimeInPS(const o2::ft0::ChannelData& channelData);
 
  private:

Detectors/FIT/FT0/reconstruction/src/CollisionTimeRecoTask.cxx

@@ -69,7 +69,6 @@ RP CollisionTimeRecoTask::processDigit(const o2::ft0::Digit& digit,
     }
     if(mDeadChannelMap && !mDeadChannelMap->isChannelAlive(channelData.ChId)) {
       LOG(debug) << "Channel " << channelData.ChId << " is dead - discarding data";
-      outChData.emplace_back(channelData.ChId, 0.0, 0.0, 0);
       continue;
     }
     const float timeInPS = getTimeInPS(channelData);

Detectors/FIT/FT0/workflow/include/FT0Workflow/ReconstructionSpec.h

@@ -47,6 +47,7 @@ class ReconstructionDPL : public Task
   bool mUseTimeOffsetCalib = true;
   bool mUseSlewingCalib = true;
   bool mUseDeadChannelMap = true;
+  bool mUpdateDeadChannelMap = true;
   const std::string mCCDBpath = o2::base::NameConf::getCCDBServer();
   std::vector<o2::ft0::RecPoints> mRecPoints;
   std::vector<o2::ft0::ChannelDataFloat> mRecChData;

Detectors/FIT/FT0/workflow/src/ReconstructionSpec.cxx

@@ -44,6 +44,7 @@ void ReconstructionDPL::init(InitContext& ic)
   LOG(info) << "FT0 param mMinRMS: " << CalibParam::Instance().mMinRMS;
   LOG(info) << "FT0 param mMaxSigma: " << CalibParam::Instance().mMaxSigma;
   LOG(info) << "FT0 param mMaxDiffMean: " << CalibParam::Instance().mMaxDiffMean;
+  LOG(info) << "FT0 dead channel map will be applied " << mUseDeadChannelMap;
 }
 
 void ReconstructionDPL::run(ProcessingContext& pc)
@@ -70,10 +71,11 @@ void ReconstructionDPL::run(ProcessingContext& pc)
   }
 
   if (mUseDeadChannelMap) {
+    LOG(debug) << "Applying dead channel map";
     auto deadChannelMap = pc.inputs().get<o2::fit::DeadChannelMap*>("deadChannelMap");
     mReco.SetDeadChannelMap(deadChannelMap.get());
   }
-
+  
   mRecPoints.reserve(digits.size());
   mRecChData.reserve(channels.size());
   mReco.processTF(digits, channels, mRecPoints, mRecChData);
@@ -96,6 +98,11 @@ void ReconstructionDPL::finaliseCCDB(ConcreteDataMatcher& matcher, void* obj)
     mUseSlewingCalib = false; // upload only once, slewing should be stable during the run
     return;
   }
+  if (matcher == ConcreteDataMatcher("FT0", "DeadChannelMap", 0)) {
+    LOG(debug) << "New DeadChannelMap is uploaded";
+    mUpdateDeadChannelMap = false; 
+    return;
+  }
 }
 
 void ReconstructionDPL::endOfStream(EndOfStreamContext& ec)
@@ -128,6 +135,7 @@ DataProcessorSpec getReconstructionSpec(bool useMC, const std::string ccdbpath,
   }
 
   if (useDeadChannelMap) {
+    LOG(info) << "Dead channel map will be applied during reconstruction";
     inputSpec.emplace_back("deadChannelMap", o2::header::gDataOriginFT0, "DeadChannelMap", 0, Lifetime::Condition, ccdbParamSpec("FT0/Calib/DeadChannelMap"));
   }