Merge branch 'AliceO2Group:master' into pjpsi_femto

Author: JiYuanjing

Common/CCDB/AnalysisCCDBLinkDef.h

@@ -9,9 +9,20 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+/// \file AnalysisCCDBLinkDef.h
+/// \brief Dictionary definitions
+///
+/// \author Evgeny Kryshen <evgeny.kryshen@cern.ch>
+
+#ifndef COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
+#define COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
 
 #pragma link C++ class EventSelectionParams + ;
 #pragma link C++ class TriggerAliases + ;
+#pragma link C++ class std::map < uint64_t, uint32_t> + ;
+
+#endif // COMMON_CCDB_ANALYSISCCDBLINKDEF_H_

Common/Core/RecoDecay.h

@@ -1111,14 +1111,14 @@ struct RecoDecay {
             if (PDGParticleIMother < 9 || (PDGParticleIMother > 20 && PDGParticleIMother < 38)) {
               // auto PDGPaticle = std::abs(particleMother.pdgCode());
               if (
-                (PDGParticleIMother / 100 == 5 || // b mesons
-                 PDGParticleIMother / 1000 == 5)  // b baryons
+                (PDGParticle / 100 == 5 || // b mesons
+                 PDGParticle / 1000 == 5)  // b baryons
               ) {
                 return OriginType::NonPrompt; // beauty
               }
               if (
-                (PDGParticleIMother / 100 == 4 || // c mesons
-                 PDGParticleIMother / 1000 == 4)  // c baryons
+                (PDGParticle / 100 == 4 || // c mesons
+                 PDGParticle / 1000 == 4)  // c baryons
               ) {
                 return OriginType::Prompt; // charm
               }

Common/DataModel/Centrality.h

@@ -26,14 +26,15 @@ DECLARE_SOA_COLUMN(CentRun2CL1, centRun2CL1, float);                   //! Run 2
 DECLARE_SOA_COLUMN(CentRun2RefMult5, centRun2RefMult5, float);         //! Run 2 cent. from ref. mult. estimator, eta 0.5
 DECLARE_SOA_COLUMN(CentRun2RefMult8, centRun2RefMult8, float);         //! Run 2 cent. from  ref. mult. estimator, eta 0.8
 
-DECLARE_SOA_COLUMN(CentFV0A, centFV0A, float);       //! Run 3 cent. from FV0A multiplicities
-DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);       //! Run 3 cent. from FT0A+FT0C multiplicities
-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(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
-DECLARE_SOA_COLUMN(CentMFT, centMFT, float);         //! Run 3 cent. from the number of tracks in the MFT
+DECLARE_SOA_COLUMN(CentFV0A, centFV0A, float);                 //! Run 3 cent. from FV0A multiplicities
+DECLARE_SOA_COLUMN(CentFT0M, centFT0M, float);                 //! Run 3 cent. from FT0A+FT0C multiplicities
+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(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
+DECLARE_SOA_COLUMN(CentMFT, centMFT, float);                   //! Run 3 cent. from the number of tracks in the MFT
 } // namespace cent
 
 // Run 2 tables
@@ -56,6 +57,9 @@ DECLARE_SOA_TABLE(CentNTPVs, "AOD", "CENTNTPV", cent::CentNTPV);          //! Ru
 DECLARE_SOA_TABLE(CentNGlobals, "AOD", "CENTNGLOBAL", cent::CentNGlobal); //! Run 3 NGlobal centrality table
 DECLARE_SOA_TABLE(CentMFTs, "AOD", "CENTMFT", cent::CentMFT);             //! Run 3 MFT tracks centrality table
 
+// Run 3 variant tables
+DECLARE_SOA_TABLE(CentFT0CVariant1s, "AOD", "CENTFT0Cvar1", cent::CentFT0CVariant1); //! Run 3 FT0C variant 1
+
 using CentRun2V0M = CentRun2V0Ms::iterator;
 using CentRun2V0A = CentRun2V0As::iterator;
 using CentRun2SPDTrk = CentRun2SPDTrks::iterator;

Common/DataModel/EventSelection.h

@@ -8,6 +8,12 @@
 // 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.
+
+/// \file EventSelection.h
+/// \brief Definitions of event selection tables
+///
+/// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
+
 #ifndef COMMON_DATAMODEL_EVENTSELECTION_H_
 #define COMMON_DATAMODEL_EVENTSELECTION_H_
 
@@ -47,6 +53,7 @@ namespace evsel
 {
 DECLARE_SOA_BITMAP_COLUMN(Alias, alias, 32);                                //! Bitmask of fired trigger aliases (see TriggerAliases.h for definitions)
 DECLARE_SOA_BITMAP_COLUMN(Selection, selection, 64);                        //! Bitmask of selection flags (see EventSelectionParams.h for definitions)
+DECLARE_SOA_BITMAP_COLUMN(Rct, rct, 32);                                    //! Bitmask of RCT flags
 DECLARE_SOA_COLUMN(Sel7, sel7, bool);                                       //! Event selection decision based on V0A & V0C
 DECLARE_SOA_COLUMN(Sel8, sel8, bool);                                       //! Event selection decision based on TVX
 DECLARE_SOA_INDEX_COLUMN_FULL(FoundBC, foundBC, int, BCs, "_foundBC");      //! BC entry index in BCs table (-1 if doesn't exist)
@@ -55,19 +62,20 @@ DECLARE_SOA_INDEX_COLUMN_FULL(FoundFV0, foundFV0, int, FV0As, "_foundFV0"); //!
 DECLARE_SOA_INDEX_COLUMN_FULL(FoundFDD, foundFDD, int, FDDs, "_foundFDD");  //! FDD entry index in FDDs table (-1 if doesn't exist)
 DECLARE_SOA_INDEX_COLUMN_FULL(FoundZDC, foundZDC, int, Zdcs, "_foundZDC");  //! ZDC entry index in ZDCs table (-1 if doesn't exist)
 DECLARE_SOA_COLUMN(BcInTF, bcInTF, int);                                    //! Position of a (found) bunch crossing inside a given timeframe
-DECLARE_SOA_COLUMN(NumTracksInTimeRange, trackOccupancyInTimeRange, int);   //! Occupancy in specified time interval by a number of tracks from nearby collisions
-DECLARE_SOA_COLUMN(SumAmpFT0CInTimeRange, ft0cOccupancyInTimeRange, float); //! Occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions
+DECLARE_SOA_COLUMN(NumTracksInTimeRange, trackOccupancyInTimeRange, int);   //! Occupancy in specified time interval by a number of tracks from nearby collisions // o2-linter: disable=name/o2-column
+DECLARE_SOA_COLUMN(SumAmpFT0CInTimeRange, ft0cOccupancyInTimeRange, float); //! Occupancy in specified time interval by a sum of FT0C amplitudes from nearby collisions // o2-linter: disable=name/o2-column
 } // namespace evsel
 
 // bc-joinable event selection decisions
 DECLARE_SOA_TABLE(BcSels, "AOD", "BCSEL", //!
-                  evsel::Alias, evsel::Selection, evsel::FoundFT0Id, evsel::FoundFV0Id, evsel::FoundFDDId, evsel::FoundZDCId);
+                  evsel::Alias, evsel::Selection, evsel::Rct, evsel::FoundFT0Id, evsel::FoundFV0Id, evsel::FoundFDDId, evsel::FoundZDCId);
 using BcSel = BcSels::iterator;
 
 // collision-joinable event selection decisions
 DECLARE_SOA_TABLE(EvSels, "AOD", "EVSEL", //!
                   evsel::Alias,
                   evsel::Selection,
+                  evsel::Rct,
                   evsel::Sel7,
                   evsel::Sel8,
                   evsel::FoundBCId,

Common/TableProducer/centralityTable.cxx

@@ -42,11 +42,12 @@ static constexpr int kCentFV0As = 6;
 static constexpr int kCentFT0Ms = 7;
 static constexpr int kCentFT0As = 8;
 static constexpr int kCentFT0Cs = 9;
-static constexpr int kCentFDDMs = 10;
-static constexpr int kCentNTPVs = 11;
-static constexpr int kCentNGlobals = 12;
-static constexpr int kCentMFTs = 13;
-static constexpr int nTables = 14;
+static constexpr int kCentFT0CVariant1s = 10;
+static constexpr int kCentFDDMs = 11;
+static constexpr int kCentNTPVs = 12;
+static constexpr int kCentNGlobals = 13;
+static constexpr int kCentMFTs = 14;
+static constexpr int nTables = 15;
 static constexpr int nParameters = 1;
 static const std::vector<std::string> tableNames{"CentRun2V0Ms",
                                                  "CentRun2V0As",
@@ -58,12 +59,13 @@ static const std::vector<std::string> tableNames{"CentRun2V0Ms",
                                                  "CentFT0Ms",
                                                  "CentFT0As",
                                                  "CentFT0Cs",
+                                                 "CentFT0CVariant1s",
                                                  "CentFDDMs",
                                                  "CentNTPVs",
                                                  "CentNGlobals",
                                                  "CentMFTs"};
 static const std::vector<std::string> parameterNames{"Enable"};
-static const int defaultParameters[nTables][nParameters]{{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}};
+static const int defaultParameters[nTables][nParameters]{{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}};
 
 struct CentralityTable {
   Produces<aod::CentRun2V0Ms> centRun2V0M;
@@ -76,6 +78,7 @@ struct CentralityTable {
   Produces<aod::CentFT0Ms> centFT0M;
   Produces<aod::CentFT0As> centFT0A;
   Produces<aod::CentFT0Cs> centFT0C;
+  Produces<aod::CentFT0CVariant1s> centFT0CVariant1;
   Produces<aod::CentFDDMs> centFDDM;
   Produces<aod::CentNTPVs> centNTPV;
   Produces<aod::CentNGlobals> centNGlobals;
@@ -166,6 +169,7 @@ struct CentralityTable {
   calibrationInfo FT0MInfo = calibrationInfo("FT0");
   calibrationInfo FT0AInfo = calibrationInfo("FT0A");
   calibrationInfo FT0CInfo = calibrationInfo("FT0C");
+  calibrationInfo FT0CVariant1Info = calibrationInfo("FT0Cvar1");
   calibrationInfo FDDMInfo = calibrationInfo("FDD");
   calibrationInfo NTPVInfo = calibrationInfo("NTracksPV");
   calibrationInfo NGlobalInfo = calibrationInfo("NGlobal");
@@ -183,8 +187,8 @@ struct CentralityTable {
     if (doprocessRun3FT0 == true) {
       LOG(fatal) << "FT0 only mode is automatically enabled in Run3 mode. Please disable it and enable processRun3.";
     }
-    if (doprocessRun2 == false && doprocessRun3 == false) {
-      LOGF(fatal, "Neither processRun2 nor processRun3 enabled. Please choose one.");
+    if (doprocessRun2 == false && doprocessRun3 == false && doprocessRun3Complete == false) {
+      LOGF(fatal, "Neither processRun2 nor processRun3 nor processRun3Complete enabled. Please choose one.");
     }
     if (doprocessRun2 == true && doprocessRun3 == true) {
       LOGF(fatal, "Cannot enable processRun2 and processRun3 at the same time. Please choose one.");
@@ -197,11 +201,11 @@ struct CentralityTable {
       if (f == 1) {
         if (tableNames[i].find("Run2") != std::string::npos) {
           if (doprocessRun3) {
-            LOGF(fatal, "Cannot enable Run2 tables in Run3 mode. Please check and disable them.");
+            LOG(fatal) << "Cannot enable Run2 table `" << tableNames[i] << "` while running in Run3 mode. Please check and disable them.";
           }
         } else {
           if (doprocessRun2) {
-            LOGF(fatal, "Cannot enable Run3 tables in Run2 mode. Please check and disable them.");
+            LOG(fatal) << "Cannot enable Run3 table `" << tableNames[i] << "` while running in Run2 mode. Please check and disable them.";
           }
         }
         isTableEnabled[i] = true;
@@ -466,6 +470,9 @@ struct CentralityTable {
         case kCentFT0Cs:
           centFT0C.reserve(collisions.size());
           break;
+        case kCentFT0CVariant1s:
+          centFT0CVariant1.reserve(collisions.size());
+          break;
         case kCentFDDMs:
           centFDDM.reserve(collisions.size());
           break;
@@ -519,6 +526,7 @@ struct CentralityTable {
         FT0MInfo.mCalibrationStored = false;
         FT0AInfo.mCalibrationStored = false;
         FT0CInfo.mCalibrationStored = false;
+        FT0CVariant1Info.mCalibrationStored = false;
         FDDMInfo.mCalibrationStored = false;
         NTPVInfo.mCalibrationStored = false;
         NGlobalInfo.mCalibrationStored = false;
@@ -564,6 +572,9 @@ struct CentralityTable {
               case kCentFT0Cs:
                 getccdb(FT0CInfo, ccdbConfig.genName);
                 break;
+              case kCentFT0CVariant1s:
+                getccdb(FT0CVariant1Info, ccdbConfig.genName);
+                break;
               case kCentFDDMs:
                 getccdb(FDDMInfo, ccdbConfig.genName);
                 break;
@@ -672,6 +683,11 @@ struct CentralityTable {
               }
             }
             break;
+          case kCentFT0CVariant1s:
+            if constexpr (enableCentFT0) {
+              populateTable(centFT0CVariant1, FT0CVariant1Info, collision.multZeqFT0C());
+            }
+            break;
           case kCentFDDMs:
             if constexpr (enableCentFDD) {
               populateTable(centFDDM, FDDMInfo, collision.multZeqFDDA() + collision.multZeqFDDC());
@@ -720,6 +736,7 @@ struct CentralityTable {
 
   // Process switches
   PROCESS_SWITCH(CentralityTable, processRun2, "Provide Run2 calibrated centrality/multiplicity percentiles tables", true);
+  PROCESS_SWITCH(CentralityTable, processRun3Complete, "Provide Run3 calibrated centrality/multiplicity percentiles tables using MFT and global tracks (requires extra subscriptions)", false);
   PROCESS_SWITCH(CentralityTable, processRun3, "Provide Run3 calibrated centrality/multiplicity percentiles tables", false);
   PROCESS_SWITCH(CentralityTable, processRun3FT0, "Provide Run3 calibrated centrality/multiplicity percentiles tables for FT0 only", false);
 };

Common/TableProducer/eventSelection.cxx

@@ -16,6 +16,7 @@
 
 #include <vector>
 #include <map>
+#include <string>
 
 #include "Framework/ConfigParamSpec.h"
 #include "Framework/runDataProcessing.h"
@@ -80,13 +81,13 @@ struct BcSelectionTask {
   bool isPP = 1;                         // default value
   TriggerAliases* aliases = nullptr;
   EventSelectionParams* par = nullptr;
+  std::map<uint64_t, uint32_t>* mapRCT = nullptr;
   std::map<int64_t, std::vector<int16_t>> mapInactiveChips; // number of inactive chips vs orbit per layer
   int64_t prevOrbitForInactiveChips = 0;                    // cached next stored orbit in the inactive chip map
   int64_t nextOrbitForInactiveChips = 0;                    // cached previous stored orbit in the inactive chip map
   bool isGoodITSLayer3 = true;                              // default value
   bool isGoodITSLayer0123 = true;                           // default value
   bool isGoodITSLayersAll = true;                           // default value
-
   void init(InitContext&)
   {
     if (metadataInfo.isFullyDefined() && !doprocessRun2 && !doprocessRun3) { // Check if the metadata is initialized (only if not forced from the workflow configuration)
@@ -242,8 +243,9 @@ struct BcSelectionTask {
         histos.get<TH1>(HIST("hCounterTVX"))->Fill(Form("%d", bc.runNumber()), 1);
       }
 
+      uint32_t rct = 0;
       // Fill bc selection columns
-      bcsel(alias, selection, foundFT0, foundFV0, foundFDD, foundZDC);
+      bcsel(alias, selection, rct, foundFT0, foundFV0, foundFDD, foundZDC);
     }
   }
   PROCESS_SWITCH(BcSelectionTask, processRun2, "Process Run2 event selection", true);
@@ -311,6 +313,18 @@ struct BcSelectionTask {
           }
         } // loop over vector of inactive chip ids
       } // loop over orbits
+
+      // QC info
+      std::map<std::string, std::string> metadata;
+      metadata["run"] = Form("%d", run);
+      ccdb->setFatalWhenNull(0);
+      mapRCT = ccdb->getSpecific<std::map<uint64_t, uint32_t>>("Users/j/jian/RCT", ts, metadata);
+      ccdb->setFatalWhenNull(1);
+      if (mapRCT == nullptr) {
+        LOGP(info, "rct object missing... inserting dummy rct flags");
+        mapRCT = new std::map<uint64_t, uint32_t>;
+        mapRCT->insert(std::pair<uint64_t, uint32_t>(sorTimestamp, 0));
+      }
     }
 
     // map from GlobalBC to BcId needed to find triggerBc
@@ -326,6 +340,13 @@ struct BcSelectionTask {
 
     // bc loop
     for (auto bc : bcs) { // o2-linter: disable=const-ref-in-for-loop
+      // store rct flags
+      auto itrct = mapRCT->upper_bound(bc.timestamp());
+      if (itrct != mapRCT->begin())
+        itrct--;
+      uint32_t rct = itrct->second;
+      LOGP(debug, "sor={} eor={} ts={} rct={}", sorTimestamp, eorTimestamp, bc.timestamp(), rct);
+
       uint32_t alias{0};
       // workaround for pp2022 (trigger info is shifted by -294 bcs)
       int32_t triggerBcId = mapGlobalBCtoBcId[bc.globalBC() + triggerBcShift];
@@ -424,7 +445,7 @@ struct BcSelectionTask {
         LOGP(debug, "prev inactive chips: {} {} {} {} {} {} {}", vPrevInactiveChips[0], vPrevInactiveChips[1], vPrevInactiveChips[2], vPrevInactiveChips[3], vPrevInactiveChips[4], vPrevInactiveChips[5], vPrevInactiveChips[6]);
         isGoodITSLayer3 = vPrevInactiveChips[3] <= maxInactiveChipsPerLayer->at(3) && vNextInactiveChips[3] <= maxInactiveChipsPerLayer->at(3);
         isGoodITSLayer0123 = true;
-        for (int i = 0; i < 3; i++) {
+        for (int i = 0; i < 4; i++) {
           isGoodITSLayer0123 &= vPrevInactiveChips[i] <= maxInactiveChipsPerLayer->at(i) && vNextInactiveChips[i] <= maxInactiveChipsPerLayer->at(i);
         }
         isGoodITSLayersAll = true;
@@ -506,7 +527,7 @@ struct BcSelectionTask {
       }
 
       // Fill bc selection columns
-      bcsel(alias, selection, foundFT0, foundFV0, foundFDD, foundZDC);
+      bcsel(alias, selection, rct, foundFT0, foundFV0, foundFDD, foundZDC);
     }
   }
   PROCESS_SWITCH(BcSelectionTask, processRun3, "Process Run3 event selection", false);
@@ -677,6 +698,9 @@ struct EventSelectionTask {
     selection |= (spdClusters < par->fSPDClsVsTklA + nTkl * par->fSPDClsVsTklB) ? BIT(kNoSPDClsVsTklBG) : 0;
     selection |= !(nTkl < 6 && multV0C012 > par->fV0C012vsTklA + nTkl * par->fV0C012vsTklB) ? BIT(kNoV0C012vsTklBG) : 0;
 
+    // copy rct flags from bcsel table
+    uint32_t rct = bc.rct_raw();
+
     // apply int7-like selections
     bool sel7 = 1;
     for (int i = 0; i < kNsel; i++) {
@@ -702,7 +726,7 @@ struct EventSelectionTask {
       }
     }
 
-    evsel(alias, selection, sel7, sel8, foundBC, foundFT0, foundFV0, foundFDD, foundZDC, 0, 0, 0);
+    evsel(alias, selection, rct, sel7, sel8, foundBC, foundFT0, foundFV0, foundFDD, foundZDC, 0, 0, 0);
   }
   PROCESS_SWITCH(EventSelectionTask, processRun2, "Process Run2 event selection", true);
 
@@ -757,7 +781,8 @@ struct EventSelectionTask {
         int32_t foundFDD = bc.foundFDDId();
         int32_t foundZDC = bc.foundZDCId();
         int bcInTF = (bc.globalBC() - bcSOR) % nBCsPerTF;
-        evsel(bc.alias_raw(), bc.selection_raw(), kFALSE, kFALSE, foundBC, foundFT0, foundFV0, foundFDD, foundZDC, bcInTF, -1, -1);
+        uint32_t rct = 0;
+        evsel(bc.alias_raw(), bc.selection_raw(), rct, kFALSE, kFALSE, foundBC, foundFT0, foundFV0, foundFDD, foundZDC, bcInTF, -1, -1);
       }
       return;
     }
@@ -1171,6 +1196,9 @@ struct EventSelectionTask {
       selection |= (vNoCollInSameRofStandard[colIndex] && vNoCollInSameRofWithCloseVz[colIndex]) ? BIT(kNoCollInRofStandard) : 0;
       selection |= vNoHighMultCollInPrevRof[colIndex] ? BIT(kNoHighMultCollInPrevRof) : 0;
 
+      // copy rct flags from bcsel table
+      uint32_t rct = bc.rct_raw();
+
       // apply int7-like selections
       bool sel7 = 0;
 
@@ -1190,7 +1218,7 @@ struct EventSelectionTask {
 
       int bcInTF = (bc.globalBC() - bcSOR) % nBCsPerTF;
 
-      evsel(alias, selection, sel7, sel8, foundBC, foundFT0, foundFV0, foundFDD, foundZDC, bcInTF,
+      evsel(alias, selection, rct, sel7, sel8, foundBC, foundFT0, foundFV0, foundFDD, foundZDC, bcInTF,
             vNumTracksITS567inFullTimeWin[colIndex], vSumAmpFT0CinFullTimeWin[colIndex]);
     }
   }