Merge branch 'master' into deutInJets

Author: Cristian-Moscatelli

ALICE3/Core/ALICE3CoreLinkDef.h

@@ -14,3 +14,5 @@
 #pragma link off all functions;
 
 #pragma link C++ class o2::pid::tof::TOFResoALICE3 + ;
+#pragma link C++ class std::vector < std::vector < unsigned int>> + ;
+#pragma link C++ class std::vector < std::vector < std::uint32_t>> + ;

ALICE3/Core/FastTracker.cxx

@@ -288,7 +288,7 @@ float FastTracker::ProbGoodChiSqHit(float radius, float searchRadiusRPhi, float
 
 // function to provide a reconstructed track from a perfect input track
 // returns number of intercepts (generic for now)
-int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackParCov& outputTrack, const float nch)
+int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackParCov& outputTrack, const float nch, const float maxRadius)
 {
   dNdEtaCent = nch; // set the number of charged particles per unit rapidity
   hits.clear();
@@ -335,6 +335,14 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
       continue; // this layer should not be attempted, but go ahead
     }
 
+    if (layers[il].getRadius() > maxRadius) {
+      if (lastLayerReached == -1) {
+        // This means that we didn't reach the first layer
+        return -9;
+      }
+      break; // could not reach
+    }
+
     // check if layer is reached
     float targetX = 1e+3;
     inputTrack.getXatLabR(layers[il].getRadius(), targetX, magneticField);
@@ -367,6 +375,7 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
         break;
       }
     }
+
     if (std::abs(inputTrack.getZ()) > layers[il].getZ() && mApplyZacceptance) {
       break; // out of acceptance bounds
     }
@@ -405,8 +414,9 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
   static constexpr float kLargeErr2Dir = 0.7 * 0.7;
   static constexpr float kLargeErr2PtI = 30.5 * 30.5;
   std::array<float, o2::track::kCovMatSize> largeCov = {0.};
-  for (int ic = o2::track::kCovMatSize; ic--;)
+  for (int ic = o2::track::kCovMatSize; ic--;) {
     largeCov[ic] = 0.;
+  }
   largeCov[o2::track::CovLabels::kSigY2] = largeCov[o2::track::CovLabels::kSigZ2] = kLargeErr2Coord;
   largeCov[o2::track::CovLabels::kSigSnp2] = largeCov[o2::track::CovLabels::kSigTgl2] = kLargeErr2Dir;
   largeCov[o2::track::CovLabels::kSigQ2Pt2] = kLargeErr2PtI * trPars[o2::track::ParLabels::kQ2Pt] * trPars[o2::track::ParLabels::kQ2Pt];
@@ -442,8 +452,10 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
       std::cos(alpha) * spacePoint[0] + std::sin(alpha) * spacePoint[1],
       -std::sin(alpha) * spacePoint[0] + std::cos(alpha) * spacePoint[1],
       spacePoint[2]};
-    if (!inwardTrack.propagateTo(xyz1[0], magneticField))
+
+    if (!inwardTrack.propagateTo(xyz1[0], magneticField)) {
       continue;
+    }
 
     if (!layers[il].isInert()) { // only update covm for tracker hits
       const o2::track::TrackParametrization<float>::dim2_t hitpoint = {
@@ -474,13 +486,14 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
       }
     }
 
-    if (layers[il].isSilicon())
+    if (layers[il].isSilicon()) {
       nSiliconPoints++; // count silicon hits
-    if (layers[il].isGas())
+    }
+    if (layers[il].isGas()) {
       nGasPoints++; // count TPC/gas hits
+    }
 
     hits.push_back(thisHit);
-
     if (!layers[il].isInert()) { // good hit probability calculation
       float sigYCmb = o2::math_utils::sqrt(inwardTrack.getSigmaY2() + layers[il].getResolutionRPhi() * layers[il].getResolutionRPhi());
       float sigZCmb = o2::math_utils::sqrt(inwardTrack.getSigmaZ2() + layers[il].getResolutionZ() * layers[il].getResolutionZ());
@@ -502,30 +515,34 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
   }
 
   // only attempt to continue if intercepts are at least four
