From 2f6496e4b39dda8e42b62a3a2ac01b04f6d7d867 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Mon, 6 May 2024 17:41:14 -0300 Subject: [PATCH 01/31] Update CutsLibrary.cxx Correct the 'KineCutOnly' by removing the line of code that does nothing. Then, create a new version called 'KineCutOnly2' that includes a condition for low momentum. --- PWGDQ/Core/CutsLibrary.cxx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 3f1a718eccf..43eedebf76e 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -523,6 +523,11 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } + if (!nameStr.compare("KineCutOnly2")) { + cut->AddCut(GetAnalysisCut("PIDStandardKine2")); // standard kine cuts usually are applied via Filter in the task + return cut; + } + if (!nameStr.compare("kaonPID")) { cut->AddCut(GetAnalysisCut("PIDStandardKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); @@ -3061,12 +3066,17 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } if (!nameStr.compare("PIDStandardKine")) { - cut->AddCut(VarManager::kPt, 0.1, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kPt, 1.0, 1000.0); return cut; } + if (!nameStr.compare("PIDStandardKine2")) { + cut->AddCut(VarManager::kEta, -0.9, 0.9); + cut->AddCut(VarManager::kPt, 0.1, 1000.0); + return cut; + } + // ----------------------------------------------- // Barrel track quality cuts From 35ebbc4d6b5ee75bb71a0912a032c5c2bfc0423c Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Wed, 8 May 2024 16:06:12 -0300 Subject: [PATCH 02/31] Update CutsLibrary.cxx New PIDStandardKine (>0.5 GeV). It will be used to create an updated Jpsi2ee tree. --- PWGDQ/Core/CutsLibrary.cxx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 43eedebf76e..444e3501ba3 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -527,7 +527,12 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("PIDStandardKine2")); // standard kine cuts usually are applied via Filter in the task return cut; } - + + if (!nameStr.compare("KineCutOnly3")) { + cut->AddCut(GetAnalysisCut("PIDStandardKine3")); // standard kine cuts usually are applied via Filter in the task + return cut; + } + if (!nameStr.compare("kaonPID")) { cut->AddCut(GetAnalysisCut("PIDStandardKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); @@ -3077,6 +3082,12 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } + if (!nameStr.compare("PIDStandardKine3")) { + cut->AddCut(VarManager::kEta, -0.9, 0.9); + cut->AddCut(VarManager::kPt, 0.5, 1000.0); + return cut; + } + // ----------------------------------------------- // Barrel track quality cuts From 880f8d2d237dec40fde2a4e77c52e851bc161fb6 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 8 May 2024 19:13:07 +0000 Subject: [PATCH 03/31] Please consider the following formatting changes --- PWGDQ/Core/CutsLibrary.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 444e3501ba3..cb5a8e749ba 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -527,12 +527,12 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("PIDStandardKine2")); // standard kine cuts usually are applied via Filter in the task return cut; } - + if (!nameStr.compare("KineCutOnly3")) { cut->AddCut(GetAnalysisCut("PIDStandardKine3")); // standard kine cuts usually are applied via Filter in the task return cut; } - + if (!nameStr.compare("kaonPID")) { cut->AddCut(GetAnalysisCut("PIDStandardKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); From 9afaa9d6597a415dbc1561321c16d6fcaa3abfce Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Thu, 11 Jul 2024 06:26:50 -0300 Subject: [PATCH 04/31] Update CutsLibrary.cxx New cuts for tree creation --- PWGDQ/Core/CutsLibrary.cxx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 515b21a2495..44ded2af62a 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -362,6 +362,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } + if (!nameStr.compare("JpsiPWGSkimmedCuts3")) { + cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); + cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed2")); + cut->AddCut(GetAnalysisCut("electronPIDLooseSkimmed2")); + return cut; + } + if (!nameStr.compare("jpsiO2MCdebugCuts13_Corr")) { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); // no cut on ITS clusters @@ -3788,6 +3795,13 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } + if (!nameStr.compare("electronTrackQualitySkimmed2")) { + cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); + cut->AddCut(VarManager::kITSchi2, 0.0, 5.0); + cut->AddCut(VarManager::kTPCncls, 60, 161); + return cut; + } + if (!nameStr.compare("pionQualityCut1")) { cut->AddCut(VarManager::kPt, 0.15, 1000.0); cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); From 9bb78d57de5ad519f18de1246e6da575d11ba36b Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Thu, 11 Jul 2024 09:29:27 +0000 Subject: [PATCH 05/31] Please consider the following formatting changes --- PWGDQ/Core/CutsLibrary.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 44ded2af62a..4bcbbdf502f 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -3801,7 +3801,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kTPCncls, 60, 161); return cut; } - + if (!nameStr.compare("pionQualityCut1")) { cut->AddCut(VarManager::kPt, 0.15, 1000.0); cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); From 578053cd77772c9586386bc850f5aa41970ef13a Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Fri, 12 Jul 2024 04:59:23 -0300 Subject: [PATCH 06/31] Update tableReader.cxx Correct some typos and add the X table --- PWGDQ/Tasks/tableReader.cxx | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/PWGDQ/Tasks/tableReader.cxx b/PWGDQ/Tasks/tableReader.cxx index 9623ce61392..8aa6b1bff00 100644 --- a/PWGDQ/Tasks/tableReader.cxx +++ b/PWGDQ/Tasks/tableReader.cxx @@ -1781,13 +1781,15 @@ struct AnalysisDileptonHadron { struct AnalysisDileptonTrackTrack { OutputObj fOutputList{"output"}; - Configurable fConfigTrackCuts{"cfgTrackCuts", "jpsiO2MCdebugCuts2", "Comma separated list of barrel track cuts"}; // used for select the tracks from SelectedTracks - Configurable fConfigDileptonCut{"cfgDiLeptonCut", "pairJpsi", "Dilepton cut"}; - Configurable fConfigDitrackCut{"cfgDiTrackCut", "pairNoCut", "Track-Track cut"}; - Configurable fConfigQuadrupletCut{"cfgQuadrupletCut", "pairNoCut", "Dilepton-Track-Track cut"}; - Configurable fConfigAddDileptonHistogram{"cfgAddDileptonHistogram", "berral", "Comma separated list of histograms"}; - Configurable fConfigAddDitrackHistogram{"cfgAddDitrackHistogram", "berral", "Comma separated list of histograms"}; - Configurable fConfigAddQuadrupletHistogram{"cfgAddQuadrupletHistogram", "XtoJpsipipi", "Comma separated list of histograms"}; + Configurable fConfigTrackCuts{"cfgTrackCuts", "pionPIDCut1", "Comma separated list of barrel track cuts"}; // used for select the tracks from SelectedTracks + Configurable fConfigDileptonCut{"cfgDiLeptonCut", "pairJpsi2", "Dilepton cut"}; + Configurable fConfigDitrackCut{"cfgDiTrackCut", "DipionPairCut1", "Track-Track cut"}; + Configurable fConfigQuadrupletCut{"cfgQuadrupletCut", "pairX3872", "Dilepton-Track-Track cut"}; + Configurable fConfigAddDileptonHistogram{"cfgAddDileptonHistogram", "barrel", "Comma separated list of histograms"}; + Configurable fConfigAddDitrackHistogram{"cfgAddDitrackHistogram", "barrel", "Comma separated list of histograms"}; + Configurable fConfigAddQuadrupletHistogram{"cfgAddQuadrupletHistogram", "xtojpsipipi", "Comma separated list of histograms"}; + + Produces XTable; Filter eventFilter = aod::dqanalysisflags::isEventSelected == 1; Filter dileptonFilter = aod::reducedpair::mass > 1.0f && aod::reducedpair::mass < 4.0f; @@ -1920,6 +1922,8 @@ struct AnalysisDileptonTrackTrack { if (fIsUnlikeSignDilepton) { if (fIsUnlikeSignDitrack) { fHistMan->FillHistClass(Form("QuadrupletSEUSUS_%s_%s_%s", fDileptonCut.GetName(), fDitrackCut.GetName(), (*cutname).Data()), fValuesQuadruplet); + XTable(fValuesQuadruplet[VarManager::kQuadMass], fValuesQuadruplet[VarManager::kQuadPt], fValuesQuadruplet[VarManager::kRap], fValuesQuadruplet[VarManager::kQuadEta], fValuesQuadruplet[VarManager::kPairMass], fValuesQuadruplet[VarManager::kDitrackMass], fValuesQuadruplet[VarManager::kPairPt], fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], fValuesQuadruplet[VarManager::kCosthetaDileptonDitrack], fValuesQuadruplet[VarManager::kTrackDCAxy], fValuesQuadruplet[VarManager::kTrackDCAz]); + } else { fHistMan->FillHistClass(Form("QuadrupletSEUSLS_%s_%s_%s", fDileptonCut.GetName(), fDitrackCut.GetName(), (*cutname).Data()), fValuesQuadruplet); } @@ -1932,7 +1936,7 @@ struct AnalysisDileptonTrackTrack { } } } - } // check if the diTrack cut is selected + } // check if the Ditrack cut is selected } // loop over hadron cuts } } From b16188a82acb1f74b2faa159ccc7ed029fb608f9 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Fri, 12 Jul 2024 05:13:50 -0300 Subject: [PATCH 07/31] Update HistogramsLibrary.cxx Add some new histograms (momentum, DCA, Mass, Angular Distance...) to the X(3872) analysis. 'Default Mass' means the mass of the dilepton candidate was replaced with the nominal mass of the J/psi. --- PWGDQ/Core/HistogramsLibrary.cxx | 33 ++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index 0dc742c0d8e..052418d5d97 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -1260,11 +1260,36 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h if (!groupStr.CompareTo("dilepton-dihadron")) { if (subGroupStr.EqualTo("xtojpsipipi")) { hm->AddHistogram(histClass, "hMass_X3872", "", false, 1000, 3.0, 5.0, VarManager::kQuadMass); - hm->AddHistogram(histClass, "hPt_X3872", "", false, 200, 0.0, 20.0, VarManager::kQuadPt); - hm->AddHistogram(histClass, "hMass_Pt_X3872", "", false, 1000, 3.0, 5.0, VarManager::kQuadMass, 150, 0.0, 15.0, VarManager::kQuadPt); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_X3872", "", false, 1000, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass); + hm->AddHistogram(histClass, "hPt_X3872", "", false, 150, 0.0, 15.0, VarManager::kQuadPt); + hm->AddHistogram(histClass, "hMass_Pt_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 150, 0.0, 15.0, VarManager::kQuadPt); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_Pt_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 150, 0.0, 15.0, VarManager::kQuadPt); hm->AddHistogram(histClass, "hCostheta_Jpsi_Dihadron", "", false, 100, -1.0, 1.0, VarManager::kCosthetaDileptonDitrack); - hm->AddHistogram(histClass, "hPtDilepton_PtDihadron", "", false, 200, 0, 20, VarManager::kPairPt, 100, 0, 10, VarManager::kDitrackPt); - hm->AddHistogram(histClass, "hPtDilepton_MassDihadron", "", false, 200, 0, 20, VarManager::kPairPt, 100, 3.0, 5.0, VarManager::kDitrackMass); + hm->AddHistogram(histClass, "hPtDilepton_PtDihadron", "", false, 150, 0, 15.0, VarManager::kPairPt, 100, 0, 10, VarManager::kDitrackPt); + hm->AddHistogram(histClass, "hPtDilepton_MassDihadron", "", false, 150, 0, 15.0, VarManager::kPairPt, 150, 0.0, 3.0, VarManager::kDitrackMass); + hm->AddHistogram(histClass, "hQ_X3872", "", false, 150, 0.0, 3.0, VarManager::kQ); + hm->AddHistogram(histClass, "hDeltaR1_X3872", "", false, 100, 0.0, 10.0, VarManager::kDeltaR1); + hm->AddHistogram(histClass, "hDeltaR2_X3872", "", false, 100, 0.0, 10.0, VarManager::kDeltaR2); + hm->AddHistogram(histClass, "hMass_Q_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 150, 0.0, 3.0, VarManager::kQ); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_Q_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 150, 0.0, 3.0, VarManager::kQ); + hm->AddHistogram(histClass, "hMass_DeltaR1_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 100, 0.0, 10.0, VarManager::kDeltaR1); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_DeltaR1_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 100, 0.0, 10.0, VarManager::kDeltaR1); + hm->AddHistogram(histClass, "hMass_DeltaR2_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 100, 0.0, 10.0, VarManager::kDeltaR2); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_DeltaR2_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 100, 0.0, 10.0, VarManager::kDeltaR2); + hm->AddHistogram(histClass, "hMass_X3872_MassDihadron", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 150, 0.0, 3.0, VarManager::kDitrackMass); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_X3872_MassDihadron", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 150, 0.0, 3.0, VarManager::kDitrackMass); + hm->AddHistogram(histClass, "hRap_X3872", "", false, 1000, 0.0, 5.0, VarManager::kRap); + hm->AddHistogram(histClass, "hMass_Rap_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 1000, 0.0, 5.0, VarManager::kRap); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_Rap_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 1000, 0.0, 5.0, VarManager::kRap); + hm->AddHistogram(histClass, "hDCAxyTrack1", "", false, 100, -0.1, 0.1, VarManager::kTrackDCAxy); + hm->AddHistogram(histClass, "hDCAzTrack1", "", false, 100, -0.1, 0.1, VarManager::kTrackDCAz); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_DCAxyTrack1", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 100, -0.1, 0.1, VarManager::kTrackDCAxy); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_DCAzTrack1", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 100, -0.1, 0.1, VarManager::kTrackDCAz); + hm->AddHistogram(histClass, "hMass_DCAxyTrack1", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 100, -0.1, 0.1, VarManager::kTrackDCAxy); + hm->AddHistogram(histClass, "hMass_DCAzTrack1", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 100, -0.1, 0.1, VarManager::kTrackDCAz); + hm->AddHistogram(histClass, "hPtTrack1", "", false, 100, 0.0, 10.0, VarManager::kPt); + hm->AddHistogram(histClass, "hMass_defaultDileptonMass_PtTrack1", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 100, 0.0, 10.0, VarManager::kPt); + hm->AddHistogram(histClass, "hMass_PtTrack1", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 100, 0.0, 10.0, VarManager::kPt); } } if (!groupStr.CompareTo("dilepton-photon-mass")) { From 071763d1be2d2e64c7fa79500c13130ab6c7cc3e Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Fri, 12 Jul 2024 05:27:05 -0300 Subject: [PATCH 08/31] Update VarManager.cxx Add Q and Delta R variables. These variables are used to study the X(3872) particle --- PWGDQ/Core/VarManager.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PWGDQ/Core/VarManager.cxx b/PWGDQ/Core/VarManager.cxx index b0f613ce068..ca1a0e500f3 100644 --- a/PWGDQ/Core/VarManager.cxx +++ b/PWGDQ/Core/VarManager.cxx @@ -889,4 +889,10 @@ void VarManager::SetDefaultVarNames() fgVariableUnits[kDitrackMass] = "GeV/c2"; fgVariableNames[kDitrackPt] = "p_{T}"; fgVariableUnits[kDitrackPt] = "GeV/c"; + fgVariableNames[kQ] = "mass difference"; + fgVariableUnits[kQ] = "GeV/c2"; + fgVariableNames[kDeltaR1] = "angular distance prong 1"; + fgVariableUnits[kDeltaR1] = ""; + fgVariableNames[kDeltaR2] = "angular distance prong 2"; + fgVariableUnits[kDeltaR2] = ""; } From 39a1d23a2d6d33e8b2ccd89198e7e60107ef42ec Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Fri, 12 Jul 2024 06:14:53 -0300 Subject: [PATCH 09/31] Update VarManager.h Add some variables for the X(3872) analysis, such as Q, Delta R, DCA and Invariant Mass. --- PWGDQ/Core/VarManager.h | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index a88fe0f515b..1b4668689e8 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -647,12 +647,16 @@ class VarManager : public TObject // Dilepton-track-track variables kQuadMass, + kQuadDefaultDileptonMass, kQuadPt, kQuadEta, kQuadPhi, kCosthetaDileptonDitrack, kDitrackMass, kDitrackPt, + kQ, + kDeltaR1, + kDeltaR2, // DQ-HF correlation variables kMassCharmHadron, @@ -4039,16 +4043,16 @@ void VarManager::FillDileptonTrackTrack(T1 const& dilepton, T2 const& hadron1, T values = fgValues; } - double DefaultdileptonMass = 3.096; + double defaultDileptonMass = 3.096; double hadronMass1 = o2::constants::physics::MassPionCharged; double hadronMass2 = o2::constants::physics::MassPionCharged; if (candidateType == kXtoJpsiPiPi) { - DefaultdileptonMass = 3.096; + defaultDileptonMass = 3.096; hadronMass1 = o2::constants::physics::MassPionCharged; hadronMass2 = o2::constants::physics::MassPionCharged; } if (candidateType == kChictoJpsiEE) { - DefaultdileptonMass = 3.096; + defaultDileptonMass = 3.096; hadronMass1 = o2::constants::physics::MassElectron; hadronMass2 = o2::constants::physics::MassElectron; } @@ -4057,18 +4061,27 @@ void VarManager::FillDileptonTrackTrack(T1 const& dilepton, T2 const& hadron1, T ROOT::Math::PtEtaPhiMVector v2(hadron1.pt(), hadron1.eta(), hadron1.phi(), hadronMass1); ROOT::Math::PtEtaPhiMVector v3(hadron2.pt(), hadron2.eta(), hadron2.phi(), hadronMass2); ROOT::Math::PtEtaPhiMVector v123 = v1 + v2 + v3; - values[kQuadMass] = v123.M() - v1.M() + DefaultdileptonMass; + values[kQuadMass] = v123.M() + values[kQuadDefaultDileptonMass] = v123.M() - v1.M() + defaultDileptonMass; values[kQuadPt] = v123.Pt(); values[kQuadEta] = v123.Eta(); values[kQuadPhi] = v123.Phi(); - if (fgUsedVars[kCosthetaDileptonDitrack] || fgUsedVars[kPairMass] || fgUsedVars[kPairPt] || fgUsedVars[kDitrackPt] || fgUsedVars[kDitrackMass]) { + values[kTrackDCAxy] = hadron1.dcaXY(); + values[kTrackDCAz] = hadron1.dcaZ(); + values[kPt] = hadron1.pt(); + + if (fgUsedVars[kCosthetaDileptonDitrack] || fgUsedVars[kPairMass] || fgUsedVars[kPairPt] || fgUsedVars[kDitrackPt] || fgUsedVars[kDitrackMass] || fgUsedVars[kQ] || fgUsedVars[kDeltaR1] || fgUsedVars[kDeltaR2] || fgUsedVars[kRap]) { ROOT::Math::PtEtaPhiMVector v23 = v2 + v3; values[kPairMass] = v1.M(); values[kPairPt] = v1.Pt(); values[kDitrackMass] = v23.M(); values[kDitrackPt] = v23.Pt(); values[kCosthetaDileptonDitrack] = (v1.Px() * v123.Px() + v1.Py() * v123.Py() + v1.Pz() * v123.Pz()) / (v1.P() * v123.P()); + values[kQ] = v123.M() - v1.M() - v23.M(); + values[kDeltaR1] = sqrt(pow(v1.Eta() - v2.Eta(), 2) + pow(v1.Phi() - v2.Phi(), 2)); + values[kDeltaR2] = sqrt(pow(v1.Eta() - v3.Eta(), 2) + pow(v1.Phi() - v3.Phi(), 2)); + values[kRap] = v123.Rapidity(); } } From bec300a81b5832ab7f52cea1f9b7e25ff79dcfe6 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Fri, 12 Jul 2024 06:41:28 -0300 Subject: [PATCH 10/31] Update tableReader.cxx Add the X(3872) table --- PWGDQ/Tasks/tableReader.cxx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/PWGDQ/Tasks/tableReader.cxx b/PWGDQ/Tasks/tableReader.cxx index 8aa6b1bff00..91edb27a2dc 100644 --- a/PWGDQ/Tasks/tableReader.cxx +++ b/PWGDQ/Tasks/tableReader.cxx @@ -76,6 +76,22 @@ DECLARE_SOA_COLUMN(TauxyBcandidate, tauxyBcandidate, float); DECLARE_SOA_COLUMN(TauzBcandidate, tauzBcandidate, float); DECLARE_SOA_COLUMN(CosPBcandidate, cosPBcandidate, float); DECLARE_SOA_COLUMN(Chi2Bcandidate, chi2Bcandidate, float); + +// Xcandidate columns +DECLARE_SOA_COLUMN(massXcandidate, MXcandidate, float); +DECLARE_SOA_COLUMN(pTXcandidate, PtXcandidate, float); +DECLARE_SOA_COLUMN(rapidityXcandidate, YXcandidate, float); +DECLARE_SOA_COLUMN(etaXcandidate, EtaXcandidate, float); +DECLARE_SOA_COLUMN(massJpsicandidate, MJpsicandidate, float); +DECLARE_SOA_COLUMN(massDipioncandidate, MDipioncandidate, float); +DECLARE_SOA_COLUMN(pTJpsicandidate, PtJpsicandidate, float); +DECLARE_SOA_COLUMN(massDiff, Q, float); +DECLARE_SOA_COLUMN(angDistPion1, DeltaR1, float); +DECLARE_SOA_COLUMN(angDistPion2, DeltaR2, float); +DECLARE_SOA_COLUMN(cosDileptonDipion, CosDileptonDipion, float); +DECLARE_SOA_COLUMN(dcaxy, DcaXY, float); +DECLARE_SOA_COLUMN(dcaz, DcaZ, float); + } // namespace dqanalysisflags DECLARE_SOA_TABLE(EventCuts, "AOD", "DQANAEVCUTS", dqanalysisflags::IsEventSelected); @@ -84,6 +100,7 @@ DECLARE_SOA_TABLE(BarrelTrackCuts, "AOD", "DQANATRKCUTS", dqanalysisflags::IsBar DECLARE_SOA_TABLE(MuonTrackCuts, "AOD", "DQANAMUONCUTS", dqanalysisflags::IsMuonSelected); DECLARE_SOA_TABLE(Prefilter, "AOD", "DQPREFILTER", dqanalysisflags::IsPrefilterVetoed); DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONS", dqanalysisflags::massBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate, dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate); +DECLARE_SOA_TABLE(XCandidates, "AOD", "DQX3872", dqanalysisflags::massXcandidate, dqanalysisflags::pTXcandidate, dqanalysisflags::rapidityXcandidate, dqanalysisflags::etaXcandidate, dqanalysisflags::massJpsicandidate, dqanalysisflags::massDipioncandidate, dqanalysisflags::pTJpsicandidate, dqanalysisflags::massDiff, dqanalysisflags::angDistPion1, dqanalysisflags::angDistPion2, dqanalysisflags::cosDileptonDipion, dqanalysisflags::dcaxy, dqanalysisflags::dcaz); } // namespace o2::aod // Declarations of various short names From 8b7229f9160df20cbfa0534a19797f02698064d6 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Fri, 12 Jul 2024 10:21:46 +0000 Subject: [PATCH 11/31] Please consider the following formatting changes --- PWGDQ/Core/VarManager.h | 6 +++--- PWGDQ/Tasks/tableReader.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index 1b4668689e8..719d62b1d4b 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -654,7 +654,7 @@ class VarManager : public TObject kCosthetaDileptonDitrack, kDitrackMass, kDitrackPt, - kQ, + kQ, kDeltaR1, kDeltaR2, @@ -4061,8 +4061,8 @@ void VarManager::FillDileptonTrackTrack(T1 const& dilepton, T2 const& hadron1, T ROOT::Math::PtEtaPhiMVector v2(hadron1.pt(), hadron1.eta(), hadron1.phi(), hadronMass1); ROOT::Math::PtEtaPhiMVector v3(hadron2.pt(), hadron2.eta(), hadron2.phi(), hadronMass2); ROOT::Math::PtEtaPhiMVector v123 = v1 + v2 + v3; - values[kQuadMass] = v123.M() - values[kQuadDefaultDileptonMass] = v123.M() - v1.M() + defaultDileptonMass; + values[kQuadMass] = v123.M() + values[kQuadDefaultDileptonMass] = v123.M() - v1.M() + defaultDileptonMass; values[kQuadPt] = v123.Pt(); values[kQuadEta] = v123.Eta(); values[kQuadPhi] = v123.Phi(); diff --git a/PWGDQ/Tasks/tableReader.cxx b/PWGDQ/Tasks/tableReader.cxx index 91edb27a2dc..45474372667 100644 --- a/PWGDQ/Tasks/tableReader.cxx +++ b/PWGDQ/Tasks/tableReader.cxx @@ -91,7 +91,7 @@ DECLARE_SOA_COLUMN(angDistPion2, DeltaR2, float); DECLARE_SOA_COLUMN(cosDileptonDipion, CosDileptonDipion, float); DECLARE_SOA_COLUMN(dcaxy, DcaXY, float); DECLARE_SOA_COLUMN(dcaz, DcaZ, float); - + } // namespace dqanalysisflags DECLARE_SOA_TABLE(EventCuts, "AOD", "DQANAEVCUTS", dqanalysisflags::IsEventSelected); From aa5fd9374f3e29f63ad459c6e183db71ac62ad69 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Fri, 12 Jul 2024 07:33:37 -0300 Subject: [PATCH 12/31] Update VarManager.h Correct a typo --- PWGDQ/Core/VarManager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index 719d62b1d4b..084bca08cca 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -4061,8 +4061,8 @@ void VarManager::FillDileptonTrackTrack(T1 const& dilepton, T2 const& hadron1, T ROOT::Math::PtEtaPhiMVector v2(hadron1.pt(), hadron1.eta(), hadron1.phi(), hadronMass1); ROOT::Math::PtEtaPhiMVector v3(hadron2.pt(), hadron2.eta(), hadron2.phi(), hadronMass2); ROOT::Math::PtEtaPhiMVector v123 = v1 + v2 + v3; - values[kQuadMass] = v123.M() - values[kQuadDefaultDileptonMass] = v123.M() - v1.M() + defaultDileptonMass; + values[kQuadMass] = v123.M(); + values[kQuadDefaultDileptonMass] = v123.M() - v1.M() + defaultDileptonMass; values[kQuadPt] = v123.Pt(); values[kQuadEta] = v123.Eta(); values[kQuadPhi] = v123.Phi(); From 8be4dac94112250470f0243a5cefdd3a19b8fe71 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Sat, 13 Jul 2024 04:21:33 -0300 Subject: [PATCH 13/31] Update tableReader.cxx Fix a typo --- PWGDQ/Tasks/tableReader.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Tasks/tableReader.cxx b/PWGDQ/Tasks/tableReader.cxx index 45474372667..284fa4369a5 100644 --- a/PWGDQ/Tasks/tableReader.cxx +++ b/PWGDQ/Tasks/tableReader.cxx @@ -1801,7 +1801,7 @@ struct AnalysisDileptonTrackTrack { Configurable fConfigTrackCuts{"cfgTrackCuts", "pionPIDCut1", "Comma separated list of barrel track cuts"}; // used for select the tracks from SelectedTracks Configurable fConfigDileptonCut{"cfgDiLeptonCut", "pairJpsi2", "Dilepton cut"}; Configurable fConfigDitrackCut{"cfgDiTrackCut", "DipionPairCut1", "Track-Track cut"}; - Configurable fConfigQuadrupletCut{"cfgQuadrupletCut", "pairX3872", "Dilepton-Track-Track cut"}; + Configurable fConfigQuadrupletCut{"cfgQuadrupletCut", "pairX3872Cut1", "Dilepton-Track-Track cut"}; Configurable fConfigAddDileptonHistogram{"cfgAddDileptonHistogram", "barrel", "Comma separated list of histograms"}; Configurable fConfigAddDitrackHistogram{"cfgAddDitrackHistogram", "barrel", "Comma separated list of histograms"}; Configurable fConfigAddQuadrupletHistogram{"cfgAddQuadrupletHistogram", "xtojpsipipi", "Comma separated list of histograms"}; From 527c3badc132442b2a625cd7bef492806d2fa1ac Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Tue, 16 Jul 2024 04:47:10 -0300 Subject: [PATCH 14/31] Update VarManager.h Correct the Q variable. Replace the J/psi candidate mass with the PDG one. --- PWGDQ/Core/VarManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index 084bca08cca..20bd29174f1 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -4078,7 +4078,7 @@ void VarManager::FillDileptonTrackTrack(T1 const& dilepton, T2 const& hadron1, T values[kDitrackMass] = v23.M(); values[kDitrackPt] = v23.Pt(); values[kCosthetaDileptonDitrack] = (v1.Px() * v123.Px() + v1.Py() * v123.Py() + v1.Pz() * v123.Pz()) / (v1.P() * v123.P()); - values[kQ] = v123.M() - v1.M() - v23.M(); + values[kQ] = v123.M() - defaultDileptonMass - v23.M(); values[kDeltaR1] = sqrt(pow(v1.Eta() - v2.Eta(), 2) + pow(v1.Phi() - v2.Phi(), 2)); values[kDeltaR2] = sqrt(pow(v1.Eta() - v3.Eta(), 2) + pow(v1.Phi() - v3.Phi(), 2)); values[kRap] = v123.Rapidity(); From c0176a34be107045e932e507408e74fc732f8b59 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Mon, 22 Jul 2024 07:07:38 -0300 Subject: [PATCH 15/31] Update CutsLibrary.cxx --- PWGDQ/Core/CutsLibrary.cxx | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 4bcbbdf502f..4ed11933ad3 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -828,6 +828,12 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } + if (!nameStr.compare("Jpsi_TPCPost_calib_debug9")) { + cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug4")); + cut->AddCut(GetAnalysisCut("electronPIDLooseSkimmed3")); + return cut; + } + if (!nameStr.compare("LMee_TPCPost_calib_debug1")) { cut->AddCut(GetAnalysisCut("lmee_trackCut_debug")); cut->AddCut(GetAnalysisCut("lmee_TPCPID_debug1")); @@ -3584,6 +3590,17 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } + if (!nameStr.compare("jpsi_trackCut_debug4")) { + cut->AddCut(VarManager::kEta, -0.9, 0.9); + cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); + cut->AddCut(VarManager::kTPCncls, 90., 159); + cut->AddCut(VarManager::kITSncls, 2.5, 7.5); + cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); + cut->AddCut(VarManager::kTrackDCAxy, -1, 1); + cut->AddCut(VarManager::kTrackDCAz, -3.0, 3.0); + return cut; + } + if (!nameStr.compare("lmee_trackCut_debug")) { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); @@ -3964,6 +3981,15 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kTPCnSigmaPr, 1.5, 999, false, VarManager::kPin, 3.0, 999); return cut; } + + if (!nameStr.compare("electronPIDLooseSkimmed3")) { + cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); + cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999, false, VarManager::kPin, 0, 3.0); + cut->AddCut(VarManager::kTPCnSigmaPr, 3.0, 999, false, VarManager::kPin, 0, 3.0); + + return cut; + } + if (!nameStr.compare("jpsi_TPCPID_debug6")) { cut->AddCut(VarManager::kTPCnSigmaEl, -2.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999); From 7f6815ed4fc65cea228a3edda637d617bccde791 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Mon, 22 Jul 2024 07:21:46 -0300 Subject: [PATCH 16/31] Update CutsLibrary.cxx --- PWGDQ/Core/CutsLibrary.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 4ed11933ad3..03c7edca766 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -3986,7 +3986,6 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999, false, VarManager::kPin, 0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 3.0, 999, false, VarManager::kPin, 0, 3.0); - return cut; } From 8c5aef4f57e33f0fa1a920a0ca7cb065e4cf0983 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 22 Jul 2024 10:23:42 +0000 Subject: [PATCH 17/31] Please consider the following formatting changes --- PWGDQ/Core/CutsLibrary.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 03c7edca766..5c79f17e52f 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -3600,7 +3600,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kTrackDCAz, -3.0, 3.0); return cut; } - + if (!nameStr.compare("lmee_trackCut_debug")) { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); @@ -3988,7 +3988,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kTPCnSigmaPr, 3.0, 999, false, VarManager::kPin, 0, 3.0); return cut; } - + if (!nameStr.compare("jpsi_TPCPID_debug6")) { cut->AddCut(VarManager::kTPCnSigmaEl, -2.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999); From 1b62d1457e0317e33f878c7a77f1bb7fd45f8648 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Wed, 24 Jul 2024 05:34:13 -0300 Subject: [PATCH 18/31] Update tableReader.cxx --- PWGDQ/Tasks/tableReader.cxx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/PWGDQ/Tasks/tableReader.cxx b/PWGDQ/Tasks/tableReader.cxx index 4227ae6e7e8..611fb30fa92 100644 --- a/PWGDQ/Tasks/tableReader.cxx +++ b/PWGDQ/Tasks/tableReader.cxx @@ -85,12 +85,19 @@ DECLARE_SOA_COLUMN(etaXcandidate, EtaXcandidate, float); DECLARE_SOA_COLUMN(massJpsicandidate, MJpsicandidate, float); DECLARE_SOA_COLUMN(massDipioncandidate, MDipioncandidate, float); DECLARE_SOA_COLUMN(pTJpsicandidate, PtJpsicandidate, float); +DECLARE_SOA_COLUMN(pTDipioncandidate, PtDipioncandidate, float); DECLARE_SOA_COLUMN(massDiff, Q, float); DECLARE_SOA_COLUMN(angDistPion1, DeltaR1, float); DECLARE_SOA_COLUMN(angDistPion2, DeltaR2, float); DECLARE_SOA_COLUMN(cosDileptonDipion, CosDileptonDipion, float); -DECLARE_SOA_COLUMN(dcaxy, DcaXY, float); -DECLARE_SOA_COLUMN(dcaz, DcaZ, float); +DECLARE_SOA_COLUMN(dcaxyPion1, DcaXYPion1, float); +DECLARE_SOA_COLUMN(dcazPion1, DcaZPion1, float); +DECLARE_SOA_COLUMN(dcaxyPion2, DcaXYPion2, float); +DECLARE_SOA_COLUMN(dcazPion2, DcaZPion2, float); +DECLARE_SOA_COLUMN(pTPion1, PtPion1, float); +DECLARE_SOA_COLUMN(pTPion2, PtPion2, float); +DECLARE_SOA_COLUMN(dileptonSign, DileptonSign, int); +DECLARE_SOA_COLUMN(ditrackSign, DitrackSign, int); } // namespace dqanalysisflags @@ -100,7 +107,7 @@ DECLARE_SOA_TABLE(BarrelTrackCuts, "AOD", "DQANATRKCUTS", dqanalysisflags::IsBar DECLARE_SOA_TABLE(MuonTrackCuts, "AOD", "DQANAMUONCUTS", dqanalysisflags::IsMuonSelected); DECLARE_SOA_TABLE(Prefilter, "AOD", "DQPREFILTER", dqanalysisflags::IsPrefilterVetoed); DECLARE_SOA_TABLE(BmesonCandidates, "AOD", "DQBMESONS", dqanalysisflags::massBcandidate, dqanalysisflags::pTBcandidate, dqanalysisflags::LxyBcandidate, dqanalysisflags::LxyzBcandidate, dqanalysisflags::LzBcandidate, dqanalysisflags::TauxyBcandidate, dqanalysisflags::TauzBcandidate, dqanalysisflags::CosPBcandidate, dqanalysisflags::Chi2Bcandidate); -DECLARE_SOA_TABLE(XCandidates, "AOD", "DQX3872", dqanalysisflags::massXcandidate, dqanalysisflags::pTXcandidate, dqanalysisflags::rapidityXcandidate, dqanalysisflags::etaXcandidate, dqanalysisflags::massJpsicandidate, dqanalysisflags::massDipioncandidate, dqanalysisflags::pTJpsicandidate, dqanalysisflags::massDiff, dqanalysisflags::angDistPion1, dqanalysisflags::angDistPion2, dqanalysisflags::cosDileptonDipion, dqanalysisflags::dcaxy, dqanalysisflags::dcaz); +DECLARE_SOA_TABLE(XCandidates, "AOD", "DQX3872", dqanalysisflags::massXcandidate, dqanalysisflags::pTXcandidate, dqanalysisflags::rapidityXcandidate, dqanalysisflags::etaXcandidate, dqanalysisflags::massJpsicandidate, dqanalysisflags::massDipioncandidate, dqanalysisflags::pTJpsicandidate, dqanalysisflags::pTDipioncandidate, dqanalysisflags::massDiff, dqanalysisflags::angDistPion1, dqanalysisflags::angDistPion2, dqanalysisflags::cosDileptonDipion, dqanalysisflags::dcaxyPion1, dqanalysisflags::dcazPion1, dqanalysisflags::dcaxyPion2, dqanalysisflags::dcazPion2, dqanalysisflags::pTPion1, dqanalysisflags::pTPion2, dqanalysisflags::dileptonSign, dqanalysisflags::ditrackSign); } // namespace o2::aod // Declarations of various short names @@ -1936,11 +1943,10 @@ struct AnalysisDileptonTrackTrack { if (t1.isBarrelSelected() & (uint32_t(1) << (iTrackCut + 1)) && t2.isBarrelSelected() & (uint32_t(1) << (iTrackCut + 1))) { fHistMan->FillHistClass(Form("DitrackSelected_%s_%s", fDitrackCut.GetName(), (*cutname).Data()), fValuesDitrack); if (fQuadrupletCut.IsSelected(fValuesQuadruplet)) { + XTable(fValuesQuadruplet[VarManager::kQuadMass], fValuesQuadruplet[VarManager::kQuadPt], fValuesQuadruplet[VarManager::kRap], fValuesQuadruplet[VarManager::kQuadEta], fValuesQuadruplet[VarManager::kPairMass], fValuesQuadruplet[VarManager::kDitrackMass], fValuesQuadruplet[VarManager::kPairPt], fValuesQuadruplet[VarManager::kDitrackPt], fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], fValuesQuadruplet[VarManager::kCosthetaDileptonDitrack], fValuesQuadruplet[VarManager::kTrackDCAxyProng1], fValuesQuadruplet[VarManager::kTrackDCAzProng1], fValuesQuadruplet[VarManager::kTrackDCAxyProng2], fValuesQuadruplet[VarManager::kTrackDCAzProng2], fValuesQuadruplet[VarManager::kPt1], fValuesQuadruplet[VarManager::kPt2], dilepton.sign(), t1.sign() + t2.sign()); if (fIsUnlikeSignDilepton) { if (fIsUnlikeSignDitrack) { fHistMan->FillHistClass(Form("QuadrupletSEUSUS_%s_%s_%s", fDileptonCut.GetName(), fDitrackCut.GetName(), (*cutname).Data()), fValuesQuadruplet); - XTable(fValuesQuadruplet[VarManager::kQuadMass], fValuesQuadruplet[VarManager::kQuadPt], fValuesQuadruplet[VarManager::kRap], fValuesQuadruplet[VarManager::kQuadEta], fValuesQuadruplet[VarManager::kPairMass], fValuesQuadruplet[VarManager::kDitrackMass], fValuesQuadruplet[VarManager::kPairPt], fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], fValuesQuadruplet[VarManager::kCosthetaDileptonDitrack], fValuesQuadruplet[VarManager::kTrackDCAxy], fValuesQuadruplet[VarManager::kTrackDCAz]); - } else { fHistMan->FillHistClass(Form("QuadrupletSEUSLS_%s_%s_%s", fDileptonCut.GetName(), fDitrackCut.GetName(), (*cutname).Data()), fValuesQuadruplet); } From 32b48ad02831fc7c697faf8ed63a944dce92140e Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Wed, 24 Jul 2024 05:43:58 -0300 Subject: [PATCH 19/31] Update VarManager.h --- PWGDQ/Core/VarManager.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index bbd70b985be..bbc86e6e014 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -430,7 +430,11 @@ class VarManager : public TObject kTOFbeta, kTrackLength, kTrackDCAxy, + kTrackDCAxyProng1, + kTrackDCAxyProng2, kTrackDCAz, + kTrackDCAzProng1, + kTrackDCAzProng2, kTrackDCAsigXY, kTrackDCAsigZ, kTrackDCAresXY, @@ -4057,9 +4061,13 @@ void VarManager::FillDileptonTrackTrack(T1 const& dilepton, T2 const& hadron1, T values[kQuadEta] = v123.Eta(); values[kQuadPhi] = v123.Phi(); - values[kTrackDCAxy] = hadron1.dcaXY(); - values[kTrackDCAz] = hadron1.dcaZ(); - values[kPt] = hadron1.pt(); + values[kTrackDCAxyProng1] = hadron1.dcaXY(); + values[kTrackDCAzProng1] = hadron1.dcaZ(); + values[kPt1] = hadron1.pt(); + + values[kTrackDCAxyProng2] = hadron2.dcaXY(); + values[kTrackDCAzProng2] = hadron2.dcaZ(); + values[kPt2] = hadron2.pt(); if (fgUsedVars[kCosthetaDileptonDitrack] || fgUsedVars[kPairMass] || fgUsedVars[kPairPt] || fgUsedVars[kDitrackPt] || fgUsedVars[kDitrackMass] || fgUsedVars[kQ] || fgUsedVars[kDeltaR1] || fgUsedVars[kDeltaR2] || fgUsedVars[kRap]) { ROOT::Math::PtEtaPhiMVector v23 = v2 + v3; From 8c310cc21aeffaeabcca078d0b22080c5c238cdf Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 24 Jul 2024 08:44:27 +0000 Subject: [PATCH 20/31] Please consider the following formatting changes --- PWGDQ/Core/VarManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index bbc86e6e014..6d0d728c803 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -4064,7 +4064,7 @@ void VarManager::FillDileptonTrackTrack(T1 const& dilepton, T2 const& hadron1, T values[kTrackDCAxyProng1] = hadron1.dcaXY(); values[kTrackDCAzProng1] = hadron1.dcaZ(); values[kPt1] = hadron1.pt(); - + values[kTrackDCAxyProng2] = hadron2.dcaXY(); values[kTrackDCAzProng2] = hadron2.dcaZ(); values[kPt2] = hadron2.pt(); From 1739fed1e3d6112103dace6fa5b2caa51a27d921 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Mon, 20 Jan 2025 16:28:44 +0100 Subject: [PATCH 21/31] [PWGDQ] X(3872) MC Signal --- PWGDQ/Core/MCSignalLibrary.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PWGDQ/Core/MCSignalLibrary.cxx b/PWGDQ/Core/MCSignalLibrary.cxx index 98b907391b9..c361ce96dc2 100644 --- a/PWGDQ/Core/MCSignalLibrary.cxx +++ b/PWGDQ/Core/MCSignalLibrary.cxx @@ -1484,6 +1484,12 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) //-------------------------------------------------------------------------------- + if (!nameStr.compare("X3872")) { + MCProng prong(1, {9920443}, {true}, {false}, {0}, {0}, {false}); + signal = new MCSignal(name, "Inclusive X(3872)", {prong}, {-1}); + return signal; + } + if (!nameStr.compare("JpsiFromX3872")) { MCProng prong(1, {443}, {true}, {false}, {0}, {0}, {false}, false, {9920443}, {false}); signal = new MCSignal(name, "Jpsi from X3872", {prong}, {-1}); From 6607d63e961b2dc23ac03be599cfd99f5af524b7 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 20 Jan 2025 15:32:53 +0000 Subject: [PATCH 22/31] Please consider the following formatting changes --- PWGDQ/Core/MCSignalLibrary.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Core/MCSignalLibrary.cxx b/PWGDQ/Core/MCSignalLibrary.cxx index c361ce96dc2..54706dd786f 100644 --- a/PWGDQ/Core/MCSignalLibrary.cxx +++ b/PWGDQ/Core/MCSignalLibrary.cxx @@ -1489,7 +1489,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) signal = new MCSignal(name, "Inclusive X(3872)", {prong}, {-1}); return signal; } - + if (!nameStr.compare("JpsiFromX3872")) { MCProng prong(1, {443}, {true}, {false}, {0}, {0}, {false}, false, {9920443}, {false}); signal = new MCSignal(name, "Jpsi from X3872", {prong}, {-1}); From d27516c8393ce131a0d947632df39be7bae70400 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:26:48 +0100 Subject: [PATCH 23/31] Update VarManager.h Fix Delta R variable. --- PWGDQ/Core/VarManager.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index 4691eb63d90..a18b732848e 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -38,6 +38,7 @@ #include "Math/Vector4D.h" #include "Math/Vector3D.h" #include "Math/GenVector/Boost.h" +#include "Math/VectorUtil.h" #include "Framework/DataTypes.h" #include "TGeoGlobalMagField.h" @@ -749,6 +750,7 @@ class VarManager : public TObject kQ, kDeltaR1, kDeltaR2, + kDeltaR, // DQ-HF correlation variables kMassCharmHadron, @@ -4602,8 +4604,9 @@ void VarManager::FillDileptonTrackTrack(T1 const& dilepton, T2 const& hadron1, T values[kDitrackPt] = v23.Pt(); values[kCosthetaDileptonDitrack] = (v1.Px() * v123.Px() + v1.Py() * v123.Py() + v1.Pz() * v123.Pz()) / (v1.P() * v123.P()); values[kQ] = v123.M() - defaultDileptonMass - v23.M(); - values[kDeltaR1] = sqrt(pow(v1.Eta() - v2.Eta(), 2) + pow(v1.Phi() - v2.Phi(), 2)); - values[kDeltaR2] = sqrt(pow(v1.Eta() - v3.Eta(), 2) + pow(v1.Phi() - v3.Phi(), 2)); + values[kDeltaR1] = ROOT::Math::VectorUtil::DeltaR(v1, v2); + values[kDeltaR2] = ROOT::Math::VectorUtil::DeltaR(v1, v3); + values[kDeltaR] = sqrt(pow(values[kDeltaR1], 2) + pow(values[kDeltaR2], 2)); values[kRap] = v123.Rapidity(); } } @@ -4636,8 +4639,9 @@ void VarManager::FillQaudMC(T1 const& dilepton, T2 const& track1, T2 const& trac values[kQuadEta] = v123.Eta(); values[kQuadPhi] = v123.Phi(); values[kQ] = v123.M() - defaultDileptonMass - v23.M(); - values[kDeltaR1] = sqrt(pow(v1.Eta() - v2.Eta(), 2) + pow(v1.Phi() - v2.Phi(), 2)); - values[kDeltaR2] = sqrt(pow(v1.Eta() - v3.Eta(), 2) + pow(v1.Phi() - v3.Phi(), 2)); + values[kDeltaR1] = ROOT::Math::VectorUtil::DeltaR(v1, v2); + values[kDeltaR2] = ROOT::Math::VectorUtil::DeltaR(v1, v3); + values[kDeltaR] = sqrt(pow(values[kDeltaR1], 2) + pow(values[kDeltaR2], 2)); values[kDitrackMass] = v23.M(); values[kDitrackPt] = v23.Pt(); } From 51c21eabba48b329a5201616f925f47ce031b292 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:56:06 +0100 Subject: [PATCH 24/31] Update CutsLibrary.cxx New cuts for the X(3872) exotic particle --- PWGDQ/Core/CutsLibrary.cxx | 76 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index d920ab2fe42..fcc4dd36536 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -379,6 +379,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } + if (!nameStr.compare("JpsiPWGSkimmedCuts5")) { + cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed3")); + cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug8")); + return cut; + } + + if (!nameStr.compare("pidElectron_ionut")) { cut->AddCut(GetAnalysisCut("pidcalib_ele")); cut->AddCut(GetAnalysisCut("jpsiStandardKine3")); @@ -493,6 +500,12 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } + if (!nameStr.compare("pionPIDCut2")) { + cut->AddCut(GetAnalysisCut("pionQualityCut2")); + cut->AddCut(GetAnalysisCut("pionPIDnsigma")); + return cut; + } + if (!nameStr.compare("PIDCalibElectron")) { cut->AddCut(GetAnalysisCut("pidcalib_ele")); return cut; @@ -3296,6 +3309,11 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } + if (!nameStr.compare("pairJpsi3")) { + cut->AddCut(GetAnalysisCut("pairJpsi3")); + return cut; + } + if (!nameStr.compare("pairPsi2S")) { cut->AddCut(GetAnalysisCut("pairPsi2S")); return cut; @@ -3311,11 +3329,26 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } + if (!nameStr.compare("pairX3872Cut2")) { + cut->AddCut(GetAnalysisCut("pairX3872_2")); + return cut; + } + + if (!nameStr.compare("pairX3872Cut3")) { + cut->AddCut(GetAnalysisCut("pairX3872_3")); + return cut; + } + if (!nameStr.compare("DipionPairCut1")) { cut->AddCut(GetAnalysisCut("DipionMassCut1")); return cut; } + if (!nameStr.compare("DipionPairCut2")) { + cut->AddCut(GetAnalysisCut("DipionMassCut2")); + return cut; + } + if (!nameStr.compare("pairRapidityForward")) { cut->AddCut(GetAnalysisCut("pairRapidityForward")); return cut; @@ -4478,6 +4511,15 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } + if (!nameStr.compare("electronTrackQualitySkimmed3")) { + cut->AddCut(VarManager::kPt, 1.0, 1000.0); + cut->AddCut(VarManager::kEta, -0.9, 0.9); + cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); + cut->AddCut(VarManager::kTPCnclsCR, 70, 161); + cut->AddCut(VarManager::kTPCncls, 70, 161); + return cut; + } + if (!nameStr.compare("pionQualityCut1")) { cut->AddCut(VarManager::kPt, 0.15, 1000.0); cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); @@ -4485,6 +4527,14 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } + if (!nameStr.compare("pionQualityCut2")) { + cut->AddCut(VarManager::kPt, 0.15, 1000.0); + cut->AddCut(VarManager::kEta, -0.9, 0.9); + cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); + cut->AddCut(VarManager::kTPCncls, 90, 161); + cut->AddCut(VarManager::kTPCnclsCR, 70, 161); + return cut; + if (!nameStr.compare("pidbasic")) { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCncls, 60, 161.); @@ -6129,6 +6179,11 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } + if (!nameStr.compare("DipionMassCut2")) { + cut->AddCut(VarManager::kMass, 0.0, 1.0); + return cut; + } + if (!nameStr.compare("pairMassLow1")) { cut->AddCut(VarManager::kMass, 1.0, 1000.0); return cut; @@ -6229,6 +6284,11 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } + if (!nameStr.compare("pairJpsi3")) { + cut->AddCut(VarManager::kMass, 2.92, 3.14); + return cut; + } + if (!nameStr.compare("pairPsi2S")) { cut->AddCut(VarManager::kMass, 3.4, 3.9); return cut; @@ -6244,6 +6304,22 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } + if (!nameStr.compare("pairX3872_2")) { + cut->AddCut(VarManager::kQuadDefaultDileptonMass, 3.0, 5.0); + cut->AddCut(VarManager::kQ, 0.0, 0.5); + cut->AddCut(VarManager::kDeltaR, 0.0, 5.0); + cut->AddCut(VarManager::kQuadPt, 5.0, 40.0); + return cut; + } + + if (!nameStr.compare("pairX3872_3")) { + cut->AddCut(VarManager::kQuadDefaultDileptonMass, 3.0, 5.0); + cut->AddCut(VarManager::kQ, 0.0, 0.5); + cut->AddCut(VarManager::kDeltaR, 0.0, 5.0); + cut->AddCut(VarManager::kQuadPt, 0.0, 1000.0); + return cut; + } + if (!nameStr.compare("pairPtLow1")) { cut->AddCut(VarManager::kPt, 2.0, 1000.0); return cut; From 29743b4312f076a61f8786dd474ebab89fefc99a Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:00:28 +0100 Subject: [PATCH 25/31] Update HistogramsLibrary.cxx Add Delta R histo --- PWGDQ/Core/HistogramsLibrary.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index 3c1030b6b69..5840a18b546 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -870,6 +870,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "hQ", "", false, 150, 0.0, 3.0, VarManager::kQ); hm->AddHistogram(histClass, "hDeltaR1", "", false, 100, 0.0, 10.0, VarManager::kDeltaR1); hm->AddHistogram(histClass, "hDeltaR2", "", false, 100, 0.0, 10.0, VarManager::kDeltaR2); + hm->AddHistogram(histClass, "hDeltaR", "", false, 100, 0.0, 10.0, VarManager::kDeltaR); hm->AddHistogram(histClass, "hDiTrackMass", "", false, 300, 0.0, 3.0, VarManager::kDitrackMass); hm->AddHistogram(histClass, "hMCPt_MCRap", "", false, 200, 0.0, 20.0, VarManager::kMCPt, 100, -2.0, 2.0, VarManager::kMCY); hm->AddHistogram(histClass, "hMCPhi", "", false, 100, -TMath::Pi(), TMath::Pi(), VarManager::kMCPhi); @@ -1586,6 +1587,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "hQ_X3872", "", false, 150, 0.0, 3.0, VarManager::kQ); hm->AddHistogram(histClass, "hDeltaR1_X3872", "", false, 100, 0.0, 10.0, VarManager::kDeltaR1); hm->AddHistogram(histClass, "hDeltaR2_X3872", "", false, 100, 0.0, 10.0, VarManager::kDeltaR2); + hm->AddHistogram(histClass, "hDeltaR_X3872", "", false, 100, 0.0, 10.0, VarManager::kDeltaR); hm->AddHistogram(histClass, "hMass_Q_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 150, 0.0, 3.0, VarManager::kQ); hm->AddHistogram(histClass, "hMass_defaultDileptonMass_Q_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 150, 0.0, 3.0, VarManager::kQ); hm->AddHistogram(histClass, "hMass_DeltaR1_X3872", "", false, 100, 3.0, 5.0, VarManager::kQuadMass, 100, 0.0, 10.0, VarManager::kDeltaR1); From c40eda73f1635aac1567a296d2f0de7c0e288e27 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:04:00 +0100 Subject: [PATCH 26/31] Update ReducedInfoTables.h Add Delta R in X(3872) table --- PWGDQ/DataModel/ReducedInfoTables.h | 1 + 1 file changed, 1 insertion(+) diff --git a/PWGDQ/DataModel/ReducedInfoTables.h b/PWGDQ/DataModel/ReducedInfoTables.h index 86e38033136..832564f7c2f 100644 --- a/PWGDQ/DataModel/ReducedInfoTables.h +++ b/PWGDQ/DataModel/ReducedInfoTables.h @@ -935,6 +935,7 @@ DECLARE_SOA_TABLE(DileptonTrackTrackCandidates, "AOD", "RTDQUADPLET", //! dileptonTrackTrackCandidate::DeltaQ, dileptonTrackTrackCandidate::R1, dileptonTrackTrackCandidate::R2, + dileptonTrackTrackCandidate::R, dileptonTrackTrackCandidate::DileptonMass, dileptonTrackTrackCandidate::DileptonPt, dileptonTrackTrackCandidate::DileptonEta, From 7e6430bf6c10a4b3c8a36ef7de7af638490cfa5f Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:08:35 +0100 Subject: [PATCH 27/31] Update dqEfficiency.cxx Add Delta R in X(3872) table --- PWGDQ/Tasks/dqEfficiency.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Tasks/dqEfficiency.cxx b/PWGDQ/Tasks/dqEfficiency.cxx index 8532525b834..ffa3835c119 100644 --- a/PWGDQ/Tasks/dqEfficiency.cxx +++ b/PWGDQ/Tasks/dqEfficiency.cxx @@ -1552,7 +1552,7 @@ struct AnalysisDileptonTrackTrack { if (!mcDecision) continue; DileptonTrackTrackTable(fValuesQuadruplet[VarManager::kQuadMass], fValuesQuadruplet[VarManager::kQuadPt], fValuesQuadruplet[VarManager::kQuadEta], fValuesQuadruplet[VarManager::kQuadPhi], fValuesQuadruplet[VarManager::kRap], - fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], + fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], fValuesQuadruplet[VarManager::kDeltaR], dilepton.mass(), dilepton.pt(), dilepton.eta(), dilepton.phi(), dilepton.sign(), fValuesQuadruplet[VarManager::kDitrackMass], fValuesQuadruplet[VarManager::kDitrackPt], t1.pt(), t2.pt(), t1.eta(), t2.eta(), t1.phi(), t2.phi(), t1.sign(), t2.sign()); } // end loop over track - track combinations From c5ea2e95c74925cebacb669098364275bde0a9aa Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:34:12 +0100 Subject: [PATCH 28/31] Update tableReader.cxx Add Delta R --- PWGDQ/Tasks/tableReader.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGDQ/Tasks/tableReader.cxx b/PWGDQ/Tasks/tableReader.cxx index 18cad5df7aa..058a45756f4 100644 --- a/PWGDQ/Tasks/tableReader.cxx +++ b/PWGDQ/Tasks/tableReader.cxx @@ -1987,7 +1987,7 @@ struct AnalysisDileptonTrackTrack { if (!CutDecision) continue; DileptonTrackTrackTable(fValuesQuadruplet[VarManager::kQuadMass], fValuesQuadruplet[VarManager::kQuadPt], fValuesQuadruplet[VarManager::kQuadEta], fValuesQuadruplet[VarManager::kQuadPhi], fValuesQuadruplet[VarManager::kRap], - fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], + fValuesQuadruplet[VarManager::kQ], fValuesQuadruplet[VarManager::kDeltaR1], fValuesQuadruplet[VarManager::kDeltaR2], fValuesQuadruplet[VarManager::kDeltaR], dilepton.mass(), dilepton.pt(), dilepton.eta(), dilepton.phi(), dilepton.sign(), fValuesQuadruplet[VarManager::kDitrackMass], fValuesQuadruplet[VarManager::kDitrackPt], t1.pt(), t2.pt(), t1.eta(), t2.eta(), t1.phi(), t2.phi(), t1.sign(), t2.sign()); } // end loop over track-track pairs From 9da427d81344a7c0705db0f863a1f551e388ed34 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Fri, 31 Jan 2025 13:50:29 +0100 Subject: [PATCH 29/31] Update ReducedInfoTables.h Declare R Column --- PWGDQ/DataModel/ReducedInfoTables.h | 1 + 1 file changed, 1 insertion(+) diff --git a/PWGDQ/DataModel/ReducedInfoTables.h b/PWGDQ/DataModel/ReducedInfoTables.h index 832564f7c2f..7986332b76a 100644 --- a/PWGDQ/DataModel/ReducedInfoTables.h +++ b/PWGDQ/DataModel/ReducedInfoTables.h @@ -909,6 +909,7 @@ DECLARE_SOA_COLUMN(Rap, rap, float); //! DECLARE_SOA_COLUMN(DeltaQ, deltaQ, float); //! DECLARE_SOA_COLUMN(R1, r1, float); //! distance between the dilepton and the track1 in theta-phi plane DECLARE_SOA_COLUMN(R2, r2, float); //! distance between the dilepton and the track2 in theta-phi plane +DECLARE_SOA_COLUMN(R, r, float); //! DECLARE_SOA_COLUMN(DileptonMass, dileptonMass, float); //! DECLARE_SOA_COLUMN(DileptonPt, dileptonPt, float); //! DECLARE_SOA_COLUMN(DileptonEta, dileptonEta, float); //! From 41c48a931bd2ec72eb18ddb5a008eaf8cf59f702 Mon Sep 17 00:00:00 2001 From: labranch94 <76623894+labranch94@users.noreply.github.com> Date: Fri, 31 Jan 2025 14:09:56 +0100 Subject: [PATCH 30/31] Update CutsLibrary.cxx Fix a typo --- PWGDQ/Core/CutsLibrary.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index fcc4dd36536..5e737b40249 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -4534,6 +4534,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kTPCncls, 90, 161); cut->AddCut(VarManager::kTPCnclsCR, 70, 161); return cut; + } if (!nameStr.compare("pidbasic")) { cut->AddCut(VarManager::kEta, -0.9, 0.9); From 60a64ff22fa376f0a4403d5d110bcbf0cf9c9009 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 3 Feb 2025 11:46:56 +0000 Subject: [PATCH 31/31] Please consider the following formatting changes --- PWGDQ/Core/CutsLibrary.cxx | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 25412371dcd..c1bae7da26c 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -389,7 +389,6 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("pidElectron_ionut")) { cut->AddCut(GetAnalysisCut("pidcalib_ele")); cut->AddCut(GetAnalysisCut("jpsiStandardKine3")); @@ -509,7 +508,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("pionPIDnsigma")); return cut; } - + if (!nameStr.compare("PIDCalibElectron")) { cut->AddCut(GetAnalysisCut("pidcalib_ele")); return cut; @@ -3317,7 +3316,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("pairJpsi3")); return cut; } - + if (!nameStr.compare("pairPsi2S")) { cut->AddCut(GetAnalysisCut("pairPsi2S")); return cut; @@ -3342,7 +3341,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("pairX3872_3")); return cut; } - + if (!nameStr.compare("DipionPairCut1")) { cut->AddCut(GetAnalysisCut("DipionMassCut1")); return cut; @@ -3352,7 +3351,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("DipionMassCut2")); return cut; } - + if (!nameStr.compare("pairRapidityForward")) { cut->AddCut(GetAnalysisCut("pairRapidityForward")); return cut; @@ -4523,7 +4522,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kTPCncls, 70, 161); return cut; } - + if (!nameStr.compare("pionQualityCut1")) { cut->AddCut(VarManager::kPt, 0.15, 1000.0); cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); @@ -4539,7 +4538,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kTPCnclsCR, 70, 161); return cut; } - + if (!nameStr.compare("pidbasic")) { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCncls, 60, 161.); @@ -6188,7 +6187,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kMass, 0.0, 1.0); return cut; } - + if (!nameStr.compare("pairMassLow1")) { cut->AddCut(VarManager::kMass, 1.0, 1000.0); return cut; @@ -6293,7 +6292,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kMass, 2.92, 3.14); return cut; } - + if (!nameStr.compare("pairPsi2S")) { cut->AddCut(VarManager::kMass, 3.4, 3.9); return cut; @@ -6315,7 +6314,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kDeltaR, 0.0, 5.0); cut->AddCut(VarManager::kQuadPt, 5.0, 40.0); return cut; - } + } if (!nameStr.compare("pairX3872_3")) { cut->AddCut(VarManager::kQuadDefaultDileptonMass, 3.0, 5.0); @@ -6323,7 +6322,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) cut->AddCut(VarManager::kDeltaR, 0.0, 5.0); cut->AddCut(VarManager::kQuadPt, 0.0, 1000.0); return cut; - } + } if (!nameStr.compare("pairPtLow1")) { cut->AddCut(VarManager::kPt, 2.0, 1000.0);