FT0: Removed from EventsPerBc calibarion option to define slot lenght in TFs; Small code cleaning

Author: wpierozak

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

@@ -23,12 +23,10 @@ void EventsPerBcContainer::fill(const o2::dataformats::TFIDInfo& ti, const gsl::
 {
   size_t oldEntries = entries;
   for (const auto& digit : data) {
-    double isVertex = digit.mTriggers.getVertex();
-    if (digit.mTriggers.getAmplA() < mMinAmplitudeSideA || digit.mTriggers.getAmplC() < mMinAmplitudeSideC) {
-      continue;
+    if (digit.mTriggers.getVertex() && digit.mTriggers.getAmplA() >= mMinAmplitudeSideA &&  digit.mTriggers.getAmplC() >= mMinAmplitudeSideC) {
+      mTvx[digit.mIntRecord.bc]++;
+      entries++;
     }
-    mTvx[digit.mIntRecord.bc] += isVertex;
-    entries += isVertex;
   }
   LOG(debug) << "Container is filled with " << entries - oldEntries << " new events";
 }
@@ -69,7 +67,7 @@ void EventsPerBcCalibrator::finalizeSlot(EventsPerBcCalibrator::Slot& slot)
   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/EventsPerBcContainer", 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

@@ -36,9 +36,8 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
     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)"}},
       {"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-entries-number", VariantType::UInt32, 5000, {"Minimum number of entries required for a slot to be valid"}},
       {"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"}}}};
 

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

@@ -41,9 +41,6 @@ class FT0EventsPerBcProcessor final : public o2::framework::Task
     if (ic.options().hasOption("one-object-per-run")) {
       mOneObjectPerRun = ic.options().get<bool>("one-object-per-run");
     }
-    if (ic.options().hasOption("slot-len-tf")) {
-      mSlotLen = ic.options().get<o2::calibration::TFType>("slot-len-tf");
-    }
     if (ic.options().hasOption("min-entries-number")) {
       mMinNumberOfEntries = ic.options().get<uint32_t>("min-entries-number");
     }
@@ -60,14 +57,10 @@ class FT0EventsPerBcProcessor final : public o2::framework::Task
       LOG(info) << "Only one object will be created at the end of run";
       mCalibrator->setUpdateAtTheEndOfRunOnly();
     }
-    if (mOneObjectPerRun == false && mSlotLen == 0) {
+    if (mOneObjectPerRun == false) {
       LOG(info) << "Defined slot interval to " << mSlotLenSec << " seconds";
       mCalibrator->setSlotLengthInSeconds(mSlotLenSec);
     }
-    if (mOneObjectPerRun == false && mSlotLen != 0) {
-      LOG(info) << "Defined slot interval to " << mSlotLen << " TFS";
-      mCalibrator->setSlotLength(mSlotLen);
-    }
   }
 
   void finaliseCCDB(o2::framework::ConcreteDataMatcher& matcher, void* obj)
@@ -123,7 +116,6 @@ class FT0EventsPerBcProcessor final : public o2::framework::Task
   std::unique_ptr<o2::ft0::EventsPerBcCalibrator> mCalibrator;
   bool mOneObjectPerRun;
   uint32_t mSlotLenSec;
-  o2::calibration::TFType mSlotLen;
   uint32_t mMinNumberOfEntries;
   int32_t mMinAmplitudeSideA;
   int32_t mMinAmplitudeSideC;

Detectors/FIT/FT0/macros/CMakeLists.txt

@@ -15,5 +15,7 @@ o2_add_test_root_macro(FT0Misaligner.C
                        LABELS ft0)
 
 o2_add_test_root_macro(FT0readEventsPerBc.C
-                       PUBLIC_LINK_LIBRARIES O2::CCDB
+                       PUBLIC_LINK_LIBRARIES
+                       O2::CCDB
+                       O2::DataFormatsFT0
                        LABELS ft0)

Detectors/FIT/FT0/macros/FT0readEventsPerBc.C

@@ -12,12 +12,14 @@
 #if !defined(__CLING__) || defined(__ROOTCLING__)
 #include <iostream>
 #include <array>
+#endif
+
 #include "CCDB/CcdbApi.h"
+#include "CCDB/CCDBTimeStampUtils.h"
 #include "TH1F.h"
 #include "DataFormatsFT0/EventsPerBc.h"
 #include "Framework/Logger.h"
 #include "CommonConstants/LHCConstants.h"
-#endif
 
 std::unique_ptr<TH1F> hist;
 std::unique_ptr<TCanvas> canvas;
@@ -33,7 +35,7 @@ void FT0readEventsPerBc(std::string ccdbUrl, long timestamp)
     timestamp = o2::ccdb::getCurrentTimestamp();
   }
 
-  EventsArray* events = ccdbApi.retrieveFromTFileAny<o2::ft0::EventsPerBc>(ccdbPath, metadata, timestamp);
+  std::unique_ptr<o2::ft0::EventsPerBc> events(ccdbApi.retrieveFromTFileAny<o2::ft0::EventsPerBc>(ccdbPath, metadata, timestamp));
 
   if (!events) {
     LOGP(fatal, "EventsPerBc object not found in {}/{} for timestamp {}.", ccdbUrl, ccdbPath, timestamp);