Changed type of EventsPerBc calibration object to std::array

Author: wpierozak

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

@@ -30,7 +30,7 @@ namespace o2::ft0
       const int32_t mMinAmplitudeSideA;
       const int32_t mMinAmplitudeSideC;
 
-      std::array<float, o2::constants::lhc::LHCMaxBunches> mTvx{0.0};
+      std::array<double, o2::constants::lhc::LHCMaxBunches> mTvx{0.0};
       size_t entries{0};
       long startTimeStamp{0};
       long stopTimeStamp{0};
@@ -42,27 +42,28 @@ namespace o2::ft0
     {
         using Slot = o2::calibration::TimeSlot<o2::ft0::EventsPerBc>;
         using TFType = o2::calibration::TFType;
+        using EventsHistogram = std::array<double, o2::constants::lhc::LHCMaxBunches>;
 
-        public:
-         EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC);
+       public:
+        EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC);
 
-         bool hasEnoughData(const Slot& slot) const override;
-         void initOutput() override;
-         void finalizeSlot(Slot& slot) override;
-         Slot& emplaceNewSlot(bool front, TFType tstart, TFType tend) override;
+        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; }
+        const std::vector<EventsHistogram>& getTvxPerBc() { return mTvxPerBcs; }
+        std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>>& getTvxPerBcCcdbInfo() { return mTvxPerBcInfos; }
 
-        private:
-         const uint32_t mMinNumberOfEntries;
-         const int32_t mMinAmplitudeSideA;
-         const int32_t mMinAmplitudeSideC;
+       private:
+        const uint32_t mMinNumberOfEntries;
+        const int32_t mMinAmplitudeSideA;
+        const int32_t mMinAmplitudeSideC;
 
-         std::vector<std::unique_ptr<TH1F>> mTvxPerBcs;
-         std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
+        std::vector<EventsHistogram> mTvxPerBcs;
+        std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
 
-         ClassDefOverride(EventsPerBcCalibrator, 1);
+        ClassDefOverride(EventsPerBcCalibrator, 1);
     };
 }
 

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

@@ -12,10 +12,10 @@ namespace o2::ft0
     {
         size_t oldEntries = entries;
         for(const auto& digit: data) {
-            float isVertex = digit.mTriggers.getVertex();
-            if (digit.mTriggers.getAmplA() < mMinAmplitudeSideA || digit.mTriggers.getAmplC() < mMinAmplitudeSideC) {
-              continue;
-            }
+          double isVertex = digit.mTriggers.getVertex();
+          if (digit.mTriggers.getAmplA() < mMinAmplitudeSideA || digit.mTriggers.getAmplC() < mMinAmplitudeSideC) {
+            continue;
+          }
             mTvx[digit.mIntRecord.bc] += isVertex;
             entries += isVertex;
         }
@@ -52,12 +52,11 @@ 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>("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) + ".root";
+        mTvxPerBcs.emplace_back(std::move(data->mTvx));
+
+        auto clName = o2::utils::MemFileHelper::getClassName(mTvxPerBcs.back());
+        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/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

@@ -26,8 +26,8 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
         {"slot-len-tf", VariantType::UInt32, 0u, {"Slot length in Time Frames (TFs)"}},
         {"one-object-per-run", VariantType::Bool, false, {"If set, workflow creates only one calibration object per run"}},
         {"min-entries-number", VariantType::UInt32, 0u, {"Minimum number of entries required for a slot to be valid"}},
-        {"min-ampl-side-a", VariantType::Int, std::numeric_limits<int32_t>::min(), {"Amplitude threshold for Side A events"}},
-        {"min-ampl-side-c", VariantType::Int, std::numeric_limits<int32_t>::min(), {"Amplitude threshold for Side C events"}}}};
+        {"min-ampl-side-a", VariantType::Int, 0, {"Amplitude threshold for Side A events"}},
+        {"min-ampl-side-c", VariantType::Int, 0, {"Amplitude threshold for Side C events"}}}};
 
     WorkflowSpec workflow;
     workflow.emplace_back(dataProcessorSpec);

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

@@ -97,7 +97,7 @@ namespace o2::calibration
               auto& info = infos[idx];
               const auto& payload = tvxHists[idx];
 
-              auto image = o2::ccdb::CcdbApi::createObjectImage(payload.get(), info.get());
+              auto image = o2::ccdb::CcdbApi::createObjectImage(&payload, 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::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc", idx}, *image.get());

Detectors/FIT/FT0/macros/CMakeLists.txt

@@ -12,3 +12,7 @@ o2_add_test_root_macro(FT0Misaligner.C
                        PUBLIC_LINK_LIBRARIES O2::CCDB
                        O2::FT0Simulation
                        LABELS ft0)
+                       
+o2_add_test_root_macro(FT0readEventsPerBc.C
+                       PUBLIC_LINK_LIBRARIES O2::CCDB
+                       LABELS ft0)

Detectors/FIT/FT0/macros/FT0readEventsPerBc.C

@@ -0,0 +1,42 @@
+
+#if !defined(__CLING__) || defined(__ROOTCLING__)
+
+#include <iostream>
+#include <array>
+#include "CCDB/CcdbApi.h"
+#include "TH1F.h"
+#endif
+
+#include "Framework/Logger.h"
+#include "CommonConstants/LHCConstants.h"
+
+using EventsArray = std::array<double, o2::constants::lhc::LHCMaxBunches>;
+std::unique_ptr<TH1F> hist;
+std::unique_ptr<TCanvas> canvas;
+
+void FT0readEventsPerBc(std::string ccdbUrl, long timestamp)
+{
+  o2::ccdb::CcdbApi ccdbApi;
+  ccdbApi.init(ccdbUrl);
+  const std::string ccdbPath = "FT0/Calib/EventsPerBc";
+  std::map<std::string, std::string> metadata;
+
+  if (timestamp < 0) {
+    timestamp = o2::ccdb::getCurrentTimestamp();
+  }
+
+  EventsArray* events = ccdbApi.retrieveFromTFileAny<EventsArray>(ccdbPath, metadata, timestamp);
+
+  if (!events) {
+    LOGP(fatal, "EventsPerBc object not found in {}/{} for timestamp {}.", ccdbUrl, ccdbPath, timestamp);
+    return;
+  }
+
+  hist = std::make_unique<TH1F>("eventsPerBcHist", "Events per BC", o2::constants::lhc::LHCMaxBunches, 0, o2::constants::lhc::LHCMaxBunches - 1);
+  for (int idx = 0; idx < LhcOrbits; idx++) {
+    hist->Fill(idx, (*events)[idx]);
+  }
+  canvas = std::make_unique<TCanvas>();
+  hist->Draw();
+  canvas->Draw();
+}