mv calib api and event maker to tof base

AliceO2Group · Nov 22, 2021 · d3d2ce4 · d3d2ce4
1 parent f3c6fd9
commit d3d2ce4
Show file tree

Hide file tree

Showing 24 changed files with 42 additions and 31 deletions.
diff --git a/DataFormats/Detectors/TOF/include/DataFormatsTOF/CalibTimeSlewingParamTOF.h b/DataFormats/Detectors/TOF/include/DataFormatsTOF/CalibTimeSlewingParamTOF.h
@@ -32,7 +32,7 @@ class CalibTimeSlewingParamTOF
 
   CalibTimeSlewingParamTOF();
 
-  CalibTimeSlewingParamTOF(const CalibTimeSlewingParamTOF& source) = default;
+  CalibTimeSlewingParamTOF(const CalibTimeSlewingParamTOF& source);
 
   CalibTimeSlewingParamTOF& operator=(const CalibTimeSlewingParamTOF& source) = default;
 

diff --git a/DataFormats/Detectors/TOF/src/CalibTimeSlewingParamTOF.cxx b/DataFormats/Detectors/TOF/src/CalibTimeSlewingParamTOF.cxx
@@ -185,7 +185,20 @@ CalibTimeSlewingParamTOF& CalibTimeSlewingParamTOF::operator+=(const CalibTimeSl
       (*(mChannelStart[i])) = (*(other.mChannelStart[i]));
       *(mFractionUnderPeak[i]) = *(other.mFractionUnderPeak[i]);
       *(mSigmaPeak[i]) = *(other.mSigmaPeak[i]);
+      *(mGlobalOffset[i]) = *(other.mGlobalOffset[i]);
     }
   }
   return *this;
 }
+//______________________________________________
+CalibTimeSlewingParamTOF::CalibTimeSlewingParamTOF(const CalibTimeSlewingParamTOF& source)
+{
+  bind();
+  for (int i = 0; i < NSECTORS; i++) {
+    *(mTimeSlewing[i]) = *(source.mTimeSlewing[i]);
+    (*(mChannelStart[i])) = (*(source.mChannelStart[i]));
+    *(mFractionUnderPeak[i]) = *(source.mFractionUnderPeak[i]);
+    *(mSigmaPeak[i]) = *(source.mSigmaPeak[i]);
+    *(mGlobalOffset[i]) = *(source.mGlobalOffset[i]);
+  }
+}
diff --git a/Detectors/GlobalTrackingWorkflow/src/TOFEventTimeChecker.cxx b/Detectors/GlobalTrackingWorkflow/src/TOFEventTimeChecker.cxx
@@ -37,7 +37,7 @@
 #include "TOFBase/Geo.h"
 #include "TOFBase/Utils.h"
 #include "DataFormatsTOF/Cluster.h"
-#include "TOFReconstruction/EventTimeMaker.h"
+#include "TOFBase/EventTimeMaker.h"
 //#include "GlobalTracking/MatchTOF.h"
 #include "GlobalTrackingWorkflow/TOFEventTimeChecker.h"
 

