Merge branch 'master' of https://github.com/AliceO2Group/O2Physics

Author: Luigi Dello Stritto

.github/labeler.yml

@@ -16,6 +16,7 @@ infrastructure:
           - '.github/**'
           - '.checkov.yml'
           - '.mega-linter.yml'
+          - '.pre-commit-config.yaml'
           - 'cmake/**'
           - 'CODEOWNERS'
           - 'CPPLINT.cfg'

.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: "v18.1.3" # clang-format version
+    hooks:
+      - id: clang-format

ALICE3/TableProducer/alice3-pidTOF.cxx

@@ -123,7 +123,7 @@ struct ALICE3pidTOFTask {
     if (!track.hasTOF()) {
       return -999.f;
     }
-    return ((track.trackTime() - track.collision().collisionTime()) * 1000.f - o2::pid::tof::ExpTimes<Trks::iterator, id>::ComputeExpectedTime(track.tofExpMom() / o2::pid::tof::kCSPEED,
+    return ((track.trackTime() - track.collision().collisionTime()) * 1000.f - o2::pid::tof::ExpTimes<Trks::iterator, id>::ComputeExpectedTime(track.tofExpMom() * o2::constants::physics::invLightSpeedCm2PS,
                                                                                                                                                track.length())) /
            sigma<id>(track);
   }
@@ -294,7 +294,7 @@ struct ALICE3pidTOFTaskQA {
       //
       // histos.fill(HIST("event/tofsignal"), t.p(), t.tofSignal());
       histos.fill(HIST("event/tofsignal"), t.p(), tofSignal);
-      histos.fill(HIST("event/pexp"), t.p(), t.tofExpMom() / o2::pid::tof::kCSPEED);
+      histos.fill(HIST("event/pexp"), t.p(), t.tofExpMom() * o2::constants::physics::invLightSpeedCm2PS);
       histos.fill(HIST("event/eta"), t.eta());
       histos.fill(HIST("event/length"), t.length());
       histos.fill(HIST("event/pt"), t.pt());

CODEOWNERS

@@ -36,7 +36,7 @@
 /PWGEM @alibuild @feisenhu @dsekihat @ivorobye
 /PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
 /PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
-/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano
+/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano @zhangbiao-phy
 # PWG-LF
 /PWGLF @alibuild @njacazio @skundu692
 /PWGLF/Tasks/GlobalEventProperties         @alibuild @njacazio @skundu692 @gbencedi @omvazque

Common/Core/PID/PIDTOF.h

@@ -41,8 +41,6 @@ namespace o2::pid::tof
 {
 
 // Utility values (to remove!)
-static constexpr float kCSPEED = TMath::C() * 1.0e2f * 1.0e-12f; /// Speed of light in TOF units (cm/ps)
-static constexpr float kCSPEDDInv = 1.f / kCSPEED;               /// Inverse of the Speed of light in TOF units (ps/cm)
 static constexpr float defaultReturnValue = -999.f;              /// Default return value in case TOF measurement is not available
 
 /// \brief Class to handle the the TOF detector response for the TOF beta measurement

Common/Core/RecoDecay.h

@@ -668,9 +668,11 @@ struct RecoDecay {
   }
 
   /// Checks whether the reconstructed decay candidate is the expected decay.
-  /// \param checkProcess  switch to accept only decay daughters by checking the production process of MC particles
-  /// \param acceptIncompleteReco  switch to accept candidates with only part of the daughters reconstructed
+  /// \tparam acceptFlavourOscillation  switch to accept flavour oscillastion (i.e. B0 -> B0bar -> D+pi-)
+  /// \tparam checkProcess  switch to accept only decay daughters by checking the production process of MC particles
+  /// \tparam acceptIncompleteReco  switch to accept candidates with only part of the daughters reconstructed
   /// \tparam acceptTrackDecay  switch to accept candidates with daughter tracks of pions and kaons which decayed
+  /// \tparam acceptTrackIntWithMaterial switch to accept candidates with final (i.e. p, K, pi) daughter tracks interacting with material
   /// \param particlesMC  table with MC particles
   /// \param arrDaughters  array of candidate daughters
   /// \param PDGMother  expected mother PDG code
@@ -680,8 +682,9 @@ struct RecoDecay {
   /// \param depthMax  maximum decay tree level to check; Daughters up to this level will be considered. If -1, all levels are considered.
   /// \param nPiToMu  number of pion prongs decayed to a muon
   /// \param nKaToPi  number of kaon prongs decayed to a pion
+  /// \param nInteractionsWithMaterial  number of daughter particles that interacted with material
   /// \return index of the mother particle if the mother and daughters are correct, -1 otherwise
-  template <bool acceptFlavourOscillation = false, bool checkProcess = false, bool acceptIncompleteReco = false, bool acceptTrackDecay = false, std::size_t N, typename T, typename U>
+  template <bool acceptFlavourOscillation = false, bool checkProcess = false, bool acceptIncompleteReco = false, bool acceptTrackDecay = false, bool acceptTrackIntWithMaterial = false, std::size_t N, typename T, typename U>
   static int getMatchedMCRec(const T& particlesMC,
                              const std::array<U, N>& arrDaughters,
                              int PDGMother,
@@ -690,16 +693,18 @@ struct RecoDecay {
                              int8_t* sign = nullptr,
                              int depthMax = 1,
                              int8_t* nPiToMu = nullptr,
-                             int8_t* nKaToPi = nullptr)
+                             int8_t* nKaToPi = nullptr,
+                             int8_t* nInteractionsWithMaterial = nullptr)
   {
     // Printf("MC Rec: Expected mother PDG: %d", PDGMother);
-    int8_t coefFlavourOscillation = 1;     // 1 if no B0(s) flavour oscillation occured, -1 else
-    int8_t sgn = 0;                        // 1 if the expected mother is particle, -1 if antiparticle (w.r.t. PDGMother)
-    int8_t nPiToMuLocal = 0;               // number of pion prongs decayed to a muon
-    int8_t nKaToPiLocal = 0;               // number of kaon prongs decayed to a pion
-    int indexMother = -1;                  // index of the mother particle
-    std::vector<int> arrAllDaughtersIndex; // vector of indices of all daughters of the mother of the first provided daughter
-    std::array<int, N> arrDaughtersIndex;  // array of indices of provided daughters
+    int8_t coefFlavourOscillation = 1;         // 1 if no B0(s) flavour oscillation occured, -1 else
+    int8_t sgn = 0;                            // 1 if the expected mother is particle, -1 if antiparticle (w.r.t. PDGMother)
+    int8_t nPiToMuLocal = 0;                   // number of pion prongs decayed to a muon
+    int8_t nKaToPiLocal = 0;                   // number of kaon prongs decayed to a pion
+    int8_t nInteractionsWithMaterialLocal = 0; // number of interactions with material
+    int indexMother = -1;                      // index of the mother particle
+    std::vector<int> arrAllDaughtersIndex;     // vector of indices of all daughters of the mother of the first provided daughter
+    std::array<int, N> arrDaughtersIndex;      // array of indices of provided daughters
     if (sign) {
       *sign = sgn;
     }
@@ -737,6 +742,28 @@ struct RecoDecay {
           particleI = motherI;
         }
       }
+      if constexpr (acceptTrackIntWithMaterial) {
+        // Replace the MC particle associated with the prong by its mother for part → part due to material interactions.
+        // It keeps looking at the mother iteratively, until it finds a particle from decay or primary
+        auto process = particleI.getProcess();
+        auto pdgI = std::abs(particleI.pdgCode());
+        auto pdgMotherI = std::abs(particleI.pdgCode());
+        while (process != TMCProcess::kPDecay && process != TMCProcess::kPPrimary && pdgI == pdgMotherI) {
+          if (!particleI.has_mothers()) {
+            break;
+          }
+          auto motherI = particleI.template mothers_first_as<T>();
+          pdgI = std::abs(particleI.pdgCode());
+          pdgMotherI = std::abs(motherI.pdgCode());
+          if (pdgI == pdgMotherI) {
+            particleI = motherI;
+            process = particleI.getProcess();
+            if (process == TMCProcess::kPDecay || process == TMCProcess::kPPrimary) { // we found the original daughter that interacted with material
+              nInteractionsWithMaterialLocal++;
+            }
+          }
+        }
+      }
       arrDaughtersIndex[iProng] = particleI.globalIndex();
       // Get the list of daughter indices from the mother of the first prong.
       if (iProng == 0) {
@@ -817,6 +844,11 @@ struct RecoDecay {
         *nKaToPi = nKaToPiLocal;
       }
     }
+    if constexpr (acceptTrackIntWithMaterial) {
+      if (nInteractionsWithMaterial) {
+        *nInteractionsWithMaterial = nInteractionsWithMaterialLocal;
+      }
+    }
     return indexMother;
   }
 

Common/Tasks/flowTest.cxx

@@ -42,13 +42,15 @@ struct flowTest {
 
   ConfigurableAxis axisB{"axisB", {100, 0.0f, 20.0f}, ""};
   ConfigurableAxis axisPhi{"axisPhi", {100, 0.0f, 2.0f * TMath::Pi()}, ""};
+  ConfigurableAxis axisNch{"axisNch", {300, 0.0f, 3000.0f}, "Nch in |eta|<0.8"};
 
   ConfigurableAxis axisPt{"axisPt", {VARIABLE_WIDTH, 0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1.0f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f, 1.8f, 1.9f, 2.0f, 2.2f, 2.4f, 2.6f, 2.8f, 3.0f, 3.2f, 3.4f, 3.6f, 3.8f, 4.0f, 4.4f, 4.8f, 5.2f, 5.6f, 6.0f, 6.5f, 7.0f, 7.5f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f}, "pt axis"};
 
   void init(InitContext&)
   {
     // pT histograms
     histos.add<TH1>("hImpactParameter", "hImpactParameter", HistType::kTH1D, {axisB});
+    histos.add<TH2>("hNchVsImpactParameter", "hNchVsImpactParameter", HistType::kTH2D, {axisB, axisNch});
     histos.add<TH1>("hEventPlaneAngle", "hEventPlaneAngle", HistType::kTH1D, {axisPhi});
     histos.add<TH2>("hPtVsPhiGenerated", "hPtVsPhiGenerated", HistType::kTH2D, {axisPhi, axisPt});
     histos.add<TH2>("hPtVsPhiGlobal", "hPtVsPhiGlobal", HistType::kTH2D, {axisPhi, axisPt});
@@ -80,6 +82,8 @@ struct flowTest {
     if (evPhi < 0)
       evPhi += 2. * TMath::Pi();
 
+    long nCh = 0;
+
     if (imp > minB && imp < maxB) {
       // event within range
       histos.fill(HIST("hImpactParameter"), imp);
@@ -104,6 +108,8 @@ struct flowTest {
         histos.fill(HIST("hPtVsPhiGenerated"), deltaPhi, mcParticle.pt());
         histos.fill(HIST("hBVsPtVsPhiGenerated"), imp, deltaPhi, mcParticle.pt());
 
+        nCh++;
+
         bool validGlobal = false;
         bool validTrack = false;
         bool validTPCTrack = false;
@@ -146,6 +152,7 @@ struct flowTest {
           histos.fill(HIST("hBVsPtVsPhiITSABTrack"), imp, deltaPhi, mcParticle.pt());
       }
     }
+    histos.fill(HIST("hNchVsImpactParameter"), imp, nCh);
   }
 
   using LabeledCascades = soa::Join<aod::CascDataExt, aod::McCascLabels>;

DPG/Tasks/AOTTrack/PID/CMakeLists.txt

@@ -12,4 +12,5 @@
 add_subdirectory(Combined)
 add_subdirectory(TOF)
 add_subdirectory(TPC)
+add_subdirectory(ITS)
 add_subdirectory(HMPID)

DPG/Tasks/AOTTrack/PID/HMPID/qaHMPID.cxx

@@ -159,8 +159,8 @@ struct pidHmpidQa {
 
       histos.fill(HIST("hmpidSignal"), t.hmpidSignal());
       histos.fill(HIST("PhivsEta"), t.track_as<TrackCandidates>().eta(), t.track_as<TrackCandidates>().phi());
-      histos.fill(HIST("hmpidMomvsTrackMom"), t.track_as<TrackCandidates>().p(), abs(t.hmpidMom()));
-      histos.fill(HIST("hmpidCkovvsMom"), abs(t.hmpidMom()), t.hmpidSignal());
+      histos.fill(HIST("hmpidMomvsTrackMom"), t.track_as<TrackCandidates>().p(), std::abs(t.hmpidMom()));
+      histos.fill(HIST("hmpidCkovvsMom"), std::abs(t.hmpidMom()), t.hmpidSignal());
       histos.fill(HIST("hmpidXTrack"), t.hmpidXTrack());
       histos.fill(HIST("hmpidYTrack"), t.hmpidYTrack());
       histos.fill(HIST("hmpidXMip"), t.hmpidXMip());
@@ -173,7 +173,7 @@ struct pidHmpidQa {
       histos.fill(HIST("hmpidQMip"), t.hmpidQMip());
       histos.fill(HIST("hmpidClusSize"), (t.hmpidClusSize() % 1000000) / 1000);
       histos.fill(HIST("TrackMom"), t.track_as<TrackCandidates>().p());
-      histos.fill(HIST("hmpidMom"), abs(t.hmpidMom()));
+      histos.fill(HIST("hmpidMom"), std::abs(t.hmpidMom()));
       for (int i = 0; i < 10; i++) {
         if (t.hmpidPhotsCharge()[i] > 0)
           histos.fill(HIST("hmpidPhotsCharge"), t.hmpidPhotsCharge()[i]);
@@ -190,7 +190,7 @@ struct pidHmpidQa {
         histos.fill(HIST("hmpidQMip0"), t.hmpidQMip());
         histos.fill(HIST("hmpidClusSize0"), (t.hmpidClusSize() % 1000000) / 1000);
         histos.fill(HIST("TrackMom0"), t.track_as<TrackCandidates>().p());
-        histos.fill(HIST("hmpidMom0"), abs(t.hmpidMom()));
+        histos.fill(HIST("hmpidMom0"), std::abs(t.hmpidMom()));
         for (int i = 0; i < 10; i++) {
           if (t.hmpidPhotsCharge()[i] > 0)
             histos.fill(HIST("hmpidPhotsCharge0"), t.hmpidPhotsCharge()[i]);
@@ -208,7 +208,7 @@ struct pidHmpidQa {
         histos.fill(HIST("hmpidQMip1"), t.hmpidQMip());
         histos.fill(HIST("hmpidClusSize1"), (t.hmpidClusSize() % 1000000) / 1000);
         histos.fill(HIST("TrackMom1"), t.track_as<TrackCandidates>().p());
-        histos.fill(HIST("hmpidMom1"), abs(t.hmpidMom()));
+        histos.fill(HIST("hmpidMom1"), std::abs(t.hmpidMom()));
         for (int i = 0; i < 10; i++) {
           if (t.hmpidPhotsCharge()[i] > 0)
             histos.fill(HIST("hmpidPhotsCharge1"), t.hmpidPhotsCharge()[i]);
@@ -226,7 +226,7 @@ struct pidHmpidQa {
         histos.fill(HIST("hmpidQMip2"), t.hmpidQMip());
         histos.fill(HIST("hmpidClusSize2"), (t.hmpidClusSize() % 1000000) / 1000);
         histos.fill(HIST("TrackMom2"), t.track_as<TrackCandidates>().p());
-        histos.fill(HIST("hmpidMom2"), abs(t.hmpidMom()));
+        histos.fill(HIST("hmpidMom2"), std::abs(t.hmpidMom()));
         for (int i = 0; i < 10; i++) {
           if (t.hmpidPhotsCharge()[i] > 0)
             histos.fill(HIST("hmpidPhotsCharge2"), t.hmpidPhotsCharge()[i]);
@@ -244,7 +244,7 @@ struct pidHmpidQa {
         histos.fill(HIST("hmpidQMip3"), t.hmpidQMip());
         histos.fill(HIST("hmpidClusSize3"), (t.hmpidClusSize() % 1000000) / 1000);
         histos.fill(HIST("TrackMom3"), t.track_as<TrackCandidates>().p());
-        histos.fill(HIST("hmpidMom3"), abs(t.hmpidMom()));
+        histos.fill(HIST("hmpidMom3"), std::abs(t.hmpidMom()));
         for (int i = 0; i < 10; i++) {
           if (t.hmpidPhotsCharge()[i] > 0)
             histos.fill(HIST("hmpidPhotsCharge3"), t.hmpidPhotsCharge()[i]);
@@ -262,7 +262,7 @@ struct pidHmpidQa {
         histos.fill(HIST("hmpidQMip4"), t.hmpidQMip());
         histos.fill(HIST("hmpidClusSize4"), (t.hmpidClusSize() % 1000000) / 1000);
         histos.fill(HIST("TrackMom4"), t.track_as<TrackCandidates>().p());
-        histos.fill(HIST("hmpidMom4"), abs(t.hmpidMom()));
+        histos.fill(HIST("hmpidMom4"), std::abs(t.hmpidMom()));
         for (int i = 0; i < 10; i++) {
           if (t.hmpidPhotsCharge()[i] > 0)
             histos.fill(HIST("hmpidPhotsCharge4"), t.hmpidPhotsCharge()[i]);
@@ -280,7 +280,7 @@ struct pidHmpidQa {
         histos.fill(HIST("hmpidQMip5"), t.hmpidQMip());
         histos.fill(HIST("hmpidClusSize5"), (t.hmpidClusSize() % 1000000) / 1000);
         histos.fill(HIST("TrackMom5"), t.track_as<TrackCandidates>().p());
-        histos.fill(HIST("hmpidMom5"), abs(t.hmpidMom()));
+        histos.fill(HIST("hmpidMom5"), std::abs(t.hmpidMom()));
         for (int i = 0; i < 10; i++) {
           if (t.hmpidPhotsCharge()[i] > 0)
             histos.fill(HIST("hmpidPhotsCharge5"), t.hmpidPhotsCharge()[i]);
@@ -298,7 +298,7 @@ struct pidHmpidQa {
         histos.fill(HIST("hmpidQMip6"), t.hmpidQMip());
         histos.fill(HIST("hmpidClusSize6"), (t.hmpidClusSize() % 1000000) / 1000);
         histos.fill(HIST("TrackMom6"), t.track_as<TrackCandidates>().p());
-        histos.fill(HIST("hmpidMom6"), abs(t.hmpidMom()));
+        histos.fill(HIST("hmpidMom6"), std::abs(t.hmpidMom()));
         for (int i = 0; i < 10; i++) {
           if (t.hmpidPhotsCharge()[i] > 0)
             histos.fill(HIST("hmpidPhotsCharge6"), t.hmpidPhotsCharge()[i]);

DPG/Tasks/AOTTrack/PID/ITS/CMakeLists.txt

@@ -0,0 +1,16 @@
+# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+# All rights not expressly granted are reserved.
+#
+# This software is distributed under the terms of the GNU General Public
+# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+#
+# In applying this license CERN does not waive the privileges and immunities
+# granted to it by virtue of its status as an Intergovernmental Organization
+# or submit itself to any jurisdiction.
+
+# ITS
+o2physics_add_dpl_workflow(pid-its-qa
+    SOURCES qaPIDITS.cxx
+    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+    COMPONENT_NAME Analysis)