Merge branch 'AliceO2Group:master' into Add-preselection-and-centrality-to-STTree-creatore

Author: FDUEnrich

Common/Core/fwdtrackUtilities.h

@@ -75,6 +75,45 @@ o2::track::TrackParCovFwd getTrackParCovFwd(TFwdTrack const& track, TFwdTrackCov
   return trackparCov;
 }
 
+/// Produce TrackParCovFwds for MFT and FwdTracks, w/ or w/o cov, with z shift
+template <typename TFwdTrack, typename... TCovariance>
+o2::track::TrackParCovFwd getTrackParCovFwdShift(TFwdTrack const& track, float zshift, TCovariance const&... covOpt)
+{
+  double chi2 = track.chi2();
+  if constexpr (sizeof...(covOpt) == 0) {
+    // No covariance passed
+    if constexpr (std::is_same_v<std::decay_t<TFwdTrack>, aod::FwdTracks::iterator>) {
+      if (track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack) {
+        chi2 = track.chi2() * (2.f * track.nClusters() - 5.f);
+      }
+    }
+  } else {
+    // Covariance passed
+    using TCov = std::decay_t<decltype((covOpt, ...))>;
+    if constexpr (std::is_same_v<TCov, aod::FwdTracksCov::iterator>) {
+      if (track.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack) {
+        chi2 = track.chi2() * (2.f * track.nClusters() - 5.f);
+      }
+    }
+  }
+
+  SMatrix5 tpars(track.x(), track.y(), track.phi(), track.tgl(), track.signed1Pt());
+
+  SMatrix55 tcovs;
+  if constexpr (sizeof...(covOpt) == 1) {
+    auto const& cov = (covOpt, ...);
+    std::vector<double> v1{
+      cov.cXX(), cov.cXY(), cov.cYY(), cov.cPhiX(), cov.cPhiY(),
+      cov.cPhiPhi(), cov.cTglX(), cov.cTglY(), cov.cTglPhi(), cov.cTglTgl(),
+      cov.c1PtX(), cov.c1PtY(), cov.c1PtPhi(), cov.c1PtTgl(), cov.c1Pt21Pt2()};
+    tcovs = SMatrix55(v1.begin(), v1.end());
+  } else {
+    tcovs = SMatrix55{};
+  }
+
+  return o2::track::TrackParCovFwd(track.z() + zshift, tpars, tcovs, chi2);
+}
+
 /// propagate fwdtrack to a certain point.
 template <typename TFwdTrack, typename TFwdTrackCov, typename TCollision>
 o2::dataformats::GlobalFwdTrack propagateMuon(TFwdTrack const& muon, TFwdTrackCov const& cov, TCollision const& collision, const propagationPoint endPoint, const float matchingZ, const float bzkG)

PWGCF/Femto/FemtoNuclei/TableProducer/HadNucleiFemto.cxx

