FT0: fixed bugs after rebase

Author: wpierozak

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

@@ -19,23 +19,13 @@
 
 namespace o2::ft0
 {
-<<<<<<< HEAD
-struct EventsPerBc {
-  EventsPerBc(int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC) {}
-
-  size_t getEntries() const { return entries; }
-  void print() const;
-  void fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data);
-  void merge(const EventsPerBc* prev);
-=======
 struct EventsPerBcContainer {
   EventsPerBcContainer(int32_t minAmplitudeSideA, int32_t minAmplitudeSideC) : mMinAmplitudeSideA(minAmplitudeSideA), mMinAmplitudeSideC(minAmplitudeSideC) {}
 
   size_t getEntries() const { return entries; }
   void print() const;
   void fill(const o2::dataformats::TFIDInfo& ti, const gsl::span<const o2::ft0::Digit> data);
   void merge(const EventsPerBcContainer* prev);
->>>>>>> b9ec63cd4d (Created CCDB object class for EvetnsPerBC calibration)
 
   const int32_t mMinAmplitudeSideA;
   const int32_t mMinAmplitudeSideC;
@@ -45,16 +35,6 @@ struct EventsPerBcContainer {
   long startTimeStamp{0};
   long stopTimeStamp{0};
 
-<<<<<<< HEAD
-  ClassDefNV(EventsPerBc, 1);
-};
-
-class EventsPerBcCalibrator final : public o2::calibration::TimeSlotCalibration<o2::ft0::EventsPerBc>
-{
-  using Slot = o2::calibration::TimeSlot<o2::ft0::EventsPerBc>;
-  using TFType = o2::calibration::TFType;
-  using EventsHistogram = std::array<double, o2::constants::lhc::LHCMaxBunches>;
-=======
   ClassDefNV(EventsPerBcContainer, 1);
 };
 
@@ -63,7 +43,6 @@ class EventsPerBcCalibrator final : public o2::calibration::TimeSlotCalibration<
   using Slot = o2::calibration::TimeSlot<o2::ft0::EventsPerBcContainer>;
   using TFType = o2::calibration::TFType;
   using EventsHistogram = std::array<double, o2::constants::lhc::LHCMaxBunches>;
->>>>>>> b9ec63cd4d (Created CCDB object class for EvetnsPerBC calibration)
 
  public:
   EventsPerBcCalibrator(uint32_t minNumberOfEntries, int32_t minAmplitudeSideA, int32_t minAmplitudeSideC);
@@ -73,26 +52,16 @@ class EventsPerBcCalibrator final : public o2::calibration::TimeSlotCalibration<
   void finalizeSlot(Slot& slot) override;
   Slot& emplaceNewSlot(bool front, TFType tstart, TFType tend) override;
 
-<<<<<<< HEAD
-  const std::vector<EventsHistogram>& getTvxPerBc() { return mTvxPerBcs; }
-  std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>>& getTvxPerBcCcdbInfo() { return mTvxPerBcInfos; }
-=======
   const std::vector<EventsPerBc>& getTvxPerBc() { return mTvxPerBcs; }
   std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>>& getTvxPerBcCcdbInfo() { return mTvxPerBcInfos; }
->>>>>>> b9ec63cd4d (Created CCDB object class for EvetnsPerBC calibration)
 
  private:
   const uint32_t mMinNumberOfEntries;
   const int32_t mMinAmplitudeSideA;
   const int32_t mMinAmplitudeSideC;
 
-<<<<<<< HEAD
-  std::vector<EventsHistogram> mTvxPerBcs;
-  std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
-=======
   std::vector<EventsPerBc> mTvxPerBcs;
   std::vector<std::unique_ptr<o2::ccdb::CcdbObjectInfo>> mTvxPerBcInfos;
->>>>>>> b9ec63cd4d (Created CCDB object class for EvetnsPerBC calibration)
 
   ClassDefOverride(EventsPerBcCalibrator, 1);
 };

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

@@ -1,45 +1,20 @@
 #include "FT0EventsPerBcSpec.h"
+#include "Framework/Lifetime.h"
 #include <limits>
 
 o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& cfgc)
 {
-<<<<<<< HEAD
-  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
-=======
   using namespace o2::framework;
   using o2::calibration::FT0EventsPerBcProcessor;
   std::vector<InputSpec> inputs;
   inputs.emplace_back("digits", "FT0", "DIGITSBC", Lifetime::Timeframe);
   auto ccdbRequest = std::make_shared<o2::base::GRPGeomRequest>(true,  // orbitResetTime
                                                                 false, // GRPECS=true
->>>>>>> b9ec63cd4d (Created CCDB object class for EvetnsPerBC calibration)
                                                                 false,                          // GRPLHCIF
                                                                 false,                          // GRPMagField
                                                                 false,                          // askMatLUT
                                                                 o2::base::GRPGeomRequest::None, // geometry
                                                                 inputs);
-<<<<<<< HEAD
-  inputs.emplace_back("digits", "FT0", "DIGITSBC");
-  std::vector<OutputSpec> outputs;
-  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,
-    outputs,
-    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-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"}}}};
-=======
   std::vector<OutputSpec> outputs;
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBWrapper, "EventsPerBc"}, Lifetime::Timeframe);
   outputs.emplace_back(ConcreteDataTypeMatcher{o2::calibration::Utils::gDataOriginCDBPayload, "EventsPerBc"}, Lifetime::Timeframe);
@@ -55,7 +30,6 @@ o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext co
       {"min-entries-number", VariantType::UInt32, 0u, {"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"}}}};
->>>>>>> b9ec63cd4d (Created CCDB object class for EvetnsPerBC calibration)
 
   WorkflowSpec workflow;
   workflow.emplace_back(dataProcessorSpec);

Detectors/FIT/FT0/macros/FT0readEventsPerBc.C

@@ -1,14 +1,13 @@
 #if !defined(__CLING__) || defined(__ROOTCLING__)
-
 #include <iostream>
 #include <array>
 #include "CCDB/CcdbApi.h"
 #include "TH1F.h"
-#endif
-
+#include "DataFormatsFT0/EventsPerBc.h"
 #include "Framework/Logger.h"
 #include "CommonConstants/LHCConstants.h"
-#include "DataFormatsFT0/EventsPerBc.h"
+#endif
+
 
 std::unique_ptr<TH1F> hist;
 std::unique_ptr<TCanvas> canvas;