Merge branch 'AliceO2Group:master' into master

ALICE3/Core/DelphesO2TrackSmearer.h

@@ -129,8 +129,8 @@ struct lutEntry_t {
   float otof = 0.;
   float covm[15] = {0.};
   float eigval[5] = {0.};
-  float eigvec[5][5] = {0.};
-  float eiginv[5][5] = {0.};
+  float eigvec[5][5] = {{0.}};
+  float eiginv[5][5] = {{0.}};
   void print()
   {
     printf(" --- lutEntry: pt = %f, eta = %f (%s)\n", pt, eta, valid ? "valid" : "not valid");

CODEOWNERS

@@ -19,7 +19,7 @@
 /DPG/Tasks/AOTEvent @alibuild @ekryshen @strogolo
 /DPG/Tasks/AOTTrack @alibuild @mfaggin @belikov @njacazio
 /EventFiltering @alibuild @mpuccio @strogolo
-/EventFiltering/PWGHF @alibuild @fgrosa @vkucera @mpuccio @strogolo
+/EventFiltering/PWGHF @alibuild @fgrosa @zhangbiao-phy @vkucera @mpuccio @strogolo
 /EventFiltering/PWGUD @alibuild @pbuehler @mpuccio @strogolo
 /EventFiltering/PWGLF @alibuild @mpuccio @ercolessi @ChiaraDeMartin95 @strogolo
 /EventFiltering/PWGCF @alibuild @lauraser @mpuccio @strogolo
@@ -30,7 +30,7 @@
 /PWGEM @alibuild @mikesas @rbailhac @feisenhu
 /PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
 /PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern
-/PWGHF @alibuild @vkucera @fcolamar @adubla @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @nzardosh @NicoleBastid @gtaillepied
+/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @nzardosh @NicoleBastid
 /PWGLF @alibuild @lramona @alcaliva @lbariogl @chiarapinto @BongHwi @lbarnby @mbombara @iravasen @njacazio @ChiaraDeMartin95 @skundu692
 /PWGMM @alibuild @aalkin
 /PWGMM/Lumi @alibuild @aalkin
@@ -40,10 +40,10 @@
 /PWGJE @alibuild @lhavener @maoyx @nzardosh @ddobrigk @mfasDa
 /Tools/PIDML @alibuild @saganatt
 /Tools/ML @alibuild @fcatalan92 @fmazzasc
-/Tutorials/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochu
+/Tutorials/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
 /Tutorials/PWGDQ @alibuild @iarsene @dsekihat @feisenhu @lucamicheletti93
 /Tutorials/PWGEM @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
-/Tutorials/PWGHF @alibuild @vkucera @fcolamar @adubla
+/Tutorials/PWGHF @alibuild @vkucera @fcolamar @fgrosa
 /Tutorials/PWGJE @alibuild @lhavener @maoyx @nzardosh @ddobrigk @mfasDa
 /Tutorials/PWGLF @alibuild @alcaliva @lbariogl @chiarapinto @BongHwi @lbarnby @mbombara @iravasen @njacazio @ChiaraDeMartin95 @skundu692
 /Tutorials/PWGMM @alibuild @aalkin @ddobrigk

Common/Core/TableHelper.h

@@ -23,6 +23,18 @@
 #include "Framework/InitContext.h"
 #include "Framework/RunningWorkflowInfo.h"
 
+/// Function to print the table required in the full workflow
+/// @param initContext initContext of the init function
+void printTablesInWorkflow(o2::framework::InitContext& initContext)
+{
+  auto& workflows = initContext.services().get<o2::framework::RunningWorkflowInfo const>();
+  for (auto const& device : workflows.devices) {
+    for (auto const& input : device.inputs) {
+      LOG(info) << "Table: " << input.matcher.binding << " in device: " << device.name;
+    }
+  }
+}
+
 /// Function to check if a table is required in a workflow
 /// @param initContext initContext of the init function
 /// @param table name of the table to check for

Common/Core/TrackSelectionDefaults.cxx

@@ -118,6 +118,7 @@ TrackSelection getGlobalTrackSelectionRun3HF()
 TrackSelection getJEGlobalTrackSelectionRun2()
 {
   TrackSelection selectedTracks = getGlobalTrackSelection();
+  selectedTracks.SetPtRange(0.15f, 1e15f);
   selectedTracks.SetRequireGoldenChi2(false);
   selectedTracks.SetMaxDcaXYPtDep([](float pt) { return 1e+10; });
   selectedTracks.SetEtaRange(-0.9f, 0.9f);

Common/DataModel/Multiplicity.h

@@ -40,6 +40,10 @@ DECLARE_SOA_DYNAMIC_COLUMN(IsInelGt0, isInelGt0, //! is INEL > 0
                            [](int multPveta1) -> bool { return multPveta1 > 0; });
 DECLARE_SOA_DYNAMIC_COLUMN(IsInelGt1, isInelGt1, //! is INEL > 1
                            [](int multPveta1) -> bool { return multPveta1 > 1; });
+// MC
+DECLARE_SOA_COLUMN(MultMCFT0A, multMCFT0A, float);                   //!
+DECLARE_SOA_COLUMN(MultMCFT0C, multMCFT0C, float);                   //!
+DECLARE_SOA_COLUMN(MultMCNTracksPVeta1, multMCNTracksPVeta1, float); //!
 
 // complementary / MultsExtra table
 DECLARE_SOA_COLUMN(MultPVTotalContributors, multPVTotalContributors, float); //!
@@ -73,14 +77,17 @@ DECLARE_SOA_TABLE(FDDMults, "AOD", "FDDMULT", //! Multiplicity with the FDD dete
                   mult::MultFDDM<mult::MultFDDA, mult::MultFDDC>);
 DECLARE_SOA_TABLE(ZDCMults, "AOD", "ZDCMULT", //! Multiplicity with the ZDC detector
                   mult::MultZNA, mult::MultZNC);
-DECLARE_SOA_TABLE(BarrelMults, "AOD", "BARRELMULT", //! Multiplicity in the barrel
-                  mult::MultTracklets,
-                  mult::MultTPC,
+DECLARE_SOA_TABLE(TrackletMults, "AOD", "TRKLTMULT", //! Multiplicity with tracklets (only Run2)
+                  mult::MultTracklets);
+DECLARE_SOA_TABLE(TPCMults, "AOD", "TPCMULT", //! Multiplicity with TPC
+                  mult::MultTPC);
+DECLARE_SOA_TABLE(PVMults, "AOD", "PVMULT", //! Multiplicity from the PV contributors
                   mult::MultNTracksPV,
                   mult::MultNTracksPVeta1,
                   mult::MultNTracksPVetaHalf,
                   mult::IsInelGt0<mult::MultNTracksPVeta1>,
                   mult::IsInelGt1<mult::MultNTracksPVeta1>);
+using BarrelMults = soa::Join<TrackletMults, TPCMults, PVMults>;
 using Mults = soa::Join<BarrelMults, FV0Mults, FT0Mults, FDDMults, ZDCMults>;
 using Mult = Mults::iterator;
 
@@ -90,6 +97,9 @@ DECLARE_SOA_TABLE(MultsExtra, "AOD", "MULTEXTRA", //!
                   mult::MultNTracksHasITS, mult::MultNTracksHasTPC, mult::MultNTracksHasTOF, mult::MultNTracksHasTRD,
                   mult::MultNTracksITSOnly, mult::MultNTracksTPCOnly, mult::MultNTracksITSTPC, mult::BCNumber);
 using MultExtra = MultsExtra::iterator;
+DECLARE_SOA_TABLE(MultsExtraMC, "AOD", "MULTEXTRAMC", //! Table for the MC information
+                  mult::MultMCFT0A, mult::MultMCFT0C, mult::MultMCNTracksPVeta1);
+using MultExtraMC = MultsExtraMC::iterator;
 
 namespace multZeq
 {
@@ -109,15 +119,15 @@ using MultZeq = MultZeqs::iterator;
 
 namespace multBC
 {
-DECLARE_SOA_COLUMN(MultBCFT0A, multBCFT0A, float);    //!
-DECLARE_SOA_COLUMN(MultBCFT0C, multBCFT0C, float);    //!
-DECLARE_SOA_COLUMN(MultBCFV0A, multBCFV0A, float);    //!
-DECLARE_SOA_COLUMN(MultBCTVX, multBCTVX, bool);       //!
-DECLARE_SOA_COLUMN(MultBCFV0OrA, multBCFV0OrA, bool); //!
+DECLARE_SOA_COLUMN(MultBCFT0A, multBCFT0A, float);                     //!
+DECLARE_SOA_COLUMN(MultBCFT0C, multBCFT0C, float);                     //!
+DECLARE_SOA_COLUMN(MultBCFV0A, multBCFV0A, float);                     //!
+DECLARE_SOA_COLUMN(MultBCTVX, multBCTVX, bool);                        //!
+DECLARE_SOA_COLUMN(MultBCFV0OrA, multBCFV0OrA, bool);                  //!
 DECLARE_SOA_COLUMN(MultBCV0triggerBits, multBCV0triggerBits, uint8_t); //!
 DECLARE_SOA_COLUMN(MultBCTriggerMask, multBCTriggerMask, uint64_t);    //! CTP trigger mask
 DECLARE_SOA_COLUMN(MultBCColliding, multBCColliding, bool);            //! CTP trigger mask
-} // namespace multDebug
+} // namespace multBC
 DECLARE_SOA_TABLE(MultsBC, "AOD", "MULTBC", //!
                   multBC::MultBCFT0A,
                   multBC::MultBCFT0C,

Common/TableProducer/PID/pidBayes.cxx

@@ -238,13 +238,13 @@ struct bayesPid {
       Response[kTOF].LoadParam(DetectorResponse::kSigma, ccdb->getForTimeStamp<Parametrization>(path, timestamp.value));
     }
     if (fnameTPC != "") { // Loading the parametrization from file
-      LOGP(info, "Loading TPC response from file {}", fnameTPC);
+      LOGP(info, "Loading TPC response from file {}", fnameTPC.Data());
       try {
         std::unique_ptr<TFile> f(TFile::Open(fnameTPC, "READ"));
         f->GetObject("Response", responseTPCptr);
         responseTPC.SetParameters(responseTPCptr);
       } catch (...) {
-        LOGP(info, "Loading the TPC PID Response from file {} failed!", fnameTPC);
+        LOGP(info, "Loading the TPC PID Response from file {} failed!", fnameTPC.Data());
       }
     } else {
       const std::string pathTPC = ccdbPathTPC.value;

Common/TableProducer/PID/pidTPC.cxx

@@ -134,12 +134,12 @@ struct tpcPid {
     /// TPC PID Response
     const TString fname = paramfile.value;
     if (fname != "") { // Loading the parametrization from file
-      LOGP(info, "Loading TPC response from file {}", fname);
+      LOGP(info, "Loading TPC response from file {}", fname.Data());
       try {
         std::unique_ptr<TFile> f(TFile::Open(fname, "READ"));
         f->GetObject("Response", response);
       } catch (...) {
-        LOGF(fatal, "Loading the TPC PID Response from file {} failed!", fname);
+        LOGF(fatal, "Loading the TPC PID Response from file {} failed!", fname.Data());
       }
       response->PrintAll();
     } else {

Common/TableProducer/PID/pidTPCBase.h

@@ -25,6 +25,7 @@ namespace o2::aod
 {
 
 DECLARE_SOA_TABLE(PIDMults, "AOD", "PIDMults", //! TPC auxiliary table for the PID
+                  o2::soa::Marker<1>,
                   mult::MultTPC);
 using PIDMult = PIDMults::iterator;
 

Common/TableProducer/PID/pidTPCFull.cxx

@@ -134,12 +134,12 @@ struct tpcPidFull {
     /// TPC PID Response
     const TString fname = paramfile.value;
     if (fname != "") { // Loading the parametrization from file
-      LOGP(info, "Loading TPC response from file {}", fname);
+      LOGP(info, "Loading TPC response from file {}", fname.Data());
       try {
         std::unique_ptr<TFile> f(TFile::Open(fname, "READ"));
         f->GetObject("Response", response);
       } catch (...) {
-        LOGF(fatal, "Loading the TPC PID Response from file {} failed!", fname);
+        LOGF(fatal, "Loading the TPC PID Response from file {} failed!", fname.Data());
       }
       response->PrintAll();
     } else {

Common/TableProducer/multiplicityExtraTable.cxx

@@ -76,11 +76,11 @@ struct MultiplicityExtraTable {
       std::map<std::string, std::string> mapHeader;
       auto grplhcif = ccdb->getForTimeStamp<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", ts);
       CollidingBunch = grplhcif->getBunchFilling().getBCPattern();
-      for (int i = 0; i < (int)CollidingBunch.size(); i++) {
-        if (CollidingBunch.test(i)) {
-          LOG(info) << i << "  ";
-        }
-      }
+      // for (int i = 0; i < (int)CollidingBunch.size(); i++) {
+      //   if (CollidingBunch.test(i)) {
+      //     LOG(info) << i << "  ";
+      //   }
+      // }
     } // new run number
 
     bool collidingBC = CollidingBunch.test(localBC);