Skip to content

Commit 4c439a9

Browse files
vfeuillavfeuilla
authored
Small changes to some cuts (ren-labelling, adjustement of variables...) (#4128)
Cleanup of unused cuts
1 parent 035cce5 commit 4c439a9

File tree

1 file changed

+74
-105
lines changed

1 file changed

+74
-105
lines changed

‎PWGDQ/Core/CutsLibrary.cxx‎

Lines changed: 74 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,53 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
2828
// These are the Cuts used in the CEFP Task //
2929
// to select tracks in the event selection //
3030
// ///////////////////////////////////////////////
31-
if (!nameStr.compare("Electron")) {
31+
if (!nameStr.compare("Electron2022")) {
3232
cut->AddCut(GetAnalysisCut("jpsiStandardKine"));
3333
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
3434
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug5"));
3535
return cut;
3636
}
37-
if (!nameStr.compare("ElectronTight")) {
38-
cut->AddCut(GetAnalysisCut("jpsiStandardKine3"));
37+
if (!nameStr.compare("Electron2023")) {
38+
cut->AddCut(GetAnalysisCut("jpsiStandardKine4"));
3939
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
40-
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug1"));
40+
cut->AddCut(GetAnalysisCut("pidCut_lowP_Corr"));
41+
42+
AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE);
43+
pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP_Corr"));
44+
pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP_Corr"));
45+
cut->AddCut(pidCut_highP);
46+
return cut;
47+
}
48+
if (!nameStr.compare("Electron2023_Tight")) {
49+
cut->AddCut(GetAnalysisCut("jpsiStandardKine4"));
50+
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
51+
cut->AddCut(GetAnalysisCut("pidCut_lowP_Corr"));
52+
53+
AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE);
54+
pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP2_Corr"));
55+
pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP_Corr"));
56+
cut->AddCut(pidCut_highP);
4157
return cut;
4258
}
43-
if (!nameStr.compare("MuonLow")) {
59+
if (!nameStr.compare("MuonLow2022")) {
60+
cut->AddCut(GetAnalysisCut("muonLowPt2"));
61+
cut->AddCut(GetAnalysisCut("muonQualityCuts"));
62+
return cut;
63+
}
64+
if (!nameStr.compare("MuonLow2023")) {
4465
cut->AddCut(GetAnalysisCut("muonLowPt2"));
4566
cut->AddCut(GetAnalysisCut("muonQualityCuts"));
4667
cut->AddCut(GetAnalysisCut("MCHMID"));
4768
return cut;
4869
}
49-
if (!nameStr.compare("MuonHigh")) {
70+
if (!nameStr.compare("MuonHigh2022")) {
5071
cut->AddCut(GetAnalysisCut("muonHighPt2"));
5172
cut->AddCut(GetAnalysisCut("muonQualityCuts"));
73+
return cut;
74+
}
75+
if (!nameStr.compare("MuonHigh2023")) {
76+
cut->AddCut(GetAnalysisCut("muonHighPt6"));
77+
cut->AddCut(GetAnalysisCut("muonQualityCuts"));
5278
cut->AddCut(GetAnalysisCut("MCHMID"));
5379
return cut;
5480
}
@@ -214,95 +240,53 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName)
214240
cut->AddCut(GetAnalysisCut("electronPIDnsigmaVeryLoose")); // with 3 sigma El TOF
215241
return cut;
216242
}
217-
//
218-
// New cuts to test for jpsi2ee electron selection (potentially not useful)
219-
//
220-
// With pT > 1.0 GeV/c as primary cut
221-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_1")) {
222-
cut->AddCut(GetAnalysisCut("jpsiStandardKine"));
223-
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
224-
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TEST_1")); // Loose pion rejection at high p with no correction maps
225-
226-
return cut;
227-
}
228-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_1_Corr")) {
229-
cut->AddCut(GetAnalysisCut("jpsiStandardKine"));
230-
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
231-
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TEST_1_Corr")); // Loose pion rejection at high p with correction maps
232-
233-
return cut;
234-
}
235-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_2")) {
236-
cut->AddCut(GetAnalysisCut("jpsiStandardKine"));
237-
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
238-
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TEST_2")); // No pion rejection at high p and asymmetrical e selection with no correction maps
239-
240-
return cut;
241-
}
242-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_2_Corr")) {
243-
cut->AddCut(GetAnalysisCut("jpsiStandardKine"));
244-
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
245-
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TEST_2_Corr")); // No pion rejection at high p and asymmetrical e selection with correction maps
246243

