From d3d2ce41b2c7e9021fdded94214d16de1dfdd836 Mon Sep 17 00:00:00 2001 From: noferini Date: Mon, 22 Nov 2021 13:02:11 +0100 Subject: [PATCH] mv calib api and event maker to tof base --- .../DataFormatsTOF/CalibTimeSlewingParamTOF.h | 2 +- .../Detectors/TOF/src/CalibTimeSlewingParamTOF.cxx | 13 +++++++++++++ .../src/TOFEventTimeChecker.cxx | 2 +- Detectors/TOF/base/CMakeLists.txt | 5 ++++- .../include/TOFBase}/CalibTOFapi.h | 0 .../include/TOFBase}/EventTimeMaker.h | 0 .../TOF/{calibration => base}/src/CalibTOFapi.cxx | 2 +- .../{reconstruction => base}/src/EventTimeMaker.cxx | 2 +- Detectors/TOF/base/src/TOFBaseLinkDef.h | 5 +++++ Detectors/TOF/calibration/CMakeLists.txt | 6 ++---- .../calibration/include/TOFCalibration/CalibTOF.h | 2 +- .../include/TOFCalibration/LHCClockCalibrator.h | 2 +- .../include/TOFCalibration/TOFChannelCalibrator.h | 2 +- .../TOF/calibration/src/TOFCalibrationLinkDef.h | 1 - .../TOF/calibration/src/TOFChannelCalibrator.cxx | 6 +++--- Detectors/TOF/prototyping/macroEvTime.C | 2 +- Detectors/TOF/prototyping/testCCDB.C | 2 +- Detectors/TOF/reconstruction/CMakeLists.txt | 4 +--- .../include/TOFReconstruction/Clusterer.h | 2 +- .../reconstruction/src/TOFReconstructionLinkDef.h | 4 ---- .../simulation/include/TOFSimulation/Digitizer.h | 2 +- Detectors/TOF/workflow/src/TOFClusterizerSpec.cxx | 2 +- Steer/DigitizerWorkflow/src/TOFDigitizerSpec.cxx | 2 +- macro/run_clus_tof.C | 3 +-- 24 files changed, 42 insertions(+), 31 deletions(-) rename Detectors/TOF/{calibration/include/TOFCalibration => base/include/TOFBase}/CalibTOFapi.h (100%) rename Detectors/TOF/{reconstruction/include/TOFReconstruction => base/include/TOFBase}/EventTimeMaker.h (100%) rename Detectors/TOF/{calibration => base}/src/CalibTOFapi.cxx (98%) rename Detectors/TOF/{reconstruction => base}/src/EventTimeMaker.cxx (99%) diff --git a/DataFormats/Detectors/TOF/include/DataFormatsTOF/CalibTimeSlewingParamTOF.h b/DataFormats/Detectors/TOF/include/DataFormatsTOF/CalibTimeSlewingParamTOF.h index c96fad2ef81a7..5e1a99c90f4f6 100644 --- 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 index b07e4a8bdc984..0d47e2c224511 100644 --- 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 index d902dc60e3e35..5dbf44fa36e81 100644 --- 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 index 9006fa349cc94..7045896c85ab4 100644 --- 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/Detectors/TOF/calibration/include/TOFCalibration/CalibTOFapi.h b/Detectors/TOF/base/include/TOFBase/CalibTOFapi.h similarity index 100% rename from Detectors/TOF/calibration/include/TOFCalibration/CalibTOFapi.h rename to Detectors/TOF/base/include/TOFBase/CalibTOFapi.h diff --git a/Detectors/TOF/reconstruction/include/TOFReconstruction/EventTimeMaker.h b/Detectors/TOF/base/include/TOFBase/EventTimeMaker.h similarity index 100% rename from Detectors/TOF/reconstruction/include/TOFReconstruction/EventTimeMaker.h rename to Detectors/TOF/base/include/TOFBase/EventTimeMaker.h diff --git a/Detectors/TOF/calibration/src/CalibTOFapi.cxx b/Detectors/TOF/base/src/CalibTOFapi.cxx similarity index 98% rename from Detectors/TOF/calibration/src/CalibTOFapi.cxx rename to Detectors/TOF/base/src/CalibTOFapi.cxx index e6f0689ca023c..2d200619ef75e 100644 --- a/Detectors/TOF/calibration/src/CalibTOFapi.cxx +++ b/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/Detectors/TOF/reconstruction/src/EventTimeMaker.cxx b/Detectors/TOF/base/src/EventTimeMaker.cxx similarity index 99% rename from Detectors/TOF/reconstruction/src/EventTimeMaker.cxx rename to Detectors/TOF/base/src/EventTimeMaker.cxx index b5da91a3029e3..b87ae5d68ff72 100644 --- a/Detectors/TOF/reconstruction/src/EventTimeMaker.cxx +++ b/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 index 31de4a72646d9..2498069dd8124 100644 --- 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 index 5aa860652a7a2..7138fadd8585a 100644 --- 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 index 229b79d1ac442..fe014c6a9747b 100644 --- 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 index e1803ccd740ea..b53ed8f23db45 100644 --- 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 index 0ddd4709cff2f..4da2cd062f64a 100644 --- 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 #include diff --git a/Detectors/TOF/calibration/src/TOFCalibrationLinkDef.h b/Detectors/TOF/calibration/src/TOFCalibrationLinkDef.h index 380067e313f8c..42380caf307a4 100644 --- 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 index 970b32443c54d..345b660969943 100644 --- a/Detectors/TOF/calibration/src/TOFChannelCalibrator.cxx +++ b/Detectors/TOF/calibration/src/TOFChannelCalibrator.cxx @@ -89,7 +89,7 @@ void TOFChannelData::fill(const gsl::span 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::finalizeSlotWithCosmics(Slot& slot) // for the CCDB entry std::map 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::finalizeSlotWithTracks(Slot& slot) // for the CCDB entry std::map 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 index e28b4fd16ad33..ab1de99dd5ca2 100644 --- 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 index e817af8e203eb..2d6bbe16c6e87 100644 --- a/Detectors/TOF/prototyping/testCCDB.C +++ b/Detectors/TOF/prototyping/testCCDB.C @@ -3,7 +3,7 @@ #include #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 index 0e79336416683..c72511710362d 100644 --- 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 index 6c5d579e52396..c4a921ced1f17 100644 --- 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 index 0d2e468fdba8e..d0a7b4b527c1c 100644 --- 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 index 59ab55b7bbf47..abdbfc0531334 100644 --- 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 index e47af04f75b88..f1e6475b9d3d0 100644 --- 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 index 086a4e7a91ea7..b2a450a88b75a 100644 --- a/Steer/DigitizerWorkflow/src/TOFDigitizerSpec.cxx +++ b/Steer/DigitizerWorkflow/src/TOFDigitizerSpec.cxx @@ -26,7 +26,7 @@ #include #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 index ecbc258f1dc70..c538cdf368e05 100644 --- 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)