Merge branch 'AliceO2Group:master' into master

Author: amatyja

ALICE3/DataModel/OTFMCParticle.h

@@ -21,6 +21,8 @@
 
 #include <Framework/AnalysisDataModel.h>
 
+#include <cstdint>
+
 namespace o2::aod
 {
 

ALICE3/Macros/drawFastTracker.C

@@ -14,16 +14,25 @@
 
 #include <DataFormatsParameters/GRPMagField.h>
 #include <DetectorsBase/Propagator.h>
+#include <Framework/Logger.h>
+#include <ReconstructionDataFormats/Track.h>
 #include <ReconstructionDataFormats/Vertex.h>
 
 #include <TAxis.h>
 #include <TCanvas.h>
 #include <TDatabasePDG.h>
 #include <TEfficiency.h>
 #include <TGraph.h>
-#include <TH1F.h>
+#include <TH1.h>
 #include <TLatex.h>
 #include <TLorentzVector.h>
+#include <TParticlePDG.h>
+#include <TString.h>
+
+#include <RtypesCore.h>
+
+#include <cstddef>
+#include <vector>
 
 void drawFastTracker(float magneticField = 5.f, // in units of kGauss
                      const int nch = 100,       // number of charged particles per unit rapidity

ALICE3/Macros/testFastTracker.C

@@ -15,10 +15,10 @@
 
 #include "ALICE3/Core/FastTracker.h"
 
-#include <CCDB/BasicCCDBManager.h>
-#include <DataFormatsParameters/GRPLHCIFData.h>
 #include <Framework/Logger.h>
 
+#include <string>
+
 void testFastTracker(std::string geometryFile = "a3geo.ini")
 {
 

ALICE3/Tasks/alice3TrackingPerformance.cxx

@@ -13,7 +13,7 @@
 ///
 /// \brief This task produces the tracking performance
 ///
-/// \author Nicolò Jacazio, Universita del Piemonte Orientale (IT)
+/// \author Nicolò Jacazio, Università del Piemonte Orientale (IT)
 /// \since  May 27, 2025
 ///
 
@@ -46,7 +46,9 @@ std::map<int, std::shared_ptr<TH1>> particlePtDistribution;
 std::map<int, std::shared_ptr<TH1>> particleEtaDistribution;
 std::map<int, std::shared_ptr<TH1>> ptDistribution;
 std::map<int, std::shared_ptr<TH2>> ptResolutionVsPt;
+std::map<int, std::shared_ptr<TProfile2D>> ptResolutionVsEta;
 std::map<int, std::shared_ptr<TH2>> invPtResolutionVsPt;
+std::map<int, std::shared_ptr<TProfile2D>> invPtResolutionVsEta;
 std::map<int, std::shared_ptr<TH2>> dcaXyResolutionVsPt;
 std::map<int, std::shared_ptr<TH2>> dcaZResolutionVsPt;
 
@@ -57,26 +59,30 @@ struct Alice3TrackingPerformance {
 
   void init(o2::framework::InitContext&)
   {
-    const AxisSpec axisPt{100, 0, 10, "p_{T} (GeV/c)"};
+    const AxisSpec axisPt{500, 0, 100, "#it{p}_{T} (GeV/#it{c})"};
     const AxisSpec axisEta{100, etaRange.value.first, etaRange.value.second, "#eta"};
-    const AxisSpec axisPtDelta{100, -1, 1, "p_{T}^{gen} - p_{T}^{reco} (GeV/c)"};
-    const AxisSpec axisInvPtDelta{100, -1, 1, "1./p_{T}^{gen} - 1./p_{T}^{reco} (GeV/c)^{-1}"};
+    const AxisSpec axisPtDelta{100, -1, 1, "(#it{p}_{T}^{reco} - #it{p}_{T}^{gen}) / #it{p}_{T}^{gen}"};
+    const AxisSpec axisInvPtDelta{100, -1, 1, "1./#it{p}_{T}^{gen} - 1./#it{p}_{T}^{reco} (GeV/#it{c})^{-1}"};
     const AxisSpec axisDcaXy{100, -1, 1, "DCA_{xy} (cm)"};
     const AxisSpec axisDcaZ{100, -1, 1, "DCA_{z} (cm)"};
     particlePdgCodes = histos.add<TH1>("particlePdgCodes", "", kTH1D, {AxisSpec{100, -0.5, 99.5, "PDG Code"}});
     for (const int& pdg : pdgCodes.value) {
-      std::string tag = Form("_%d", pdg);
+      std::string prefix = Form("%i", pdg);
       if (pdg < 0) {
-        tag = Form("_m%d", -pdg);
+        prefix = Form("m%i", -pdg);
       }
-      particlePtDistribution[pdg] = histos.add<TH1>("particlePtDistribution" + tag, "", kTH1D, {axisPt});
-      particleEtaDistribution[pdg] = histos.add<TH1>("particleEtaDistribution" + tag, "", kTH1D, {axisEta});
+      const std::string tag = "_" + prefix;
+      prefix += "/";
+      particlePtDistribution[pdg] = histos.add<TH1>(prefix + "particlePtDistribution" + tag, "", kTH1D, {axisPt});
+      particleEtaDistribution[pdg] = histos.add<TH1>(prefix + "particleEtaDistribution" + tag, "", kTH1D, {axisEta});
 
-      ptDistribution[pdg] = histos.add<TH1>("ptDistribution" + tag, "", kTH1D, {axisPt});
-      ptResolutionVsPt[pdg] = histos.add<TH2>("ptResolutionVsPt" + tag, "", kTH2D, {axisPt, axisPtDelta});
-      invPtResolutionVsPt[pdg] = histos.add<TH2>("invPtResolutionVsPt" + tag, "", kTH2D, {axisPt, axisInvPtDelta});
-      dcaXyResolutionVsPt[pdg] = histos.add<TH2>("dcaXyResolutionVsPt" + tag, "", kTH2D, {axisPt, axisDcaXy});
-      dcaZResolutionVsPt[pdg] = histos.add<TH2>("dcaZResolutionVsPt" + tag, "", kTH2D, {axisPt, axisDcaZ});
+      ptDistribution[pdg] = histos.add<TH1>(prefix + "ptDistribution" + tag, "", kTH1D, {axisPt});
+      ptResolutionVsPt[pdg] = histos.add<TH2>(prefix + "ptResolutionVsPt" + tag, "", kTH2D, {axisPt, axisPtDelta});
+      ptResolutionVsEta[pdg] = histos.add<TProfile2D>(prefix + "ptResolutionVsEta" + tag, "", kTProfile2D, {axisPt, axisEta});
+      invPtResolutionVsPt[pdg] = histos.add<TH2>(prefix + "invPtResolutionVsPt" + tag, "", kTH2D, {axisPt, axisInvPtDelta});
+      invPtResolutionVsEta[pdg] = histos.add<TProfile2D>(prefix + "invPtResolutionVsEta" + tag, "", kTProfile2D, {axisPt, axisEta});
+      dcaXyResolutionVsPt[pdg] = histos.add<TH2>(prefix + "dcaXyResolutionVsPt" + tag, "", kTH2D, {axisPt, axisDcaXy});
+      dcaZResolutionVsPt[pdg] = histos.add<TH2>(prefix + "dcaZResolutionVsPt" + tag, "", kTH2D, {axisPt, axisDcaZ});
     }
   }
 
@@ -110,26 +116,32 @@ struct Alice3TrackingPerformance {
       particleEtaDistribution[mcParticle.pdgCode()]->Fill(mcParticle.eta());
     }
     for (const auto& track : tracks) {
-      ptDistribution[0]->Fill(track.pt());
       if (!track.has_mcParticle()) {
         continue;
       }
       const auto& mcParticle = track.mcParticle();
-      ptResolutionVsPt[0]->Fill(mcParticle.pt(), mcParticle.pt() - track.pt());
-      invPtResolutionVsPt[0]->Fill(mcParticle.pt(), 1.f / mcParticle.pt() - 1.f / track.pt());
-      dcaXyResolutionVsPt[0]->Fill(mcParticle.pt(), track.dcaXY());
-      dcaZResolutionVsPt[0]->Fill(mcParticle.pt(), track.dcaZ());
+      const float ptResolution = (track.pt() - mcParticle.pt()) / mcParticle.pt();
+      const float invptResolution = 1.f / track.pt() - 1.f / mcParticle.pt();
+
+      auto fillResolutionHistograms = [&](const int p) {
+        ptDistribution[p]->Fill(track.pt());
+        ptResolutionVsPt[p]->Fill(mcParticle.pt(), ptResolution);
+        ptResolutionVsEta[p]->Fill(mcParticle.pt(), mcParticle.eta(), ptResolution);
+        invPtResolutionVsPt[p]->Fill(mcParticle.pt(), invptResolution);
+        invPtResolutionVsEta[p]->Fill(mcParticle.pt(), mcParticle.eta(), invptResolution);
+        dcaXyResolutionVsPt[p]->Fill(mcParticle.pt(), track.dcaXY());
+        dcaZResolutionVsPt[p]->Fill(mcParticle.pt(), track.dcaZ());
+      };
+
+      fillResolutionHistograms(0);
+
       if (!isParticleSelected(mcParticle)) {
         continue;
       }
       if (ptResolutionVsPt.find(mcParticle.pdgCode()) == ptResolutionVsPt.end()) {
         continue;
       }
-      ptDistribution[mcParticle.pdgCode()]->Fill(mcParticle.pt());
-      ptResolutionVsPt[mcParticle.pdgCode()]->Fill(mcParticle.pt(), mcParticle.pt() - track.pt());
-      invPtResolutionVsPt[mcParticle.pdgCode()]->Fill(mcParticle.pt(), 1.f / mcParticle.pt() - 1.f / track.pt());
-      dcaXyResolutionVsPt[mcParticle.pdgCode()]->Fill(mcParticle.pt(), track.dcaXY());
-      dcaZResolutionVsPt[mcParticle.pdgCode()]->Fill(mcParticle.pt(), track.dcaZ());
+      fillResolutionHistograms(mcParticle.pdgCode());
     }
   }
 };

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);

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;
 
@@ -140,4 +147,4 @@ void fillMapOfCustomOrbitShifts(std::map<int, int>& mapOrbitShift)
   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>

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>