Merge branch 'AliceO2Group:master' into master

Author: Swadhinkumar49

ALICE3/TableProducer/OTF/onTheFlyTracker.cxx

@@ -838,6 +838,10 @@ struct OnTheFlyTracker {
                       static_cast<float>(xyz1[1]),
                       static_cast<float>(xyz1[2])};
                     const o2::track::TrackParametrization<float>::dim3_t hitpointcov = {currentTrackingLayer.getResolutionRPhi() * currentTrackingLayer.getResolutionRPhi(), 0.f, currentTrackingLayer.getResolutionZ() * currentTrackingLayer.getResolutionZ()};
+                    if (currentTrackingLayer.isInDeadPhiRegion(phi)) {
+                      continue; // No hit for strangeness tracking update
+                    }
+
                     cascadeTrack.update(hitpoint, hitpointcov);
                     thisCascade.foundClusters++; // add to findable
                   }

Common/DataModel/Centrality.h

@@ -31,6 +31,7 @@ DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);                 //! Run 3 cent. f
 DECLARE_SOA_COLUMN(CentFT0A, centFT0A, float);                 //! Run 3 cent. from FT0A multiplicity
 DECLARE_SOA_COLUMN(CentFT0C, centFT0C, float);                 //! Run 3 cent. from FT0C multiplicity
 DECLARE_SOA_COLUMN(CentFT0CVariant1, centFT0CVariant1, float); //! Run 3 cent. from FT0C multiplicity
+DECLARE_SOA_COLUMN(CentFT0CVariant2, centFT0CVariant2, float); //! Run 3 cent. from FT0C multiplicity, uses classical truncated Nancestors (NOT recommended, cross-check only!)
 DECLARE_SOA_COLUMN(CentFDDM, centFDDM, float);                 //! Run 3 cent. from FDDA+FDDC multiplicity
 DECLARE_SOA_COLUMN(CentNTPV, centNTPV, float);                 //! Run 3 cent. from the number of tracks contributing to the
 DECLARE_SOA_COLUMN(CentNGlobal, centNGlobal, float);           //! Run 3 cent. from the number of tracks contributing to the PV
@@ -59,6 +60,7 @@ DECLARE_SOA_TABLE(CentMFTs, "AOD", "CENTMFT", cent::CentMFT);             //! Ru
 
 // Run 3 variant tables
 DECLARE_SOA_TABLE(CentFT0CVariant1s, "AOD", "CENTFT0Cvar1", cent::CentFT0CVariant1); //! Run 3 FT0C variant 1
+DECLARE_SOA_TABLE(CentFT0CVariant2s, "AOD", "CENTFT0Cvar2", cent::CentFT0CVariant2); //! Run 3 FT0C variant 1 - uses truncated Nancestors in glauber fit. Not recommended! for cross-checks only
 
 // Run 3 centrality per BC (joinable with BC)
 DECLARE_SOA_TABLE(BCCentFT0Ms, "AOD", "BCCENTFT0M", cent::CentFT0M, o2::soa::Marker<1>); //! Run 3 FT0M BC centrality table

Common/Tasks/qaMuon.cxx

