From 3027a2277f214aeb5db610e619868265c30dd42e Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Tue, 6 Jan 2026 10:58:06 +0100 Subject: [PATCH 1/4] Adding missing includes --- PWGDQ/Core/AnalysisCut.cxx | 2 ++ PWGDQ/Core/MCSignalLibrary.h | 2 ++ PWGDQ/Core/MixingHandler.h | 2 ++ PWGDQ/Core/MixingLibrary.cxx | 3 +++ PWGDQ/TableProducer/generatedQuarkoniaMC.cxx | 2 ++ PWGDQ/TableProducer/tableMakerJpsiHf.cxx | 2 ++ PWGDQ/Tasks/DalitzSelection.cxx | 5 +++++ PWGDQ/Tasks/dqCorrelation.cxx | 2 ++ PWGDQ/Tasks/muonDCA.cxx | 2 ++ PWGDQ/Tasks/taskFwdTrackPid.cxx | 2 ++ PWGDQ/Tasks/taskJpsiHf.cxx | 3 +++ PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx | 3 +++ 12 files changed, 30 insertions(+) diff --git a/PWGDQ/Core/AnalysisCut.cxx b/PWGDQ/Core/AnalysisCut.cxx index 7b5718552ba..ecb1ace04e6 100644 --- a/PWGDQ/Core/AnalysisCut.cxx +++ b/PWGDQ/Core/AnalysisCut.cxx @@ -12,6 +12,8 @@ #include "PWGDQ/Core/AnalysisCut.h" #include +#include + using std::cout; using std::endl; diff --git a/PWGDQ/Core/MCSignalLibrary.h b/PWGDQ/Core/MCSignalLibrary.h index df01f60c978..9d237131280 100644 --- a/PWGDQ/Core/MCSignalLibrary.h +++ b/PWGDQ/Core/MCSignalLibrary.h @@ -16,6 +16,8 @@ #define PWGDQ_CORE_MCSIGNALLIBRARY_H_ #include +#include + #include "rapidjson/document.h" #include "PWGDQ/Core/MCProng.h" #include "PWGDQ/Core/MCSignal.h" diff --git a/PWGDQ/Core/MixingHandler.h b/PWGDQ/Core/MixingHandler.h index 0e38a89291e..e5f64361e2b 100644 --- a/PWGDQ/Core/MixingHandler.h +++ b/PWGDQ/Core/MixingHandler.h @@ -24,6 +24,8 @@ #include #include +#include + #include "PWGDQ/Core/HistogramManager.h" #include "PWGDQ/Core/VarManager.h" diff --git a/PWGDQ/Core/MixingLibrary.cxx b/PWGDQ/Core/MixingLibrary.cxx index 9cb2eb9029d..37278b90971 100644 --- a/PWGDQ/Core/MixingLibrary.cxx +++ b/PWGDQ/Core/MixingLibrary.cxx @@ -13,6 +13,9 @@ // #include "PWGDQ/Core/MixingLibrary.h" +#include +#include + void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible) { std::string nameStr = mixingVarible; diff --git a/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx b/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx index 9d578c4e916..68e3c3cb192 100644 --- a/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx +++ b/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx @@ -51,6 +51,8 @@ #include #include #include +#include +#include using namespace o2; using namespace o2::framework; diff --git a/PWGDQ/TableProducer/tableMakerJpsiHf.cxx b/PWGDQ/TableProducer/tableMakerJpsiHf.cxx index 7ae949c40d1..658eea8a01f 100644 --- a/PWGDQ/TableProducer/tableMakerJpsiHf.cxx +++ b/PWGDQ/TableProducer/tableMakerJpsiHf.cxx @@ -15,6 +15,8 @@ /// \author Fabrizio Grosa , CERN #include +#include +#include #include "Framework/AnalysisTask.h" #include "Framework/AnalysisDataModel.h" diff --git a/PWGDQ/Tasks/DalitzSelection.cxx b/PWGDQ/Tasks/DalitzSelection.cxx index c0023ff8de7..3b8e3d52028 100644 --- a/PWGDQ/Tasks/DalitzSelection.cxx +++ b/PWGDQ/Tasks/DalitzSelection.cxx @@ -37,6 +37,11 @@ #include "Framework/DataTypes.h" #include "Framework/runDataProcessing.h" +#include +#include +#include +#include + using namespace o2; using namespace o2::framework; using namespace o2::framework::expressions; diff --git a/PWGDQ/Tasks/dqCorrelation.cxx b/PWGDQ/Tasks/dqCorrelation.cxx index ec240fa66fe..51a71a65fab 100644 --- a/PWGDQ/Tasks/dqCorrelation.cxx +++ b/PWGDQ/Tasks/dqCorrelation.cxx @@ -50,6 +50,8 @@ #include #include #include +#include +#include using std::cout; using std::endl; diff --git a/PWGDQ/Tasks/muonDCA.cxx b/PWGDQ/Tasks/muonDCA.cxx index 897ed273322..a607ad16b4b 100644 --- a/PWGDQ/Tasks/muonDCA.cxx +++ b/PWGDQ/Tasks/muonDCA.cxx @@ -23,6 +23,8 @@ #include "Framework/runDataProcessing.h" #include "GlobalTracking/MatchGlobalFwd.h" +#include + using namespace o2; using namespace o2::framework; using namespace o2::aod; diff --git a/PWGDQ/Tasks/taskFwdTrackPid.cxx b/PWGDQ/Tasks/taskFwdTrackPid.cxx index cbe6e233630..e85be0ad466 100644 --- a/PWGDQ/Tasks/taskFwdTrackPid.cxx +++ b/PWGDQ/Tasks/taskFwdTrackPid.cxx @@ -15,6 +15,8 @@ #include #include +#include +#include #include #include #include diff --git a/PWGDQ/Tasks/taskJpsiHf.cxx b/PWGDQ/Tasks/taskJpsiHf.cxx index ef415259a02..720a16fa64c 100644 --- a/PWGDQ/Tasks/taskJpsiHf.cxx +++ b/PWGDQ/Tasks/taskJpsiHf.cxx @@ -29,6 +29,9 @@ #include "PWGHF/Utils/utilsAnalysis.h" #include "PWGDQ/DataModel/ReducedInfoTables.h" +#include +#include + using namespace o2; using namespace o2::analysis; using namespace o2::framework; diff --git a/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx b/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx index 4914658ae81..a3eaaa324c1 100644 --- a/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx +++ b/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx @@ -25,6 +25,9 @@ #include "PWGDQ/DataModel/MchTrkEffTables.h" +#include +#include + using namespace o2; using namespace o2::aod; using namespace o2::framework; From e8b83e752866dd7051dc8b4b63f90b09aed73be8 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Tue, 6 Jan 2026 11:00:12 +0100 Subject: [PATCH 2/4] clang format --- PWGDQ/Core/MCSignalLibrary.h | 9 +-- PWGDQ/Core/MixingHandler.h | 8 +-- PWGDQ/TableProducer/generatedQuarkoniaMC.cxx | 2 +- PWGDQ/TableProducer/tableMakerJpsiHf.cxx | 24 ++++---- PWGDQ/Tasks/DalitzSelection.cxx | 4 +- PWGDQ/Tasks/dqCorrelation.cxx | 2 +- PWGDQ/Tasks/taskFwdTrackPid.cxx | 58 +++++++++++--------- PWGDQ/Tasks/taskJpsiHf.cxx | 19 +++---- PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx | 4 +- 9 files changed, 67 insertions(+), 63 deletions(-) diff --git a/PWGDQ/Core/MCSignalLibrary.h b/PWGDQ/Core/MCSignalLibrary.h index 9d237131280..6d04009d393 100644 --- a/PWGDQ/Core/MCSignalLibrary.h +++ b/PWGDQ/Core/MCSignalLibrary.h @@ -15,13 +15,14 @@ #ifndef PWGDQ_CORE_MCSIGNALLIBRARY_H_ #define PWGDQ_CORE_MCSIGNALLIBRARY_H_ -#include -#include - -#include "rapidjson/document.h" #include "PWGDQ/Core/MCProng.h" #include "PWGDQ/Core/MCSignal.h" +#include "rapidjson/document.h" + +#include +#include + namespace o2::aod { namespace dqmcsignals diff --git a/PWGDQ/Core/MixingHandler.h b/PWGDQ/Core/MixingHandler.h index e5f64361e2b..108505322c1 100644 --- a/PWGDQ/Core/MixingHandler.h +++ b/PWGDQ/Core/MixingHandler.h @@ -17,18 +17,18 @@ #ifndef MixingHandler_H #define MixingHandler_H -#include +#include "PWGDQ/Core/HistogramManager.h" +#include "PWGDQ/Core/VarManager.h" + #include #include #include #include +#include #include #include -#include "PWGDQ/Core/HistogramManager.h" -#include "PWGDQ/Core/VarManager.h" - class MixingHandler : public TNamed { diff --git a/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx b/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx index 68e3c3cb192..22d5d78e6f7 100644 --- a/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx +++ b/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx @@ -50,8 +50,8 @@ #include #include #include -#include #include +#include #include using namespace o2; diff --git a/PWGDQ/TableProducer/tableMakerJpsiHf.cxx b/PWGDQ/TableProducer/tableMakerJpsiHf.cxx index 658eea8a01f..d5690ab7b78 100644 --- a/PWGDQ/TableProducer/tableMakerJpsiHf.cxx +++ b/PWGDQ/TableProducer/tableMakerJpsiHf.cxx @@ -14,25 +14,25 @@ /// \author Luca Micheletti , INFN /// \author Fabrizio Grosa , CERN -#include -#include -#include - -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/HistogramRegistry.h" -#include "Framework/runDataProcessing.h" - -#include "PWGHF/Core/HfHelper.h" -#include "PWGDQ/Core/AnalysisCut.h" #include "PWGDQ/Core/AnalysisCompositeCut.h" +#include "PWGDQ/Core/AnalysisCut.h" #include "PWGDQ/Core/CutsLibrary.h" #include "PWGDQ/Core/HistogramManager.h" #include "PWGDQ/Core/HistogramsLibrary.h" #include "PWGDQ/Core/VarManager.h" +#include "PWGDQ/DataModel/ReducedInfoTables.h" +#include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" -#include "PWGDQ/DataModel/ReducedInfoTables.h" + +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "Framework/HistogramRegistry.h" +#include "Framework/runDataProcessing.h" + +#include +#include +#include using namespace o2; using namespace o2::analysis; diff --git a/PWGDQ/Tasks/DalitzSelection.cxx b/PWGDQ/Tasks/DalitzSelection.cxx index 3b8e3d52028..4312434c2e6 100644 --- a/PWGDQ/Tasks/DalitzSelection.cxx +++ b/PWGDQ/Tasks/DalitzSelection.cxx @@ -37,10 +37,10 @@ #include "Framework/DataTypes.h" #include "Framework/runDataProcessing.h" -#include #include -#include #include +#include +#include using namespace o2; using namespace o2::framework; diff --git a/PWGDQ/Tasks/dqCorrelation.cxx b/PWGDQ/Tasks/dqCorrelation.cxx index 51a71a65fab..f6ba8f3bd39 100644 --- a/PWGDQ/Tasks/dqCorrelation.cxx +++ b/PWGDQ/Tasks/dqCorrelation.cxx @@ -49,9 +49,9 @@ #include #include #include -#include #include #include +#include using std::cout; using std::endl; diff --git a/PWGDQ/Tasks/taskFwdTrackPid.cxx b/PWGDQ/Tasks/taskFwdTrackPid.cxx index e85be0ad466..0780fee1b6c 100644 --- a/PWGDQ/Tasks/taskFwdTrackPid.cxx +++ b/PWGDQ/Tasks/taskFwdTrackPid.cxx @@ -13,40 +13,44 @@ /// \brief Task for the analysis of forward PID with MFT /// \author Luca Micheletti , INFN -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "CCDB/BasicCCDBManager.h" -#include "DataFormatsParameters/GRPObject.h" -#include "Framework/runDataProcessing.h" -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/ASoAHelpers.h" -#include "PWGDQ/DataModel/ReducedInfoTables.h" -#include "PWGDQ/Core/VarManager.h" +#include "PWGDQ/Core/AnalysisCompositeCut.h" +#include "PWGDQ/Core/AnalysisCut.h" +#include "PWGDQ/Core/CutsLibrary.h" #include "PWGDQ/Core/HistogramManager.h" -#include "PWGDQ/Core/MixingHandler.h" +#include "PWGDQ/Core/HistogramsLibrary.h" #include "PWGDQ/Core/MCSignal.h" #include "PWGDQ/Core/MCSignalLibrary.h" -#include "PWGDQ/Core/AnalysisCut.h" -#include "PWGDQ/Core/AnalysisCompositeCut.h" -#include "PWGDQ/Core/HistogramsLibrary.h" -#include "PWGDQ/Core/CutsLibrary.h" +#include "PWGDQ/Core/MixingHandler.h" #include "PWGDQ/Core/MixingLibrary.h" +#include "PWGDQ/Core/VarManager.h" +#include "PWGDQ/DataModel/ReducedInfoTables.h" + +#include "Common/CCDB/EventSelectionParams.h" + +#include "CCDB/BasicCCDBManager.h" #include "DataFormatsParameters/GRPMagField.h" -#include "Field/MagneticField.h" -#include "TGeoGlobalMagField.h" -#include "DetectorsBase/Propagator.h" +#include "DataFormatsParameters/GRPObject.h" #include "DetectorsBase/GeometryManager.h" +#include "DetectorsBase/Propagator.h" +#include "Field/MagneticField.h" +#include "Framework/ASoAHelpers.h" +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "Framework/runDataProcessing.h" #include "ITSMFTBase/DPLAlpideParam.h" -#include "Common/CCDB/EventSelectionParams.h" + +#include "TGeoGlobalMagField.h" +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include using namespace o2; using namespace o2::framework; diff --git a/PWGDQ/Tasks/taskJpsiHf.cxx b/PWGDQ/Tasks/taskJpsiHf.cxx index 720a16fa64c..fcc78628b20 100644 --- a/PWGDQ/Tasks/taskJpsiHf.cxx +++ b/PWGDQ/Tasks/taskJpsiHf.cxx @@ -14,22 +14,21 @@ /// \author Luca Micheletti , INFN /// \author Fabrizio Grosa , CERN -#include - -#include "Framework/AnalysisTask.h" -#include "Framework/AnalysisDataModel.h" -#include "Framework/HistogramRegistry.h" -#include "Framework/runDataProcessing.h" - -#include "Common/Core/RecoDecay.h" - +#include "PWGDQ/DataModel/ReducedInfoTables.h" #include "PWGHF/Core/HfHelper.h" #include "PWGHF/DataModel/CandidateReconstructionTables.h" #include "PWGHF/DataModel/CandidateSelectionTables.h" #include "PWGHF/Utils/utilsAnalysis.h" -#include "PWGDQ/DataModel/ReducedInfoTables.h" + +#include "Common/Core/RecoDecay.h" + +#include "Framework/AnalysisDataModel.h" +#include "Framework/AnalysisTask.h" +#include "Framework/HistogramRegistry.h" +#include "Framework/runDataProcessing.h" #include +#include #include using namespace o2; diff --git a/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx b/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx index a3eaaa324c1..ff161fbafc1 100644 --- a/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx +++ b/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx @@ -19,12 +19,12 @@ /// \author Zaida Conesa del Valle /// +#include "PWGDQ/DataModel/MchTrkEffTables.h" + #include "Framework/AnalysisTask.h" #include "Framework/HistogramRegistry.h" #include "Framework/runDataProcessing.h" -#include "PWGDQ/DataModel/MchTrkEffTables.h" - #include #include From ba172669580ab12f2e8ad0ee00d9eeff3b449456 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Tue, 6 Jan 2026 11:15:49 +0100 Subject: [PATCH 3/4] Fixing megalinter errors --- PWGDQ/Core/MCSignalLibrary.h | 2 +- PWGDQ/Core/MixingHandler.h | 6 +++--- PWGDQ/Tasks/taskFwdTrackPid.cxx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PWGDQ/Core/MCSignalLibrary.h b/PWGDQ/Core/MCSignalLibrary.h index 6d04009d393..f244c7cbbfc 100644 --- a/PWGDQ/Core/MCSignalLibrary.h +++ b/PWGDQ/Core/MCSignalLibrary.h @@ -39,7 +39,7 @@ MCProng* ParseJSONMCProng(T prongJSON, const char* prongName); template bool ValidateJSONMCProng(T prongJSON, const char* prongName); -} +} // namespace dqmcsignals } // namespace o2::aod #endif // PWGDQ_CORE_MCSIGNALLIBRARY_H_ diff --git a/PWGDQ/Core/MixingHandler.h b/PWGDQ/Core/MixingHandler.h index 108505322c1..9eb233c4b43 100644 --- a/PWGDQ/Core/MixingHandler.h +++ b/PWGDQ/Core/MixingHandler.h @@ -14,8 +14,8 @@ // Class to define and fill histograms // -#ifndef MixingHandler_H -#define MixingHandler_H +#ifndef PWGDQ_CORE_MIXINGHANDLER_H_ +#define PWGDQ_CORE_MIXINGHANDLER_H_ #include "PWGDQ/Core/HistogramManager.h" #include "PWGDQ/Core/VarManager.h" @@ -63,4 +63,4 @@ class MixingHandler : public TNamed ClassDef(MixingHandler, 1); }; -#endif +#endif // PWGDQ_CORE_MIXINGHANDLER_H_ diff --git a/PWGDQ/Tasks/taskFwdTrackPid.cxx b/PWGDQ/Tasks/taskFwdTrackPid.cxx index 0780fee1b6c..33b89b0e745 100644 --- a/PWGDQ/Tasks/taskFwdTrackPid.cxx +++ b/PWGDQ/Tasks/taskFwdTrackPid.cxx @@ -156,7 +156,7 @@ struct taskFwdTrackPid { for (const auto& mftTrack : mftTracks) { if (TMath::Abs(mftTrack.fwdDcaX()) < fConfigMaxDCA && TMath::Abs(mftTrack.fwdDcaY()) < fConfigMaxDCA) { if (downSampleFactor < 1.) { - float pseudoRndm = mftTrack.pt() * 1000. - (int64_t)(mftTrack.pt() * 1000); + float pseudoRndm = mftTrack.pt() * 1000. - static_cast(mftTrack.pt() * 1000); if (pseudoRndm >= downSampleFactor) { continue; } From 4dd8fcd627d030d7c14db5927d1691e537746ceb Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Tue, 6 Jan 2026 11:18:02 +0100 Subject: [PATCH 4/4] clang format --- PWGDQ/Core/MixingHandler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Core/MixingHandler.h b/PWGDQ/Core/MixingHandler.h index 9eb233c4b43..12b4b4dcc1a 100644 --- a/PWGDQ/Core/MixingHandler.h +++ b/PWGDQ/Core/MixingHandler.h @@ -63,4 +63,4 @@ class MixingHandler : public TNamed ClassDef(MixingHandler, 1); }; -#endif // PWGDQ_CORE_MIXINGHANDLER_H_ +#endif // PWGDQ_CORE_MIXINGHANDLER_H_