247-
return cut;
248-
}
249-
250-
// With p > 1.5 GeV/c as primary cut
251-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_3")) {
244+
if (!nameStr.compare("jpsiO2MCdebugCuts_Pdependent_Corr")) {
252245
cut->AddCut(GetAnalysisCut("jpsiStandardKine4"));
253246
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
254-
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TEST_1")); // Loose pion rejection at high p with no correction maps
247+
cut->AddCut(GetAnalysisCut("pidCut_lowP_Corr"));
255248

249+
AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE);
250+
pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP_Corr"));
251+
pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP_Corr"));
252+
cut->AddCut(pidCut_highP);
256253
return cut;
257254
}
258-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_3_Corr")) {
259-
cut->AddCut(GetAnalysisCut("jpsiStandardKine4"));
260-
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
261-
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TEST_1_Corr")); // Loose pion rejection at high p with correction maps
262255

263-
return cut;
264-
}
265-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_4")) {
256+
if (!nameStr.compare("jpsiO2MCdebugCuts_Pdependent")) {
266257
cut->AddCut(GetAnalysisCut("jpsiStandardKine4"));
267258
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
268-
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TEST_2")); // No pion rejection at high p and asymmetrical e selection with no correction maps
259+
cut->AddCut(GetAnalysisCut("pidCut_lowP"));
269260

261+
AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE);
262+
pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP"));
263+
pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP"));
264+
cut->AddCut(pidCut_highP);
270265
return cut;
271266
}
272-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_4_Corr")) {
267+
if (!nameStr.compare("jpsiO2MCdebugCuts_Pdependent2_Corr")) {
273268
cut->AddCut(GetAnalysisCut("jpsiStandardKine4"));
274269
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
275-
cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TEST_2_Corr")); // No pion rejection at high p and asymmetrical e selection with correction maps
276-
277-
return cut;
278-
}
279-
280-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_6_Corr")) {
281-
cut->AddCut(GetAnalysisCut("jpsiStandardKine"));
282-
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
283-
cut->AddCut(GetAnalysisCut("pidCut_lowP"));
270+
cut->AddCut(GetAnalysisCut("pidCut_lowP_Corr"));
284271

285272
AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE);
286-
pidCut_highP->AddCut(GetAnalysisCut("MySpecial_EleInclusion"));
287-
pidCut_highP->AddCut(GetAnalysisCut("MySpecial_PionExclusion"));
273+
pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP2_Corr"));
274+
pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP_Corr"));
288275
cut->AddCut(pidCut_highP);
289276
return cut;
290277
}
291278

292-
if (!nameStr.compare("jpsiO2MCdebugCuts_TEST_5_Corr")) {
279+
if (!nameStr.compare("jpsiO2MCdebugCuts_Pdependent2")) {
293280
cut->AddCut(GetAnalysisCut("jpsiStandardKine4"));
294281
cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug"));
295282
cut->AddCut(GetAnalysisCut("pidCut_lowP"));
296283

297284
AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE);
298-
pidCut_highP->AddCut(GetAnalysisCut("MySpecial_EleInclusion"));
299-
pidCut_highP->AddCut(GetAnalysisCut("MySpecial_PionExclusion"));
285+
pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP2"));
286+
pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP"));
300287
cut->AddCut(pidCut_highP);
301288
return cut;
302289
}
303-
//
304-
// end new test cuts
305-
//
306290