@@ -90,6 +90,7 @@ static const std::vector<std::string> tableNames{
   "CentFT0As",
   "CentFT0Cs",
   "CentFT0CVariant1s",
+  "CentFT0CVariant2s",
   "CentFDDMs",
   "CentNTPVs",
   "CentNGlobals",
@@ -98,7 +99,7 @@ static const std::vector<std::string> tableNames{
   "BCCentFT0As",
   "BCCentFT0Cs"};
 
-static constexpr int nTablesConst = 38;
+static constexpr int nTablesConst = 39;
 
 static const std::vector<std::string> parameterNames{"enable"};
 static const int defaultParameters[nTablesConst][nParameters]{
@@ -139,6 +140,7 @@ static const int defaultParameters[nTablesConst][nParameters]{
   {-1},
   {-1},
   {-1},
+  {-1},
   {-1}};
 
 // table index : match order above
@@ -175,6 +177,7 @@ enum tableIndex { kFV0Mults,       // standard
                   kCentFT0As,         // standard Run 3
                   kCentFT0Cs,         // standard Run 3
                   kCentFT0CVariant1s, // standard Run 3
+                  kCentFT0CVariant2s, // standard Run 3
                   kCentFDDMs,         // standard Run 3
                   kCentNTPVs,         // standard Run 3
                   kCentNGlobals,      // requires track selection task
@@ -221,6 +224,7 @@ struct products : o2::framework::ProducesGroup {
   o2::framework::Produces<aod::CentFT0As> centFT0A;
   o2::framework::Produces<aod::CentFT0Cs> centFT0C;
   o2::framework::Produces<aod::CentFT0CVariant1s> centFT0CVariant1;
+  o2::framework::Produces<aod::CentFT0CVariant2s> centFT0CVariant2;
   o2::framework::Produces<aod::CentFDDMs> centFDDM;
   o2::framework::Produces<aod::CentNTPVs> centNTPV;
   o2::framework::Produces<aod::CentNGlobals> centNGlobals;
@@ -432,6 +436,7 @@ class MultModule
   CalibrationInfo ft0aInfo = CalibrationInfo("FT0A");
   CalibrationInfo ft0cInfo = CalibrationInfo("FT0C");
   CalibrationInfo ft0cVariant1Info = CalibrationInfo("FT0Cvar1");
+  CalibrationInfo ft0cVariant2Info = CalibrationInfo("FT0Cvar2");
   CalibrationInfo fddmInfo = CalibrationInfo("FDD");
   CalibrationInfo ntpvInfo = CalibrationInfo("NTracksPV");
   CalibrationInfo nGlobalInfo = CalibrationInfo("NGlobal");
@@ -1186,6 +1191,7 @@ class MultModule
       ft0aInfo.mCalibrationStored = false;
       ft0cInfo.mCalibrationStored = false;
       ft0cVariant1Info.mCalibrationStored = false;
+      ft0cVariant2Info.mCalibrationStored = false;
       fddmInfo.mCalibrationStored = false;
       ntpvInfo.mCalibrationStored = false;
       nGlobalInfo.mCalibrationStored = false;
@@ -1225,6 +1231,8 @@ class MultModule
           getccdb(ft0cInfo, internalOpts.generatorName);
         if (internalOpts.mEnabledTables[kCentFT0CVariant1s])
           getccdb(ft0cVariant1Info, internalOpts.generatorName);
+        if (internalOpts.mEnabledTables[kCentFT0CVariant2s])
+          getccdb(ft0cVariant2Info, internalOpts.generatorName);
         if (internalOpts.mEnabledTables[kCentFDDMs])
           getccdb(fddmInfo, internalOpts.generatorName);
         if (internalOpts.mEnabledTables[kCentNTPVs])
@@ -1249,7 +1257,9 @@ class MultModule
     if (
       internalOpts.mEnabledTables[kCentFV0As] || internalOpts.mEnabledTables[kCentFT0Ms] ||
       internalOpts.mEnabledTables[kCentFT0As] || internalOpts.mEnabledTables[kCentFT0Cs] ||
-      internalOpts.mEnabledTables[kCentFT0CVariant1s] || internalOpts.mEnabledTables[kCentFDDMs] ||
+      internalOpts.mEnabledTables[kCentFT0CVariant1s] ||
+      internalOpts.mEnabledTables[kCentFT0CVariant2s] ||
+      internalOpts.mEnabledTables[kCentFDDMs] ||
       internalOpts.mEnabledTables[kCentNTPVs] || internalOpts.mEnabledTables[kCentNGlobals] ||
       internalOpts.mEnabledTables[kCentMFTs] || internalOpts.mEnabledTables[kBCCentFT0Ms] ||
       internalOpts.mEnabledTables[kBCCentFT0As] || internalOpts.mEnabledTables[kBCCentFT0Cs]) {
@@ -1304,6 +1314,8 @@ class MultModule
           populateTable(cursors.centFT0C, ft0cInfo, mults[iEv].multFT0CZeq, isInelGt0);
         if (internalOpts.mEnabledTables[kCentFT0CVariant1s])
           populateTable(cursors.centFT0CVariant1, ft0cVariant1Info, mults[iEv].multFT0CZeq, isInelGt0);
+        if (internalOpts.mEnabledTables[kCentFT0CVariant2s])
+          populateTable(cursors.centFT0CVariant2, ft0cVariant2Info, mults[iEv].multFT0CZeq, isInelGt0);
         if (internalOpts.mEnabledTables[kCentFDDMs])
           populateTable(cursors.centFDDM, fddmInfo, mults[iEv].multFDDAZeq + mults[iEv].multFDDCZeq, isInelGt0);
         if (internalOpts.mEnabledTables[kCentNTPVs])