[Common] Fix includes and using statements

Common/CCDB/EventSelectionParams.h

@@ -17,9 +17,10 @@
 #ifndef COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 #define COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 
-#include <Rtypes.h>
 #include <TMath.h>
 
+#include <Rtypes.h>
+
 namespace o2::aod::evsel
 {
 // Event selection criteria

Common/CCDB/macros/ctpRateF.C

@@ -9,16 +9,24 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "Common/CCDB/ctpRateFetcher.h"
+
+#include <CCDB/BasicCCDBManager.h>
+#include <CommonConstants/LHCConstants.h>
+#include <DataFormatsCTP/Configuration.h>
+#include <DataFormatsCTP/Scalers.h>
+#include <DataFormatsParameters/GRPLHCIFData.h>
+#include <Framework/Logger.h>
+
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <iostream>
 #include <map>
+#include <ostream>
+#include <string>
 #include <vector>
 
-#include "CommonConstants/LHCConstants.h"
-#include "DataFormatsCTP/Configuration.h"
-#include "DataFormatsCTP/Scalers.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "Common/CCDB/ctpRateFetcher.h"
-
 struct ctpRateFetcher {
   ctpRateFetcher() = default;
   double fetch(o2::ccdb::BasicCCDBManager* ccdb, uint64_t timeStamp, int runNumber, std::string sourceName);
@@ -89,7 +97,7 @@
   getCTPscalers(ccdb, timeStamp, runNumber);
   getLHCIFdata(ccdb, timeStamp, runNumber);
   std::vector<o2::ctp::CTPScalerRecordO2> recs = mScalers->getScalerRecordO2();
   if (recs[0].scalersInps.size() == 48) {
     return pileUpCorrection(mScalers->getRateGivenT(timeStamp * 1.e-3, input, 7).second);
   } else {
     LOG(error) << "Inputs not available";
@@ -120,7 +128,7 @@
 double ctpRateFetcher::fetch(o2::ccdb::BasicCCDBManager* ccdb, uint64_t timeStamp, int runNumber, std::string sourceName)
 {
   if (sourceName.find("ZNC") != std::string::npos) {
     if (runNumber < 544448) {
       return fetchCTPratesInputs(ccdb, timeStamp, runNumber, 25) / (sourceName.find("hadronic") != std::string::npos ? 28. : 1.);
     } else {
       return fetchCTPratesClasses(ccdb, timeStamp, runNumber, "C1ZNC-B-NOPF-CRU", 6) / (sourceName.find("hadronic") != std::string::npos ? 28. : 1.);
@@ -130,7 +138,7 @@
   } else if (sourceName == "T0SC") {
     return fetchCTPratesClasses(ccdb, timeStamp, runNumber, "CMTVXTSC-B-NOPF");
   } else if (sourceName == "T0VTX") {
     if (runNumber < 534202) {
       return fetchCTPratesClasses(ccdb, timeStamp, runNumber, "minbias_TVX_L0", 3); // 2022
     } else {
       double_t ret = fetchCTPratesClasses(ccdb, timeStamp, runNumber, "CMTVX-B-NOPF");

Common/CCDB/macros/upload_event_selection_params.C

@@ -9,12 +9,19 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "TString.h"
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include <CCDB/BasicCCDBManager.h>
+#include <CCDB/CcdbApi.h>
+
+#include <TString.h>
+
+#include <RtypesCore.h>
+
+#include <cstdio>
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
+
 using std::map;
 using std::string;
 

Common/CCDB/macros/upload_event_selection_params_run3.C

@@ -9,11 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
-#include "TString.h"
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include <CCDB/CcdbApi.h>
+#include <Framework/Logger.h>
+
+#include <TString.h>
+
+#include <RtypesCore.h>
+
+#include <cstdlib>
 #include <map>
 #include <string>
-#include "EventSelectionParams.h"
 using std::map;
 using std::string;
 
@@ -57,7 +64,7 @@
   }
 
   // fill param objects for runs with custom orbit shifts
   for (auto m : mapOrbitShift) {
     int run = m.first;
     int orbitShift = m.second;
     LOGP(info, "Uploading custom object for run = {}: orbitShift = {}", run, orbitShift);
@@ -140,4 +147,4 @@
   mapOrbitShift[523797] = 41;
   mapOrbitShift[523821] = 36;
   mapOrbitShift[523897] = 38;
-}
+}

Common/CCDB/macros/upload_trigger_aliases.C

@@ -9,12 +9,17 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
-#include "TString.h"
+#include "Common/CCDB/TriggerAliases.h"
+
+#include <CCDB/BasicCCDBManager.h>
+#include <CCDB/CcdbApi.h>
+#include <Framework/Logger.h>
+
+#include <TObjArray.h>
+#include <TString.h>
+
+#include <RtypesCore.h>
+
 #include <fstream>
 #include <map>
 #include <string>
@@ -54,7 +59,7 @@
   createDefaultAliases(mAliases);
 
   TObjArray* classNames[kNaliases];
   for (auto& al : mAliases) {
     classNames[al.first] = (al.second).Tokenize(",");
   }
 
@@ -73,13 +78,13 @@
     runs.push_back(r);
   }
 
   for (auto& run : runs) {
     LOGP(info, "run = {}", run);
     // read list of trigger classes
     map<string, int>* pClassNameToIndexMap = ccdb.retrieveFromTFileAny<map<string, int>>("CTP/ClassNameToIndexMap", metadata, run);
     // fill map of alias-to-class-indices
     TriggerAliases* aliases = new TriggerAliases();
     for (auto& al : mAliases) {
       int aliasId = al.first;
       LOGP(debug, " aliadId = {}", aliasId);
       for (const auto& className : *(classNames[aliasId])) {

Common/CCDB/macros/upload_trigger_aliases_run3.C

@@ -9,13 +9,18 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include "DataFormatsCTP/Configuration.h"
-#include "CCDB/CcdbApi.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "TObjArray.h"
-#include "TriggerAliases.h"
-#include "TTree.h"
-#include "TString.h"
+#include "Common/CCDB/TriggerAliases.h"
+
+#include <CCDB/BasicCCDBManager.h>
+#include <CCDB/CcdbApi.h>
+#include <DataFormatsCTP/Configuration.h>
+#include <Framework/Logger.h>
+
+#include <TObjArray.h>
+#include <TString.h>
+
+#include <RtypesCore.h>
+
 #include <fstream>
 #include <map>
 #include <string>
@@ -50,7 +55,7 @@
   // createPbPbAliases(mAliases);
 
   TObjArray* classNames[kNaliases];
   for (auto& al : mAliases) {
     classNames[al.first] = (al.second).Tokenize(",");
   }
 
@@ -77,7 +82,7 @@
     ccdb.storeAsTFileAny(aliases, "EventSelection/TriggerAliases", metadata, sor, eor);
   }
 
   for (auto& run : runs) {
     LOGP(info, "run = {}", run);
 
     //    if (run != 535983)
@@ -115,7 +120,7 @@
     ctpcfg->printConfigString();
     // create trigger aliases
     TriggerAliases* aliases = new TriggerAliases();
     for (auto& al : mAliases) {
       int aliasId = al.first;
       LOGP(debug, "alias = {}", al.second.Data());
       for (const auto& className : *(classNames[aliasId])) {

Common/Core/EventMixing.h

@@ -9,8 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef ANALYSIS_CORE_EVENTMIXING_H_
-#define ANALYSIS_CORE_EVENTMIXING_H_
+#ifndef COMMON_CORE_EVENTMIXING_H_
+#define COMMON_CORE_EVENTMIXING_H_
 
 namespace eventmixing
 {
@@ -47,4 +47,4 @@ static int getMixingBin(const T1& vtxBins, const T1& multBins, const T2& vtx, co
 }
 }; // namespace eventmixing
 
-#endif /* ANALYSIS_CORE_EVENTMIXING_H_ */
+#endif // COMMON_CORE_EVENTMIXING_H_

Common/Core/FFitWeights.cxx

@@ -16,12 +16,14 @@
 
 #include "FFitWeights.h"
 
-#include "Framework/Logger.h"
+#include <Framework/Logger.h>
 
 #include <TCollection.h>
 #include <TH1.h>
+#include <TH2.h>
 #include <TNamed.h>
 #include <TObjArray.h>
+#include <TProfile.h>
 #include <TSpline.h>
 #include <TString.h>
 

Common/Core/MetadataHelper.cxx

@@ -21,6 +21,7 @@
 #include <Framework/InitContext.h>
 #include <Framework/Logger.h>
 
+#include <TString.h>
 #include <TSystem.h>
 
 #include <array>

Common/Core/PID/PIDTOFParamService.cxx

@@ -18,11 +18,24 @@
 
 #include "PIDTOFParamService.h"
 
+#include "Common/Core/CollisionTypeHelper.h"
+#include "Common/Core/MetadataHelper.h"
+
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPLHCIFData.h>
+#include <DataFormatsTOF/ParameterContainers.h>
 #include <Framework/CommonServices.h>
+#include <Framework/Logger.h>
 #include <Framework/Plugins.h>
 #include <Framework/ServiceHandle.h>
 #include <Framework/ServiceSpec.h>
+#include <Framework/TypeIdHelpers.h>
+#include <PID/PIDTOF.h>
+
+#include <TGraph.h>
 
+#include <chrono>
+#include <cstdint>
 #include <map>
 #include <string>
 

Common/Core/PID/PIDTOFParamService.h

@@ -24,14 +24,16 @@
 #include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/TableHelper.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/PhysicsConstants.h"
-#include "DataFormatsTOF/ParameterContainers.h"
-#include "Framework/DataTypes.h"
-#include "Framework/PID.h"
-#include "Framework/Plugins.h"
-#include "ReconstructionDataFormats/PID.h"
-
+#include <CCDB/BasicCCDBManager.h>
+#include <CommonConstants/PhysicsConstants.h>
+#include <Framework/InitContext.h>
+#include <Framework/Logger.h>
+#include <Framework/PID.h>
+#include <Framework/Plugins.h>
+#include <ReconstructionDataFormats/PID.h>
+
+#include <cmath>
+#include <cstdint>
 #include <string>
 
 namespace o2::pid::tof
@@ -188,7 +190,7 @@ struct TOFResponseImpl {
   template <typename VType>
   void getCfg(o2::framework::InitContext& initContext, const std::string name, VType& v, const std::string task)
   {
-    if (!getTaskOptionValue(initContext, task, name, v, false)) {
+    if (!o2::common::core::getTaskOptionValue(initContext, task, name, v, false)) {
       LOG(fatal) << "Could not get " << name << " from " << task << " task";
     }
   }

Common/Core/PID/TPCPIDResponse.h

@@ -17,8 +17,8 @@
 #ifndef COMMON_CORE_PID_TPCPIDRESPONSE_H_
 #define COMMON_CORE_PID_TPCPIDRESPONSE_H_
 
-#include <MathUtils/BetheBlochAleph.h>
 #include <Framework/Logger.h>
+#include <MathUtils/BetheBlochAleph.h>
 #include <ReconstructionDataFormats/PID.h>
 
 #include <Rtypes.h>

Common/Core/TableHelper.h

@@ -121,9 +121,4 @@ bool getTaskOptionValue(o2::framework::InitContext& initContext, const std::stri
 
 } // namespace o2::common::core
 
-using o2::common::core::enableFlagIfTableRequired;
-using o2::common::core::getTaskOptionValue;
-using o2::common::core::isTableRequiredInWorkflow;
-using o2::common::core::printTablesInWorkflow;
-
 #endif // COMMON_CORE_TABLEHELPER_H_

Common/Core/Zorro.cxx

@@ -33,7 +33,6 @@
 #include <bitset>
 #include <cstddef>
 #include <cstdint>
-#include <map>
 #include <memory>
 #include <string>
 #include <vector>

Common/Core/Zorro.h

@@ -16,8 +16,8 @@
 /// \author M Puccio
 ///
 
-#ifndef EVENTFILTERING_ZORRO_H_
-#define EVENTFILTERING_ZORRO_H_
+#ifndef COMMON_CORE_ZORRO_H_
+#define COMMON_CORE_ZORRO_H_
 
 #include "ZorroHelper.h"
 #include "ZorroSummary.h"
@@ -103,4 +103,4 @@ class Zorro
   o2::ccdb::BasicCCDBManager* mCCDB = nullptr;
 };
 
-#endif // EVENTFILTERING_ZORRO_H_
+#endif // COMMON_CORE_ZORRO_H_

Common/Core/ZorroHelper.h

@@ -10,8 +10,8 @@
 // or submit itself to any jurisdiction.
 //
 
-#ifndef EVENTFILTERING_ZORROHELPER_H_
-#define EVENTFILTERING_ZORROHELPER_H_
+#ifndef COMMON_CORE_ZORROHELPER_H_
+#define COMMON_CORE_ZORROHELPER_H_
 
 #include <Rtypes.h>
 #include <RtypesCore.h>
@@ -21,4 +21,4 @@ struct ZorroHelper {
   ClassDefNV(ZorroHelper, 1);
 };
 
-#endif // EVENTFILTERING_ZORROHELPER_H_
+#endif // COMMON_CORE_ZORROHELPER_H_

Common/Core/ZorroSummary.h

@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 //
 
-#ifndef EVENTFILTERING_ZORROSUMMARY_H_
-#define EVENTFILTERING_ZORROSUMMARY_H_
+#ifndef COMMON_CORE_ZORROSUMMARY_H_
+#define COMMON_CORE_ZORROSUMMARY_H_
 
 #include <TNamed.h>
 
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
+#include <cstddef>
 #include <string>
 #include <unordered_map>
 #include <vector>
@@ -80,4 +81,4 @@ class ZorroSummary : public TNamed
   ClassDef(ZorroSummary, 1);
 };
 
-#endif // EVENTFILTERING_ZORROSUMMARY_H_
+#endif // COMMON_CORE_ZORROSUMMARY_H_

Common/Core/fwdtrackUtilities.h

@@ -18,18 +18,18 @@
 #ifndef COMMON_CORE_FWDTRACKUTILITIES_H_
 #define COMMON_CORE_FWDTRACKUTILITIES_H_
 
-#include "DetectorsBase/GeometryManager.h"
-#include "Field/MagneticField.h"
-#include "Framework/AnalysisDataModel.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "ReconstructionDataFormats/GlobalFwdTrack.h"
-#include "ReconstructionDataFormats/TrackFwd.h"
-
-#include "Math/MatrixRepresentationsStatic.h"
-#include "Math/SMatrix.h"
-#include "TGeoGlobalMagField.h"
-
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/DataTypes.h>
+#include <GlobalTracking/MatchGlobalFwd.h>
+#include <MCHTracking/TrackExtrap.h>
+#include <ReconstructionDataFormats/GlobalFwdTrack.h>
+#include <ReconstructionDataFormats/TrackFwd.h>
+
+#include <Math/MatrixRepresentationsStatic.h>
+#include <Math/SMatrix.h>
+
+#include <array>
+#include <cstdint>
 #include <type_traits>
 #include <vector>
 

Common/Core/macros/testCollisionTypeHelper.C

@@ -15,8 +15,8 @@
 
 #include "Common/Core/CollisionTypeHelper.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <DataFormatsParameters/GRPLHCIFData.h>
 
 void testCollisionTypeHelper(int runNumber = 544124)
 {