FT0 calibration: fixed ROOT directory compilation, fixed CCDB output

Author: wpierozak

Detectors/FIT/FT0/calibration/include/FT0Calibration/EventsPerBcCalibrator.h

@@ -41,17 +41,18 @@ namespace o2::ft0
         public:
         EventsPerBcCalibrator() = default;
 
-        bool hasEnoughData(const Slot& slot) const final { return true; }
-        void initOutput() final;
-        void finalizeSlot(Slot& slot) final;
-        Slot& emplaceNewSlot(bool front, TFType tstart, TFType tend) final;
+        bool hasEnoughData(const Slot& slot) const override;
+        void initOutput() override;
+        void finalizeSlot(Slot& slot) override;
+        Slot& emplaceNewSlot(bool front, TFType tstart, TFType tend) override;
 
         const std::vector<std::unique_ptr<TH1F>>& getTvxPerBc() { return mTvxPerBcs; }
         std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>>& getTvxPerBcCcdbInfo() { return mTvxPerBcInfos; }
 
         private:
         std::vector<std::unique_ptr<TH1F>> mTvxPerBcs;
         std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
+        uint32_t mMinNumberOfEntries{1000};
 
         ClassDefOverride(EventsPerBcCalibrator, 1);
     };

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

@@ -10,11 +10,13 @@ namespace o2::ft0
 
     void EventsPerBc::fill(const gsl::span<const o2::ft0::Digit> data)
     {
+        size_t oldEntries = entries;
         for(const auto& digit: data) {
             double isVertex = digit.mTriggers.getVertex();
             mTvx[digit.mIntRecord.bc] += isVertex;
             entries += isVertex;
         }
+        LOG(debug) << "Container is filled with " << entries - oldEntries << " new VTX events";
     }
 
     void EventsPerBc::merge(const EventsPerBc* prev)
@@ -31,8 +33,14 @@ namespace o2::ft0
         mTvxPerBcInfos.clear();
     }
 
+    bool EventsPerBcCalibrator::hasEnoughData(const EventsPerBcCalibrator::Slot& slot) const
+    { 
+        return slot.getContainer()->entries > mMinNumberOfEntries;
+    }
+
     void EventsPerBcCalibrator::finalizeSlot(EventsPerBcCalibrator::Slot& slot)
     {
+        LOG(info) << "Finializing 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));
         for(int bin = 0; bin < o2::constants::lhc::LHCMaxBunches; bin++) {
@@ -42,6 +50,7 @@ namespace o2::ft0
         auto flName = o2::ccdb::CcdbApi::generateFileName(clName);
         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()));
+        LOG(info) << "Created new calibration object. Current number of objects: " << mTvxPerBcs.size();
     }
 
     EventsPerBcCalibrator::Slot& EventsPerBcCalibrator::emplaceNewSlot(bool front, TFType tstart, TFType tend)

Detectors/FIT/FT0/calibration/src/FT0CalibrationLinkDef.h

@@ -16,8 +16,9 @@
 #pragma link off all functions;
 
 #pragma link C++ class o2::ft0::FT0TimeOffsetSlotContainer + ;
-#pragma link C++ class o2::calibration::EventsPerBcCalibrator + ;
+#pragma link C++ class o2::ft0::EventsPerBcCalibrator + ;
 #pragma link C++ class o2::calibration::TimeSlot < o2::ft0::FT0TimeOffsetSlotContainer>;
 #pragma link C++ class o2::calibration::TimeSlotCalibration < o2::ft0::FT0TimeOffsetSlotContainer>;
-
+#pragma link C++ class o2::calibration::TimeSlot < o2::ft0::EventsPerBc> + ;
+#pragma link C++ class o2::calibration::TimeSlotCalibration < o2::ft0::EventsPerBc> + ;
 #endif

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

@@ -6,7 +6,8 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
     std::vector<InputSpec> inputs;
     inputs.emplace_back("digits", "FT0", "DIGITSBC");
     std::vector<OutputSpec> outputs;
-    outputs.emplace_back(ConcreteDataTypeMatcher{"FT0", "EventsPerBc"}, Lifetime::Sporadic);
+    outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc"}, Lifetime::Sporadic);
+    outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc"}, Lifetime::Sporadic);
     DataProcessorSpec dataProcessorSpec{
         "FT0EventsPerBcProcessor",
         inputs,

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

@@ -42,6 +42,9 @@ namespace o2::calibration
         void run(o2::framework::ProcessingContext& pc) final
         {
             auto digits = pc.inputs().get<gsl::span<o2::ft0::Digit>>("digits");
+            if(digits.size() == 0) {
+                return;
+            }
             mCalibrator->process(digits);
             if(mOneObjectPerRun == false) {
                 sendOutput(pc.outputs());
@@ -58,7 +61,6 @@ namespace o2::calibration
         void sendOutput(o2::framework::DataAllocator& output)
         {
             using o2::framework::Output;
-
             const auto& tvxHists = mCalibrator->getTvxPerBc();
             auto& infos = mCalibrator->getTvxPerBcCcdbInfo();
             for(int idx = 0; idx < tvxHists.size(); idx++){
@@ -68,8 +70,8 @@ namespace o2::calibration
                 auto image = o2::ccdb::CcdbApi::createObjectImage(payload.get(), info.get());
                 LOG(info) << "Sending object " << info->getPath() << "/" << info->getFileName() << " of size " << image->size()
                     << " bytes, valid for " << info->getStartValidityTimestamp() << " : " << info->getEndValidityTimestamp();
-                output.snapshot(Output{o2::header::gDataOriginFT0, "EventsPerBc", idx}, *image.get());
-                output.snapshot(Output{o2::header::gDataOriginFT0, "EventsPerBc", idx}, *info.get());
+                output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc", idx}, *image.get());
+                output.snapshot(Output{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc", idx}, *info.get());
             }
 
             if(tvxHists.size()) {