-  if (nIntercepts < 4)
+  if (nIntercepts < 4) {
     return nIntercepts;
+  }
 
   // generate efficiency
   float eff = 1.;
   for (size_t i = 0; i < layers.size(); i++) {
     float iGoodHit = goodHitProbability[i];
-    if (iGoodHit <= 0)
+    if (iGoodHit <= 0) {
       continue;
+    }
 
     eff *= iGoodHit;
   }
   if (mApplyEffCorrection) {
-    if (gRandom->Uniform() > eff)
+    if (gRandom->Uniform() > eff) {
       return -8;
+    }
   }
 
   outputTrack.setCov(inwardTrack.getCov());
   outputTrack.checkCovariance();
 
   // Use covariance matrix based smearing
   std::array<float, o2::track::kCovMatSize> covMat = {0.};
-  for (int ii = 0; ii < o2::track::kCovMatSize; ii++)
+  for (int ii = 0; ii < o2::track::kCovMatSize; ii++) {
     covMat[ii] = outputTrack.getCov()[ii];
+  }
   TMatrixDSym m(5);
   double fcovm[5][5]; // double precision is needed for regularisation
 

ALICE3/Core/FastTracker.h

@@ -92,7 +92,7 @@ class FastTracker
    * @param nch Charged particle multiplicity (used for hit density calculations).
    * @return int i.e. number of intercepts (implementation-defined).
    */
-  int FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackParCov& outputTrack, const float nch);
+  int FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackParCov& outputTrack, const float nch, const float maxRadius = 100.f);
 
   // For efficiency calculation
   float Dist(float z, float radius);

ALICE3/Core/GeometryContainer.cxx

@@ -101,6 +101,14 @@ void GeometryContainer::init(o2::framework::InitContext& initContext)
   }
 }
 
+void GeometryContainer::addEntry(const std::string& filename)
+{
+  if (!mCcdb) {
+    LOG(fatal) << " --- ccdb is not set";
+  }
+  mEntries.emplace_back(filename, mCcdb);
+}
+
 std::map<std::string, std::string> GeometryEntry::getConfiguration(const std::string& layerName) const
 {
   auto it = mConfigurations.find(layerName);

ALICE3/Core/GeometryContainer.h

@@ -91,7 +91,7 @@ class GeometryContainer
   void init(o2::framework::InitContext& initContext);
 
   // Add a geometry entry from a configuration file
-  void addEntry(const std::string& filename) { mEntries.emplace_back(filename, mCcdb); }
+  void addEntry(const std::string& filename);
   static void setLutCleanupSetting(const bool cleanLutWhenLoaded) { mCleanLutWhenLoaded = cleanLutWhenLoaded; }
   void setCcdbManager(o2::ccdb::BasicCCDBManager* mgr) { mCcdb = mgr; }
 

ALICE3/DataModel/OTFMCParticle.h

@@ -37,7 +37,7 @@ DECLARE_SOA_COLUMN(IsPrimary, isPrimary, bool);
 
 } // namespace otfmcparticle
 