diff --git a/Detectors/TOF/base/CMakeLists.txt b/Detectors/TOF/base/CMakeLists.txt
@@ -17,13 +17,16 @@ o2_add_library(TOFBase
                        src/Strip.cxx
                        src/WindowFiller.cxx
                        src/Utils.cxx
+                       src/CalibTOFapi.cxx
+                       src/EventTimeMaker.cxx
                PUBLIC_LINK_LIBRARIES Boost::serialization FairRoot::Base Microsoft.GSL::GSL
                                      O2::DetectorsBase O2::CommonDataFormat O2::DetectorsRaw
                                      O2::DataFormatsTOF)
 
 o2_target_root_dictionary(TOFBase
                           HEADERS include/TOFBase/Geo.h include/TOFBase/Digit.h include/TOFBase/Utils.h
-                                  include/TOFBase/Strip.h include/TOFBase/WindowFiller.h)
+                                  include/TOFBase/Strip.h include/TOFBase/WindowFiller.h include/TOFBase/CalibTOFapi.h
+                                  include/TOFBase/EventTimeMaker.h)
 
 o2_add_test(TOFIndex
             SOURCES test/testTOFIndex.cxx

diff --git a/...tion/include/TOFCalibration/CalibTOFapi.h → ...rs/TOF/base/include/TOFBase/CalibTOFapi.h b/...tion/include/TOFCalibration/CalibTOFapi.h → ...rs/TOF/base/include/TOFBase/CalibTOFapi.h
diff --git a/...nclude/TOFReconstruction/EventTimeMaker.h → ...TOF/base/include/TOFBase/EventTimeMaker.h b/...nclude/TOFReconstruction/EventTimeMaker.h → ...TOF/base/include/TOFBase/EventTimeMaker.h
diff --git a/...ctors/TOF/calibration/src/CalibTOFapi.cxx → Detectors/TOF/base/src/CalibTOFapi.cxx b/...ctors/TOF/calibration/src/CalibTOFapi.cxx → Detectors/TOF/base/src/CalibTOFapi.cxx
@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 #include "FairLogger.h" // for LOG
 
 using namespace o2::tof;

diff --git a/...TOF/reconstruction/src/EventTimeMaker.cxx → Detectors/TOF/base/src/EventTimeMaker.cxx b/...TOF/reconstruction/src/EventTimeMaker.cxx → Detectors/TOF/base/src/EventTimeMaker.cxx
@@ -19,7 +19,7 @@
 
 #include "TRandom.h"
 #include "TMath.h"
-#include "TOFReconstruction/EventTimeMaker.h"
+#include "TOFBase/EventTimeMaker.h"
 
 namespace o2
 {

diff --git a/Detectors/TOF/base/src/TOFBaseLinkDef.h b/Detectors/TOF/base/src/TOFBaseLinkDef.h
@@ -25,5 +25,10 @@
 #pragma link C++ class vector < o2::tof::ReadoutWindowData> + ;
 #pragma link C++ class o2::tof::DigitHeader + ;
 #pragma link C++ class vector < o2::tof::DigitHeader> + ;
+#pragma link C++ class o2::tof::CalibTOFapi + ;
+#pragma link C++ class o2::tof::eventTimeTrack + ;
+#pragma link C++ class o2::tof::eventTimeTrackTest + ;
+#pragma link C++ class vector < o2::tof::eventTimeTrack> + ;
+#pragma link C++ class vector < o2::tof::eventTimeTrackTest> + ;
 #pragma link C++ class vector < unsigned int> + ;
 #endif
diff --git a/Detectors/TOF/calibration/CMakeLists.txt b/Detectors/TOF/calibration/CMakeLists.txt
@@ -11,8 +11,7 @@
 
 o2_add_library(TOFCalibration
                TARGETVARNAME targetName
-               SOURCES src/CalibTOFapi.cxx
-                       src/CalibTOF.cxx
+               SOURCES src/CalibTOF.cxx
                        src/CollectCalibInfoTOF.cxx
                        src/LHCClockCalibrator.cxx
                        src/TOFChannelCalibrator.cxx
@@ -30,8 +29,7 @@ o2_add_library(TOFCalibration
 
 
 o2_target_root_dictionary(TOFCalibration
-                          HEADERS include/TOFCalibration/CalibTOFapi.h
-                                  include/TOFCalibration/CalibTOF.h
+                          HEADERS include/TOFCalibration/CalibTOF.h
                                   include/TOFCalibration/LHCClockCalibrator.h
                                   include/TOFCalibration/TOFChannelCalibrator.h
                                   include/TOFCalibration/TOFCalibCollector.h

diff --git a/Detectors/TOF/calibration/include/TOFCalibration/CalibTOF.h b/Detectors/TOF/calibration/include/TOFCalibration/CalibTOF.h
@@ -31,7 +31,7 @@
 #include "TF1.h"
 #include "TFile.h"
 #include "TGraphErrors.h"
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 
 class TTree;
 

diff --git a/Detectors/TOF/calibration/include/TOFCalibration/LHCClockCalibrator.h b/Detectors/TOF/calibration/include/TOFCalibration/LHCClockCalibrator.h
@@ -15,7 +15,7 @@
 #include "DetectorsCalibration/TimeSlotCalibration.h"
 #include "DetectorsCalibration/TimeSlot.h"
 #include "DataFormatsTOF/CalibInfoTOF.h"
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 #include "DataFormatsTOF/CalibLHCphaseTOF.h"
 #include "TOFBase/Geo.h"
 #include "CCDB/CcdbObjectInfo.h"

diff --git a/Detectors/TOF/calibration/include/TOFCalibration/TOFChannelCalibrator.h b/Detectors/TOF/calibration/include/TOFCalibration/TOFChannelCalibrator.h
@@ -19,7 +19,7 @@
 #include "DataFormatsTOF/CalibLHCphaseTOF.h"
 #include "TOFBase/Geo.h"
 #include "CCDB/CcdbObjectInfo.h"
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 
 #include <array>
 #include <boost/histogram.hpp>

diff --git a/Detectors/TOF/calibration/src/TOFCalibrationLinkDef.h b/Detectors/TOF/calibration/src/TOFCalibrationLinkDef.h
@@ -15,7 +15,6 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class o2::tof::CalibTOFapi + ;
 #pragma link C++ class o2::globaltracking::CalibTOF + ;
 #pragma link C++ class o2::globaltracking::CollectCalibInfoTOF + ;
 

diff --git a/Detectors/TOF/calibration/src/TOFChannelCalibrator.cxx b/Detectors/TOF/calibration/src/TOFChannelCalibrator.cxx
@@ -89,7 +89,7 @@ void TOFChannelData::fill(const gsl::span<const o2::dataformats::CalibInfoTOF> d
 
     dtcorr = Utils::subtractInteractionBC(dtcorr, true);
 
-    LOG(INFO) << "inserting in channel " << ch << ": dt = " << Utils::subtractInteractionBC(dt, true) << ", tot = " << tot << ", corr = " << corr << ", corrected dt = " << dtcorr;
+    LOG(DEBUG) << "inserting in channel " << ch << ": dt = " << Utils::subtractInteractionBC(dt, true) << ", tot = " << tot << ", corr = " << corr << ", corrected dt = " << dtcorr;
 
 #ifdef DEBUGGING
     mChannelDist->Fill(ch, dtcorr);
@@ -425,7 +425,7 @@ void TOFChannelCalibrator<T>::finalizeSlotWithCosmics(Slot& slot)
   // for the CCDB entry
   std::map<std::string, std::string> md;
   TimeSlewing& ts = mCalibTOFapi->getSlewParamObj(); // we take the current CCDB object, since we want to simply update the offset
-  ts.bind();
+                                                     //  ts.bind();
 
   int nbins = c->getNbins();
   float range = c->getRange();
@@ -642,7 +642,7 @@ void TOFChannelCalibrator<T>::finalizeSlotWithTracks(Slot& slot)
   // for the CCDB entry
   std::map<std::string, std::string> md;
   TimeSlewing& ts = mCalibTOFapi->getSlewParamObj(); // we take the current CCDB object, since we want to simply update the offset
-  ts.bind();
+  //  ts.bind();
 
 #ifdef WITH_OPENMP
   if (mNThreads < 1) {

diff --git a/Detectors/TOF/prototyping/macroEvTime.C b/Detectors/TOF/prototyping/macroEvTime.C
@@ -1,5 +1,5 @@
 #if !defined(__CLING__) || defined(__ROOTCLING__)
-#include "TOFReconstruction/EventTimeMaker.h"
+#include "TOFBase/EventTimeMaker.h"
 #endif
 
 using namespace o2::tof;

diff --git a/Detectors/TOF/prototyping/testCCDB.C b/Detectors/TOF/prototyping/testCCDB.C
@@ -3,7 +3,7 @@
 #include <string>
 #include "TTree.h"
 #include "TFile.h"
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 #include "DataFormatsTOF/CalibTimeSlewingParamTOF.h"
 #include "DataFormatsTOF/CalibLHCphaseTOF.h"
 #endif

diff --git a/Detectors/TOF/reconstruction/CMakeLists.txt b/Detectors/TOF/reconstruction/CMakeLists.txt
@@ -15,14 +15,13 @@ o2_add_library(TOFReconstruction
                	       src/DecoderBase.cxx
                        src/Decoder.cxx
                        src/CTFCoder.cxx
-                       src/EventTimeMaker.cxx
                        src/CosmicProcessor.cxx
                PUBLIC_LINK_LIBRARIES O2::TOFBase O2::DataFormatsTOF
                                      O2::SimulationDataFormat
                                      O2::CommonDataFormat
                                      O2::DataFormatsTOF
                                      O2::rANS O2::DPLUtils
-                                     O2::TOFCalibration O2::DetectorsRaw)
+                                     O2::DetectorsRaw)
 
 o2_target_root_dictionary(TOFReconstruction
                           HEADERS include/TOFReconstruction/DataReader.h
@@ -32,5 +31,4 @@ o2_target_root_dictionary(TOFReconstruction
                                   include/TOFReconstruction/DecoderBase.h
                                   include/TOFReconstruction/Decoder.h
                                   include/TOFReconstruction/CTFCoder.h
-                                  include/TOFReconstruction/EventTimeMaker.h
                                   include/TOFReconstruction/CosmicProcessor.h)
diff --git a/Detectors/TOF/reconstruction/include/TOFReconstruction/Clusterer.h b/Detectors/TOF/reconstruction/include/TOFReconstruction/Clusterer.h
@@ -22,7 +22,7 @@
 #include "TOFReconstruction/DataReader.h"
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "SimulationDataFormat/MCCompLabel.h"
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 #include "DataFormatsTOF/Diagnostic.h"
 
 namespace o2

diff --git a/Detectors/TOF/reconstruction/src/TOFReconstructionLinkDef.h b/Detectors/TOF/reconstruction/src/TOFReconstructionLinkDef.h
@@ -23,9 +23,5 @@
 #pragma link C++ class o2::tof::compressed::Decoder + ;
 #pragma link C++ class o2::tof::CTFCoder + ;
 #pragma link C++ class o2::tof::CosmicProcessor + ;
-#pragma link C++ class o2::tof::eventTimeTrack + ;
-#pragma link C++ class o2::tof::eventTimeTrackTest + ;
-#pragma link C++ class vector < o2::tof::eventTimeTrack> + ;
-#pragma link C++ class vector < o2::tof::eventTimeTrackTest> + ;
 
 #endif
diff --git a/Detectors/TOF/simulation/include/TOFSimulation/Digitizer.h b/Detectors/TOF/simulation/include/TOFSimulation/Digitizer.h
@@ -19,7 +19,7 @@
 #include "TOFSimulation/Detector.h"
 #include "SimulationDataFormat/MCTruthContainer.h"
 #include "TOFSimulation/MCLabel.h"
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 
 namespace o2
 {

diff --git a/Detectors/TOF/workflow/src/TOFClusterizerSpec.cxx b/Detectors/TOF/workflow/src/TOFClusterizerSpec.cxx
@@ -26,7 +26,7 @@
 #include "SimulationDataFormat/MCCompLabel.h"
 #include "DataFormatsTOF/CalibLHCphaseTOF.h"
 #include "DataFormatsTOF/CalibTimeSlewingParamTOF.h"
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 #include "TStopwatch.h"
 #include "Framework/ConfigParamRegistry.h"
 #include "Framework/DataRefUtils.h"

diff --git a/Steer/DigitizerWorkflow/src/TOFDigitizerSpec.cxx b/Steer/DigitizerWorkflow/src/TOFDigitizerSpec.cxx
@@ -26,7 +26,7 @@
 #include <SimulationDataFormat/MCTruthContainer.h>
 #include "DataFormatsTOF/CalibLHCphaseTOF.h"
 #include "DataFormatsTOF/CalibTimeSlewingParamTOF.h"
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 #include "SimConfig/DigiParams.h"
 #include "DetectorsBase/BaseDPLDigitizer.h"
 

diff --git a/macro/run_clus_tof.C b/macro/run_clus_tof.C
@@ -30,10 +30,9 @@
 #include "TOFReconstruction/ClustererTask.h"
 #include "DataFormatsTOF/CalibLHCphaseTOF.h"
 #include "DataFormatsTOF/CalibTimeSlewingParamTOF.h"
-#include "TOFCalibration/CalibTOFapi.h"
+#include "TOFBase/CalibTOFapi.h"
 #include "TOFReconstruction/Clusterer.h"
 #include "TOFReconstruction/DataReader.h"
-#include "TOFCalibration/CalibTOFapi.h"
 #endif
 
 void run_clus_tof(std::string outputfile = "tofclusters.root", std::string inputfile = "tofdigits.root", bool isMC = true)