Merge branch 'AliceO2Group:master' into hInvMassK0Short_fake_improved

Author: a-m-andrushko

Common/Core/RecoDecay.h

@@ -279,6 +279,27 @@ struct RecoDecay {
     return cos;
   }
 
+  /// Calculates cosine of pointing angle in the {r, z} plane.
+  /// \param posPV {x, y, z} position of the primary vertex
+  /// \param posSV {x, y, z} position of the secondary vertex
+  /// \param mom {x, y, z} momentum array
+  /// \return cosine of pointing angle in {r, z}
+  template <typename T, typename U, typename V>
+  static double cpaRZ(const T& posPV, const U& posSV, const std::array<V, 3>& mom)
+  {
+    // CPARZ = (r . pz)/(|r| |pz|)
+    auto lineDecay = std::array{sqrtSumOfSquares(posSV[0] - posPV[0], posSV[1] - posPV[1]), static_cast<double>(posSV[2] - posPV[2])};
+    auto momRZ = std::array{sqrtSumOfSquares(mom[0], mom[1]), static_cast<double>(mom[2])};
+    auto cos = dotProd(lineDecay, momRZ) / std::sqrt(mag2(lineDecay) * mag2(momRZ));
+    if (cos < -1.) {
+      return -1.;
+    }
+    if (cos > 1.) {
+      return 1.;
+    }
+    return cos;
+  }
+
   /// Calculates proper lifetime times c.
   /// \note Promotes numbers to double before squaring to avoid precision loss in float multiplication.
   /// \param mom  3-momentum array

EventFiltering/PWGHF/HFFilter.cxx

