Merge branch 'AliceO2Group:master' into master

Author: sarahherrmann

ALICE3/Core/TOFResoALICE3.h

@@ -59,7 +59,7 @@ class TOFResoALICE3 : public Parametrization
 float TOFResoALICE3Param(const float& momentum, const float& momentumError, const float& evtimereso, const float& length, const float& mass, const Parameters& parameters)
 {
   if (momentum <= 0) {
-    return -999;
+    return -999.f;
   }
 
   const float p2 = momentum * momentum;

ALICE3/TableProducer/alice3-centrality.cxx

@@ -27,7 +27,7 @@ struct ALICE3Centrality {
   Produces<aod::CentV0Ms> cent;
   Service<o2::ccdb::BasicCCDBManager> ccdb;
 
-  HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::QAObject};
+  HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
   Configurable<float> MinEta{"MinEta", -4.0f, "Minimum eta in range"};
   Configurable<float> MaxEta{"MaxEta", 4.0f, "Maximum eta in range"};
   Configurable<float> MaxMult{"MaxMult", 10000.f, "Maximum multiplicity in range"};

ALICE3/TableProducer/alice3-pidTOF.cxx

@@ -11,7 +11,7 @@
 
 ///
 /// \file   alice3-pidTOF.cxx
-/// \author Nicolo' Jacazio
+/// \author Nicolò Jacazio nicolo.jacazio@cern.ch
 /// \brief  Task to produce PID tables for TOF split for each particle.
 ///         Only the tables for the mass hypotheses requested are filled, the others are sent empty.
 ///
@@ -26,6 +26,7 @@
 #include "ALICE3/Core/TOFResoALICE3.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Framework/RunningWorkflowInfo.h"
+#include "Framework/StaticFor.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -120,9 +121,15 @@ struct ALICE3pidTOFTask {
   template <o2::track::PID::ID id>
   float nsigma(Trks::iterator track)
   {
-    return ((track.trackTime() - track.collision().collisionTime()) * 1000.f - tof::ExpTimes<Trks::iterator, id>::GetExpectedSignal(track)) / sigma<id>(track);
+    if (!track.hasTOF()) {
+      return -999.f;
+    }
+    return ((track.trackTime() - track.collision().collisionTime()) * 1000.f - tof::ExpTimes<Trks::iterator, id>::ComputeExpectedTime(track.tofExpMom() / o2::pid::tof::kCSPEED,
+                                                                                                                                      track.length(),
+                                                                                                                                      o2::track::PID::getMass2Z(id))) /
+           sigma<id>(track);
   }
-  void process(Coll const& collisions, Trks const& tracks)
+  void process(Trks const& tracks, Coll const&)
   {
     tablePIDEl.reserve(tracks.size());
     tablePIDMu.reserve(tracks.size());
@@ -167,8 +174,8 @@ struct ALICE3pidTOFTaskQA {
 
   Configurable<int> logAxis{"logAxis", 1, "Flag to use a log momentum axis"};
   Configurable<int> nBinsP{"nBinsP", 400, "Number of bins for the momentum"};
-  Configurable<float> minP{"minP", -2.f, "Minimum momentum in range"};
-  Configurable<float> maxP{"maxP", 2.f, "Maximum momentum in range"};
+  Configurable<float> minP{"minP", 0.01f, "Minimum momentum in range"};
+  Configurable<float> maxP{"maxP", 20.f, "Maximum momentum in range"};
   Configurable<int> nBinsDelta{"nBinsDelta", 200, "Number of bins for the Delta"};
   Configurable<float> minDelta{"minDelta", -1000.f, "Minimum Delta in range"};
   Configurable<float> maxDelta{"maxDelta", 1000.f, "Maximum Delta in range"};
@@ -181,15 +188,8 @@ struct ALICE3pidTOFTaskQA {
   Configurable<int> minMult{"minMult", 1, "Minimum track multiplicity with TOF"};
 
   template <uint8_t i>
-  void addParticleHistos()
+  void addParticleHistos(const AxisSpec& pAxis, const AxisSpec& ptAxis)
   {
-    AxisSpec pAxis{nBinsP, minP, maxP, "#it{p} (GeV/#it{c})"};
-    AxisSpec ptAxis{nBinsP, minP, maxP, "#it{p}_{T} (GeV/#it{c})"};
-    if (logAxis) {
-      pAxis.makeLogaritmic();
-      ptAxis.makeLogaritmic();
-    }
-
     // Exp signal
     const AxisSpec expAxis{1000, 0, 2e6, Form("t_{exp}(%s)", pT[i])};
     histos.add(hexpected[i].data(), "", kTH2F, {pAxis, expAxis});
@@ -210,7 +210,6 @@ struct ALICE3pidTOFTaskQA {
   void init(o2::framework::InitContext&)
   {
 
-    const AxisSpec pExpAxis{100, 0, 10, "#it{p}_{Exp. TOF} (GeV/#it{c})"};
     const AxisSpec multAxis{100, 0, 100, "TOF multiplicity"};
     const AxisSpec vtxZAxis{100, -20, 20, "Vtx_{z} (cm)"};
     const AxisSpec tofAxis{10000, 0, 2e6, "TOF Signal"};
@@ -221,9 +220,11 @@ struct ALICE3pidTOFTaskQA {
     const AxisSpec ptResoAxis{100, 0, 0.1, "#sigma_{#it{p}_{T}}"};
     AxisSpec ptAxis{nBinsP, minP, maxP, "#it{p}_{T} (GeV/#it{c})"};
     AxisSpec pAxis{nBinsP, minP, maxP, "#it{p} (GeV/#it{c})"};
+    AxisSpec pExpAxis{nBinsP, minP, maxP, "#it{p}_{Exp. TOF} (GeV/#it{c})"};
     if (logAxis) {
       ptAxis.makeLogaritmic();
       pAxis.makeLogaritmic();
+      pExpAxis.makeLogaritmic();
     }
 
     // Event properties
@@ -239,24 +240,18 @@ struct ALICE3pidTOFTaskQA {
     histos.add("event/p", "", kTH1F, {pAxis});
     histos.add("event/ptreso", "", kTH2F, {pAxis, ptResoAxis});
 
-    addParticleHistos<0>();
-    addParticleHistos<1>();
-    addParticleHistos<2>();
-    addParticleHistos<3>();
-    addParticleHistos<4>();
-    addParticleHistos<5>();
-    addParticleHistos<6>();
-    addParticleHistos<7>();
-    addParticleHistos<8>();
+    static_for<0, 8>([&](auto i) {
+      addParticleHistos<i>(pAxis, ptAxis);
+    });
   }
 
-  template <uint8_t i, typename T>
-  void fillParticleHistos(const T& t, const float& tof, const float& exp_diff, const float& expsigma, const float& nsigma)
+  template <o2::track::PID::ID i, typename T>
+  void fillParticleHistos(const T& t, const float& tof, const float& exp_diff, const float& expsigma)
   {
     histos.fill(HIST(hexpected[i]), t.p(), tof - exp_diff);
     histos.fill(HIST(hexpected_diff[i]), t.p(), exp_diff);
     histos.fill(HIST(hexpsigma[i]), t.p(), expsigma);
-    histos.fill(HIST(hnsigma[i]), t.p(), nsigma);
+    histos.fill(HIST(hnsigma[i]), t.p(), o2::aod::pidutils::tofNSigma(i, t));
   }
 
   void process(aod::Collision const& collision,
@@ -301,21 +296,21 @@ 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());
+      histos.fill(HIST("event/pexp"), t.p(), t.tofExpMom() / o2::pid::tof::kCSPEED);
       histos.fill(HIST("event/eta"), t.eta());
       histos.fill(HIST("event/length"), t.length());
       histos.fill(HIST("event/pt"), t.pt());
       histos.fill(HIST("event/ptreso"), t.p(), t.sigma1Pt() * t.pt() * t.pt());
       //
-      fillParticleHistos<0>(t, tof, t.tofExpSignalDiffEl(), t.tofExpSigmaEl(), t.tofNSigmaEl());
-      fillParticleHistos<1>(t, tof, t.tofExpSignalDiffMu(), t.tofExpSigmaMu(), t.tofNSigmaMu());
-      fillParticleHistos<2>(t, tof, t.tofExpSignalDiffPi(), t.tofExpSigmaPi(), t.tofNSigmaPi());
-      fillParticleHistos<3>(t, tof, t.tofExpSignalDiffKa(), t.tofExpSigmaKa(), t.tofNSigmaKa());
-      fillParticleHistos<4>(t, tof, t.tofExpSignalDiffPr(), t.tofExpSigmaPr(), t.tofNSigmaPr());
-      fillParticleHistos<5>(t, tof, t.tofExpSignalDiffDe(), t.tofExpSigmaDe(), t.tofNSigmaDe());
-      fillParticleHistos<6>(t, tof, t.tofExpSignalDiffTr(), t.tofExpSigmaTr(), t.tofNSigmaTr());
-      fillParticleHistos<7>(t, tof, t.tofExpSignalDiffHe(), t.tofExpSigmaHe(), t.tofNSigmaHe());
-      fillParticleHistos<8>(t, tof, t.tofExpSignalDiffAl(), t.tofExpSigmaAl(), t.tofNSigmaAl());
+      fillParticleHistos<o2::track::PID::Electron>(t, tof, t.tofExpSignalDiffEl(), t.tofExpSigmaEl());
+      fillParticleHistos<o2::track::PID::Muon>(t, tof, t.tofExpSignalDiffMu(), t.tofExpSigmaMu());
+      fillParticleHistos<o2::track::PID::Pion>(t, tof, t.tofExpSignalDiffPi(), t.tofExpSigmaPi());
+      fillParticleHistos<o2::track::PID::Kaon>(t, tof, t.tofExpSignalDiffKa(), t.tofExpSigmaKa());
+      fillParticleHistos<o2::track::PID::Proton>(t, tof, t.tofExpSignalDiffPr(), t.tofExpSigmaPr());
+      fillParticleHistos<o2::track::PID::Deuteron>(t, tof, t.tofExpSignalDiffDe(), t.tofExpSigmaDe());
+      fillParticleHistos<o2::track::PID::Triton>(t, tof, t.tofExpSignalDiffTr(), t.tofExpSigmaTr());
+      fillParticleHistos<o2::track::PID::Helium3>(t, tof, t.tofExpSignalDiffHe(), t.tofExpSigmaHe());
+      fillParticleHistos<o2::track::PID::Alpha>(t, tof, t.tofExpSignalDiffAl(), t.tofExpSigmaAl());
     }
   }
 };

Common/Core/PID/BetheBloch.h

@@ -19,9 +19,10 @@
 #ifndef O2_ANALYSIS_PID_BETHEBLOCH_H_
 #define O2_ANALYSIS_PID_BETHEBLOCH_H_
 
-#include "TPCSimulation/Detector.h"
+#include "DataFormatsTPC/BetheBlochAleph.h"
 #include "Common/Core/PID/ParamBase.h"
 #include "ReconstructionDataFormats/PID.h"
+#include <cmath>
 
 namespace o2::pid::tpc
 {
@@ -33,14 +34,14 @@ class BetheBloch : public Parametrization
   ~BetheBloch() override = default;
   float operator()(const float* x) const override
   {
-    return mParameters[5] * o2::tpc::Detector::BetheBlochAleph(x[0], mParameters[0], mParameters[1], mParameters[2], mParameters[3], mParameters[4]) * TMath::Power(x[1], mParameters[6]);
+    return mParameters[5] * o2::tpc::BetheBlochAleph(x[0], mParameters[0], mParameters[1], mParameters[2], mParameters[3], mParameters[4]) * std::pow(x[1], mParameters[6]);
   }
   ClassDef(BetheBloch, 1);
 };
 
 float BetheBlochParam(const float& momentum, const float& mass, const float& charge, const Parameters& parameters)
 {
-  return parameters[5] * o2::tpc::Detector::BetheBlochAleph(momentum / mass, parameters[0], parameters[1], parameters[2], parameters[3], parameters[4]) * pow(charge, parameters[6]);
+  return parameters[5] * o2::tpc::BetheBlochAleph(momentum / mass, parameters[0], parameters[1], parameters[2], parameters[3], parameters[4]) * std::pow(charge, parameters[6]);
 }
 
 template <o2::track::PID::ID id, typename T>