-DECLARE_SOA_TABLE_FULL(McParticlesWithDau, "McParticlesWithDau", "AOD", "MCPARTICLEWITHDAU",
+DECLARE_SOA_TABLE_FULL(McPartsWithDau, "McPartsWithDau", "AOD", "MCPARTSWITHDAU",
                        o2::soa::Index<>,
                        mcparticle::McCollisionId,
                        mcparticle::PdgCode,
@@ -69,7 +69,7 @@ DECLARE_SOA_TABLE_FULL(McParticlesWithDau, "McParticlesWithDau", "AOD", "MCPARTI
                        mcparticle::GetProcess<mcparticle::Flags, mcparticle::StatusCode>,
                        mcparticle::IsPhysicalPrimary<mcparticle::Flags>);
 
-using McParticleWithDau = McParticlesWithDau::iterator;
+using McPartWithDau = McPartsWithDau::iterator;
 
 } // namespace o2::aod
 

ALICE3/DataModel/OTFMulticharm.h

@@ -75,31 +75,6 @@ DECLARE_SOA_COLUMN(XicProperLength, xicProperLength, float);
 DECLARE_SOA_COLUMN(XicDistanceFromPV, xicDistanceFromPV, float);
 DECLARE_SOA_COLUMN(XiccProperLength, xiccProperLength, float);
 
-// PID
-DECLARE_SOA_COLUMN(Pi1cTofDeltaInner, pi1cTofDeltaInner, float);
-DECLARE_SOA_COLUMN(Pi1cTofNSigmaInner, pi1cTofNSigmaInner, float);
-DECLARE_SOA_COLUMN(Pi1cTofDeltaOuter, pi1cTofDeltaOuter, float);
-DECLARE_SOA_COLUMN(Pi1cTofNSigmaOuter, pi1cTofNSigmaOuter, float);
-DECLARE_SOA_COLUMN(Pi1cHasRichSignal, pi1cHasRichSignal, bool);
-DECLARE_SOA_COLUMN(Pi1cRichNSigma, pi1cRichNSigma, float);
-DECLARE_SOA_COLUMN(Pi1cPdgCode, pi1cPdgCode, int);
-
-DECLARE_SOA_COLUMN(Pi2cTofDeltaInner, pi2cTofDeltaInner, float);
-DECLARE_SOA_COLUMN(Pi2cTofNSigmaInner, pi2cTofNSigmaInner, float);
-DECLARE_SOA_COLUMN(Pi2cTofDeltaOuter, pi2cTofDeltaOuter, float);
-DECLARE_SOA_COLUMN(Pi2cTofNSigmaOuter, pi2cTofNSigmaOuter, float);
-DECLARE_SOA_COLUMN(Pi2cHasRichSignal, pi2cHasRichSignal, bool);
-DECLARE_SOA_COLUMN(Pi2cRichNSigma, pi2cRichNSigma, float);
-DECLARE_SOA_COLUMN(Pi2cPdgCode, pi2cPdgCode, int);
-
-DECLARE_SOA_COLUMN(PiccTofDeltaInner, piccTofDeltaInner, float);
-DECLARE_SOA_COLUMN(PiccTofNSigmaInner, piccTofNSigmaInner, float);
-DECLARE_SOA_COLUMN(PiccTofDeltaOuter, piccTofDeltaOuter, float);
-DECLARE_SOA_COLUMN(PiccTofNSigmaOuter, piccTofNSigmaOuter, float);
-DECLARE_SOA_COLUMN(PiccHasRichSignal, piccHasRichSignal, bool);
-DECLARE_SOA_COLUMN(PiccRichNSigma, piccRichNSigma, float);
-DECLARE_SOA_COLUMN(PiccPdgCode, piccPdgCode, int);
-
 // Daughter info
 DECLARE_SOA_COLUMN(PosPt, posPt, float);
 DECLARE_SOA_COLUMN(PosEta, posEta, float);
@@ -159,31 +134,6 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
                   otfmulticharm::PiccPt,
                   otfmulticharm::LUTConfigId);
 