@@ -249,7 +249,8 @@ struct HfFilter { // Main struct for HF triggers
   std::array<std::shared_ptr<TH1>, kNCharmParticles> hBDTScorePrompt{};
   std::array<std::shared_ptr<TH1>, kNCharmParticles> hBDTScoreNonPrompt{};
   std::array<std::shared_ptr<TH2>, kNV0> hArmPod{};
-  std::shared_ptr<TH2> hV0Selected, hMassVsCtCharmBaryonToXiPiPi;
+  std::shared_ptr<TH2> hV0Selected;
+  std::array<std::shared_ptr<TH2>, 2> hMassVsCtCharmBaryonToXi{};
   std::array<std::shared_ptr<TH2>, 2> hMassXi{}; // not tracked and tracked
   std::array<std::shared_ptr<TH2>, kNBeautyParticles> hCpaVsPtB{};
   std::array<std::shared_ptr<TH2>, kNBeautyParticles> hDecayLengthVsPtB{};
@@ -390,7 +391,8 @@ struct HfFilter { // Main struct for HF triggers
       hMassVsPtC[kNCharmParticles + 15] = registry.add<TH2>("fMassVsPtCharmBaryonToXiPi", "#it{M} vs. #it{p}_{T} distribution of triggered #Xi+#pi candidates;#it{p}_{T} (GeV/#it{c});#it{M} (GeV/#it{c}^{2});counts", HistType::kTH2D, {ptAxis, massAxisC[kNCharmParticles + 15]});
       hMassVsPtC[kNCharmParticles + 16] = registry.add<TH2>("fMassVsPtCharmBaryonToXiKa", "#it{M} vs. #it{p}_{T} distribution of triggered #Xi+K candidates;#it{p}_{T} (GeV/#it{c});#it{M} (GeV/#it{c}^{2});counts", HistType::kTH2D, {ptAxis, massAxisC[kNCharmParticles + 16]});
       hMassVsPtC[kNCharmParticles + 17] = registry.add<TH2>("fMassVsPtCharmBaryonToXiPiPi", "#it{M} vs. #it{p}_{T} distribution of triggered #Xi+#pi+#pi candidates;#it{p}_{T} (GeV/#it{c});#it{M} (GeV/#it{c}^{2});counts", HistType::kTH2D, {ptAxis, massAxisC[kNCharmParticles + 17]});
-      hMassVsCtCharmBaryonToXiPiPi = registry.add<TH2>("fMassVsCtCharmBaryonToXiPiPi", "#it{M} vs. ct distribution of triggered #Xi+#pi+#pi candidates;ct (cm);#it{M} (GeV/#it{c}^{2});counts", HistType::kTH2D, {ctAxis, massAxisC[kNCharmParticles + 17]});
+      hMassVsCtCharmBaryonToXi[0] = registry.add<TH2>("fMassVsCtCharmBaryonToXiPi", "#it{M} vs. ct distribution of triggered #Xi+#pi candidates;ct (cm);#it{M} (GeV/#it{c}^{2});counts", HistType::kTH2D, {ctAxis, massAxisC[kNCharmParticles + 15]});
+      hMassVsCtCharmBaryonToXi[1] = registry.add<TH2>("fMassVsCtCharmBaryonToXiPiPi", "#it{M} vs. ct distribution of triggered #Xi+#pi+#pi candidates;ct (cm);#it{M} (GeV/#it{c}^{2});counts", HistType::kTH2D, {ctAxis, massAxisC[kNCharmParticles + 17]});
       // JPsi
       hMassVsPtC[kNCharmParticles + 18] = registry.add<TH2>("fMassVsPtJPsiToMuMu", "#it{M} vs. #it{p}_{T} distribution of triggered J/#psi to #mu#mu candidates;#it{p}_{T} (GeV/#it{c});#it{M} (GeV/#it{c}^{2});counts", HistType::kTH2D, {ptAxis, massAxisC[kNCharmParticles + 18]});
       // Lc resonances
@@ -1949,10 +1951,10 @@ struct HfFilter { // Main struct for HF triggers
               bool isSelXiBach{false};
               if (requireStrangenessTracking->get(0u, 0u) > 0) {
                 if (hasStrangeTrack) {
-                  isSelXiBach = helper.isSelectedXiBach(trackParCascTrack, trackParBachelor, isSelBachelor, collision, dfStrangeness, activateQA, hMassVsPtC[kNCharmParticles + 15], hMassVsPtC[kNCharmParticles + 16]);
+                  isSelXiBach = helper.isSelectedXiBach(trackParCascTrack, trackParBachelor, isSelBachelor, collision, dfStrangeness, activateQA, hMassVsPtC[kNCharmParticles + 15], hMassVsPtC[kNCharmParticles + 16], hMassVsCtCharmBaryonToXi[0]);
                 }
               } else {
-                isSelXiBach = helper.isSelectedXiBach(trackParCasc, trackParBachelor, isSelBachelor, collision, dfStrangeness, activateQA, hMassVsPtC[kNCharmParticles + 15], hMassVsPtC[kNCharmParticles + 16]);
+                isSelXiBach = helper.isSelectedXiBach(trackParCasc, trackParBachelor, isSelBachelor, collision, dfStrangeness, activateQA, hMassVsPtC[kNCharmParticles + 15], hMassVsPtC[kNCharmParticles + 16], hMassVsCtCharmBaryonToXi[0]);
               }
               if (isSelXiBach) {
                 keepEvent[kCharmBarToXiBach] = true;
@@ -1992,10 +1994,10 @@ struct HfFilter { // Main struct for HF triggers
                   bool isSelXiBachBach{false};
                   if (requireStrangenessTracking->get(0u, 1u) > 0) {
                     if (hasStrangeTrack) {
-                      isSelXiBachBach = helper.isSelectedXiBachBach<3>(trackParCascTrack, {trackParBachelor, trackParBachelorSecond}, collision, dfStrangeness3, activateQA, hMassVsPtC[kNCharmParticles + 17], hMassVsCtCharmBaryonToXiPiPi);
+                      isSelXiBachBach = helper.isSelectedXiBachBach<3>(trackParCascTrack, {trackParBachelor, trackParBachelorSecond}, collision, dfStrangeness3, activateQA, hMassVsPtC[kNCharmParticles + 17], hMassVsCtCharmBaryonToXi[1]);
                     }
                   } else { // vertex with only the two bachelors
-                    isSelXiBachBach = helper.isSelectedXiBachBach<2>(trackParCasc, {trackParBachelor, trackParBachelorSecond}, collision, df2, activateQA, hMassVsPtC[kNCharmParticles + 17], hMassVsCtCharmBaryonToXiPiPi);
+                    isSelXiBachBach = helper.isSelectedXiBachBach<2>(trackParCasc, {trackParBachelor, trackParBachelorSecond}, collision, df2, activateQA, hMassVsPtC[kNCharmParticles + 17], hMassVsCtCharmBaryonToXi[1]);
                   }
                   if (isSelXiBachBach) {
                     keepEvent[kCharmBarToXi2Bach] = true;

EventFiltering/PWGHF/HFFilterHelpers.h

@@ -274,6 +274,7 @@ constexpr float massDPlus = o2::constants::physics::MassDPlus;
 constexpr float massDs = o2::constants::physics::MassDS;
 constexpr float massLc = o2::constants::physics::MassLambdaCPlus;
 constexpr float massXic = o2::constants::physics::MassXiCPlus;
+constexpr float massXic0 = o2::constants::physics::MassXiC0;
 constexpr float massDStar = o2::constants::physics::MassDStar;
 constexpr float massBPlus = o2::constants::physics::MassBPlus;
 constexpr float massB0 = o2::constants::physics::MassB0;
@@ -717,7 +718,7 @@ class HfFilterHelper
   template <typename T1>
   bool isCharmHadronMassInSbRegions(T1 const& massHypo1, T1 const& massHypo2, const float& lowLimitSB, const float& upLimitSB);
   template <typename T, typename C, typename H2>
-  bool isSelectedXiBach(T const& trackParCasc, T const& trackParBachelor, int8_t isSelBachelor, C const& collision, o2::vertexing::DCAFitterN<2>& dcaFitter, const int& activateQA, H2 hMassVsPtXiPi, H2 hMassVsPtXiKa);
+  bool isSelectedXiBach(T const& trackParCasc, T const& trackParBachelor, int8_t isSelBachelor, C const& collision, o2::vertexing::DCAFitterN<2>& dcaFitter, const int& activateQA, H2 hMassVsPtXiPi, H2 hMassVsPtXiKa, H2 hMassVsCtXiPi);
   template <int Nprongs, typename T, typename C, typename H2>
   bool isSelectedXiBachBach(T const& trackParCasc, std::array<T, 2> const& trackParBachelor, C const& collision, o2::vertexing::DCAFitterN<Nprongs>& dcaFitter, const int& activateQA, H2 hMassVsPtXiPiPi, H2 hMassVsCtXiPiPi);
   template <bool is4ThetaC = false, typename T>
@@ -2423,8 +2424,9 @@ inline bool HfFilterHelper::isCharmHadronMassInSbRegions(T1 const& massHypo1, T1
 /// \param activateQA is the flag to activate the QA
 /// \param hMassVsPtXiPi is the 2D histogram with pT vs mass(XiPi)
 /// \param hMassVsPtXiKa is the 2D histogram with pT vs mass(XiKa)
+/// \param hMassVsCtXiPi is the 2D histogram with ct vs mass(XiPi)
 template <typename T, typename C, typename H2>
-inline bool HfFilterHelper::isSelectedXiBach(T const& trackParCasc, T const& trackParBachelor, int8_t isSelBachelor, C const& collision, o2::vertexing::DCAFitterN<2>& dcaFitter, const int& activateQA, H2 hMassVsPtXiPi, H2 hMassVsPtXiKa)
+inline bool HfFilterHelper::isSelectedXiBach(T const& trackParCasc, T const& trackParBachelor, int8_t isSelBachelor, C const& collision, o2::vertexing::DCAFitterN<2>& dcaFitter, const int& activateQA, H2 hMassVsPtXiPi, H2 hMassVsPtXiKa, H2 hMassVsCtXiPi)
 {
   bool isSelectedXiPi{false}, isSelectedXiKa{false};
 
@@ -2483,13 +2485,16 @@ inline bool HfFilterHelper::isSelectedXiBach(T const& trackParCasc, T const& tra
       return false;
     }
 
-    if (RecoDecay::distance(primVtx, vtx) < mDecLenMinXiBach[0]) {
+    auto decLenXiBach = RecoDecay::distance(primVtx, vtx);
+    if (decLenXiBach < mDecLenMinXiBach[0]) {
       return false;
     }
 
     if (activateQA) {
       if (isSelectedXiPi) {
+        auto ctXiBach = RecoDecay::ct(momXiBach, decLenXiBach, massXic0);
         hMassVsPtXiPi->Fill(ptXiBach, massXiPi);
+        hMassVsCtXiPi->Fill(ctXiBach, massXiPi);
       }
       if (isSelectedXiKa) {
         hMassVsPtXiKa->Fill(ptXiBach, massXiKa);

PWGCF/Flow/Tasks/flowEventPlane.cxx

@@ -180,6 +180,7 @@ struct SpectatorPlaneTableProducer {
   // CCDB
   Configurable<std::string> cCcdbUrl{"cCcdbUrl", "http://ccdb-test.cern.ch:8080", "url of ccdb"};
   Configurable<std::string> cCcdbPath{"cCcdbPath", "Users/y/ypatley/DFOO", "Path for ccdb-object"};
+  Configurable<int64_t> nolaterthan{"nolaterthan", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
 
   // Tracks
   Configurable<float> cTrackMinPt{"cTrackMinPt", 0.1, "p_{T} minimum"};
@@ -238,6 +239,8 @@ struct SpectatorPlaneTableProducer {
     // Set CCDB url
     ccdbService->setURL(cCcdbUrl.value);
     ccdbService->setCaching(true);
+    ccdbService->setLocalObjectValidityChecking();
+    ccdbService->setCreatedNotAfter(nolaterthan.value);
 
     // Define axes
     const AxisSpec axisZDCEnergy{500, 0, 500, "ZD[AC] Signal"};
@@ -379,7 +382,7 @@ struct SpectatorPlaneTableProducer {
     // Load ZDC gain calibration
     if (cDoGainCalib) {
       std::string ccdbPath = static_cast<std::string>(cCcdbPath) + "/GainCalib" + "/Run" + std::to_string(cRunNum);
-      auto ccdbObj = ccdbService->getForTimeStamp<TList>(ccdbPath, 1);
+      auto ccdbObj = ccdbService->getForTimeStamp<TList>(ccdbPath, nolaterthan.value);
       CorrectionHistContainer.hGainCalib[0] = reinterpret_cast<TH2F*>(ccdbObj->FindObject("hZNASignal"));
       CorrectionHistContainer.hGainCalib[1] = reinterpret_cast<TH2F*>(ccdbObj->FindObject("hZNCSignal"));
     }
@@ -407,7 +410,7 @@ struct SpectatorPlaneTableProducer {
         std::string ccdbPath = static_cast<std::string>(cCcdbPath) + "/CorrItr_" + std::to_string(i + 1) + "/Run" + std::to_string(cRunNum);
 
         // Get object from CCDB
-        auto ccdbObject = ccdbService->getForTimeStamp<TList>(ccdbPath, 1);
+        auto ccdbObject = ccdbService->getForTimeStamp<TList>(ccdbPath, nolaterthan.value);
 
         // Check CCDB Object
         if (!ccdbObject) {

PWGCF/Flow/Tasks/flowMc.cxx

@@ -20,6 +20,7 @@
 #include "PWGMM/Mult/DataModel/Index.h" // for Particles2Tracks table
 
 #include "Common/CCDB/EventSelectionParams.h"
+#include "Common/CCDB/RCTSelectionFlags.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/TrackSelectionDefaults.h"
@@ -63,6 +64,7 @@
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
+using namespace o2::aod::rctsel;
 
 #define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
 
@@ -113,6 +115,7 @@ struct FlowMc {
   O2_DEFINE_CONFIGURABLE(cfgRecoEvSelkNoCollInTimeRangeStandard, bool, false, "no collisions in specified time range")
   O2_DEFINE_CONFIGURABLE(cfgRecoEvSelkNoCollInRofStandard, bool, false, "no other collisions in this Readout Frame with per-collision multiplicity above threshold")
   O2_DEFINE_CONFIGURABLE(cfgRecoEvSelkNoHighMultCollInPrevRof, bool, false, "veto an event if FT0C amplitude in previous ITS ROF is above threshold")
+  O2_DEFINE_CONFIGURABLE(cfgEvSelRCTflags, std::string, "", "keep empty to disable, usage: 'CentralBarrelTracking', 'CBT_hadronPID' ")
 
   Configurable<std::vector<double>> cfgTrackDensityP0{"cfgTrackDensityP0", std::vector<double>{0.6003720411, 0.6152630970, 0.6288860646, 0.6360694031, 0.6409494798, 0.6450540203, 0.6482117301, 0.6512592056, 0.6640008690, 0.6862631416, 0.7005738691, 0.7106567432, 0.7170728333}, "parameter 0 for track density efficiency correction"};
   Configurable<std::vector<double>> cfgTrackDensityP1{"cfgTrackDensityP1", std::vector<double>{-1.007592e-05, -8.932635e-06, -9.114538e-06, -1.054818e-05, -1.220212e-05, -1.312304e-05, -1.376433e-05, -1.412813e-05, -1.289562e-05, -1.050065e-05, -8.635725e-06, -7.380821e-06, -6.201250e-06}, "parameter 1 for track density efficiency correction"};
@@ -177,6 +180,8 @@ struct FlowMc {
   TRandom3* fRndm = new TRandom3(0);
   double epsilon = 1e-6;
 
+  RCTFlagsChecker rctChecker{"CBT"};
+
   void init(InitContext&)
   {
     ccdb->setURL(ccdbUrl.value);
@@ -338,6 +343,9 @@ struct FlowMc {
       funcV4 = new TF1("funcV4", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
       funcV4->SetParameters(0.008845, 0.000259668, -3.24435e-06, 4.54837e-08, -6.01825e-10);
     }
+    if (!cfgEvSelRCTflags.value.empty()) {
+      rctChecker.init(cfgEvSelRCTflags.value.c_str()); // override initialzation
+    }
   }
 
   void loadCorrections(uint64_t timestamp)
@@ -435,6 +443,8 @@ struct FlowMc {
     if (cfgRecoEvSel8 && !collision.sel8()) {
       return 0;
     }
+    if (!cfgEvSelRCTflags.value.empty() && !rctChecker(*collision))
+      return 0;
     if (cfgRecoEvkNoSameBunchPileup && !collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) {
       // rejects collisions which are associated with the same "found-by-T0" bunch crossing
       // https://indico.cern.ch/event/1396220/#1-event-selection-with-its-rof

PWGCF/Flow/Tasks/flowTask.cxx

@@ -323,7 +323,7 @@ struct FlowTask {
   std::unordered_map<int, TH2*> gHadronicRate;
   ctpRateFetcher mRateFetcher;
   TH2* gCurrentHadronicRate;
-  RCTFlagsChecker rctChecker{"CentralBarrelTracking"};
+  RCTFlagsChecker rctChecker{"CBT"};
 
   // phi-EP correction
   std::vector<TF1*> funcEff;
@@ -759,7 +759,7 @@ struct FlowTask {
       LOGF(info, "DCAz pt-dependence function for Nch: %s", Form("%0.1f * %s", cfgTrackCuts->getData()[kDCAzNSigma][kTrCutNch], cfgFuncParas.cfgDCAzFunc->c_str()));
     }
     if (!cfgEvSelRCTflags.value.empty()) {
-      rctChecker.init(cfgEvSelRCTflags.value.c_str(), true); // override initialzation
+      rctChecker.init(cfgEvSelRCTflags.value.c_str()); // override initialzation
     }
   }