@@ -199,8 +199,10 @@ struct HadNucleiFemto {
   Configurable<float> settingCutHadDCAxyMin{"settingCutHadDCAxyMin", 0.3f, "DCAxy Min for Had"};
   Configurable<float> settingCutHadDCAzMin{"settingCutHadDCAzMin", 0.3f, "DCAz Min for Had"};
   Configurable<float> settingCutDeDCAzMin{"settingCutDeDCAzMin", 0.2f, "DCAxy Min for De"};
-  Configurable<float> settingCutNsigTPCPrMin{"settingCutNsigTPCPrMin", 3.0f, "Minimum TPC Pr Nsigma cut on Pi"};
-  Configurable<float> settingCutNsigTOFPrMin{"settingCutNsigTOFPrMin", 3.0f, "Minimum TOF Pr Nsigma cut on Pi"};
+  Configurable<float> settingCutNsigTPCPrMin{"settingCutNsigTPCPrMin", 3.0f, "Minimum TPC Pr Nsigma cut for rejection"};
+  Configurable<float> settingCutNsigTPCPiMin{"settingCutNsigTPCPiMin", 3.0f, "Minimum TPC Pi Nsigma cut for rejection"};
+  Configurable<float> settingCutNsigTOFPrMin{"settingCutNsigTOFPrMin", 3.0f, "Minimum TOF Pr Nsigma cut for rejection"};
+  Configurable<float> settingCutNsigTOFPiMin{"settingCutNsigTOFPiMin", 3.0f, "Minimum TOF Pi Nsigma cut for rejection"};
 
   Configurable<bool> settingSaveUSandLS{"settingSaveUSandLS", true, "Save All Pairs"};
   Configurable<bool> settingFillMultiplicity{"settingFillMultiplicity", false, "Fill multiplicity table"};
@@ -278,6 +280,7 @@ struct HadNucleiFemto {
      {"hNuPhi", "phi distribution; phi(Nu)", {HistType::kTH1F, {{600, -4.0f, 4.0f}}}},
      {"hHadPhi", "phi distribution; phi(had)", {HistType::kTH1F, {{600, -4.0f, 4.0f}}}},
      {"h2dEdxNucandidates", "dEdx distribution; #it{p} (GeV/#it{c}); dE/dx (a.u.)", {HistType::kTH2F, {{200, -5.0f, 5.0f}, {100, 0.0f, 2000.0f}}}},
+     {"h2dEdxHadcandidates", "dEdx distribution; #it{p} (GeV/#it{c}); dE/dx (a.u.)", {HistType::kTH2F, {{200, -5.0f, 5.0f}, {100, 0.0f, 2000.0f}}}},
      {"h2dEdx", "dEdx distribution; #it{p} (GeV/#it{c}); dE/dx (a.u.)", {HistType::kTH2F, {{200, -5.0f, 5.0f}, {100, 0.0f, 2000.0f}}}},
      {"h2NsigmaNuTPC", "NsigmaNu TPC distribution; #it{p}_{T} (GeV/#it{c}); n#sigma_{TPC}(Nu)", {HistType::kTH2F, {{100, -2.0f, 2.0f}, {200, -5.0f, 5.0f}}}},
      {"h2NsigmaNuComb", "NsigmaNu TPCTOF comb distribution; #it{p}_{T} (GeV/#it{c}); n#sigma_{comb}(Nu)", {HistType::kTH2F, {{100, -2.0f, 2.0f}, {100, 0.0f, 5.0f}}}},
@@ -306,7 +309,9 @@ struct HadNucleiFemto {
      {"hkStar_US_M", ";kStar (GeV/c)", {HistType::kTH1F, {{300, 0.0f, 3.0f}}}},
      {"hkStar_US_A", ";kStar (GeV/c)", {HistType::kTH1F, {{300, 0.0f, 3.0f}}}},
      {"h2NsigmaHadPrTPC", "NsigmaHad TPC distribution; #it{p}_{T}(GeV/#it{c}); n#sigma_{TPC}(p)", {HistType::kTH1F, {{200, -5.0f, 5.0f}}}},
+     {"h2NsigmaHadPiTPC", "NsigmaHad TPC distribution; #it{p}_{T}(GeV/#it{c}); n#sigma_{TPC}(pi)", {HistType::kTH1F, {{200, -5.0f, 5.0f}}}},
      {"h2NsigmaHadPrTOF", "NsigmaHad TOF distribution; #it{p}_{T}(GeV/#it{c}); n#sigma_{TPC}(p)", {HistType::kTH1F, {{200, -5.0f, 5.0f}}}},
+     {"h2NsigmaHadPiTOF", "NsigmaHad TOF distribution; #it{p}_{T}(GeV/#it{c}); n#sigma_{TPC}(pi)", {HistType::kTH1F, {{200, -5.0f, 5.0f}}}},
      {"hisBkgEM", "; isBkgEM;", {HistType::kTH1F, {{3, -1, 2}}}}},
     OutputObjHandlingPolicy::AnalysisObject,
     false,
@@ -502,6 +507,19 @@ struct HadNucleiFemto {
     if (std::abs(candidate.pt()) < settingCutHadptMin || std::abs(candidate.pt()) > settingCutHadptMax)
       return false;
 
+    // reject protons and pions
+    if (std::abs(candidate.tpcNSigmaPr()) < settingCutNsigTPCPrMin || std::abs(candidate.tpcNSigmaPi()) < settingCutNsigTPCPiMin)
+      return false;
+    mQaRegistry.fill(HIST("h2NsigmaHadPrTPC"), candidate.tpcNSigmaPr());
+    mQaRegistry.fill(HIST("h2NsigmaHadPiTPC"), candidate.tpcNSigmaPi());
+    if (candidate.hasTOF() && std::abs(candidate.tofNSigmaPr()) < settingCutNsigTOFPrMin)
+      return false;
+    if (candidate.hasTOF() && std::abs(candidate.tofNSigmaPi()) < settingCutNsigTOFPiMin)
+      return false;
+    mQaRegistry.fill(HIST("h2NsigmaHadPrTOF"), candidate.tofNSigmaPr());
+    mQaRegistry.fill(HIST("h2NsigmaHadPiTOF"), candidate.tofNSigmaPi());
+    // rejection end
+
     if (candidate.hasTOF() && candidate.tpcInnerParam() >= settingCutPinMinTOFHad) {
       auto tofNSigmaKa = candidate.tofNSigmaKa();
 
@@ -514,12 +532,14 @@ struct HadNucleiFemto {
       }
       mQaRegistry.fill(HIST("h2NsigmaHadTPC"), candidate.sign() * candidate.pt(), tpcNSigmaKa);
       mQaRegistry.fill(HIST("h2NsigmaHadTOF"), candidate.sign() * candidate.pt(), tofNSigmaKa);
+      mQaRegistry.fill(HIST("h2dEdxHadcandidates"), candidate.sign() * candidate.tpcInnerParam(), candidate.tpcSignal());
       return true;
     } else if (candidate.tpcInnerParam() < settingCutPinMinTOFHad) {
       if (std::abs(tpcNSigmaKa) > settingCutNsigmaTPCHad) {
         return false;
       }
       mQaRegistry.fill(HIST("h2NsigmaHadTPC"), candidate.sign() * candidate.pt(), tpcNSigmaKa);
+      mQaRegistry.fill(HIST("h2dEdxHadcandidates"), candidate.sign() * candidate.tpcInnerParam(), candidate.tpcSignal());
       return true;
     }
     return false;
@@ -562,12 +582,14 @@ struct HadNucleiFemto {
       mQaRegistry.fill(HIST("h2NsigmaHadTPC"), candidate.sign() * candidate.pt(), tpcNSigmaPi);
       mQaRegistry.fill(HIST("h2NsigmaHadTOF"), candidate.sign() * candidate.pt(), tofNSigmaPi);
       mQaRegistry.fill(HIST("h2NsigmaHadComb"), candidate.sign() * candidate.pt(), combNsigma);
+      mQaRegistry.fill(HIST("h2dEdxHadcandidates"), candidate.sign() * candidate.tpcInnerParam(), candidate.tpcSignal());
       return true;
     } else if (candidate.tpcInnerParam() < settingCutPinMinTOFHad) {
       if (std::abs(tpcNSigmaPi) > settingCutNsigmaTPCHad) {
         return false;
       }
       mQaRegistry.fill(HIST("h2NsigmaHadTPC"), candidate.sign() * candidate.pt(), tpcNSigmaPi);
+      mQaRegistry.fill(HIST("h2dEdxHadcandidates"), candidate.sign() * candidate.tpcInnerParam(), candidate.tpcSignal());
       return true;
     }
     return false;

PWGCF/FemtoUniverse/Core/FemtoUniverseParticleHisto.h

@@ -144,7 +144,7 @@ class FemtoUniverseParticleHisto
 
     mHistogramRegistry->add((folderName + folderSuffix + "/hTrueRecoMomPart1").c_str(), "; #it{p}_{reco} (GeV/#it{c}); #it{p}_{truth} - #it{p}_{reco} (GeV/#it{c})", kTH2F, {tempFitVarpTAxis, tempFitVarAxis});
     mHistogramRegistry->add((folderName + folderSuffix + "/hTrueRecoThetaPart1").c_str(), "; #it{p}_{reco} (GeV/#it{c}); #it{#theta}_{truth} - #it{#theta}_{reco} (GeV/#it{c})", kTH2F, {tempFitVarpTAxis, tempFitVarAxis});
-    mHistogramRegistry->add((folderName + folderSuffix + "/hTrueRecoMomPart1").c_str(), "; #it{p}_{reco} (GeV/#it{c}); #it{#phi}_{truth} - #it{#phi}_{reco} (GeV/#it{c})", kTH2F, {tempFitVarpTAxis, tempFitVarAxis});
+    mHistogramRegistry->add((folderName + folderSuffix + "/hTrueRecoPhiPart1").c_str(), "; #it{p}_{reco} (GeV/#it{c}); #it{#phi}_{truth} - #it{#phi}_{reco} (GeV/#it{c})", kTH2F, {tempFitVarpTAxis, tempFitVarAxis});
 
     if constexpr (mParticleType == o2::aod::femtouniverseparticle::ParticleType::kTrack || mParticleType == o2::aod::femtouniverseparticle::ParticleType::kV0Child || mParticleType == o2::aod::femtouniverseparticle::ParticleType::kCascadeBachelor || mParticleType == o2::aod::femtouniverseparticle::ParticleType::kMCTruthTrack) {
       /// Track histograms
@@ -355,9 +355,9 @@ class FemtoUniverseParticleHisto
           float part_theta = 2.0 * std::atan(std::exp(-part.eta()));
           float part_MC_theta = 2.0 * std::atan(std::exp(-part.fdMCParticle().eta()));
 
-          mHistogramRegistry->fill(histFolder + HIST("_MC/hTrueRecoMomPion"), part_p, (part_MC_p - part_p));
-          mHistogramRegistry->fill(histFolder + HIST("_MC/hTrueRecoThetaPion"), part_p, (part_MC_theta - part_theta));
-          mHistogramRegistry->fill(histFolder + HIST("_MC/hTrueRecoMomPion"), part_p, part.fdMCParticle().phi() - part.phi());
+          mHistogramRegistry->fill(histFolder + HIST("_MC/hTrueRecoMomPart1"), part_p, (part_MC_p - part_p));
+          mHistogramRegistry->fill(histFolder + HIST("_MC/hTrueRecoThetaPart1"), part_p, (part_MC_theta - part_theta));
+          mHistogramRegistry->fill(histFolder + HIST("_MC/hTrueRecoPhiPart1"), part_p, part.fdMCParticle().phi() - part.phi());
         }
       }
 

PWGCF/Flow/Tasks/flowTask.cxx

@@ -1253,6 +1253,13 @@ struct FlowTask {
     fGFW->Clear();
     fFCptgen->clearVector();
 
+    if (cfgUseAdditionalEventCut) {
+      for (auto const& collision : collisions) {
+        if (!eventSelected(collision, mcParticles.size(), cent))
+          return;
+      }
+    }
+
     double ptSum_Gap08 = 0.;
     double count_Gap08 = 0.;
     for (const auto& mcParticle : mcParticles) {

PWGCF/GenericFramework/Core/FlowContainer.cxx

@@ -395,7 +395,7 @@ TProfile* FlowContainer::GetCorrXXVsMulti(const char* order, int l_pti)
   }
   return retSubset;
 };
-TProfile* FlowContainer::GetCorrXXVsPt(const char* order, double lminmulti, double lmaxmulti)
+TH1D* FlowContainer::GetCorrXXVsPt(const char* order, double lminmulti, double lmaxmulti)
 {
   int minm = 1;
   int maxm = fProf->GetXaxis()->GetNbins();
@@ -408,35 +408,31 @@ TProfile* FlowContainer::GetCorrXXVsPt(const char* order, double lminmulti, doub
   if (lmaxmulti > lminmulti)
     maxm = fProf->GetXaxis()->FindBin(lmaxmulti - 0.001);
   ProfileSubset* rhProfSub = new ProfileSubset(*fProf);
-  TProfile* retSubset = 0;
   TString l_name("");
   Ssiz_t l_pos = 0;
   while (fIDName.Tokenize(l_name, l_pos)) {
     TString ybl1(Form("%s%s_pt_1", l_name.Data(), order));
     TString ybl2(Form("%s%s_pt_%i", l_name.Data(), order, fNbinsPt));
     int ybn1 = fProf->GetYaxis()->FindBin(ybl1.Data());
     int ybn2 = fProf->GetYaxis()->FindBin(ybl2.Data());
-    rhProfSub->GetYaxis()->SetRange(ybn1, ybn2);
-    TProfile* tempprof = rhProfSub->GetSubset(kFALSE, "tempprof", minm, maxm, fNbinsPt, fbinsPt);
-    if (!retSubset) {
-      TString profname = Form("%s_MultiB_%i_%i", order, minm, maxm);
-      retSubset = dynamic_cast<TProfile*>(tempprof->Clone(profname.Data()));
-    } else {
-      retSubset->Add(tempprof);
+    if (fNbinsPt != (ybn2 - ybn1 + 1)) {
+      printf("fNbinsPt is not matching the num of found histograms");
+      return nullptr;
     }
-    delete tempprof;
-  }
-  delete rhProfSub;
-  if (fPtRebinEdges) {
-    TString pnbu(retSubset->GetName());
-    retSubset->SetName("TempName");
-    TProfile* tempprof = dynamic_cast<TProfile*>(retSubset->Rebin(fPtRebin, pnbu.Data(), fPtRebinEdges));
-    delete retSubset;
-    retSubset = tempprof;
-  } else {
-    retSubset->RebinX(fPtRebin);
+    TProfile* profY = rhProfSub->ProfileY("profY", minm, maxm);
+    TH1D* histY = ProfToHist(profY);
+    TH1D* hist = new TH1D("temphist", "temphist", fNbinsPt, fbinsPt);
+    for (int ibin = 1; ibin < hist->GetNbinsX(); ibin++) {
+      TString bLabel = rhProfSub->GetYaxis()->GetBinLabel(ibin + ybn1 - 1);
+      hist->GetXaxis()->SetBinLabel(ibin, bLabel.Data());
+      hist->SetBinContent(ibin, histY->GetBinContent(ibin + ybn1 - 1));
+      hist->SetBinError(ibin, histY->GetBinError(ibin + ybn1 - 1));
+    }
+    delete histY;
+    delete rhProfSub;
+    return hist;
   }
-  return retSubset;
+  return nullptr;
 };
 TH1D* FlowContainer::ProfToHist(TProfile* inpf)
 {
@@ -462,16 +458,18 @@ TH1D* FlowContainer::GetHistCorrXXVsMulti(const char* order, int l_pti)
 }
 TH1D* FlowContainer::GetHistCorrXXVsPt(const char* order, double lminmulti, double lmaxmulti)
 {
-  TProfile* tpf = GetCorrXXVsPt(order, lminmulti, lmaxmulti);
-  TH1D* rethist = ProfToHist(tpf);
+  TH1D* rethist = GetCorrXXVsPt(order, lminmulti, lmaxmulti);
+  if (!rethist) {
+    printf("GetCorrXXVsPt return nullptr!");
+    return nullptr;
+  }
   TProfile* refflow = GetRefFlowProfile(order, lminmulti, lmaxmulti);
   if (refflow) {
     refflow->RebinX(refflow->GetNbinsX());
     rethist->SetBinContent(0, refflow->GetBinContent(1));
     rethist->SetBinError(0, refflow->GetBinError(1));
   }
   delete refflow;
-  delete tpf;
   return rethist;
 }
 TH1D* FlowContainer::GetVN2(TH1D* cn2)

PWGCF/GenericFramework/Core/FlowContainer.h

@@ -72,7 +72,7 @@ class FlowContainer : public TNamed
   double* GetMultiRebin(int& nBins);
   void SetPropagateErrors(bool newval) { fPropagateErrors = newval; }
   TProfile* GetCorrXXVsMulti(const char* order, int l_pti = 0);                             // pti = 0 for pt-integrated
-  TProfile* GetCorrXXVsPt(const char* order, double lminmulti = -1, double lmaxmulti = -1); // 0 for multi. integrated
+  TH1D* GetCorrXXVsPt(const char* order, double lminmulti = -1, double lmaxmulti = -1);     // 0 for multi. integrated
   TH1D* GetHistCorrXXVsMulti(const char* order, int l_pti = 0);                             // pti = 0 for pt-integrated
   TH1D* GetHistCorrXXVsPt(const char* order, double lminmulti = -1, double lmaxmulti = -1); // 0 for multi. integrated