-DECLARE_SOA_TABLE(MCharmPID, "AOD", "MCharmPID",
-                  otfmulticharm::Pi1cTofDeltaInner,
-                  otfmulticharm::Pi1cTofNSigmaInner,
-                  otfmulticharm::Pi1cTofDeltaOuter,
-                  otfmulticharm::Pi1cTofNSigmaOuter,
-                  otfmulticharm::Pi1cHasRichSignal,
-                  otfmulticharm::Pi1cRichNSigma,
-                  otfmulticharm::Pi1cPdgCode,
-
-                  otfmulticharm::Pi2cTofDeltaInner,
-                  otfmulticharm::Pi2cTofNSigmaInner,
-                  otfmulticharm::Pi2cTofDeltaOuter,
-                  otfmulticharm::Pi2cTofNSigmaOuter,
-                  otfmulticharm::Pi2cHasRichSignal,
-                  otfmulticharm::Pi2cRichNSigma,
-                  otfmulticharm::Pi2cPdgCode,
-
-                  otfmulticharm::PiccTofDeltaInner,
-                  otfmulticharm::PiccTofNSigmaInner,
-                  otfmulticharm::PiccTofDeltaOuter,
-                  otfmulticharm::PiccTofNSigmaOuter,
-                  otfmulticharm::PiccHasRichSignal,
-                  otfmulticharm::PiccRichNSigma,
-                  otfmulticharm::PiccPdgCode);
-
 DECLARE_SOA_TABLE(MCharmExtra, "AOD", "MCharmExtra",
                   otfmulticharm::BachPt,
                   otfmulticharm::BachEta,

ALICE3/DataModel/tracksAlice3.h

@@ -21,6 +21,7 @@
 
 // O2 includes
 #include "Framework/AnalysisDataModel.h"
+#include <Framework/ASoA.h>
 
 namespace o2::aod
 {
@@ -29,16 +30,30 @@ namespace track_alice3
 DECLARE_SOA_COLUMN(IsReconstructed, isReconstructed, bool); //! is reconstructed or not
 DECLARE_SOA_COLUMN(NSiliconHits, nSiliconHits, int);        //! number of silicon hits
 DECLARE_SOA_COLUMN(NTPCHits, nTPCHits, int);                //! number of tpc hits
+DECLARE_SOA_COLUMN(PdgCode, pdgCode, int);                  //! PDG code of the linked truth MC particle
 } // namespace track_alice3
 DECLARE_SOA_TABLE(TracksAlice3, "AOD", "TRACKSALICE3",
                   track_alice3::IsReconstructed);
 using TrackAlice3 = TracksAlice3::iterator;
 
+DECLARE_SOA_TABLE(TracksAlice3Pdg, "AOD", "TRACKSALICE3PDG",
+                  track_alice3::PdgCode);
+using TrackAlice3Pdg = TracksAlice3Pdg::iterator;
+
 DECLARE_SOA_TABLE(TracksExtraA3, "AOD", "TracksExtraA3",
                   track_alice3::NSiliconHits,
                   track_alice3::NTPCHits);
 using TrackExtraA3 = TracksExtraA3::iterator;
 
+namespace mcparticle_alice3
+{
+DECLARE_SOA_COLUMN(NHits, nHits, int);     //! number of silicon hits
+DECLARE_SOA_COLUMN(Charge, charge, float); //! particle charge
+} // namespace mcparticle_alice3
+DECLARE_SOA_TABLE(MCParticlesExtraA3, "AOD", "MCParticlesExtraA3",
+                  mcparticle_alice3::NHits,
+                  mcparticle_alice3::Charge);
+using MCParticleExtraA3 = MCParticlesExtraA3::iterator;
 } // namespace o2::aod
 
 #endif // ALICE3_DATAMODEL_TRACKSALICE3_H_

ALICE3/TableProducer/CMakeLists.txt

@@ -58,7 +58,7 @@ o2physics_add_dpl_workflow(alice3-hf-tree-creator-3prong
 
 o2physics_add_dpl_workflow(alice3-tracking-translator
                     SOURCES alice3TrackingTranslator.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::ALICE3Core
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(alice3-dq-table-maker
@@ -68,5 +68,5 @@ o2physics_add_dpl_workflow(alice3-dq-table-maker
 
 o2physics_add_dpl_workflow(alice3strangenessfinder
                     SOURCES alice3strangenessFinder.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::ALICE3Core
                     COMPONENT_NAME Analysis)