FT0: Changed calibration object name, implemented missing OrbitReset fetching

Author: wpierozak

Detectors/FIT/FT0/calibration/README.md

@@ -2,7 +2,7 @@
 
 ## Events per BC Calibration
 ### Description
-Generates histograms of **TVX per Bunch Crossing (BC)**. Events can be filtered by applying amplitude thresholds to the **A-side** and **C-side**.
+Generates histograms of **Events per Bunch Crossing (BC)**. Events can be filtered by applying amplitude thresholds to the **A-side** and **C-side**.
 
 ### Command-Line Options
 | Option | Default | Description |

Detectors/FIT/FT0/calibration/src/EventsPerBcCalibrator.cxx

@@ -52,14 +52,14 @@ namespace o2::ft0
     {
         LOG(info) << "Finalizing slot from " << slot.getStartTimeMS() << " to " << slot.getEndTimeMS();
         o2::ft0::EventsPerBc* data = slot.getContainer();
-        mTvxPerBcs.emplace_back(std::make_unique<TH1F>("TvxPerBc", "FT0 TVX per BC", o2::constants::lhc::LHCMaxBunches, 0, o2::constants::lhc::LHCMaxBunches - 1));
+        mTvxPerBcs.emplace_back(std::make_unique<TH1F>("EventsPerBc", "FT0 Events per BC", o2::constants::lhc::LHCMaxBunches, 0, o2::constants::lhc::LHCMaxBunches - 1));
         for (int bin = 0; bin < o2::constants::lhc::LHCMaxBunches; bin++) {
             mTvxPerBcs.back()->Fill(bin, data->mTvx[bin]);
         }
         auto clName = o2::utils::MemFileHelper::getClassName(*mTvxPerBcs.back());
-        auto flName = o2::ccdb::CcdbApi::generateFileName(clName);
+        auto flName = o2::ccdb::CcdbApi::generateFileName(clName) + ".root";
         std::map<std::string, std::string> metaData;
-        mTvxPerBcInfos.emplace_back(std::make_unique<o2::ccdb::CcdbObjectInfo>("FT0/Calib/TvxPerBc", clName, flName, metaData, slot.getStartTimeMS(), slot.getEndTimeMS()));
+        mTvxPerBcInfos.emplace_back(std::make_unique<o2::ccdb::CcdbObjectInfo>("FT0/Calib/EventsPerBc", clName, flName, metaData, slot.getStartTimeMS(), slot.getEndTimeMS()));
         LOG(info) << "Created object valid from " << mTvxPerBcInfos.back()->getStartValidityTimestamp() << " to " << mTvxPerBcInfos.back()->getEndValidityTimestamp();
     }
 

Detectors/FIT/FT0/calibration/workflow/FT0EventsPerBcProcessor-Workflow.cxx

@@ -5,6 +5,13 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
     using namespace o2::framework;
     using o2::calibration::FT0EventsPerBcProcessor;
     std::vector<InputSpec> inputs;
+    auto ccdbRequest = std::make_shared<o2::base::GRPGeomRequest>(true,                           // orbitResetTime
+                                                                false,                           // GRPECS=true
+                                                                false,                          // GRPLHCIF
+                                                                false,                          // GRPMagField
+                                                                false,                          // askMatLUT
+                                                                o2::base::GRPGeomRequest::None, // geometry
+                                                                inputs);
     inputs.emplace_back("digits", "FT0", "DIGITSBC");
     std::vector<OutputSpec> outputs;
     outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc"}, Lifetime::Sporadic);
@@ -13,7 +20,7 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
       "FT0EventsPerBcProcessor",
       inputs,
       outputs,
-      AlgorithmSpec(adaptFromTask<FT0EventsPerBcProcessor>()),
+      AlgorithmSpec(adaptFromTask<FT0EventsPerBcProcessor>(ccdbRequest)),
       Options{
         {"slot-len-sec", VariantType::UInt32, 3600u, {"Duration of each slot in seconds"}},
         {"slot-len-tf", VariantType::UInt32, 0u, {"Slot length in Time Frames (TFs)"}},

Detectors/FIT/FT0/calibration/workflow/FT0EventsPerBcSpec.h

@@ -10,6 +10,7 @@
 #include "Framework/WorkflowSpec.h"
 #include "Framework/Task.h"
 #include "DetectorsCalibration/Utils.h"
+#include "DetectorsBase/GRPGeomHelper.h"
 
 #include "DataFormatsFT0/Digit.h"
 #include "FT0Calibration/EventsPerBcCalibrator.h"
@@ -20,10 +21,11 @@ namespace o2::calibration
     class FT0EventsPerBcProcessor final : public o2::framework::Task
     {
         public:
-        FT0EventsPerBcProcessor() = default;
+        FT0EventsPerBcProcessor(std::shared_ptr<o2::base::GRPGeomRequest> request): mCCDBRequest(request) {}
 
         void init(o2::framework::InitContext& ic) final
         {
+          o2::base::GRPGeomHelper::instance().setRequest(mCCDBRequest);
           if (ic.options().hasOption("slot-len-sec")) {
             mSlotLenSec = ic.options().get<uint32_t>("slot-len-sec");
           }
@@ -59,8 +61,14 @@ namespace o2::calibration
           }
         }
 
+        void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj)
+        {
+          o2::base::GRPGeomHelper::instance().finaliseCCDB(matcher, obj);
+        }
+
         void run(o2::framework::ProcessingContext& pc) final
         {
+            o2::base::GRPGeomHelper::instance().checkUpdates(pc);
             auto digits = pc.inputs().get<gsl::span<o2::ft0::Digit>>("digits");
             o2::base::TFIDInfoHelper::fillTFIDInfo(pc, mCalibrator->getCurrentTFInfo());
             if(digits.size() == 0) {
@@ -102,6 +110,7 @@ namespace o2::calibration
         }
 
         private:
+        std::shared_ptr<o2::base::GRPGeomRequest> mCCDBRequest;
         std::unique_ptr<o2::ft0::EventsPerBcCalibrator> mCalibrator;
         bool mOneObjectPerRun;
         uint32_t mSlotLenSec;