307291
if (!nameStr.compare("JpsiPWGSkimmedCuts1")) { // please do not remove or modify, this is used for the common Skimmed tree production, (Xiaozhi Bai)
308292
cut->AddCut(GetAnalysisCut("jpsiKineSkimmed"));
@@ -2921,60 +2905,45 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName)
29212905
cut->AddCut(VarManager::kTPCnSigmaPr, 3.5, 999);
29222906
return cut;
29232907
}
2924-
//
2925-
// New test for jpsi2ee PID selection
2926-
//
2927-
if (!nameStr.compare("jpsi_TPCPID_TEST_1_Corr")) {
2928-
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0);
2929-
cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2930-
cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 2.0, 999, false, VarManager::kP, 4.0, 999);
2931-
cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2932-
cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 2.0, 999, false, VarManager::kP, 4.0, 999);
2908+
2909+
if (!nameStr.compare("pidCut_lowP_Corr")) {
2910+
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0, false, VarManager::kP, 0.0, 5.0);
2911+
cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 3.0, 999, false, VarManager::kP, 0.0, 5.0);
2912+
cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 2.5, 999, false, VarManager::kP, 0.0, 5.0);
29332913
return cut;
29342914
}
2935-
if (!nameStr.compare("jpsi_TPCPID_TEST_1")) {
2936-
cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0);
2937-
cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2938-
cut->AddCut(VarManager::kTPCnSigmaPi, 2.0, 999, false, VarManager::kP, 4.0, 999);
2939-
cut->AddCut(VarManager::kTPCnSigmaPr, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2940-
cut->AddCut(VarManager::kTPCnSigmaPr, 2.0, 999, false, VarManager::kP, 4.0, 999);
2915+
2916+
if (!nameStr.compare("EleInclusion_highP_Corr")) {
2917+
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -1.0, 4.0, false, VarManager::kP, 5.0, 999.0);
29412918
return cut;
29422919
}
2943-
if (!nameStr.compare("jpsi_TPCPID_TEST_2_Corr")) {
2944-
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0, false, VarManager::kP, 0.0, 4.0);
2945-
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -1.0, 4.0, false, VarManager::kP, 4.0, 999);
2946-
cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2947-
cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 2.0, 999, false, VarManager::kP, 4.0, 999);
2948-
cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2949-
cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 2.0, 999, false, VarManager::kP, 4.0, 999);
2920+
if (!nameStr.compare("EleInclusion_highP2_Corr")) {
2921+
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -0.5, 4.0, false, VarManager::kP, 5.0, 999.0);
29502922
return cut;
29512923
}
2952-
if (!nameStr.compare("jpsi_TPCPID_TEST_2")) {
2953-
cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0, false, VarManager::kP, 0.0, 4.0);
2954-
cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 4.0, false, VarManager::kP, 4.0, 999.0);
2955-
cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2956-
cut->AddCut(VarManager::kTPCnSigmaPi, 0, 999, false, VarManager::kP, 4.0, 999);
2957-
cut->AddCut(VarManager::kTPCnSigmaPr, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2958-
cut->AddCut(VarManager::kTPCnSigmaPr, 0, 999, false, VarManager::kP, 4.0, 999);
2924+
if (!nameStr.compare("PionExclusion_highP_Corr")) {
2925+
cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 2.0, 999, false, VarManager::kP, 5.0, 999.0);
29592926
return cut;
29602927
}
2961-
29622928
if (!nameStr.compare("pidCut_lowP")) {
2963-
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0, false, VarManager::kP, 0.0, 4.0);
2964-
cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2965-
cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 3.0, 999, false, VarManager::kP, 0.0, 4.0);
2929+
cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0, false, VarManager::kP, 0.0, 5.0);
2930+
cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999, false, VarManager::kP, 0.0, 5.0);
2931+
cut->AddCut(VarManager::kTPCnSigmaPr, 2.5, 999, false, VarManager::kP, 0.0, 5.0);
29662932
return cut;
29672933
}
29682934

2969-
if (!nameStr.compare("MySpecial_EleInclusion")) {
2970-
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -1.0, 4.0, false, VarManager::kP, 4.0, 999.0);
2935+
if (!nameStr.compare("EleInclusion_highP")) {
2936+
cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 4.0, false, VarManager::kP, 5.0, 999.0);
2937+
return cut;
2938+
}
2939+
if (!nameStr.compare("EleInclusion_highP2")) {
2940+
cut->AddCut(VarManager::kTPCnSigmaEl, -0.5, 4.0, false, VarManager::kP, 5.0, 999.0);
29712941
return cut;
29722942
}
2973-
if (!nameStr.compare("MySpecial_PionExclusion")) {
2974-
cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 2.0, 999, false, VarManager::kP, 4.0, 999.0);
2943+
if (!nameStr.compare("PionExclusion_highP")) {
2944+
cut->AddCut(VarManager::kTPCnSigmaPi, 2.0, 999, false, VarManager::kP, 5.0, 999.0);
29752945
return cut;
29762946
}
2977-
// end of new tests cuts
29782947

29792948
if (!nameStr.compare("lmee_TPCPID_debug1")) {
29802949
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -5.0, 5.0);

0 commit comments

Comments
 (0)