Merge branch 'AliceO2Group:master' into master

Author: Preet-Bhanjan

Common/Core/CMakeLists.txt

@@ -24,6 +24,7 @@ o2physics_add_library(AnalysisCore
         FFitWeights.cxx
         Zorro.cxx
         ZorroSummary.cxx
+        INSTALL_HEADERS ZorroHelper.h ZorroSummary.h
         PUBLIC_LINK_LIBRARIES O2::Framework O2::DataFormatsParameters ROOT::EG O2::CCDB ROOT::Physics O2::FT0Base O2::FV0Base O2::DataFormatsParamTOF)
 
 o2physics_target_root_dictionary(AnalysisCore

Common/Core/CollisionAssociation.h

@@ -80,7 +80,8 @@ class CollisionAssociation
           switch (mTrackSelection) {
             case o2::aod::track_association::TrackSelection::CentralBarrelRun2: {
               unsigned char itsClusterMap = track.itsClusterMap();
-              if (!(track.tpcNClsFound() >= 50 && track.flags() & o2::aod::track::ITSrefit && track.flags() & o2::aod::track::TPCrefit && (TESTBIT(itsClusterMap, 0) || TESTBIT(itsClusterMap, 1)))) {
+              int minTpcNClsFound{50};
+              if (!(track.tpcNClsFound() >= minTpcNClsFound && track.flags() & o2::aod::track::ITSrefit && track.flags() & o2::aod::track::TPCrefit && (TESTBIT(itsClusterMap, 0) || TESTBIT(itsClusterMap, 1)))) {
                 hasGoodQuality = false;
               }
               break;
@@ -127,7 +128,7 @@ class CollisionAssociation
                         TTracksUnfiltered const& tracksUnfiltered,
                         TTracks const& tracks,
                         TAmbiTracks const& ambiguousTracks,
-                        o2::aod::BCs const&,
+                        o2::aod::BCs const& bcs,
                         Assoc& association,
                         RevIndices& reverseIndices)
   {
@@ -151,6 +152,11 @@ class CollisionAssociation
         for (const auto& ambTrack : ambiguousTracks) {
           if constexpr (isCentralBarrel) { // FIXME: to be removed as soon as it is possible to use getId<Table>() for joined tables
             if (ambTrack.trackId() == track.globalIndex()) {
+              // special check to avoid crashes (in particular on some MC datasets)
+              // related to shifts in ambiguous tracks association to bc slices (off by 1) - see https://mattermost.web.cern.ch/alice/pl/g9yaaf3tn3g4pgn7c1yex9copy
+              if (ambTrack.bcIds()[0] >= bcs.size() || ambTrack.bcIds()[1] >= bcs.size()) {
+                break;
+              }
               if (!ambTrack.has_bc() || ambTrack.bc().size() == 0) {
                 break;
               }
@@ -194,7 +200,7 @@ class CollisionAssociation
       uint64_t collBC = collision.bc().globalBC();
 
       // This is done per block to allow optimization below. Within each block the globalBC increase continously
-      for (auto& iterationWindow : trackIterationWindows) {
+      for (auto& iterationWindow : trackIterationWindows) { // o2-linter: disable=const-ref-in-for-loop (iterationWindow is modified)
         bool iteratorMoved = false;
         const bool isAssignedTrackWindow = (iterationWindow.first != iterationWindow.second) ? iterationWindow.first.has_collision() : false;
         for (auto trackInWindow = iterationWindow.first; trackInWindow != iterationWindow.second; ++trackInWindow) {

Common/Core/FFitWeights.cxx

@@ -16,9 +16,10 @@
 
 #include "FFitWeights.h"
 
+#include "Framework/Logger.h"
+
 #include <TCollection.h>
 #include <TH1.h>
-#include <TH2.h>
 #include <TNamed.h>
 #include <TObjArray.h>
 #include <TSpline.h>
@@ -35,25 +36,35 @@ ClassImp(FFitWeights)
 
   FFitWeights::FFitWeights() : TNamed("", ""),
                                fW_data{nullptr},
-                               CentBin{100},
+                               ptProfCent{nullptr},
+                               h2ptCent{nullptr},
+                               centBin{100},
                                qAxis{nullptr},
                                nResolution{3000},
+                               ptBin{100},
+                               ptAxis{nullptr},
                                qnTYPE{0}
 {
 }
 
 FFitWeights::FFitWeights(const char* name) : TNamed(name, name),
                                              fW_data{nullptr},
-                                             CentBin{100},
+                                             ptProfCent{nullptr},
+                                             h2ptCent{nullptr},
+                                             centBin{100},
                                              qAxis{nullptr},
                                              nResolution{3000},
+                                             ptBin{100},
+                                             ptAxis{nullptr},
                                              qnTYPE{0} {}
 
 FFitWeights::~FFitWeights()
 {
   delete fW_data;
   if (qAxis)
     delete qAxis;
+  if (ptAxis)
+    delete ptAxis;
 };
 
 void FFitWeights::init()
@@ -65,8 +76,16 @@ void FFitWeights::init()
   if (!qAxis)
     this->setBinAxis(500, 0, 25);
   for (const auto& qn : qnTYPE) {
-    fW_data->Add(new TH2D(this->getQName(qn.first, qn.second.c_str()), this->getAxisName(qn.first, qn.second.c_str()), CentBin, 0, CentBin, qAxis->GetNbins(), qAxis->GetXmin(), qAxis->GetXmax()));
+    fW_data->Add(new TH2D(this->getQName(qn.first, qn.second.c_str()), this->getAxisName(qn.first, qn.second.c_str()), centBin, 0, centBin, qAxis->GetNbins(), qAxis->GetXmin(), qAxis->GetXmax()));
   }
+
+  if (!ptAxis)
+    this->setPtAxis(3000, -3, 3);
+  fW_data->Add(new TProfile("pMeanPt", "", centBin, 0, centBin));
+  fW_data->Add(new TH2D("hPtWeight", "", centBin, 0, centBin, ptBin, ptAxis->GetXmin(), ptAxis->GetXmax()));
+
+  ptProfCent = reinterpret_cast<TProfile*>(fW_data->FindObject("pMeanPt"));
+  h2ptCent = reinterpret_cast<TH2D*>(fW_data->FindObject("hPtWeight"));
 };
 
 void FFitWeights::fillWeights(float centrality, float qn, int nh, const char* pf)
@@ -79,12 +98,28 @@ void FFitWeights::fillWeights(float centrality, float qn, int nh, const char* pf
 
   TH2D* th2 = reinterpret_cast<TH2D*>(tar->FindObject(this->getQName(nh, pf)));
   if (!th2) {
-    tar->Add(new TH2D(this->getQName(nh, pf), this->getAxisName(nh, pf), CentBin, 0, CentBin, qAxis->GetNbins(), qAxis->GetXmin(), qAxis->GetXmax()));
+    tar->Add(new TH2D(this->getQName(nh, pf), this->getAxisName(nh, pf), centBin, 0, centBin, qAxis->GetNbins(), qAxis->GetXmin(), qAxis->GetXmax()));
     th2 = reinterpret_cast<TH2D*>(tar->At(tar->GetEntries() - 1));
   }
   th2->Fill(centrality, qn);
 };
 
+void FFitWeights::fillPt(float centrality, float pt, bool first)
+{
+  if (first) {
+    ptProfCent->Fill(centrality, pt);
+  } else {
+    h2ptCent->Fill(centrality, pt);
+  }
+};
+float FFitWeights::getPtMult(float centrality)
+{
+  if (!ptProfCent) {
+    ptProfCent = reinterpret_cast<TProfile*>(fW_data->FindObject("pMeanPt"));
+  }
+  return ptProfCent->GetBinContent(ptProfCent->FindBin(centrality));
+};
+
 Long64_t FFitWeights::Merge(TCollection* collist)
 {
   Long64_t nmerged = 0;
@@ -93,32 +128,63 @@ Long64_t FFitWeights::Merge(TCollection* collist)
     fW_data->SetName("FFitWeights_Data");
     fW_data->SetOwner(kTRUE);
   }
-  FFitWeights* l_w = 0;
-  TIter all_w(collist);
-  while ((l_w = (reinterpret_cast<FFitWeights*>(all_w())))) {
-    addArray(fW_data, l_w->getDataArray());
+  FFitWeights* lW = 0;
+  TIter allW(collist);
+  while ((lW = (reinterpret_cast<FFitWeights*>(allW())))) {
+    addArray(fW_data, lW->getDataArray());
     nmerged++;
   }
   return nmerged;
 };
 void FFitWeights::addArray(TObjArray* targ, TObjArray* sour)
 {
-  if (!sour) {
-    printf("Source array does not exist!\n");
+  if (!sour)
     return;
-  }
+
   for (int i = 0; i < sour->GetEntries(); i++) {
-    TH2D* sourh = reinterpret_cast<TH2D*>(sour->At(i));
-    TH2D* targh = reinterpret_cast<TH2D*>(targ->FindObject(sourh->GetName()));
-    if (!targh) {
-      targh = reinterpret_cast<TH2D*>(sourh->Clone(sourh->GetName()));
-      targh->SetDirectory(0);
-      targ->Add(targh);
-    } else {
-      targh->Add(sourh);
+    auto* obj = sour->At(i);
+    if (!obj)
+      continue;
+
+    auto* tObj = targ->FindObject(obj->GetName());
+    if (!tObj) {
+      auto* clone = static_cast<TObject*>(obj->Clone(obj->GetName()));
+      if (auto* h = dynamic_cast<TH1*>(clone))
+        h->SetDirectory(0);
+      targ->Add(clone);
+    } else if (auto* h1 = dynamic_cast<TH1*>(tObj)) {
+      if (auto* h2 = dynamic_cast<TH1*>(obj))
+        h1->Add(h2);
     }
   }
-};
+}
+
+void FFitWeights::mptSel()
+{
+  TObjArray* tar{nullptr};
+  tar = fW_data;
+  if (!tar)
+    return;
+
+  TH2D* th2 = reinterpret_cast<TH2D*>(tar->FindObject("hPtWeight"));
+  if (!th2) {
+    return;
+  }
+
+  TH1D* tmp{nullptr};
+  TGraph* tmpgr{nullptr};
+  for (int iSP{0}; iSP < NumberSp; iSP++) {
+    tmp = th2->ProjectionY(Form("mpt_%i_%i", iSP, iSP + 1), iSP + 1, iSP + 1);
+    std::vector<double> xq(nResolution);
+    std::vector<double> yq(nResolution);
+    for (int i{0}; i < nResolution; i++)
+      xq[i] = static_cast<double>(i + 1) / static_cast<double>(nResolution);
+    tmp->GetQuantiles(nResolution, yq.data(), xq.data());
+    tmpgr = new TGraph(nResolution, yq.data(), xq.data());
+    tmpgr->SetName(Form("sp_mpt_%i", iSP));
+    fW_data->Add(tmpgr);
+  }
+}
 
 void FFitWeights::qSelection(const std::vector<int>& nhv, const std::vector<std::string>& stv) /* only execute OFFLINE */
 {
@@ -132,14 +198,14 @@ void FFitWeights::qSelection(const std::vector<int>& nhv, const std::vector<std:
     for (const auto& nh : nhv) {
       TH2D* th2{reinterpret_cast<TH2D*>(tar->FindObject(this->getQName(nh, pf.c_str())))};
       if (!th2) {
-        printf("qh not found!\n");
+        LOGF(info, "FFitWeights qh not found!");
         return;
       }
 
       TH1D* tmp{nullptr};
       TGraph* tmpgr{nullptr};
       // TSpline3* spline = nullptr;
-      for (int iSP{0}; iSP < 90; iSP++) {
+      for (int iSP{0}; iSP < NumberSp; iSP++) {
         tmp = th2->ProjectionY(Form("q%i_%i_%i", nh, iSP, iSP + 1), iSP + 1, iSP + 1);
         std::vector<double> xq(nResolution);
         std::vector<double> yq(nResolution);
@@ -148,37 +214,36 @@ void FFitWeights::qSelection(const std::vector<int>& nhv, const std::vector<std:
         tmp->GetQuantiles(nResolution, yq.data(), xq.data());
         tmpgr = new TGraph(nResolution, yq.data(), xq.data());
         tmpgr->SetName(Form("sp_q%i%s_%i", nh, pf.c_str(), iSP));
-        // spline = new TSpline3(Form("sp_q%i%s_%i", nh, pf.c_str(), iSP), tmpgr);
-        // spline->SetName(Form("sp_q%i%s_%i", nh, pf.c_str(), iSP));
         fW_data->Add(tmpgr);
       }
     }
   }
 };
-
-float FFitWeights::eval(float centr, const float& dqn, const int nh, const char* pf)
+float FFitWeights::internalEval(float centr, const float& val, const char* name)
 {
-  TObjArray* tar{nullptr};
-
-  tar = fW_data;
-  if (!tar)
+  if (!fW_data) {
     return -1;
-
-  int isp{static_cast<int>(centr)};
-  if (isp < 0 || isp > 90) {
+  }
+  int isp = static_cast<int>(centr);
+  if (isp < 0 || isp > NumberSp) {
     return -1;
   }
 
-  TGraph* spline{nullptr};
-  spline = reinterpret_cast<TGraph*>(tar->FindObject(Form("sp_q%i%s_%i", nh, pf, isp)));
+  auto* spline = dynamic_cast<TGraph*>(fW_data->FindObject(Form(name, isp)));
   if (!spline) {
     return -1;
   }
 
-  float qn_val{static_cast<float>(100. * spline->Eval(dqn))};
-  if (qn_val < 0 || qn_val > 100.05) {
-    return -1;
-  }
+  float perc = 100.f * spline->Eval(val);
+  return (perc < 0 || perc > MaxTol) ? -1 : perc;
+};
 
-  return qn_val;
+float FFitWeights::eval(float centr, const float& dqn, int nh, const char* pf)
+{
+  return internalEval(centr, dqn, Form("sp_q%i%s_%%i", nh, pf));
+};
+
+float FFitWeights::evalPt(float centr, const float& mpt)
+{
+  return internalEval(centr, mpt, "sp_mpt_%i");
 };

Common/Core/FFitWeights.h

@@ -19,8 +19,10 @@
 
 #include <TAxis.h>
 #include <TCollection.h>
+#include <TH2.h>
 #include <TNamed.h>
 #include <TObjArray.h>
+#include <TProfile.h>
 #include <TString.h>
 
 #include <Rtypes.h>
@@ -39,28 +41,44 @@ class FFitWeights : public TNamed
 
   void init();
   void fillWeights(float centrality, float qn, int nh, const char* pf = "");
+  void fillPt(float centrality, float pt, bool first);
+  float getPtMult(float centrality);
   TObjArray* getDataArray() { return fW_data; }
 
-  void setCentBin(int bin) { CentBin = bin; }
+  void setCentBin(int bin) { centBin = bin; }
   void setBinAxis(int bin, float min, float max)
   {
     qAxis = new TAxis(bin, min, max);
   }
   TAxis* getqVecAx() { return qAxis; }
 
+  void setPtBin(int bin) { ptBin = bin; }
+  void setPtAxis(int bin, float min, float max)
+  {
+    ptAxis = new TAxis(bin, min, max);
+  }
+  TAxis* getPtAx() { return ptAxis; }
+
   Long64_t Merge(TCollection* collist);
   void qSelection(const std::vector<int>& nhv, const std::vector<std::string>& stv);
   float eval(float centr, const float& dqn, const int nh, const char* pf = "");
+  float evalPt(float centr, const float& mpt);
   void setResolution(int res) { nResolution = res; }
   int getResolution() const { return nResolution; }
   void setQnType(const std::vector<std::pair<int, std::string>>& qninp) { qnTYPE = qninp; }
 
+  void mptSel();
+
  private:
   TObjArray* fW_data;
+  TProfile* ptProfCent; //!
+  TH2D* h2ptCent;       //!
 
-  int CentBin;
+  int centBin;
   TAxis* qAxis; //!
   int nResolution;
+  int ptBin;
+  TAxis* ptAxis; //!
 
   std::vector<std::pair<int, std::string>> qnTYPE;
 
@@ -74,6 +92,11 @@ class FFitWeights : public TNamed
   };
   void addArray(TObjArray* targ, TObjArray* sour);
 
+  static constexpr int NumberSp = 90;
+  static constexpr float MaxTol = 100.05;
+
+  float internalEval(float centr, const float& val, const char* name);
+
   ClassDef(FFitWeights, 1); // calibration class
 };
 #endif // COMMON_CORE_FFITWEIGHTS_H_

Common/DataModel/EseTable.h

@@ -9,9 +9,10 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-// q vector framework with ESE (20/08/2024)
-//
-/// \author Joachim Hansen <joachim.hansen@cern.ch>
+/// \file EseTable.h
+/// \brief ESE Framework (20/08/2024)
+/// \author Joachim C. K. B. Hansen, Lund University, joachim.hansen@cern.ch
+
 //
 
 #ifndef COMMON_DATAMODEL_ESETABLE_H_
@@ -46,6 +47,16 @@ using QPercentileTPCall = QPercentileTPCalls::iterator;
 using QPercentileTPCneg = QPercentileTPCnegs::iterator;
 using QPercentileTPCpos = QPercentileTPCposs::iterator;
 
+namespace meanptshape
+{
+DECLARE_SOA_COLUMN(FMEANPT, fMEANPT, std::vector<float>);
+DECLARE_SOA_COLUMN(FMEANPTSHAPE, fMEANPTSHAPE, std::vector<float>);
+} // namespace meanptshape
+DECLARE_SOA_TABLE(MeanPts, "AOD", "MEANPT", meanptshape::FMEANPT);
+DECLARE_SOA_TABLE(MeanPtShapes, "AOD", "MEANPTSHAPE", meanptshape::FMEANPTSHAPE);
+using MeanPt = MeanPts::iterator;
+using MeanPtShape = MeanPtShapes::iterator;
+
 } // namespace o2::aod
 
 #endif // COMMON_DATAMODEL_ESETABLE_H_