From 81b609d25c6f53b970c046afcb0db1fb7b6136ee Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 10:35:39 +0200 Subject: [PATCH 01/11] readability-string-compare --- PWGDQ/Core/CutsLibrary.cxx | 1804 ++++++++++++++++++------------------ 1 file changed, 902 insertions(+), 902 deletions(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index a285fde2fca..98cc6a1e729 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -54,19 +54,19 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // // // see CutsLubrary.h for the description // // /////////////////////////////////////////////// - if (!nameStr.compare("Electron2022")) { + if (nameStr == "Electron2022") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug5")); return cut; } - if (!nameStr.compare("Electron2023")) { + if (nameStr == "Electron2023") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug5_noCorr")); return cut; } - if (!nameStr.compare("Electron2025_1")) { + if (nameStr == "Electron2025_1") { AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); @@ -89,7 +89,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("Electron2025_2")) { + if (nameStr == "Electron2025_2") { AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); @@ -112,7 +112,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("Electron2025_3")) { + if (nameStr == "Electron2025_3") { AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); @@ -134,7 +134,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("Electron2025_4")) { + if (nameStr == "Electron2025_4") { AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); @@ -157,7 +157,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("Electron2025_5")) { + if (nameStr == "Electron2025_5") { AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); @@ -180,7 +180,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("Electron2025_4_ldong")) { + if (nameStr == "Electron2025_4_ldong") { AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); @@ -208,41 +208,41 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("LowMassElectron2023")) { + if (nameStr == "LowMassElectron2023") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("LooseGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("lmee_pp_502TeV_TOFloose_pionrej")); return cut; } - if (!nameStr.compare("MuonLow2022")) { + if (nameStr == "MuonLow2022") { cut->AddCut(GetAnalysisCut("muonLowPt2")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("MuonHigh2022")) { + if (nameStr == "MuonHigh2022") { cut->AddCut(GetAnalysisCut("muonHighPt2")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("MuonLow2023")) { + if (nameStr == "MuonLow2023") { cut->AddCut(GetAnalysisCut("muonLowPt2")); cut->AddCut(GetAnalysisCut("muonQualityCuts10SigmaPDCA")); cut->AddCut(GetAnalysisCut("MCHMID")); return cut; } - if (!nameStr.compare("MuonHigh2023")) { + if (nameStr == "MuonHigh2023") { cut->AddCut(GetAnalysisCut("muonHighPt6")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); cut->AddCut(GetAnalysisCut("MCHMID")); return cut; } - if (!nameStr.compare("ElectronForEMu")) { + if (nameStr == "ElectronForEMu") { cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug4")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaLoose")); return cut; } - if (!nameStr.compare("MuonForEMu")) { + if (nameStr == "MuonForEMu") { cut->AddCut(GetAnalysisCut("muonLowPt5")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); cut->AddCut(GetAnalysisCut("MCHMID")); @@ -252,14 +252,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // End of Cuts for CEFP // // /////////////////////////////////////////////// - if (!nameStr.compare("jpsiO2MCdebugCuts")) { + if (nameStr == "jpsiO2MCdebugCuts") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPID1")); return cut; } - if (!nameStr.compare("jpsiBenchmarkCuts")) { + if (nameStr == "jpsiBenchmarkCuts") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityBenchmark")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -267,21 +267,21 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts2")) { + if (nameStr == "jpsiO2MCdebugCuts2") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigma")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts2_Corr")) { + if (nameStr == "jpsiO2MCdebugCuts2_Corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug2")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts2_prefiltered1")) { + if (nameStr == "jpsiO2MCdebugCuts2_prefiltered1") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigma")); @@ -289,47 +289,47 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts3")) { + if (nameStr == "jpsiO2MCdebugCuts3") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaMedium")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts4")) { + if (nameStr == "jpsiO2MCdebugCuts4") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaLoose")); return cut; } - if (!nameStr.compare("electronSelection1_ionut")) { + if (nameStr == "electronSelection1_ionut") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaMedium")); return cut; } - if (!nameStr.compare("jpsiKineDcaQualitynoPID")) { + if (nameStr == "jpsiKineDcaQualitynoPID") { cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); return cut; } - if (!nameStr.compare("jpsiKineDcaQualitynoPID2")) { + if (nameStr == "jpsiKineDcaQualitynoPID2") { cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug4")); return cut; } - if (!nameStr.compare("electronSelection1_ionut_withTOFPID")) { + if (nameStr == "electronSelection1_ionut_withTOFPID") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaMedium_withLargeTOFPID")); return cut; } - if (!nameStr.compare("electronSelection1_idstoreh")) { // same as electronSelection1_ionut, but with kIsSPDAny -> kIsITSibAny + if (nameStr == "electronSelection1_idstoreh") { // same as electronSelection1_ionut, but with kIsSPDAny -> kIsITSibAny cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug4")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); @@ -337,7 +337,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("electronSelection1pos_ionut")) { + if (nameStr == "electronSelection1pos_ionut") { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); @@ -345,7 +345,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronPIDnsigmaMedium")); return cut; } - if (!nameStr.compare("electronSelection1neg_ionut")) { + if (nameStr == "electronSelection1neg_ionut") { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); @@ -354,7 +354,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("electronSelection2_ionut")) { + if (nameStr == "electronSelection2_ionut") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); @@ -362,7 +362,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("insideTPCsector")); return cut; } - if (!nameStr.compare("electronSelection2pos_ionut")) { + if (nameStr == "electronSelection2pos_ionut") { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); @@ -371,7 +371,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("insideTPCsector")); return cut; } - if (!nameStr.compare("electronSelection2neg_ionut")) { + if (nameStr == "electronSelection2neg_ionut") { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); @@ -381,14 +381,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts4_Corr")) { + if (nameStr == "jpsiO2MCdebugCuts4_Corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug1")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts5")) { + if (nameStr == "jpsiO2MCdebugCuts5") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaVeryLoose")); @@ -396,7 +396,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts6")) { + if (nameStr == "jpsiO2MCdebugCuts6") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaVeryVeryLoose")); @@ -404,7 +404,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts7")) { + if (nameStr == "jpsiO2MCdebugCuts7") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaOpen")); @@ -412,7 +412,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts7_Corr")) { + if (nameStr == "jpsiO2MCdebugCuts7_Corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug5")); @@ -420,7 +420,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts7_noCorr")) { + if (nameStr == "jpsiO2MCdebugCuts7_noCorr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug5_noCorr")); @@ -428,7 +428,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts7_Corr_2")) { + if (nameStr == "jpsiO2MCdebugCuts7_Corr_2") { cut->AddCut(GetAnalysisCut("jpsiStandardKine2")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug5")); @@ -436,7 +436,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts7_Corr_3")) { + if (nameStr == "jpsiO2MCdebugCuts7_Corr_3") { cut->AddCut(GetAnalysisCut("jpsiStandardKine3")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug5")); @@ -444,28 +444,28 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts8")) { + if (nameStr == "jpsiO2MCdebugCuts8") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPID1shiftUp")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts9")) { + if (nameStr == "jpsiO2MCdebugCuts9") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPID1shiftDown")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts10_Corr")) { + if (nameStr == "jpsiO2MCdebugCuts10_Corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); // no cut on ITS clusters cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug2")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts10_Corr_Amb")) { + if (nameStr == "jpsiO2MCdebugCuts10_Corr_Amb") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); // no cut on ITS clusters cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug2")); @@ -473,21 +473,21 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts11_Corr")) { + if (nameStr == "jpsiO2MCdebugCuts11_Corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug3")); // cut on 1 ITS cluster cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug2")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts12")) { + if (nameStr == "jpsiO2MCdebugCuts12") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); // no cut on ITS clusters cut->AddCut(GetAnalysisCut("electronPIDnsigmaVeryLoose")); // with 3 sigma El TOF return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts_Pdependent_Corr")) { + if (nameStr == "jpsiO2MCdebugCuts_Pdependent_Corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine4")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("pidCut_lowP_Corr")); @@ -499,7 +499,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts_Pdependent")) { + if (nameStr == "jpsiO2MCdebugCuts_Pdependent") { cut->AddCut(GetAnalysisCut("jpsiStandardKine4")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("pidCut_lowP")); @@ -510,7 +510,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(pidCut_highP); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts_Pdependent2_Corr")) { + if (nameStr == "jpsiO2MCdebugCuts_Pdependent2_Corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine4")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("pidCut_lowP_Corr")); @@ -522,7 +522,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts_Pdependent2")) { + if (nameStr == "jpsiO2MCdebugCuts_Pdependent2") { cut->AddCut(GetAnalysisCut("jpsiStandardKine4")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("pidCut_lowP")); @@ -534,72 +534,72 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("JpsiPWGSkimmedCuts1")) { // please do not remove or modify, this is used for the common Skimmed tree production, (Xiaozhi Bai) + if (nameStr == "JpsiPWGSkimmedCuts1") { // please do not remove or modify, this is used for the common Skimmed tree production, (Xiaozhi Bai) cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed")); cut->AddCut(GetAnalysisCut("electronPIDLooseSkimmed")); return cut; } - if (!nameStr.compare("JpsiPWGSkimmedCuts1")) { // please do not remove or modify, this is used for the common Skimmed tree production, (Xiaozhi Bai) + if (nameStr == "JpsiPWGSkimmedCuts1") { // please do not remove or modify, this is used for the common Skimmed tree production, (Xiaozhi Bai) cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed")); cut->AddCut(GetAnalysisCut("electronPIDLooseSkimmed")); return cut; } - if (!nameStr.compare("JpsiPWGSkimmedCuts2")) { + if (nameStr == "JpsiPWGSkimmedCuts2") { cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed")); cut->AddCut(GetAnalysisCut("electronPIDLooseSkimmed2")); return cut; } - if (!nameStr.compare("JpsiPWGSkimmedCuts3")) { + if (nameStr == "JpsiPWGSkimmedCuts3") { cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed2")); cut->AddCut(GetAnalysisCut("electronPIDLooseSkimmed2")); return cut; } - if (!nameStr.compare("JpsiPWGSkimmedCuts4")) { + if (nameStr == "JpsiPWGSkimmedCuts4") { cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed2")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug9")); // loose cut return cut; } - if (!nameStr.compare("JpsiPWGSkimmedCuts5")) { + if (nameStr == "JpsiPWGSkimmedCuts5") { cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed3")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug8")); return cut; } - if (!nameStr.compare("pidElectron_ionut")) { + if (nameStr == "pidElectron_ionut") { cut->AddCut(GetAnalysisCut("pidcalib_ele")); cut->AddCut(GetAnalysisCut("jpsiStandardKine3")); return cut; } - if (!nameStr.compare("pidElectron_ionut_posEta")) { + if (nameStr == "pidElectron_ionut_posEta") { cut->AddCut(GetAnalysisCut("pidcalib_ele")); cut->AddCut(GetAnalysisCut("jpsiPIDcalibKine_posEta")); return cut; } - if (!nameStr.compare("pidElectron_ionut_negEta")) { + if (nameStr == "pidElectron_ionut_negEta") { cut->AddCut(GetAnalysisCut("pidcalib_ele")); cut->AddCut(GetAnalysisCut("jpsiPIDcalibKine_negEta")); return cut; } - if (!nameStr.compare("pidPion_ionut")) { + if (nameStr == "pidPion_ionut") { cut->AddCut(GetAnalysisCut("pidcalib_pion")); cut->AddCut(GetAnalysisCut("jpsiStandardKine3")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts13_Corr")) { + if (nameStr == "jpsiO2MCdebugCuts13_Corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); // no cut on ITS clusters cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug2")); @@ -607,14 +607,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts14")) { + if (nameStr == "jpsiO2MCdebugCuts14") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaSkewed")); return cut; } - if (!nameStr.compare("jpsiO2MCdebugCuts14andDCA")) { + if (nameStr == "jpsiO2MCdebugCuts14andDCA") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaSkewed")); @@ -622,14 +622,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("emu_electronCuts")) { + if (nameStr == "emu_electronCuts") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug4")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaSkewed")); return cut; } - if (!nameStr.compare("emu_electronCuts_tof")) { + if (nameStr == "emu_electronCuts_tof") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug4")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaSkewed")); @@ -637,14 +637,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("emu_electronCuts_tightTPC")) { + if (nameStr == "emu_electronCuts_tightTPC") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug4")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaSkewed_2")); return cut; } - if (!nameStr.compare("emu_electronCuts_tof_tightTPC")) { + if (nameStr == "emu_electronCuts_tof_tightTPC") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug4")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaSkewed_2")); @@ -652,14 +652,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiKineAndQuality")) { + if (nameStr == "jpsiKineAndQuality") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); return cut; } - if (!nameStr.compare("jpsiPID1")) { + if (nameStr == "jpsiPID1") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -667,7 +667,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiPID2")) { + if (nameStr == "jpsiPID2") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -675,7 +675,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiPIDnsigma")) { + if (nameStr == "jpsiPIDnsigma") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -683,44 +683,44 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("pionPIDCut1")) { + if (nameStr == "pionPIDCut1") { cut->AddCut(GetAnalysisCut("pionQualityCut1")); cut->AddCut(GetAnalysisCut("pionPIDnsigma")); return cut; } - if (!nameStr.compare("pionPIDCut2")) { + if (nameStr == "pionPIDCut2") { cut->AddCut(GetAnalysisCut("pionQualityCut2")); cut->AddCut(GetAnalysisCut("pionPIDnsigma")); return cut; } - if (!nameStr.compare("PIDCalibElectron")) { + if (nameStr == "PIDCalibElectron") { cut->AddCut(GetAnalysisCut("pidcalib_ele")); return cut; } - if (!nameStr.compare("PIDCalibPion")) { + if (nameStr == "PIDCalibPion") { cut->AddCut(GetAnalysisCut("pidcalib_pion")); return cut; } - if (!nameStr.compare("PIDCalibKaon")) { + if (nameStr == "PIDCalibKaon") { cut->AddCut(GetAnalysisCut("pidcalib_kaon")); return cut; } - if (!nameStr.compare("PIDCalibProton")) { + if (nameStr == "PIDCalibProton") { cut->AddCut(GetAnalysisCut("pidcalib_proton")); return cut; } - if (!nameStr.compare("PIDCalib_basic")) { + if (nameStr == "PIDCalib_basic") { cut->AddCut(GetAnalysisCut("pidbasic")); return cut; } - if (!nameStr.compare("PIDefficiency_wPID")) { + if (nameStr == "PIDefficiency_wPID") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -729,7 +729,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("PIDefficiency_woPID")) { + if (nameStr == "PIDefficiency_woPID") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -737,34 +737,34 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("highPtHadron")) { + if (nameStr == "highPtHadron") { cut->AddCut(GetAnalysisCut("highPtHadron")); return cut; } - if (!nameStr.compare("rho0Cuts")) { + if (nameStr == "rho0Cuts") { cut->AddCut(GetAnalysisCut("rho0Kine")); cut->AddCut(GetAnalysisCut("pionQuality")); cut->AddCut(GetAnalysisCut("pionPIDnsigma")); return cut; } - if (!nameStr.compare("rho0Kine")) { + if (nameStr == "rho0Kine") { cut->AddCut(GetAnalysisCut("rho0Kine")); return cut; } - if (!nameStr.compare("openEtaSel")) { + if (nameStr == "openEtaSel") { cut->AddCut(GetAnalysisCut("openEtaSel")); return cut; } - if (!nameStr.compare("hasTOF")) { + if (nameStr == "hasTOF") { cut->AddCut(GetAnalysisCut("hasTOF")); return cut; } - if (!nameStr.compare("singleGapTrackCuts1")) { + if (nameStr == "singleGapTrackCuts1") { cut->AddCut(GetAnalysisCut("muonLowPt")); cut->AddCut(GetAnalysisCut("SPDany")); cut->AddCut(GetAnalysisCut("openEtaSel")); @@ -772,7 +772,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("singleGapTrackCuts2")) { + if (nameStr == "singleGapTrackCuts2") { cut->AddCut(GetAnalysisCut("muonLowPt3")); cut->AddCut(GetAnalysisCut("ITSiball")); cut->AddCut(GetAnalysisCut("openEtaSel")); @@ -780,7 +780,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("singleGapTrackCuts3")) { + if (nameStr == "singleGapTrackCuts3") { cut->AddCut(GetAnalysisCut("PIDStandardKine2")); cut->AddCut(GetAnalysisCut("SPDany")); @@ -797,7 +797,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("singleGapTrackCuts4")) { + if (nameStr == "singleGapTrackCuts4") { cut->AddCut(GetAnalysisCut("PIDStandardKine2")); cut->AddCut(GetAnalysisCut("ITSibany")); @@ -814,7 +814,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("PIDCalib")) { + if (nameStr == "PIDCalib") { cut->AddCut(GetAnalysisCut("PIDStandardKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -822,50 +822,50 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("NoPID")) { + if (nameStr == "NoPID") { cut->AddCut(GetAnalysisCut("PIDStandardKine2")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly2")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); return cut; } - if (!nameStr.compare("KineCutOnly")) { + if (nameStr == "KineCutOnly") { cut->AddCut(GetAnalysisCut("PIDStandardKine")); // standard kine cuts usually are applied via Filter in the task return cut; } - if (!nameStr.compare("KineCutOnly2")) { + if (nameStr == "KineCutOnly2") { cut->AddCut(GetAnalysisCut("PIDStandardKine2")); // standard kine cuts usually are applied via Filter in the task return cut; } - if (!nameStr.compare("KineCutOnly3")) { + if (nameStr == "KineCutOnly3") { cut->AddCut(GetAnalysisCut("PIDStandardKine3")); // standard kine cuts usually are applied via Filter in the task return cut; } - if (!nameStr.compare("kaonPID")) { + if (nameStr == "kaonPID") { cut->AddCut(GetAnalysisCut("PIDStandardKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("kaonPIDnsigma")); return cut; } - if (!nameStr.compare("kaonPID2")) { + if (nameStr == "kaonPID2") { cut->AddCut(GetAnalysisCut("PIDStandardKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("kaonPIDnsigma2")); return cut; } - if (!nameStr.compare("kaonPID3")) { + if (nameStr == "kaonPID3") { cut->AddCut(GetAnalysisCut("AssocKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); return cut; } - if (!nameStr.compare("kaonPID3_withDCA")) { // same as kaonPID3 but with cut on DCA and SPDAny->ITSAny + if (nameStr == "kaonPID3_withDCA") { // same as kaonPID3 but with cut on DCA and SPDAny->ITSAny cut->AddCut(GetAnalysisCut("AssocKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug4")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); @@ -873,22 +873,22 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("kaonPID4")) { + if (nameStr == "kaonPID4") { cut->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); return cut; } - if (!nameStr.compare("kaonPID5")) { + if (nameStr == "kaonPID5") { cut->AddCut(GetAnalysisCut("kaonPIDnsigma")); return cut; } - if (!nameStr.compare("kaonPID6")) { + if (nameStr == "kaonPID6") { cut->AddCut(GetAnalysisCut("kaonPIDnsigma700")); return cut; } - if (!nameStr.compare("kaonPIDTPCTOForTPC")) { + if (nameStr == "kaonPIDTPCTOForTPC") { AnalysisCompositeCut* cut_tpctof_nSigma = new AnalysisCompositeCut("pid_TPCTOFnSigma", "pid_TPCTOFnSigma", kTRUE); cut_tpctof_nSigma->AddCut(GetAnalysisCut("hasTOF")); cut_tpctof_nSigma->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); @@ -904,7 +904,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("kaonPIDTPCTOForTPC700")) { + if (nameStr == "kaonPIDTPCTOForTPC700") { AnalysisCompositeCut* cut_tpctof_nSigma = new AnalysisCompositeCut("pid_TPCTOFnSigma", "pid_TPCTOFnSigma", kTRUE); cut_tpctof_nSigma->AddCut(GetAnalysisCut("hasTOF")); cut_tpctof_nSigma->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); @@ -920,43 +920,43 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("kaonPosPID4")) { + if (nameStr == "kaonPosPID4") { cut->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("posTrack")); return cut; } - if (!nameStr.compare("kaonPosPID4Pt05")) { + if (nameStr == "kaonPosPID4Pt05") { cut->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("muonLowPt")); return cut; } - if (!nameStr.compare("kaonNegPID4")) { + if (nameStr == "kaonNegPID4") { cut->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("negTrack")); return cut; } - if (!nameStr.compare("kaonNegPID4Pt05")) { + if (nameStr == "kaonNegPID4Pt05") { cut->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("muonLowPt")); return cut; } - if (!nameStr.compare("pionPID")) { + if (nameStr == "pionPID") { cut->AddCut(GetAnalysisCut("pionPID_TPCnTOF")); return cut; } - if (!nameStr.compare("pionPID2")) { + if (nameStr == "pionPID2") { cut->AddCut(GetAnalysisCut("pionPIDnsigma")); return cut; } - if (!nameStr.compare("pionPIDTPCTOForTPC")) { + if (nameStr == "pionPIDTPCTOForTPC") { AnalysisCompositeCut* cut_tpctof_nSigma = new AnalysisCompositeCut("pid_TPCTOFnSigma", "pid_TPCTOFnSigma", kTRUE); cut_tpctof_nSigma->AddCut(GetAnalysisCut("pionPID_TPCnTOF")); @@ -970,247 +970,247 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("pionPosPID")) { + if (nameStr == "pionPosPID") { cut->AddCut(GetAnalysisCut("pionPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("posTrack")); return cut; } - if (!nameStr.compare("pionPosPID2")) { + if (nameStr == "pionPosPID2") { cut->AddCut(GetAnalysisCut("pionPIDnsigma")); cut->AddCut(GetAnalysisCut("posTrack")); return cut; } - if (!nameStr.compare("pionNegPID")) { + if (nameStr == "pionNegPID") { cut->AddCut(GetAnalysisCut("pionPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("negTrack")); return cut; } - if (!nameStr.compare("pionNegPID2")) { + if (nameStr == "pionNegPID2") { cut->AddCut(GetAnalysisCut("pionPIDnsigma")); cut->AddCut(GetAnalysisCut("negTrack")); return cut; } - if (!nameStr.compare("protonPosPID")) { + if (nameStr == "protonPosPID") { cut->AddCut(GetAnalysisCut("protonPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("posTrack")); return cut; } - if (!nameStr.compare("protonPosPIDPt05")) { + if (nameStr == "protonPosPIDPt05") { cut->AddCut(GetAnalysisCut("protonPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("muonLowPt")); return cut; } - if (!nameStr.compare("protonNegPID")) { + if (nameStr == "protonNegPID") { cut->AddCut(GetAnalysisCut("protonPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("negTrack")); return cut; } - if (!nameStr.compare("protonNegPIDPt05")) { + if (nameStr == "protonNegPIDPt05") { cut->AddCut(GetAnalysisCut("protonPID_TPCnTOF")); cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("muonLowPt")); return cut; } - if (!nameStr.compare("protonPIDPV")) { + if (nameStr == "protonPIDPV") { cut->AddCut(GetAnalysisCut("protonPID_TPCnTOF2")); cut->AddCut(GetAnalysisCut("protonPVcut")); return cut; } - if (!nameStr.compare("protonPIDPV2")) { + if (nameStr == "protonPIDPV2") { cut->AddCut(GetAnalysisCut("protonPID_TPCnTOF2")); return cut; } - if (!nameStr.compare("PrimaryTrack_DCAz")) { + if (nameStr == "PrimaryTrack_DCAz") { cut->AddCut(GetAnalysisCut("PrimaryTrack_DCAz")); return cut; } - if (!nameStr.compare("posPrimaryTrack_DCAz")) { + if (nameStr == "posPrimaryTrack_DCAz") { cut->AddCut(GetAnalysisCut("PrimaryTrack_DCAz")); cut->AddCut(GetAnalysisCut("posTrack")); return cut; } - if (!nameStr.compare("negPrimaryTrack_DCAz")) { + if (nameStr == "negPrimaryTrack_DCAz") { cut->AddCut(GetAnalysisCut("PrimaryTrack_DCAz")); cut->AddCut(GetAnalysisCut("negTrack")); return cut; } - if (!nameStr.compare("posStandardPrimaryTrackDCA")) { + if (nameStr == "posStandardPrimaryTrackDCA") { cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCA")); cut->AddCut(GetAnalysisCut("posTrack")); return cut; } - if (!nameStr.compare("negStandardPrimaryTrackDCA")) { + if (nameStr == "negStandardPrimaryTrackDCA") { cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCA")); cut->AddCut(GetAnalysisCut("negTrack")); return cut; } - if (!nameStr.compare("posTrack")) { + if (nameStr == "posTrack") { cut->AddCut(GetAnalysisCut("posTrack")); return cut; } - if (!nameStr.compare("negTrack")) { + if (nameStr == "negTrack") { cut->AddCut(GetAnalysisCut("negTrack")); return cut; } - if (!nameStr.compare("posTrackKaonRej")) { + if (nameStr == "posTrackKaonRej") { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("kaonRejNsigma")); return cut; } - if (!nameStr.compare("negTrackKaonRej")) { + if (nameStr == "negTrackKaonRej") { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("kaonRejNsigma")); return cut; } - if (!nameStr.compare("pTLow05")) { + if (nameStr == "pTLow05") { cut->AddCut(GetAnalysisCut("muonLowPt")); return cut; } - if (!nameStr.compare("pTLow04")) { + if (nameStr == "pTLow04") { cut->AddCut(GetAnalysisCut("pTLow04")); return cut; } - if (!nameStr.compare("pTLow03")) { + if (nameStr == "pTLow03") { cut->AddCut(GetAnalysisCut("pTLow03")); return cut; } - if (!nameStr.compare("pTLow02")) { + if (nameStr == "pTLow02") { cut->AddCut(GetAnalysisCut("pTLow02")); return cut; } - if (!nameStr.compare("pTLow05DCAzHigh03")) { + if (nameStr == "pTLow05DCAzHigh03") { cut->AddCut(GetAnalysisCut("muonLowPt")); cut->AddCut(GetAnalysisCut("PrimaryTrack_DCAz")); return cut; } - if (!nameStr.compare("pTLow04DCAzHigh03")) { + if (nameStr == "pTLow04DCAzHigh03") { cut->AddCut(GetAnalysisCut("pTLow04")); cut->AddCut(GetAnalysisCut("PrimaryTrack_DCAz")); return cut; } - if (!nameStr.compare("pTLow03DCAzHigh03")) { + if (nameStr == "pTLow03DCAzHigh03") { cut->AddCut(GetAnalysisCut("pTLow03")); cut->AddCut(GetAnalysisCut("PrimaryTrack_DCAz")); return cut; } // NOTE Below there are several TPC pid cuts used for studies of the Run3 TPC post PID calib. - if (!nameStr.compare("Jpsi_TPCPost_calib_debug1")) { + if (nameStr == "Jpsi_TPCPost_calib_debug1") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug1")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_debug2")) { + if (nameStr == "Jpsi_TPCPost_calib_debug2") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug2")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_noITSCuts_debug2")) { + if (nameStr == "Jpsi_TPCPost_calib_noITSCuts_debug2") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_noITSCuts_debug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug2")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_debug3")) { + if (nameStr == "Jpsi_TPCPost_calib_debug3") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug3")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_debug4")) { + if (nameStr == "Jpsi_TPCPost_calib_debug4") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug4")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_noITSCuts_debug4")) { + if (nameStr == "Jpsi_TPCPost_calib_noITSCuts_debug4") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_noITSCuts_debug")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug4")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_debug6")) { + if (nameStr == "Jpsi_TPCPost_calib_debug6") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug2")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug6")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_debug7")) { + if (nameStr == "Jpsi_TPCPost_calib_debug7") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug2")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug7")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_debug8")) { + if (nameStr == "Jpsi_TPCPost_calib_debug8") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug5")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug8")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_debug9")) { + if (nameStr == "Jpsi_TPCPost_calib_debug9") { cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug4")); cut->AddCut(GetAnalysisCut("electronPIDLooseSkimmed3")); return cut; } - if (!nameStr.compare("Jpsi_TPCPost_calib_debug10")) { + if (nameStr == "Jpsi_TPCPost_calib_debug10") { cut->AddCut(GetAnalysisCut("jpsiKineSkimmed")); cut->AddCut(GetAnalysisCut("jpsi_trackCut_debug6")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug10")); return cut; } - if (!nameStr.compare("LMee_TPCPost_calib_debug1")) { + if (nameStr == "LMee_TPCPost_calib_debug1") { cut->AddCut(GetAnalysisCut("lmee_trackCut_debug")); cut->AddCut(GetAnalysisCut("lmee_TPCPID_debug1")); return cut; } - if (!nameStr.compare("ITSalone_prefilter")) { + if (nameStr == "ITSalone_prefilter") { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); return cut; } - if (!nameStr.compare("ITSalonebAny_prefilter")) { + if (nameStr == "ITSalonebAny_prefilter") { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); return cut; } - if (!nameStr.compare("TPCalone_prefilter")) { + if (nameStr == "TPCalone_prefilter") { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); return cut; } - if (!nameStr.compare("ITSTPC_prefilter")) { + if (nameStr == "ITSTPC_prefilter") { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1219,7 +1219,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } for (int iCut = 0; iCut < 10; iCut++) { // o2-linter: disable=magic-number (number of cuts) - if (!nameStr.compare(Form("jpsiEleSel%d_ionut", iCut))) { + if (nameStr == Form("jpsiEleSel%d_ionut", iCut)) { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1227,7 +1227,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("jpsiEleSelTight%d_ionut", iCut))) { + if (nameStr == Form("jpsiEleSelTight%d_ionut", iCut)) { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQualityTight_ionut")); @@ -1242,7 +1242,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID111->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID111->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID111->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); - if (!nameStr.compare("MagnussOptimization111")) { + if (nameStr == "MagnussOptimization111") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1254,7 +1254,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID211->AddCut(GetAnalysisCut("pidJpsi_magnus_ele2")); magnus_PID211->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID211->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); - if (!nameStr.compare("MagnussOptimization211")) { + if (nameStr == "MagnussOptimization211") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1266,7 +1266,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID311->AddCut(GetAnalysisCut("pidJpsi_magnus_ele3")); magnus_PID311->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID311->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); - if (!nameStr.compare("MagnussOptimization311")) { + if (nameStr == "MagnussOptimization311") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1278,7 +1278,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID121->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID121->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID121->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); - if (!nameStr.compare("MagnussOptimization121")) { + if (nameStr == "MagnussOptimization121") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1290,7 +1290,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID112->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID112->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID112->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); - if (!nameStr.compare("MagnussOptimization112")) { + if (nameStr == "MagnussOptimization112") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1302,7 +1302,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID122->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID122->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID122->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); - if (!nameStr.compare("MagnussOptimization122")) { + if (nameStr == "MagnussOptimization122") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1314,7 +1314,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID222->AddCut(GetAnalysisCut("pidJpsi_magnus_ele2")); magnus_PID222->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID222->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); - if (!nameStr.compare("MagnussOptimization222")) { + if (nameStr == "MagnussOptimization222") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1326,7 +1326,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID212->AddCut(GetAnalysisCut("pidJpsi_magnus_ele2")); magnus_PID212->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID212->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); - if (!nameStr.compare("MagnussOptimization212")) { + if (nameStr == "MagnussOptimization212") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1338,7 +1338,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID221->AddCut(GetAnalysisCut("pidJpsi_magnus_ele2")); magnus_PID221->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID221->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); - if (!nameStr.compare("MagnussOptimization221")) { + if (nameStr == "MagnussOptimization221") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1350,7 +1350,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID321->AddCut(GetAnalysisCut("pidJpsi_magnus_ele3")); magnus_PID321->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID321->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); - if (!nameStr.compare("MagnussOptimization321")) { + if (nameStr == "MagnussOptimization321") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1362,7 +1362,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID312->AddCut(GetAnalysisCut("pidJpsi_magnus_ele3")); magnus_PID312->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID312->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); - if (!nameStr.compare("MagnussOptimization312")) { + if (nameStr == "MagnussOptimization312") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1374,7 +1374,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) magnus_PID322->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID322->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID322->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); - if (!nameStr.compare("MagnussOptimization322")) { + if (nameStr == "MagnussOptimization322") { cut->AddCut(GetAnalysisCut("kineJpsiEle_ionut")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); cut->AddCut(GetAnalysisCut("trackQuality_ionut")); @@ -1386,7 +1386,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) //--------------------------------------------------------------- // Cuts for the selection of legs from dalitz decay // - if (!nameStr.compare("DalitzCut1")) { + if (nameStr == "DalitzCut1") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1394,7 +1394,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut2")) { + if (nameStr == "DalitzCut2") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1402,7 +1402,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut2_Corr")) { + if (nameStr == "DalitzCut2_Corr") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1410,7 +1410,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut3")) { + if (nameStr == "DalitzCut3") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1418,7 +1418,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut3_Corr")) { + if (nameStr == "DalitzCut3_Corr") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1426,7 +1426,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut1SPDfirst")) { + if (nameStr == "DalitzCut1SPDfirst") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1435,7 +1435,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut1SPDfirst_Corr")) { + if (nameStr == "DalitzCut1SPDfirst_Corr") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1444,7 +1444,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut2SPDfirst")) { + if (nameStr == "DalitzCut2SPDfirst") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1453,7 +1453,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut2SPDfirst_Corr")) { + if (nameStr == "DalitzCut2SPDfirst_Corr") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1462,7 +1462,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut3SPDfirst")) { + if (nameStr == "DalitzCut3SPDfirst") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1471,7 +1471,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("DalitzCut3SPDfirst_Corr")) { + if (nameStr == "DalitzCut3SPDfirst_Corr") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1480,7 +1480,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("Dalitz_WithTOF_SPDfirst")) { + if (nameStr == "Dalitz_WithTOF_SPDfirst") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1499,7 +1499,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("Dalitz_WithTOF_SPDfirst_Corr")) { + if (nameStr == "Dalitz_WithTOF_SPDfirst_Corr") { cut->AddCut(GetAnalysisCut("dalitzStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1519,13 +1519,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } for (int i = 1; i <= 8; i++) { // o2-linter: disable=magic-number (number of cuts) - if (!nameStr.compare(Form("dalitzSelected%d", i))) { + if (nameStr == Form("dalitzSelected%d", i)) { cut->AddCut(GetAnalysisCut(Form("dalitzLeg%d", i))); return cut; } } - if (!nameStr.compare("electronPrimaryTag0")) { + if (nameStr == "electronPrimaryTag0") { // with tight 3 sigma DCA cut for selecting primary electrons cut->AddCut(GetAnalysisCut("electronPID_TPCnsigma_loose")); // 3 sigma inclusion, 3sigma rejection cut->AddCut(GetAnalysisCut("electronPrimary_dca3sigma")); @@ -1533,7 +1533,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("electronPrimaryTag1")) { + if (nameStr == "electronPrimaryTag1") { // with 7 sigma DCA cut for selecting primary electrons cut->AddCut(GetAnalysisCut("electronPID_TPCnsigma_loose")); // 3 sigma inclusion, 3sigma rejection cut->AddCut(GetAnalysisCut("electronPrimary_dca7sigma")); @@ -1541,20 +1541,20 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("electronPrimaryProbe_TPC")) { + if (nameStr == "electronPrimaryProbe_TPC") { cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); cut->AddCut(GetAnalysisCut("lmeeStandardKine")); return cut; } - if (!nameStr.compare("electronPrimaryProbe_ITS")) { + if (nameStr == "electronPrimaryProbe_ITS") { cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly")); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCA")); cut->AddCut(GetAnalysisCut("lmeeStandardKine")); return cut; } - if (!nameStr.compare("electronPrimaryProbe_ITSTPC")) { + if (nameStr == "electronPrimaryProbe_ITSTPC") { cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly")); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCA")); @@ -1562,7 +1562,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiPIDworseRes")) { + if (nameStr == "jpsiPIDworseRes") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -1570,7 +1570,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiPIDshift")) { + if (nameStr == "jpsiPIDshift") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -1578,7 +1578,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiPID1shiftUp")) { + if (nameStr == "jpsiPID1shiftUp") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -1586,7 +1586,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsiPID1shiftDown")) { + if (nameStr == "jpsiPID1shiftDown") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQuality")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -1597,7 +1597,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // // Q vector contributor cut // - if (!nameStr.compare("selTPCCentral")) { + if (nameStr == "selTPCCentral") { AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kEta, -0.8, 0.8); kineCut->AddCut(VarManager::kPt, 0.15, 5); @@ -1627,14 +1627,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // List of cuts used for low mass dielectron analyses // // Skimming cuts: - if (!nameStr.compare("lmee_skimming")) { + if (nameStr == "lmee_skimming") { cut->AddCut(GetAnalysisCut("lmee_skimming_cuts")); return cut; } // LMee Run2 PID cuts - if (!nameStr.compare("lmeePID_TPChadrejTOFrec")) { + if (nameStr == "lmeePID_TPChadrejTOFrec") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -1656,7 +1656,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmeePID_TPChadrej")) { + if (nameStr == "lmeePID_TPChadrej") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -1670,7 +1670,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_eNSigmaRun2")) { + if (nameStr == "lmee_eNSigmaRun2") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -1688,7 +1688,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmeePID_TOFrec")) { + if (nameStr == "lmeePID_TOFrec") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -1701,28 +1701,28 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_GlobalTrackRun2")) { + if (nameStr == "lmee_GlobalTrackRun2") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); return cut; } - if (!nameStr.compare("lmee_GlobalTrackRun2_lowPt")) { + if (nameStr == "lmee_GlobalTrackRun2_lowPt") { cut->AddCut(GetAnalysisCut("lmeeLowBKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); return cut; } - if (!nameStr.compare("lmee_TPCTrackRun2_lowPt")) { + if (nameStr == "lmee_TPCTrackRun2_lowPt") { cut->AddCut(GetAnalysisCut("lmeeLowBKine")); cut->AddCut(GetAnalysisCut("TightTPCTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); return cut; } - if (!nameStr.compare("lmee_TPCTrackRun2")) { + if (nameStr == "lmee_TPCTrackRun2") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightTPCTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); @@ -1731,7 +1731,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // LMee Run3 PID cuts - if (!nameStr.compare("lmeePID_TPChadrejTOFrecRun3")) { + if (nameStr == "lmeePID_TPChadrejTOFrecRun3") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -1755,7 +1755,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_Run3_TPCelectron")) { + if (nameStr == "lmee_Run3_TPCelectron") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); @@ -1763,7 +1763,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_Run3_TOFelectron")) { + if (nameStr == "lmee_Run3_TOFelectron") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); @@ -1771,7 +1771,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_Run3_posTrack_TPCelectron")) { + if (nameStr == "lmee_Run3_posTrack_TPCelectron") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); @@ -1780,7 +1780,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_Run3_posTrack_TOFelectron")) { + if (nameStr == "lmee_Run3_posTrack_TOFelectron") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); @@ -1789,7 +1789,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_Run3_negTrack_TPCelectron")) { + if (nameStr == "lmee_Run3_negTrack_TPCelectron") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); @@ -1798,7 +1798,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_Run3_negTrack_TOFelectron")) { + if (nameStr == "lmee_Run3_negTrack_TOFelectron") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); @@ -1822,21 +1822,21 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // loop to define PID cuts with and without post calibration for (size_t icase = 0; icase < vecTypetrack.size(); icase++) { // Tracking cuts of Pb--Pb analysis - if (!nameStr.compare(Form("lmee%s_PbPb_selection", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee%s_PbPb_selection", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); return cut; } - if (!nameStr.compare(Form("lmee%s_PbPb_selection_pt04", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee%s_PbPb_selection_pt04", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine_pt04")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); return cut; } - if (!nameStr.compare(Form("lmee%s_TrackCuts_Resol", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee%s_TrackCuts_Resol", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("openEtaSel")); // No pt cut and wider eta cut to produce resolution maps cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -1844,7 +1844,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // 4 cuts to separate pos & neg tracks in pos & neg eta range - if (!nameStr.compare(Form("lmee_posTrack_posEta_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_posTrack_posEta_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1852,7 +1852,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_negTrack_posEta_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_negTrack_posEta_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1860,7 +1860,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_posTrack_negEta_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_posTrack_negEta_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1868,7 +1868,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_negTrack_negEta_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_negTrack_negEta_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1877,7 +1877,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // 2 cuts to separate pos & neg tracks - if (!nameStr.compare(Form("lmee_posTrack_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_posTrack_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("etaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1885,7 +1885,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_negTrack_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_negTrack_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("etaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1894,7 +1894,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // 4 cuts to separate pos & neg tracks in pos & neg eta range low B field - if (!nameStr.compare(Form("lmee_lowB_posTrack_posEta_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_lowB_posTrack_posEta_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1902,7 +1902,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_lowB_negTrack_posEta_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_lowB_negTrack_posEta_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1910,7 +1910,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_lowB_posTrack_negEta_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_lowB_posTrack_negEta_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1918,7 +1918,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_lowB_negTrack_negEta_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_lowB_negTrack_negEta_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1927,7 +1927,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // 2 cuts to separate pos & neg tracks in low B field - if (!nameStr.compare(Form("lmee_lowB_posTrack_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_lowB_posTrack_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("etaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1935,7 +1935,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_lowB_negTrack_selection%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmee_lowB_negTrack_selection%s", vecTypetrack.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("etaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))); @@ -1958,12 +1958,12 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // loop to define PID cuts with and without post calibration for (size_t icase = 0; icase < vecPIDcase.size(); icase++) { - if (!nameStr.compare(Form("lmee_onlyTPCPID%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_onlyTPCPID%s", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut(Form("electronPIDOnly%s", vecPIDcase.at(icase).Data()))); return cut; } - if (!nameStr.compare(Form("ITSTPC_TPCPID%s_prefilter", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("ITSTPC_TPCPID%s_prefilter", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -1972,7 +1972,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("ITS_ifTPC_TPCPID%s_prefilter", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("ITS_ifTPC_TPCPID%s_prefilter", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -1991,7 +1991,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("ITS_ifTPCStandard_TPCPID%s_prefilter", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("ITS_ifTPCStandard_TPCPID%s_prefilter", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2010,7 +2010,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("ITSTPCbAny_TPCPID%s_prefilter", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("ITSTPCbAny_TPCPID%s_prefilter", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); @@ -2019,7 +2019,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("ITSbAny_ifTPC_TPCPID%s_prefilter", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("ITSbAny_ifTPC_TPCPID%s_prefilter", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2038,7 +2038,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("ITSbAny_ifTPCStandard_TPCPID%s_prefilter", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("ITSbAny_ifTPCStandard_TPCPID%s_prefilter", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeePrefilterKine")); cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2058,7 +2058,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } for (unsigned int i = 0; i < 30; i++) { // o2-linter: disable=magic-number (number of cuts) - if (!nameStr.compare(Form("ElSelCutVar%s%i", vecPIDcase.at(icase).Data(), i))) { + if (nameStr == Form("ElSelCutVar%s%i", vecPIDcase.at(icase).Data(), i)) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeCutVarTrackCuts%i", i))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2079,7 +2079,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) for (size_t jcase = 0; jcase < vecTypetrackWithPID.size(); jcase++) { // All previous cut with TightGlobalTrackRun3 - if (!nameStr.compare(Form("ITSTPC%s_TPCPIDalone%s_PbPb", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("ITSTPC%s_TPCPIDalone%s_PbPb", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); @@ -2087,7 +2087,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_loose", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_loose", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2105,7 +2105,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2123,7 +2123,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_strongHadRej", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_strongHadRej", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2141,7 +2141,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2159,7 +2159,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2177,7 +2177,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_TOFreq", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_TOFreq", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2185,7 +2185,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_Resol", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_Resol", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("openEtaSel")); // No pt cut and wider eta cut to produce resolution maps cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2203,7 +2203,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_tightNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_tightNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); @@ -2221,7 +2221,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); @@ -2239,7 +2239,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_tightNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_tightNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine_pt04")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); @@ -2257,7 +2257,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine_pt04")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); @@ -2275,7 +2275,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_lowB_eNSigmaRun3%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_eNSigmaRun3%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeLowBKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); // to reject looper using DCAz @@ -2293,7 +2293,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_lowB_eNSigmaRun3%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_eNSigmaRun3%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeLowBKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); // to reject looper using DCAz @@ -2311,7 +2311,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_TOFreqRun3%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_TOFreqRun3%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine_pt04")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); @@ -2319,7 +2319,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_TOFreqRun3%s_tightNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_TOFreqRun3%s_tightNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine_pt04")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); @@ -2328,7 +2328,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // 8 cuts for QC - if (!nameStr.compare(Form("lmee%s_NSigmaRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_NSigmaRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("pt02Sel")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2347,7 +2347,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_NSigmaRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_NSigmaRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("pt02Sel")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2366,7 +2366,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_NSigmaRun3_posEta%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_NSigmaRun3_posEta%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("pt04Sel")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2385,7 +2385,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_NSigmaRun3_negEta%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_NSigmaRun3_negEta%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("pt04Sel")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2404,7 +2404,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_posNSigmaRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_posNSigmaRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2423,7 +2423,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_posNSigmaRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_posNSigmaRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2442,7 +2442,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_negNSigmaRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_negNSigmaRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2461,7 +2461,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_negNSigmaRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_negNSigmaRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2481,7 +2481,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // 6 cuts for QC - if (!nameStr.compare(Form("lmee%s_posTOFreqRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_posTOFreqRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2490,7 +2490,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_posTOFreqRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_posTOFreqRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2499,7 +2499,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_TOFreqRun3_posEta%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_TOFreqRun3_posEta%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("pt04Sel")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2508,7 +2508,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_TOFreqRun3_negEta%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_TOFreqRun3_negEta%s_strongNSigEPbPb_rejBadTOF_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("pt04Sel")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2517,7 +2517,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_negTOFreqRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_negTOFreqRun3_posEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2526,7 +2526,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_negTOFreqRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_negTOFreqRun3_negEta%s_strongNSigEPbPb_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2535,7 +2535,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_TPC_PID", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_TPC_PID", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2547,7 +2547,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_TOF_PID", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_TOF_PID", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2559,7 +2559,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_strongNSigE_DCA05", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_strongNSigE_DCA05", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_DCA05")); @@ -2578,7 +2578,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // 4 cuts to separate pos & neg tracks in pos & neg eta range applying electron PID - if (!nameStr.compare(Form("lmee%s_posNSigmaRun3_posEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_posNSigmaRun3_posEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2597,7 +2597,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_negNSigmaRun3_posEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_negNSigmaRun3_posEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2616,7 +2616,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_posNSigmaRun3_negEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_posNSigmaRun3_negEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2635,7 +2635,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_negNSigmaRun3_negEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_negNSigmaRun3_negEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2655,7 +2655,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // 4 cuts to separate pos & neg tracks in pos & neg eta range applying electron PID for low B field - if (!nameStr.compare(Form("lmee%s_lowB_posNSigmaRun3_posEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_posNSigmaRun3_posEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2674,7 +2674,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_lowB_negNSigmaRun3_posEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_negNSigmaRun3_posEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2693,7 +2693,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_lowB_posNSigmaRun3_negEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_posNSigmaRun3_negEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2712,7 +2712,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_lowB_negNSigmaRun3_negEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_negNSigmaRun3_negEta%s_strongNSigE", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2732,7 +2732,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // 4 cuts to separate pos & neg tracks in pos & neg eta range applying electron PID for low B field with bad TOF rejection - if (!nameStr.compare(Form("lmee%s_lowB_posNSigmaRun3_posEta%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_posNSigmaRun3_posEta%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2751,7 +2751,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_lowB_negNSigmaRun3_posEta%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_negNSigmaRun3_posEta%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("posEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2770,7 +2770,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_lowB_posNSigmaRun3_negEta%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_posNSigmaRun3_negEta%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("posTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2789,7 +2789,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_lowB_negNSigmaRun3_negEta%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_lowB_negNSigmaRun3_negEta%s_strongNSigE_rejBadTOF", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("negTrack")); cut->AddCut(GetAnalysisCut("negEtaSel")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2809,7 +2809,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } // some older cuts - if (!nameStr.compare(Form("lmee%s_pp502TeV_PID%s", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_pp502TeV_PID%s", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2828,7 +2828,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } for (int i = 1; i <= 8; i++) { // o2-linter: disable=magic-number (number of cuts) - if (!nameStr.compare(Form("lmee%s_pp502TeV_PID%s_UsePrefilter%d", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data(), i))) { + if (nameStr == Form("lmee%s_pp502TeV_PID%s_UsePrefilter%d", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data(), i)) { cut->AddCut(GetAnalysisCut(Form("notDalitzLeg%d", i))); cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2848,7 +2848,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } } - if (!nameStr.compare(Form("lmee%s_pp502TeV_lowB_PID%s", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_pp502TeV_lowB_PID%s", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeLowBKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); // DCAz to reject loopers @@ -2866,7 +2866,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_pt04", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine_pt04")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2885,7 +2885,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } for (int i = 1; i <= 8; i++) { // o2-linter: disable=magic-number (number of cuts) - if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_UsePrefilter%d", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data(), i))) { + if (nameStr == Form("lmee%s_eNSigmaRun3%s_UsePrefilter%d", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data(), i)) { cut->AddCut(GetAnalysisCut(Form("notDalitzLeg%d", i))); cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); @@ -2906,7 +2906,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } } - if (!nameStr.compare(Form("lmee_eNSigmaRun3%s_strongTPC", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_eNSigmaRun3%s_strongTPC", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3_strongTPC")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2924,7 +2924,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_skimmingtesta_PID%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_skimmingtesta_PID%s", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("LooseGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2942,7 +2942,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_skimmingtestb_PID%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_skimmingtestb_PID%s", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("LooseGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2954,7 +2954,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_skimmingtesta_TOF%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_skimmingtesta_TOF%s", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("LooseGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2962,7 +2962,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_skimmingtesta_TOF_pionrej%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_skimmingtesta_TOF_pionrej%s", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("LooseGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); @@ -2970,7 +2970,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_skimmingtesta_TOF_pionrej_noDCA%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_skimmingtesta_TOF_pionrej_noDCA%s", vecPIDcase.at(icase).Data())) { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("LooseGlobalTrackRun3")); cut->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_TOFloose_pionrej%s", vecPIDcase.at(icase).Data()))); @@ -2978,42 +2978,42 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } } - if (!nameStr.compare("testCut_chic")) { + if (nameStr == "testCut_chic") { cut->AddCut(GetAnalysisCut("jpsiStandardKine5")); cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("electronPIDnsigma")); return cut; } - if (!nameStr.compare("lmee_GlobalTrackRun3")) { + if (nameStr == "lmee_GlobalTrackRun3") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); return cut; } - if (!nameStr.compare("lmee_GlobalTrackRun3_lowPt")) { + if (nameStr == "lmee_GlobalTrackRun3_lowPt") { cut->AddCut(GetAnalysisCut("lmeeLowBKine")); cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); return cut; } - if (!nameStr.compare("lmee_TPCTrackRun3_lowPt")) { + if (nameStr == "lmee_TPCTrackRun3_lowPt") { cut->AddCut(GetAnalysisCut("lmeeLowBKine")); cut->AddCut(GetAnalysisCut("TightTPCTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); return cut; } - if (!nameStr.compare("lmee_TPCTrackRun3")) { + if (nameStr == "lmee_TPCTrackRun3") { cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("TightTPCTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); return cut; } - if (!nameStr.compare("trackCut_compareDQEMframework")) { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ + if (nameStr == "trackCut_compareDQEMframework") { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("trackQuality_compareDQEMframework")); cut->AddCut(GetAnalysisCut("trackDCA1cm")); @@ -3029,7 +3029,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_debug_TPCTOF3_rejBadTOF")) { + if (nameStr == "jpsi_debug_TPCTOF3_rejBadTOF") { cut->AddCut(GetAnalysisCut("jpsiStandardKine5")); cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly3")); cut->AddCut(GetAnalysisCut("SPDfirst")); @@ -3043,7 +3043,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // ------------------------------------------------------------------------------------------------- // lmee pair cuts - if (!nameStr.compare("pairPhiV")) { + if (nameStr == "pairPhiV") { AnalysisCompositeCut* cut_pairPhiV = new AnalysisCompositeCut("cut_pairPhiV", "cut_pairPhiV", kTRUE); cut_pairPhiV->AddCut(GetAnalysisCut("pairLowMass")); cut_pairPhiV->AddCut(GetAnalysisCut("pairPhiV")); @@ -3051,7 +3051,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("excludePairPhiV")) { + if (nameStr == "excludePairPhiV") { AnalysisCompositeCut* cut_pairlowPhiV = new AnalysisCompositeCut("cut_pairlowPhiV", "cut_pairlowPhiV", kFALSE); cut_pairlowPhiV->AddCut(GetAnalysisCut("excludePairLowMass")); cut_pairlowPhiV->AddCut(GetAnalysisCut("excludePairPhiV")); @@ -3062,651 +3062,651 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // ------------------------------------------------------------------------------------------------- // Muon cuts - if (!nameStr.compare("muonQualityCutsMatchingOnly")) { + if (nameStr == "muonQualityCutsMatchingOnly") { cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonMinimalCuts")) { + if (nameStr == "muonMinimalCuts") { cut->AddCut(GetAnalysisCut("muonMinimalCuts")); return cut; } - if (!nameStr.compare("muonMinimalCuts10SigmaPDCA")) { + if (nameStr == "muonMinimalCuts10SigmaPDCA") { cut->AddCut(GetAnalysisCut("muonMinimalCuts10SigmaPDCA")); return cut; } - if (!nameStr.compare("muonQualityCuts")) { + if (nameStr == "muonQualityCuts") { cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("matchedQualityCuts")) { + if (nameStr == "matchedQualityCuts") { cut->AddCut(GetAnalysisCut("matchedQualityCuts")); return cut; } - if (!nameStr.compare("matchedQualityCutsMFTeta")) { + if (nameStr == "matchedQualityCutsMFTeta") { cut->AddCut(GetAnalysisCut("matchedQualityCutsMFTeta")); return cut; } - if (!nameStr.compare("muonQualityCuts5SigmaPDCA_Run3")) { + if (nameStr == "muonQualityCuts5SigmaPDCA_Run3") { cut->AddCut(GetAnalysisCut("muonQualityCuts5SigmaPDCA_Run3")); return cut; } - if (!nameStr.compare("muonLowPt5SigmaPDCA_Run3")) { + if (nameStr == "muonLowPt5SigmaPDCA_Run3") { cut->AddCut(GetAnalysisCut("muonLowPt")); cut->AddCut(GetAnalysisCut("muonQualityCuts5SigmaPDCA_Run3")); cut->AddCut(GetAnalysisCut("MCHMID")); return cut; } - if (!nameStr.compare("muonQualityCuts10SigmaPDCA_MCHMID")) { + if (nameStr == "muonQualityCuts10SigmaPDCA_MCHMID") { cut->AddCut(GetAnalysisCut("muonQualityCuts10SigmaPDCA")); cut->AddCut(GetAnalysisCut("MCHMID")); return cut; } - if (!nameStr.compare("muonLowPt10SigmaPDCA")) { + if (nameStr == "muonLowPt10SigmaPDCA") { cut->AddCut(GetAnalysisCut("muonLowPt")); cut->AddCut(GetAnalysisCut("muonQualityCuts10SigmaPDCA")); cut->AddCut(GetAnalysisCut("MCHMID")); return cut; } - if (!nameStr.compare("muonLowPt210SigmaPDCA")) { + if (nameStr == "muonLowPt210SigmaPDCA") { cut->AddCut(GetAnalysisCut("muonLowPt2")); cut->AddCut(GetAnalysisCut("muonQualityCuts10SigmaPDCA")); cut->AddCut(GetAnalysisCut("MCHMID")); return cut; } - if (!nameStr.compare("muonLowPt510SigmaPDCA")) { + if (nameStr == "muonLowPt510SigmaPDCA") { cut->AddCut(GetAnalysisCut("muonLowPt5")); cut->AddCut(GetAnalysisCut("muonQualityCuts10SigmaPDCA")); cut->AddCut(GetAnalysisCut("MCHMID")); return cut; } - if (!nameStr.compare("muonLowPt610SigmaPDCA")) { + if (nameStr == "muonLowPt610SigmaPDCA") { cut->AddCut(GetAnalysisCut("muonLowPt6")); cut->AddCut(GetAnalysisCut("muonQualityCuts10SigmaPDCA")); cut->AddCut(GetAnalysisCut("MCHMID")); return cut; } - if (!nameStr.compare("muonLowPt")) { + if (nameStr == "muonLowPt") { cut->AddCut(GetAnalysisCut("muonLowPt")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonLowPt2")) { + if (nameStr == "muonLowPt2") { cut->AddCut(GetAnalysisCut("muonLowPt2")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonLowPt3")) { + if (nameStr == "muonLowPt3") { cut->AddCut(GetAnalysisCut("muonLowPt3")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonLowPt4")) { + if (nameStr == "muonLowPt4") { cut->AddCut(GetAnalysisCut("muonLowPt4")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonLowPt5")) { + if (nameStr == "muonLowPt5") { cut->AddCut(GetAnalysisCut("muonLowPt5")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonLowPt6")) { + if (nameStr == "muonLowPt6") { cut->AddCut(GetAnalysisCut("muonLowPt6")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonLowPtMatchingOnly")) { + if (nameStr == "muonLowPtMatchingOnly") { cut->AddCut(GetAnalysisCut("muonLowPt")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonLowPtMatchingOnly2")) { + if (nameStr == "muonLowPtMatchingOnly2") { cut->AddCut(GetAnalysisCut("muonLowPt2")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonLowPtMatchingOnly3")) { + if (nameStr == "muonLowPtMatchingOnly3") { cut->AddCut(GetAnalysisCut("muonLowPt3")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonLowPtMatchingOnly4")) { + if (nameStr == "muonLowPtMatchingOnly4") { cut->AddCut(GetAnalysisCut("muonLowPt4")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonLowPtMatchingOnly5")) { + if (nameStr == "muonLowPtMatchingOnly5") { cut->AddCut(GetAnalysisCut("muonLowPt5")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonLowPtMatchingOnly6")) { + if (nameStr == "muonLowPtMatchingOnly6") { cut->AddCut(GetAnalysisCut("muonLowPt6")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonHighPt")) { + if (nameStr == "muonHighPt") { cut->AddCut(GetAnalysisCut("muonHighPt")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonHighPt2")) { + if (nameStr == "muonHighPt2") { cut->AddCut(GetAnalysisCut("muonHighPt2")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonHighPt3")) { + if (nameStr == "muonHighPt3") { cut->AddCut(GetAnalysisCut("muonHighPt3")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonHighPt4")) { + if (nameStr == "muonHighPt4") { cut->AddCut(GetAnalysisCut("muonHighPt4")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonHighPt5")) { + if (nameStr == "muonHighPt5") { cut->AddCut(GetAnalysisCut("muonHighPt5")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonHighPt6")) { + if (nameStr == "muonHighPt6") { cut->AddCut(GetAnalysisCut("muonHighPt6")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonHighPtMatchingOnly2")) { + if (nameStr == "muonHighPtMatchingOnly2") { cut->AddCut(GetAnalysisCut("muonHighPt2")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonHighPtMatchingOnly3")) { + if (nameStr == "muonHighPtMatchingOnly3") { cut->AddCut(GetAnalysisCut("muonHighPt3")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonTightQualityCutsForTests")) { + if (nameStr == "muonTightQualityCutsForTests") { cut->AddCut(GetAnalysisCut("muonTightQualityCutsForTests")); return cut; } - if (!nameStr.compare("mchTrack")) { + if (nameStr == "mchTrack") { cut->AddCut(GetAnalysisCut("mchTrack")); return cut; } - if (!nameStr.compare("matchedMchMid")) { + if (nameStr == "matchedMchMid") { cut->AddCut(GetAnalysisCut("matchedMchMid")); return cut; } - if (!nameStr.compare("matchedFwd")) { + if (nameStr == "matchedFwd") { cut->AddCut(GetAnalysisCut("matchedFwd")); return cut; } - if (!nameStr.compare("matchedGlobal")) { + if (nameStr == "matchedGlobal") { cut->AddCut(GetAnalysisCut("matchedGlobal")); return cut; } - if (!nameStr.compare("Chi2MCHMFTCut1")) { + if (nameStr == "Chi2MCHMFTCut1") { cut->AddCut(GetAnalysisCut("Chi2MCHMFTCut1")); return cut; } - if (!nameStr.compare("Chi2MCHMFTCut2")) { + if (nameStr == "Chi2MCHMFTCut2") { cut->AddCut(GetAnalysisCut("Chi2MCHMFTCut2")); return cut; } - if (!nameStr.compare("Chi2MCHMFTCut3")) { + if (nameStr == "Chi2MCHMFTCut3") { cut->AddCut(GetAnalysisCut("Chi2MCHMFTCut3")); return cut; } - if (!nameStr.compare("Chi2MCHMFTCut4")) { + if (nameStr == "Chi2MCHMFTCut4") { cut->AddCut(GetAnalysisCut("Chi2MCHMFTCut4")); return cut; } - if (!nameStr.compare("muonQualityCutsMUONStandalone")) { + if (nameStr == "muonQualityCutsMUONStandalone") { cut->AddCut(GetAnalysisCut("matchedMchMid")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } - if (!nameStr.compare("muonQualityCutsGlobal")) { + if (nameStr == "muonQualityCutsGlobal") { cut->AddCut(GetAnalysisCut("matchedGlobal")); cut->AddCut(GetAnalysisCut("muonQualityCuts")); return cut; } // ----------------------------------------------------------- // Pair cuts - if (!nameStr.compare("pairNoCut")) { + if (nameStr == "pairNoCut") { cut->AddCut(GetAnalysisCut("pairNoCut")); return cut; } - if (!nameStr.compare("pairMassLow1")) { + if (nameStr == "pairMassLow1") { cut->AddCut(GetAnalysisCut("pairMassLow1")); return cut; } - if (!nameStr.compare("pairMassLow2")) { + if (nameStr == "pairMassLow2") { cut->AddCut(GetAnalysisCut("pairMassLow2")); return cut; } - if (!nameStr.compare("pairPtLow3")) { + if (nameStr == "pairPtLow3") { cut->AddCut(GetAnalysisCut("pairPtLow3")); return cut; } - if (!nameStr.compare("pairPtLow4")) { + if (nameStr == "pairPtLow4") { cut->AddCut(GetAnalysisCut("pairPtLow4")); return cut; } - if (!nameStr.compare("pairPtLow5")) { + if (nameStr == "pairPtLow5") { cut->AddCut(GetAnalysisCut("pairPtLow5")); return cut; } - if (!nameStr.compare("pairMassLow3")) { + if (nameStr == "pairMassLow3") { cut->AddCut(GetAnalysisCut("pairMassLow3")); return cut; } - if (!nameStr.compare("pairMassLow4")) { + if (nameStr == "pairMassLow4") { cut->AddCut(GetAnalysisCut("pairMassLow4")); return cut; } - if (!nameStr.compare("pairMassLow5")) { + if (nameStr == "pairMassLow5") { cut->AddCut(GetAnalysisCut("pairMassLow5")); return cut; } - if (!nameStr.compare("pairMassLow6")) { + if (nameStr == "pairMassLow6") { cut->AddCut(GetAnalysisCut("pairMassLow6")); return cut; } - if (!nameStr.compare("pairMassLow7")) { + if (nameStr == "pairMassLow7") { cut->AddCut(GetAnalysisCut("pairMassLow7")); return cut; } - if (!nameStr.compare("pairMassLow8")) { + if (nameStr == "pairMassLow8") { cut->AddCut(GetAnalysisCut("pairMassLow8")); return cut; } - if (!nameStr.compare("pairMassLow9")) { + if (nameStr == "pairMassLow9") { cut->AddCut(GetAnalysisCut("pairMassLow9")); return cut; } - if (!nameStr.compare("pairMassLow10")) { + if (nameStr == "pairMassLow10") { cut->AddCut(GetAnalysisCut("pairMassLow10")); return cut; } - if (!nameStr.compare("pairMassLow11")) { + if (nameStr == "pairMassLow11") { cut->AddCut(GetAnalysisCut("pairMassLow11")); return cut; } - if (!nameStr.compare("pairMassLow12")) { + if (nameStr == "pairMassLow12") { cut->AddCut(GetAnalysisCut("pairMassLow12")); return cut; } - if (!nameStr.compare("pairMass1to2")) { + if (nameStr == "pairMass1to2") { cut->AddCut(GetAnalysisCut("pairMass1to2")); return cut; } - if (!nameStr.compare("pairMassIMR")) { + if (nameStr == "pairMassIMR") { cut->AddCut(GetAnalysisCut("pairMassIMR")); return cut; } - if (!nameStr.compare("pairMass1_5to2_7")) { + if (nameStr == "pairMass1_5to2_7") { cut->AddCut(GetAnalysisCut("pairMass1_5to2_7")); return cut; } - if (!nameStr.compare("pairMass1_3to3_5")) { + if (nameStr == "pairMass1_3to3_5") { cut->AddCut(GetAnalysisCut("pairMass1_3to3_5")); return cut; } - if (!nameStr.compare("pairMass1_3")) { + if (nameStr == "pairMass1_3") { cut->AddCut(GetAnalysisCut("pairMass1_3")); return cut; } - if (!nameStr.compare("pairMass1_5to3_5")) { + if (nameStr == "pairMass1_5to3_5") { cut->AddCut(GetAnalysisCut("pairMass1_5to3_5")); return cut; } - if (!nameStr.compare("pairDalitz1")) { + if (nameStr == "pairDalitz1") { cut->AddCut(GetAnalysisCut("pairDalitz1")); return cut; } - if (!nameStr.compare("pairDalitz1Strong")) { + if (nameStr == "pairDalitz1Strong") { cut->AddCut(GetAnalysisCut("pairDalitz1Strong")); return cut; } - if (!nameStr.compare("pairDalitz2")) { + if (nameStr == "pairDalitz2") { cut->AddCut(GetAnalysisCut("pairDalitz2")); return cut; } - if (!nameStr.compare("pairDalitz3")) { + if (nameStr == "pairDalitz3") { cut->AddCut(GetAnalysisCut("pairDalitz3")); return cut; } - if (!nameStr.compare("paira_prefilter1")) { + if (nameStr == "paira_prefilter1") { cut->AddCut(GetAnalysisCut("paira_prefilter1")); return cut; } - if (!nameStr.compare("paira_prefilter2")) { + if (nameStr == "paira_prefilter2") { cut->AddCut(GetAnalysisCut("paira_prefilter2")); return cut; } - if (!nameStr.compare("paira_prefilter3")) { + if (nameStr == "paira_prefilter3") { cut->AddCut(GetAnalysisCut("paira_prefilter3")); return cut; } - if (!nameStr.compare("paira_prefilter4")) { + if (nameStr == "paira_prefilter4") { cut->AddCut(GetAnalysisCut("paira_prefilter4")); return cut; } - if (!nameStr.compare("paira_prefilter5")) { + if (nameStr == "paira_prefilter5") { cut->AddCut(GetAnalysisCut("paira_prefilter5")); return cut; } - if (!nameStr.compare("paira_prefilter6")) { + if (nameStr == "paira_prefilter6") { cut->AddCut(GetAnalysisCut("paira_prefilter6")); return cut; } - if (!nameStr.compare("paira_prefilter7")) { + if (nameStr == "paira_prefilter7") { cut->AddCut(GetAnalysisCut("paira_prefilter7")); return cut; } - if (!nameStr.compare("pairb_prefilter1")) { + if (nameStr == "pairb_prefilter1") { cut->AddCut(GetAnalysisCut("pairb_prefilter1")); return cut; } - if (!nameStr.compare("pairb_prefilter2")) { + if (nameStr == "pairb_prefilter2") { cut->AddCut(GetAnalysisCut("pairb_prefilter2")); return cut; } - if (!nameStr.compare("pairb_prefilter3")) { + if (nameStr == "pairb_prefilter3") { cut->AddCut(GetAnalysisCut("pairb_prefilter3")); return cut; } - if (!nameStr.compare("pairb_prefilter4")) { + if (nameStr == "pairb_prefilter4") { cut->AddCut(GetAnalysisCut("pairb_prefilter4")); return cut; } - if (!nameStr.compare("pairb_prefilter5")) { + if (nameStr == "pairb_prefilter5") { cut->AddCut(GetAnalysisCut("pairb_prefilter5")); return cut; } - if (!nameStr.compare("pairb_prefilter6")) { + if (nameStr == "pairb_prefilter6") { cut->AddCut(GetAnalysisCut("pairb_prefilter6")); return cut; } - if (!nameStr.compare("pairb_prefilter7")) { + if (nameStr == "pairb_prefilter7") { cut->AddCut(GetAnalysisCut("pairb_prefilter7")); return cut; } - if (!nameStr.compare("pairc_prefilter1")) { + if (nameStr == "pairc_prefilter1") { cut->AddCut(GetAnalysisCut("pairc_prefilter1")); return cut; } - if (!nameStr.compare("pairc_prefilter2")) { + if (nameStr == "pairc_prefilter2") { cut->AddCut(GetAnalysisCut("pairc_prefilter2")); return cut; } - if (!nameStr.compare("pairc_prefilter3")) { + if (nameStr == "pairc_prefilter3") { cut->AddCut(GetAnalysisCut("pairc_prefilter3")); return cut; } - if (!nameStr.compare("pairc_prefilter4")) { + if (nameStr == "pairc_prefilter4") { cut->AddCut(GetAnalysisCut("pairc_prefilter4")); return cut; } - if (!nameStr.compare("pairc_prefilter5")) { + if (nameStr == "pairc_prefilter5") { cut->AddCut(GetAnalysisCut("pairc_prefilter5")); return cut; } - if (!nameStr.compare("pairc_prefilter6")) { + if (nameStr == "pairc_prefilter6") { cut->AddCut(GetAnalysisCut("pairc_prefilter6")); return cut; } - if (!nameStr.compare("pairc_prefilter7")) { + if (nameStr == "pairc_prefilter7") { cut->AddCut(GetAnalysisCut("pairc_prefilter7")); return cut; } - if (!nameStr.compare("paird_prefilter1")) { + if (nameStr == "paird_prefilter1") { cut->AddCut(GetAnalysisCut("paird_prefilter1")); return cut; } - if (!nameStr.compare("paire_prefilter1")) { + if (nameStr == "paire_prefilter1") { cut->AddCut(GetAnalysisCut("paire_prefilter1")); return cut; } - if (!nameStr.compare("pairf_prefilter1")) { + if (nameStr == "pairf_prefilter1") { cut->AddCut(GetAnalysisCut("pairf_prefilter1")); return cut; } - if (!nameStr.compare("pairg_prefilter1")) { + if (nameStr == "pairg_prefilter1") { cut->AddCut(GetAnalysisCut("pairg_prefilter1")); return cut; } - if (!nameStr.compare("pairh_prefilter1")) { + if (nameStr == "pairh_prefilter1") { cut->AddCut(GetAnalysisCut("pairh_prefilter1")); return cut; } - if (!nameStr.compare("pairi_prefilter1")) { + if (nameStr == "pairi_prefilter1") { cut->AddCut(GetAnalysisCut("pairi_prefilter1")); return cut; } - if (!nameStr.compare("pairJpsi")) { + if (nameStr == "pairJpsi") { cut->AddCut(GetAnalysisCut("pairJpsi")); return cut; } - if (!nameStr.compare("pairJpsi2")) { + if (nameStr == "pairJpsi2") { cut->AddCut(GetAnalysisCut("pairJpsi2")); return cut; } - if (!nameStr.compare("pairJpsi3")) { + if (nameStr == "pairJpsi3") { cut->AddCut(GetAnalysisCut("pairJpsi3")); return cut; } - if (!nameStr.compare("pairPsi2S")) { + if (nameStr == "pairPsi2S") { cut->AddCut(GetAnalysisCut("pairPsi2S")); return cut; } - if (!nameStr.compare("pairUpsilon")) { + if (nameStr == "pairUpsilon") { cut->AddCut(GetAnalysisCut("pairUpsilon")); return cut; } - if (!nameStr.compare("pairX3872Cut1")) { + if (nameStr == "pairX3872Cut1") { cut->AddCut(GetAnalysisCut("pairX3872")); return cut; } - if (!nameStr.compare("pairX3872Cut2")) { + if (nameStr == "pairX3872Cut2") { cut->AddCut(GetAnalysisCut("pairX3872_2")); return cut; } - if (!nameStr.compare("pairX3872Cut3")) { + if (nameStr == "pairX3872Cut3") { cut->AddCut(GetAnalysisCut("pairX3872_3")); return cut; } - if (!nameStr.compare("DipionPairCut1")) { + if (nameStr == "DipionPairCut1") { cut->AddCut(GetAnalysisCut("DipionMassCut1")); return cut; } - if (!nameStr.compare("DipionPairCut2")) { + if (nameStr == "DipionPairCut2") { cut->AddCut(GetAnalysisCut("DipionMassCut2")); return cut; } - if (!nameStr.compare("pairRapidityForward")) { + if (nameStr == "pairRapidityForward") { cut->AddCut(GetAnalysisCut("pairRapidityForward")); return cut; } - if (!nameStr.compare("pairJpsiLowPt1")) { + if (nameStr == "pairJpsiLowPt1") { cut->AddCut(GetAnalysisCut("pairJpsi")); cut->AddCut(GetAnalysisCut("pairPtLow1")); return cut; } - if (!nameStr.compare("pairJpsiLowPt2")) { + if (nameStr == "pairJpsiLowPt2") { cut->AddCut(GetAnalysisCut("pairJpsi")); cut->AddCut(GetAnalysisCut("pairPtLow2")); return cut; } - if (!nameStr.compare("pairCoherentRho0")) { + if (nameStr == "pairCoherentRho0") { cut->AddCut(GetAnalysisCut("pairPtLow3")); return cut; } - if (!nameStr.compare("pairD0")) { + if (nameStr == "pairD0") { cut->AddCut(GetAnalysisCut("pairD0")); return cut; } - if (!nameStr.compare("pairD0HighPt1")) { + if (nameStr == "pairD0HighPt1") { cut->AddCut(GetAnalysisCut("pairLxyzProjected3sigma")); cut->AddCut(GetAnalysisCut("pairPtLow5")); return cut; } - if (!nameStr.compare("pairD0HighPt2")) { + if (nameStr == "pairD0HighPt2") { cut->AddCut(GetAnalysisCut("pairTauxyzProjected1")); cut->AddCut(GetAnalysisCut("pairPtLow5")); return cut; } - if (!nameStr.compare("pairD0HighPt3")) { + if (nameStr == "pairD0HighPt3") { cut->AddCut(GetAnalysisCut("pairTauxyzProjected1sigma")); cut->AddCut(GetAnalysisCut("pairPtLow5")); return cut; } - if (!nameStr.compare("pairTauxyzProjected1")) { + if (nameStr == "pairTauxyzProjected1") { cut->AddCut(GetAnalysisCut("pairTauxyzProjected1")); return cut; } - if (!nameStr.compare("pairLxyProjected3sigmaLambdacCand")) { + if (nameStr == "pairLxyProjected3sigmaLambdacCand") { cut->AddCut(GetAnalysisCut("pairLxyProjected3sigmaLambdacCand")); return cut; } - if (!nameStr.compare("pairLxyProjected3sigmaDplusCand")) { + if (nameStr == "pairLxyProjected3sigmaDplusCand") { cut->AddCut(GetAnalysisCut("pairLxyProjected3sigmaDplusCand")); return cut; } - if (!nameStr.compare("pairCosPointingPos")) { + if (nameStr == "pairCosPointingPos") { cut->AddCut(GetAnalysisCut("pairCosPointingPos")); return cut; } - if (!nameStr.compare("pairCosPointingNeg90")) { + if (nameStr == "pairCosPointingNeg90") { cut->AddCut(GetAnalysisCut("pairCosPointingNeg90")); return cut; } - if (!nameStr.compare("pairCosPointingNeg85")) { + if (nameStr == "pairCosPointingNeg85") { cut->AddCut(GetAnalysisCut("pairCosPointingNeg85")); return cut; } - if (!nameStr.compare("pairTauxyzProjectedCosPointing1")) { + if (nameStr == "pairTauxyzProjectedCosPointing1") { cut->AddCut(GetAnalysisCut("pairCosPointingNeg")); cut->AddCut(GetAnalysisCut("pairTauxyzProjected1")); return cut; @@ -3717,122 +3717,122 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // Below are a list of single electron single muon and in order or optimize the trigger // trigger selection cuts - if (!nameStr.compare("jpsiO2TriggerTestCuts_LooseNsigma")) { + if (nameStr == "jpsiO2TriggerTestCuts_LooseNsigma") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaOpen")); return cut; } - if (!nameStr.compare("jpsiO2TriggerTestCuts_LooseNsigma_corr")) { + if (nameStr == "jpsiO2TriggerTestCuts_LooseNsigma_corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug5")); return cut; } - if (!nameStr.compare("jpsiO2TriggerTestCuts_MediumNsigma")) { + if (nameStr == "jpsiO2TriggerTestCuts_MediumNsigma") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaOpen")); return cut; } - if (!nameStr.compare("jpsiO2TriggerTestCuts_MediumNsigma_corr")) { + if (nameStr == "jpsiO2TriggerTestCuts_MediumNsigma_corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug1")); return cut; } - if (!nameStr.compare("jpsiO2TriggerTestCuts_TightNsigma")) { + if (nameStr == "jpsiO2TriggerTestCuts_TightNsigma") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("electronPIDnsigma")); return cut; } - if (!nameStr.compare("jpsiO2TriggerTestCuts_TightNsigma_corr")) { + if (nameStr == "jpsiO2TriggerTestCuts_TightNsigma_corr") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_debug2")); return cut; } - if (!nameStr.compare("jpsiO2TriggerTestCuts_TPCPID1")) { + if (nameStr == "jpsiO2TriggerTestCuts_TPCPID1") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TriggerTest1")); return cut; } - if (!nameStr.compare("jpsiO2TriggerTestCuts_TPCPID2")) { + if (nameStr == "jpsiO2TriggerTestCuts_TPCPID2") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TriggerTest2")); return cut; } - if (!nameStr.compare("jpsiO2TriggerTestCuts_TPCPID3")) { + if (nameStr == "jpsiO2TriggerTestCuts_TPCPID3") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TriggerTest3")); return cut; } - if (!nameStr.compare("jpsiO2TriggerTestCuts_TPCPID4")) { + if (nameStr == "jpsiO2TriggerTestCuts_TPCPID4") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronStandardQualityTriggerTest")); cut->AddCut(GetAnalysisCut("jpsi_TPCPID_TriggerTest4")); return cut; } - if (!nameStr.compare("emu_electron_test")) { + if (nameStr == "emu_electron_test") { cut->AddCut(GetAnalysisCut("jpsiStandardKine")); cut->AddCut(GetAnalysisCut("electronTrackQuality_Maolin")); cut->AddCut(GetAnalysisCut("electronPIDnsigmaEMu")); return cut; } - if (!nameStr.compare("muonLooseTriggerTestCuts")) { + if (nameStr == "muonLooseTriggerTestCuts") { cut->AddCut(GetAnalysisCut("muonLooseTriggerTestCuts")); return cut; } - if (!nameStr.compare("muonLooseTriggerTestCuts_LowPt")) { + if (nameStr == "muonLooseTriggerTestCuts_LowPt") { cut->AddCut(GetAnalysisCut("muonLowPt")); cut->AddCut(GetAnalysisCut("muonLooseTriggerTestCuts")); return cut; } - if (!nameStr.compare("muonLooseTriggerTestCuts_HighPt2")) { + if (nameStr == "muonLooseTriggerTestCuts_HighPt2") { cut->AddCut(GetAnalysisCut("muonHighPt2")); cut->AddCut(GetAnalysisCut("muonLooseTriggerTestCuts")); return cut; } - if (!nameStr.compare("muonLooseTriggerTestCuts_HighPt3")) { + if (nameStr == "muonLooseTriggerTestCuts_HighPt3") { cut->AddCut(GetAnalysisCut("muonHighPt3")); cut->AddCut(GetAnalysisCut("muonLooseTriggerTestCuts")); return cut; } - if (!nameStr.compare("muonHighPtMatchingOnly2")) { + if (nameStr == "muonHighPtMatchingOnly2") { cut->AddCut(GetAnalysisCut("muonHighPt2")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonHighPtMatchingOnly3")) { + if (nameStr == "muonHighPtMatchingOnly3") { cut->AddCut(GetAnalysisCut("muonHighPt3")); cut->AddCut(GetAnalysisCut("muonQualityCutsMatchingOnly")); return cut; } - if (!nameStr.compare("muonMatchingMFTMCHTriggerTestCuts")) { + if (nameStr == "muonMatchingMFTMCHTriggerTestCuts") { cut->AddCut(GetAnalysisCut("muonMatchingMFTMCHTriggerTestCuts")); return cut; } - if (!nameStr.compare("muonMatchingMFTMCHTriggerTestCuts_LowPt")) { + if (nameStr == "muonMatchingMFTMCHTriggerTestCuts_LowPt") { cut->AddCut(GetAnalysisCut("muonLowPt")); cut->AddCut(GetAnalysisCut("muonMatchingMFTMCHTriggerTestCuts")); return cut; @@ -3841,175 +3841,175 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) //--------------------------------------------------------------- // ALICE 3 studies composite cuts - if (!nameStr.compare("alice3StandardKine")) { + if (nameStr == "alice3StandardKine") { cut->AddCut(GetAnalysisCut("alice3StandardKine")); return cut; } - if (!nameStr.compare("alice3KineSkim")) { + if (nameStr == "alice3KineSkim") { cut->AddCut(GetAnalysisCut("alice3KineSkim")); return cut; } - if (!nameStr.compare("alice3TrackQuality")) { + if (nameStr == "alice3TrackQuality") { cut->AddCut(GetAnalysisCut("alice3TrackQuality")); return cut; } - if (!nameStr.compare("alice3TrackQualityTightDCA")) { + if (nameStr == "alice3TrackQualityTightDCA") { cut->AddCut(GetAnalysisCut("alice3TrackQuality")); return cut; } - if (!nameStr.compare("alice3StandardTrack")) { + if (nameStr == "alice3StandardTrack") { cut->AddCut(GetAnalysisCut("alice3StandardKine")); cut->AddCut(GetAnalysisCut("alice3TrackQuality")); return cut; } - if (!nameStr.compare("alice3StandardTrackTOFAcceptance")) { + if (nameStr == "alice3StandardTrackTOFAcceptance") { cut->AddCut(GetAnalysisCut("alice3KineTOFAcceptance")); cut->AddCut(GetAnalysisCut("alice3TrackQuality")); return cut; } - if (!nameStr.compare("alice3StandardTrackRICHAcceptance")) { + if (nameStr == "alice3StandardTrackRICHAcceptance") { cut->AddCut(GetAnalysisCut("alice3KineRICHAcceptance")); cut->AddCut(GetAnalysisCut("alice3TrackQuality")); return cut; } - if (!nameStr.compare("alice3TightDCATrack")) { + if (nameStr == "alice3TightDCATrack") { cut->AddCut(GetAnalysisCut("alice3StandardKine")); cut->AddCut(GetAnalysisCut("alice3TrackQualityTightDCA")); return cut; } - if (!nameStr.compare("alice3TightDCATrackTOFAcceptance")) { + if (nameStr == "alice3TightDCATrackTOFAcceptance") { cut->AddCut(GetAnalysisCut("alice3KineTOFAcceptance")); cut->AddCut(GetAnalysisCut("alice3TrackQualityTightDCA")); return cut; } - if (!nameStr.compare("alice3TightDCATrackRICHAcceptance")) { + if (nameStr == "alice3TightDCATrackRICHAcceptance") { cut->AddCut(GetAnalysisCut("alice3KineRICHAcceptance")); cut->AddCut(GetAnalysisCut("alice3TrackQualityTightDCA")); return cut; } - if (!nameStr.compare("alice3iTOFPIDEl")) { + if (nameStr == "alice3iTOFPIDEl") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDEl")); return cut; } - if (!nameStr.compare("alice3iTOFPIDPi")) { + if (nameStr == "alice3iTOFPIDPi") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDPi")); return cut; } - if (!nameStr.compare("alice3iTOFPIDKa")) { + if (nameStr == "alice3iTOFPIDKa") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDKa")); return cut; } - if (!nameStr.compare("alice3iTOFPIDPr")) { + if (nameStr == "alice3iTOFPIDPr") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDPr")); return cut; } - if (!nameStr.compare("alice3oTOFPIDEl")) { + if (nameStr == "alice3oTOFPIDEl") { cut->AddCut(GetAnalysisCut("alice3oTOFPIDEl")); return cut; } - if (!nameStr.compare("alice3oTOFPIDPi")) { + if (nameStr == "alice3oTOFPIDPi") { cut->AddCut(GetAnalysisCut("alice3oTOFPIDPi")); return cut; } - if (!nameStr.compare("alice3oTOFPIDKa")) { + if (nameStr == "alice3oTOFPIDKa") { cut->AddCut(GetAnalysisCut("alice3oTOFPIDKa")); return cut; } - if (!nameStr.compare("alice3oTOFPIDPr")) { + if (nameStr == "alice3oTOFPIDPr") { cut->AddCut(GetAnalysisCut("alice3oTOFPIDPr")); return cut; } - if (!nameStr.compare("alice3FullTOFPIDEl")) { + if (nameStr == "alice3FullTOFPIDEl") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDEl")); cut->AddCut(GetAnalysisCut("alice3oTOFPIDEl")); return cut; } - if (!nameStr.compare("alice3FullTOFPIDPi")) { + if (nameStr == "alice3FullTOFPIDPi") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDPi")); cut->AddCut(GetAnalysisCut("alice3oTOFPIDPi")); return cut; } - if (!nameStr.compare("alice3FullTOFPIDKa")) { + if (nameStr == "alice3FullTOFPIDKa") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDKa")); cut->AddCut(GetAnalysisCut("alice3oTOFPIDKa")); return cut; } - if (!nameStr.compare("alice3FullTOFPIDPr")) { + if (nameStr == "alice3FullTOFPIDPr") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDPr")); cut->AddCut(GetAnalysisCut("alice3oTOFPIDPr")); return cut; } - if (!nameStr.compare("alice3RICHPIDEl")) { + if (nameStr == "alice3RICHPIDEl") { cut->AddCut(GetAnalysisCut("alice3RICHPIDEl")); return cut; } - if (!nameStr.compare("alice3RICHPIDPi")) { + if (nameStr == "alice3RICHPIDPi") { cut->AddCut(GetAnalysisCut("alice3RICHPIDPi")); return cut; } - if (!nameStr.compare("alice3RICHPIDKa")) { + if (nameStr == "alice3RICHPIDKa") { cut->AddCut(GetAnalysisCut("alice3RICHPIDKa")); return cut; } - if (!nameStr.compare("alice3RICHPIDPr")) { + if (nameStr == "alice3RICHPIDPr") { cut->AddCut(GetAnalysisCut("alice3RICHPIDPr")); return cut; } - if (!nameStr.compare("alice3RICHTOFPIDEl")) { + if (nameStr == "alice3RICHTOFPIDEl") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDEl")); cut->AddCut(GetAnalysisCut("alice3oTOFPIDEl")); cut->AddCut(GetAnalysisCut("alice3RICHPIDEl")); return cut; } - if (!nameStr.compare("alice3RICHTOFPIDPi")) { + if (nameStr == "alice3RICHTOFPIDPi") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDPi")); cut->AddCut(GetAnalysisCut("alice3oTOFPIDPi")); cut->AddCut(GetAnalysisCut("alice3RICHPIDPi")); return cut; } - if (!nameStr.compare("alice3RICHTOFPIDKa")) { + if (nameStr == "alice3RICHTOFPIDKa") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDKa")); cut->AddCut(GetAnalysisCut("alice3oTOFPIDKa")); cut->AddCut(GetAnalysisCut("alice3RICHPIDKa")); return cut; } - if (!nameStr.compare("alice3RICHTOFPIDPr")) { + if (nameStr == "alice3RICHTOFPIDPr") { cut->AddCut(GetAnalysisCut("alice3iTOFPIDPr")); cut->AddCut(GetAnalysisCut("alice3oTOFPIDPr")); cut->AddCut(GetAnalysisCut("alice3RICHPIDPr")); return cut; } - if (!nameStr.compare("alice3DielectronPID")) { + if (nameStr == "alice3DielectronPID") { cut->AddCut(GetAnalysisCut("alice3JpsiKine")); cut->AddCut(GetAnalysisCut("alice3TrackQuality")); cut->AddCut(GetAnalysisCut("alice3iTOFPIDEl")); @@ -4018,7 +4018,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("alice3DielectronPIDTOFOnly")) { + if (nameStr == "alice3DielectronPIDTOFOnly") { cut->AddCut(GetAnalysisCut("alice3JpsiKineTOFAcceptance")); cut->AddCut(GetAnalysisCut("alice3TrackQuality")); cut->AddCut(GetAnalysisCut("alice3iTOFPIDEl")); @@ -4026,7 +4026,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("alice3DielectronPIDRICHOnly")) { + if (nameStr == "alice3DielectronPIDRICHOnly") { cut->AddCut(GetAnalysisCut("alice3JpsiKineTOFAcceptance")); cut->AddCut(GetAnalysisCut("alice3TrackQuality")); cut->AddCut(GetAnalysisCut("alice3iTOFPIDEl")); @@ -4034,7 +4034,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("alice3DielectronPIDTOFOnly")) { + if (nameStr == "alice3DielectronPIDTOFOnly") { cut->AddCut(GetAnalysisCut("alice3JpsiKine")); cut->AddCut(GetAnalysisCut("alice3TrackQuality")); cut->AddCut(GetAnalysisCut("alice3iTOFPIDEl")); @@ -4042,7 +4042,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("alice3DielectronPIDTOFAcceptance")) { + if (nameStr == "alice3DielectronPIDTOFAcceptance") { cut->AddCut(GetAnalysisCut("alice3JpsiKineTOFAcceptance")); cut->AddCut(GetAnalysisCut("alice3TrackQuality")); cut->AddCut(GetAnalysisCut("alice3iTOFPIDEl")); @@ -4051,7 +4051,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (!nameStr.compare("alice3DielectronPIDRICHAcceptance")) { + if (nameStr == "alice3DielectronPIDRICHAcceptance") { cut->AddCut(GetAnalysisCut("alice3JpsiKineRICHAcceptance")); cut->AddCut(GetAnalysisCut("alice3TrackQuality")); cut->AddCut(GetAnalysisCut("alice3iTOFPIDEl")); @@ -4074,46 +4074,46 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) std::string nameStr = cutName; // --------------------------------------------------------------- // Event cuts - if (!nameStr.compare("noEventCut")) { + if (nameStr == "noEventCut") { return cut; } - if (!nameStr.compare("eventNoTFBorder")) { + if (nameStr == "eventNoTFBorder") { cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventIsTVXTriggered")) { + if (nameStr == "eventIsTVXTriggered") { cut->AddCut(VarManager::kIsTVXTriggered, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventStandard")) { + if (nameStr == "eventStandard") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsINT7, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventStandardNoINT7")) { + if (nameStr == "eventStandardNoINT7") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); return cut; } - if (!nameStr.compare("eventStandardtest")) { + if (nameStr == "eventStandardtest") { cut->AddCut(VarManager::kVtxZ, -30.0, 30.0); return cut; } - if (!nameStr.compare("eventSel8")) { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder + if (nameStr == "eventSel8") { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventStandardSel8")) { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder + if (nameStr == "eventStandardSel8") { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventStandardSel8WithITSROFRecomputedCut")) { + if (nameStr == "eventStandardSel8WithITSROFRecomputedCut") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4121,14 +4121,14 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8NoTFBorder")) { // Redundant w.r.t. eventStandardSel8, to be removed + if (nameStr == "eventStandardSel8NoTFBorder") { // Redundant w.r.t. eventStandardSel8, to be removed cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventStandardSel8NoTFBNoITSROFB")) { // Redundant w.r.t. eventStandardSel8, to be removed + if (nameStr == "eventStandardSel8NoTFBNoITSROFB") { // Redundant w.r.t. eventStandardSel8, to be removed cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4136,7 +4136,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8NoTFBNoITSROFBrecomp")) { + if (nameStr == "eventStandardSel8NoTFBNoITSROFBrecomp") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4144,33 +4144,33 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventSel8NoSameBunch")) { + if (nameStr == "eventSel8NoSameBunch") { cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoSameBunch, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventSel8TriggerZNAZNC")) { + if (nameStr == "eventSel8TriggerZNAZNC") { cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsTriggerZNAZNC, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventSel8TriggerZNAZNCNoPileUp")) { + if (nameStr == "eventSel8TriggerZNAZNCNoPileUp") { cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsTriggerZNAZNC, 0.5, 1.5); cut->AddCut(VarManager::kIsNoSameBunch, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventSel8NoSameBunchGoodZvtx")) { + if (nameStr == "eventSel8NoSameBunchGoodZvtx") { cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoSameBunch, 0.5, 1.5); cut->AddCut(VarManager::kIsGoodZvtxFT0vsPV, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventStandardSel8PbPbQuality")) { + if (nameStr == "eventStandardSel8PbPbQuality") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4180,7 +4180,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8NoPileup")) { + if (nameStr == "eventStandardSel8NoPileup") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoSameBunch, 0.5, 1.5); @@ -4189,7 +4189,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8PbPbQualityCent90")) { + if (nameStr == "eventStandardSel8PbPbQualityCent90") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4200,7 +4200,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8PbPbQualityGoodITSLayersAll")) { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder + if (nameStr == "eventStandardSel8PbPbQualityGoodITSLayersAll") { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4211,7 +4211,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8PbPbQualityTightTrackOccupancy")) { + if (nameStr == "eventStandardSel8PbPbQualityTightTrackOccupancy") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4223,7 +4223,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8PbPbQualityFirmTrackOccupancy")) { + if (nameStr == "eventStandardSel8PbPbQualityFirmTrackOccupancy") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4236,7 +4236,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8PbPbQualityLooseTrackOccupancy")) { + if (nameStr == "eventStandardSel8PbPbQualityLooseTrackOccupancy") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4249,7 +4249,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8PbPbQualityTightTrackOccupancyCollInTime")) { + if (nameStr == "eventStandardSel8PbPbQualityTightTrackOccupancyCollInTime") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4263,7 +4263,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8PbPbQualityTightTrackOccupancyCollInTime")) { + if (nameStr == "eventStandardSel8PbPbQualityTightTrackOccupancyCollInTime") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4292,7 +4292,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) 50000.}; for (size_t icase = 0; icase < vecOccupancies.size() - 1; icase++) { - if (!nameStr.compare(Form("eventStandardSel8PbPbQualityTrackOccupancySlice%lu", icase))) { + if (nameStr == Form("eventStandardSel8PbPbQualityTrackOccupancySlice%lu", icase)) { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4307,7 +4307,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } for (size_t icase = 0; icase < vecOccupancies.size() - 1; icase++) { - if (!nameStr.compare(Form("eventStandardSel8PbPbQualityTrackOccupancySlice_0_%lu", icase))) { + if (nameStr == Form("eventStandardSel8PbPbQualityTrackOccupancySlice_0_%lu", icase)) { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4321,7 +4321,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } } - if (!nameStr.compare("eventStandardSel8ppQuality")) { + if (nameStr == "eventStandardSel8ppQuality") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4333,7 +4333,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8ppQualityNoVtxZ")) { + if (nameStr == "eventStandardSel8ppQualityNoVtxZ") { cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); cut->AddCut(VarManager::kIsNoITSROFBorder, 0.5, 1.5); @@ -4344,7 +4344,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8multAnalysis")) { + if (nameStr == "eventStandardSel8multAnalysis") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5); @@ -4354,7 +4354,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8VtxQuality1")) { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder + if (nameStr == "eventStandardSel8VtxQuality1") { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kIsSel8, 0.5, 1.5); cut->AddCut(VarManager::kIsNoSameBunch, 0.5, 1.5); @@ -4363,7 +4363,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventStandardSel8PbPbMultCorr")) { + if (nameStr == "eventStandardSel8PbPbMultCorr") { std::shared_ptr fMultPVCutLow = std::make_shared("fMultPVCutLow", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x - 3.5*([5]+[6]*x+[7]*x*x+[8]*x*x*x+[9]*x*x*x*x)", 0, 100); fMultPVCutLow->SetParameters(3257.29, -121.848, 1.98492, -0.0172128, 6.47528e-05, 154.756, -1.86072, -0.0274713, 0.000633499, -3.37757e-06); std::shared_ptr fMultPVCutHigh = std::make_shared("fMultPVCutHigh", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x + 3.5*([5]+[6]*x+[7]*x*x+[8]*x*x*x+[9]*x*x*x*x)", 0, 100); @@ -4382,77 +4382,77 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("eventDimuonStandard")) { + if (nameStr == "eventDimuonStandard") { cut->AddCut(VarManager::kIsMuonUnlikeLowPt7, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventMuonStandard")) { + if (nameStr == "eventMuonStandard") { cut->AddCut(VarManager::kIsMuonSingleLowPt7, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventTPCMultLow")) { + if (nameStr == "eventTPCMultLow") { cut->AddCut(VarManager::kMultTPC, 0, 50); return cut; } - if (!nameStr.compare("eventExclusivePair")) { + if (nameStr == "eventExclusivePair") { cut->AddCut(VarManager::kVtxNcontrib, 2, 2); return cut; } - if (!nameStr.compare("eventVtxNContrib")) { + if (nameStr == "eventVtxNContrib") { cut->AddCut(VarManager::kVtxNcontrib, 0, 10); return cut; } - if (!nameStr.compare("eventTPCMult3")) { + if (nameStr == "eventTPCMult3") { cut->AddCut(VarManager::kMultTPC, 3, 3); return cut; } - if (!nameStr.compare("int7vtxZ5")) { + if (nameStr == "int7vtxZ5") { cut->AddCut(VarManager::kVtxZ, -5.0, 5.0); cut->AddCut(VarManager::kIsINT7, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventDoubleGap")) { + if (nameStr == "eventDoubleGap") { cut->AddCut(VarManager::kIsDoubleGap, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventSingleGap")) { + if (nameStr == "eventSingleGap") { cut->AddCut(VarManager::kIsSingleGap, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventSingleGapA")) { + if (nameStr == "eventSingleGapA") { cut->AddCut(VarManager::kIsSingleGapA, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventSingleGapAZDC")) { + if (nameStr == "eventSingleGapAZDC") { cut->AddCut(VarManager::kIsSingleGapA, 0.5, 1.5); cut->AddCut(VarManager::kEnergyCommonZNA, -1000., 1.); cut->AddCut(VarManager::kEnergyCommonZNC, 1., 1000.); return cut; } - if (!nameStr.compare("eventSingleGapC")) { + if (nameStr == "eventSingleGapC") { cut->AddCut(VarManager::kIsSingleGapC, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventSingleGapCZDC")) { + if (nameStr == "eventSingleGapCZDC") { cut->AddCut(VarManager::kIsSingleGapC, 0.5, 1.5); cut->AddCut(VarManager::kEnergyCommonZNC, -1000., 1.); cut->AddCut(VarManager::kEnergyCommonZNA, 1., 1000.); return cut; } - if (!nameStr.compare("eventSingleGapACZDC")) { + if (nameStr == "eventSingleGapACZDC") { AnalysisCompositeCut* cutA = new AnalysisCompositeCut("singleGapAZDC", "singleGapAZDC", kTRUE); cutA->AddCut(GetAnalysisCut("eventSingleGapAZDC")); @@ -4465,12 +4465,12 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cutAorC; } - if (!nameStr.compare("eventUPCMode")) { + if (nameStr == "eventUPCMode") { cut->AddCut(VarManager::kIsITSUPCMode, 0.5, 1.5); return cut; } - if (!nameStr.compare("eventSingleGapACZDC_UPCMode")) { + if (nameStr == "eventSingleGapACZDC_UPCMode") { AnalysisCompositeCut* cutA = new AnalysisCompositeCut("singleGapAZDC", "singleGapAZDC", kTRUE); cutA->AddCut(GetAnalysisCut("eventSingleGapAZDC")); cutA->AddCut(GetAnalysisCut("eventUPCMode")); @@ -4485,62 +4485,62 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cutAorC; } - if (!nameStr.compare("eventXn0nTime")) { + if (nameStr == "eventXn0nTime") { cut->AddCut(VarManager::kTimeZNA, -2.0, 2.0); cut->AddCut(VarManager::kTimeZNC, -2.0, 2.0, true); return cut; } - if (!nameStr.compare("event0nXnTime")) { + if (nameStr == "event0nXnTime") { cut->AddCut(VarManager::kTimeZNA, -2.0, 2.0, true); cut->AddCut(VarManager::kTimeZNC, -2.0, 2.0); return cut; } - if (!nameStr.compare("event0n0nTime")) { + if (nameStr == "event0n0nTime") { cut->AddCut(VarManager::kTimeZNA, -2.0, 2.0, true); cut->AddCut(VarManager::kTimeZNC, -2.0, 2.0, true); return cut; } - if (!nameStr.compare("eventXnXnTime")) { + if (nameStr == "eventXnXnTime") { cut->AddCut(VarManager::kTimeZNA, -2.0, 2.0); cut->AddCut(VarManager::kTimeZNC, -2.0, 2.0); return cut; } // Event cuts based on centrality - if (!nameStr.compare("eventStandardNoINT7Cent090")) { + if (nameStr == "eventStandardNoINT7Cent090") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kCentFT0C, 0.0, 90.0); return cut; } - if (!nameStr.compare("eventStandardNoINT7Cent7090")) { + if (nameStr == "eventStandardNoINT7Cent7090") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kCentFT0C, 70.0, 90.0); return cut; } - if (!nameStr.compare("eventStandardNoINT7Cent5070")) { + if (nameStr == "eventStandardNoINT7Cent5070") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kCentFT0C, 50.0, 70.0); return cut; } - if (!nameStr.compare("eventStandardNoINT7Cent3050")) { + if (nameStr == "eventStandardNoINT7Cent3050") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kCentFT0C, 30.0, 50.0); return cut; } - if (!nameStr.compare("eventStandardNoINT7Cent1030")) { + if (nameStr == "eventStandardNoINT7Cent1030") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kCentFT0C, 10.0, 30.0); return cut; } - if (!nameStr.compare("eventStandardNoINT7Cent010")) { + if (nameStr == "eventStandardNoINT7Cent010") { cut->AddCut(VarManager::kVtxZ, -10.0, 10.0); cut->AddCut(VarManager::kCentFT0C, 0.0, 10.0); return cut; @@ -4548,180 +4548,180 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // --------------------------------------------------- // Barrel track kine cuts - if (!nameStr.compare("negTrack")) { + if (nameStr == "negTrack") { cut->AddCut(VarManager::kCharge, -99., 0.); return cut; } - if (!nameStr.compare("posTrack")) { + if (nameStr == "posTrack") { cut->AddCut(VarManager::kCharge, 0., 99.); return cut; } - if (!nameStr.compare("posEtaSel")) { + if (nameStr == "posEtaSel") { cut->AddCut(VarManager::kEta, 0., 0.8); return cut; } - if (!nameStr.compare("negEtaSel")) { + if (nameStr == "negEtaSel") { cut->AddCut(VarManager::kEta, -0.8, 0.); return cut; } - if (!nameStr.compare("etaSel")) { + if (nameStr == "etaSel") { cut->AddCut(VarManager::kEta, -0.8, 0.8); return cut; } - if (!nameStr.compare("pt02Sel")) { + if (nameStr == "pt02Sel") { cut->AddCut(VarManager::kPt, 0.2, 20.0); return cut; } - if (!nameStr.compare("pt04Sel")) { + if (nameStr == "pt04Sel") { cut->AddCut(VarManager::kPt, 0.4, 20.0); return cut; } - if (!nameStr.compare("openEtaSel")) { + if (nameStr == "openEtaSel") { cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("insideTPCsector")) { + if (nameStr == "insideTPCsector") { cut->AddCut(VarManager::kTrackIsInsideTPCModule, 0.5, 1.5); return cut; } - if (!nameStr.compare("rho0Kine")) { + if (nameStr == "rho0Kine") { cut->AddCut(VarManager::kPt, 0.1, 1000.0); cut->AddCut(VarManager::kEta, -1.1, 1.1); return cut; } - if (!nameStr.compare("pionQuality")) { + if (nameStr == "pionQuality") { cut->AddCut(VarManager::kTPCncls, 50.0, 1000.); return cut; } - if (!nameStr.compare("primaryVertexContributor")) { + if (nameStr == "primaryVertexContributor") { cut->AddCut(VarManager::kPVContributor, 0.5, 1.5); return cut; } - if (!nameStr.compare("jpsiStandardKine")) { + if (nameStr == "jpsiStandardKine") { cut->AddCut(VarManager::kPt, 1.0, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("jpsiStandardKine2")) { + if (nameStr == "jpsiStandardKine2") { cut->AddCut(VarManager::kPt, 0.9, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("jpsiStandardKine3")) { + if (nameStr == "jpsiStandardKine3") { cut->AddCut(VarManager::kP, 1.2, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("jpsiPIDcalibKine_posEta")) { + if (nameStr == "jpsiPIDcalibKine_posEta") { cut->AddCut(VarManager::kPin, 1.0, 1000.0); cut->AddCut(VarManager::kEta, 0.0, 0.9); return cut; } - if (!nameStr.compare("jpsiPIDcalibKine_negEta")) { + if (nameStr == "jpsiPIDcalibKine_negEta") { cut->AddCut(VarManager::kPin, 1.0, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.0); return cut; } - if (!nameStr.compare("jpsiStandardKine4")) { + if (nameStr == "jpsiStandardKine4") { cut->AddCut(VarManager::kP, 1.5, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("jpsiStandardKine5")) { + if (nameStr == "jpsiStandardKine5") { cut->AddCut(VarManager::kP, 1.0, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("jpsiKineSkimmed")) { + if (nameStr == "jpsiKineSkimmed") { cut->AddCut(VarManager::kPt, 0.7, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("jpsiKineSkimmed")) { + if (nameStr == "jpsiKineSkimmed") { cut->AddCut(VarManager::kPt, 0.7, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("lmeePrefilterKine")) { + if (nameStr == "lmeePrefilterKine") { cut->AddCut(VarManager::kPt, 0., 20.0); cut->AddCut(VarManager::kEta, -1.2, 1.2); return cut; } - if (!nameStr.compare("lmeeStandardKine")) { + if (nameStr == "lmeeStandardKine") { cut->AddCut(VarManager::kPt, 0.2, 20.0); cut->AddCut(VarManager::kEta, -0.8, 0.8); return cut; } - if (!nameStr.compare("lmeeStandardKine_pt04")) { + if (nameStr == "lmeeStandardKine_pt04") { cut->AddCut(VarManager::kPt, 0.4, 20.0); cut->AddCut(VarManager::kEta, -0.8, 0.8); return cut; } - if (!nameStr.compare("lmeeLowBKine")) { + if (nameStr == "lmeeLowBKine") { cut->AddCut(VarManager::kPt, 0.075, 20.0); cut->AddCut(VarManager::kEta, -0.8, 0.8); return cut; } - if (!nameStr.compare("dalitzStandardKine")) { + if (nameStr == "dalitzStandardKine") { cut->AddCut(VarManager::kPt, 0.15, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("PIDStandardKine")) { + if (nameStr == "PIDStandardKine") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kPt, 1.0, 1000.0); return cut; } - if (!nameStr.compare("PIDStandardKine2")) { + if (nameStr == "PIDStandardKine2") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kPt, 0.1, 1000.0); return cut; } - if (!nameStr.compare("PIDStandardKine3")) { + if (nameStr == "PIDStandardKine3") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kPt, 0.5, 1000.0); return cut; } - if (!nameStr.compare("pTLow04")) { + if (nameStr == "pTLow04") { cut->AddCut(VarManager::kPt, 0.4, 1000.0); return cut; } - if (!nameStr.compare("pTLow03")) { + if (nameStr == "pTLow03") { cut->AddCut(VarManager::kPt, 0.3, 1000.0); return cut; } - if (!nameStr.compare("pTLow02")) { + if (nameStr == "pTLow02") { cut->AddCut(VarManager::kPt, 0.2, 1000.0); return cut; } @@ -4732,17 +4732,17 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // --------------------------------------------------- // MC generated particle acceptance cuts - if (!nameStr.compare("rapidity08")) { + if (nameStr == "rapidity08") { cut->AddCut(VarManager::kMCY, -0.8, 0.8); return cut; } - if (!nameStr.compare("rapidity09")) { + if (nameStr == "rapidity09") { cut->AddCut(VarManager::kMCY, -0.9, 0.9); return cut; } - if (!nameStr.compare("acceptance_pp13600")) { + if (nameStr == "acceptance_pp13600") { cut->AddCut(VarManager::kMCY, -0.8, 0.8); cut->AddCut(VarManager::kMCPt1, 1.0, 1000.0); cut->AddCut(VarManager::kMCPt2, 1.0, 1000.0); @@ -4751,7 +4751,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("acceptance_pp5360")) { + if (nameStr == "acceptance_pp5360") { cut->AddCut(VarManager::kMCY, -0.9, 0.9); cut->AddCut(VarManager::kMCPt1, 1.0, 1000.0); cut->AddCut(VarManager::kMCPt2, 1.0, 1000.0); @@ -4760,7 +4760,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("acceptance_PbPb5360")) { + if (nameStr == "acceptance_PbPb5360") { cut->AddCut(VarManager::kMCY, -0.9, 0.9); cut->AddCut(VarManager::kMCP1, 1.0, 1000.0); cut->AddCut(VarManager::kMCP2, 1.0, 1000.0); @@ -4769,7 +4769,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("acceptance_PbPb5360_y08")) { + if (nameStr == "acceptance_PbPb5360_y08") { cut->AddCut(VarManager::kMCY, -0.8, 0.8); cut->AddCut(VarManager::kMCP1, 1.0, 1000.0); cut->AddCut(VarManager::kMCP2, 1.0, 1000.0); @@ -4783,7 +4783,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // Run 2 only - if (!nameStr.compare("highPtHadron")) { + if (nameStr == "highPtHadron") { cut->AddCut(VarManager::kPt, 4.0, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kIsITSrefit, 0.5, 1.5); @@ -4794,7 +4794,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("TightGlobalTrack")) { + if (nameStr == "TightGlobalTrack") { cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5); cut->AddCut(VarManager::kIsITSrefit, 0.5, 1.5); cut->AddCut(VarManager::kIsTPCrefit, 0.5, 1.5); @@ -4806,7 +4806,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronStandardQuality")) { + if (nameStr == "electronStandardQuality") { cut->AddCut(VarManager::kIsSPDany, 0.5, 1.5); cut->AddCut(VarManager::kIsITSrefit, 0.5, 1.5); cut->AddCut(VarManager::kIsTPCrefit, 0.5, 1.5); @@ -4816,7 +4816,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronStandardQualityBenchmark")) { + if (nameStr == "electronStandardQualityBenchmark") { cut->AddCut(VarManager::kIsITSrefit, 0.5, 1.5); cut->AddCut(VarManager::kIsTPCrefit, 0.5, 1.5); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); @@ -4827,7 +4827,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // Run 2 or run 3 - if (!nameStr.compare("jpsi_trackCut_debug")) { + if (nameStr == "jpsi_trackCut_debug") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 90., 159); @@ -4835,14 +4835,14 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_trackCut_noITSCuts_debug")) { + if (nameStr == "jpsi_trackCut_noITSCuts_debug") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 90., 159); return cut; } - if (!nameStr.compare("jpsi_trackCut_debug2")) { + if (nameStr == "jpsi_trackCut_debug2") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 90., 159); @@ -4853,7 +4853,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_trackCut_debug3")) { + if (nameStr == "jpsi_trackCut_debug3") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 90., 159); @@ -4867,7 +4867,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_trackCut_debug4")) { + if (nameStr == "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); @@ -4878,7 +4878,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_trackCut_debug5")) { + if (nameStr == "jpsi_trackCut_debug5") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 70., 159); @@ -4886,7 +4886,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_trackCut_debug6")) { + if (nameStr == "jpsi_trackCut_debug6") { cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 120., 159); cut->AddCut(VarManager::kTPCnclsCR, 140., 159); @@ -4895,7 +4895,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_trackCut_debug")) { + if (nameStr == "lmee_trackCut_debug") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 80., 159); @@ -4903,7 +4903,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_skimming_cuts")) { + if (nameStr == "lmee_skimming_cuts") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); @@ -4912,7 +4912,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("trackQuality_compareDQEMframework")) { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ + if (nameStr == "trackQuality_compareDQEMframework") { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5); cut->AddCut(VarManager::kITSchi2, 0.0, 5.0); cut->AddCut(VarManager::kITSncls, 4.5, 7.5); @@ -4923,7 +4923,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if ((!nameStr.compare("TightGlobalTrackRun3")) || (!nameStr.compare("lmeeQCTrackCuts"))) { + if ((nameStr == "TightGlobalTrackRun3") || (nameStr == "lmeeQCTrackCuts")) { cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kITSchi2, 0.0, 5.0); @@ -4947,7 +4947,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // loop to define PID cuts with and without post calibration for (size_t icase = 1; icase < vecTypetrack.size(); icase++) { - if (!nameStr.compare(Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data()))) { + if (nameStr == Form("lmeeQCTrackCuts%s", vecTypetrack.at(icase).Data())) { if (icase == 1) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); @@ -5004,7 +5004,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } } - if (!nameStr.compare("LooseGlobalTrackRun3")) { + if (nameStr == "LooseGlobalTrackRun3") { cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kITSchi2, 0.0, 6.0); @@ -5013,7 +5013,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("TightGlobalTrackRun3_strongTPC")) { + if (nameStr == "TightGlobalTrackRun3_strongTPC") { cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kITSchi2, 0.0, 5.0); @@ -5023,40 +5023,40 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("TightTPCTrackRun3")) { + if (nameStr == "TightTPCTrackRun3") { cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCnclsCR, 80.0, 161.); return cut; } - if (!nameStr.compare("TightTPCTrack")) { + if (nameStr == "TightTPCTrack") { cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCnclsCR, 80.0, 161.); cut->AddCut(VarManager::kIsTPCrefit, 0.5, 1.5); return cut; } - if (!nameStr.compare("SPDfirst")) { + if (nameStr == "SPDfirst") { cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5); return cut; } - if (!nameStr.compare("noTPC")) { + if (nameStr == "noTPC") { cut->AddCut(VarManager::kHasTPC, -0.5, 0.5); return cut; } - if (!nameStr.compare("SPDany")) { + if (nameStr == "SPDany") { cut->AddCut(VarManager::kIsSPDany, 0.5, 1.5); return cut; } - if (!nameStr.compare("ITSiball")) { + if (nameStr == "ITSiball") { cut->AddCut(VarManager::kIsITSibAll, 0.5, 1.5); return cut; } - if (!nameStr.compare("ITSibany")) { + if (nameStr == "ITSibany") { cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); return cut; } @@ -5069,7 +5069,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) std::vector cutVar_TPCnCls = {80., 100., 80., 90., 90., 80., 80., 80., 80., 90., 100., 100., 80., 80., 80., 80., 100., 90., 100., 90., 90., 100., 100., 80., 100., 90., 90., 100., 90., 90.}; for (unsigned int i = 0; i < cutVar_ITSchi2.size(); i++) { - if (!nameStr.compare(Form("lmeeCutVarTrackCuts%i", i))) { + if (nameStr == Form("lmeeCutVarTrackCuts%i", i)) { cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5); cut->AddCut(VarManager::kITSchi2, 0.0, cutVar_ITSchi2.at(i)); cut->AddCut(VarManager::kTPCchi2, 0.0, cutVar_TPCchi2.at(i)); @@ -5080,72 +5080,72 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } } - if (!nameStr.compare("electronStandardQualityForO2MCdebug")) { + if (nameStr == "electronStandardQualityForO2MCdebug") { cut->AddCut(VarManager::kIsSPDany, 0.5, 1.5); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 70, 161.); return cut; } - if (!nameStr.compare("electronStandardQualityForO2MCdebug2")) { + if (nameStr == "electronStandardQualityForO2MCdebug2") { cut->AddCut(VarManager::kIsSPDany, 0.5, 1.5); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 100.0, 161.); return cut; } - if (!nameStr.compare("electronStandardQualityForO2MCdebug3")) { + if (nameStr == "electronStandardQualityForO2MCdebug3") { cut->AddCut(VarManager::kITSncls, 0.5, 10); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 70, 161.); return cut; } - if (!nameStr.compare("electronStandardQualityForO2MCdebug4")) { + if (nameStr == "electronStandardQualityForO2MCdebug4") { cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 70, 161.); return cut; } - if (!nameStr.compare("electronStandardQualityITSOnly")) { + if (nameStr == "electronStandardQualityITSOnly") { cut->AddCut(VarManager::kIsSPDany, 0.5, 1.5); cut->AddCut(VarManager::kITSchi2, 0.0, 5.0); cut->AddCut(VarManager::kITSncls, 3.5, 7.5); return cut; } - if (!nameStr.compare("electronStandardQualitybAnyITSOnly")) { + if (nameStr == "electronStandardQualitybAnyITSOnly") { cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); cut->AddCut(VarManager::kITSchi2, 0.0, 5.0); cut->AddCut(VarManager::kITSncls, 3.5, 7.5); return cut; } - if (!nameStr.compare("electronStandardQualityTPCOnly")) { + if (nameStr == "electronStandardQualityTPCOnly") { cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 70, 161.); return cut; } - if (!nameStr.compare("electronStandardQualityTPCOnly2")) { + if (nameStr == "electronStandardQualityTPCOnly2") { cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 100, 161.); return cut; } - if (!nameStr.compare("electronStandardQualityTPCOnly3")) { + if (nameStr == "electronStandardQualityTPCOnly3") { cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); cut->AddCut(VarManager::kTPCncls, 120, 161.); return cut; } - if (!nameStr.compare("NoelectronStandardQualityTPCOnly")) { + if (nameStr == "NoelectronStandardQualityTPCOnly") { cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0, true, VarManager::kTPCncls, 70, 161.); return cut; } - if (!nameStr.compare("electronTrackQualitySkimmed")) { + if (nameStr == "electronTrackQualitySkimmed") { cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); cut->AddCut(VarManager::kITSchi2, 0.0, 5.0); cut->AddCut(VarManager::kTPCncls, 60, 161); @@ -5154,14 +5154,14 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronTrackQualitySkimmed2")) { + if (nameStr == "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("electronTrackQualitySkimmed3")) { + if (nameStr == "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); @@ -5170,7 +5170,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronTrackQuality_Maolin")) { + if (nameStr == "electronTrackQuality_Maolin") { cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); cut->AddCut(VarManager::kITSchi2, 0.0, 15.0); cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0); @@ -5181,14 +5181,14 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("pionQualityCut1")) { + if (nameStr == "pionQualityCut1") { cut->AddCut(VarManager::kPt, 0.15, 1000.0); cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); cut->AddCut(VarManager::kTPCncls, 70, 161); return cut; } - if (!nameStr.compare("pionQualityCut2")) { + if (nameStr == "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); @@ -5197,7 +5197,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("protonPVcut")) { + if (nameStr == "protonPVcut") { cut->AddCut(VarManager::kTrackDCAxy, -0.1, 0.1); cut->AddCut(VarManager::kTrackDCAz, -0.15, 0.15); cut->AddCut(VarManager::kPt, 0.4, 3); @@ -5208,31 +5208,31 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("pidbasic")) { + if (nameStr == "pidbasic") { cut->AddCut(VarManager::kEta, -0.9, 0.9); cut->AddCut(VarManager::kTPCncls, 60, 161.); return cut; } - if (!nameStr.compare("standardPrimaryTrack")) { + if (nameStr == "standardPrimaryTrack") { cut->AddCut(VarManager::kTrackDCAxy, -1.0, 1.0); cut->AddCut(VarManager::kTrackDCAz, -3.0, 3.0); return cut; } - if (!nameStr.compare("trackDCA1cm")) { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ + if (nameStr == "trackDCA1cm") { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ cut->AddCut(VarManager::kTrackDCAxy, -1.0, 1.0); cut->AddCut(VarManager::kTrackDCAz, -1.0, 1.0); return cut; } - if (!nameStr.compare("electronPrimary_dca3sigma") || !nameStr.compare("electronPrimary_dca7sigma")) { + if (nameStr == "electronPrimary_dca3sigma" || nameStr == "electronPrimary_dca7sigma") { std::shared_ptr fDCAxyresLow = std::make_shared("fDCAxyresLow", "[0] + [1] * pow(x, -[2])", 0.1, 1000.); std::shared_ptr fDCAzresLow = std::make_shared("fDCAzresLow", "[0] + [1] * pow(x, -[2])", 0.1, 1000.); std::shared_ptr fDCAxyresUp = std::make_shared("fDCAxyresUp", "[0] + [1] * pow(x, -[2])", 0.1, 1000.); std::shared_ptr fDCAzresUp = std::make_shared("fDCAzresUp", "[0] + [1] * pow(x, -[2])", 0.1, 1000.); - if (!nameStr.compare("electronPrimary_dca3sigma")) { + if (nameStr == "electronPrimary_dca3sigma") { // DCAxy and DCAz 3 sigma cut. DCA resolution vs pt extracted from fits of Users/m/mfaggin/test/inputsTrackTuner/pp2024/pass1_minBias/vsPhi (used for the track tuner) // we add in addition a term for the misalignment of the mean of the distribution, which seems to be at most 20 mum for DCAxy and 10 mum for DCAz fDCAxyresLow->SetParameters(-3 * 8.7e-4 - 20e-4, -3 * 25.4e-4, 0.79); // res is 8.7 + 25.4/pt^0.79 mum @@ -5248,7 +5248,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronPrimary_dca7sigma")) { + if (nameStr == "electronPrimary_dca7sigma") { // DCAxy and DCAz 7 sigma cut fDCAxyresLow->SetParameters(-7 * 8.7e-4 - 20e-4, -7 * 25.4e-4, 0.79); fDCAzresLow->SetParameters(-7 * 9.4e-4 - 10e-4, -7 * 26.5e-4, 0.79); @@ -5264,13 +5264,13 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } } - if (!nameStr.compare("dcaCut1_ionut")) { + if (nameStr == "dcaCut1_ionut") { cut->AddCut(VarManager::kTrackDCAxy, -0.5, 0.5); cut->AddCut(VarManager::kTrackDCAz, -0.5, 0.5); return cut; } - if (!nameStr.compare("trackQuality_ionut")) { + if (nameStr == "trackQuality_ionut") { cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); cut->AddCut(VarManager::kTPCncls, 70, 161); cut->AddCut(VarManager::kITSchi2, 0.0, 5.0); @@ -5278,7 +5278,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("trackQualityTight_ionut")) { + if (nameStr == "trackQualityTight_ionut") { cut->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); cut->AddCut(VarManager::kTPCncls, 100, 161); cut->AddCut(VarManager::kITSchi2, 0.0, 3.0); @@ -5287,13 +5287,13 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("kineJpsiEle_ionut")) { + if (nameStr == "kineJpsiEle_ionut") { cut->AddCut(VarManager::kP, 1.0, 15.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("pidJpsiEle0_ionut")) { + if (nameStr == "pidJpsiEle0_ionut") { cut->AddCut(VarManager::kTPCnSigmaEl, -2.0, 4.0, false, VarManager::kPin, 1.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 4.0, false, VarManager::kPin, 4.0, 150.0); cut->AddCut(VarManager::kTPCnSigmaEl, 98.1, 98.11, false, VarManager::kPin, 0.0, 1.0); @@ -5301,7 +5301,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("pidJpsiEle1_ionut")) { + if (nameStr == "pidJpsiEle1_ionut") { cut->AddCut(VarManager::kTPCnSigmaEl, -1.5, 4.0, false, VarManager::kPin, 1.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 4.0, false, VarManager::kPin, 4.0, 150.0); cut->AddCut(VarManager::kTPCnSigmaEl, 98.1, 98.11, false, VarManager::kPin, 0.0, 1.0); @@ -5309,144 +5309,144 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("pidJpsiEle2_ionut")) { + if (nameStr == "pidJpsiEle2_ionut") { cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPr, -4.0, 4.0, true); return cut; } - if (!nameStr.compare("pidJpsiEle3_ionut")) { + if (nameStr == "pidJpsiEle3_ionut") { cut->AddCut(VarManager::kTPCnSigmaEl, -0.5, 4.0); cut->AddCut(VarManager::kTPCnSigmaPr, -4.0, 4.0, true); return cut; } - if (!nameStr.compare("pidJpsiEle4_ionut")) { + if (nameStr == "pidJpsiEle4_ionut") { cut->AddCut(VarManager::kTPCnSigmaEl, 0.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPr, -4.0, 4.0, true); return cut; } - if (!nameStr.compare("pidJpsiEle5_ionut")) { + if (nameStr == "pidJpsiEle5_ionut") { cut->AddCut(VarManager::kTPCnSigmaEl, 0.5, 4.0); cut->AddCut(VarManager::kTPCnSigmaPr, -4.0, 4.0, true); return cut; } - if (!nameStr.compare("pidJpsiEle6_ionut")) { + if (nameStr == "pidJpsiEle6_ionut") { cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 4.0); cut->AddCut(VarManager::kTOFnSigmaEl, -1.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPr, -4.0, 4.0, true); return cut; } - if (!nameStr.compare("pidJpsiEle7_ionut")) { + if (nameStr == "pidJpsiEle7_ionut") { cut->AddCut(VarManager::kTOFnSigmaEl, -3.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 4.0); return cut; } - if (!nameStr.compare("pidJpsiEle8_ionut")) { + if (nameStr == "pidJpsiEle8_ionut") { cut->AddCut(VarManager::kTOFnSigmaEl, -3.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaEl, -1.5, 4.0); return cut; } - if (!nameStr.compare("pidJpsiEle9_ionut")) { + if (nameStr == "pidJpsiEle9_ionut") { cut->AddCut(VarManager::kTOFnSigmaEl, -3.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaEl, -2.0, 4.0); return cut; } - if (!nameStr.compare("pidJpsi_TPCpion0")) { + if (nameStr == "pidJpsi_TPCpion0") { cut->AddCut(VarManager::kTPCnSigmaPi, 4.0, 1000.0); return cut; } - if (!nameStr.compare("pidJpsi_noTOF_prot")) { + if (nameStr == "pidJpsi_noTOF_prot") { cut->AddCut(VarManager::kTPCnSigmaPr, 3.5, 1000.0, false, VarManager::kHasTOF, -0.5, 0.5); return cut; } - if (!nameStr.compare("pidJpsi_beta")) { + if (nameStr == "pidJpsi_beta") { cut->AddCut(VarManager::kTOFbeta, 0.98, 1.02, false, VarManager::kHasTOF, 0.5, 1.5); return cut; } // Magnus cuts ---------------------------------------------------------- - if (!nameStr.compare("pidJpsi_magnus_ele1")) { + if (nameStr == "pidJpsi_magnus_ele1") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 4.0); return cut; } - if (!nameStr.compare("pidJpsi_magnus_ele2")) { + if (nameStr == "pidJpsi_magnus_ele2") { cut->AddCut(VarManager::kTPCnSigmaEl, -2.0, 4.0); return cut; } - if (!nameStr.compare("pidJpsi_magnus_ele3")) { + if (nameStr == "pidJpsi_magnus_ele3") { cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 4.0); return cut; } - if (!nameStr.compare("pidJpsi_magnus_prot1")) { + if (nameStr == "pidJpsi_magnus_prot1") { cut->AddCut(VarManager::kTPCnSigmaPr, 3.0, 1000.0); return cut; } - if (!nameStr.compare("pidJpsi_magnus_prot2")) { + if (nameStr == "pidJpsi_magnus_prot2") { cut->AddCut(VarManager::kTPCnSigmaPr, 3.5, 1000.0); return cut; } - if (!nameStr.compare("pidJpsi_magnus_pion1")) { + if (nameStr == "pidJpsi_magnus_pion1") { cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 1000.0); return cut; } - if (!nameStr.compare("pidJpsi_magnus_pion2")) { + if (nameStr == "pidJpsi_magnus_pion2") { cut->AddCut(VarManager::kTPCnSigmaPi, 3.5, 1000.0); return cut; } // ---------------------------------------------------------------------------------- - if (!nameStr.compare("standardPrimaryTrackDCAz")) { + if (nameStr == "standardPrimaryTrackDCAz") { cut->AddCut(VarManager::kTrackDCAxy, -3.0, 3.0); cut->AddCut(VarManager::kTrackDCAz, -1.0, 1.0); return cut; } - if (!nameStr.compare("standardPrimaryTrackDCA")) { + if (nameStr == "standardPrimaryTrackDCA") { cut->AddCut(VarManager::kTrackDCAxy, -0.1, 0.1); cut->AddCut(VarManager::kTrackDCAz, -0.15, 0.15); return cut; } - if (!nameStr.compare("PrimaryTrack_looseDCA")) { + if (nameStr == "PrimaryTrack_looseDCA") { cut->AddCut(VarManager::kTrackDCAxy, -3.0, 3.0); cut->AddCut(VarManager::kTrackDCAz, -3.0, 3.0); return cut; } - if (!nameStr.compare("tightPrimaryTrack")) { + if (nameStr == "tightPrimaryTrack") { cut->AddCut(VarManager::kTrackDCAsigXY, -3.0, 3.0); cut->AddCut(VarManager::kTrackDCAsigZ, -3.0, 3.0); return cut; } - if (!nameStr.compare("PrimaryTrack_DCA05")) { + if (nameStr == "PrimaryTrack_DCA05") { cut->AddCut(VarManager::kTrackDCAsigXY, -0.5, 0.5); cut->AddCut(VarManager::kTrackDCAsigZ, -0.5, 0.5); return cut; } - if (!nameStr.compare("PrimaryTrack_DCAz")) { + if (nameStr == "PrimaryTrack_DCAz") { cut->AddCut(VarManager::kTrackDCAz, -0.3, 0.3); return cut; } - if (!nameStr.compare("hasTOF")) { + if (nameStr == "hasTOF") { cut->AddCut(VarManager::kHasTOF, 0.5, 1.5); return cut; } - if (!nameStr.compare("noTOF")) { + if (nameStr == "noTOF") { cut->AddCut(VarManager::kHasTOF, -0.5, 0.5); return cut; } @@ -5455,33 +5455,33 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // V0 and Dalitz legs selections for (int i = 1; i <= 8; i++) { // o2-linter: disable=magic-number (number of cuts) - if (!nameStr.compare(Form("dalitzLeg%d", i))) { + if (nameStr == Form("dalitzLeg%d", i)) { cut->AddCut(VarManager::kIsDalitzLeg + i - 1, 0.5, 1.5); return cut; } - if (!nameStr.compare(Form("notDalitzLeg%d", i))) { + if (nameStr == Form("notDalitzLeg%d", i)) { cut->AddCut(VarManager::kIsDalitzLeg + i - 1, -0.5, 0.5); return cut; } } - if (!nameStr.compare("pidcalib_ele")) { + if (nameStr == "pidcalib_ele") { cut->AddCut(VarManager::kIsLegFromGamma, 0.5, 1.5, false); return cut; } - if (!nameStr.compare("pidcalib_pion")) { + if (nameStr == "pidcalib_pion") { cut->AddCut(VarManager::kIsLegFromK0S, 0.5, 1.5, false); return cut; } - if (!nameStr.compare("pidcalib_proton")) { + if (nameStr == "pidcalib_proton") { cut->AddCut(VarManager::kIsProtonFromLambdaAndAntiLambda, 0.5, 1.5, false); return cut; } - if (!nameStr.compare("pidcalib_kaon")) { + if (nameStr == "pidcalib_kaon") { cut->AddCut(VarManager::kTOFnSigmaKa, -2.0, 2.0); cut->AddCut(VarManager::kTOFnSigmaPi, -2.0, 2.0, true); cut->AddCut(VarManager::kITSncls, 1.5, 7.5); @@ -5490,55 +5490,55 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // ------------------------------------------------ // Barrel PID cuts - if (!nameStr.compare("jpsi_TPCPID_debug1")) { + if (nameStr == "jpsi_TPCPID_debug1") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 2.5, 999); cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 2.5, 999); return cut; } - if (!nameStr.compare("jpsi_TPCPID_debug2")) { + if (nameStr == "jpsi_TPCPID_debug2") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 3.0, 999); cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 3.0, 999); return cut; } - if (!nameStr.compare("jpsi_TPCPID_debug3")) { + if (nameStr == "jpsi_TPCPID_debug3") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 3.5, 999); cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 3.5, 999); return cut; } - if (!nameStr.compare("jpsi_TPCPID_debug4")) { + if (nameStr == "jpsi_TPCPID_debug4") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999); cut->AddCut(VarManager::kTPCnSigmaPr, 3.0, 999); return cut; } - if (!nameStr.compare("jpsi_TPCPID_debug5")) { + if (nameStr == "jpsi_TPCPID_debug5") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -4.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 2.5, 999); cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 2.5, 999); return cut; } - if (!nameStr.compare("jpsi_TPCPID_debug5_noCorr")) { + if (nameStr == "jpsi_TPCPID_debug5_noCorr") { cut->AddCut(VarManager::kTPCnSigmaEl, -4.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPi, 2.5, 999); cut->AddCut(VarManager::kTPCnSigmaPr, 2.5, 999); return cut; } - if (!nameStr.compare("electronPIDLooseSkimmed")) { + if (nameStr == "electronPIDLooseSkimmed") { cut->AddCut(VarManager::kTPCnSigmaEl, -4.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPi, 2.5, 999); cut->AddCut(VarManager::kTPCnSigmaPr, 2.5, 999); return cut; } - if (!nameStr.compare("electronPIDLooseSkimmed2")) { + if (nameStr == "electronPIDLooseSkimmed2") { cut->AddCut(VarManager::kTPCnSigmaEl, -4.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPi, 2.5, 999, false, VarManager::kPin, 0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi, 1.5, 999, false, VarManager::kPin, 3.0, 999); @@ -5547,28 +5547,28 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronPIDLooseSkimmed3")) { + if (nameStr == "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")) { + if (nameStr == "jpsi_TPCPID_debug6") { cut->AddCut(VarManager::kTPCnSigmaEl, -2.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999); cut->AddCut(VarManager::kTPCnSigmaPr, 3.0, 999); return cut; } - if (!nameStr.compare("jpsi_TPCPID_debug7")) { + if (nameStr == "jpsi_TPCPID_debug7") { cut->AddCut(VarManager::kTPCnSigmaEl, -2.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.5, 999); cut->AddCut(VarManager::kTPCnSigmaPr, 3.5, 999); return cut; } - if (!nameStr.compare("jpsi_TPCPID_debug8")) { + if (nameStr == "jpsi_TPCPID_debug8") { cut->AddCut(VarManager::kTPCnSigmaEl, -2.0, 3.0, false, VarManager::kPin, 0.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0, false, VarManager::kPin, 3.0, 999.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999, false, VarManager::kPin, 0.0, 3.0); @@ -5577,95 +5577,95 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_TPCPID_debug9")) { + if (nameStr == "jpsi_TPCPID_debug9") { cut->AddCut(VarManager::kTPCnSigmaEl, -2.5, 4.0); cut->AddCut(VarManager::kTPCnSigmaPi, 1.0, 999, false, VarManager::kPin, 3.0, 999.0); cut->AddCut(VarManager::kTPCnSigmaPr, 2.0, 999); return cut; } - if (!nameStr.compare("jpsi_TPCPID_debug10")) { + if (nameStr == "jpsi_TPCPID_debug10") { cut->AddCut(VarManager::kTPCnSigmaEl, -1.5, 2.0); cut->AddCut(VarManager::kTPCnSigmaPi, 4.0, 999); cut->AddCut(VarManager::kTPCnSigmaPr, 3.5, 999); return cut; } - if (!nameStr.compare("pidCut_lowP_Corr")) { + if (nameStr == "pidCut_lowP_Corr") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0, false, VarManager::kP, 0.0, 5.0); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 3.0, 999, false, VarManager::kP, 0.0, 5.0); cut->AddCut(VarManager::kTPCnSigmaPr_Corr, 2.5, 999, false, VarManager::kP, 0.0, 5.0); return cut; } - if (!nameStr.compare("EleInclusion_highP_Corr")) { + if (nameStr == "EleInclusion_highP_Corr") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -1.0, 4.0, false, VarManager::kP, 5.0, 999.0); return cut; } - if (!nameStr.compare("EleInclusion_highP2_Corr")) { + if (nameStr == "EleInclusion_highP2_Corr") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -0.5, 4.0, false, VarManager::kP, 5.0, 999.0); return cut; } - if (!nameStr.compare("PionExclusion_highP_Corr")) { + if (nameStr == "PionExclusion_highP_Corr") { cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 2.0, 999, false, VarManager::kP, 5.0, 999.0); return cut; } - if (!nameStr.compare("pidCut_lowP")) { + if (nameStr == "pidCut_lowP") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0, false, VarManager::kP, 0.0, 5.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 999, false, VarManager::kP, 0.0, 5.0); cut->AddCut(VarManager::kTPCnSigmaPr, 2.5, 999, false, VarManager::kP, 0.0, 5.0); return cut; } - if (!nameStr.compare("EleInclusion_highP")) { + if (nameStr == "EleInclusion_highP") { cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 4.0, false, VarManager::kP, 5.0, 999.0); return cut; } - if (!nameStr.compare("EleInclusion_highP2")) { + if (nameStr == "EleInclusion_highP2") { cut->AddCut(VarManager::kTPCnSigmaEl, -0.5, 4.0, false, VarManager::kP, 5.0, 999.0); return cut; } - if (!nameStr.compare("PionExclusion_highP")) { + if (nameStr == "PionExclusion_highP") { cut->AddCut(VarManager::kTPCnSigmaPi, 2.0, 999, false, VarManager::kP, 5.0, 999.0); return cut; } - if (!nameStr.compare("lmee_TPCPID_debug1")) { + if (nameStr == "lmee_TPCPID_debug1") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -5.0, 5.0); return cut; } - if (!nameStr.compare("electronPID1") || !nameStr.compare("electronPID1shiftUp") || !nameStr.compare("electronPID1shiftDown") || !nameStr.compare("electronPID2") || !nameStr.compare("electronPID3")) { + if (nameStr == "electronPID1" || nameStr == "electronPID1shiftUp" || nameStr == "electronPID1shiftDown" || nameStr == "electronPID2" || nameStr == "electronPID3") { std::shared_ptr cutLow1 = std::make_shared("cutLow1", "pol1", 0., 10.); - if (!nameStr.compare("electronPID1")) { + if (nameStr == "electronPID1") { cutLow1->SetParameters(130., -40.0); cut->AddCut(VarManager::kTPCsignal, 70., 100.); cut->AddCut(VarManager::kTPCsignal, cutLow1, 100.0, false, VarManager::kPin, 0.5, 3.0); return cut; } - if (!nameStr.compare("electronPID1shiftUp")) { + if (nameStr == "electronPID1shiftUp") { cut->AddCut(VarManager::kTPCsignal, 70. - 0.85, 100. - 0.85); cutLow1->SetParameters(130. - 0.85, -40.0); cut->AddCut(VarManager::kTPCsignal, cutLow1, 100.0 - 0.85, false, VarManager::kPin, 0.5, 3.0); return cut; } - if (!nameStr.compare("electronPID1shiftDown")) { + if (nameStr == "electronPID1shiftDown") { cut->AddCut(VarManager::kTPCsignal, 70.0 + 0.85, 100.0 + 0.85); cutLow1->SetParameters(130. + 0.85, -40.0); cut->AddCut(VarManager::kTPCsignal, cutLow1, 100.0 + 0.85, false, VarManager::kPin, 0.5, 3.0); return cut; } - if (!nameStr.compare("electronPID2")) { + if (nameStr == "electronPID2") { cutLow1->SetParameters(130., -40.0); cut->AddCut(VarManager::kTPCsignal, 73., 100.); cut->AddCut(VarManager::kTPCsignal, cutLow1, 100.0, false, VarManager::kPin, 0.5, 3.0); return cut; } - if (!nameStr.compare("electronPID3")) { + if (nameStr == "electronPID3") { cutLow1->SetParameters(130., -40.0); cut->AddCut(VarManager::kTPCsignal, 60., 110.); cut->AddCut(VarManager::kTPCsignal, cutLow1, 100.0, false, VarManager::kPin, 0.5, 3.0); @@ -5673,14 +5673,14 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } } - if (!nameStr.compare("electronPIDnsigma")) { + if (nameStr == "electronPIDnsigma") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 3.0, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.0, 3000.0); return cut; } - if (!nameStr.compare("lmee_commonDQEM_PID_TPC")) { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ + if (nameStr == "lmee_commonDQEM_PID_TPC") { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ cut->AddCut(VarManager::kTPCnSigmaEl, -2.5, 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -1e12, 3.5, true, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaKa, -3., 3., true, VarManager::kPin, 0.0, 1e+10, false); @@ -5688,7 +5688,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("lmee_commonDQEM_PID_TOF")) { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ + if (nameStr == "lmee_commonDQEM_PID_TOF") { // cut setting to check least common factor between reduced data sets of PWGEM and PWGDQ cut->AddCut(VarManager::kTPCnSigmaEl, -2.5, 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 3.5, true, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTOFnSigmaEl, -3., 3., false, VarManager::kPin, 0.3, 1e+10, false); @@ -5702,7 +5702,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // loop to define TPC PID cuts with and without post calibration for (size_t icase = 0; icase < vecPIDcase.size(); icase++) { - if (!nameStr.compare(Form("electronPIDOnly%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPIDOnly%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); } else if (icase == 1 || icase == 2) { // o2-linter: disable=magic-number (number of cuts) @@ -5711,7 +5711,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TPCnsigma%s_loose", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TPCnsigma%s_loose", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 3.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -5731,7 +5731,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TPCnsigma%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TPCnsigma%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // previously known as electronPID_TPCnsigma_tight // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 3.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -5751,7 +5751,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TPCnsigma%s_strongHadRej", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TPCnsigma%s_strongHadRej", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -5771,7 +5771,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -2., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -5791,7 +5791,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_lowB_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_lowB_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -2., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -5814,7 +5814,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_lowB_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_lowB_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -2., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -5839,7 +5839,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -2., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -5861,7 +5861,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -1., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -5883,7 +5883,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TPCnsigma%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TPCnsigma%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, 0., 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -5916,7 +5916,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) std::vector cutVar_TPCnSigmaPr_up = {2., 2., 3., 2., 3., 3., 3., 2., 4., 3., 3., 4., 4., 3., 4., 4., 3., 4., 2., 3., 4., 4., 3., 4., 3., 2., 3., 3., 2., 3}; for (unsigned int i = 0; i < cutVar_TPCnSigmaEl_low.size(); i++) { - if (!nameStr.compare(Form("electronPID_TPCnsigma_cutVar%s%i", vecPIDcase.at(icase).Data(), i))) { + if (nameStr == Form("electronPID_TPCnsigma_cutVar%s%i", vecPIDcase.at(icase).Data(), i)) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, cutVar_TPCnSigmaEl_low.at(i), cutVar_TPCnSigmaEl_up.at(i), false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, cutVar_TPCnSigmaPi_low.at(i), cutVar_TPCnSigmaPi_up.at(i), true, VarManager::kPin, 0.0, 1e+10, false); @@ -5937,7 +5937,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } } - if (!nameStr.compare(Form("lmee_pp_502TeV_TPC%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_pp_502TeV_TPC%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -99., 3.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -5957,7 +5957,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_pp_502TeV_lowB_TPC%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_pp_502TeV_lowB_TPC%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3.5, 3.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -5980,7 +5980,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_pp_502TeV_TPCloosenopkrej%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_pp_502TeV_TPCloosenopkrej%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { cut->AddCut(VarManager::kTPCnSigmaEl, -4., 4., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -99., 2.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -5991,7 +5991,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_pp_502TeV_TPCPbPbnopkrej%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_pp_502TeV_TPCPbPbnopkrej%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -1., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -6002,7 +6002,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_pp_502TeV_TPCloose%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_pp_502TeV_TPCloose%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -4., 4., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -99., 2.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -6023,21 +6023,21 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } } - if (!nameStr.compare("electronPIDnsigmaOpen")) { + if (nameStr == "electronPIDnsigmaOpen") { cut->AddCut(VarManager::kTPCnSigmaEl, -4.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPr, 2.0, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 2.0, 3000.0); return cut; } - if (!nameStr.compare("electronPIDnsigmaVeryVeryLoose")) { + if (nameStr == "electronPIDnsigmaVeryVeryLoose") { cut->AddCut(VarManager::kTPCnSigmaEl, -4.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPr, 2.5, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 2.0, 3000.0); return cut; } - if (!nameStr.compare("electronPIDnsigmaVeryLoose")) { + if (nameStr == "electronPIDnsigmaVeryLoose") { cut->AddCut(VarManager::kTPCnSigmaEl, -4.0, 4.0); cut->AddCut(VarManager::kTPCnSigmaPr, 2.5, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 2.5, 3000.0); @@ -6045,41 +6045,41 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronPIDnsigmaLoose")) { + if (nameStr == "electronPIDnsigmaLoose") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 2.5, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 2.5, 3000.0); return cut; } - if (!nameStr.compare("electronPIDnsigmaMedium")) { + if (nameStr == "electronPIDnsigmaMedium") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 2.7, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 2.7, 3000.0); return cut; } - if (!nameStr.compare("electronPIDnsigmaMedium_withLargeTOFPID")) { + if (nameStr == "electronPIDnsigmaMedium_withLargeTOFPID") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 2.7, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 2.7, 3000.0); cut->AddCut(VarManager::kTOFnSigmaEl, -5.0, 5.0); return cut; } - if (!nameStr.compare("electronPIDnsigmaSkewed")) { + if (nameStr == "electronPIDnsigmaSkewed") { cut->AddCut(VarManager::kTPCnSigmaEl, -2.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 3.5, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.5, 3000.0); return cut; } - if (!nameStr.compare("electronPIDnsigmaSkewed_2")) { + if (nameStr == "electronPIDnsigmaSkewed_2") { cut->AddCut(VarManager::kTPCnSigmaEl, -0.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 3.5, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.5, 3000.0); return cut; } - if (!nameStr.compare("electronPIDPrKaPiRej")) { + if (nameStr == "electronPIDPrKaPiRej") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, -3.0, 3.0, true); cut->AddCut(VarManager::kTPCnSigmaPi, -3.0, 3.0, true); @@ -6087,7 +6087,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronPIDPrKaPiRej_Corr")) { + if (nameStr == "electronPIDPrKaPiRej_Corr") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr_Corr, -3.0, 3.0, true); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, -3.0, 3.0, true); @@ -6095,7 +6095,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronPIDPrKaPiRejLoose")) { + if (nameStr == "electronPIDPrKaPiRejLoose") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, -2.0, 2.0, true); cut->AddCut(VarManager::kTPCnSigmaPi, -3.0, 3.0, true, VarManager::kPin, 0.0, 1.0, false); @@ -6104,7 +6104,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronPIDPrKaPiRejLoose_Corr")) { + if (nameStr == "electronPIDPrKaPiRejLoose_Corr") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr_Corr, -2.0, 2.0, true); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, -3.0, 3.0, true, VarManager::kPin, 0.0, 1.0, false); @@ -6113,7 +6113,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("electronPIDnsigmaEMu")) { + if (nameStr == "electronPIDnsigmaEMu") { cut->AddCut(VarManager::kTPCnSigmaEl, -1.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 3.5, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.5, 3000.0); @@ -6121,83 +6121,83 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("kaonPIDnsigma")) { + if (nameStr == "kaonPIDnsigma") { cut->AddCut(VarManager::kTPCnSigmaKa, -3.0, 3.0); return cut; } - if (!nameStr.compare("kaonRejNsigma")) { + if (nameStr == "kaonRejNsigma") { cut->AddCut(VarManager::kTPCnSigmaKa, -3.0, 3.0, true); return cut; } - if (!nameStr.compare("kaonPIDnsigma2")) { + if (nameStr == "kaonPIDnsigma2") { cut->AddCut(VarManager::kTPCnSigmaKa, -2.0, 2.0); return cut; } - if (!nameStr.compare("kaonPID_TPCnTOF")) { + if (nameStr == "kaonPID_TPCnTOF") { cut->AddCut(VarManager::kTPCnSigmaKa, -3.0, 3.0); cut->AddCut(VarManager::kTOFnSigmaKa, -3.0, 3.0); return cut; } - if (!nameStr.compare("kaonPIDnsigma700")) { + if (nameStr == "kaonPIDnsigma700") { cut->AddCut(VarManager::kTPCnSigmaKa, -3.0, 3.0); cut->AddCut(VarManager::kPin, 0.0, 0.7); return cut; } - if (!nameStr.compare("AssocKine")) { + if (nameStr == "AssocKine") { cut->AddCut(VarManager::kPt, 1.0, 1000.0); cut->AddCut(VarManager::kEta, -0.9, 0.9); return cut; } - if (!nameStr.compare("electronPIDworseRes")) { + if (nameStr == "electronPIDworseRes") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 3.0 * 0.8, 3000.0); // emulates a 20% degradation in PID resolution cut->AddCut(VarManager::kTPCnSigmaPi, 3.0 * 0.8, 3000.0); // proton and pion rejections are effectively relaxed by 20% return cut; } - if (!nameStr.compare("electronPIDshift")) { + if (nameStr == "electronPIDshift") { cut->AddCut(VarManager::kTPCnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kTPCnSigmaPr, 3.0 - 0.2, 3000.0); cut->AddCut(VarManager::kTPCnSigmaPi, 3.0 - 0.2, 3000.0); return cut; } - if (!nameStr.compare("pionPIDnsigma")) { + if (nameStr == "pionPIDnsigma") { cut->AddCut(VarManager::kTPCnSigmaPi, -3.0, 3.0); return cut; } - if (!nameStr.compare("pionPID_TPCnTOF")) { + if (nameStr == "pionPID_TPCnTOF") { cut->AddCut(VarManager::kTPCnSigmaPi, -3.0, 3.0); cut->AddCut(VarManager::kTOFnSigmaPi, -3.0, 3.0); return cut; } - if (!nameStr.compare("protonPID_TPCnTOF")) { + if (nameStr == "protonPID_TPCnTOF") { cut->AddCut(VarManager::kTPCnSigmaPr, -3.0, 3.0); cut->AddCut(VarManager::kTOFnSigmaPr, -3.0, 3.0); return cut; } - if (!nameStr.compare("protonPID_TPCnTOF2")) { + if (nameStr == "protonPID_TPCnTOF2") { cut->AddCut(VarManager::kTPCnSigmaPr, -2.5, 2.5); return cut; } - if (!nameStr.compare("tpc_pion_rejection")) { + if (nameStr == "tpc_pion_rejection") { std::shared_ptr f1maxPi = std::make_shared("f1maxPi", "[0]+[1]*x", 0, 10); f1maxPi->SetParameters(85, -50); cut->AddCut(VarManager::kTPCsignal, 70, f1maxPi, true, VarManager::kPin, 0.0, 0.4, false); return cut; } - if (!nameStr.compare("tpc_pion_band_rejection")) { + if (nameStr == "tpc_pion_band_rejection") { std::shared_ptr f1minPi = std::make_shared("f1minPi", "[0]+[1]*log(x)", 0, 10); f1minPi->SetParameters(-115, -90); std::shared_ptr f1maxPi = std::make_shared("f1maxPi", "[0]+[1]*log(x)", 0, 10); @@ -6206,7 +6206,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("tpc_pion_muon_band_rejection")) { + if (nameStr == "tpc_pion_muon_band_rejection") { std::shared_ptr f1minPi = std::make_shared("f1minPi", "[0]+exp([1]*x+[2])", 0, 10); f1minPi->SetParameters(37, -18, 5.5); std::shared_ptr f1maxPi = std::make_shared("f1maxPi", "[0]+exp([1]*x+[2])", 0, 10); @@ -6215,14 +6215,14 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("tpc_pion_rejection_highp")) { + if (nameStr == "tpc_pion_rejection_highp") { std::shared_ptr f1minPi = std::make_shared("f1minPi", "[0]+[1]*x", 0, 10); f1minPi->SetParameters(65, 4.); cut->AddCut(VarManager::kTPCsignal, f1minPi, 110., false, VarManager::kPin, 0.0, 10, false); return cut; } - if (!nameStr.compare("tpc_kaon_rejection")) { + if (nameStr == "tpc_kaon_rejection") { std::shared_ptr f1minKa = std::make_shared("f1minKa", "[0]+exp([1]*x+[2])", 0, 10); f1minKa->SetParameters(37, -4, 5.6); std::shared_ptr f1maxKa = std::make_shared("f1maxKa", "[0]+exp([1]*x+[2])", 0, 10); @@ -6231,7 +6231,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("tpc_proton_rejection")) { + if (nameStr == "tpc_proton_rejection") { std::shared_ptr f1minPr = std::make_shared("f1minPr", "[0]+exp([1]*x+[2])", 0, 10); f1minPr->SetParameters(37, -2.6, 6.1); std::shared_ptr f1maxPr = std::make_shared("f1maxPr", "[0]+exp([1]*x+[2])", 0, 10); @@ -6240,34 +6240,34 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("tpc_electron")) { + if (nameStr == "tpc_electron") { cut->AddCut(VarManager::kTPCsignal, 60, 110, false, VarManager::kPin, 0.0, 1e+10, false); return cut; } - if (!nameStr.compare("tof_electron")) { + if (nameStr == "tof_electron") { cut->AddCut(VarManager::kTOFbeta, 0.99, 1.01, false, VarManager::kPin, 0.0, 1e+10, false); return cut; } - if (!nameStr.compare("tof_electron_sigma")) { + if (nameStr == "tof_electron_sigma") { cut->AddCut(VarManager::kTOFnSigmaEl, -2., 2., false, VarManager::kPin, 0.0, 1e+10, false); return cut; } - if (!nameStr.compare("tof_electron_sigma_2")) { + if (nameStr == "tof_electron_sigma_2") { cut->AddCut(VarManager::kTOFnSigmaEl, -3., 3.); return cut; } - if (!nameStr.compare("tof_electron_loose")) { + if (nameStr == "tof_electron_loose") { cut->AddCut(VarManager::kTOFbeta, 0.95, 1.05, false, VarManager::kPin, 0.0, 1e+10, false); return cut; } // loop to define TOF PID cuts with and without post calibration for (size_t icase = 0; icase < vecPIDcase.size(); icase++) { - if (!nameStr.compare(Form("electronPID_TOFnsigma%s_loose", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TOFnsigma%s_loose", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 3.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -6280,7 +6280,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TOFnsigma%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TOFnsigma%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // previously known as electronPID_TOFnsigma_tight // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 3.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -6293,7 +6293,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TOFnsigma%s_strongHadRej", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TOFnsigma%s_strongHadRej", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -6306,7 +6306,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -2., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -6328,7 +6328,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) std::vector cutVar_TOFnSigmaEl_up = {4., 2., 4., 2., 4., 3., 2., 3., 3., 3., 4., 3., 2., 3., 4., 3., 3., 3., 4., 4., 2., 2., 2., 3., 3., 3., 2., 3., 2., 4}; for (unsigned int i = 0; i < cutVar_TOFnSigmaEl_low.size(); i++) { - if (!nameStr.compare(Form("electronPID_TOFnsigma_cutVar%s%i", vecPIDcase.at(icase).Data(), i))) { + if (nameStr == Form("electronPID_TOFnsigma_cutVar%s%i", vecPIDcase.at(icase).Data(), i)) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, cutVar_TPCnSigmaEl_low.at(i), cutVar_TPCnSigmaEl_up.at(i), false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, cutVar_TPCnSigmaPi_low.at(i), cutVar_TPCnSigmaPi_up.at(i), true, VarManager::kPin, 0.0, 1e+10, false); @@ -6342,7 +6342,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } } - if (!nameStr.compare(Form("electronPID_TPC_TOFnsigma%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TPC_TOFnsigma%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // previously known as electronPID_TOFnsigma_tight // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 3.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -6359,7 +6359,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_lowB_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_lowB_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -2., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.3, 1e+10, false); @@ -6374,7 +6374,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_lowB_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_lowB_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -2., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.3, 1e+10, false); @@ -6391,7 +6391,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -2., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -6406,7 +6406,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -1., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -6421,7 +6421,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TOFnsigma%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TOFnsigma%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, 0., 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -6436,7 +6436,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TOFreq%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TOFreq%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -1., 2., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -6449,7 +6449,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("electronPID_TOFreq%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("electronPID_TOFreq%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, 0., 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 4., true, VarManager::kPin, 0.0, 1e+10, false); @@ -6462,7 +6462,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_pp_502TeV_TOF%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_pp_502TeV_TOF%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -99., 3.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -6475,7 +6475,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_pp_502TeV_lowB_TOF%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_pp_502TeV_lowB_TOF%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -3., 3., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -3., 3.5, true, VarManager::kPin, 0.0, 1e+10, false); @@ -6490,7 +6490,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_pp_502TeV_TOFloose%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_pp_502TeV_TOFloose%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -4., 4., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -99., 3., true, VarManager::kPin, 0.0, 4.0, false); @@ -6505,7 +6505,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare(Form("lmee_pp_502TeV_TOFloose_pionrej%s", vecPIDcase.at(icase).Data()))) { + if (nameStr == Form("lmee_pp_502TeV_TOFloose_pionrej%s", vecPIDcase.at(icase).Data())) { if (icase == 0) { // o2-linter: disable=magic-number (number of cuts) cut->AddCut(VarManager::kTPCnSigmaEl, -4., 4., false, VarManager::kPin, 0.0, 1e+10, false); cut->AddCut(VarManager::kTPCnSigmaPi, -99., 3.5, true, VarManager::kPin, 0.0, 2.0, false); @@ -6523,27 +6523,27 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // ------------------------------------------------------------------------------------------------- // Muon cuts - if (!nameStr.compare("GlobalMuonTrack")) { + if (nameStr == "GlobalMuonTrack") { cut->AddCut(VarManager::kMuonTrackType, -0.5, 0.5); return cut; } - if (!nameStr.compare("MFTMCH")) { + if (nameStr == "MFTMCH") { cut->AddCut(VarManager::kMuonTrackType, 1.5, 2.5); return cut; } - if (!nameStr.compare("MCHMID")) { + if (nameStr == "MCHMID") { cut->AddCut(VarManager::kMuonTrackType, 2.5, 3.5); return cut; } - if (!nameStr.compare("MCHStandalone")) { + if (nameStr == "MCHStandalone") { cut->AddCut(VarManager::kMuonTrackType, 3.5, 4.5); return cut; } - if (!nameStr.compare("muonMinimalCuts")) { + if (nameStr == "muonMinimalCuts") { cut->AddCut(VarManager::kEta, -4.0, -2.5); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 17.6, 89.5); cut->AddCut(VarManager::kMuonPDca, 0.0, 594.0, false, VarManager::kMuonRAtAbsorberEnd, 17.6, 26.5); @@ -6551,7 +6551,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("muonMinimalCuts10SigmaPDCA")) { + if (nameStr == "muonMinimalCuts10SigmaPDCA") { cut->AddCut(VarManager::kEta, -4.0, -2.5); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 17.6, 89.5); cut->AddCut(VarManager::kMuonPDca, 0.0, 990.0, false, VarManager::kMuonRAtAbsorberEnd, 17.6, 26.5); @@ -6559,7 +6559,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("muonQualityCuts")) { + if (nameStr == "muonQualityCuts") { cut->AddCut(VarManager::kEta, -4.0, -2.5); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 17.6, 89.5); cut->AddCut(VarManager::kMuonPDca, 0.0, 594.0, false, VarManager::kMuonRAtAbsorberEnd, 17.6, 26.5); @@ -6569,7 +6569,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("muonQualityCuts5SigmaPDCA_Run3")) { + if (nameStr == "muonQualityCuts5SigmaPDCA_Run3") { cut->AddCut(VarManager::kEta, -4.0, -2.5); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 17.6, 89.5); cut->AddCut(VarManager::kMuonPDca, 0.0, 500.0, false, VarManager::kMuonRAtAbsorberEnd, 17.6, 26.5); @@ -6579,7 +6579,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("muonQualityCuts10SigmaPDCA")) { + if (nameStr == "muonQualityCuts10SigmaPDCA") { cut->AddCut(VarManager::kEta, -4.0, -2.5); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 17.6, 89.5); cut->AddCut(VarManager::kMuonPDca, 0.0, 990.0, false, VarManager::kMuonRAtAbsorberEnd, 17.6, 26.5); @@ -6589,7 +6589,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("matchedQualityCuts")) { + if (nameStr == "matchedQualityCuts") { cut->AddCut(VarManager::kEta, -4.0, -2.5); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 17.6, 89.5); cut->AddCut(VarManager::kMuonPDca, 0.0, 594.0, false, VarManager::kMuonRAtAbsorberEnd, 17.6, 26.5); @@ -6600,7 +6600,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("matchedQualityCutsMFTeta")) { + if (nameStr == "matchedQualityCutsMFTeta") { cut->AddCut(VarManager::kEta, -3.6, -2.5); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 17.6, 89.5); cut->AddCut(VarManager::kMuonPDca, 0.0, 594.0, false, VarManager::kMuonRAtAbsorberEnd, 17.6, 26.5); @@ -6611,74 +6611,74 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("muonQualityCutsMatchingOnly")) { + if (nameStr == "muonQualityCutsMatchingOnly") { cut->AddCut(VarManager::kEta, -4.0, -2.5); cut->AddCut(VarManager::kMuonChi2, 0.0, 1e6); cut->AddCut(VarManager::kMuonChi2MatchMCHMID, 0.0, 1e6); // matching MCH-MID return cut; } - if (!nameStr.compare("muonLowPt")) { + if (nameStr == "muonLowPt") { cut->AddCut(VarManager::kPt, 0.5, 1000.0); return cut; } - if (!nameStr.compare("muonLowPt2")) { + if (nameStr == "muonLowPt2") { cut->AddCut(VarManager::kPt, 0.7, 1000.0); return cut; } - if (!nameStr.compare("muonLowPt3")) { + if (nameStr == "muonLowPt3") { cut->AddCut(VarManager::kPt, 0.8, 1000.0); return cut; } - if (!nameStr.compare("muonLowPt4")) { + if (nameStr == "muonLowPt4") { cut->AddCut(VarManager::kPt, 0.9, 1000.0); return cut; } - if (!nameStr.compare("muonLowPt5")) { + if (nameStr == "muonLowPt5") { cut->AddCut(VarManager::kPt, 1.0, 1000.0); return cut; } - if (!nameStr.compare("muonLowPt6")) { + if (nameStr == "muonLowPt6") { cut->AddCut(VarManager::kPt, 2.0, 1000.0); return cut; } - if (!nameStr.compare("muonHighPt")) { + if (nameStr == "muonHighPt") { cut->AddCut(VarManager::kPt, 3.0, 1000.0); return cut; } - if (!nameStr.compare("muonHighPt2")) { + if (nameStr == "muonHighPt2") { cut->AddCut(VarManager::kPt, 4.0, 1000.0); return cut; } - if (!nameStr.compare("muonHighPt3")) { + if (nameStr == "muonHighPt3") { cut->AddCut(VarManager::kPt, 6.0, 1000.0); return cut; } - if (!nameStr.compare("muonHighPt4")) { + if (nameStr == "muonHighPt4") { cut->AddCut(VarManager::kPt, 8.0, 1000.0); return cut; } - if (!nameStr.compare("muonHighPt5")) { + if (nameStr == "muonHighPt5") { cut->AddCut(VarManager::kPt, 10.0, 1000.0); return cut; } - if (!nameStr.compare("muonHighPt6")) { + if (nameStr == "muonHighPt6") { cut->AddCut(VarManager::kPt, 20.0, 1000.0); return cut; } - if (!nameStr.compare("muonTightQualityCutsForTests")) { + if (nameStr == "muonTightQualityCutsForTests") { cut->AddCut(VarManager::kEta, -4.0, -2.5); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 20.0, 60.0); cut->AddCut(VarManager::kMuonPDca, 0.0, 594.0, false, VarManager::kMuonRAtAbsorberEnd, 17.6, 26.5); @@ -6687,49 +6687,49 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("mchTrack")) { + if (nameStr == "mchTrack") { cut->AddCut(VarManager::kMuonTrackType, 3.5, 4.5); return cut; } - if (!nameStr.compare("matchedMchMid")) { + if (nameStr == "matchedMchMid") { cut->AddCut(VarManager::kMuonTrackType, 2.5, 3.5); return cut; } - if (!nameStr.compare("matchedFwd")) { + if (nameStr == "matchedFwd") { cut->AddCut(VarManager::kMuonTrackType, 1.5, 2.5); return cut; } - if (!nameStr.compare("matchedGlobal")) { + if (nameStr == "matchedGlobal") { cut->AddCut(VarManager::kMuonTrackType, -0.5, 0.5); return cut; } - if (!nameStr.compare("Chi2MCHMFTCut1")) { + if (nameStr == "Chi2MCHMFTCut1") { cut->AddCut(VarManager::kMuonChi2MatchMCHMFT, 0, 30); return cut; } - if (!nameStr.compare("Chi2MCHMFTCut2")) { + if (nameStr == "Chi2MCHMFTCut2") { cut->AddCut(VarManager::kMuonChi2MatchMCHMFT, 0, 40); return cut; } - if (!nameStr.compare("Chi2MCHMFTCut3")) { + if (nameStr == "Chi2MCHMFTCut3") { cut->AddCut(VarManager::kMuonChi2MatchMCHMFT, 0, 50); return cut; } - if (!nameStr.compare("Chi2MCHMFTCut4")) { + if (nameStr == "Chi2MCHMFTCut4") { cut->AddCut(VarManager::kMuonChi2MatchMCHMFT, 0, 60); return cut; } // ----------------------------------------------------------------------------------------------- // Pair cuts - if (!nameStr.compare("pairDalitz1")) { + if (nameStr == "pairDalitz1") { cut->AddCut(VarManager::kMass, 0.0, 0.015, false, VarManager::kPt, 0., 1.); cut->AddCut(VarManager::kMass, 0.0, 0.035, false, VarManager::kPt, 0., 1., true); std::shared_ptr fcutHigh = std::make_shared("f1", "[0] - [0]/[1]*x", -1.5, 1.5); @@ -6740,318 +6740,318 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("pairDalitz1Strong")) { + if (nameStr == "pairDalitz1Strong") { cut->AddCut(VarManager::kMass, 0.0, 0.015, false, VarManager::kPt, 0., 1.); cut->AddCut(VarManager::kMass, 0.0, 0.035, false, VarManager::kPt, 0., 1., true); cut->AddCut(VarManager::kDeltaPhiPair, -1., 0.); return cut; } - if (!nameStr.compare("pairDalitz2")) { + if (nameStr == "pairDalitz2") { cut->AddCut(VarManager::kMass, 0.0, 0.015, false, VarManager::kPt, 0., 1.); cut->AddCut(VarManager::kMass, 0.0, 0.035, false, VarManager::kPt, 0., 1., true); return cut; } - if (!nameStr.compare("pairDalitz3")) { + if (nameStr == "pairDalitz3") { cut->AddCut(VarManager::kMass, 0.0, 0.15); return cut; } - if (!nameStr.compare("paira_prefilter1")) { + if (nameStr == "paira_prefilter1") { cut->AddCut(VarManager::kMass, 0.0, 0.06); return cut; } - if (!nameStr.compare("paira_prefilter2")) { + if (nameStr == "paira_prefilter2") { cut->AddCut(VarManager::kMass, 0.0, 0.06); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.025); return cut; } - if (!nameStr.compare("paira_prefilter3")) { + if (nameStr == "paira_prefilter3") { cut->AddCut(VarManager::kMass, 0.0, 0.06); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.05); return cut; } - if (!nameStr.compare("paira_prefilter4")) { + if (nameStr == "paira_prefilter4") { cut->AddCut(VarManager::kMass, 0.0, 0.06); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.075); return cut; } - if (!nameStr.compare("paira_prefilter5")) { + if (nameStr == "paira_prefilter5") { cut->AddCut(VarManager::kMass, 0.0, 0.06); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.1); return cut; } - if (!nameStr.compare("paira_prefilter6")) { + if (nameStr == "paira_prefilter6") { cut->AddCut(VarManager::kMass, 0.0, 0.06); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.125); return cut; } - if (!nameStr.compare("paira_prefilter7")) { + if (nameStr == "paira_prefilter7") { cut->AddCut(VarManager::kMass, 0.0, 0.06); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.15); return cut; } - if (!nameStr.compare("pairb_prefilter1")) { + if (nameStr == "pairb_prefilter1") { cut->AddCut(VarManager::kMass, 0.0, 0.05); return cut; } - if (!nameStr.compare("pairb_prefilter2")) { + if (nameStr == "pairb_prefilter2") { cut->AddCut(VarManager::kMass, 0.0, 0.05); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.025); return cut; } - if (!nameStr.compare("pairb_prefilter3")) { + if (nameStr == "pairb_prefilter3") { cut->AddCut(VarManager::kMass, 0.0, 0.05); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.05); return cut; } - if (!nameStr.compare("pairb_prefilter4")) { + if (nameStr == "pairb_prefilter4") { cut->AddCut(VarManager::kMass, 0.0, 0.05); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.075); return cut; } - if (!nameStr.compare("pairb_prefilter5")) { + if (nameStr == "pairb_prefilter5") { cut->AddCut(VarManager::kMass, 0.0, 0.05); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.1); return cut; } - if (!nameStr.compare("pairb_prefilter6")) { + if (nameStr == "pairb_prefilter6") { cut->AddCut(VarManager::kMass, 0.0, 0.05); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.125); return cut; } - if (!nameStr.compare("pairb_prefilter7")) { + if (nameStr == "pairb_prefilter7") { cut->AddCut(VarManager::kMass, 0.0, 0.05); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.15); return cut; } - if (!nameStr.compare("pairc_prefilter1")) { + if (nameStr == "pairc_prefilter1") { cut->AddCut(VarManager::kMass, 0.0, 0.04); return cut; } - if (!nameStr.compare("pairc_prefilter2")) { + if (nameStr == "pairc_prefilter2") { cut->AddCut(VarManager::kMass, 0.0, 0.04); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.025); return cut; } - if (!nameStr.compare("pairc_prefilter3")) { + if (nameStr == "pairc_prefilter3") { cut->AddCut(VarManager::kMass, 0.0, 0.04); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.05); return cut; } - if (!nameStr.compare("pairc_prefilter4")) { + if (nameStr == "pairc_prefilter4") { cut->AddCut(VarManager::kMass, 0.0, 0.04); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.075); return cut; } - if (!nameStr.compare("pairc_prefilter5")) { + if (nameStr == "pairc_prefilter5") { cut->AddCut(VarManager::kMass, 0.0, 0.04); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.1); return cut; } - if (!nameStr.compare("pairc_prefilter6")) { + if (nameStr == "pairc_prefilter6") { cut->AddCut(VarManager::kMass, 0.0, 0.04); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.125); return cut; } - if (!nameStr.compare("pairc_prefilter7")) { + if (nameStr == "pairc_prefilter7") { cut->AddCut(VarManager::kMass, 0.0, 0.04); cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.15); return cut; } - if (!nameStr.compare("paird_prefilter1")) { + if (nameStr == "paird_prefilter1") { cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.025); return cut; } - if (!nameStr.compare("paire_prefilter1")) { + if (nameStr == "paire_prefilter1") { cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.05); return cut; } - if (!nameStr.compare("pairf_prefilter1")) { + if (nameStr == "pairf_prefilter1") { cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.075); return cut; } - if (!nameStr.compare("pairg_prefilter1")) { + if (nameStr == "pairg_prefilter1") { cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.1); return cut; } - if (!nameStr.compare("pairh_prefilter1")) { + if (nameStr == "pairh_prefilter1") { cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.125); return cut; } - if (!nameStr.compare("pairi_prefilter1")) { + if (nameStr == "pairi_prefilter1") { cut->AddCut(VarManager::kOpeningAngle, 0.0, 0.15); return cut; } - if (!nameStr.compare("pairNoCut")) { + if (nameStr == "pairNoCut") { cut->AddCut(VarManager::kMass, 0.0, 1000.0); return cut; } - if (!nameStr.compare("DipionMassCut1")) { + if (nameStr == "DipionMassCut1") { cut->AddCut(VarManager::kMass, 0.5, 1.0); return cut; } - if (!nameStr.compare("DipionMassCut2")) { + if (nameStr == "DipionMassCut2") { cut->AddCut(VarManager::kMass, 0.0, 1.0); return cut; } - if (!nameStr.compare("pairMassLow1")) { + if (nameStr == "pairMassLow1") { cut->AddCut(VarManager::kMass, 1.0, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow2")) { + if (nameStr == "pairMassLow2") { cut->AddCut(VarManager::kMass, 1.5, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow3")) { + if (nameStr == "pairMassLow3") { cut->AddCut(VarManager::kMass, 1.6, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow4")) { + if (nameStr == "pairMassLow4") { cut->AddCut(VarManager::kMass, 1.7, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow5")) { + if (nameStr == "pairMassLow5") { cut->AddCut(VarManager::kMass, 1.8, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow6")) { + if (nameStr == "pairMassLow6") { cut->AddCut(VarManager::kMass, 1.85, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow7")) { + if (nameStr == "pairMassLow7") { cut->AddCut(VarManager::kMass, 1.9, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow8")) { + if (nameStr == "pairMassLow8") { cut->AddCut(VarManager::kMass, 2.0, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow9")) { + if (nameStr == "pairMassLow9") { cut->AddCut(VarManager::kMass, 2.2, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow10")) { + if (nameStr == "pairMassLow10") { cut->AddCut(VarManager::kMass, 2.5, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow11")) { + if (nameStr == "pairMassLow11") { cut->AddCut(VarManager::kMass, 3.0, 1000.0); return cut; } - if (!nameStr.compare("pairMassLow12")) { + if (nameStr == "pairMassLow12") { cut->AddCut(VarManager::kMass, 3.5, 1000.0); return cut; } - if (!nameStr.compare("pairMass1to2")) { + if (nameStr == "pairMass1to2") { cut->AddCut(VarManager::kMass, 1., 2.); return cut; } - if (!nameStr.compare("pairMassIMR")) { + if (nameStr == "pairMassIMR") { cut->AddCut(VarManager::kMass, 1.1, 2.7); return cut; } - if (!nameStr.compare("pairMass1_5to2_7")) { + if (nameStr == "pairMass1_5to2_7") { cut->AddCut(VarManager::kMass, 1.5, 2.7); return cut; } - if (!nameStr.compare("pairMass1_3to3_5")) { + if (nameStr == "pairMass1_3to3_5") { cut->AddCut(VarManager::kMass, 1.3, 3.5); return cut; } - if (!nameStr.compare("pairMass1_3")) { + if (nameStr == "pairMass1_3") { cut->AddCut(VarManager::kMass, 1.3, 1000.0); return cut; } - if (!nameStr.compare("pairMass1_5to3_5")) { + if (nameStr == "pairMass1_5to3_5") { cut->AddCut(VarManager::kMass, 1.5, 3.5); return cut; } - if (!nameStr.compare("pairD0")) { + if (nameStr == "pairD0") { cut->AddCut(VarManager::kMass, 1.814, 1.914); return cut; } - if (!nameStr.compare("pairJpsi")) { + if (nameStr == "pairJpsi") { cut->AddCut(VarManager::kMass, 2.8, 3.3); return cut; } - if (!nameStr.compare("pairJpsi2")) { + if (nameStr == "pairJpsi2") { cut->AddCut(VarManager::kMass, 2.72, 3.2); return cut; } - if (!nameStr.compare("pairJpsi3")) { + if (nameStr == "pairJpsi3") { cut->AddCut(VarManager::kMass, 2.92, 3.14); return cut; } - if (!nameStr.compare("pairPsi2S")) { + if (nameStr == "pairPsi2S") { cut->AddCut(VarManager::kMass, 3.4, 3.9); return cut; } - if (!nameStr.compare("pairUpsilon")) { + if (nameStr == "pairUpsilon") { cut->AddCut(VarManager::kMass, 8.0, 11.0); return cut; } - if (!nameStr.compare("pairX3872")) { + if (nameStr == "pairX3872") { cut->AddCut(VarManager::kQ, 0.0, 0.3); return cut; } - if (!nameStr.compare("pairX3872_2")) { + if (nameStr == "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); @@ -7059,7 +7059,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("pairX3872_3")) { + if (nameStr == "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); @@ -7067,104 +7067,104 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("pairPtLow1")) { + if (nameStr == "pairPtLow1") { cut->AddCut(VarManager::kPt, 2.0, 1000.0); return cut; } - if (!nameStr.compare("pairPtLow2")) { + if (nameStr == "pairPtLow2") { cut->AddCut(VarManager::kPt, 5.0, 1000.0); return cut; } - if (!nameStr.compare("pairPtLow3")) { + if (nameStr == "pairPtLow3") { cut->AddCut(VarManager::kPt, 0, 0.15); return cut; } - if (!nameStr.compare("pairPtLow4")) { + if (nameStr == "pairPtLow4") { cut->AddCut(VarManager::kPt, 0, 10.0); return cut; } - if (!nameStr.compare("pairPtLow5")) { + if (nameStr == "pairPtLow5") { cut->AddCut(VarManager::kPt, 0.8, 1000.0); return cut; } - if (!nameStr.compare("pairRapidityForward")) { + if (nameStr == "pairRapidityForward") { cut->AddCut(VarManager::kRap, 2.5, 4.0); return cut; } - if (!nameStr.compare("pairDCA")) { + if (nameStr == "pairDCA") { cut->AddCut(VarManager::kQuadDCAabsXY, .0, .50); return cut; } - if (!nameStr.compare("singleDCA")) { + if (nameStr == "singleDCA") { cut->AddCut(VarManager::kTrackDCAsigXY, 0.0, 5.); return cut; } - if (!nameStr.compare("pairPhiV")) { + if (nameStr == "pairPhiV") { cut->AddCut(VarManager::kPairPhiv, 2., 3.2); return cut; } - if (!nameStr.compare("excludePairPhiV")) { + if (nameStr == "excludePairPhiV") { cut->AddCut(VarManager::kPairPhiv, 2., 3.2, true); return cut; } - if (!nameStr.compare("pairLowMass")) { + if (nameStr == "pairLowMass") { cut->AddCut(VarManager::kMass, 0., 0.1); return cut; } - if (!nameStr.compare("excludePairLowMass")) { + if (nameStr == "excludePairLowMass") { cut->AddCut(VarManager::kMass, 0., 0.1, true); return cut; } - if (!nameStr.compare("pairLxyzProjected3sigma")) { + if (nameStr == "pairLxyzProjected3sigma") { cut->AddCut(VarManager::kVertexingLxyzProjected, 0.015, 10.); return cut; } - if (!nameStr.compare("pairTauxyzProjected1")) { + if (nameStr == "pairTauxyzProjected1") { cut->AddCut(VarManager::kVertexingTauxyzProjected, 0.0005, 10.); return cut; } - if (!nameStr.compare("pairTauxyzProjected1sigma")) { + if (nameStr == "pairTauxyzProjected1sigma") { cut->AddCut(VarManager::kVertexingTauxyzProjected, 0.003, 10.); return cut; } - if (!nameStr.compare("pairLxyProjected3sigmaLambdacCand")) { + if (nameStr == "pairLxyProjected3sigmaLambdacCand") { std::shared_ptr f1minLxyProjected = std::make_shared("f1minLxyProjected", "[0]+[1]*x", 0., 20.); f1minLxyProjected->SetParameters(0.0065, -0.00023); cut->AddCut(VarManager::kVertexingLxyProjected, f1minLxyProjected, 1., false, VarManager::kPt, 0., 20.); return cut; } - if (!nameStr.compare("pairLxyProjected3sigmaDplusCand")) { + if (nameStr == "pairLxyProjected3sigmaDplusCand") { cut->AddCut(VarManager::kVertexingLxyProjected, 0.009, 10.); return cut; } - if (!nameStr.compare("pairCosPointingPos")) { + if (nameStr == "pairCosPointingPos") { cut->AddCut(VarManager::kCosPointingAngle, 0.9, 1000.); return cut; } - if (!nameStr.compare("pairCosPointingNeg90")) { + if (nameStr == "pairCosPointingNeg90") { cut->AddCut(VarManager::kCosPointingAngle, -1000., -0.9); return cut; } - if (!nameStr.compare("pairCosPointingNeg85")) { + if (nameStr == "pairCosPointingNeg85") { cut->AddCut(VarManager::kCosPointingAngle, -1000., -0.85); return cut; } @@ -7174,7 +7174,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // Below are a list of single electron single muon and pair selection in order or optimize the trigger // trigger selection cuts - if (!nameStr.compare("electronStandardQualityTriggerTest")) { + if (nameStr == "electronStandardQualityTriggerTest") { cut->AddCut(VarManager::kIsSPDany, 0.5, 1.5); cut->AddCut(VarManager::kIsITSrefit, 0.5, 1.5); cut->AddCut(VarManager::kIsTPCrefit, 0.5, 1.5); @@ -7184,7 +7184,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("muonLooseTriggerTestCuts")) { + if (nameStr == "muonLooseTriggerTestCuts") { cut->AddCut(VarManager::kEta, -4.5, -2.0); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 10, 100); cut->AddCut(VarManager::kMuonPDca, 0.0, 1500, false, VarManager::kMuonRAtAbsorberEnd, 10, 26.5); @@ -7194,7 +7194,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("muonMatchingMFTMCHTriggerTestCuts")) { + if (nameStr == "muonMatchingMFTMCHTriggerTestCuts") { cut->AddCut(VarManager::kEta, -4.5, -2.0); cut->AddCut(VarManager::kMuonRAtAbsorberEnd, 10, 100); cut->AddCut(VarManager::kMuonPDca, 0.0, 1500, false, VarManager::kMuonRAtAbsorberEnd, 10, 26.5); @@ -7205,7 +7205,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_TPCPID_TriggerTest1")) { + if (nameStr == "jpsi_TPCPID_TriggerTest1") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 4.0, false, VarManager::kPin, 0, 2.0); cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -2.0, 4.0, false, VarManager::kPin, 2.0, 9999.0); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 3.0, 999, false, VarManager::kPin, 0, 2.0); @@ -7213,7 +7213,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_TPCPID_TriggerTest2")) { + if (nameStr == "jpsi_TPCPID_TriggerTest2") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 4.0, false, VarManager::kPin, 0, 2.0); cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -2.0, 4.0, false, VarManager::kPin, 2.0, 9999.0); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 2.5, 999, false, VarManager::kPin, 0, 2.0); @@ -7221,7 +7221,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_TPCPID_TriggerTest3")) { + if (nameStr == "jpsi_TPCPID_TriggerTest3") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 4.0, false, VarManager::kPin, 0, 3.0); cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -2.0, 4.0, false, VarManager::kPin, 3.0, 9999.0); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 3.0, 999, false, VarManager::kPin, 0, 2.0); @@ -7229,7 +7229,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("jpsi_TPCPID_TriggerTest4")) { + if (nameStr == "jpsi_TPCPID_TriggerTest4") { cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -3.0, 4.0, false, VarManager::kPin, 0, 3.0); cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -2.0, 4.0, false, VarManager::kPin, 3.0, 9999.0); cut->AddCut(VarManager::kTPCnSigmaPi_Corr, 2.5, 999, false, VarManager::kPin, 0, 2.0); @@ -7240,49 +7240,49 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) //--------------------------------------------------------------- // ALICE 3 Analysis Cuts - if (!nameStr.compare("alice3KineSkim")) { + if (nameStr == "alice3KineSkim") { cut->AddCut(VarManager::kPt, 0.05, 1000.0); cut->AddCut(VarManager::kEta, -4.0, 4.0); return cut; } - if (!nameStr.compare("alice3StandardKine")) { + if (nameStr == "alice3StandardKine") { cut->AddCut(VarManager::kPt, 0.1, 1000.0); cut->AddCut(VarManager::kEta, -2.5, 2.5); // Total tracker acceptance in v3b geomety return cut; } - if (!nameStr.compare("alice3KineTOFAcceptance")) { + if (nameStr == "alice3KineTOFAcceptance") { cut->AddCut(VarManager::kPt, 0.1, 1000.0); cut->AddCut(VarManager::kEta, -2.0, 2.0); // TOF acceptance in v3b geomety return cut; } - if (!nameStr.compare("alice3KineRICHAcceptance")) { + if (nameStr == "alice3KineRICHAcceptance") { cut->AddCut(VarManager::kPt, 0.1, 1000.0); cut->AddCut(VarManager::kEta, -0.8, 0.8); // RICH acceptance in v3b geomety return cut; } - if (!nameStr.compare("alice3JpsiKine")) { + if (nameStr == "alice3JpsiKine") { cut->AddCut(VarManager::kPt, 1.0, 1000.0); cut->AddCut(VarManager::kEta, -2.5, 2.5); // Total tracker acceptance in v3b geomety return cut; } - if (!nameStr.compare("alice3JpsiKineTOFAcceptance")) { + if (nameStr == "alice3JpsiKineTOFAcceptance") { cut->AddCut(VarManager::kPt, 1.0, 1000.0); cut->AddCut(VarManager::kEta, -2.0, 2.0); // TOF acceptance in v3b geomety return cut; } - if (!nameStr.compare("alice3JpsiKineRICHAcceptance")) { + if (nameStr == "alice3JpsiKineRICHAcceptance") { cut->AddCut(VarManager::kPt, 1.0, 1000.0); cut->AddCut(VarManager::kEta, -0.8, 0.8); // RICH acceptance in v3b geomety return cut; } - if (!nameStr.compare("alice3TrackQuality")) { + if (nameStr == "alice3TrackQuality") { cut->AddCut(VarManager::kIsReconstructed, 0.5, 1.5); cut->AddCut(VarManager::kNSiliconHits, 6.0, 12.0); cut->AddCut(VarManager::kTrackDCAxy, -3.0, 3.0); @@ -7290,7 +7290,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("alice3TrackQualityTightDCA")) { + if (nameStr == "alice3TrackQualityTightDCA") { cut->AddCut(VarManager::kIsReconstructed, 0.5, 1.5); cut->AddCut(VarManager::kNSiliconHits, 6.0, 12.0); cut->AddCut(VarManager::kTrackDCAxy, -1.0, 1.0); @@ -7298,90 +7298,90 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) return cut; } - if (!nameStr.compare("alice3OTPIDEl")) { + if (nameStr == "alice3OTPIDEl") { cut->AddCut(VarManager::kOTnSigmaEl, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3OTPIDPi")) { + if (nameStr == "alice3OTPIDPi") { cut->AddCut(VarManager::kOTnSigmaPi, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3OTPIDKa")) { + if (nameStr == "alice3OTPIDKa") { cut->AddCut(VarManager::kOTnSigmaKa, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3OTPIDPr")) { + if (nameStr == "alice3OTPIDPr") { cut->AddCut(VarManager::kOTnSigmaPr, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3iTOFPIDEl")) { + if (nameStr == "alice3iTOFPIDEl") { cut->AddCut(VarManager::kInnerTOFnSigmaEl, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3iTOFPIDPi")) { + if (nameStr == "alice3iTOFPIDPi") { cut->AddCut(VarManager::kInnerTOFnSigmaPi, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3iTOFPIDKa")) { + if (nameStr == "alice3iTOFPIDKa") { cut->AddCut(VarManager::kInnerTOFnSigmaKa, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3iTOFPIDPr")) { + if (nameStr == "alice3iTOFPIDPr") { cut->AddCut(VarManager::kInnerTOFnSigmaPr, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3oTOFPIDEl")) { + if (nameStr == "alice3oTOFPIDEl") { cut->AddCut(VarManager::kOuterTOFnSigmaEl, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3oTOFPIDEl")) { + if (nameStr == "alice3oTOFPIDEl") { cut->AddCut(VarManager::kOuterTOFnSigmaEl, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3oTOFPIDPi")) { + if (nameStr == "alice3oTOFPIDPi") { cut->AddCut(VarManager::kOuterTOFnSigmaPi, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3oTOFPIDKa")) { + if (nameStr == "alice3oTOFPIDKa") { cut->AddCut(VarManager::kOuterTOFnSigmaKa, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3oTOFPIDPr")) { + if (nameStr == "alice3oTOFPIDPr") { cut->AddCut(VarManager::kOuterTOFnSigmaPr, -3.0, 3.0); return cut; } - if (!nameStr.compare("alice3RICHPIDEl")) { + if (nameStr == "alice3RICHPIDEl") { cut->AddCut(VarManager::kRICHnSigmaEl, -3.0, 3.0); cut->AddCut(VarManager::kHasRICHSigEl, 0.5, 1.5); return cut; } - if (!nameStr.compare("alice3RICHPIDPi")) { + if (nameStr == "alice3RICHPIDPi") { cut->AddCut(VarManager::kRICHnSigmaPi, -3.0, 3.0); cut->AddCut(VarManager::kHasRICHSigPi, 0.5, 1.5); return cut; } - if (!nameStr.compare("alice3RICHPIDKa")) { + if (nameStr == "alice3RICHPIDKa") { cut->AddCut(VarManager::kRICHnSigmaKa, -3.0, 3.0); cut->AddCut(VarManager::kHasRICHSigKa, 0.5, 1.5); return cut; } - if (!nameStr.compare("alice3RICHPIDPr")) { + if (nameStr == "alice3RICHPIDPr") { cut->AddCut(VarManager::kRICHnSigmaPr, -3.0, 3.0); cut->AddCut(VarManager::kHasRICHSigPr, 0.5, 1.5); return cut; From f4b0417dd19e817c33c692bc66ed8656866f7f32 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 10:45:51 +0200 Subject: [PATCH 02/11] readability-braces-around-statements --- PWGDQ/Core/CutsLibrary.cxx | 456 +++++++++++++++++++------------------ 1 file changed, 230 insertions(+), 226 deletions(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 98cc6a1e729..d94b6620da9 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -45,7 +45,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // TODO: Agree on some conventions for the naming // Think of possible customization of the predefined cuts via names - AnalysisCompositeCut* cut = new AnalysisCompositeCut(cutName, cutName); + auto* cut = new AnalysisCompositeCut(cutName, cutName); std::string nameStr = cutName; // /////////////////////////////////////////////// @@ -67,17 +67,17 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } if (nameStr == "Electron2025_1") { - AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); + auto* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); - AnalysisCut* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); + auto* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); qualityCuts->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); qualityCuts->AddCut(VarManager::kTPCchi2, 0.0, 4.0); qualityCuts->AddCut(VarManager::kTPCncls, 70, 161.); qualityCuts->AddCut(VarManager::kTrackDCAz, -0.5, 0.5); - AnalysisCut* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); + auto* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -3.0, 4.0, false, VarManager::kPin, 0.0, 5.0); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -1.5, 4.0, false, VarManager::kPin, 5.0, 1000.0); pidCuts->AddCut(VarManager::kTPCnSigmaPi, 2.5, 999, false, VarManager::kPin, 0.0, 5.0); @@ -90,17 +90,17 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } if (nameStr == "Electron2025_2") { - AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); + auto* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); - AnalysisCut* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); + auto* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); qualityCuts->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); qualityCuts->AddCut(VarManager::kTPCchi2, 0.0, 4.0); qualityCuts->AddCut(VarManager::kTPCncls, 70, 161.); qualityCuts->AddCut(VarManager::kTrackDCAz, -0.5, 0.5); - AnalysisCut* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); + auto* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -3.0, 4.0, false, VarManager::kPin, 0.0, 5.0); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -2.0, 4.0, false, VarManager::kPin, 5.0, 1000.0); pidCuts->AddCut(VarManager::kTPCnSigmaPi, 2.0, 999, false, VarManager::kPin, 0.0, 5.0); @@ -113,17 +113,17 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } if (nameStr == "Electron2025_3") { - AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); + auto* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); - AnalysisCut* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); + auto* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); qualityCuts->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); qualityCuts->AddCut(VarManager::kTPCchi2, 0.0, 4.0); qualityCuts->AddCut(VarManager::kTPCncls, 70, 161.); qualityCuts->AddCut(VarManager::kTrackDCAz, -0.5, 0.5); - AnalysisCut* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); + auto* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -2.5, 4.0, false, VarManager::kPin, 0.0, 5.0); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -2.0, 4.0, false, VarManager::kPin, 5.0, 1000.0); pidCuts->AddCut(VarManager::kTPCnSigmaPr, 2.5, 999, false, VarManager::kPin, 0.0, 5.0); @@ -135,17 +135,17 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } if (nameStr == "Electron2025_4") { - AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); + auto* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); - AnalysisCut* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); + auto* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); qualityCuts->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); qualityCuts->AddCut(VarManager::kTPCchi2, 0.0, 4.0); qualityCuts->AddCut(VarManager::kTPCncls, 70, 161.); qualityCuts->AddCut(VarManager::kTrackDCAz, -0.5, 0.5); - AnalysisCut* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); + auto* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -2.5, 4.0, false, VarManager::kPin, 0.0, 5.0); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -1.5, 4.0, false, VarManager::kPin, 5.0, 1000.0); pidCuts->AddCut(VarManager::kTPCnSigmaPi, 2.5, 999, false, VarManager::kPin, 0.0, 5.0); @@ -158,17 +158,17 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } if (nameStr == "Electron2025_5") { - AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); + auto* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); - AnalysisCut* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); + auto* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); qualityCuts->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); qualityCuts->AddCut(VarManager::kTPCchi2, 0.0, 4.0); qualityCuts->AddCut(VarManager::kTPCncls, 70, 161.); qualityCuts->AddCut(VarManager::kTrackDCAz, -0.5, 0.5); - AnalysisCut* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); + auto* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -2.25, 4.0, false, VarManager::kPin, 0.0, 5.0); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -1.5, 4.0, false, VarManager::kPin, 5.0, 1000.0); pidCuts->AddCut(VarManager::kTPCnSigmaPi, 2.5, 999, false, VarManager::kPin, 0.0, 5.0); @@ -181,11 +181,11 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } if (nameStr == "Electron2025_4_ldong") { - AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); + auto* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kP, 1.0, 1000.0); kineCut->AddCut(VarManager::kEta, -0.9, 0.9); - AnalysisCut* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); + auto* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); qualityCuts->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); qualityCuts->AddCut(VarManager::kIsSPDany, 0.5, 1.5); qualityCuts->AddCut(VarManager::kITSchi2, 0.0, 5.0); @@ -194,7 +194,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) qualityCuts->AddCut(VarManager::kTrackDCAz, -0.5, 0.5); qualityCuts->AddCut(VarManager::kTrackDCAxy, -0.5, 0.5); - AnalysisCut* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); + auto* pidCuts = new AnalysisCut("pidCuts", "pid cuts"); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -2.5, 4.0, false, VarManager::kPin, 0.0, 5.0); pidCuts->AddCut(VarManager::kTPCnSigmaEl, -1.5, 4.0, false, VarManager::kPin, 5.0, 1000.0); pidCuts->AddCut(VarManager::kTPCnSigmaPi, 2.7, 999, false, VarManager::kPin, 0.0, 5.0); @@ -492,7 +492,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("pidCut_lowP_Corr")); - AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE); + auto* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE); pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP_Corr")); pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP_Corr")); cut->AddCut(pidCut_highP); @@ -504,7 +504,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("pidCut_lowP")); - AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE); + auto* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE); pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP")); pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP")); cut->AddCut(pidCut_highP); @@ -515,7 +515,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("pidCut_lowP_Corr")); - AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE); + auto* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE); pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP2_Corr")); pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP_Corr")); cut->AddCut(pidCut_highP); @@ -527,7 +527,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug")); cut->AddCut(GetAnalysisCut("pidCut_lowP")); - AnalysisCompositeCut* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE); + auto* pidCut_highP = new AnalysisCompositeCut("pidCut_highP", "pidCut_highP", kFALSE); pidCut_highP->AddCut(GetAnalysisCut("EleInclusion_highP2")); pidCut_highP->AddCut(GetAnalysisCut("PionExclusion_highP")); cut->AddCut(pidCut_highP); @@ -784,13 +784,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("PIDStandardKine2")); cut->AddCut(GetAnalysisCut("SPDany")); - AnalysisCompositeCut* cut_notpc = new AnalysisCompositeCut("NoTPC", "NoTPC", kTRUE); + auto* cut_notpc = new AnalysisCompositeCut("NoTPC", "NoTPC", kTRUE); cut_notpc->AddCut(GetAnalysisCut("noTPC")); - AnalysisCompositeCut* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); + auto* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); cut_tpcpid->AddCut(GetAnalysisCut("pionQuality")); - AnalysisCompositeCut* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); + auto* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); cut_OR->AddCut(cut_notpc); cut_OR->AddCut(cut_tpcpid); cut->AddCut(cut_OR); @@ -801,13 +801,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("PIDStandardKine2")); cut->AddCut(GetAnalysisCut("ITSibany")); - AnalysisCompositeCut* cut_notpc = new AnalysisCompositeCut("NoTPC", "NoTPC", kTRUE); + auto* cut_notpc = new AnalysisCompositeCut("NoTPC", "NoTPC", kTRUE); cut_notpc->AddCut(GetAnalysisCut("noTPC")); - AnalysisCompositeCut* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); + auto* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); cut_tpcpid->AddCut(GetAnalysisCut("pionQuality")); - AnalysisCompositeCut* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); + auto* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); cut_OR->AddCut(cut_notpc); cut_OR->AddCut(cut_tpcpid); cut->AddCut(cut_OR); @@ -889,15 +889,15 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } if (nameStr == "kaonPIDTPCTOForTPC") { - AnalysisCompositeCut* cut_tpctof_nSigma = new AnalysisCompositeCut("pid_TPCTOFnSigma", "pid_TPCTOFnSigma", kTRUE); + auto* cut_tpctof_nSigma = new AnalysisCompositeCut("pid_TPCTOFnSigma", "pid_TPCTOFnSigma", kTRUE); cut_tpctof_nSigma->AddCut(GetAnalysisCut("hasTOF")); cut_tpctof_nSigma->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut("noTOF")); cut_tpc_nSigma->AddCut(GetAnalysisCut("kaonPIDnsigma")); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("kaon_nsigma", "kaon_nsigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("kaon_nsigma", "kaon_nsigma", kFALSE); cut_pid_OR->AddCut(cut_tpctof_nSigma); cut_pid_OR->AddCut(cut_tpc_nSigma); cut->AddCut(cut_pid_OR); @@ -905,15 +905,15 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } if (nameStr == "kaonPIDTPCTOForTPC700") { - AnalysisCompositeCut* cut_tpctof_nSigma = new AnalysisCompositeCut("pid_TPCTOFnSigma", "pid_TPCTOFnSigma", kTRUE); + auto* cut_tpctof_nSigma = new AnalysisCompositeCut("pid_TPCTOFnSigma", "pid_TPCTOFnSigma", kTRUE); cut_tpctof_nSigma->AddCut(GetAnalysisCut("hasTOF")); cut_tpctof_nSigma->AddCut(GetAnalysisCut("kaonPID_TPCnTOF")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut("noTOF")); cut_tpc_nSigma->AddCut(GetAnalysisCut("kaonPIDnsigma700")); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("kaon_nsigma", "kaon_nsigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("kaon_nsigma", "kaon_nsigma", kFALSE); cut_pid_OR->AddCut(cut_tpctof_nSigma); cut_pid_OR->AddCut(cut_tpc_nSigma); cut->AddCut(cut_pid_OR); @@ -957,13 +957,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } if (nameStr == "pionPIDTPCTOForTPC") { - AnalysisCompositeCut* cut_tpctof_nSigma = new AnalysisCompositeCut("pid_TPCTOFnSigma", "pid_TPCTOFnSigma", kTRUE); + auto* cut_tpctof_nSigma = new AnalysisCompositeCut("pid_TPCTOFnSigma", "pid_TPCTOFnSigma", kTRUE); cut_tpctof_nSigma->AddCut(GetAnalysisCut("pionPID_TPCnTOF")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut("pionPIDnsigma")); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("pion_nsigma", "pion_nsigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("pion_nsigma", "pion_nsigma", kFALSE); cut_pid_OR->AddCut(cut_tpctof_nSigma); cut_pid_OR->AddCut(cut_tpc_nSigma); cut->AddCut(cut_pid_OR); @@ -1238,7 +1238,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // Magnus composite cuts ----------------------------------------------------------------------------------------------------------------- - AnalysisCompositeCut* magnus_PID111 = new AnalysisCompositeCut("magnus_PID111", ""); + auto* magnus_PID111 = new AnalysisCompositeCut("magnus_PID111", ""); magnus_PID111->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID111->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID111->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); @@ -1250,7 +1250,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID211 = new AnalysisCompositeCut("magnus_PID211", ""); + auto* magnus_PID211 = new AnalysisCompositeCut("magnus_PID211", ""); magnus_PID211->AddCut(GetAnalysisCut("pidJpsi_magnus_ele2")); magnus_PID211->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID211->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); @@ -1262,7 +1262,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID311 = new AnalysisCompositeCut("magnus_PID311", ""); + auto* magnus_PID311 = new AnalysisCompositeCut("magnus_PID311", ""); magnus_PID311->AddCut(GetAnalysisCut("pidJpsi_magnus_ele3")); magnus_PID311->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID311->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); @@ -1274,7 +1274,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID121 = new AnalysisCompositeCut("magnus_PID121", ""); + auto* magnus_PID121 = new AnalysisCompositeCut("magnus_PID121", ""); magnus_PID121->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID121->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID121->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); @@ -1286,7 +1286,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID112 = new AnalysisCompositeCut("magnus_PID112", ""); + auto* magnus_PID112 = new AnalysisCompositeCut("magnus_PID112", ""); magnus_PID112->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID112->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID112->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); @@ -1298,7 +1298,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID122 = new AnalysisCompositeCut("magnus_PID122", ""); + auto* magnus_PID122 = new AnalysisCompositeCut("magnus_PID122", ""); magnus_PID122->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID122->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID122->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); @@ -1310,7 +1310,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID222 = new AnalysisCompositeCut("magnus_PID222", ""); + auto* magnus_PID222 = new AnalysisCompositeCut("magnus_PID222", ""); magnus_PID222->AddCut(GetAnalysisCut("pidJpsi_magnus_ele2")); magnus_PID222->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID222->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); @@ -1322,7 +1322,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID212 = new AnalysisCompositeCut("magnus_PID212", ""); + auto* magnus_PID212 = new AnalysisCompositeCut("magnus_PID212", ""); magnus_PID212->AddCut(GetAnalysisCut("pidJpsi_magnus_ele2")); magnus_PID212->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID212->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); @@ -1334,7 +1334,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID221 = new AnalysisCompositeCut("magnus_PID221", ""); + auto* magnus_PID221 = new AnalysisCompositeCut("magnus_PID221", ""); magnus_PID221->AddCut(GetAnalysisCut("pidJpsi_magnus_ele2")); magnus_PID221->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID221->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); @@ -1346,7 +1346,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID321 = new AnalysisCompositeCut("magnus_PID321", ""); + auto* magnus_PID321 = new AnalysisCompositeCut("magnus_PID321", ""); magnus_PID321->AddCut(GetAnalysisCut("pidJpsi_magnus_ele3")); magnus_PID321->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID321->AddCut(GetAnalysisCut("pidJpsi_magnus_prot1")); @@ -1358,7 +1358,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID312 = new AnalysisCompositeCut("magnus_PID312", ""); + auto* magnus_PID312 = new AnalysisCompositeCut("magnus_PID312", ""); magnus_PID312->AddCut(GetAnalysisCut("pidJpsi_magnus_ele3")); magnus_PID312->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1")); magnus_PID312->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); @@ -1370,7 +1370,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - AnalysisCompositeCut* magnus_PID322 = new AnalysisCompositeCut("magnus_PID322", ""); + auto* magnus_PID322 = new AnalysisCompositeCut("magnus_PID322", ""); magnus_PID322->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1")); magnus_PID322->AddCut(GetAnalysisCut("pidJpsi_magnus_pion2")); magnus_PID322->AddCut(GetAnalysisCut("pidJpsi_magnus_prot2")); @@ -1486,13 +1486,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); cut->AddCut(GetAnalysisCut("SPDfirst")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut("electronPIDPrKaPiRejLoose")); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut("electronPID_TOFnsigma")); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -1505,13 +1505,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); cut->AddCut(GetAnalysisCut("SPDfirst")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut("electronPIDPrKaPiRejLoose_Corr")); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut("electronPID_TOFnsigma_Corr")); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -1598,17 +1598,17 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // Q vector contributor cut // if (nameStr == "selTPCCentral") { - AnalysisCut* kineCut = new AnalysisCut("kineCut", "kine cut"); + auto* kineCut = new AnalysisCut("kineCut", "kine cut"); kineCut->AddCut(VarManager::kEta, -0.8, 0.8); kineCut->AddCut(VarManager::kPt, 0.15, 5); - AnalysisCut* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); + auto* qualityCuts = new AnalysisCut("qualityCuts", "quality cuts"); qualityCuts->AddCut(VarManager::kTPCchi2, 0., 4.); qualityCuts->AddCut(VarManager::kTPCnCRoverFindCls, 0.8, 1.); qualityCuts->AddCut(VarManager::kIsITSibAny, 0.5, 1.5); qualityCuts->AddCut(VarManager::kITSchi2, 0., 36.); - AnalysisCut* dcaCuts = new AnalysisCut("dcaCuts", "DCA cuts"); + auto* dcaCuts = new AnalysisCut("dcaCuts", "DCA cuts"); std::shared_ptr f1dcaxyHigh = std::make_shared("f1dcaxy", "[0]+[1]/pow(x,[2])", 0., 10.); f1dcaxyHigh->SetParameters(0.0105, 0.035, 1.1); std::shared_ptr f1dcaxyLow = std::make_shared("f1dcaxy_low", "[0]+[1]/pow(x,[2])", 0., 10.); @@ -1639,17 +1639,17 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); - AnalysisCompositeCut* cut_tpc_hadrej = new AnalysisCompositeCut("pid_TPChadrej", "pid_TPChadrej", kTRUE); + auto* cut_tpc_hadrej = new AnalysisCompositeCut("pid_TPChadrej", "pid_TPChadrej", kTRUE); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_electron")); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_pion_rejection")); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_kaon_rejection")); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_proton_rejection")); - AnalysisCompositeCut* cut_tof_rec = new AnalysisCompositeCut("pid_tof_rec", "pid_tof_rec", kTRUE); + auto* cut_tof_rec = new AnalysisCompositeCut("pid_tof_rec", "pid_tof_rec", kTRUE); cut_tof_rec->AddCut(GetAnalysisCut("tpc_electron")); cut_tof_rec->AddCut(GetAnalysisCut("tof_electron")); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("pid_TPChadrejTOFrec", "pid_TPChadrejTOFrec", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("pid_TPChadrejTOFrec", "pid_TPChadrejTOFrec", kFALSE); cut_pid_OR->AddCut(cut_tpc_hadrej); cut_pid_OR->AddCut(cut_tof_rec); cut->AddCut(cut_pid_OR); @@ -1661,7 +1661,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); - AnalysisCompositeCut* cut_tpc_hadrej = new AnalysisCompositeCut("pid_TPChadrej", "pid_TPChadrej", kTRUE); + auto* cut_tpc_hadrej = new AnalysisCompositeCut("pid_TPChadrej", "pid_TPChadrej", kTRUE); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_electron")); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_pion_rejection")); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_kaon_rejection")); @@ -1675,13 +1675,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut("electronPID_TPCnsigma")); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut("electronPID_TOFnsigma")); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -1693,7 +1693,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("TightGlobalTrack")); cut->AddCut(GetAnalysisCut("standardPrimaryTrack")); - AnalysisCompositeCut* cut_tof_rec = new AnalysisCompositeCut("pid_tof_rec", "pid_tof_rec", kTRUE); + auto* cut_tof_rec = new AnalysisCompositeCut("pid_tof_rec", "pid_tof_rec", kTRUE); cut_tof_rec->AddCut(GetAnalysisCut("tpc_electron")); cut_tof_rec->AddCut(GetAnalysisCut("tof_electron")); @@ -1736,19 +1736,19 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_hadrej = new AnalysisCompositeCut("pid_TPChadrej", "pid_TPChadrej", kTRUE); + auto* cut_tpc_hadrej = new AnalysisCompositeCut("pid_TPChadrej", "pid_TPChadrej", kTRUE); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_electron")); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_pion_muon_band_rejection")); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_pion_rejection_highp")); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_kaon_rejection")); cut_tpc_hadrej->AddCut(GetAnalysisCut("tpc_proton_rejection")); - AnalysisCompositeCut* cut_tof_rec = new AnalysisCompositeCut("pid_tof_rec", "pid_tof_rec", kTRUE); + auto* cut_tof_rec = new AnalysisCompositeCut("pid_tof_rec", "pid_tof_rec", kTRUE); cut_tof_rec->AddCut(GetAnalysisCut("tpc_electron")); cut_tof_rec->AddCut(GetAnalysisCut("tof_electron_loose")); cut_tof_rec->AddCut(GetAnalysisCut("tpc_pion_rejection_highp")); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("pid_TPChadrejTOFrec", "pid_TPChadrejTOFrec", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("pid_TPChadrejTOFrec", "pid_TPChadrejTOFrec", kFALSE); cut_pid_OR->AddCut(cut_tpc_hadrej); cut_pid_OR->AddCut(cut_tof_rec); cut->AddCut(cut_pid_OR); @@ -1977,14 +1977,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_notpc = new AnalysisCompositeCut("NoTPC", "NoTPC", kTRUE); + auto* cut_notpc = new AnalysisCompositeCut("NoTPC", "NoTPC", kTRUE); cut_notpc->AddCut(GetAnalysisCut("noTPC")); - AnalysisCompositeCut* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); + auto* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); cut_tpcpid->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); cut_tpcpid->AddCut(GetAnalysisCut(Form("electronPIDOnly%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); + auto* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); cut_OR->AddCut(cut_notpc); cut_OR->AddCut(cut_tpcpid); cut->AddCut(cut_OR); @@ -1996,14 +1996,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualityITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_notpcstandard = new AnalysisCompositeCut("NoTPCstandard", "NoTPCstandard", kTRUE); + auto* cut_notpcstandard = new AnalysisCompositeCut("NoTPCstandard", "NoTPCstandard", kTRUE); cut_notpcstandard->AddCut(GetAnalysisCut("NoelectronStandardQualityTPCOnly")); - AnalysisCompositeCut* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); + auto* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); cut_tpcpid->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); cut_tpcpid->AddCut(GetAnalysisCut(Form("electronPIDOnly%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); + auto* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); cut_OR->AddCut(cut_notpcstandard); cut_OR->AddCut(cut_tpcpid); cut->AddCut(cut_OR); @@ -2024,14 +2024,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_notpc = new AnalysisCompositeCut("NoTPC", "NoTPC", kTRUE); + auto* cut_notpc = new AnalysisCompositeCut("NoTPC", "NoTPC", kTRUE); cut_notpc->AddCut(GetAnalysisCut("noTPC")); - AnalysisCompositeCut* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); + auto* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); cut_tpcpid->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); cut_tpcpid->AddCut(GetAnalysisCut(Form("electronPIDOnly%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); + auto* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); cut_OR->AddCut(cut_notpc); cut_OR->AddCut(cut_tpcpid); cut->AddCut(cut_OR); @@ -2043,14 +2043,14 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("electronStandardQualitybAnyITSOnly")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_notpcstandard = new AnalysisCompositeCut("NoTPCstandard", "NoTPCstandard", kTRUE); + auto* cut_notpcstandard = new AnalysisCompositeCut("NoTPCstandard", "NoTPCstandard", kTRUE); cut_notpcstandard->AddCut(GetAnalysisCut("NoelectronStandardQualityTPCOnly")); - AnalysisCompositeCut* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); + auto* cut_tpcpid = new AnalysisCompositeCut("pid_TPC", "pid_TPC", kTRUE); cut_tpcpid->AddCut(GetAnalysisCut("electronStandardQualityTPCOnly")); cut_tpcpid->AddCut(GetAnalysisCut(Form("electronPIDOnly%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); + auto* cut_OR = new AnalysisCompositeCut("OR", "OR", kFALSE); cut_OR->AddCut(cut_notpcstandard); cut_OR->AddCut(cut_tpcpid); cut->AddCut(cut_OR); @@ -2063,13 +2063,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeCutVarTrackCuts%i", i))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma_cutVar%s%i", vecPIDcase.at(icase).Data(), i))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma_cutVar%s%i", vecPIDcase.at(icase).Data(), i))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2092,13 +2092,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_loose", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_loose", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2110,13 +2110,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2128,13 +2128,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongHadRej", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongHadRej", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2146,13 +2146,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2164,13 +2164,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2190,13 +2190,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2208,13 +2208,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2226,13 +2226,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2244,13 +2244,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_tightNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2262,13 +2262,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2280,13 +2280,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); // to reject looper using DCAz - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2298,13 +2298,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); // to reject looper using DCAz - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2334,13 +2334,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2353,13 +2353,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2372,13 +2372,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2391,13 +2391,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2410,13 +2410,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2429,13 +2429,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2448,13 +2448,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2467,13 +2467,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigEPbPb_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2540,7 +2540,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); cut->AddCut(cut_tpc_nSigma); @@ -2552,7 +2552,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); cut->AddCut(cut_tof_nSigma); @@ -2564,13 +2564,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_DCA05")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2584,13 +2584,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2603,13 +2603,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2622,13 +2622,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2641,13 +2641,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2661,13 +2661,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2680,13 +2680,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2699,13 +2699,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2718,13 +2718,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2738,13 +2738,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2757,13 +2757,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2776,13 +2776,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2795,13 +2795,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TPCnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_lowB_TOFnsigma%s_strongNSigE_rejBadTOF", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2814,13 +2814,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_TPC%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_TOF%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2834,13 +2834,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_TPC%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_TOF%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2853,13 +2853,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("standardPrimaryTrackDCAz")); // DCAz to reject loopers - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_lowB_TPC%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_lowB_TOF%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2871,13 +2871,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2891,13 +2891,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data()))); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2911,13 +2911,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("TightGlobalTrackRun3_strongTPC")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2929,13 +2929,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("LooseGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_TPCloose%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_TOFloose%s", vecPIDcase.at(icase).Data()))); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); cut->AddCut(cut_pid_OR); @@ -2947,7 +2947,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("LooseGlobalTrackRun3")); cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_TPCloosenopkrej%s", vecPIDcase.at(icase).Data()))); cut->AddCut(cut_tpc_nSigma); @@ -3017,13 +3017,13 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) cut->AddCut(GetAnalysisCut("lmeeStandardKine")); cut->AddCut(GetAnalysisCut("trackQuality_compareDQEMframework")); cut->AddCut(GetAnalysisCut("trackDCA1cm")); - AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); + auto* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE); cut_tpc_nSigma->AddCut(GetAnalysisCut("lmee_commonDQEM_PID_TPC")); - AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); + auto* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE); cut_tof_nSigma->AddCut(GetAnalysisCut("lmee_commonDQEM_PID_TOF")); - AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); + auto* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE); cut_pid_OR->AddCut(cut_tpc_nSigma); cut_pid_OR->AddCut(cut_tof_nSigma); return cut; @@ -3044,7 +3044,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) // lmee pair cuts if (nameStr == "pairPhiV") { - AnalysisCompositeCut* cut_pairPhiV = new AnalysisCompositeCut("cut_pairPhiV", "cut_pairPhiV", kTRUE); + auto* cut_pairPhiV = new AnalysisCompositeCut("cut_pairPhiV", "cut_pairPhiV", kTRUE); cut_pairPhiV->AddCut(GetAnalysisCut("pairLowMass")); cut_pairPhiV->AddCut(GetAnalysisCut("pairPhiV")); cut->AddCut(cut_pairPhiV); @@ -3052,7 +3052,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) } if (nameStr == "excludePairPhiV") { - AnalysisCompositeCut* cut_pairlowPhiV = new AnalysisCompositeCut("cut_pairlowPhiV", "cut_pairlowPhiV", kFALSE); + auto* cut_pairlowPhiV = new AnalysisCompositeCut("cut_pairlowPhiV", "cut_pairlowPhiV", kFALSE); cut_pairlowPhiV->AddCut(GetAnalysisCut("excludePairLowMass")); cut_pairlowPhiV->AddCut(GetAnalysisCut("excludePairPhiV")); cut->AddCut(cut_pairlowPhiV); @@ -4070,7 +4070,7 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) // // define here cuts which are likely to be used often // - AnalysisCut* cut = new AnalysisCut(cutName, cutName); + auto* cut = new AnalysisCut(cutName, cutName); std::string nameStr = cutName; // --------------------------------------------------------------- // Event cuts @@ -4453,13 +4453,13 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } if (nameStr == "eventSingleGapACZDC") { - AnalysisCompositeCut* cutA = new AnalysisCompositeCut("singleGapAZDC", "singleGapAZDC", kTRUE); + auto* cutA = new AnalysisCompositeCut("singleGapAZDC", "singleGapAZDC", kTRUE); cutA->AddCut(GetAnalysisCut("eventSingleGapAZDC")); - AnalysisCompositeCut* cutC = new AnalysisCompositeCut("singleGapCZDC", "singleGapCZDC", kTRUE); + auto* cutC = new AnalysisCompositeCut("singleGapCZDC", "singleGapCZDC", kTRUE); cutC->AddCut(GetAnalysisCut("eventSingleGapCZDC")); - AnalysisCompositeCut* cutAorC = new AnalysisCompositeCut("singleGapACZDC", "singleGapACZDC", kFALSE); + auto* cutAorC = new AnalysisCompositeCut("singleGapACZDC", "singleGapACZDC", kFALSE); cutAorC->AddCut(cutA); cutAorC->AddCut(cutC); return cutAorC; @@ -4471,15 +4471,15 @@ AnalysisCut* o2::aod::dqcuts::GetAnalysisCut(const char* cutName) } if (nameStr == "eventSingleGapACZDC_UPCMode") { - AnalysisCompositeCut* cutA = new AnalysisCompositeCut("singleGapAZDC", "singleGapAZDC", kTRUE); + auto* cutA = new AnalysisCompositeCut("singleGapAZDC", "singleGapAZDC", kTRUE); cutA->AddCut(GetAnalysisCut("eventSingleGapAZDC")); cutA->AddCut(GetAnalysisCut("eventUPCMode")); - AnalysisCompositeCut* cutC = new AnalysisCompositeCut("singleGapCZDC", "singleGapCZDC", kTRUE); + auto* cutC = new AnalysisCompositeCut("singleGapCZDC", "singleGapCZDC", kTRUE); cutC->AddCut(GetAnalysisCut("eventSingleGapCZDC")); cutC->AddCut(GetAnalysisCut("eventUPCMode")); - AnalysisCompositeCut* cutAorC = new AnalysisCompositeCut("singleGapACZDC", "singleGapACZDC", kFALSE); + auto* cutAorC = new AnalysisCompositeCut("singleGapACZDC", "singleGapACZDC", kFALSE); cutAorC->AddCut(cutA); cutAorC->AddCut(cutC); return cutAorC; @@ -7600,7 +7600,7 @@ AnalysisCut* o2::aod::dqcuts::ParseJSONAnalysisCut(T cut, const char* cutName) } // construct the AnalysisCut object and add the AddCuts - AnalysisCut* retCut = new AnalysisCut(cutName, cut->HasMember("library") ? cut->FindMember("title")->value.GetString() : ""); + auto* retCut = new AnalysisCut(cutName, cut->HasMember("library") ? cut->FindMember("title")->value.GetString() : ""); // loop over all the members for this cut and configure the AddCut objects for (rapidjson::Value::ConstMemberIterator it = cut->MemberBegin(); it != cut->MemberEnd(); it++) { @@ -7731,7 +7731,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::ParseJSONAnalysisCompositeCut(T cut, cons return GetCompositeCut(cut->FindMember("library")->value.GetString()); } - AnalysisCompositeCut* retCut = new AnalysisCompositeCut(cutName, cut->HasMember("library") ? cut->FindMember("title")->value.GetString() : "", cut->FindMember("useAND")->value.GetBool()); + auto* retCut = new AnalysisCompositeCut(cutName, cut->HasMember("library") ? cut->FindMember("title")->value.GetString() : "", cut->FindMember("useAND")->value.GetBool()); // Loop to find AddCut objects for (rapidjson::Value::ConstMemberIterator it = cut->MemberBegin(); it != cut->MemberEnd(); it++) { @@ -7859,8 +7859,9 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro for (auto centMember = obj.MemberBegin(); centMember != obj.MemberEnd(); ++centMember) { TString centKey = centMember->name.GetString(); - if (!centKey.Contains("AddCentCut")) + if (!centKey.Contains("AddCentCut")) { continue; +} const auto& centCut = centMember->value; @@ -7874,8 +7875,9 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro for (auto ptMember = centCut.MemberBegin(); ptMember != centCut.MemberEnd(); ++ptMember) { TString ptKey = ptMember->name.GetString(); - if (!ptKey.Contains("AddPtCut")) + if (!ptKey.Contains("AddPtCut")) { continue; +} const auto& ptCut = ptMember->value; @@ -7893,8 +7895,9 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro for (auto mlMember = ptCut.MemberBegin(); mlMember != ptCut.MemberEnd(); ++mlMember) { TString mlKey = mlMember->name.GetString(); - if (!mlKey.Contains("AddMLCut")) + if (!mlKey.Contains("AddMLCut")) { continue; +} const auto& mlcut = mlMember->value; @@ -7925,8 +7928,9 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro std::string msg = ""; for (size_t i = 0; i < binCuts.size(); ++i) { msg += std::to_string(binCuts[i]); - if (i != binCuts.size() - 1) + if (i != binCuts.size() - 1) { msg += ", "; +} } msg += "] and direction: "; msg += (exclude ? "CutGreater" : "CutSmaller"); From 2adfa35f6e0221fb0706450874d040e149486247 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 10:51:02 +0200 Subject: [PATCH 03/11] performance-inefficient-vector-operation --- PWGDQ/Core/CutsLibrary.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index d94b6620da9..0c6e3f2ab09 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -7945,6 +7945,7 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro } std::vector labelsClass; + labelsClass.reserve(cutsMl[0].size()); for (size_t j = 0; j < cutsMl[0].size(); ++j) { labelsClass.push_back(Form("score class %d", static_cast(j))); } From 931b80c30a39f0a7416397d8d3ef4f1577257fb5 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 11:01:42 +0200 Subject: [PATCH 04/11] modernize-avoid-c-arrays --- PWGDQ/Core/HistogramsLibrary.cxx | 914 +++++++++++++++---------------- 1 file changed, 457 insertions(+), 457 deletions(-) diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index 189f488d5a9..5071fe77faa 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -293,14 +293,14 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Psi2C_CentFT0C", "", false, 100, 0.0, 100.0, VarManager::kCentFT0C, 100, -2.0, 2.0, VarManager::kPsi2C); } if (subGroupStr.Contains("all-qvector")) { - int varZNA[3] = {VarManager::kQ1ZNAX, VarManager::kQ1ZNAY, VarManager::kCentFT0C}; - int varZNC[3] = {VarManager::kQ1ZNCX, VarManager::kQ1ZNCY, VarManager::kCentFT0C}; + std::array varZNA = {VarManager::kQ1ZNAX, VarManager::kQ1ZNAY, VarManager::kCentFT0C}; + std::array varZNC = {VarManager::kQ1ZNCX, VarManager::kQ1ZNCY, VarManager::kCentFT0C}; - int bins[3] = {500, 500, 18}; - double minBins[3] = {-10, -10, 0}; - double maxBins[3] = {10, 10, 90}; - hm->AddHistogram(histClass, "Q1ZNAX_Q1ZNAY_CentFT0C", "", 3, varZNA, bins, minBins, maxBins, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Q1ZNCX_Q1ZNCY_CentFT0C", "", 3, varZNC, bins, minBins, maxBins, 0, -1, kTRUE); + std::array bins = {500, 500, 18}; + std::array minBins = {-10, -10, 0}; + std::array maxBins = {10, 10, 90}; + hm->AddHistogram(histClass, "Q1ZNAX_Q1ZNAY_CentFT0C", "", 3, varZNA.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Q1ZNCX_Q1ZNCY_CentFT0C", "", 3, varZNC.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); hm->AddHistogram(histClass, "IntercalibZNA_CentFT0C", "", false, 18, 0.0, 90.0, VarManager::kCentFT0C, 500, -50.0, 50.0, VarManager::KIntercalibZNA); hm->AddHistogram(histClass, "IntercalibZNC_CentFT0C", "", false, 18, 0.0, 90.0, VarManager::kCentFT0C, 500, -50.0, 50.0, VarManager::KIntercalibZNC); @@ -744,32 +744,32 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h if (subGroupStr.Contains("tpcpid")) { if (subGroupStr.Contains("tpcpid_fine")) { // fine binning for pIN: steps in 10 MeV/c from 0 to 1 GeV/c and 100 MeV/c up to 10 GeV/c - double pIN_bins[281]; + std::array pIN_bins; for (int i = 0; i <= 200; i++) pIN_bins[i] = 0.01 * i; for (int i = 1; i <= 80; i++) pIN_bins[200 + i] = 2. + 0.1 * i; - int nbins_pIN = sizeof(pIN_bins) / sizeof(*pIN_bins) - 1; + int nbins_pIN = static_cast(pIN_bins.size()) - 1; - double TPCdEdx_bins[201]; + std::array TPCdEdx_bins; for (int i = 0; i <= 200; i++) TPCdEdx_bins[i] = i; - int nbins_TPCdEdx = sizeof(TPCdEdx_bins) / sizeof(*TPCdEdx_bins) - 1; + int nbins_TPCdEdx = static_cast(TPCdEdx_bins.size()) - 1; - double nSigma_bins[101]; + std::array nSigma_bins; for (int i = 0; i <= 100; i++) nSigma_bins[i] = -5. + 0.1 * i; - int nbins_nSigma = sizeof(nSigma_bins) / sizeof(*nSigma_bins) - 1; + int nbins_nSigma = static_cast(nSigma_bins.size()) - 1; - hm->AddHistogram(histClass, "TPCdedx_pIN", "TPC dE/dx vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_TPCdEdx, TPCdEdx_bins, VarManager::kTPCsignal); - hm->AddHistogram(histClass, "TPCnSigEle_pIN", "TPC n-#sigma(e) vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTPCnSigmaEl); - hm->AddHistogram(histClass, "TPCnSigPi_pIN", "TPC n-#sigma(#pi) vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTPCnSigmaPi); - hm->AddHistogram(histClass, "TPCnSigKa_pIN", "TPC n-#sigma(K) vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTPCnSigmaKa); - hm->AddHistogram(histClass, "TPCnSigPr_pIN", "TPC n-#sigma(p) vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTPCnSigmaPr); + hm->AddHistogram(histClass, "TPCdedx_pIN", "TPC dE/dx vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_TPCdEdx, TPCdEdx_bins.data(), VarManager::kTPCsignal); + hm->AddHistogram(histClass, "TPCnSigEle_pIN", "TPC n-#sigma(e) vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTPCnSigmaEl); + hm->AddHistogram(histClass, "TPCnSigPi_pIN", "TPC n-#sigma(#pi) vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTPCnSigmaPi); + hm->AddHistogram(histClass, "TPCnSigKa_pIN", "TPC n-#sigma(K) vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTPCnSigmaKa); + hm->AddHistogram(histClass, "TPCnSigPr_pIN", "TPC n-#sigma(p) vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTPCnSigmaPr); if (subGroupStr.Contains("tpcpid_fine_corr")) { - hm->AddHistogram(histClass, "TPCnSigEl_Corr_pIN", "TPC n-#sigma(e) Corr. vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTPCnSigmaEl_Corr); - hm->AddHistogram(histClass, "TPCnSigPi_Corr_pIN", "TPC n-#sigma(#pi) Corr. vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTPCnSigmaPi_Corr); - hm->AddHistogram(histClass, "TPCnSigPr_Corr_pIN", "TPC n-#sigma(p) Corr. vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTPCnSigmaPr_Corr); + hm->AddHistogram(histClass, "TPCnSigEl_Corr_pIN", "TPC n-#sigma(e) Corr. vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTPCnSigmaEl_Corr); + hm->AddHistogram(histClass, "TPCnSigPi_Corr_pIN", "TPC n-#sigma(#pi) Corr. vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTPCnSigmaPi_Corr); + hm->AddHistogram(histClass, "TPCnSigPr_Corr_pIN", "TPC n-#sigma(p) Corr. vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTPCnSigmaPr_Corr); } } else { hm->AddHistogram(histClass, "TPCdedx_pIN", "TPC dE/dx vs pIN", false, 100, 0.0, 20.0, VarManager::kPin, 150, 0.0, 150., VarManager::kTPCsignal); @@ -818,86 +818,86 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h if (subGroupStr.Contains("postcalib")) { const int kNvarsPID = 4; const int kTPCnsigmaNbins = 70; - double tpcNsigmaBinLims[kTPCnsigmaNbins + 1]; + std::array tpcNsigmaBinLims; for (int i = 0; i <= kTPCnsigmaNbins; ++i) tpcNsigmaBinLims[i] = -7.0 + 0.2 * i; const int kPinEleNbins = 20; - double pinEleBinLims[kPinEleNbins + 1] = {0.1, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 6.0, 8.0, 10.0, 12.0, 16.0, 20.0}; + std::array pinEleBinLims = {0.1, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 6.0, 8.0, 10.0, 12.0, 16.0, 20.0}; const int kEtaNbins = 9; - double etaBinLimsI[kEtaNbins + 1] = {-0.9, -0.7, -0.5, -0.3, -0.1, 0.1, 0.3, 0.5, 0.7, 0.9}; + std::array etaBinLimsI = {-0.9, -0.7, -0.5, -0.3, -0.1, 0.1, 0.3, 0.5, 0.7, 0.9}; const int kTPCnClusterbins = 16; - double tpcNclusterBinLims[kTPCnClusterbins + 1]; + std::array tpcNclusterBinLims; for (int i = 0; i <= kTPCnClusterbins; ++i) tpcNclusterBinLims[i] = 10 * i; - TArrayD nSigBinLimits[kNvarsPID]; - nSigBinLimits[0] = TArrayD(kTPCnsigmaNbins + 1, tpcNsigmaBinLims); - nSigBinLimits[1] = TArrayD(kTPCnClusterbins + 1, tpcNclusterBinLims); - nSigBinLimits[2] = TArrayD(kPinEleNbins + 1, pinEleBinLims); - nSigBinLimits[3] = TArrayD(kEtaNbins + 1, etaBinLimsI); + std::array nSigBinLimits; + nSigBinLimits[0] = TArrayD(kTPCnsigmaNbins + 1, tpcNsigmaBinLims.data()); + nSigBinLimits[1] = TArrayD(kTPCnClusterbins + 1, tpcNclusterBinLims.data()); + nSigBinLimits[2] = TArrayD(kPinEleNbins + 1, pinEleBinLims.data()); + nSigBinLimits[3] = TArrayD(kEtaNbins + 1, etaBinLimsI.data()); const int kPinKaNbins = 15; - double pinKaBinLims[kPinKaNbins + 1] = {0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 2.0, 3.0, 4.0, 5.0, 10.0}; + std::array pinKaBinLims = {0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 2.0, 3.0, 4.0, 5.0, 10.0}; - TArrayD nSigBinLimitsKa[kNvarsPID]; - nSigBinLimitsKa[0] = TArrayD(kTPCnsigmaNbins + 1, tpcNsigmaBinLims); - nSigBinLimitsKa[1] = TArrayD(kTPCnClusterbins + 1, tpcNclusterBinLims); - nSigBinLimitsKa[2] = TArrayD(kPinKaNbins + 1, pinKaBinLims); - nSigBinLimitsKa[3] = TArrayD(kEtaNbins + 1, etaBinLimsI); + std::array nSigBinLimitsKa; + nSigBinLimitsKa[0] = TArrayD(kTPCnsigmaNbins + 1, tpcNsigmaBinLims.data()); + nSigBinLimitsKa[1] = TArrayD(kTPCnClusterbins + 1, tpcNclusterBinLims.data()); + nSigBinLimitsKa[2] = TArrayD(kPinKaNbins + 1, pinKaBinLims.data()); + nSigBinLimitsKa[3] = TArrayD(kEtaNbins + 1, etaBinLimsI.data()); if (subGroupStr.Contains("electron")) { - int varsPIDnSigEle[kNvarsPID] = {VarManager::kTPCnSigmaEl, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; - int varsPIDnSigEle_Corr[kNvarsPID] = {VarManager::kTPCnSigmaEl_Corr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; - hm->AddHistogram(histClass, "nSigmaTPCelectron", "TPC n_{#sigma}(e) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigEle, nSigBinLimits); - hm->AddHistogram(histClass, "nSigmaTPCelectron_Corr", "TPC n_{#sigma}^{Corr}(e) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigEle_Corr, nSigBinLimits); + std::array varsPIDnSigEle = {VarManager::kTPCnSigmaEl, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; + std::array varsPIDnSigEle_Corr = {VarManager::kTPCnSigmaEl_Corr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; + hm->AddHistogram(histClass, "nSigmaTPCelectron", "TPC n_{#sigma}(e) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigEle.data(), nSigBinLimits.data()); + hm->AddHistogram(histClass, "nSigmaTPCelectron_Corr", "TPC n_{#sigma}^{Corr}(e) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigEle_Corr.data(), nSigBinLimits.data()); } if (subGroupStr.Contains("pion")) { - int varsPIDnSigPion[kNvarsPID] = {VarManager::kTPCnSigmaPi, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; - int varsPIDnSigPion_Corr[kNvarsPID] = {VarManager::kTPCnSigmaPi_Corr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; - hm->AddHistogram(histClass, "nSigmaTPCpion", "TPC n_{#sigma}(pion) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigPion, nSigBinLimits); - hm->AddHistogram(histClass, "nSigmaTPCpion_Corr", "TPC n_{#sigma}^{Corr}(pion) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigPion_Corr, nSigBinLimits); + std::array varsPIDnSigPion = {VarManager::kTPCnSigmaPi, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; + std::array varsPIDnSigPion_Corr = {VarManager::kTPCnSigmaPi_Corr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; + hm->AddHistogram(histClass, "nSigmaTPCpion", "TPC n_{#sigma}(pion) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigPion.data(), nSigBinLimits.data()); + hm->AddHistogram(histClass, "nSigmaTPCpion_Corr", "TPC n_{#sigma}^{Corr}(pion) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigPion_Corr.data(), nSigBinLimits.data()); } if (subGroupStr.Contains("kaon")) { - int varsPIDnSigKaon[kNvarsPID] = {VarManager::kTPCnSigmaKa, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; - int varsPIDnSigKaon_Corr[kNvarsPID] = {VarManager::kTPCnSigmaKa_Corr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; - hm->AddHistogram(histClass, "nSigmaTPCkaon", "TPC n_{#sigma}(kaon) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigKaon, nSigBinLimitsKa); - hm->AddHistogram(histClass, "nSigmaTPCkaon_Corr", "TPC n_{#sigma}^{Corr}(kaon) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigKaon_Corr, nSigBinLimitsKa); + std::array varsPIDnSigKaon = {VarManager::kTPCnSigmaKa, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; + std::array varsPIDnSigKaon_Corr = {VarManager::kTPCnSigmaKa_Corr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; + hm->AddHistogram(histClass, "nSigmaTPCkaon", "TPC n_{#sigma}(kaon) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigKaon.data(), nSigBinLimitsKa.data()); + hm->AddHistogram(histClass, "nSigmaTPCkaon_Corr", "TPC n_{#sigma}^{Corr}(kaon) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigKaon_Corr.data(), nSigBinLimitsKa.data()); } if (subGroupStr.Contains("proton")) { - int varsPIDnSigProton[kNvarsPID] = {VarManager::kTPCnSigmaPr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; - int varsPIDnSigProton_Corr[kNvarsPID] = {VarManager::kTPCnSigmaPr_Corr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; - hm->AddHistogram(histClass, "nSigmaTPCproton", "TPC n_{#sigma}(proton) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigProton, nSigBinLimits); - hm->AddHistogram(histClass, "nSigmaTPCproton_Corr", "TPC n_{#sigma}^{Corr}(proton) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigProton_Corr, nSigBinLimits); + std::array varsPIDnSigProton = {VarManager::kTPCnSigmaPr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; + std::array varsPIDnSigProton_Corr = {VarManager::kTPCnSigmaPr_Corr, VarManager::kTPCncls, VarManager::kPin, VarManager::kEta}; + hm->AddHistogram(histClass, "nSigmaTPCproton", "TPC n_{#sigma}(proton) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigProton.data(), nSigBinLimits.data()); + hm->AddHistogram(histClass, "nSigmaTPCproton_Corr", "TPC n_{#sigma}^{Corr}(proton) Vs normNcluster Vs Pin Vs Eta", kNvarsPID, varsPIDnSigProton_Corr.data(), nSigBinLimits.data()); } } if (subGroupStr.Contains("tofpid")) { if (subGroupStr.Contains("tofpid_fine")) { // fine binning for pIN: steps in 10 MeV/c from 0 to 1 GeV/c and 100 MeV/c up to 10 GeV/c - double pIN_bins[281]; + std::array pIN_bins; for (int i = 0; i <= 200; i++) pIN_bins[i] = 0.01 * i; for (int i = 1; i <= 80; i++) pIN_bins[200 + i] = 2. + 0.1 * i; - int nbins_pIN = sizeof(pIN_bins) / sizeof(*pIN_bins) - 1; + int nbins_pIN = static_cast(pIN_bins.size()) - 1; - double TOFbeta_bins[241]; + std::array TOFbeta_bins; for (int i = 0; i <= 240; i++) TOFbeta_bins[i] = 0.005 * i; - int nbins_TOFbeta = sizeof(TOFbeta_bins) / sizeof(*TOFbeta_bins) - 1; + int nbins_TOFbeta = static_cast(TOFbeta_bins.size()) - 1; - double nSigma_bins[101]; + std::array nSigma_bins; for (int i = 0; i <= 100; i++) nSigma_bins[i] = -5. + 0.1 * i; - int nbins_nSigma = sizeof(nSigma_bins) / sizeof(*nSigma_bins) - 1; + int nbins_nSigma = static_cast(nSigma_bins.size()) - 1; - hm->AddHistogram(histClass, "TOFbeta_pIN", "TOF #beta vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_TOFbeta, TOFbeta_bins, VarManager::kTOFbeta); - hm->AddHistogram(histClass, "TOFnSigEle_pIN", "TOF n-#sigma(e) vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTOFnSigmaEl); - hm->AddHistogram(histClass, "TOFnSigPi_pIN", "TOF n-#sigma(#pi) vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTOFnSigmaPi); - hm->AddHistogram(histClass, "TOFnSigKa_pIN", "TOF n-#sigma(K) vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTOFnSigmaKa); - hm->AddHistogram(histClass, "TOFnSigPr_pIN", "TOF n-#sigma(p) vs pIN", false, nbins_pIN, pIN_bins, VarManager::kPin, nbins_nSigma, nSigma_bins, VarManager::kTOFnSigmaPr); + hm->AddHistogram(histClass, "TOFbeta_pIN", "TOF #beta vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_TOFbeta, TOFbeta_bins.data(), VarManager::kTOFbeta); + hm->AddHistogram(histClass, "TOFnSigEle_pIN", "TOF n-#sigma(e) vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTOFnSigmaEl); + hm->AddHistogram(histClass, "TOFnSigPi_pIN", "TOF n-#sigma(#pi) vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTOFnSigmaPi); + hm->AddHistogram(histClass, "TOFnSigKa_pIN", "TOF n-#sigma(K) vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTOFnSigmaKa); + hm->AddHistogram(histClass, "TOFnSigPr_pIN", "TOF n-#sigma(p) vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_nSigma, nSigma_bins.data(), VarManager::kTOFnSigmaPr); } else { hm->AddHistogram(histClass, "TOFbeta_pIN", "TOF #beta vs pIN", false, 100, 0.0, 10.0, VarManager::kPin, 240, 0.0, 1.2, VarManager::kTOFbeta); hm->AddHistogram(histClass, "TOFnSigEle_pIN", "TOF n-#sigma(e) vs pIN", false, 100, 0.0, 10.0, VarManager::kPin, 100, -5.0, 5.0, VarManager::kTOFnSigmaEl); @@ -909,7 +909,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h if (subGroupStr.Contains("pidcorre")) { const int kNvarsPID = 3; const int kNbins_pIN = 169; - double pIN_bins[kNbins_pIN + 1]; + std::array pIN_bins; for (int i = 0; i <= 140; i++) pIN_bins[i] = 0.01 * i + 0.1; for (int i = 1; i <= 15; i++) @@ -918,7 +918,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h pIN_bins[155 + i] = 3. + 0.5 * i; const int kNbins_pINmore = 135; - double pIN_binsmore[kNbins_pINmore + 1]; + std::array pIN_binsmore; for (int i = 0; i <= 120; i++) pIN_binsmore[i] = 0.01 * i + 0.3; for (int i = 1; i <= 10; i++) @@ -930,55 +930,55 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h pIN_binsmore[135] = 10.; const int kNbins_nSigma = 100; - double nSigma_bins[kNbins_nSigma + 1]; + std::array nSigma_bins; for (int i = 0; i <= kNbins_nSigma; i++) nSigma_bins[i] = -5. + 0.1 * i; const int kNbins_nSigmamore = 50; - double nSigma_binsmore[kNbins_nSigmamore + 1]; + std::array nSigma_binsmore; for (int i = 0; i <= kNbins_nSigmamore; i++) nSigma_binsmore[i] = -5. + 0.2 * i; const int kNbins_nSigmagrob = 24; - double nSigma_binsgrob[kNbins_nSigmagrob + 1]; + std::array nSigma_binsgrob; for (int i = 0; i <= kNbins_nSigmagrob; i++) nSigma_binsgrob[i] = -6. + 0.5 * i; const int kNbins_TOFbeta = 120; - double TOFbeta_bins[kNbins_TOFbeta + 1]; + std::array TOFbeta_bins; for (int i = 0; i <= kNbins_TOFbeta; i++) TOFbeta_bins[i] = 0.01 * i; const int kNbins_TPCdEdx = 140; - double TPCdEdx_bins[kNbins_TPCdEdx + 1]; + std::array TPCdEdx_bins; for (int i = 0; i <= kNbins_TPCdEdx; i++) TPCdEdx_bins[i] = i + 20; - TArrayD nSigmaBinLimits[kNvarsPID]; - nSigmaBinLimits[0] = TArrayD(kNbins_pIN + 1, pIN_bins); - nSigmaBinLimits[1] = TArrayD(kNbins_nSigma + 1, nSigma_bins); - nSigmaBinLimits[2] = TArrayD(kNbins_nSigma + 1, nSigma_bins); + std::array nSigmaBinLimits; + nSigmaBinLimits[0] = TArrayD(kNbins_pIN + 1, pIN_bins.data()); + nSigmaBinLimits[1] = TArrayD(kNbins_nSigma + 1, nSigma_bins.data()); + nSigmaBinLimits[2] = TArrayD(kNbins_nSigma + 1, nSigma_bins.data()); - TArrayD nSignalBinLimits[kNvarsPID]; - nSignalBinLimits[0] = TArrayD(kNbins_pIN + 1, pIN_bins); - nSignalBinLimits[1] = TArrayD(kNbins_TPCdEdx + 1, TPCdEdx_bins); - nSignalBinLimits[2] = TArrayD(kNbins_TOFbeta + 1, TOFbeta_bins); + std::array nSignalBinLimits; + nSignalBinLimits[0] = TArrayD(kNbins_pIN + 1, pIN_bins.data()); + nSignalBinLimits[1] = TArrayD(kNbins_TPCdEdx + 1, TPCdEdx_bins.data()); + nSignalBinLimits[2] = TArrayD(kNbins_TOFbeta + 1, TOFbeta_bins.data()); - int varsPIDnSignal[kNvarsPID] = {VarManager::kPin, VarManager::kTPCsignal, VarManager::kTOFbeta}; - hm->AddHistogram(histClass, "nSignalTPCTOF", "", kNvarsPID, varsPIDnSignal, nSignalBinLimits); + std::array varsPIDnSignal = {VarManager::kPin, VarManager::kTPCsignal, VarManager::kTOFbeta}; + hm->AddHistogram(histClass, "nSignalTPCTOF", "", kNvarsPID, varsPIDnSignal.data(), nSignalBinLimits.data()); if (subGroupStr.Contains("more")) { const int kNvarsPIDmore = 4; - TArrayD nSigmaBinLimitsmore[kNvarsPIDmore]; - nSigmaBinLimitsmore[0] = TArrayD(kNbins_pINmore + 1, pIN_binsmore); - nSigmaBinLimitsmore[1] = TArrayD(kNbins_nSigmamore + 1, nSigma_binsmore); - nSigmaBinLimitsmore[2] = TArrayD(kNbins_nSigmagrob + 1, nSigma_binsgrob); - nSigmaBinLimitsmore[3] = TArrayD(kNbins_nSigmamore + 1, nSigma_binsmore); - int varsPIDnSigmamore[kNvarsPIDmore] = {VarManager::kPin, VarManager::kTPCnSigmaEl, VarManager::kTPCnSigmaPi, VarManager::kTOFnSigmaEl}; - hm->AddHistogram(histClass, "nSigmaTPCTOF", "", kNvarsPIDmore, varsPIDnSigmamore, nSigmaBinLimitsmore); + std::array nSigmaBinLimitsmore; + nSigmaBinLimitsmore[0] = TArrayD(kNbins_pINmore + 1, pIN_binsmore.data()); + nSigmaBinLimitsmore[1] = TArrayD(kNbins_nSigmamore + 1, nSigma_binsmore.data()); + nSigmaBinLimitsmore[2] = TArrayD(kNbins_nSigmagrob + 1, nSigma_binsgrob.data()); + nSigmaBinLimitsmore[3] = TArrayD(kNbins_nSigmamore + 1, nSigma_binsmore.data()); + std::array varsPIDnSigmamore = {VarManager::kPin, VarManager::kTPCnSigmaEl, VarManager::kTPCnSigmaPi, VarManager::kTOFnSigmaEl}; + hm->AddHistogram(histClass, "nSigmaTPCTOF", "", kNvarsPIDmore, varsPIDnSigmamore.data(), nSigmaBinLimitsmore.data()); } else { - int varsPIDnSigma[kNvarsPID] = {VarManager::kPin, VarManager::kTPCnSigmaEl, VarManager::kTOFnSigmaEl}; - hm->AddHistogram(histClass, "nSigmaTPCTOF", "", kNvarsPID, varsPIDnSigma, nSigmaBinLimits); + std::array varsPIDnSigma = {VarManager::kPin, VarManager::kTPCnSigmaEl, VarManager::kTOFnSigmaEl}; + hm->AddHistogram(histClass, "nSigmaTPCTOF", "", kNvarsPID, varsPIDnSigma.data(), nSigmaBinLimits.data()); } } if (subGroupStr.Contains("runbyrun")) { @@ -1128,7 +1128,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "tpcNSigmaPi_tofNSigmaPi", "", false, 200, -10., 10., VarManager::kTPCnSigmaPi, 200, -10., 10., VarManager::kTOFnSigmaPi); } if (subGroupStr.Contains("singlemucumulant")) { - double PtBinEdges[67]; // 0-30GeV/c + std::array PtBinEdges; // 0-30GeV/c for (int i = 0; i < 67; i++) { if (i <= 39) { PtBinEdges[i] = i / 10.; @@ -1137,15 +1137,15 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } - double CentBinEdges[19]; // 0-90% + std::array CentBinEdges; // 0-90% for (int i = 0; i < 19; i++) { CentBinEdges[i] = i * 5; } - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2REFsingle", "", true, 66, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2REFbysinglemu, "", "", "", VarManager::kNothing, VarManager::kM11REFoverMpsingle); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4REFsingle", "", true, 66, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4REFbysinglemu, "", "", "", VarManager::kNothing, VarManager::kM1111REFoverMpsingle); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2POIsingle", "", true, 66, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2POIsingle, "", "", "", VarManager::kNothing, VarManager::kM01POIoverMpsingle); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4POIsingle", "", true, 66, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4POIsingle, "", "", "", VarManager::kNothing, VarManager::kM0111POIoverMpsingle); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2REFsingle", "", true, 66, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2REFbysinglemu, "", "", "", VarManager::kNothing, VarManager::kM11REFoverMpsingle); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4REFsingle", "", true, 66, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4REFbysinglemu, "", "", "", VarManager::kNothing, VarManager::kM1111REFoverMpsingle); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2POIsingle", "", true, 66, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2POIsingle, "", "", "", VarManager::kNothing, VarManager::kM01POIoverMpsingle); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4POIsingle", "", true, 66, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4POIsingle, "", "", "", VarManager::kNothing, VarManager::kM0111POIoverMpsingle); } } @@ -1179,13 +1179,13 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Phi_Eta", "#phi vs #eta distribution", false, 200, -5.0, 5.0, VarManager::kMCEta, 200, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kMCPhi); if (subGroupStr.Contains("polarization")) { if (subGroupStr.Contains("pp")) { - int varspTHE[4] = {VarManager::kMCPt, VarManager::kMCCosThetaHE, VarManager::kMCPhiHE, VarManager::kMCPhiTildeHE}; - int varspTCS[4] = {VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCPhiCS, VarManager::kMCPhiTildeCS}; - int bins[4] = {20, 20, 20, 20}; - double xmin[4] = {0., -1., 0., 0.}; - double xmax[4] = {20., 1., 2. * o2::constants::math::PI, 2. * o2::constants::math::PI}; - hm->AddHistogram(histClass, "Pt_cosThetaHE_phiHE_phiTildeHE", "", 4, varspTHE, bins, xmin, xmax, 0, -1, kFALSE); - hm->AddHistogram(histClass, "Pt_cosThetaCS_phiCS_phiTildeCS", "", 4, varspTCS, bins, xmin, xmax, 0, -1, kFALSE); + std::array varspTHE = {VarManager::kMCPt, VarManager::kMCCosThetaHE, VarManager::kMCPhiHE, VarManager::kMCPhiTildeHE}; + std::array varspTCS = {VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCPhiCS, VarManager::kMCPhiTildeCS}; + std::array bins = {20, 20, 20, 20}; + std::array xmin = {0., -1., 0., 0.}; + std::array xmax = {20., 1., 2. * o2::constants::math::PI, 2. * o2::constants::math::PI}; + hm->AddHistogram(histClass, "Pt_cosThetaHE_phiHE_phiTildeHE", "", 4, varspTHE.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE); + hm->AddHistogram(histClass, "Pt_cosThetaCS_phiCS_phiTildeCS", "", 4, varspTCS.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("pbpb")) { hm->AddHistogram(histClass, "CosThetaStarRandom", "", false, 100, -1.0, 1.0, VarManager::kCosThetaStarRandom); @@ -1231,23 +1231,23 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } if (!groupStr.CompareTo("energy-correlator-gen")) { - double coschiBins[26]; + std::array coschiBins; for (int i = 0; i < 26; i++) { coschiBins[i] = -1.0 + 2.0 * TMath::Power(0.04 * i, 2.0); } - hm->AddHistogram(histClass, "Coschi", "", false, 25, coschiBins, VarManager::kMCCosChi, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kMCWeight); + hm->AddHistogram(histClass, "Coschi", "", false, 25, coschiBins.data(), VarManager::kMCCosChi, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kMCWeight); } if (!groupStr.CompareTo("polarization-pseudoproper-gen")) { - int varspTHE[3] = {VarManager::kMCPt, VarManager::kMCCosThetaHE, VarManager::kMCVertexingTauxyProjected}; - int varspTCS[3] = {VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCVertexingTauxyProjected}; - int varspTRM[3] = {VarManager::kMCPt, VarManager::kMCCosThetaRM, VarManager::kMCVertexingTauxyProjected}; - int bins[3] = {20, 20, 1000}; - double xmin[3] = {0., -1., -0.5}; - double xmax[3] = {20., 1., 0.5}; - hm->AddHistogram(histClass, "Pt_cosThetaHE_Tauxy", "", 3, varspTHE, bins, xmin, xmax, 0, -1, kFALSE); - hm->AddHistogram(histClass, "Pt_cosThetaCS_Tauxy", "", 3, varspTCS, bins, xmin, xmax, 0, -1, kFALSE); - hm->AddHistogram(histClass, "Pt_cosThetaRM_Tauxy", "", 3, varspTRM, bins, xmin, xmax, 0, -1, kFALSE); + std::array varspTHE = {VarManager::kMCPt, VarManager::kMCCosThetaHE, VarManager::kMCVertexingTauxyProjected}; + std::array varspTCS = {VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCVertexingTauxyProjected}; + std::array varspTRM = {VarManager::kMCPt, VarManager::kMCCosThetaRM, VarManager::kMCVertexingTauxyProjected}; + std::array bins = {20, 20, 1000}; + std::array xmin = {0., -1., -0.5}; + std::array xmax = {20., 1., 0.5}; + hm->AddHistogram(histClass, "Pt_cosThetaHE_Tauxy", "", 3, varspTHE.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE); + hm->AddHistogram(histClass, "Pt_cosThetaCS_Tauxy", "", 3, varspTCS.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE); + hm->AddHistogram(histClass, "Pt_cosThetaRM_Tauxy", "", 3, varspTRM.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE); } if (!groupStr.CompareTo("pair")) { if (subGroupStr.Contains("cepf")) { @@ -1269,45 +1269,45 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Mass_MultFDDC", "Mass vs MultFDDC", false, 200, 2.0, 5.0, VarManager::kMass, 1000, 0, 25000.0, VarManager::kMultFDDC); } if (subGroupStr.Contains("mass_mult_pv")) { - double multAnalysisBins[4] = {0.0, 4.0, 8.0, 1000.0}; + std::array multAnalysisBins = {0.0, 4.0, 8.0, 1000.0}; - double multAnalsisMassBins[201] = {0.0}; + std::array multAnalsisMassBins = {0.0}; for (int i = 0; i <= 200; i++) { multAnalsisMassBins[i] = 2.0 + i * 0.015; } - double multAnalysisPVBins[151] = {0.0}; + std::array multAnalysisPVBins = {0.0}; for (int i = 0; i <= 150; i++) { multAnalysisPVBins[i] = i * 1.0; } - double multAnalysisFV0ABins[1001] = {0.0}; + std::array multAnalysisFV0ABins = {0.0}; for (int i = 0; i <= 1000; i++) { multAnalysisFV0ABins[i] = i * 1.0; } - hm->AddHistogram(histClass, "Mass_VtxNcontribReal_Pt", "Mass vs VtxNcontribReal vs Pt", false, 200, multAnalsisMassBins, VarManager::kMass, 150, multAnalysisPVBins, VarManager::kVtxNcontribReal, 3, multAnalysisBins, VarManager::kPt); - hm->AddHistogram(histClass, "Mass_MultFV0A_Pt", "Mass vs MultFV0A vs Pt", false, 200, multAnalsisMassBins, VarManager::kMass, 1000, multAnalysisFV0ABins, VarManager::kMultFV0A, 3, multAnalysisBins, VarManager::kPt); - hm->AddHistogram(histClass, "Mass_MultFT0A_Pt", "Mass vs MultFT0A vs Pt", false, 200, multAnalsisMassBins, VarManager::kMass, 1000, multAnalysisFV0ABins, VarManager::kMultFT0A, 3, multAnalysisBins, VarManager::kPt); - hm->AddHistogram(histClass, "Mass_MultFT0C_Pt", "Mass vs MultFT0C vs Pt", false, 200, multAnalsisMassBins, VarManager::kMass, 1000, multAnalysisFV0ABins, VarManager::kMultFT0C, 3, multAnalysisBins, VarManager::kPt); + hm->AddHistogram(histClass, "Mass_VtxNcontribReal_Pt", "Mass vs VtxNcontribReal vs Pt", false, 200, multAnalsisMassBins.data(), VarManager::kMass, 150, multAnalysisPVBins.data(), VarManager::kVtxNcontribReal, 3, multAnalysisBins.data(), VarManager::kPt); + hm->AddHistogram(histClass, "Mass_MultFV0A_Pt", "Mass vs MultFV0A vs Pt", false, 200, multAnalsisMassBins.data(), VarManager::kMass, 1000, multAnalysisFV0ABins.data(), VarManager::kMultFV0A, 3, multAnalysisBins.data(), VarManager::kPt); + hm->AddHistogram(histClass, "Mass_MultFT0A_Pt", "Mass vs MultFT0A vs Pt", false, 200, multAnalsisMassBins.data(), VarManager::kMass, 1000, multAnalysisFV0ABins.data(), VarManager::kMultFT0A, 3, multAnalysisBins.data(), VarManager::kPt); + hm->AddHistogram(histClass, "Mass_MultFT0C_Pt", "Mass vs MultFT0C vs Pt", false, 200, multAnalsisMassBins.data(), VarManager::kMass, 1000, multAnalysisFV0ABins.data(), VarManager::kMultFT0C, 3, multAnalysisBins.data(), VarManager::kPt); } if (subGroupStr.Contains("barrel")) { hm->AddHistogram(histClass, "Mass", "", false, 500, 0.0, 5.0, VarManager::kMass); hm->AddHistogram(histClass, "Mass_HighRange", "", false, 375, 0.0, 15.0, VarManager::kMass); hm->AddHistogram(histClass, "Pt", "", false, 2000, 0.0, 20., VarManager::kPt); hm->AddHistogram(histClass, "Mass_Pt", "", false, 500, 0.0, 5.0, VarManager::kMass, 40, 0.0, 20.0, VarManager::kPt); - double massBins[76]; + std::array massBins; for (int i = 0; i < 76; i++) { massBins[i] = 1.5 + i * 0.04; } - double ptBins[70]; + std::array ptBins; for (int i = 0; i <= 50; i++) { ptBins[i] = i * 0.01; } for (int i = 1; i <= 19; i++) { ptBins[50 + i] = 0.5 + i * 0.5; } - hm->AddHistogram(histClass, "Mass_PtFine", "", false, 75, massBins, VarManager::kMass, 69, ptBins, VarManager::kPt); + hm->AddHistogram(histClass, "Mass_PtFine", "", false, 75, massBins.data(), VarManager::kMass, 69, ptBins.data(), VarManager::kPt); hm->AddHistogram(histClass, "Eta_Pt", "", false, 320, -2.0, 2.0, VarManager::kEta, 400, 0.0, 40.0, VarManager::kPt); hm->AddHistogram(histClass, "Y_Pt", "", false, 40, -2.0, 2.0, VarManager::kRap, 40, 0.0, 20.0, VarManager::kPt); hm->AddHistogram(histClass, "Mass_VtxZ", "", true, 30, -15.0, 15.0, VarManager::kVtxZ, 500, 0.0, 5.0, VarManager::kMass); @@ -1326,31 +1326,31 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "VtxZ_VtxNcontribReal", "VtxZ vs VtxNcontribReal", false, 240, -12.0, 12.0, VarManager::kVtxZ, 200, 0, 200.0, VarManager::kVtxNcontribReal); } if (subGroupStr.Contains("alice3barrel")) { - double pTBins[21] = { + std::array pTBins = { 0.1, 0.5, 1.0, 1.25, 1.5, 2.0, 2.5, 3.0, 4.0, 5.0, 6.5, 8.0, 10.0, 12.0, 15.0, 20.0, 30.0, 40.0, 60.0, 80.0, 100.0}; - double massBins[501]; + std::array massBins; for (int i = 0; i < 501; i++) { massBins[i] = 0.01 * (i); } - hm->AddHistogram(histClass, "Mass_PtLong", "", false, 500, massBins, VarManager::kMass, 20, pTBins, VarManager::kPt); + hm->AddHistogram(histClass, "Mass_PtLong", "", false, 500, massBins.data(), VarManager::kMass, 20, pTBins.data(), VarManager::kPt); } if (subGroupStr.Contains("dielectron-polarization-he-pbpb")) { - int varsHEpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaHE, VarManager::kPhiHE}; - int binspT[5] = {100, 30, 10, 10, 10}; - double xminpT[5] = {2., 0., 0, -1., 0.0}; - double xmaxpT[5] = {4.5, 3., 100, 1., 6.28}; - hm->AddHistogram(histClass, "Dielectron_Mass_Pt_Cent_cosThetaHE", "", 5, varsHEpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsHEpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaHE, VarManager::kPhiHE}; + std::array binspT = {100, 30, 10, 10, 10}; + std::array xminpT = {2., 0., 0, -1., 0.0}; + std::array xmaxpT = {4.5, 3., 100, 1., 6.28}; + hm->AddHistogram(histClass, "Dielectron_Mass_Pt_Cent_cosThetaHE", "", 5, varsHEpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dielectron-polarization-cs-pbpb")) { - int varsCSpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaCS, VarManager::kPhiCS}; - int binspT[5] = {100, 30, 10, 10, 10}; - double xminpT[5] = {2.0, 0., 0, -1., 0.0}; - double xmaxpT[5] = {4.5, 3., 100, 1., 6.28}; - hm->AddHistogram(histClass, "Dielectron_Mass_Pt_Cent_cosThetaCS", "", 5, varsCSpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsCSpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaCS, VarManager::kPhiCS}; + std::array binspT = {100, 30, 10, 10, 10}; + std::array xminpT = {2.0, 0., 0, -1., 0.0}; + std::array xmaxpT = {4.5, 3., 100, 1., 6.28}; + hm->AddHistogram(histClass, "Dielectron_Mass_Pt_Cent_cosThetaCS", "", 5, varsCSpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("polarization")) { if (subGroupStr.Contains("helicity")) { @@ -1390,42 +1390,42 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } if (subGroupStr.Contains("flow-jpsi-ep")) { - int bins_A2[5] = {50, 20, 20, 9, 200}; - double minBins_A2[5] = {2.0, 0.0, -1., 0.0, -20.0}; - double maxBins_A2[5] = {4.0, 2.0, 1.0, 90.0, 20.0}; - int bins_DeltaPhi[5] = {50, 20, 20, 9, 10}; - double minBins_DeltaPhi[5] = {2.0, 0.0, -1., 0.0, 0}; - double maxBins_DeltaPhi[5] = {4.0, 2.0, 1.0, 90.0, 3.14}; + std::array bins_A2 = {50, 20, 20, 9, 200}; + std::array minBins_A2 = {2.0, 0.0, -1., 0.0, -20.0}; + std::array maxBins_A2 = {4.0, 2.0, 1.0, 90.0, 20.0}; + std::array bins_DeltaPhi = {50, 20, 20, 9, 10}; + std::array minBins_DeltaPhi = {2.0, 0.0, -1., 0.0, 0}; + std::array maxBins_DeltaPhi = {4.0, 2.0, 1.0, 90.0, 3.14}; TString labels[5] = {"kMass", "kPt", "kRapidity", "kCentFT0C", "kA2EP"}; if (subGroupStr.Contains("tpc")) { - int varA2_TPC_PP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_PP_TPC}; - int varA2_TPC_RP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_RP_TPC}; - int varDeltaPhi_TPC_PP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiPP_TPC}; - int varDeltaPhi_TPC_RP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiRP_TPC}; - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2PP_TPC", "", 5, varA2_TPC_PP, bins_A2, minBins_A2, maxBins_A2, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2RP_TPC", "", 5, varA2_TPC_RP, bins_A2, minBins_A2, maxBins_A2, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiPP_TPC", "", 5, varDeltaPhi_TPC_PP, bins_DeltaPhi, minBins_DeltaPhi, maxBins_DeltaPhi, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiRP_TPC", "", 5, varDeltaPhi_TPC_RP, bins_DeltaPhi, minBins_DeltaPhi, maxBins_DeltaPhi, 0, -1, kTRUE); + std::array varA2_TPC_PP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_PP_TPC}; + std::array varA2_TPC_RP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_RP_TPC}; + std::array varDeltaPhi_TPC_PP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiPP_TPC}; + std::array varDeltaPhi_TPC_RP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiRP_TPC}; + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2PP_TPC", "", 5, varA2_TPC_PP.data(), bins_A2.data(), minBins_A2.data(), maxBins_A2.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2RP_TPC", "", 5, varA2_TPC_RP.data(), bins_A2.data(), minBins_A2.data(), maxBins_A2.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiPP_TPC", "", 5, varDeltaPhi_TPC_PP.data(), bins_DeltaPhi.data(), minBins_DeltaPhi.data(), maxBins_DeltaPhi.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiRP_TPC", "", 5, varDeltaPhi_TPC_RP.data(), bins_DeltaPhi.data(), minBins_DeltaPhi.data(), maxBins_DeltaPhi.data(), 0, -1, kTRUE); } if (subGroupStr.Contains("ft0c")) { - int varA2_FT0C_PP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_PP_FT0C}; - int varA2_FT0C_RP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_RP_FT0C}; - int varDeltaPhi_FT0C_PP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiPP_FT0C}; - int varDeltaPhi_FT0C_RP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiRP_FT0C}; - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2PP_FT0C", "", 5, varA2_FT0C_PP, bins_A2, minBins_A2, maxBins_A2, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2RP_FT0C", "", 5, varA2_FT0C_RP, bins_A2, minBins_A2, maxBins_A2, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiPP_FT0C", "", 5, varDeltaPhi_FT0C_PP, bins_DeltaPhi, minBins_DeltaPhi, maxBins_DeltaPhi, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiRP_FT0C", "", 5, varDeltaPhi_FT0C_RP, bins_DeltaPhi, minBins_DeltaPhi, maxBins_DeltaPhi, 0, -1, kTRUE); + std::array varA2_FT0C_PP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_PP_FT0C}; + std::array varA2_FT0C_RP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_RP_FT0C}; + std::array varDeltaPhi_FT0C_PP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiPP_FT0C}; + std::array varDeltaPhi_FT0C_RP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiRP_FT0C}; + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2PP_FT0C", "", 5, varA2_FT0C_PP.data(), bins_A2.data(), minBins_A2.data(), maxBins_A2.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2RP_FT0C", "", 5, varA2_FT0C_RP.data(), bins_A2.data(), minBins_A2.data(), maxBins_A2.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiPP_FT0C", "", 5, varDeltaPhi_FT0C_PP.data(), bins_DeltaPhi.data(), minBins_DeltaPhi.data(), maxBins_DeltaPhi.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiRP_FT0C", "", 5, varDeltaPhi_FT0C_RP.data(), bins_DeltaPhi.data(), minBins_DeltaPhi.data(), maxBins_DeltaPhi.data(), 0, -1, kTRUE); } if (subGroupStr.Contains("ft0a")) { - int varA2_FT0A_PP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_PP_FT0A}; - int varA2_FT0A_RP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_RP_FT0A}; - int varDeltaPhi_FT0A_PP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiPP_FT0A}; - int varDeltaPhi_FT0A_RP[5] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiRP_FT0A}; - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2PP_FT0A", "", 5, varA2_FT0A_PP, bins_A2, minBins_A2, maxBins_A2, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2RP_FT0A", "", 5, varA2_FT0A_RP, bins_A2, minBins_A2, maxBins_A2, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiPP_FT0A", "", 5, varDeltaPhi_FT0A_PP, bins_DeltaPhi, minBins_DeltaPhi, maxBins_DeltaPhi, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiRP_FT0A", "", 5, varDeltaPhi_FT0A_RP, bins_DeltaPhi, minBins_DeltaPhi, maxBins_DeltaPhi, 0, -1, kTRUE); + std::array varA2_FT0A_PP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_PP_FT0A}; + std::array varA2_FT0A_RP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kA2EP_RP_FT0A}; + std::array varDeltaPhi_FT0A_PP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiPP_FT0A}; + std::array varDeltaPhi_FT0A_RP = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kDeltaPhiRP_FT0A}; + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2PP_FT0A", "", 5, varA2_FT0A_PP.data(), bins_A2.data(), minBins_A2.data(), maxBins_A2.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_A2RP_FT0A", "", 5, varA2_FT0A_RP.data(), bins_A2.data(), minBins_A2.data(), maxBins_A2.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiPP_FT0A", "", 5, varDeltaPhi_FT0A_PP.data(), bins_DeltaPhi.data(), minBins_DeltaPhi.data(), maxBins_DeltaPhi.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_DeltaPhiRP_FT0A", "", 5, varDeltaPhi_FT0A_RP.data(), bins_DeltaPhi.data(), minBins_DeltaPhi.data(), maxBins_DeltaPhi.data(), 0, -1, kTRUE); } } if (subGroupStr.Contains("upsilon")) { @@ -1460,29 +1460,29 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "VtxingChi2PCA", "", false, 100, 0.0, 10.0, VarManager::kVertexingChi2PCA); } if (subGroupStr.Contains("tauxy-midy-pol-he")) { - int varspTHE[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaHE, VarManager::kVertexingTauxyProjectedPoleJPsiMass}; - int binspT[4] = {50, 10, 20, 1000}; - double xminpT[4] = {2., 0., -1., -0.5}; - double xmaxpT[4] = {4., 20., 1., 0.5}; - hm->AddHistogram(histClass, "Tauxy_Mass_Pt_CosthetaHE", "", 4, varspTHE, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varspTHE = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaHE, VarManager::kVertexingTauxyProjectedPoleJPsiMass}; + std::array binspT = {50, 10, 20, 1000}; + std::array xminpT = {2., 0., -1., -0.5}; + std::array xmaxpT = {4., 20., 1., 0.5}; + hm->AddHistogram(histClass, "Tauxy_Mass_Pt_CosthetaHE", "", 4, varspTHE.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("tauxy-midy-pol-rand")) { - int varspTRand[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaRM, VarManager::kVertexingTauxyProjectedPoleJPsiMass}; + std::array varspTRand = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaRM, VarManager::kVertexingTauxyProjectedPoleJPsiMass}; - int binspT[4] = {50, 10, 20, 1000}; - double xminpT[4] = {2., 0., -1., -0.5}; - double xmaxpT[4] = {4., 20., 1., 0.5}; - hm->AddHistogram(histClass, "Tauxy_Mass_Pt_CosthetaRand", "", 4, varspTRand, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array binspT = {50, 10, 20, 1000}; + std::array xminpT = {2., 0., -1., -0.5}; + std::array xmaxpT = {4., 20., 1., 0.5}; + hm->AddHistogram(histClass, "Tauxy_Mass_Pt_CosthetaRand", "", 4, varspTRand.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("tauxy-midy-pol-cs")) { - int varspTCS[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaCS, VarManager::kVertexingTauxyProjectedPoleJPsiMass}; + std::array varspTCS = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaCS, VarManager::kVertexingTauxyProjectedPoleJPsiMass}; - int binspT[4] = {50, 10, 20, 1000}; - double xminpT[4] = {2., 0., -1., -0.5}; - double xmaxpT[4] = {4., 20., 1., 0.5}; - hm->AddHistogram(histClass, "Tauxy_Mass_Pt_CosthetaCS", "", 4, varspTCS, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array binspT = {50, 10, 20, 1000}; + std::array xminpT = {2., 0., -1., -0.5}; + std::array xmaxpT = {4., 20., 1., 0.5}; + hm->AddHistogram(histClass, "Tauxy_Mass_Pt_CosthetaCS", "", 4, varspTCS.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("kalman-filter")) { @@ -1537,24 +1537,24 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h const int kNvarsPair = 4; const int kInvMassNbins = 3; - double InvMassBinLims[kInvMassNbins + 1] = {2.2, 2.6, 3.4, 3.6}; + std::array InvMassBinLims = {2.2, 2.6, 3.4, 3.6}; const int kPtNbins = 10; - double PtBinLims[kPtNbins + 1] = {1., 2., 3., 4., 5., 6., 7., 8., 9., 12., 20.}; + std::array PtBinLims = {1., 2., 3., 4., 5., 6., 7., 8., 9., 12., 20.}; const int kTauNBins = 500; - double TauBinLims[kTauNBins + 1]; + std::array TauBinLims; for (int i = 0; i <= kTauNBins; ++i) TauBinLims[i] = -0.3 + (0.0015 * i); - TArrayD nCutsBinLimits[kNvarsPair]; - nCutsBinLimits[0] = TArrayD(kInvMassNbins + 1, InvMassBinLims); - nCutsBinLimits[1] = TArrayD(kPtNbins + 1, PtBinLims); - nCutsBinLimits[2] = TArrayD(kTauNBins + 1, TauBinLims); - nCutsBinLimits[3] = TArrayD(kTauNBins + 1, TauBinLims); + std::array nCutsBinLimits; + nCutsBinLimits[0] = TArrayD(kInvMassNbins + 1, InvMassBinLims.data()); + nCutsBinLimits[1] = TArrayD(kPtNbins + 1, PtBinLims.data()); + nCutsBinLimits[2] = TArrayD(kTauNBins + 1, TauBinLims.data()); + nCutsBinLimits[3] = TArrayD(kTauNBins + 1, TauBinLims.data()); - int varsPair[kNvarsPair] = {VarManager::kMass, VarManager::kPt, VarManager::kVertexingTauzProjected, VarManager::kVertexingTauxyProjected}; - hm->AddHistogram(histClass, "tau_MultiD", "Invariant mass vs. pT vs. eta vs. rapidity vs. Run2 tau", kNvarsPair, varsPair, nCutsBinLimits); + std::array varsPair = {VarManager::kMass, VarManager::kPt, VarManager::kVertexingTauzProjected, VarManager::kVertexingTauxyProjected}; + hm->AddHistogram(histClass, "tau_MultiD", "Invariant mass vs. pT vs. eta vs. rapidity vs. Run2 tau", kNvarsPair, varsPair.data(), nCutsBinLimits.data()); } if (subGroupStr.Contains("flow")) { @@ -1572,18 +1572,18 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Mass_EtaProbe", "mass vs probe eta", false, 750, 0.0, 15.0, VarManager::kMass, 120, 0.0, 30.0, VarManager::kEta2); // Warning: in the tag-and-probe task t2 is always the probe } if (subGroupStr.Contains("dimuon-multi-diff")) { - int varsKine[3] = {VarManager::kMass, VarManager::kPt, VarManager::kRap}; - int binsKine[3] = {250, 120, 60}; - double xminKine[3] = {0.0, 0.0, 2.5}; - double xmaxKine[3] = {5.0, 30.0, 4.0}; - hm->AddHistogram(histClass, "Mass_Pt_Rapidity", "", 3, varsKine, binsKine, xminKine, xmaxKine, 0, -1, kFALSE); + std::array varsKine = {VarManager::kMass, VarManager::kPt, VarManager::kRap}; + std::array binsKine = {250, 120, 60}; + std::array xminKine = {0.0, 0.0, 2.5}; + std::array xmaxKine = {5.0, 30.0, 4.0}; + hm->AddHistogram(histClass, "Mass_Pt_Rapidity", "", 3, varsKine.data(), binsKine.data(), xminKine.data(), xmaxKine.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-high-mass-multi-diff")) { - int varsKine[3] = {VarManager::kMass, VarManager::kPt, VarManager::kRap}; - int binsKine[3] = {250, 120, 60}; - double xminKine[3] = {7.0, 0.0, 2.5}; - double xmaxKine[3] = {12.0, 30.0, 4.0}; - hm->AddHistogram(histClass, "Mass_Pt_Rapidity", "", 3, varsKine, binsKine, xminKine, xmaxKine, 0, -1, kFALSE); + std::array varsKine = {VarManager::kMass, VarManager::kPt, VarManager::kRap}; + std::array binsKine = {250, 120, 60}; + std::array xminKine = {7.0, 0.0, 2.5}; + std::array xmaxKine = {12.0, 30.0, 4.0}; + hm->AddHistogram(histClass, "Mass_Pt_Rapidity", "", 3, varsKine.data(), binsKine.data(), xminKine.data(), xmaxKine.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-centr")) { hm->AddHistogram(histClass, "Mass_CentFT0C", "", false, 750, 0.0, 15.0, VarManager::kMass, 100, 0., 100., VarManager::kCentFT0C); @@ -1604,12 +1604,12 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "U2Q2_CentFT0C_ev2", "mass vs. centrality vs. U2Q2_event2", false, 125, 0.0, 5.0, VarManager::kMass, 9, 0.0, 90.0, VarManager::kCentFT0C, 100, -10.0, 10.0, VarManager::kU2Q2Ev2); } if (subGroupStr.Contains("metest")) { - double MassBinEdges[251]; // 0-5GeV/c2 + std::array MassBinEdges; // 0-5GeV/c2 for (int i = 0; i < 251; i++) { MassBinEdges[i] = i * 0.02; } - double PtBinEdges[49]; // 0-20GeV/c + std::array PtBinEdges; // 0-20GeV/c for (int i = 0; i < 49; i++) { if (i <= 9) { PtBinEdges[i] = i / 10.; @@ -1618,13 +1618,13 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } - double CentBinEdges[19]; // 0-90% + std::array CentBinEdges; // 0-90% for (int i = 0; i < 19; i++) { CentBinEdges[i] = i * 5; } - hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V2ME_SP", "Mass_Pt_CentFT0C_V2ME_SP", true, 250, MassBinEdges, VarManager::kMass, 48, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, "", "", "", VarManager::kV2ME_SP, VarManager::kWV2ME_SP); - hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V2ME_EP", "Mass_Pt_CentFT0C_V2ME_EP", true, 250, MassBinEdges, VarManager::kMass, 48, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, "", "", "", VarManager::kV2ME_EP, VarManager::kWV2ME_EP); + hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V2ME_SP", "Mass_Pt_CentFT0C_V2ME_SP", true, 250, MassBinEdges.data(), VarManager::kMass, 48, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, "", "", "", VarManager::kV2ME_SP, VarManager::kWV2ME_SP); + hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V2ME_EP", "Mass_Pt_CentFT0C_V2ME_EP", true, 250, MassBinEdges.data(), VarManager::kMass, 48, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, "", "", "", VarManager::kV2ME_EP, VarManager::kWV2ME_EP); } if (subGroupStr.Contains("cumulantme")) { hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_M11REFoverMpME", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 9, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kM11REFoverMpME); @@ -1639,12 +1639,12 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V24ME", "Mass_Pt_CentFT0C_V24ME", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 90, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kV24ME, VarManager::kWV24ME); } if (subGroupStr.Contains("cumulantme1")) { - double MassBinEdges[251]; // 0-5GeV/c2 + std::array MassBinEdges; // 0-5GeV/c2 for (int i = 0; i < 251; i++) { MassBinEdges[i] = i * 0.02; } - double PtBinEdges[67]; // 0-30GeV/c + std::array PtBinEdges; // 0-30GeV/c for (int i = 0; i < 67; i++) { if (i <= 39) { PtBinEdges[i] = i / 10.; @@ -1653,12 +1653,12 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } - double CentBinEdges[19]; // 0-90% + std::array CentBinEdges; // 0-90% for (int i = 0; i < 19; i++) { CentBinEdges[i] = i * 5; } - hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V22ME", "Mass_Pt_CentFT0C_V22ME", true, 250, MassBinEdges, VarManager::kMass, 66, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, "", "", "", VarManager::kV22ME, VarManager::kWV22ME); - hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V24ME", "Mass_Pt_CentFT0C_V24ME", true, 250, MassBinEdges, VarManager::kMass, 66, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, "", "", "", VarManager::kV24ME, VarManager::kWV24ME); + hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V22ME", "Mass_Pt_CentFT0C_V22ME", true, 250, MassBinEdges.data(), VarManager::kMass, 66, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, "", "", "", VarManager::kV22ME, VarManager::kWV22ME); + hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V24ME", "Mass_Pt_CentFT0C_V24ME", true, 250, MassBinEdges.data(), VarManager::kMass, 66, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, "", "", "", VarManager::kV24ME, VarManager::kWV24ME); } if (subGroupStr.Contains("cumulantme2")) { hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_M11REFoverMpME", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 9, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kM11REFoverMpME); @@ -1671,162 +1671,162 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr4POIME", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 9, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kCORR4POIME, VarManager::kM0111POIoverMpME); } if (subGroupStr.Contains("dimuon-polarization-he")) { - int varspTHE[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaHE, VarManager::kPhiHE}; - int binspT[4] = {100, 40, 20, 20}; - double xminpT[4] = {1., 0., -1., -3.14}; - double xmaxpT[4] = {5., 20., 1., +3.14}; - hm->AddHistogram(histClass, "Mass_Pt_cosThetaHE_phiHE", "", 4, varspTHE, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varspTHE = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaHE, VarManager::kPhiHE}; + std::array binspT = {100, 40, 20, 20}; + std::array xminpT = {1., 0., -1., -3.14}; + std::array xmaxpT = {5., 20., 1., +3.14}; + hm->AddHistogram(histClass, "Mass_Pt_cosThetaHE_phiHE", "", 4, varspTHE.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-cs")) { - int varspTCS[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaCS, VarManager::kPhiCS}; - int binspT[4] = {100, 40, 20, 20}; - double xminpT[4] = {1., 0., -1., -3.14}; - double xmaxpT[4] = {5., 20., 1., +3.14}; - hm->AddHistogram(histClass, "Mass_Pt_cosThetaCS_phiCS", "", 4, varspTCS, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varspTCS = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaCS, VarManager::kPhiCS}; + std::array binspT = {100, 40, 20, 20}; + std::array xminpT = {1., 0., -1., -3.14}; + std::array xmaxpT = {5., 20., 1., +3.14}; + hm->AddHistogram(histClass, "Mass_Pt_cosThetaCS_phiCS", "", 4, varspTCS.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-pp")) { - int varspTPP[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaPP, VarManager::kPhiPP}; - int binspT[4] = {100, 40, 20, 20}; - double xminpT[4] = {1., 0., -1., -3.14}; - double xmaxpT[4] = {5., 20., 1., +3.14}; - hm->AddHistogram(histClass, "Mass_Pt_cosThetaPP_phiPP", "", 4, varspTPP, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varspTPP = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaPP, VarManager::kPhiPP}; + std::array binspT = {100, 40, 20, 20}; + std::array xminpT = {1., 0., -1., -3.14}; + std::array xmaxpT = {5., 20., 1., +3.14}; + hm->AddHistogram(histClass, "Mass_Pt_cosThetaPP_phiPP", "", 4, varspTPP.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-lowmass-pp")) { - int varspTPP[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaPP, VarManager::kPhiPP}; - int varsrapPP[4] = {VarManager::kMass, VarManager::kRap, VarManager::kCosThetaPP, VarManager::kPhiPP}; - int binspT[4] = {100, 20, 20, 20}; - int binsy[4] = {100, 10, 20, 20}; - double xminpT[4] = {0.2, 0., -1., -3.14}; - double xmaxpT[4] = {1.5, 20., 1., +3.14}; - double xminy[4] = {0.2, 2.5, -1., -3.14}; - double xmaxy[4] = {1.5, 4.0, 1., +3.14}; - hm->AddHistogram(histClass, "Mass_Pt_cosThetaPP_phiPP", "", 4, varspTPP, binspT, xminpT, xmaxpT, 0, -1, kFALSE); - hm->AddHistogram(histClass, "Mass_y_cosThetaPP_phiPP", "", 4, varsrapPP, binsy, xminy, xmaxy, 0, -1, kFALSE); + std::array varspTPP = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaPP, VarManager::kPhiPP}; + std::array varsrapPP = {VarManager::kMass, VarManager::kRap, VarManager::kCosThetaPP, VarManager::kPhiPP}; + std::array binspT = {100, 20, 20, 20}; + std::array binsy = {100, 10, 20, 20}; + std::array xminpT = {0.2, 0., -1., -3.14}; + std::array xmaxpT = {1.5, 20., 1., +3.14}; + std::array xminy = {0.2, 2.5, -1., -3.14}; + std::array xmaxy = {1.5, 4.0, 1., +3.14}; + hm->AddHistogram(histClass, "Mass_Pt_cosThetaPP_phiPP", "", 4, varspTPP.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); + hm->AddHistogram(histClass, "Mass_y_cosThetaPP_phiPP", "", 4, varsrapPP.data(), binsy.data(), xminy.data(), xmaxy.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("upsilon-polarization-he")) { - int varspTHE[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaHE, VarManager::kPhiHE}; - int binspT[4] = {100, 20, 20, 20}; - double xminpT[4] = {1., 0., -1., 0.}; - double xmaxpT[4] = {15., 20., 1., 2. * o2::constants::math::PI}; - hm->AddHistogram(histClass, "Mass_Pt_cosThetaHE_phiHE", "", 4, varspTHE, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varspTHE = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaHE, VarManager::kPhiHE}; + std::array binspT = {100, 20, 20, 20}; + std::array xminpT = {1., 0., -1., 0.}; + std::array xmaxpT = {15., 20., 1., 2. * o2::constants::math::PI}; + hm->AddHistogram(histClass, "Mass_Pt_cosThetaHE_phiHE", "", 4, varspTHE.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("upsilon-polarization-cs")) { - int varspTCS[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaCS, VarManager::kPhiCS}; - int binspT[4] = {100, 20, 20, 20}; - double xminpT[4] = {1., 0., -1., 0.}; - double xmaxpT[4] = {15., 20., 1., 2. * o2::constants::math::PI}; - hm->AddHistogram(histClass, "Mass_Pt_cosThetaCS_phiCS", "", 4, varspTCS, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varspTCS = {VarManager::kMass, VarManager::kPt, VarManager::kCosThetaCS, VarManager::kPhiCS}; + std::array binspT = {100, 20, 20, 20}; + std::array xminpT = {1., 0., -1., 0.}; + std::array xmaxpT = {15., 20., 1., 2. * o2::constants::math::PI}; + hm->AddHistogram(histClass, "Mass_Pt_cosThetaCS_phiCS", "", 4, varspTCS.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-vp")) { - int varspTVP[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCosPhiVP, VarManager::kPhiVP}; - int varsrapVP[4] = {VarManager::kMass, VarManager::kRap, VarManager::kCosPhiVP, VarManager::kPhiVP}; - int binspT[4] = {100, 20, 24, 24}; - int binsy[4] = {100, 10, 24, 24}; - double xminpT[4] = {1., 0., -1., 0.}; - double xmaxpT[4] = {5., 20., 1., +3.14}; - double xminy[4] = {1., 2.5, -1., 0.}; - double xmaxy[4] = {5., 4.0, 1., +3.14}; - hm->AddHistogram(histClass, "Mass_Pt_phiVP", "", 4, varspTVP, binspT, xminpT, xmaxpT, 0, -1, kFALSE); - hm->AddHistogram(histClass, "Mass_y_phiVP", "", 4, varsrapVP, binsy, xminy, xmaxy, 0, -1, kFALSE); + std::array varspTVP = {VarManager::kMass, VarManager::kPt, VarManager::kCosPhiVP, VarManager::kPhiVP}; + std::array varsrapVP = {VarManager::kMass, VarManager::kRap, VarManager::kCosPhiVP, VarManager::kPhiVP}; + std::array binspT = {100, 20, 24, 24}; + std::array binsy = {100, 10, 24, 24}; + std::array xminpT = {1., 0., -1., 0.}; + std::array xmaxpT = {5., 20., 1., +3.14}; + std::array xminy = {1., 2.5, -1., 0.}; + std::array xmaxy = {5., 4.0, 1., +3.14}; + hm->AddHistogram(histClass, "Mass_Pt_phiVP", "", 4, varspTVP.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); + hm->AddHistogram(histClass, "Mass_y_phiVP", "", 4, varsrapVP.data(), binsy.data(), xminy.data(), xmaxy.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-rap")) { - int vars[4] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kRap}; - int binspT[4] = {300, 200, 10, 6}; - double xminpT[4] = {2., 0., 0, 2.5}; - double xmaxpT[4] = {8., 20., 100, 4.0}; - hm->AddHistogram(histClass, "Mass_Pt_Cent_Rap", "", 4, vars, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array vars = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kRap}; + std::array binspT = {300, 200, 10, 6}; + std::array xminpT = {2., 0., 0, 2.5}; + std::array xmaxpT = {8., 20., 100, 4.0}; + hm->AddHistogram(histClass, "Mass_Pt_Cent_Rap", "", 4, vars.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-he-pbpb")) { - int varsHEpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaHE, VarManager::kPhiHE}; - int binspT[5] = {150, 30, 10, 10, 10}; - double xminpT[5] = {2., 0., 0, -1., -3.14}; - double xmaxpT[5] = {5., 3., 100, 1., 3.14}; - hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaHE", "", 5, varsHEpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsHEpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaHE, VarManager::kPhiHE}; + std::array binspT = {150, 30, 10, 10, 10}; + std::array xminpT = {2., 0., 0, -1., -3.14}; + std::array xmaxpT = {5., 3., 100, 1., 3.14}; + hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaHE", "", 5, varsHEpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-lowmass-he-pbpb")) { - int varsHEpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaHE, VarManager::kPhiHE}; - int binspT[5] = {200, 30, 10, 10, 10}; - double xminpT[5] = {0.2, 0., 0, -1., -3.14}; - double xmaxpT[5] = {1.2, 3., 100, 1., 3.14}; - hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaHE_lowmass", "", 5, varsHEpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsHEpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaHE, VarManager::kPhiHE}; + std::array binspT = {200, 30, 10, 10, 10}; + std::array xminpT = {0.2, 0., 0, -1., -3.14}; + std::array xmaxpT = {1.2, 3., 100, 1., 3.14}; + hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaHE_lowmass", "", 5, varsHEpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-cs-pbpb")) { - int varsCSpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaCS, VarManager::kPhiCS}; - int binspT[5] = {150, 30, 10, 10, 10}; - double xminpT[5] = {2., 0., 0, -1., -3.14}; - double xmaxpT[5] = {5., 3., 100, 1., 3.14}; - hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaCS", "", 5, varsCSpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsCSpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaCS, VarManager::kPhiCS}; + std::array binspT = {150, 30, 10, 10, 10}; + std::array xminpT = {2., 0., 0, -1., -3.14}; + std::array xmaxpT = {5., 3., 100, 1., 3.14}; + hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaCS", "", 5, varsCSpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-lowmass-cs-pbpb")) { - int varsCSpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaCS, VarManager::kPhiCS}; - int binspT[5] = {200, 30, 10, 10, 10}; - double xminpT[5] = {0.2, 0., 0, -1., -3.14}; - double xmaxpT[5] = {1.2, 3., 100, 1., 3.14}; - hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaCS_lowmass", "", 5, varsCSpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsCSpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaCS, VarManager::kPhiCS}; + std::array binspT = {200, 30, 10, 10, 10}; + std::array xminpT = {0.2, 0., 0, -1., -3.14}; + std::array xmaxpT = {1.2, 3., 100, 1., 3.14}; + hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaCS_lowmass", "", 5, varsCSpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-vp-pbpb")) { - int varsVPpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosPhiVP, VarManager::kPhiVP}; - int binspT[5] = {150, 30, 10, 24, 24}; - double xminpT[5] = {2., 0., 0, -1., 0.}; - double xmaxpT[5] = {5., 3., 100, 1., 3.14}; - hm->AddHistogram(histClass, "Mass_Pt_Cent_phiVP", "", 5, varsVPpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsVPpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosPhiVP, VarManager::kPhiVP}; + std::array binspT = {150, 30, 10, 24, 24}; + std::array xminpT = {2., 0., 0, -1., 0.}; + std::array xmaxpT = {5., 3., 100, 1., 3.14}; + hm->AddHistogram(histClass, "Mass_Pt_Cent_phiVP", "", 5, varsVPpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-polarization-lowmass-vp-pbpb")) { - int varsVPpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosPhiVP, VarManager::kPhiVP}; - int binspT[5] = {200, 30, 10, 24, 24}; - double xminpT[5] = {0.2, 0., 0, -1., 0.}; - double xmaxpT[5] = {1.2, 3., 100, 1., 3.14}; - hm->AddHistogram(histClass, "Mass_Pt_Cent_phiVP_lowmass", "", 5, varsVPpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsVPpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosPhiVP, VarManager::kPhiVP}; + std::array binspT = {200, 30, 10, 24, 24}; + std::array xminpT = {0.2, 0., 0, -1., 0.}; + std::array xmaxpT = {1.2, 3., 100, 1., 3.14}; + hm->AddHistogram(histClass, "Mass_Pt_Cent_phiVP_lowmass", "", 5, varsVPpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-rap-polarization-he-pbpb")) { - int varsHEpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaHE, VarManager::kRap}; - int binspT[5] = {150, 30, 10, 10, 6}; - double xminpT[5] = {2., 0., 0, -1., 2.5}; - double xmaxpT[5] = {5., 3., 100, 1., 4.0}; - hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaHE_Rap", "", 5, varsHEpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsHEpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaHE, VarManager::kRap}; + std::array binspT = {150, 30, 10, 10, 6}; + std::array xminpT = {2., 0., 0, -1., 2.5}; + std::array xmaxpT = {5., 3., 100, 1., 4.0}; + hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaHE_Rap", "", 5, varsHEpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-rap-polarization-cs-pbpb")) { - int varsCSpbpb[5] = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaCS, VarManager::kRap}; - int binspT[5] = {150, 30, 10, 10, 6}; - double xminpT[5] = {2., 0., 0, -1., 2.5}; - double xmaxpT[5] = {5., 3., 100, 1., 4.0}; - hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaCS_Rap", "", 5, varsCSpbpb, binspT, xminpT, xmaxpT, 0, -1, kFALSE); + std::array varsCSpbpb = {VarManager::kMass, VarManager::kPt, VarManager::kCentFT0C, VarManager::kCosThetaCS, VarManager::kRap}; + std::array binspT = {150, 30, 10, 10, 6}; + std::array xminpT = {2., 0., 0, -1., 2.5}; + std::array xmaxpT = {5., 3., 100, 1., 4.0}; + hm->AddHistogram(histClass, "Mass_Pt_Cent_cosThetaCS_Rap", "", 5, varsCSpbpb.data(), binspT.data(), xminpT.data(), xmaxpT.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-midmult-polarization-he")) { - int varsITSTPCMulHE[4] = {VarManager::kMass, VarManager::kMultNTracksITSTPC, VarManager::kCosThetaHE, VarManager::kPhiHE}; - int varsITSMulHE[4] = {VarManager::kMass, VarManager::kMultNTracksHasITS, VarManager::kCosThetaHE, VarManager::kPhiHE}; - int binsMul[4] = {100, 20, 20, 20}; - double xminMul[4] = {1., 0., -1., -3.14}; - double xmaxMul[4] = {5., 120., 1., +3.14}; - hm->AddHistogram(histClass, "Mass_ITSTPCMult_cosThetaHE_phiHE", "", 4, varsITSTPCMulHE, binsMul, xminMul, xmaxMul, 0, -1, kFALSE); - hm->AddHistogram(histClass, "Mass_ITSMult_cosThetaHE_phiHE", "", 4, varsITSMulHE, binsMul, xminMul, xmaxMul, 0, -1, kFALSE); + std::array varsITSTPCMulHE = {VarManager::kMass, VarManager::kMultNTracksITSTPC, VarManager::kCosThetaHE, VarManager::kPhiHE}; + std::array varsITSMulHE = {VarManager::kMass, VarManager::kMultNTracksHasITS, VarManager::kCosThetaHE, VarManager::kPhiHE}; + std::array binsMul = {100, 20, 20, 20}; + std::array xminMul = {1., 0., -1., -3.14}; + std::array xmaxMul = {5., 120., 1., +3.14}; + hm->AddHistogram(histClass, "Mass_ITSTPCMult_cosThetaHE_phiHE", "", 4, varsITSTPCMulHE.data(), binsMul.data(), xminMul.data(), xmaxMul.data(), 0, -1, kFALSE); + hm->AddHistogram(histClass, "Mass_ITSMult_cosThetaHE_phiHE", "", 4, varsITSMulHE.data(), binsMul.data(), xminMul.data(), xmaxMul.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-midmult-polarization-cs")) { - int varsITSTPCMulCS[4] = {VarManager::kMass, VarManager::kMultNTracksITSTPC, VarManager::kCosThetaCS, VarManager::kPhiCS}; - int varsITSMulCS[4] = {VarManager::kMass, VarManager::kMultNTracksHasITS, VarManager::kCosThetaCS, VarManager::kPhiCS}; - int binsMul[4] = {100, 20, 20, 20}; - double xminMul[4] = {1., 0., -1., -3.14}; - double xmaxMul[4] = {5., 120., 1., +3.14}; - hm->AddHistogram(histClass, "Mass_ITSTPCMult_cosThetaCS_phiCS", "", 4, varsITSTPCMulCS, binsMul, xminMul, xmaxMul, 0, -1, kFALSE); - hm->AddHistogram(histClass, "Mass_ITSMult_cosThetaCS_phiCS", "", 4, varsITSMulCS, binsMul, xminMul, xmaxMul, 0, -1, kFALSE); + std::array varsITSTPCMulCS = {VarManager::kMass, VarManager::kMultNTracksITSTPC, VarManager::kCosThetaCS, VarManager::kPhiCS}; + std::array varsITSMulCS = {VarManager::kMass, VarManager::kMultNTracksHasITS, VarManager::kCosThetaCS, VarManager::kPhiCS}; + std::array binsMul = {100, 20, 20, 20}; + std::array xminMul = {1., 0., -1., -3.14}; + std::array xmaxMul = {5., 120., 1., +3.14}; + hm->AddHistogram(histClass, "Mass_ITSTPCMult_cosThetaCS_phiCS", "", 4, varsITSTPCMulCS.data(), binsMul.data(), xminMul.data(), xmaxMul.data(), 0, -1, kFALSE); + hm->AddHistogram(histClass, "Mass_ITSMult_cosThetaCS_phiCS", "", 4, varsITSMulCS.data(), binsMul.data(), xminMul.data(), xmaxMul.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-fwdmult-polarization-he")) { - int varsFT0AMulHE[4] = {VarManager::kMass, VarManager::kMultFT0A, VarManager::kCosThetaHE, VarManager::kPhiHE}; - int varsFV0AMulHE[4] = {VarManager::kMass, VarManager::kMultFV0A, VarManager::kCosThetaHE, VarManager::kPhiHE}; - int binsMul[4] = {100, 20, 20, 20}; - double xminMul[4] = {1., 0., -1., -3.14}; - double xmaxMul[4] = {5., 3000., 1., +3.14}; - hm->AddHistogram(histClass, "Mass_FT0AMult_cosThetaHE_phiHE", "", 4, varsFT0AMulHE, binsMul, xminMul, xmaxMul, 0, -1, kFALSE); - hm->AddHistogram(histClass, "Mass_FV0AMult_cosThetaHE_phiHE", "", 4, varsFV0AMulHE, binsMul, xminMul, xmaxMul, 0, -1, kFALSE); + std::array varsFT0AMulHE = {VarManager::kMass, VarManager::kMultFT0A, VarManager::kCosThetaHE, VarManager::kPhiHE}; + std::array varsFV0AMulHE = {VarManager::kMass, VarManager::kMultFV0A, VarManager::kCosThetaHE, VarManager::kPhiHE}; + std::array binsMul = {100, 20, 20, 20}; + std::array xminMul = {1., 0., -1., -3.14}; + std::array xmaxMul = {5., 3000., 1., +3.14}; + hm->AddHistogram(histClass, "Mass_FT0AMult_cosThetaHE_phiHE", "", 4, varsFT0AMulHE.data(), binsMul.data(), xminMul.data(), xmaxMul.data(), 0, -1, kFALSE); + hm->AddHistogram(histClass, "Mass_FV0AMult_cosThetaHE_phiHE", "", 4, varsFV0AMulHE.data(), binsMul.data(), xminMul.data(), xmaxMul.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("dimuon-fwdmult-polarization-cs")) { - int varsFT0AMulCS[4] = {VarManager::kMass, VarManager::kMultFT0A, VarManager::kCosThetaCS, VarManager::kPhiCS}; - int varsFV0AMulCS[4] = {VarManager::kMass, VarManager::kMultFV0A, VarManager::kCosThetaCS, VarManager::kPhiCS}; - int binsMul[4] = {100, 20, 20, 20}; - double xminMul[4] = {1., 0., -1., -3.14}; - double xmaxMul[4] = {5., 3000., 1., +3.14}; - hm->AddHistogram(histClass, "Mass_FT0AMult_cosThetaCS_phiCS", "", 4, varsFT0AMulCS, binsMul, xminMul, xmaxMul, 0, -1, kFALSE); - hm->AddHistogram(histClass, "Mass_FV0AMult_cosThetaCS_phiCS", "", 4, varsFV0AMulCS, binsMul, xminMul, xmaxMul, 0, -1, kFALSE); + std::array varsFT0AMulCS = {VarManager::kMass, VarManager::kMultFT0A, VarManager::kCosThetaCS, VarManager::kPhiCS}; + std::array varsFV0AMulCS = {VarManager::kMass, VarManager::kMultFV0A, VarManager::kCosThetaCS, VarManager::kPhiCS}; + std::array binsMul = {100, 20, 20, 20}; + std::array xminMul = {1., 0., -1., -3.14}; + std::array xmaxMul = {5., 3000., 1., +3.14}; + hm->AddHistogram(histClass, "Mass_FT0AMult_cosThetaCS_phiCS", "", 4, varsFT0AMulCS.data(), binsMul.data(), xminMul.data(), xmaxMul.data(), 0, -1, kFALSE); + hm->AddHistogram(histClass, "Mass_FV0AMult_cosThetaCS_phiCS", "", 4, varsFV0AMulCS.data(), binsMul.data(), xminMul.data(), xmaxMul.data(), 0, -1, kFALSE); } if (subGroupStr.Contains("vertexing-forward")) { hm->AddHistogram(histClass, "Lxyz", "", false, 100, 0.0, 10.0, VarManager::kVertexingLxyz); @@ -1858,40 +1858,40 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Mass_OpeningAngle", "", false, 250, 0.0, 5.0, VarManager::kMass, 800, 0, 0.8, VarManager::kOpeningAngle); } if (subGroupStr.Contains("flow-pos-neg-dimuon")) { - int varV2POS[6] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU2Q2POS, VarManager::kCos2DeltaPhiPOS}; - int varV2NEG[6] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU2Q2NEG, VarManager::kCos2DeltaPhiNEG}; + std::array varV2POS = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU2Q2POS, VarManager::kCos2DeltaPhiPOS}; + std::array varV2NEG = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU2Q2NEG, VarManager::kCos2DeltaPhiNEG}; - int bins[6] = {250, 60, 6, 18, 200, 40}; - double minBins[6] = {0.0, 0.0, 2.5, 0.0, -10.0, -2.0}; - double maxBins[6] = {5.0, 30.0, 4.0, 90.0, 10.0, 2.0}; - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V2POS", "", 6, varV2POS, bins, minBins, maxBins, 0, -1, kTRUE); - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V2NEG", "", 6, varV2NEG, bins, minBins, maxBins, 0, -1, kTRUE); + std::array bins = {250, 60, 6, 18, 200, 40}; + std::array minBins = {0.0, 0.0, 2.5, 0.0, -10.0, -2.0}; + std::array maxBins = {5.0, 30.0, 4.0, 90.0, 10.0, 2.0}; + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V2POS", "", 6, varV2POS.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V2NEG", "", 6, varV2NEG.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); } if (subGroupStr.Contains("flow-dimuon-high-mass")) { - int varV2[6] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU2Q2, VarManager::kCos2DeltaPhi}; + std::array varV2 = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU2Q2, VarManager::kCos2DeltaPhi}; - int bins[6] = {50, 30, 6, 18, 200, 40}; - double minBins[6] = {7.0, 0.0, 2.5, 0.0, -10.0, -2.0}; - double maxBins[6] = {12.0, 30.0, 4.0, 90.0, 10.0, 2.0}; - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V2", "", 6, varV2, bins, minBins, maxBins, 0, -1, kTRUE); + std::array bins = {50, 30, 6, 18, 200, 40}; + std::array minBins = {7.0, 0.0, 2.5, 0.0, -10.0, -2.0}; + std::array maxBins = {12.0, 30.0, 4.0, 90.0, 10.0, 2.0}; + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V2", "", 6, varV2.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); } if (subGroupStr.Contains("flow-dimuon")) { - int varV2[6] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU2Q2, VarManager::kCos2DeltaPhi}; - // int varV3[6] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU3Q3, VarManager::kCos3DeltaPhi}; // removed temporarily + std::array varV2 = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU2Q2, VarManager::kCos2DeltaPhi}; + // std::array varV3 = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kU3Q3, VarManager::kCos3DeltaPhi}; // removed temporarily - int bins[6] = {250, 60, 6, 18, 200, 40}; - double minBins[6] = {0.0, 0.0, 2.5, 0.0, -10.0, -2.0}; - double maxBins[6] = {5.0, 30.0, 4.0, 90.0, 10.0, 2.0}; - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V2", "", 6, varV2, bins, minBins, maxBins, 0, -1, kTRUE); - // hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V3", "", 6, varV3, bins, minBins, maxBins, 0, -1, kTRUE); // removed temporarily + std::array bins = {250, 60, 6, 18, 200, 40}; + std::array minBins = {0.0, 0.0, 2.5, 0.0, -10.0, -2.0}; + std::array maxBins = {5.0, 30.0, 4.0, 90.0, 10.0, 2.0}; + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V2", "", 6, varV2.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); + // hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_V3", "", 6, varV3.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); // removed temporarily } if (subGroupStr.Contains("flow-ccdb")) { - double MassBinEdges[251]; // 0-5GeV/c2 + std::array MassBinEdges; // 0-5GeV/c2 for (int i = 0; i < 251; i++) { MassBinEdges[i] = i * 0.02; } - double PtBinEdges[49]; // 0-20GeV/c + std::array PtBinEdges; // 0-20GeV/c for (int i = 0; i < 49; i++) { if (i <= 9) { PtBinEdges[i] = i / 10.; @@ -1900,19 +1900,19 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } - double CentBinEdges[19]; // 0-90% + std::array CentBinEdges; // 0-90% for (int i = 0; i < 19; i++) { CentBinEdges[i] = i * 5; } - hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V2SPwR", "Mass_Pt_CentFT0C_V2SPwR", true, 250, MassBinEdges, VarManager::kMass, 48, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, "", "", "", VarManager::kV2SP, VarManager::kWV2SP); - hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V2EPwR", "Mass_Pt_CentFT0C_V2EPwR", true, 250, MassBinEdges, VarManager::kMass, 48, PtBinEdges, VarManager::kPt, 18, CentBinEdges, VarManager::kCentFT0C, "", "", "", VarManager::kV2EP, VarManager::kWV2EP); + hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V2SPwR", "Mass_Pt_CentFT0C_V2SPwR", true, 250, MassBinEdges.data(), VarManager::kMass, 48, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, "", "", "", VarManager::kV2SP, VarManager::kWV2SP); + hm->AddHistogram(histClass, "Mass_Pt_CentFT0C_V2EPwR", "Mass_Pt_CentFT0C_V2EPwR", true, 250, MassBinEdges.data(), VarManager::kMass, 48, PtBinEdges.data(), VarManager::kPt, 18, CentBinEdges.data(), VarManager::kCentFT0C, "", "", "", VarManager::kV2EP, VarManager::kWV2EP); } if (subGroupStr.Contains("cumulant")) { - int var[4] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C}; - int bins[4] = {250, 60, 6, 18}; - double minBins[4] = {0.0, 0.0, 2.5, 0.0}; - double maxBins[4] = {5.0, 30.0, 4.0, 90.0}; + std::array var = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C}; + std::array bins = {250, 60, 6, 18}; + std::array minBins = {0.0, 0.0, 2.5, 0.0}; + std::array maxBins = {5.0, 30.0, 4.0, 90.0}; hm->AddHistogram(histClass, "centrFT0C_M11REFoverMp_ev", "", true, 100, 0.0, 100.0, VarManager::kCentFT0C, 1000, 0.0, 1000000.0, VarManager::kM11REFoverMp); hm->AddHistogram(histClass, "centrFT0C_M1111REFoverMp_ev", "", true, 100, 0.0, 100.0, VarManager::kCentFT0C, 1000, 0.0, 100000000000000.0, VarManager::kM1111REFoverMp); hm->AddHistogram(histClass, "centrFT0C_M11M1111REFoverMp_ev", "", true, 100, 0.0, 100.0, VarManager::kCentFT0C, 1000, 0.0, 10000000000000000.0, VarManager::kM11M1111REFoverMp); @@ -1927,7 +1927,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_M01M0111overMp", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kM01M0111overMp); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_M11M0111overMp", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kM11M0111overMp); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_M11M01REFoverMp", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kM11M01overMp); - hm->AddHistogram(histClass, "Mass_Pt_Rapidity_CentFT0C", "", 4, var, bins, minBins, maxBins, 0, -1, kTRUE); + hm->AddHistogram(histClass, "Mass_Pt_Rapidity_CentFT0C", "", 4, var.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr2REF", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kCORR2REFbydimuons, VarManager::kM11REFoverMp); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr4REF", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kCORR4REFbydimuons, VarManager::kM1111REFoverMp); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr2POI", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kCORR2POI, VarManager::kM01POIoverMp); @@ -1938,11 +1938,11 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr2REFCorr2POI", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kCORR2REFCORR2POI, VarManager::kM11M01overMp); } if (subGroupStr.Contains("cumulant1")) { - int var[4] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C}; - int bins[4] = {250, 60, 6, 18}; - double minBins[4] = {0.0, 0.0, 2.5, 0.0}; - double maxBins[4] = {5.0, 30.0, 4.0, 90.0}; - hm->AddHistogram(histClass, "Mass_Pt_Rapidity_CentFT0C", "", 4, var, bins, minBins, maxBins, 0, -1, kTRUE); + std::array var = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C}; + std::array bins = {250, 60, 6, 18}; + std::array minBins = {0.0, 0.0, 2.5, 0.0}; + std::array maxBins = {5.0, 30.0, 4.0, 90.0}; + hm->AddHistogram(histClass, "Mass_Pt_Rapidity_CentFT0C", "", 4, var.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr2REF", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kCORR2REFbydimuons, VarManager::kM11REFoverMp); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr4REF", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kCORR4REFbydimuons, VarManager::kM1111REFoverMp); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr2POI", "", true, 250, 0.0, 5.0, VarManager::kMass, 60, 0.0, 30.0, VarManager::kPt, 18, 0.0, 90.0, VarManager::kCentFT0C, "", "", "", VarManager::kCORR2POI, VarManager::kM01POIoverMp); @@ -1961,11 +1961,11 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "centrFT0C_Corr2Corr4REF_ev", "", true, 100, 0.0, 100.0, VarManager::kCentFT0C, 250, -1.0, 1.0, VarManager::kCORR2CORR4REF, VarManager::kM11M1111REFoverMp); } if (subGroupStr.Contains("singlecumulant")) { - int var[4] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C}; - int bins[4] = {250, 60, 6, 18}; - double minBins[4] = {0.0, 0.0, 2.5, 0.0}; - double maxBins[4] = {5.0, 30.0, 4.0, 90.0}; - hm->AddHistogram(histClass, "Mass_Pt_Rapidity_CentFT0C", "", 4, var, bins, minBins, maxBins, 0, -1, kTRUE); + std::array var = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C}; + std::array bins = {250, 60, 6, 18}; + std::array minBins = {0.0, 0.0, 2.5, 0.0}; + std::array maxBins = {5.0, 30.0, 4.0, 90.0}; + hm->AddHistogram(histClass, "Mass_Pt_Rapidity_CentFT0C", "", 4, var.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr2REFminus", "", true, 60, 0.0, 30.0, VarManager::kPt2, 18, 0.0, 90.0, VarManager::kCentFT0C, 0, 0.0, 1.0, VarManager::kCORR2REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM11REFoverMpminus); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr4REFminus", "", true, 60, 0.0, 30.0, VarManager::kPt2, 18, 0.0, 90.0, VarManager::kCentFT0C, 0, 0.0, 1.0, VarManager::kCORR4REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM1111REFoverMpminus); hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr2REFplus", "", true, 60, 0.0, 30.0, VarManager::kPt1, 18, 0.0, 90.0, VarManager::kCentFT0C, 0, 0.0, 1.0, VarManager::kCORR2REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM11REFoverMpplus); @@ -1976,7 +1976,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_Corr4POIplus", "", true, 60, 0.0, 30.0, VarManager::kPt1, 18, 0.0, 90.0, VarManager::kCentFT0C, 0, 0.0, 1.0, VarManager::kCORR4POIplus, "", "", "", VarManager::kNothing, VarManager::kM0111POIoverMpplus); } if (subGroupStr.Contains("singlecumulant2")) { - double PtBinEdges[67]; // 0-30GeV/c + std::array PtBinEdges; // 0-30GeV/c for (int i = 0; i < 67; i++) { if (i <= 39) { PtBinEdges[i] = i / 10.; @@ -1984,28 +1984,28 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h PtBinEdges[i] = (i - 40) * 1. + 4.; } } - double CentBinEdges[19]; // 0-90% + std::array CentBinEdges; // 0-90% for (int i = 0; i < 19; i++) { CentBinEdges[i] = i * 5; } - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2REFminus", "", true, 66, PtBinEdges, VarManager::kPt2, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM11REFoverMpminus); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4REFminus", "", true, 66, PtBinEdges, VarManager::kPt2, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM1111REFoverMpminus); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2REFplus", "", true, 66, PtBinEdges, VarManager::kPt1, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM11REFoverMpplus); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4REFplus", "", true, 66, PtBinEdges, VarManager::kPt1, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM1111REFoverMpplus); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2POIminus", "", true, 66, PtBinEdges, VarManager::kPt2, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2POIminus, "", "", "", VarManager::kNothing, VarManager::kM01POIoverMpminus); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4POIminus", "", true, 66, PtBinEdges, VarManager::kPt2, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4POIminus, "", "", "", VarManager::kNothing, VarManager::kM0111POIoverMpminus); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2POIplus", "", true, 66, PtBinEdges, VarManager::kPt1, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2POIplus, "", "", "", VarManager::kNothing, VarManager::kM01POIoverMpplus); - hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4POIplus", "", true, 66, PtBinEdges, VarManager::kPt1, 18, CentBinEdges, VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4POIplus, "", "", "", VarManager::kNothing, VarManager::kM0111POIoverMpplus); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2REFminus", "", true, 66, PtBinEdges.data(), VarManager::kPt2, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM11REFoverMpminus); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4REFminus", "", true, 66, PtBinEdges.data(), VarManager::kPt2, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM1111REFoverMpminus); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2REFplus", "", true, 66, PtBinEdges.data(), VarManager::kPt1, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM11REFoverMpplus); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4REFplus", "", true, 66, PtBinEdges.data(), VarManager::kPt1, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4REFbydimuons, "", "", "", VarManager::kNothing, VarManager::kM1111REFoverMpplus); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2POIminus", "", true, 66, PtBinEdges.data(), VarManager::kPt2, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2POIminus, "", "", "", VarManager::kNothing, VarManager::kM01POIoverMpminus); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4POIminus", "", true, 66, PtBinEdges.data(), VarManager::kPt2, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4POIminus, "", "", "", VarManager::kNothing, VarManager::kM0111POIoverMpminus); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr2POIplus", "", true, 66, PtBinEdges.data(), VarManager::kPt1, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR2POIplus, "", "", "", VarManager::kNothing, VarManager::kM01POIoverMpplus); + hm->AddHistogram(histClass, "Pt_centrFT0C_Corr4POIplus", "", true, 66, PtBinEdges.data(), VarManager::kPt1, 18, CentBinEdges.data(), VarManager::kCentFT0C, 0, nullptr, VarManager::kCORR4POIplus, "", "", "", VarManager::kNothing, VarManager::kM0111POIoverMpplus); } if (subGroupStr.Contains("res-flow-dimuon")) { - int varV2[6] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kR2SP_AB, VarManager::kR2EP_AB}; - // int varV3[6] = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kR3SP, VarManager::kR3EP}; // removed temporarily + std::array varV2 = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kR2SP_AB, VarManager::kR2EP_AB}; + // std::array varV3 = {VarManager::kMass, VarManager::kPt, VarManager::kRap, VarManager::kCentFT0C, VarManager::kR3SP, VarManager::kR3EP}; // removed temporarily - int bins[6] = {125, 60, 6, 18, 200, 40}; - double minBins[6] = {0.0, 0.0, 2.5, 0.0, -10.0, -2.0}; - double maxBins[6] = {5.0, 30.0, 4.0, 90.0, 10.0, 2.0}; - hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_R2", "", 6, varV2, bins, minBins, maxBins, 0, -1, kTRUE); - // hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_R3", "", 6, varV3, bins, minBins, maxBins, 0, -1, kTRUE); // removed temporarily + std::array bins = {125, 60, 6, 18, 200, 40}; + std::array minBins = {0.0, 0.0, 2.5, 0.0, -10.0, -2.0}; + std::array maxBins = {5.0, 30.0, 4.0, 90.0, 10.0, 2.0}; + hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_R2", "", 6, varV2.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); + // hm->AddHistogram(histClass, "Mass_Pt_centrFT0C_R3", "", 6, varV3.data(), bins.data(), minBins.data(), maxBins.data(), 0, -1, kTRUE); // removed temporarily } if (subGroupStr.Contains("z-boson")) { hm->AddHistogram(histClass, "MassZboson", "", false, 240, 20.0, 140.0, VarManager::kMass); @@ -2037,11 +2037,11 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h // which FillPair populates for SE and FillPairME (patched in this PR) populates for ME. Stored as THnSparse so // running with many MC-matched hist classes (track cut x muon cut x signal x QA variant) does not blow the // 1 GB TBufferFile limit during the final ROOT serialization. - int varsEmu4D[4] = {VarManager::kDeltaPhiPair2, VarManager::kDeltaEtaPair2, VarManager::kPt1, VarManager::kPt2}; - int binsEmu4D[4] = {60, 35, 20, 20}; - double xminEmu4D[4] = {-o2::constants::math::PIHalf, 1.5, 0.0, 0.0}; - double xmaxEmu4D[4] = {1.5 * o2::constants::math::PI, 5.0, 20.0, 20.0}; - hm->AddHistogram(histClass, "DeltaPhiPair2_DeltaEtaPair2_PtE_PtMu", "", 4, varsEmu4D, binsEmu4D, xminEmu4D, xmaxEmu4D, nullptr, -1, kTRUE); + std::array varsEmu4D = {VarManager::kDeltaPhiPair2, VarManager::kDeltaEtaPair2, VarManager::kPt1, VarManager::kPt2}; + std::array binsEmu4D = {60, 35, 20, 20}; + std::array xminEmu4D = {-o2::constants::math::PIHalf, 1.5, 0.0, 0.0}; + std::array xmaxEmu4D = {1.5 * o2::constants::math::PI, 5.0, 20.0, 20.0}; + hm->AddHistogram(histClass, "DeltaPhiPair2_DeltaEtaPair2_PtE_PtMu", "", 4, varsEmu4D.data(), binsEmu4D.data(), xminEmu4D.data(), xmaxEmu4D.data(), nullptr, -1, kTRUE); } if (subGroupStr.Contains("dielectrons")) { if (subGroupStr.Contains("prefilter")) { @@ -2058,31 +2058,31 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h // every 10 MeV from 0 to 0.2 GeV/c2 // every 100 MeV from 0.2 to 1. GeV/c2 // every 500 GeV from 1 to 5 GeV/c2 - double mee_bins[37]; + std::array mee_bins; for (int i = 0; i <= 20; i++) mee_bins[i] = 0.01 * i; for (int i = 1; i <= 8; i++) mee_bins[20 + i] = 0.2 + 0.1 * i; for (int i = 1; i <= 8; i++) mee_bins[28 + i] = 1. + 0.5 * i; - int nbins_mee = sizeof(mee_bins) / sizeof(*mee_bins) - 1; + int nbins_mee = static_cast(mee_bins.size()) - 1; // binning for ptee at large scales: // every 0.2 GeV/c from 0 to 10 GeV/c - double ptee_bins[51]; + std::array ptee_bins; for (int i = 0; i <= 50; i++) ptee_bins[i] = 0.2 * i; - int nbins_ptee = sizeof(ptee_bins) / sizeof(*ptee_bins) - 1; + int nbins_ptee = static_cast(ptee_bins.size()) - 1; // binning for phiv: // steps of size pi/100 - double phiv_bins[101]; + std::array phiv_bins; for (int i = 0; i <= 100; i++) phiv_bins[i] = o2::constants::math::PI / 100. * i; - int nbins_phiv = sizeof(phiv_bins) / sizeof(*phiv_bins) - 1; + int nbins_phiv = static_cast(phiv_bins.size()) - 1; // 3D histo - hm->AddHistogram(histClass, "Mass_Pt_PhiV", "", false, nbins_mee, mee_bins, VarManager::kMass, nbins_ptee, ptee_bins, VarManager::kPt, nbins_phiv, phiv_bins, VarManager::kPairPhiv); + hm->AddHistogram(histClass, "Mass_Pt_PhiV", "", false, nbins_mee, mee_bins.data(), VarManager::kMass, nbins_ptee, ptee_bins.data(), VarManager::kPt, nbins_phiv, phiv_bins.data(), VarManager::kPairPhiv); } if (subGroupStr.Contains("meeptee")) { hm->AddHistogram(histClass, "Mass_Pt", "", false, 500, 0.0, 5.0, VarManager::kMass, 100, 0.0, 10.0, VarManager::kPt); @@ -2102,7 +2102,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h // every 50 MeV from 1.1 to 2.7 GeV/c2 // every 10 MeV from 2.7 to 3.2 GeV/c2 // every 50 MeV from 3.2 to 12 GeV/c2 - double mee_bins[369]; + std::array mee_bins; for (int i = 0; i <= 110; i++) mee_bins[i] = 0.01 * i; for (int i = 1; i <= 32; i++) @@ -2111,34 +2111,34 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h mee_bins[142 + i] = 2.7 + 0.01 * i; for (int i = 1; i <= 176; i++) mee_bins[192 + i] = 3.2 + 0.05 * i; - int nbins_mee = sizeof(mee_bins) / sizeof(*mee_bins) - 1; + int nbins_mee = static_cast(mee_bins.size()) - 1; // binning for ptee at large scales: // every 0.1 GeV/c from 0 to 10 GeV/c // every 0.5 GeV/c from 10 to 30 GeV/c - double ptee_bins[201]; + std::array ptee_bins; for (int i = 0; i <= 100; i++) ptee_bins[i] = 0.1 * i; for (int i = 1; i <= 100; i++) ptee_bins[100 + i] = 10 + 0.2 * i; - int nbins_ptee = sizeof(ptee_bins) / sizeof(*ptee_bins) - 1; + int nbins_ptee = static_cast(ptee_bins.size()) - 1; // binning for dca at large scales: // every 0.1 sigma from 0 to 5 sigma // every 0.5 sigma from 5 to 10 sigma // every 1.0 sigma from 10 to 40 sigma - double dca_bins[91]; + std::array dca_bins; for (int i = 0; i <= 50; i++) dca_bins[i] = 0.1 * i; for (int i = 1; i <= 10; i++) dca_bins[50 + i] = 5 + 0.5 * i; for (int i = 1; i <= 30; i++) dca_bins[60 + i] = 10 + 1 * i; - int nbins_dca = sizeof(dca_bins) / sizeof(*dca_bins) - 1; + int nbins_dca = static_cast(dca_bins.size()) - 1; - hm->AddHistogram(histClass, "Mass_QuadDCAsigXY", "", false, nbins_mee, mee_bins, VarManager::kMass, nbins_dca, dca_bins, VarManager::kQuadDCAsigXY); - hm->AddHistogram(histClass, "Mass_QuadDCAsigZ", "", false, nbins_mee, mee_bins, VarManager::kMass, nbins_dca, dca_bins, VarManager::kQuadDCAsigZ); - hm->AddHistogram(histClass, "Mass_Pt_QuadDCAsigXYZ", "", false, nbins_mee, mee_bins, VarManager::kMass, nbins_ptee, ptee_bins, VarManager::kPt, nbins_dca, dca_bins, VarManager::kQuadDCAsigXYZ); + hm->AddHistogram(histClass, "Mass_QuadDCAsigXY", "", false, nbins_mee, mee_bins.data(), VarManager::kMass, nbins_dca, dca_bins.data(), VarManager::kQuadDCAsigXY); + hm->AddHistogram(histClass, "Mass_QuadDCAsigZ", "", false, nbins_mee, mee_bins.data(), VarManager::kMass, nbins_dca, dca_bins.data(), VarManager::kQuadDCAsigZ); + hm->AddHistogram(histClass, "Mass_Pt_QuadDCAsigXYZ", "", false, nbins_mee, mee_bins.data(), VarManager::kMass, nbins_ptee, ptee_bins.data(), VarManager::kPt, nbins_dca, dca_bins.data(), VarManager::kQuadDCAsigXYZ); } } if (subGroupStr.Contains("opencharm")) { @@ -2217,26 +2217,26 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h const int kNvarsTripletCuts = 4; const int kInvMassNbins = 100; - double InvMassBinLims[kInvMassNbins + 1]; + std::array InvMassBinLims; for (int i = 0; i <= kInvMassNbins; ++i) InvMassBinLims[i] = 4.0 + 0.02 * i; const int kPtNbins = 6; - double PtBinLims[kPtNbins + 1] = {0., 2., 4., 6., 8., 10., 20.}; + std::array PtBinLims = {0., 2., 4., 6., 8., 10., 20.}; const int kCosPointingAngleNbins = 5; - double CosPointingAngleBinLims[kCosPointingAngleNbins + 1] = {0., 0.86, 0.90, 0.94, 0.98, 1.0}; + std::array CosPointingAngleBinLims = {0., 0.86, 0.90, 0.94, 0.98, 1.0}; const int kTauNBins = 6; - double TauBinLims[kTauNBins + 1] = {0., 0.005, 0.01, 0.015, 0.02, 0.025, 0.3}; + std::array TauBinLims = {0., 0.005, 0.01, 0.015, 0.02, 0.025, 0.3}; - TArrayD nCutsBinLimits[kNvarsTripletCuts]; - nCutsBinLimits[0] = TArrayD(kInvMassNbins + 1, InvMassBinLims); - nCutsBinLimits[1] = TArrayD(kPtNbins + 1, PtBinLims); - nCutsBinLimits[2] = TArrayD(kCosPointingAngleNbins + 1, CosPointingAngleBinLims); - nCutsBinLimits[3] = TArrayD(kTauNBins + 1, TauBinLims); + std::array nCutsBinLimits; + nCutsBinLimits[0] = TArrayD(kInvMassNbins + 1, InvMassBinLims.data()); + nCutsBinLimits[1] = TArrayD(kPtNbins + 1, PtBinLims.data()); + nCutsBinLimits[2] = TArrayD(kCosPointingAngleNbins + 1, CosPointingAngleBinLims.data()); + nCutsBinLimits[3] = TArrayD(kTauNBins + 1, TauBinLims.data()); - int varsTripletCuts[kNvarsTripletCuts] = {VarManager::kPairMass, VarManager::kPairPt, VarManager::kCosPointingAngle, VarManager::kVertexingTauxyProjected}; - hm->AddHistogram(histClass, "multidimentional-vertexing", "Invariant mass vs. pT vs. cosine of pointing angle vs. tau", kNvarsTripletCuts, varsTripletCuts, nCutsBinLimits); + std::array varsTripletCuts = {VarManager::kPairMass, VarManager::kPairPt, VarManager::kCosPointingAngle, VarManager::kVertexingTauxyProjected}; + hm->AddHistogram(histClass, "multidimentional-vertexing", "Invariant mass vs. pT vs. cosine of pointing angle vs. tau", kNvarsTripletCuts, varsTripletCuts.data(), nCutsBinLimits.data()); } if (subGroupStr.Contains("correlation")) { hm->AddHistogram(histClass, "DeltaEta_DeltaPhi", "", false, 20, -2.0, 2.0, VarManager::kDeltaEta, 50, -8.0, 8.0, VarManager::kDeltaPhi); @@ -2244,30 +2244,30 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } if (subGroupStr.Contains("dilepton-hadron-array-correlation")) { const int kInvMassBins = 500; - double InvMassBinLims[kInvMassBins + 1]; + std::array InvMassBinLims; for (int i = 0; i <= kInvMassBins; i++) InvMassBinLims[i] = 0 + i * 0.01; const int kDelEtaBins = 20; - double DelEtaBinLims[kDelEtaBins + 1]; + std::array DelEtaBinLims; for (int i = 0; i <= kDelEtaBins; i++) DelEtaBinLims[i] = -2 + i * 0.2; const int kDelPhiBins = 26; - double DelPhiBinLims[] = {-1.69647, -1.44513, -1.19381, -0.94248, -0.69115, -0.43982, -0.18850, 0.06283, 0.31416, 0.56549, 0.81681, 1.06814, 1.31947, 1.57080, 1.82212, 2.07345, 2.32478, 2.57611, 2.82743, 3.07876, 3.33009, 3.58142, 3.83274, 4.08407, 4.33540, 4.58673, 4.83806}; + std::array DelPhiBinLims = {-1.69647, -1.44513, -1.19381, -0.94248, -0.69115, -0.43982, -0.18850, 0.06283, 0.31416, 0.56549, 0.81681, 1.06814, 1.31947, 1.57080, 1.82212, 2.07345, 2.32478, 2.57611, 2.82743, 3.07876, 3.33009, 3.58142, 3.83274, 4.08407, 4.33540, 4.58673, 4.83806}; const int kPtBins = 12; - double PtBinLims[kPtBins + 1] = {0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 5, 7.5, 10, 20}; + std::array PtBinLims = {0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 5, 7.5, 10, 20}; - TArrayD nJPsiHadCorr[4]; - nJPsiHadCorr[0] = TArrayD(kInvMassBins + 1, InvMassBinLims); - nJPsiHadCorr[1] = TArrayD(kDelEtaBins + 1, DelEtaBinLims); - nJPsiHadCorr[2] = TArrayD(kDelPhiBins + 1, DelPhiBinLims); - nJPsiHadCorr[3] = TArrayD(kPtBins + 1, PtBinLims); + std::array nJPsiHadCorr; + nJPsiHadCorr[0] = TArrayD(kInvMassBins + 1, InvMassBinLims.data()); + nJPsiHadCorr[1] = TArrayD(kDelEtaBins + 1, DelEtaBinLims.data()); + nJPsiHadCorr[2] = TArrayD(kDelPhiBins + 1, DelPhiBinLims.data()); + nJPsiHadCorr[3] = TArrayD(kPtBins + 1, PtBinLims.data()); - int varsJPsiHadCorr[4] = {VarManager::kPairMassDau, VarManager::kDeltaEta, VarManager::kDeltaPhi, VarManager::kPairPtDau}; - hm->AddHistogram(histClass, "InvMass_DelEta_DelPhi", "", 4, varsJPsiHadCorr, nJPsiHadCorr); // Without efficiency - // hm->AddHistogram(histClass, "InvMass_DelEta_DelPhi", "", 4, varsJPsiHadCorr, nJPsiHadCorr, nullptr, VarManager::kJpsiHadronEff); + std::array varsJPsiHadCorr = {VarManager::kPairMassDau, VarManager::kDeltaEta, VarManager::kDeltaPhi, VarManager::kPairPtDau}; + hm->AddHistogram(histClass, "InvMass_DelEta_DelPhi", "", 4, varsJPsiHadCorr.data(), nJPsiHadCorr.data()); // Without efficiency + // hm->AddHistogram(histClass, "InvMass_DelEta_DelPhi", "", 4, varsJPsiHadCorr.data(), nJPsiHadCorr.data(), nullptr, VarManager::kJpsiHadronEff); } if (subGroupStr.Contains("dilepton-hadron-femto")) { hm->AddHistogram(histClass, "DileptonHadronKstar_DileptonMass", "", false, 150, 0.0, 3.0, VarManager::kDileptonHadronKstar, 100, 1.5, 4.5, VarManager::kPairMassDau); @@ -2276,13 +2276,13 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Delta_Mass_DstarD0region", "", false, 50, 0.14, 0.16, VarManager::kDeltaMass); } if (subGroupStr.Contains("energy-correlator")) { - double coschiBins[26]; + std::array coschiBins; for (int i = 0; i < 26; i++) { coschiBins[i] = -1.0 + 2.0 * TMath::Power(0.04 * i, 2.0); } - hm->AddHistogram(histClass, "Coschi_unfolding", "", false, 25, coschiBins, VarManager::kMCCosChi_rec, 25, coschiBins, VarManager::kMCCosChi_gen); - hm->AddHistogram(histClass, "Coschi", "", false, 25, coschiBins, VarManager::kCosChi, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kECWeight); + hm->AddHistogram(histClass, "Coschi_unfolding", "", false, 25, coschiBins.data(), VarManager::kMCCosChi_rec, 25, coschiBins.data(), VarManager::kMCCosChi_gen); + hm->AddHistogram(histClass, "Coschi", "", false, 25, coschiBins.data(), VarManager::kCosChi, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kECWeight); hm->AddHistogram(histClass, "DeltaEta_DeltaPhi_weight", "", false, 20, -2.0, 2.0, VarManager::kDeltaEta, 50, -2.0, 6.0, VarManager::kDeltaPhi, 0, 0, 0, -1, "", "", "", -1, VarManager::kPtDau); } } @@ -2508,7 +2508,7 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist) } // Check if the histogram uses constant binning bool isConstantBinning = true; - if (!(hist->HasMember("xmin") && hist->HasMember("xmax"))) { + if (!(hist->HasMember("xmin.data()") && hist->HasMember("xmax.data()"))) { isConstantBinning = false; } @@ -2519,17 +2519,17 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist) bool isProfile = (hist->HasMember("isProfile") ? hist->FindMember("isProfile")->value.GetBool() : false); if (isConstantBinning) { - if (!hist->HasMember("xmin") || !hist->HasMember("xmax")) { - LOG(fatal) << "Missing xmin or xmax information for histogram"; + if (!hist->HasMember("xmin.data()") || !hist->HasMember("xmax.data()")) { + LOG(fatal) << "Missing xmin.data() or xmax.data() information for histogram"; return false; } if (isTHn) { - if (!hist->FindMember("xmin")->value.IsArray()) { - LOG(fatal) << "xmin field should be an array of arrays"; + if (!hist->FindMember("xmin.data()")->value.IsArray()) { + LOG(fatal) << "xmin.data() field should be an array of arrays"; return false; } - if (!hist->FindMember("xmax")->value.IsArray()) { - LOG(fatal) << "xmax field should be an array of arrays"; + if (!hist->FindMember("xmax.data()")->value.IsArray()) { + LOG(fatal) << "xmax.data() field should be an array of arrays"; return false; } } @@ -2557,8 +2557,8 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist) } if (isTHn) { - if (!hist->HasMember("nDimensions") || !hist->HasMember("vars")) { - LOG(fatal) << "Missing nDimensions or vars fields for histogram"; + if (!hist->HasMember("nDimensions") || !hist->HasMember("vars.data()")) { + LOG(fatal) << "Missing nDimensions or vars.data() fields for histogram"; return false; } if (isConstantBinning) { @@ -2646,9 +2646,9 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist) } } if (isTHn) { - for (auto& v : hist->FindMember("vars")->value.GetArray()) { + for (auto& v : hist->FindMember("vars.data()")->value.GetArray()) { if (VarManager::fgVarNamesMap.find(v.GetString()) == VarManager::fgVarNamesMap.end()) { - LOG(fatal) << "Bad variable in vars (" << v.GetString() << ") specified for histogram"; + LOG(fatal) << "Bad variable in vars.data() (" << v.GetString() << ") specified for histogram"; return false; } } @@ -2703,7 +2703,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch bool isTH3 = (histTypeStr.CompareTo("TH3") == 0); bool isTHn = (histTypeStr.CompareTo("THn") == 0); bool isConstantBinning = true; - if (!(hist.HasMember("xmin") && hist.HasMember("xmax"))) { + if (!(hist.HasMember("xmin.data()") && hist.HasMember("xmax.data()"))) { isConstantBinning = false; } @@ -2720,7 +2720,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch int* vars = new int[nDimensions]; int iDim = 0; - for (auto& v : hist.FindMember("vars")->value.GetArray()) { + for (auto& v : hist.FindMember("vars.data()")->value.GetArray()) { LOG(debug) << "iDim " << iDim << ": " << v.GetString(); vars[iDim++] = VarManager::fgVarNamesMap[v.GetString()]; } @@ -2739,14 +2739,14 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch LOG(debug) << "nBins " << iDim << ": " << nBins[iDim - 1]; } iDim = 0; - for (auto& v : hist.FindMember("xmin")->value.GetArray()) { + for (auto& v : hist.FindMember("xmin.data()")->value.GetArray()) { xmin[iDim++] = v.GetDouble(); - LOG(debug) << "xmin " << iDim << ": " << xmin[iDim - 1]; + LOG(debug) << "xmin.data() " << iDim << ": " << xmin[iDim - 1]; } iDim = 0; - for (auto& v : hist.FindMember("xmax")->value.GetArray()) { + for (auto& v : hist.FindMember("xmax.data()")->value.GetArray()) { xmax[iDim++] = v.GetDouble(); - LOG(debug) << "xmax " << iDim << ": " << xmax[iDim - 1]; + LOG(debug) << "xmax.data() " << iDim << ": " << xmax[iDim - 1]; } } else { int iDim = 0; @@ -2776,11 +2776,11 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch if (isConstantBinning) { for (auto histClass : histClasses) { - hm->AddHistogram(histClass, histName, title, nDimensions, vars, nBins, xmin, xmax, axLabels, varW, useSparse, isDouble); + hm->AddHistogram(histClass, histName, title, nDimensions, vars.data(), nBins, xmin.data(), xmax.data(), axLabels, varW, useSparse, isDouble); } } else { for (auto histClass : histClasses) { - hm->AddHistogram(histClass, histName, title, nDimensions, vars, binLimits, axLabels, varW, useSparse, isDouble); + hm->AddHistogram(histClass, histName, title, nDimensions, vars.data(), binLimits, axLabels, varW, useSparse, isDouble); } } @@ -2797,11 +2797,11 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch const char* varX = hist.FindMember("varX")->value.GetString(); LOG(debug) << "varX: " << varX; - double xmin = (hist.HasMember("xmin") ? hist.FindMember("xmin")->value.GetDouble() : 0.0); - LOG(debug) << "xmin: " << xmin; + double xmin = (hist.HasMember("xmin.data()") ? hist.FindMember("xmin.data()")->value.GetDouble() : 0.0); + LOG(debug) << "xmin.data(): " << xmin.data(); - double xmax = (hist.HasMember("xmax") ? hist.FindMember("xmax")->value.GetDouble() : 0.0); - LOG(debug) << "xmax: " << xmax; + double xmax = (hist.HasMember("xmax.data()") ? hist.FindMember("xmax.data()")->value.GetDouble() : 0.0); + LOG(debug) << "xmax.data(): " << xmax.data(); std::vector xbinsVec; if (hist.HasMember("xbins")) { @@ -2878,7 +2878,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch if (isConstantBinning) { for (auto histClass : histClasses) { hm->AddHistogram(histClass, histName, title, isProfile, - nXbins, xmin, xmax, VarManager::fgVarNamesMap[varX], + nXbins, xmin.data(), xmax.data(), VarManager::fgVarNamesMap[varX], nYbins, ymin, ymax, VarManager::fgVarNamesMap[varY], nZbins, zmin, zmax, VarManager::fgVarNamesMap[varZ], xLabels, yLabels, zLabels, From 7868b9f59b9bfca097ceae4f2ac20087afc7a2b8 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 11:02:10 +0200 Subject: [PATCH 05/11] readability-implicit-bool-conversion --- PWGDQ/Core/HistogramsLibrary.cxx | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index 5071fe77faa..cbaf091c93d 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -55,7 +55,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "TF_NMuons", "Number of muons per TF", false, 1000, 0.0, 5000.0, VarManager::kTFNMuons); hm->AddHistogram(histClass, "TF_NMFTs", "Number of MFT tracks per TF", false, 1000, 0.0, 200000.0, VarManager::kTFNMFTs); } - if (!groupStr.CompareTo("event")) { + if (groupStr.CompareTo("event") == 0) { if (!subGroupStr.Contains("generator") && !subGroupStr.Contains("pairing")) { hm->AddHistogram(histClass, "VtxZ", "Vtx Z", false, 60, -15.0, 15.0, VarManager::kVtxZ); hm->AddHistogram(histClass, "VtxZ_Run", "Vtx Z", true, 1, -0.5, 0.5, VarManager::kRunNo, 60, -15.0, 15.0, VarManager::kVtxZ, 1, 0, 1, VarManager::kNothing, "", "", "", VarManager::kNothing, VarManager::kNothing, false, true); @@ -628,7 +628,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } // end "event" - if (!groupStr.CompareTo("two-collisions")) { + if (groupStr.CompareTo("two-collisions") == 0) { hm->AddHistogram(histClass, "DeltaZ", "z_{1} - z_{2}", false, 400, -20., 20., VarManager::kTwoEvDeltaZ); hm->AddHistogram(histClass, "DeltaZ_Z1", "z_{1} - z_{2} vs z_{1}", false, 24, -12., 12., VarManager::kTwoEvPosZ1, 300, -15., 15., VarManager::kTwoEvDeltaZ); hm->AddHistogram(histClass, "DeltaR", "r_{1} - r_{2}", false, 200, -0.1, 0.1, VarManager::kTwoEvDeltaR); @@ -639,7 +639,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "NContrib1vs2", "n.contrib 1 vs 2", false, 100, 0.0, 100.0, VarManager::kTwoEvPVcontrib1, 100, 0.0, 100.0, VarManager::kTwoEvPVcontrib2); } - if (!groupStr.CompareTo("track")) { + if (groupStr.CompareTo("track") == 0) { hm->AddHistogram(histClass, "Pt", "p_{T} distribution", false, 2000, 0.0, 20.0, VarManager::kPt); hm->AddHistogram(histClass, "Eta", "#eta distribution", false, 500, -5.0, 5.0, VarManager::kEta); hm->AddHistogram(histClass, "Phi", "#varphi distribution", false, 500, -2. * o2::constants::math::PI, 2. * o2::constants::math::PI, VarManager::kPhi); @@ -1149,7 +1149,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } - if (!groupStr.CompareTo("mctruth_triple")) { + if (groupStr.CompareTo("mctruth_triple") == 0) { hm->AddHistogram(histClass, "Eta_Pt", "", false, 100, -2.0, 2.0, VarManager::kPairEta, 200, 0.0, 30.0, VarManager::kPairPt); hm->AddHistogram(histClass, "Eta_Pt_lepton1", "", false, 100, -2.0, 2.0, VarManager::kEta1, 200, 0.0, 30.0, VarManager::kPt1); hm->AddHistogram(histClass, "Eta_Pt_lepton2", "", false, 100, -2.0, 2.0, VarManager::kEta2, 200, 0.0, 30.0, VarManager::kPt2); @@ -1169,7 +1169,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "DeltaMass_Jpsi", "", false, 1500, 3, 4.5, (VarManager::kDeltaMass_jpsi)); hm->AddHistogram(histClass, "Rapidity", "", false, 400, -5.0, 5.0, VarManager::kRap); } - if (!groupStr.CompareTo("mctruth_pair")) { + if (groupStr.CompareTo("mctruth_pair") == 0) { hm->AddHistogram(histClass, "Mass_Pt", "", false, 500, 0.0, 15.0, VarManager::kMCMass, 40, 0.0, 20.0, VarManager::kMCPt); hm->AddHistogram(histClass, "Pt", "", false, 200, 0.0, 20.0, VarManager::kMCPt); hm->AddHistogram(histClass, "Pt_Dilepton", "", false, 200, 0.0, 20.0, VarManager::kPairPtDau); @@ -1195,7 +1195,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } } - if (!groupStr.CompareTo("mctruth_quad")) { + if (groupStr.CompareTo("mctruth_quad") == 0) { hm->AddHistogram(histClass, "hMass_defaultDileptonMass", "", false, 1000, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass); hm->AddHistogram(histClass, "hPt", "", false, 150, 0.0, 15.0, VarManager::kQuadPt); hm->AddHistogram(histClass, "hMass_defaultDileptonMass_Pt", "", false, 100, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass, 150, 0.0, 15.0, VarManager::kQuadPt); @@ -1207,7 +1207,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h 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); } - if (!groupStr.CompareTo("mctruth_track")) { + if (groupStr.CompareTo("mctruth_track") == 0) { hm->AddHistogram(histClass, "PtMC", "MC pT", false, 200, 0.0, 20.0, VarManager::kMCPt); hm->AddHistogram(histClass, "EtaMC", "MC #eta", false, 50, -5.0, 5.0, VarManager::kMCEta); hm->AddHistogram(histClass, "PhiMC", "MC #phi", false, 50, -6.3, 6.3, VarManager::kMCPhi); @@ -1221,7 +1221,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Weight", "", false, 50, 0.0, 5.0, VarManager::kMCParticleWeight); hm->AddHistogram(histClass, "MCImpPar_CentFT0CMC", "MC impact param vs MC Cent. FT0C", false, 20, 0.0, 20.0, VarManager::kMCEventImpParam, 100, 0.0, 100.0, VarManager::kMCEventCentrFT0C); } - if (!groupStr.CompareTo("mctruth_mult")) { + if (groupStr.CompareTo("mctruth_mult") == 0) { hm->AddHistogram(histClass, "PtMC_MultEta05", "MC pT vs mult |#eta| < 0.5", false, 200, 0.0, 20.0, VarManager::kMCPt, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta05); hm->AddHistogram(histClass, "PtMC_MultEta08", "MC pT vs mult |#eta| < 0.8", false, 200, 0.0, 20.0, VarManager::kMCPt, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta08); hm->AddHistogram(histClass, "PtMC_MultEta10", "MC pT vs mult |#eta| < 1.0", false, 200, 0.0, 20.0, VarManager::kMCPt, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta10); @@ -1230,7 +1230,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "EtaMC_MultEta10", "MC Eta vs mult |#eta| < 1.0", false, 40, -2.0, 2.0, VarManager::kMCEta, 150, 0.0, 150.0, VarManager::kMultMCNParticlesEta10); } - if (!groupStr.CompareTo("energy-correlator-gen")) { + if (groupStr.CompareTo("energy-correlator-gen") == 0) { std::array coschiBins; for (int i = 0; i < 26; i++) { coschiBins[i] = -1.0 + 2.0 * TMath::Power(0.04 * i, 2.0); @@ -1238,7 +1238,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Coschi", "", false, 25, coschiBins.data(), VarManager::kMCCosChi, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kMCWeight); } - if (!groupStr.CompareTo("polarization-pseudoproper-gen")) { + if (groupStr.CompareTo("polarization-pseudoproper-gen") == 0) { std::array varspTHE = {VarManager::kMCPt, VarManager::kMCCosThetaHE, VarManager::kMCVertexingTauxyProjected}; std::array varspTCS = {VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCVertexingTauxyProjected}; std::array varspTRM = {VarManager::kMCPt, VarManager::kMCCosThetaRM, VarManager::kMCVertexingTauxyProjected}; @@ -1249,7 +1249,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Pt_cosThetaCS_Tauxy", "", 3, varspTCS.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE); hm->AddHistogram(histClass, "Pt_cosThetaRM_Tauxy", "", 3, varspTRM.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE); } - if (!groupStr.CompareTo("pair")) { + if (groupStr.CompareTo("pair") == 0) { if (subGroupStr.Contains("cepf")) { hm->AddHistogram(histClass, "Mass", "", false, 300, 0.0, 12.0, VarManager::kMass); hm->AddHistogram(histClass, "Mass_Pt", "", false, 300, 0.0, 12.0, VarManager::kMass, 10, 0.0, 20.0, VarManager::kPt); @@ -2170,7 +2170,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } - if (!groupStr.CompareTo("dilepton-track")) { + if (groupStr.CompareTo("dilepton-track") == 0) { if (subGroupStr.Contains("mixedevent")) { // for mixed event hm->AddHistogram(histClass, "Mass_Pt", "", false, 40, 0.0, 20.0, VarManager::kPairMass, 40, 0.0, 20.0, VarManager::kPairPt); hm->AddHistogram(histClass, "Mass", "", false, 750, 0.0, 30.0, VarManager::kPairMass); @@ -2287,7 +2287,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } } - if (!groupStr.CompareTo("dilepton-charmhadron")) { + if (groupStr.CompareTo("dilepton-charmhadron") == 0) { if (subGroupStr.EqualTo("jpsitomumu")) { hm->AddHistogram(histClass, "hMassVsPtJPsi", "", false, 100, 0.f, 50.f, VarManager::kPt, 300, 2.f, 5.f, VarManager::kMass); hm->AddHistogram(histClass, "hRapVsPtJPsi", "", false, 100, 0.f, 50.f, VarManager::kPt, 50, -4.5f, -2.0f, VarManager::kRap); @@ -2316,7 +2316,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "hPhiVsPtVsBdtDmesonWithJPsi", "", false, 100, 0.f, 1.f, VarManager::kBdtCharmHadron, 100, 0.f, 50.f, VarManager::kPtCharmHadron, 180, 0., 2 * constants::math::PI, VarManager::kPhiCharmHadron); } } - if (!groupStr.CompareTo("dilepton-dihadron")) { + if (groupStr.CompareTo("dilepton-dihadron") == 0) { if (subGroupStr.Contains("xtojpsipipi") || subGroupStr.Contains("psi2stojpsipipi")) { hm->AddHistogram(histClass, "hMass_X3872", "", false, 1000, 3.0, 5.0, VarManager::kQuadMass); hm->AddHistogram(histClass, "hMass_defaultDileptonMass_X3872", "", false, 1000, 3.0, 5.0, VarManager::kQuadDefaultDileptonMass); @@ -2406,7 +2406,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "TauxyMC_Tauxy", "", false, 500, -0.01, 0.01, VarManager::kMCVertexingTauxy, 500, -0.01, 0.01, VarManager::kVertexingTauxy); hm->AddHistogram(histClass, "CosPointingAngleMC", "", false, 100, 0.0, 1.0, VarManager::kMCCosPointingAngle); } - if (!groupStr.CompareTo("dilepton-photon-mass")) { + if (groupStr.CompareTo("dilepton-photon-mass") == 0) { hm->AddHistogram(histClass, "Mass_Dilepton", "", false, 500, 0.0, 5.0, VarManager::kPairMassDau); hm->AddHistogram(histClass, "Mass_Photon", "", false, 500, 0.0, 0.1, VarManager::kMassDau); hm->AddHistogram(histClass, "Mass_Dilepton_Mass_Photon", "", false, 250, 0.0, 5.0, VarManager::kPairMassDau, 250, 0.0, 5.0, VarManager::kMassDau); @@ -2426,7 +2426,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Eta_Pt_lepton2", "", false, 100, -2.0, 2.0, VarManager::kEta2, 200, 0.0, 20.0, VarManager::kPt); } - if (!groupStr.CompareTo("photon")) { + if (groupStr.CompareTo("photon") == 0) { hm->AddHistogram(histClass, "Pt_Photon", "p_{T} distribution", false, 4500, 0.0, 4.5, VarManager::kPt); hm->AddHistogram(histClass, "Eta", "#eta distribution", false, 500, -5.0, 5.0, VarManager::kEta); hm->AddHistogram(histClass, "Eta_Pt", "", false, 100, -2.0, 2.0, VarManager::kEta, 200, 0.0, 20.0, VarManager::kPt); @@ -2437,7 +2437,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h } // specific group/subgroups for trigger - if (!groupStr.CompareTo("software-trigger")) { + if (groupStr.CompareTo("software-trigger") == 0) { if (subGroupStr.Contains("vtxpp")) { hm->AddHistogram(histClass, "VtxZ", "Vtx Z", false, 60, -15.0, 15.0, VarManager::kVtxZ); hm->AddHistogram(histClass, "VtxX", "Vtx X", false, 200, -0.1, 0.1, VarManager::kVtxX); From 6f0dac6580947898bd7acd77c13c0d14f0c8b580 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 11:07:33 +0200 Subject: [PATCH 06/11] readability-braces-around-statements --- PWGDQ/Core/HistogramsLibrary.cxx | 111 ++++++++++++++++++++----------- 1 file changed, 74 insertions(+), 37 deletions(-) diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index cbaf091c93d..36f88a90a39 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -745,20 +745,24 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h if (subGroupStr.Contains("tpcpid_fine")) { // fine binning for pIN: steps in 10 MeV/c from 0 to 1 GeV/c and 100 MeV/c up to 10 GeV/c std::array pIN_bins; - for (int i = 0; i <= 200; i++) + for (int i = 0; i <= 200; i++) { pIN_bins[i] = 0.01 * i; - for (int i = 1; i <= 80; i++) +} + for (int i = 1; i <= 80; i++) { pIN_bins[200 + i] = 2. + 0.1 * i; +} int nbins_pIN = static_cast(pIN_bins.size()) - 1; std::array TPCdEdx_bins; - for (int i = 0; i <= 200; i++) + for (int i = 0; i <= 200; i++) { TPCdEdx_bins[i] = i; +} int nbins_TPCdEdx = static_cast(TPCdEdx_bins.size()) - 1; std::array nSigma_bins; - for (int i = 0; i <= 100; i++) + for (int i = 0; i <= 100; i++) { nSigma_bins[i] = -5. + 0.1 * i; +} int nbins_nSigma = static_cast(nSigma_bins.size()) - 1; hm->AddHistogram(histClass, "TPCdedx_pIN", "TPC dE/dx vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_TPCdEdx, TPCdEdx_bins.data(), VarManager::kTPCsignal); @@ -819,8 +823,9 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h const int kNvarsPID = 4; const int kTPCnsigmaNbins = 70; std::array tpcNsigmaBinLims; - for (int i = 0; i <= kTPCnsigmaNbins; ++i) + for (int i = 0; i <= kTPCnsigmaNbins; ++i) { tpcNsigmaBinLims[i] = -7.0 + 0.2 * i; +} const int kPinEleNbins = 20; std::array pinEleBinLims = {0.1, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 6.0, 8.0, 10.0, 12.0, 16.0, 20.0}; @@ -830,8 +835,9 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h const int kTPCnClusterbins = 16; std::array tpcNclusterBinLims; - for (int i = 0; i <= kTPCnClusterbins; ++i) + for (int i = 0; i <= kTPCnClusterbins; ++i) { tpcNclusterBinLims[i] = 10 * i; +} std::array nSigBinLimits; nSigBinLimits[0] = TArrayD(kTPCnsigmaNbins + 1, tpcNsigmaBinLims.data()); @@ -877,20 +883,24 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h if (subGroupStr.Contains("tofpid_fine")) { // fine binning for pIN: steps in 10 MeV/c from 0 to 1 GeV/c and 100 MeV/c up to 10 GeV/c std::array pIN_bins; - for (int i = 0; i <= 200; i++) + for (int i = 0; i <= 200; i++) { pIN_bins[i] = 0.01 * i; - for (int i = 1; i <= 80; i++) +} + for (int i = 1; i <= 80; i++) { pIN_bins[200 + i] = 2. + 0.1 * i; +} int nbins_pIN = static_cast(pIN_bins.size()) - 1; std::array TOFbeta_bins; - for (int i = 0; i <= 240; i++) + for (int i = 0; i <= 240; i++) { TOFbeta_bins[i] = 0.005 * i; +} int nbins_TOFbeta = static_cast(TOFbeta_bins.size()) - 1; std::array nSigma_bins; - for (int i = 0; i <= 100; i++) + for (int i = 0; i <= 100; i++) { nSigma_bins[i] = -5. + 0.1 * i; +} int nbins_nSigma = static_cast(nSigma_bins.size()) - 1; hm->AddHistogram(histClass, "TOFbeta_pIN", "TOF #beta vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_TOFbeta, TOFbeta_bins.data(), VarManager::kTOFbeta); @@ -910,19 +920,24 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h const int kNvarsPID = 3; const int kNbins_pIN = 169; std::array pIN_bins; - for (int i = 0; i <= 140; i++) + for (int i = 0; i <= 140; i++) { pIN_bins[i] = 0.01 * i + 0.1; - for (int i = 1; i <= 15; i++) +} + for (int i = 1; i <= 15; i++) { pIN_bins[140 + i] = 1.5 + 0.1 * i; - for (int i = 1; i <= 14; i++) +} + for (int i = 1; i <= 14; i++) { pIN_bins[155 + i] = 3. + 0.5 * i; +} const int kNbins_pINmore = 135; std::array pIN_binsmore; - for (int i = 0; i <= 120; i++) + for (int i = 0; i <= 120; i++) { pIN_binsmore[i] = 0.01 * i + 0.3; - for (int i = 1; i <= 10; i++) +} + for (int i = 1; i <= 10; i++) { pIN_binsmore[120 + i] = 1.5 + 0.2 * i; +} pIN_binsmore[131] = 4.; pIN_binsmore[132] = 5.; pIN_binsmore[133] = 6.; @@ -931,28 +946,33 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h const int kNbins_nSigma = 100; std::array nSigma_bins; - for (int i = 0; i <= kNbins_nSigma; i++) + for (int i = 0; i <= kNbins_nSigma; i++) { nSigma_bins[i] = -5. + 0.1 * i; +} const int kNbins_nSigmamore = 50; std::array nSigma_binsmore; - for (int i = 0; i <= kNbins_nSigmamore; i++) + for (int i = 0; i <= kNbins_nSigmamore; i++) { nSigma_binsmore[i] = -5. + 0.2 * i; +} const int kNbins_nSigmagrob = 24; std::array nSigma_binsgrob; - for (int i = 0; i <= kNbins_nSigmagrob; i++) + for (int i = 0; i <= kNbins_nSigmagrob; i++) { nSigma_binsgrob[i] = -6. + 0.5 * i; +} const int kNbins_TOFbeta = 120; std::array TOFbeta_bins; - for (int i = 0; i <= kNbins_TOFbeta; i++) + for (int i = 0; i <= kNbins_TOFbeta; i++) { TOFbeta_bins[i] = 0.01 * i; +} const int kNbins_TPCdEdx = 140; std::array TPCdEdx_bins; - for (int i = 0; i <= kNbins_TPCdEdx; i++) + for (int i = 0; i <= kNbins_TPCdEdx; i++) { TPCdEdx_bins[i] = i + 20; +} std::array nSigmaBinLimits; nSigmaBinLimits[0] = TArrayD(kNbins_pIN + 1, pIN_bins.data()); @@ -1544,8 +1564,9 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h const int kTauNBins = 500; std::array TauBinLims; - for (int i = 0; i <= kTauNBins; ++i) + for (int i = 0; i <= kTauNBins; ++i) { TauBinLims[i] = -0.3 + (0.0015 * i); +} std::array nCutsBinLimits; nCutsBinLimits[0] = TArrayD(kInvMassNbins + 1, InvMassBinLims.data()); @@ -2059,19 +2080,23 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h // every 100 MeV from 0.2 to 1. GeV/c2 // every 500 GeV from 1 to 5 GeV/c2 std::array mee_bins; - for (int i = 0; i <= 20; i++) + for (int i = 0; i <= 20; i++) { mee_bins[i] = 0.01 * i; - for (int i = 1; i <= 8; i++) +} + for (int i = 1; i <= 8; i++) { mee_bins[20 + i] = 0.2 + 0.1 * i; - for (int i = 1; i <= 8; i++) +} + for (int i = 1; i <= 8; i++) { mee_bins[28 + i] = 1. + 0.5 * i; +} int nbins_mee = static_cast(mee_bins.size()) - 1; // binning for ptee at large scales: // every 0.2 GeV/c from 0 to 10 GeV/c std::array ptee_bins; - for (int i = 0; i <= 50; i++) + for (int i = 0; i <= 50; i++) { ptee_bins[i] = 0.2 * i; +} int nbins_ptee = static_cast(ptee_bins.size()) - 1; // binning for phiv: @@ -2103,24 +2128,30 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h // every 10 MeV from 2.7 to 3.2 GeV/c2 // every 50 MeV from 3.2 to 12 GeV/c2 std::array mee_bins; - for (int i = 0; i <= 110; i++) + for (int i = 0; i <= 110; i++) { mee_bins[i] = 0.01 * i; - for (int i = 1; i <= 32; i++) +} + for (int i = 1; i <= 32; i++) { mee_bins[110 + i] = 1.1 + 0.05 * i; - for (int i = 1; i <= 50; i++) +} + for (int i = 1; i <= 50; i++) { mee_bins[142 + i] = 2.7 + 0.01 * i; - for (int i = 1; i <= 176; i++) +} + for (int i = 1; i <= 176; i++) { mee_bins[192 + i] = 3.2 + 0.05 * i; +} int nbins_mee = static_cast(mee_bins.size()) - 1; // binning for ptee at large scales: // every 0.1 GeV/c from 0 to 10 GeV/c // every 0.5 GeV/c from 10 to 30 GeV/c std::array ptee_bins; - for (int i = 0; i <= 100; i++) + for (int i = 0; i <= 100; i++) { ptee_bins[i] = 0.1 * i; - for (int i = 1; i <= 100; i++) +} + for (int i = 1; i <= 100; i++) { ptee_bins[100 + i] = 10 + 0.2 * i; +} int nbins_ptee = static_cast(ptee_bins.size()) - 1; // binning for dca at large scales: @@ -2128,12 +2159,15 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h // every 0.5 sigma from 5 to 10 sigma // every 1.0 sigma from 10 to 40 sigma std::array dca_bins; - for (int i = 0; i <= 50; i++) + for (int i = 0; i <= 50; i++) { dca_bins[i] = 0.1 * i; - for (int i = 1; i <= 10; i++) +} + for (int i = 1; i <= 10; i++) { dca_bins[50 + i] = 5 + 0.5 * i; - for (int i = 1; i <= 30; i++) +} + for (int i = 1; i <= 30; i++) { dca_bins[60 + i] = 10 + 1 * i; +} int nbins_dca = static_cast(dca_bins.size()) - 1; hm->AddHistogram(histClass, "Mass_QuadDCAsigXY", "", false, nbins_mee, mee_bins.data(), VarManager::kMass, nbins_dca, dca_bins.data(), VarManager::kQuadDCAsigXY); @@ -2218,8 +2252,9 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h const int kNvarsTripletCuts = 4; const int kInvMassNbins = 100; std::array InvMassBinLims; - for (int i = 0; i <= kInvMassNbins; ++i) + for (int i = 0; i <= kInvMassNbins; ++i) { InvMassBinLims[i] = 4.0 + 0.02 * i; +} const int kPtNbins = 6; std::array PtBinLims = {0., 2., 4., 6., 8., 10., 20.}; @@ -2245,13 +2280,15 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h if (subGroupStr.Contains("dilepton-hadron-array-correlation")) { const int kInvMassBins = 500; std::array InvMassBinLims; - for (int i = 0; i <= kInvMassBins; i++) + for (int i = 0; i <= kInvMassBins; i++) { InvMassBinLims[i] = 0 + i * 0.01; +} const int kDelEtaBins = 20; std::array DelEtaBinLims; - for (int i = 0; i <= kDelEtaBins; i++) + for (int i = 0; i <= kDelEtaBins; i++) { DelEtaBinLims[i] = -2 + i * 0.2; +} const int kDelPhiBins = 26; std::array DelPhiBinLims = {-1.69647, -1.44513, -1.19381, -0.94248, -0.69115, -0.43982, -0.18850, 0.06283, 0.31416, 0.56549, 0.81681, 1.06814, 1.31947, 1.57080, 1.82212, 2.07345, 2.32478, 2.57611, 2.82743, 3.07876, 3.33009, 3.58142, 3.83274, 4.08407, 4.33540, 4.58673, 4.83806}; From 2466ebc26a619810f50a723911928642dbf789cb Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 11:14:59 +0200 Subject: [PATCH 07/11] modernize-use-auto --- PWGDQ/Core/MCSignalLibrary.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGDQ/Core/MCSignalLibrary.cxx b/PWGDQ/Core/MCSignalLibrary.cxx index e41ed34ed03..e62ef325b0b 100644 --- a/PWGDQ/Core/MCSignalLibrary.cxx +++ b/PWGDQ/Core/MCSignalLibrary.cxx @@ -37,7 +37,7 @@ using namespace o2::constants::physics; MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) { std::string nameStr = name; - MCSignal* signal; + MCSignal* signal = nullptr; // 1-prong signals if (!nameStr.compare("alicePrimary")) { MCProng prong(1); // 1-generation prong @@ -2136,7 +2136,7 @@ std::vector o2::aod::dqmcsignals::GetMCSignalsFromJSON(const char* js } // Create the signal and add it to the output vector - MCSignal* mcSignal = new MCSignal(sigName, title, prongs, commonAncestors, excludeCommonAncestor); + auto* mcSignal = new MCSignal(sigName, title, prongs, commonAncestors, excludeCommonAncestor); LOG(debug) << "MCSignal defined, adding to the output vector"; mcSignal->PrintConfig(); signals.push_back(mcSignal); @@ -2422,7 +2422,7 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa } // Calling the MCProng constructor - MCProng* prong = new MCProng(n, pdgs, checkBothCharges, excludePDG, sBitsVec, sBitsExcludeVec, useANDonSourceBitMap, + auto* prong = new MCProng(n, pdgs, checkBothCharges, excludePDG, sBitsVec, sBitsExcludeVec, useANDonSourceBitMap, checkGenerationsInTime, checkIfPDGInHistory, excludePDGInHistory); // Print the configuration prong->Print(); From 4b0b40fc7f7fd16641a2cb6283b6f92f6464521e Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 11:17:49 +0200 Subject: [PATCH 08/11] readability-string-compare --- PWGDQ/Core/MCSignalLibrary.cxx | 628 ++++++++++++++++----------------- 1 file changed, 314 insertions(+), 314 deletions(-) diff --git a/PWGDQ/Core/MCSignalLibrary.cxx b/PWGDQ/Core/MCSignalLibrary.cxx index e62ef325b0b..33aa1bafe5a 100644 --- a/PWGDQ/Core/MCSignalLibrary.cxx +++ b/PWGDQ/Core/MCSignalLibrary.cxx @@ -39,403 +39,403 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) std::string nameStr = name; MCSignal* signal = nullptr; // 1-prong signals - if (!nameStr.compare("alicePrimary")) { + if (nameStr == "alicePrimary") { MCProng prong(1); // 1-generation prong prong.SetSourceBit(0, MCProng::kPhysicalPrimary); // set source to be ALICE primary particles signal = new MCSignal(1, name, "ALICE primaries"); // define a signal with one prong signal->AddProng(prong); // add the previously defined prong to the signal return signal; } - if (!nameStr.compare("electron")) { + if (nameStr == "electron") { MCProng prong(1, {11}, {true}, {false}, {0}, {0}, {false}); // define 1-generation prong using the full constructor signal = new MCSignal(name, "Inclusive electrons", {prong}, {-1}); // define the signal using the full constructor return signal; } - if (!nameStr.compare("electronPrimary")) { + if (nameStr == "electronPrimary") { MCProng prong(1, {11}, {true}, {false}, {0}, {0}, {false}); // define 1-generation prong using the full constructor prong.SetSourceBit(0, MCProng::kPhysicalPrimary); // set source to be ALICE primary particles signal = new MCSignal(name, "Primary electrons", {prong}, {-1}); // define the signal using the full constructor return signal; } - if (!nameStr.compare("pionPrimary")) { + if (nameStr == "pionPrimary") { MCProng prong(1, {211}, {true}, {false}, {0}, {0}, {false}); // define 1-generation prong using the full constructor prong.SetSourceBit(0, MCProng::kPhysicalPrimary); // set source to be ALICE primary particles signal = new MCSignal(name, "Primary pions", {prong}, {-1}); // define the signal using the full constructor return signal; } - if (!nameStr.compare("pionPrimaryFromHc")) { + if (nameStr == "pionPrimaryFromHc") { MCProng prong(2, {211, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); signal = new MCSignal(name, "Primary pions from open charmed hadron decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("pionPrimaryFromHb")) { + if (nameStr == "pionPrimaryFromHb") { MCProng prong(2, {211, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); signal = new MCSignal(name, "Primary pions from open beauty hadron decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("photon")) { + if (nameStr == "photon") { MCProng prong(1, {22}, {true}, {false}, {0}, {0}, {false}); // define 1-generation prong using the full constructor signal = new MCSignal(name, "Photon", {prong}, {-1}); // define the signal using the full constructor return signal; } - if (!nameStr.compare("muonPrimary")) { + if (nameStr == "muonPrimary") { MCProng prong(1, {13}, {true}, {false}, {0}, {0}, {false}); // define 1-generation prong using the full constructor prong.SetSourceBit(0, MCProng::kPhysicalPrimary); // set source to be ALICE primary particles signal = new MCSignal(name, "Primary Muons", {prong}, {-1}); // define the signal using the full constructor return signal; } - if (!nameStr.compare("kaonFromPhi")) { + if (nameStr == "kaonFromPhi") { MCProng prong(2, {321, 333}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); // define 2-generation prong using the full constructor signal = new MCSignal(name, "Kaons from phi-mesons", {prong}, {-1}); // define the signal using the full constructor return signal; } - if (!nameStr.compare("kaonPrimary")) { + if (nameStr == "kaonPrimary") { MCProng prong(1, {321}, {true}, {false}, {0}, {0}, {false}); // define 1-generation prong using the full constructor prong.SetSourceBit(0, MCProng::kPhysicalPrimary); // set source to be ALICE primary particles signal = new MCSignal(name, "Primary Kaons", {prong}, {-1}); // define the signal using the full constructor return signal; } - if (!nameStr.compare("Lambda0Baryon")) { + if (nameStr == "Lambda0Baryon") { MCProng prong(1, {3122}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Lambda0 Baryon", {prong}, {-1}); return signal; } - if (!nameStr.compare("SigmaPlusBaryon")) { + if (nameStr == "SigmaPlusBaryon") { MCProng prong(1, {3222}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "SigmaPlus Baryon", {prong}, {-1}); return signal; } - if (!nameStr.compare("proton")) { + if (nameStr == "proton") { MCProng prong(1, {2212}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "proton", {prong}, {-1}); return signal; } - if (!nameStr.compare("protonPrimary")) { + if (nameStr == "protonPrimary") { MCProng prong(1, {2212}, {true}, {false}, {0}, {0}, {false}); // define 1-generation prong using the full constructor prong.SetSourceBit(0, MCProng::kPhysicalPrimary); // set source to be ALICE primary particles signal = new MCSignal(name, "Primary Proton", {prong}, {-1}); // define the signal using the full constructor return signal; } - if (!nameStr.compare("protonFromTransport")) { + if (nameStr == "protonFromTransport") { MCProng prong(1, {2212}, {true}, {false}, {0}, {0}, {false}); prong.SetSourceBit(0, MCProng::kProducedInTransport); signal = new MCSignal(name, "ProtonFromTransport", {prong}, {-1}); return signal; } - if (!nameStr.compare("protonFromLambda0")) { + if (nameStr == "protonFromLambda0") { MCProng prong(2, {2212, 3122}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Proton from Lambda0 decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("protonFromSigmaPlus")) { + if (nameStr == "protonFromSigmaPlus") { MCProng prong(2, {2212, 3222}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Proton from Sigma+ decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("phiMeson")) { + if (nameStr == "phiMeson") { MCProng prong(1, {333}, {true}, {false}, {0}, {0}, {false}); // define 1-generation prong using the full constructor signal = new MCSignal(name, "phi meson", {prong}, {-1}); // define the signal using the full constructor return signal; } - if (!nameStr.compare("muon")) { + if (nameStr == "muon") { MCProng prong(1, {13}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive muons", {prong}, {-1}); return signal; } - if (!nameStr.compare("electronNOTfromTransport")) { + if (nameStr == "electronNOTfromTransport") { MCProng prong(1); prong.SetPDGcode(0, 11, true); prong.SetSourceBit(0, MCProng::kProducedInTransport, true); // exclude particles produces in transport signal = new MCSignal(name, "Electrons which are not produced during transport in detector", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromNonpromptJpsi")) { + if (nameStr == "eFromNonpromptJpsi") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); signal = new MCSignal(name, "Electrons from non-prompt jpsi decays with beauty in decay chain", {prong}, {-1}); return signal; } - if (!nameStr.compare("ePrimaryFromPromptJpsi")) { + if (nameStr == "ePrimaryFromPromptJpsi") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from prompt jpsi decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("ePrimaryFromNonpromptJpsi")) { + if (nameStr == "ePrimaryFromNonpromptJpsi") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from non-prompt jpsi decays with beauty in decay chain", {prong}, {-1}); return signal; } - if (!nameStr.compare("Jpsi")) { + if (nameStr == "Jpsi") { MCProng prong(1, {443}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive jpsi", {prong}, {-1}); return signal; } - if (!nameStr.compare("Helium3")) { + if (nameStr == "Helium3") { MCProng prong(1, {1000020030}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Helium3", {prong}, {-1}); return signal; } - if (!nameStr.compare("Helium3Primary")) { + if (nameStr == "Helium3Primary") { MCProng prong(1, {1000020030}, {true}, {false}, {0}, {0}, {false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Helium3Primary", {prong}, {-1}); return signal; } - if (!nameStr.compare("Helium3FromTransport")) { + if (nameStr == "Helium3FromTransport") { MCProng prong(1, {1000020030}, {true}, {false}, {0}, {0}, {false}); prong.SetSourceBit(0, MCProng::kProducedInTransport); signal = new MCSignal(name, "Helium3FromTransport", {prong}, {-1}); return signal; } - if (!nameStr.compare("promptJpsi")) { + if (nameStr == "promptJpsi") { MCProng prong(1, {443}, {true}, {false}, {0}, {0}, {false}, false, {503}, {true}); signal = new MCSignal(name, "Prompt jpsi (not from beauty)", {prong}, {-1}); return signal; } - if (!nameStr.compare("nonPromptJpsi")) { + if (nameStr == "nonPromptJpsi") { MCProng prong(1, {443}, {true}, {false}, {0}, {0}, {false}, false, {503}, {false}); signal = new MCSignal(name, "Non-prompt jpsi (from beauty)", {prong}, {-1}); return signal; } - if (!nameStr.compare("nonPromptJpsiFromBeauty")) { + if (nameStr == "nonPromptJpsiFromBeauty") { MCProng prong(2, {503, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); signal = new MCSignal(name, "Non-prompt jpsi directly from beauty", {prong}, {-1}); return signal; } - if (!nameStr.compare("nonPromptJpsiNotDirectlyFromBeauty")) { + if (nameStr == "nonPromptJpsiNotDirectlyFromBeauty") { MCProng prong(2, {443, 503}, {true, true}, {false, true}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); signal = new MCSignal(name, "Non-prompt jpsi from other but with beauty in decay chain", {prong}, {-1}); return signal; } - if (!nameStr.compare("AnythingDecayToJpsi")) { + if (nameStr == "AnythingDecayToJpsi") { MCProng prong(2, {MCProng::kPDGCodeNotAssigned, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); signal = new MCSignal(name, "Decay of anything into J/psi", {prong}, {-1}); return signal; } - if (!nameStr.compare("eeFromNonpromptPsi2S")) { + if (nameStr == "eeFromNonpromptPsi2S") { MCProng prong(2, {11, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); signal = new MCSignal(name, "ee pairs from non-prompt psi2s decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromPromptPsi2S")) { + if (nameStr == "eeFromPromptPsi2S") { MCProng prong(2, {11, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); signal = new MCSignal(name, "ee pairs from prompt psi2s decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eFromNonpromptPsi2S")) { + if (nameStr == "eFromNonpromptPsi2S") { MCProng prong(2, {11, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); signal = new MCSignal(name, "Electrons from beauty psi2s decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromPromptPsi2S")) { + if (nameStr == "eFromPromptPsi2S") { MCProng prong(2, {11, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); signal = new MCSignal(name, "Electrons from prompt psi2s decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("Psi2S")) { + if (nameStr == "Psi2S") { MCProng prong(1, {100443}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive psi2s", {prong}, {-1}); return signal; } - if (!nameStr.compare("nonPromptPsi2S")) { + if (nameStr == "nonPromptPsi2S") { MCProng prong(1, {100443}, {true}, {false}, {0}, {0}, {false}, false, {503}, {false}); signal = new MCSignal(name, "Non-prompt psi2s", {prong}, {-1}); return signal; } - if (!nameStr.compare("promptPsi2S")) { + if (nameStr == "promptPsi2S") { MCProng prong(1, {100443}, {true}, {false}, {0}, {0}, {false}, false, {503}, {true}); signal = new MCSignal(name, "Prompt psi2s (not from beauty)", {prong}, {-1}); return signal; } - if (!nameStr.compare("Chic0")) { + if (nameStr == "Chic0") { MCProng prong(1, {10441}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive Chic0", {prong}, {-1}); return signal; } - if (!nameStr.compare("Chic1")) { + if (nameStr == "Chic1") { MCProng prong(1, {20443}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive Chic1", {prong}, {-1}); return signal; } - if (!nameStr.compare("Chic2")) { + if (nameStr == "Chic2") { MCProng prong(1, {445}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive Chic2", {prong}, {-1}); return signal; } - if (!nameStr.compare("Chic012")) { + if (nameStr == "Chic012") { MCProng prong(1, {904}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive Chic0, Chic1 and Chic2", {prong}, {-1}); return signal; } - if (!nameStr.compare("Upsilon1S")) { + if (nameStr == "Upsilon1S") { MCProng prong(1, {553}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive Upsilon1S", {prong}, {-1}); return signal; } - if (!nameStr.compare("Upsilon2S")) { + if (nameStr == "Upsilon2S") { MCProng prong(1, {100553}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive Upsilon2S", {prong}, {-1}); return signal; } - if (!nameStr.compare("Upsilon3S")) { + if (nameStr == "Upsilon3S") { MCProng prong(1, {200553}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Inclusive Upsilon3S", {prong}, {-1}); return signal; } - if (!nameStr.compare("allBeautyHadrons")) { + if (nameStr == "allBeautyHadrons") { MCProng prong(1, {503}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "All beauty hadrons", {prong}, {-1}); return signal; } - if (!nameStr.compare("allBeautyHadronsFS")) { + if (nameStr == "allBeautyHadronsFS") { MCProng prong(1, {503}, {true}, {false}, {0}, {0}, {false}); prong.SetSourceBit(0, MCProng::kHEPMCFinalState); signal = new MCSignal(name, "All beauty hadrons", {prong}, {-1}); return signal; } - if (!nameStr.compare("allOpenBeautyHadrons")) { + if (nameStr == "allOpenBeautyHadrons") { MCProng prong(1, {502}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "All open beauty hadrons", {prong}, {-1}); return signal; } - if (!nameStr.compare("allOpenBeautyHadronsFS")) { + if (nameStr == "allOpenBeautyHadronsFS") { MCProng prong(1, {502}, {true}, {false}, {0}, {0}, {false}); prong.SetSourceBit(0, MCProng::kHEPMCFinalState); signal = new MCSignal(name, "All open beauty hadrons", {prong}, {-1}); return signal; } - if (!nameStr.compare("Bc")) { + if (nameStr == "Bc") { MCProng prong(1, {541}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Bc", {prong}, {-1}); return signal; } - if (!nameStr.compare("mumuFromJpsiFromBc")) { + if (nameStr == "mumuFromJpsiFromBc") { MCProng prong(3, {13, 443, 541}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Muon pair from jpsi from Bc decays", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("muFromBc")) { + if (nameStr == "muFromBc") { MCProng prong(2, {13, 541}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Muon from Bc decays", {prong}, {1}); return signal; } - if (!nameStr.compare("mumumuFromBc")) { + if (nameStr == "mumumuFromBc") { MCProng prongMuFromJpsi(3, {13, 443, 541}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongMuFromBc(2, {13, 541}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Trimuon from Bc decays", {prongMuFromJpsi, prongMuFromJpsi, prongMuFromBc}, {2, 2, 1}); return signal; } - if (!nameStr.compare("everythingFromBeauty")) { + if (nameStr == "everythingFromBeauty") { MCProng prong(2, {0, 503}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Everything from beauty", {prong}, {-1}); return signal; } - if (!nameStr.compare("everythingFromBeautyFS")) { + if (nameStr == "everythingFromBeautyFS") { MCProng prong(2, {0, 503}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(1, MCProng::kHEPMCFinalState); signal = new MCSignal(name, "Everything from beauty", {prong}, {-1}); return signal; } - if (!nameStr.compare("everythingFromEverythingFromBeauty")) { + if (nameStr == "everythingFromEverythingFromBeauty") { MCProng prong(3, {0, 0, 503}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Everything from everything from beauty", {prong}, {-1}); return signal; } - if (!nameStr.compare("everythingFromEverythingFromBeautyFS")) { + if (nameStr == "everythingFromEverythingFromBeautyFS") { MCProng prong(3, {0, 0, 503}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSourceBit(2, MCProng::kHEPMCFinalState); signal = new MCSignal(name, "Everything from everything from beauty", {prong}, {-1}); return signal; } - if (!nameStr.compare("allCharmHadrons")) { + if (nameStr == "allCharmHadrons") { MCProng prong(1, {403}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "All charm hadrons", {prong}, {-1}); return signal; } - if (!nameStr.compare("allOpenCharmHadrons")) { + if (nameStr == "allOpenCharmHadrons") { MCProng prong(1, {402}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "All open charm hadrons", {prong}, {-1}); return signal; } - if (!nameStr.compare("allCharmFromBeauty")) { + if (nameStr == "allCharmFromBeauty") { MCProng prong(2, {403, 503}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "All charm hadrons from beauty", {prong}, {-1}); return signal; } - if (!nameStr.compare("allPromptCharm")) { + if (nameStr == "allPromptCharm") { MCProng prong(2, {403, 503}, {true, true}, {false, true}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "All prompt charm hadrons (not from beauty)", {prong}, {-1}); return signal; } - if (!nameStr.compare("Pi0DecayToe")) { + if (nameStr == "Pi0DecayToe") { MCProng prong(2, {111, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Pi0 decays into an electron", {prong}, {-1}); return signal; } - if (!nameStr.compare("Pi0DecayTog")) { + if (nameStr == "Pi0DecayTog") { MCProng prong(2, {111, 22}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Pi0 decays into an gamma", {prong}, {1}); return signal; } - if (!nameStr.compare("Pi0DecayTogg")) { + if (nameStr == "Pi0DecayTogg") { MCProng prong(2, {111, 22}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Pi0 decays into an gamma, gamma", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("PromptPi0DecayToe")) { + if (nameStr == "PromptPi0DecayToe") { MCProng prong(2, {111, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, true, {403, 503}, {true, true}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Pi0 decays into an electron", {prong}, {-1}); return signal; } - if (!nameStr.compare("Pi0")) { + if (nameStr == "Pi0") { MCProng prong(1, {111}, {true}, {false}, {0}, {0}, {false}); // prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); // set source to be ALICE primary particles signal = new MCSignal(name, "Pi0", {prong}, {-1}); return signal; } - if (!nameStr.compare("LMeeLFQ")) { + if (nameStr == "LMeeLFQ") { MCProng prong(1, {900}, {true}, {false}, {0}, {0}, {false}); // prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); // set source to be ALICE primary particles signal = new MCSignal(name, "light flavor mesons + quarkonia", {prong}, {-1}); // pi0,eta,eta',rho,omega,phi,jpsi,psi2s return signal; } - if (!nameStr.compare("LMeeLF")) { + if (nameStr == "LMeeLF") { MCProng prong(1, {901}, {true}, {false}, {0}, {0}, {false}); // prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); // set source to be ALICE primary particles signal = new MCSignal(name, "ligh flavor mesons", {prong}, {-1}); // pi0,eta,eta',rho,omega,phi return signal; } - if (!nameStr.compare("PromptJpsiDecayToe")) { + if (nameStr == "PromptJpsiDecayToe") { MCProng prong(2, {443, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, true, {503}, {true}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Prompt jpsi (not from beauty) decay to electron", {prong}, {-1}); return signal; } - if (!nameStr.compare("electronFromDs")) { + if (nameStr == "electronFromDs") { MCProng prong(2, {11, 431}, {true, true}, {false, false}, {0, 0}, {0, 0}, {true, true}); signal = new MCSignal(name, "Electrons from Ds decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("dsMeson")) { + if (nameStr == "dsMeson") { MCProng prong(1, {431}, {true}, {false}, {0}, {0}, {true}); signal = new MCSignal(name, "Ds mesons", {prong}, {-1}); return signal; } - if (!nameStr.compare("electronFromPC")) { + if (nameStr == "electronFromPC") { MCProng prong(2, {11, 22}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "electron from a photon conversion", {prong}, {-1}); return signal; } - if (!nameStr.compare("PowhegDYMuon1")) { + if (nameStr == "PowhegDYMuon1") { MCProng prong(1, {13}, {true}, {false}, {0}, {0}, {false}); // selecting muons prong.SetSourceBit(0, MCProng::kIsPowhegDYMuon); // set source to be Muon from POWHEG signal = new MCSignal(name, "POWHEG Muon singles", {prong}, {-1}); // define a signal with 1-prong @@ -443,23 +443,23 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // 2-prong signals - if (!nameStr.compare("dielectron")) { + if (nameStr == "dielectron") { MCProng prong(1, {11}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Electron pair", {prong, prong}, {-1, -1}); return signal; } - if (!nameStr.compare("dimuon")) { + if (nameStr == "dimuon") { MCProng prong(1, {13}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Muon pair", {prong, prong}, {-1, -1}); return signal; } - if (!nameStr.compare("electronMuonPair")) { + if (nameStr == "electronMuonPair") { MCProng electron(1, {11}, {true}, {false}, {0}, {0}, {false}); MCProng muon(1, {13}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Electron-muon pair", {electron, muon}, {-1, -1}); return signal; } - if (!nameStr.compare("emuFromOpenHFhadron")) { + if (nameStr == "emuFromOpenHFhadron") { MCProng electron(2, {11, 902}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); electron.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng muon(2, {13, 902}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); @@ -467,7 +467,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) signal = new MCSignal(name, "e and mu each from an open charm or beauty hadron decay", {electron, muon}, {-1, -1}); return signal; } - if (!nameStr.compare("emuFromOpenCharmHadron")) { + if (nameStr == "emuFromOpenCharmHadron") { MCProng electron(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); electron.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng muon(2, {13, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); @@ -475,7 +475,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) signal = new MCSignal(name, "e and mu each from an open charm hadron decay", {electron, muon}, {-1, -1}); return signal; } - if (!nameStr.compare("emuFromOpenBeautyHadron")) { + if (nameStr == "emuFromOpenBeautyHadron") { MCProng electron(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); electron.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng muon(2, {13, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); @@ -483,22 +483,22 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) signal = new MCSignal(name, "e and mu each from an open beauty hadron decay", {electron, muon}, {-1, -1}); return signal; } - if (!nameStr.compare("dielectronFromPC")) { + if (nameStr == "dielectronFromPC") { MCProng prong(2, {11, 22}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "dielectron from a photon conversion", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("dielectronFromAllPC")) { + if (nameStr == "dielectronFromAllPC") { MCProng prong(2, {11, 22}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "dielectron from a photon conversion", {prong, prong}, {-1, -1}); return signal; } - if (!nameStr.compare("dielectronPCPi0")) { + if (nameStr == "dielectronPCPi0") { MCProng prong(3, {11, 22, 111}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "dielectron from a photon conversion from a pi0", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("PowhegDYMuon2")) { + if (nameStr == "PowhegDYMuon2") { MCProng prong(1, {13}, {true}, {false}, {0}, {0}, {false}); // selecting muons prong.SetSourceBit(0, MCProng::kIsPowhegDYMuon); // set source to be Muon from POWHEG signal = new MCSignal(name, "POWHEG Muon pair", {prong, prong}, {-1, -1}); // define a signal with 2-prong @@ -507,376 +507,376 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) // LMEE single signals // electron signals with mother X: e from mother X - if (!nameStr.compare("eFromAnything")) { + if (nameStr == "eFromAnything") { MCProng prong(2, {11, MCProng::kPDGCodeNotAssigned}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from any mother", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromPhoton")) { + if (nameStr == "eFromPhoton") { MCProng prong(2, {11, 22}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from photon conversion", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromPi0")) { + if (nameStr == "eFromPi0") { MCProng prong(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from pi0 decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("ePrimaryFromPromptPi0")) { + if (nameStr == "ePrimaryFromPromptPi0") { MCProng prong(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502, 402}, {true, true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from prompt pi0 decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromEta")) { + if (nameStr == "eFromEta") { MCProng prong(2, {11, 221}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from eta decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromEtaPrime")) { + if (nameStr == "eFromEtaPrime") { MCProng prong(2, {11, 331}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from eta' decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromRho")) { + if (nameStr == "eFromRho") { MCProng prong(2, {11, 113}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from rho decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromOmega")) { + if (nameStr == "eFromOmega") { MCProng prong(2, {11, 223}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from omega decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromPhi")) { + if (nameStr == "eFromPhi") { MCProng prong(2, {11, 333}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from phi decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromJpsi")) { + if (nameStr == "eFromJpsi") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from jpsi decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("anythingFromJpsi")) { + if (nameStr == "anythingFromJpsi") { MCProng prong(2, {MCProng::kPDGCodeNotAssigned, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Anything from jpsi decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromPromptJpsi")) { + if (nameStr == "eFromPromptJpsi") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); signal = new MCSignal(name, "Electrons from jpsi decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromPsi2S")) { + if (nameStr == "eFromPsi2S") { MCProng prong(2, {11, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from psi2s decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromLMeeLF")) { + if (nameStr == "eFromLMeeLF") { MCProng prong(2, {11, 901}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from LF meson decays", {prong}, {-1}); // pi0,eta,eta',rho,omega,phi mesons return signal; } - if (!nameStr.compare("ePrimaryFromLMeeLF")) { + if (nameStr == "ePrimaryFromLMeeLF") { MCProng prong(2, {11, 901}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); // set source to be ALICE primary particles signal = new MCSignal(name, "Electrons from LF meson decays", {prong}, {-1}); // pi0,eta,eta',rho,omega,phi mesons return signal; } - if (!nameStr.compare("eFromLMeeLFQ")) { + if (nameStr == "eFromLMeeLFQ") { MCProng prong(2, {11, 900}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(false); // set direction to check generation in time (true) or back in time (false) signal = new MCSignal(name, "Electrons from LF meson + quarkonia decays", {prong}, {-1}); // pi0,eta,eta',rho,omega,phi,jpsi,psi2s mesons return signal; } - if (!nameStr.compare("ePrimaryFromLMeeLFQ")) { + if (nameStr == "ePrimaryFromLMeeLFQ") { MCProng prong(2, {11, 900}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); // set source to be ALICE primary particles prong.SetSignalInTime(false); // set direction to check generation in time (true) or back in time (false) signal = new MCSignal(name, "Electrons from LF meson + quarkonia decays", {prong}, {-1}); // pi0,eta,eta',rho,omega,phi,jpsi,psi2s mesons return signal; } - if (!nameStr.compare("eFromHc")) { + if (nameStr == "eFromHc") { MCProng prong(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from open charmed hadron decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromAnyHc")) { + if (nameStr == "eFromAnyHc") { MCProng prong(1, {11}, {true}, {false}, {0}, {0}, {false}, false, {402}, {false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); signal = new MCSignal(name, "Electrons from any open charm hadron decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromD0")) { + if (nameStr == "eFromD0") { MCProng prong(2, {11, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from D0 decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromChargedD")) { + if (nameStr == "eFromChargedD") { MCProng prong(2, {11, Pdg::kDPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from D+/- decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromDs")) { + if (nameStr == "eFromDs") { MCProng prong(2, {11, Pdg::kDS}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from Ds +/- decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromLambdaC")) { + if (nameStr == "eFromLambdaC") { MCProng prong(2, {11, Pdg::kLambdaCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from Lambda_c decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromXiC0")) { + if (nameStr == "eFromXiC0") { MCProng prong(2, {11, Pdg::kXiC0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from Xi_c_0 decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromXiCPlus")) { + if (nameStr == "eFromXiCPlus") { MCProng prong(2, {11, Pdg::kXiCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from Xi_c_+ decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromXiCPlusPlus")) { + if (nameStr == "eFromXiCPlusPlus") { MCProng prong(2, {11, Pdg::kXiCCPlusPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from Xi_c_++ decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromHb")) { + if (nameStr == "eFromHb") { MCProng prong(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from open beauty hadron decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromAnyHb")) { + if (nameStr == "eFromAnyHb") { MCProng prong(1, {11}, {true}, {false}, {0}, {0}, {false}, false, {502}, {false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); signal = new MCSignal(name, "Electrons from any open beauty hadron decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromHbc")) { + if (nameStr == "eFromHbc") { MCProng prong(2, {11, 902}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from open charm or beauty hadron decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromMc")) { + if (nameStr == "eFromMc") { MCProng prong(2, {11, 401}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from open charmed meson decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromMb")) { + if (nameStr == "eFromMb") { MCProng prong(2, {11, 501}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from open beauty meson decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromBc")) { + if (nameStr == "eFromBc") { MCProng prong(2, {11, 4001}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from open charmed baryon decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromBb")) { + if (nameStr == "eFromBb") { MCProng prong(2, {11, 5001}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from open beauty baryon decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromPromptHc")) { + if (nameStr == "eFromPromptHc") { MCProng prong(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from open charmed hadron decays without beauty in decay history", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromHbtoHc")) { + if (nameStr == "eFromHbtoHc") { MCProng prong(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from open charmed hadron decays with b hadron in decay history", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromPromptLM")) { + if (nameStr == "eFromPromptLM") { MCProng prong(2, {11, 101}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502, 402}, {true, true}); signal = new MCSignal(name, "Electrons from light mesons without B/D in decay history", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromHbtoLM")) { + if (nameStr == "eFromHbtoLM") { MCProng prong(2, {11, 101}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {false}); signal = new MCSignal(name, "Electrons from light mesons with B hadron in decay history", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromHctoLM")) { + if (nameStr == "eFromHctoLM") { MCProng prong(2, {11, 101, 402}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false, {502}, {true}); signal = new MCSignal(name, "Electrons from light mesons from D hadron decays and no B in decay history", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromUpsilon1S")) { + if (nameStr == "eFromUpsilon1S") { MCProng prong(2, {11, 553}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from Upsilon1S decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromUpsilon2S")) { + if (nameStr == "eFromUpsilon2S") { MCProng prong(2, {11, 100553}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from Upsilon2S decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromUpsilon3S")) { + if (nameStr == "eFromUpsilon3S") { MCProng prong(2, {11, 200553}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electrons from Upsilon3S decays", {prong}, {-1}); return signal; } // muon signals with mother X: mu from mother X - if (!nameStr.compare("muFromJpsi")) { + if (nameStr == "muFromJpsi") { MCProng prong(2, {13, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "muons from jpsi decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromPsi2S")) { + if (nameStr == "muFromPsi2S") { MCProng prong(2, {13, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "muons from psi2s decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromHb")) { + if (nameStr == "muFromHb") { MCProng prong(2, {13, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "muons from b->mu", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromPromptHc")) { + if (nameStr == "muFromPromptHc") { MCProng prong(2, {13, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); signal = new MCSignal(name, "muons from c->mu, without beauty in decay history", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromHbtoHc")) { + if (nameStr == "muFromHbtoHc") { MCProng prong(3, {13, 402, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "muons from b->c->mu", {prong}, {-1}); return signal; } - if (!nameStr.compare("secondaryMuon")) { + if (nameStr == "secondaryMuon") { MCProng prong(1, {13}, {true}, {false}, {0}, {0}, {false}); prong.SetSourceBit(0, MCProng::kProducedInTransport); signal = new MCSignal(name, "muons produced during transport in detector", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromPromptLM")) { + if (nameStr == "muFromPromptLM") { MCProng prong(2, {13, 101}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502, 402}, {true, true}); signal = new MCSignal(name, "muons from light mesons without B/D in decay history", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromHbtoLM")) { + if (nameStr == "muFromHbtoLM") { MCProng prong(2, {13, 101}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {false}); signal = new MCSignal(name, "muons from light mesons with B hadron in decay history", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromHctoLM")) { + if (nameStr == "muFromHctoLM") { MCProng prong(2, {13, 101, 402}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false, {502}, {true}); signal = new MCSignal(name, "muons from light mesons from D hadron decays and no B in decay history", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromUpsilon1S")) { + if (nameStr == "muFromUpsilon1S") { MCProng prong(2, {13, 553}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "muons from Upsilon1S decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromUpsilon2S")) { + if (nameStr == "muFromUpsilon2S") { MCProng prong(2, {13, 100553}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "muons from Upsilon2S decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("muFromUpsilon3S")) { + if (nameStr == "muFromUpsilon3S") { MCProng prong(2, {13, 200553}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "muons from Upsilon3S decays", {prong}, {-1}); return signal; } // Decay signal: Mother to electron: X -> e - if (!nameStr.compare("AnythingToE")) { + if (nameStr == "AnythingToE") { MCProng prong(2, {MCProng::kPDGCodeNotAssigned, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); // prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); // set source to be ALICE primary particles prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Decay of anything into e", {prong}, {-1}); // pi0,eta,eta',rho,omega,phi,jpsi,psi2s mesons return signal; } - if (!nameStr.compare("LFQdecayToE")) { + if (nameStr == "LFQdecayToE") { MCProng prong(2, {900, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); // prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); // set source to be ALICE primary particles prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "LF meson + quarkonia decays into e", {prong}, {-1}); // pi0,eta,eta',rho,omega,phi,jpsi,psi2s mesons return signal; } - if (!nameStr.compare("HcToE")) { + if (nameStr == "HcToE") { MCProng prong(2, {402, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Open charmed hadron decays into e", {prong}, {-1}); return signal; } - if (!nameStr.compare("HbToE")) { + if (nameStr == "HbToE") { MCProng prong(2, {502, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Open beauty hadron decays into e", {prong}, {-1}); return signal; } - if (!nameStr.compare("McToE")) { + if (nameStr == "McToE") { MCProng prong(2, {401, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Open charmed meson decays into e", {prong}, {-1}); return signal; } - if (!nameStr.compare("MbToE")) { + if (nameStr == "MbToE") { MCProng prong(2, {501, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Open beauty meson decays into e", {prong}, {-1}); return signal; } - if (!nameStr.compare("BcToE")) { + if (nameStr == "BcToE") { MCProng prong(2, {4001, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Open charmed baryon decays into e", {prong}, {-1}); return signal; } - if (!nameStr.compare("BbToE")) { + if (nameStr == "BbToE") { MCProng prong(2, {5001, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Open beauty baryon decay into e", {prong}, {-1}); return signal; } - if (!nameStr.compare("PromptHcToE")) { + if (nameStr == "PromptHcToE") { MCProng prong(3, {502, 402, 11}, {true, true, true}, {true, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Open charmed hadron decays into e", {prong}, {-1}); return signal; } - if (!nameStr.compare("NonPromptHcToE")) { + if (nameStr == "NonPromptHcToE") { MCProng prong(3, {502, 402, 11}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "b hadron decays to open charmed hadron decays to e", {prong}, {-1}); return signal; } - if (!nameStr.compare("HFdecayToE")) { + if (nameStr == "HFdecayToE") { MCProng prong(2, {902, 11}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); // prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); // set source to be ALICE primary particles prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Open charm and beauty to electrons", {prong}, {-1}); return signal; } - if (!nameStr.compare("AnyHFdecayToE")) { + if (nameStr == "AnyHFdecayToE") { MCProng prong(1, {902}, {true}, {false}, {0}, {0}, {false}, true, {11}, {false}); // prong.SetSourceBit(0, MCProng::kPhysicalPrimary, false); // set source to be ALICE primary particles prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) signal = new MCSignal(name, "Open charm and beauty to electrons", {prong}, {-1}); return signal; } - // if (!nameStr.compare("LFQtoPC")) { + // if (nameStr == "LFQtoPC") { // MCProng prong(3, {900, 22, 11}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); // prong.SetSignalInTime(true); // set direction to check for daughters (true, in time) or for mothers (false, back in time) // signal = new MCSignal(name, "LF meson + quarkonia decays into photon conversion electron", {prong}, {-1}); @@ -885,166 +885,166 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) //_________________________________________________________________________________________________________________________ // LMEE pair signals for LF, same mother - if (!nameStr.compare("eeFromAnything")) { + if (nameStr == "eeFromAnything") { MCProng prong(2, {11, MCProng::kPDGCodeNotAssigned}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from any decay", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromPi0")) { + if (nameStr == "eeFromPi0") { MCProng prong(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from pi0 decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eePrimaryFromPromptPi0")) { + if (nameStr == "eePrimaryFromPromptPi0") { MCProng prong(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502, 402}, {true, true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from prompt pi0 decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromEta")) { + if (nameStr == "eeFromEta") { MCProng prong(2, {11, 221}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from eta decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromEtaprime")) { + if (nameStr == "eeFromEtaprime") { MCProng prong(2, {11, 331}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from eta' decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromRho")) { + if (nameStr == "eeFromRho") { MCProng prong(2, {11, 113}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from rho decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromOmega")) { + if (nameStr == "eeFromOmega") { MCProng prong(2, {11, 223}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from omega decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromPhi")) { + if (nameStr == "eeFromPhi") { MCProng prong(2, {11, 333}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from phi decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromJpsi")) { + if (nameStr == "eeFromJpsi") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from j/psi decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromJpsiExclusive")) { + if (nameStr == "eeFromJpsiExclusive") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from j/psi decays", {prong, prong}, {1, 1}); // signal at pair level signal->SetDecayChannelIsExclusive(2, true); return signal; } - if (!nameStr.compare("eeFromJpsiNotExclusive")) { + if (nameStr == "eeFromJpsiNotExclusive") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from j/psi decays", {prong, prong}, {1, 1}); // signal at pair level signal->SetDecayChannelIsNotExclusive(2, true); return signal; } - if (!nameStr.compare("eePrimaryFromPromptJPsi")) { + if (nameStr == "eePrimaryFromPromptJPsi") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from prompt j/psi decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eePrimaryFromNonPromptJPsi")) { + if (nameStr == "eePrimaryFromNonPromptJPsi") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from non-prompt j/psi decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromPhi")) { + if (nameStr == "mumuFromPhi") { MCProng prong(2, {13, 333}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "mumu pairs from phi decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromJpsi")) { + if (nameStr == "mumuFromJpsi") { MCProng prong(2, {13, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "mumu pairs from j/psi decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromPromptJpsi")) { + if (nameStr == "mumuFromPromptJpsi") { MCProng prong(2, {13, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "mumu pairs from prompt j/psi decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromNonPromptJpsi")) { + if (nameStr == "mumuFromNonPromptJpsi") { MCProng prong(2, {13, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "mumu pairs from non-prompt j/psi decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromPsi2S")) { + if (nameStr == "eeFromPsi2S") { MCProng prong(2, {11, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from psi2s decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromPsi2S")) { + if (nameStr == "mumuFromPsi2S") { MCProng prong(2, {13, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "mumu pairs from psi2s decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromPromptPsi2S")) { + if (nameStr == "mumuFromPromptPsi2S") { MCProng prong(2, {13, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "mumu pairs from prompt psi2s decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromNonPromptPsi2S")) { + if (nameStr == "mumuFromNonPromptPsi2S") { MCProng prong(2, {13, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "mumu pairs from non-prompt psi2s decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromUpsilon1S")) { + if (nameStr == "mumuFromUpsilon1S") { MCProng prong(2, {13, 553}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "mumu pairs from upsilon1s decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromUpsilon2S")) { + if (nameStr == "mumuFromUpsilon2S") { MCProng prong(2, {13, 100553}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "mumu pairs from upsilon2s decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("mumuFromUpsilon3S")) { + if (nameStr == "mumuFromUpsilon3S") { MCProng prong(2, {13, 200553}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "mumu pairs from upsilon3s decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromLMeeLFQ")) { + if (nameStr == "eeFromLMeeLFQ") { MCProng prong(2, {11, 900}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from light flavor meson + quarkonia decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromLMeeLF")) { + if (nameStr == "eeFromLMeeLF") { MCProng prong(2, {11, 901}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from light flavor meson decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromLMeeNoHFLFQ")) { + if (nameStr == "eeFromLMeeNoHFLFQ") { MCProng prong(2, {11, 900}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502, 402}, {true, true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from light flavor meson + quarkonia decays not from open-HF decays", {prong, prong}, {1, 1}); // signal at pair level return signal; } - if (!nameStr.compare("eeFromLMeeNoHFLF")) { + if (nameStr == "eeFromLMeeNoHFLF") { MCProng prong(2, {11, 901}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502, 402}, {true, true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from light flavor meson decays not from open-HF decays", {prong, prong}, {1, 1}); // signal at pair level @@ -1053,7 +1053,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) // LMEE pair signals for HF // D0->e and D0->e - if (!nameStr.compare("eeFromD0")) { + if (nameStr == "eeFromD0") { MCProng prong(2, {kElectron, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from D0 decays, no beauty in history", {prong, prong}, {-1, -1}); @@ -1061,7 +1061,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // D0->e and D0->e - if (!nameStr.compare("eeFromPi0FromD0")) { + if (nameStr == "eeFromPi0FromD0") { MCProng prong(2, {kElectron, kPi0, Pdg::kD0}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from D0 to Pi0 decays, no beauty in history", {prong, prong}, {1, 1}); @@ -1069,7 +1069,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // D+/- -> e and D+/- -> e - if (!nameStr.compare("eeFromChargedD")) { + if (nameStr == "eeFromChargedD") { MCProng prong(2, {kElectron, Pdg::kDPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from D+/- decays, no beauty in history", {prong, prong}, {-1, -1}); @@ -1077,7 +1077,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // D0 -> e and D+/- -> e - if (!nameStr.compare("eeFromD0andChargedD")) { + if (nameStr == "eeFromD0andChargedD") { MCProng prongD0(2, {kElectron, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); MCProng prongDch(2, {kElectron, Pdg::kDPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prongD0.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1087,7 +1087,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // D+/- -> e and D0 -> e - if (!nameStr.compare("eeFromD0andChargedDBis")) { + if (nameStr == "eeFromD0andChargedDBis") { MCProng prongD0(2, {kElectron, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); MCProng prongDch(2, {kElectron, Pdg::kDPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prongD0.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1097,7 +1097,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // D_s->e and D_s->e - if (!nameStr.compare("eeFromDs")) { + if (nameStr == "eeFromDs") { MCProng prong(2, {kElectron, Pdg::kDS}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from Ds +/- decays, no beauty in history", {prong, prong}, {-1, -1}); @@ -1105,7 +1105,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Lambda_c->e and Lambda_c->e - if (!nameStr.compare("eeFromLambdaC")) { + if (nameStr == "eeFromLambdaC") { MCProng prong(2, {kElectron, Pdg::kLambdaCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from Lambda_c, no beauty in history", {prong, prong}, {-1, -1}); @@ -1113,7 +1113,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Lambda_c->e and D0->e - if (!nameStr.compare("eeFromLambdaCandD0")) { + if (nameStr == "eeFromLambdaCandD0") { MCProng prongLc(2, {kElectron, Pdg::kLambdaCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); MCProng prongD0(2, {kElectron, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prongLc.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1123,7 +1123,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // D0->e and Lambda_c->e - if (!nameStr.compare("eeFromLambdaCandD0Bis")) { + if (nameStr == "eeFromLambdaCandD0Bis") { MCProng prongLc(2, {kElectron, Pdg::kLambdaCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); MCProng prongD0(2, {kElectron, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prongLc.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1133,7 +1133,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Lambda_c->e and D+/- -> e - if (!nameStr.compare("eeFromLambdaCandChargedD")) { + if (nameStr == "eeFromLambdaCandChargedD") { MCProng prongLc(2, {kElectron, Pdg::kLambdaCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); MCProng prongDch(2, {kElectron, Pdg::kDPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prongLc.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1143,7 +1143,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // D+/- -> e and Lambda_c->e - if (!nameStr.compare("eeFromLambdaCandChargedDBis")) { + if (nameStr == "eeFromLambdaCandChargedDBis") { MCProng prongLc(2, {kElectron, Pdg::kLambdaCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); MCProng prongDch(2, {kElectron, Pdg::kDPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prongLc.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1153,7 +1153,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Xic0 ->e and Xic0 ->e - if (!nameStr.compare("eeFromXiC0")) { + if (nameStr == "eeFromXiC0") { MCProng prong(2, {kElectron, Pdg::kXiC0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from Xi_c0, no beauty in history", {prong, prong}, {-1, -1}); @@ -1161,7 +1161,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Xi_c+ ->e and Xi_c+ ->e - if (!nameStr.compare("eeFromXiCPlus")) { + if (nameStr == "eeFromXiCPlus") { MCProng prong(2, {kElectron, Pdg::kXiCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from Xi_c+, no beauty in history", {prong, prong}, {-1, -1}); @@ -1169,7 +1169,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Xi_c0 ->e and Xi_c+ ->e - if (!nameStr.compare("eeFromXiC0andXiCPlus")) { + if (nameStr == "eeFromXiC0andXiCPlus") { MCProng prongXiCPlus(2, {kElectron, Pdg::kXiCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); MCProng prongXiC0(2, {kElectron, Pdg::kXiC0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prongXiCPlus.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1179,7 +1179,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Xi_c+ ->e and Xi_c0 ->e - if (!nameStr.compare("eeFromXiC0andXiCPlusBis")) { + if (nameStr == "eeFromXiC0andXiCPlusBis") { MCProng prongXiCPlus(2, {kElectron, Pdg::kXiCPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); MCProng prongXiC0(2, {kElectron, Pdg::kXiC0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prongXiCPlus.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1189,7 +1189,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Xi_cc++ ->e and Xi_cc++ ->e - if (!nameStr.compare("eeFromXiCPlusPlus")) { + if (nameStr == "eeFromXiCPlusPlus") { MCProng prong(2, {kElectron, Pdg::kXiCCPlusPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from Xi_cc++, no beauty in history", {prong, prong}, {-1, -1}); @@ -1197,7 +1197,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // c->e and c->e (no check) - if (!nameStr.compare("eeFromCCNoCheck")) { + if (nameStr == "eeFromCCNoCheck") { MCProng prong(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from c->e and c->e without check", {prong, prong}, {-1, -1}); // signal at pair level @@ -1205,7 +1205,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // ee from HF in general - if (!nameStr.compare("eeFromHF")) { + if (nameStr == "eeFromHF") { MCProng prong(2, {11, 902}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from b,c->e and b,c->e without check", {prong, prong}, {-1, -1}); // signal at pair level @@ -1213,7 +1213,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Any c in history but no b -> c -> e - if (!nameStr.compare("eeFromPromptCandPromptC")) { + if (nameStr == "eeFromPromptCandPromptC") { MCProng prong(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); // check if mother pdg code is in history prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs with any charm but no beauty in decay chain", {prong, prong}, {-1, -1}); // signal at pair level @@ -1221,7 +1221,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Any b to any c in history b -> c -> e - if (!nameStr.compare("eeFromAnyBtoCandAnyBtoC")) { + if (nameStr == "eeFromAnyBtoCandAnyBtoC") { MCProng prong(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {false}); // check if mother pdg code is in history prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs with any beauty to charm in decay chain", {prong, prong}, {-1, -1}); // signal at pair level @@ -1229,7 +1229,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // b->c->e, b->c->e - if (!nameStr.compare("eeFromBtoCandBtoC")) { + if (nameStr == "eeFromBtoCandBtoC") { MCProng prong(3, {11, 402, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false); // check if mother pdg code is in history prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs with any beauty to charm in decay chain", {prong, prong}, {-1, -1}); // signal at pair level @@ -1240,7 +1240,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) // Looking at such decays: B -> (e) D -> (e)e and bar{B} -> e // Signal allows combinations of ee from the same B meson // + the combination of e fom B and e from bar{B} - if (!nameStr.compare("eeFromBandAnyBtoC")) { + if (nameStr == "eeFromBandAnyBtoC") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongBtoC(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {false}); // check if mother pdg code is in history @@ -1250,7 +1250,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // Any b->e and Any b->X->c->e - if (!nameStr.compare("eeFromBandAnyBtoCBis")) { + if (nameStr == "eeFromBandAnyBtoCBis") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongBtoC(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {false}); // check if mother pdg code is in history @@ -1260,7 +1260,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // b->e and b->c->e - if (!nameStr.compare("eeFromBandBtoC")) { + if (nameStr == "eeFromBandBtoC") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongBtoC(3, {11, 402, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false); // check if mother pdg code is in history @@ -1270,7 +1270,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // b->e and b->c->e - if (!nameStr.compare("eeFromBandBtoCBis")) { + if (nameStr == "eeFromBandBtoCBis") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongBtoC(3, {11, 402, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false); // check if mother pdg code is in history @@ -1281,7 +1281,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) // b->e and b->c->e (same mother/grandmother) // require that the mother is the grandmother of the other electron - if (!nameStr.compare("eeFromBandBtoCsameGM")) { + if (nameStr == "eeFromBandBtoCsameGM") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongBtoC(3, {11, 402, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false); // check if mother pdg code is in history @@ -1292,7 +1292,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) // b->e and b->c->e (same mother/grandmother) // require that the mother is the grandmother of the other electron - if (!nameStr.compare("eeFromBandBtoCsameGMBis")) { + if (nameStr == "eeFromBandBtoCsameGMBis") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongBtoC(3, {11, 402, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false); // check if mother pdg code is in history @@ -1303,7 +1303,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) // b->e and b->c->e (different mother/grandmother) // require that the mother is not the grandmother of the other electron - if (!nameStr.compare("eeFromBandBtoCdiffGM")) { + if (nameStr == "eeFromBandBtoCdiffGM") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongBtoC(3, {11, 402, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false); // check if mother pdg code is in history @@ -1314,7 +1314,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) // b->e and b->c->e (different mother/grandmother) // require that the mother is not the grandmother of the other electron - if (!nameStr.compare("eeFromBandBtoCdiffGMBis")) { + if (nameStr == "eeFromBandBtoCdiffGMBis") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongBtoC(3, {11, 402, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false); // check if mother pdg code is in history @@ -1324,7 +1324,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // b->e and b->e - if (!nameStr.compare("eeFromBB")) { + if (nameStr == "eeFromBB") { MCProng prong(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from b->e and b->e", {prong, prong}, {-1, -1}); // signal at pair level @@ -1332,7 +1332,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // b->e and b->e (commonAncestors) - if (!nameStr.compare("eeFromSameB")) { + if (nameStr == "eeFromSameB") { MCProng prong(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "ee pairs from b->e and b->e", {prong, prong}, {1, 1}); // signal at pair level @@ -1340,7 +1340,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // b->e and c->e no check - if (!nameStr.compare("eeFromBandFromC")) { + if (nameStr == "eeFromBandFromC") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongC(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); @@ -1350,7 +1350,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // b->e and c->e no check - if (!nameStr.compare("eeFromBandFromCBis")) { + if (nameStr == "eeFromBandFromCBis") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongC(2, {11, 402}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); @@ -1360,7 +1360,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // b->e and b->c->e (single b) - if (!nameStr.compare("eeFromSingleBandBtoC")) { + if (nameStr == "eeFromSingleBandBtoC") { MCProng prongB(2, {11, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prongB.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongBtoC(3, {11, 402, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); @@ -1371,26 +1371,26 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) //_________________________________________________________________________________________________________________________ - if (!nameStr.compare("kaonFromBplus")) { + if (nameStr == "kaonFromBplus") { MCProng prong(2, {321, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaons from B+ decays", {prong}, {1}); return signal; } - if (!nameStr.compare("kaonFromBplusHistory")) { + if (nameStr == "kaonFromBplusHistory") { MCProng prong(1, {321}, {true}, {false}, {0}, {0}, {false}, false, {521}, {false}); signal = new MCSignal(name, "Kaons from B+ decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("kaonPrimaryFromBplusHistory")) { + if (nameStr == "kaonPrimaryFromBplusHistory") { MCProng prong(1, {321}, {true}, {false}, {0}, {0}, {false}, false, {521}, {false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Kaons from B+ decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("kaonPrimaryFromBplusFS")) { + if (nameStr == "kaonPrimaryFromBplusFS") { MCProng prong(2, {321, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); prong.SetSourceBit(1, MCProng::kHEPMCFinalState); @@ -1398,57 +1398,57 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("kaonFromAnyBHistory")) { + if (nameStr == "kaonFromAnyBHistory") { MCProng prong(1, {321}, {true}, {false}, {0}, {0}, {false}, false, {503}, {false}); signal = new MCSignal(name, "Kaons from B+ decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("JpsiFromBplus")) { + if (nameStr == "JpsiFromBplus") { MCProng prong(2, {443, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Jpsi from B+ decays", {prong}, {1}); return signal; } - if (!nameStr.compare("eFromJpsiFromBplus")) { + if (nameStr == "eFromJpsiFromBplus") { MCProng prong(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Electrons from Jpsi from B+ decays", {prong}, {1}); return signal; } - if (!nameStr.compare("electronFromJpsiFromBplus")) { + if (nameStr == "electronFromJpsiFromBplus") { MCProng prong(3, {11, 443, 521}, {false, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Electrons from Jpsi from B+ decays", {prong}, {1}); return signal; } - if (!nameStr.compare("positronFromJpsiFromBplus")) { + if (nameStr == "positronFromJpsiFromBplus") { MCProng prong(3, {-11, 443, 521}, {false, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Positrons from Jpsi from B+ decays", {prong}, {1}); return signal; } - if (!nameStr.compare("eeFromJpsiFromBplus")) { + if (nameStr == "eeFromJpsiFromBplus") { MCProng prong(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Electron pair from Jpsi from B+ decays", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("eeKaonFromBplus")) { + if (nameStr == "eeKaonFromBplus") { MCProng pronge(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon and electron pair from B+", {pronge, pronge, prongKaon}, {2, 2, 1}); return signal; } - if (!nameStr.compare("eeFromJpsiKaonAny")) { + if (nameStr == "eeFromJpsiKaonAny") { MCProng pronge(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongKaon(1, {321}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Kaon and electron pair", {pronge, pronge, prongKaon}, {-1, -1, -1}); return signal; } - if (!nameStr.compare("eeKaonFromBplusExclusive")) { + if (nameStr == "eeKaonFromBplusExclusive") { MCProng pronge(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon and electron pair from B+", {pronge, pronge, prongKaon}, {2, 2, 1}); @@ -1456,7 +1456,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("eeKaonFromBplusNotExclusive")) { + if (nameStr == "eeKaonFromBplusNotExclusive") { MCProng pronge(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon and electron pair from B+", {pronge, pronge, prongKaon}, {2, 2, 1}); @@ -1465,56 +1465,56 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) } // correlated background - if (!nameStr.compare("eePionFromBplus")) { + if (nameStr == "eePionFromBplus") { MCProng pronge(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPion(2, {211, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Pion and electron pair from B+", {pronge, pronge, prongPion}, {2, 2, 1}); return signal; } - if (!nameStr.compare("eeKaonFromBplusViaEverything")) { + if (nameStr == "eeKaonFromBplusViaEverything") { MCProng pronge(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(3, {321, 0, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Kaon and electron pair from B+ via everything", {pronge, pronge, prongKaon}, {2, 2, 2}); return signal; } - if (!nameStr.compare("eeKaonFromB0")) { + if (nameStr == "eeKaonFromB0") { MCProng pronge(3, {11, 443, 511}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 511}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon and electron pair from B0", {pronge, pronge, prongKaon}, {2, 2, 1}); return signal; } - if (!nameStr.compare("eePionFromB0ViaEverything")) { // catching feed-down for B0 + if (nameStr == "eePionFromB0ViaEverything") { // catching feed-down for B0 MCProng pronge(3, {11, 443, 511}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPion(3, {211, 0, 511}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Pion and electron pair from B0", {pronge, pronge, prongPion}, {2, 2, 1}); return signal; } - if (!nameStr.compare("eeKaonFromOpenBeautyMesons")) { + if (nameStr == "eeKaonFromOpenBeautyMesons") { MCProng pronge(3, {11, 443, 501}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 501}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Excited kaon and electron pair from B0", {pronge, pronge, prongKaon}, {2, 2, 2}); return signal; } - if (!nameStr.compare("eeKaonFromOpenBeautyHadrons")) { + if (nameStr == "eeKaonFromOpenBeautyHadrons") { MCProng pronge(3, {11, 443, 502}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 502}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon and electron pair from open beauty hadrons", {pronge, pronge, prongKaon}, {2, 2, 1}); return signal; } - if (!nameStr.compare("eeKaonFromLambdaB")) { + if (nameStr == "eeKaonFromLambdaB") { MCProng pronge(3, {11, 443, 5122}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 5122}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon and electron pair from lambda B", {pronge, pronge, prongKaon}, {2, 2, 1}); return signal; } - if (!nameStr.compare("eeKaonPion0FromBplus")) { + if (nameStr == "eeKaonPion0FromBplus") { MCProng pronge(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongPion(2, {111, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); @@ -1522,7 +1522,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("eeKaonEtaFromBplus")) { + if (nameStr == "eeKaonEtaFromBplus") { MCProng pronge(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongEta(2, {221, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); @@ -1530,7 +1530,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("eeKaonOmegaFromBplus")) { + if (nameStr == "eeKaonOmegaFromBplus") { MCProng pronge(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongOmega(2, {223, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); @@ -1538,7 +1538,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("eeKaonPionFromBplus")) { + if (nameStr == "eeKaonPionFromBplus") { MCProng pronge(3, {11, 443, 521}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongKaon(2, {321, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongPion(2, {211, 521}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); @@ -1546,35 +1546,35 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("Bplus")) { + if (nameStr == "Bplus") { MCProng prong(1, {521}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "B+", {prong}, {-1}); return signal; } - if (!nameStr.compare("BplusFS")) { + if (nameStr == "BplusFS") { MCProng prong(1, {521}, {true}, {false}, {0}, {0}, {false}); prong.SetSourceBit(0, MCProng::kHEPMCFinalState); signal = new MCSignal(name, "B+", {prong}, {-1}); return signal; } - if (!nameStr.compare("beautyPairs")) { + if (nameStr == "beautyPairs") { MCProng prong(1, {503}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal("beautyPairs", "Beauty hadron pair", {prong, prong}, {-1, -1}); return signal; } - if (!nameStr.compare("everythingFromBeautyPairs")) { + if (nameStr == "everythingFromBeautyPairs") { MCProng prong(2, {0, 503}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal("everythingFromBeautyPairs", "Everything from beauty hadrons pair", {prong, prong}, {-1, -1}); return signal; } - if (!nameStr.compare("everythingFromEverythingFromBeautyPairsCM")) { + if (nameStr == "everythingFromEverythingFromBeautyPairsCM") { MCProng prong(3, {0, 0, 503}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal("everythingFromEverythingFromBeautyPairs", "Everything from everything from beauty hadrons pair with common grand-mother", {prong, prong}, {2, 2}); return signal; } - if (!nameStr.compare("everythingFromBeautyANDeverythingFromEverythingFromBeautyPairs")) { + if (nameStr == "everythingFromBeautyANDeverythingFromEverythingFromBeautyPairs") { MCProng prong1(3, {0, 0, 503}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prong2(2, {0, 503}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal("everythingFromBeautyANDeverythingFromEverythingFromBeautyPairs", "Everything beauty and everything from everything from beauty hadrons pair", {prong1, prong2}, {2, 1}); @@ -1583,136 +1583,136 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) //------------------------------------------------------------------------------------ - if (!nameStr.compare("D0")) { + if (nameStr == "D0") { MCProng prong(1, {Pdg::kD0}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "D0", {prong}, {-1}); return signal; } - if (!nameStr.compare("nonPromptD0")) { + if (nameStr == "nonPromptD0") { MCProng prong(2, {Pdg::kD0, 503}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Non-prompt D0", {prong}, {-1}); return signal; } - if (!nameStr.compare("D0FS")) { + if (nameStr == "D0FS") { MCProng prong(1, {Pdg::kD0}, {true}, {false}, {0}, {0}, {false}); prong.SetSourceBit(0, MCProng::kHEPMCFinalState); signal = new MCSignal(name, "D0", {prong}, {-1}); return signal; } - if (!nameStr.compare("KPiFromD0")) { + if (nameStr == "KPiFromD0") { MCProng prongKaon(2, {321, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongPion(2, {211, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon and pion pair from D0", {prongKaon, prongPion}, {1, 1}); return signal; } - if (!nameStr.compare("KPiFromD0Reflected")) { + if (nameStr == "KPiFromD0Reflected") { MCProng prongFalseKaon(2, {211, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongFalsePion(2, {321, Pdg::kD0}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon and pion pair from D0 with reflected mass assumption", {prongFalseKaon, prongFalsePion}, {1, 1}); return signal; } - if (!nameStr.compare("Dcharged")) { + if (nameStr == "Dcharged") { MCProng prong(1, {Pdg::kDPlus}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "D+/-", {prong}, {-1}); return signal; } - if (!nameStr.compare("Dplus")) { + if (nameStr == "Dplus") { MCProng prong(1, {Pdg::kDPlus}, {false}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "D+", {prong}, {-1}); return signal; } - if (!nameStr.compare("Dminus")) { + if (nameStr == "Dminus") { MCProng prong(1, {-Pdg::kDPlus}, {false}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "D+", {prong}, {-1}); return signal; } - if (!nameStr.compare("KPiPiFromDcharged")) { + if (nameStr == "KPiPiFromDcharged") { MCProng prongKaon(2, {321, Pdg::kDPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongPion(2, {211, Pdg::kDPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon pion pion triplet from D+/-", {prongKaon, prongPion, prongPion}, {1, 1, 1}); return signal; } - if (!nameStr.compare("KPiPiFromDplus")) { + if (nameStr == "KPiPiFromDplus") { MCProng prongKaon(2, {-321, Pdg::kDPlus}, {false, false}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongPion(2, {211, Pdg::kDPlus}, {false, false}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon pion pion triplet from D+", {prongKaon, prongPion, prongPion}, {1, 1, 1}); return signal; } - if (!nameStr.compare("KPiPiFromDminus")) { + if (nameStr == "KPiPiFromDminus") { MCProng prongKaon(2, {321, -Pdg::kDPlus}, {false, false}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongPion(2, {-211, -Pdg::kDPlus}, {false, false}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon pion pion triplet from D-", {prongKaon, prongPion, prongPion}, {1, 1, 1}); return signal; } - if (!nameStr.compare("Dstar")) { + if (nameStr == "Dstar") { MCProng prong(1, {Pdg::kDStar}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "D*", {prong}, {-1}); return signal; } - if (!nameStr.compare("DstarPlus")) { + if (nameStr == "DstarPlus") { MCProng prong(1, {Pdg::kDStar}, {false}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "D*+", {prong}, {-1}); return signal; } - if (!nameStr.compare("DstarMinus")) { + if (nameStr == "DstarMinus") { MCProng prong(1, {-Pdg::kDStar}, {false}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "D*-", {prong}, {-1}); return signal; } - if (!nameStr.compare("pionFromDstar")) { + if (nameStr == "pionFromDstar") { MCProng prong(2, {211, Pdg::kDStar}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Pions from D* decays", {prong}, {1}); return signal; } - if (!nameStr.compare("D0FromDstar")) { + if (nameStr == "D0FromDstar") { MCProng prong(2, {Pdg::kD0, Pdg::kDStar}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "D0 from D* decays", {prong}, {1}); return signal; } - if (!nameStr.compare("KFromD0FromDstar")) { + if (nameStr == "KFromD0FromDstar") { MCProng prong(3, {321, Pdg::kD0, Pdg::kDStar}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Kaons from D0 from D* decays", {prong}, {1}); return signal; } - if (!nameStr.compare("PiFromD0FromDstar")) { + if (nameStr == "PiFromD0FromDstar") { MCProng prong(3, {211, Pdg::kD0, Pdg::kDStar}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Pions from D0 from D* decays", {prong}, {1}); return signal; } - if (!nameStr.compare("KPiFromD0FromDstar")) { + if (nameStr == "KPiFromD0FromDstar") { MCProng prongKaon(3, {321, Pdg::kD0, Pdg::kDStar}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPion(3, {321, Pdg::kD0, Pdg::kDStar}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Kaon and pion pair from D0 from D* decay", {prongKaon, prongPion}, {1, 1}); return signal; } - if (!nameStr.compare("KPiPiFromD0FromDstar")) { + if (nameStr == "KPiPiFromD0FromDstar") { MCProng prongKaon(3, {321, Pdg::kD0, Pdg::kDStar}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPionSecondary(3, {211, Pdg::kD0, Pdg::kDStar}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPion(2, {211, Pdg::kDStar}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon pion pion triplet from D*", {prongKaon, prongPionSecondary, prongPion}, {2, 2, 1}); return signal; } - if (!nameStr.compare("KPiPiFromD0FromDstarPlus")) { + if (nameStr == "KPiPiFromD0FromDstarPlus") { MCProng prongKaon(3, {-321, Pdg::kD0, Pdg::kDStar}, {false, false, false}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPionSecondary(3, {211, Pdg::kD0, Pdg::kDStar}, {false, false, false}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPion(2, {211, Pdg::kDStar}, {false, false}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon pion pion triplet from D*+", {prongKaon, prongPionSecondary, prongPion}, {2, 2, 1}); return signal; } - if (!nameStr.compare("KPiPiFromD0FromDstarMinus")) { + if (nameStr == "KPiPiFromD0FromDstarMinus") { MCProng prongKaon(3, {321, Pdg::kD0, Pdg::kDStar}, {false, false, false}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPionSecondary(3, {-211, Pdg::kD0, Pdg::kDStar}, {false, false, false}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPion(2, {-211, Pdg::kDStar}, {false, false}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Kaon pion pion triplet from D*-", {prongKaon, prongPionSecondary, prongPion}, {2, 2, 1}); return signal; } - if (!nameStr.compare("KFromDplus")) { + if (nameStr == "KFromDplus") { MCProng prong(2, {321, Pdg::kDPlus}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502}, {true}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Kaons from D+/- decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("LambdaC")) { + if (nameStr == "LambdaC") { MCProng prong(1, {Pdg::kLambdaCPlus}, {true}, {false}, {0}, {0}, {false}); signal = new MCSignal(name, "Lambda_c", {prong}, {-1}); return signal; @@ -1720,110 +1720,110 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) //-------------------------------------------------------------------------------- - if (!nameStr.compare("JpsiFromChic0")) { + if (nameStr == "JpsiFromChic0") { MCProng prong(2, {443, 10441}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Jpsi from Chic0 decays", {prong}, {1}); return signal; } - if (!nameStr.compare("eFromJpsiFromChic0")) { + if (nameStr == "eFromJpsiFromChic0") { MCProng prong(3, {11, 443, 10441}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from Jpsi from Chic0 decays", {prong}, {1}); return signal; } - if (!nameStr.compare("eeFromJpsiFromChic0")) { + if (nameStr == "eeFromJpsiFromChic0") { MCProng prong(3, {11, 443, 10441}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electron pair from Jpsi from Chic0 decays", {prong, prong}, {2, 2}); return signal; } - if (!nameStr.compare("JpsiFromChic1")) { + if (nameStr == "JpsiFromChic1") { MCProng prong(2, {443, 20443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Jpsi from Chic1 decays", {prong}, {1}); return signal; } - if (!nameStr.compare("eFromJpsiFromChic1")) { + if (nameStr == "eFromJpsiFromChic1") { MCProng prong(3, {11, 443, 20443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from Jpsi from Chic1 decays", {prong}, {2}); return signal; } - if (!nameStr.compare("eeFromJpsiFromChic1")) { + if (nameStr == "eeFromJpsiFromChic1") { MCProng prong(3, {11, 443, 20443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electron pair from Jpsi from Chic1 decays", {prong, prong}, {2, 2}); return signal; } - if (!nameStr.compare("JpsiFromChic2")) { + if (nameStr == "JpsiFromChic2") { MCProng prong(2, {443, 445}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Jpsi from Chic2 decays", {prong}, {1}); return signal; } - if (!nameStr.compare("JpsiFromChic2")) { + if (nameStr == "JpsiFromChic2") { MCProng prong(2, {443, 904}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Jpsi from Chic0, Chic1 or Chic2 decays", {prong}, {1}); return signal; } - if (!nameStr.compare("eFromJpsiFromChic2")) { + if (nameStr == "eFromJpsiFromChic2") { MCProng prong(3, {11, 443, 445}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electrons from Jpsi from Chic2 decays", {prong}, {2}); return signal; } - if (!nameStr.compare("eeFromJpsiFromChic2")) { + if (nameStr == "eeFromJpsiFromChic2") { MCProng prong(3, {11, 443, 445}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electron pair from Jpsi from Chic2 decays", {prong, prong}, {2, 2}); return signal; } - if (!nameStr.compare("eeFromJpsiFromChic012")) { + if (nameStr == "eeFromJpsiFromChic012") { MCProng prong(3, {11, 443, 904}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Electron pair from Jpsi from Chic0, Chic1 or Chic2 decays", {prong, prong}, {2, 2}); return signal; } - if (!nameStr.compare("PhotonFromChic0")) { + if (nameStr == "PhotonFromChic0") { MCProng prong(2, {22, 10441}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Photon from Chic0 decays", {prong}, {1}); return signal; } - if (!nameStr.compare("PhotonFromChic1")) { + if (nameStr == "PhotonFromChic1") { MCProng prong(2, {22, 20443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Photon from Chic1 decays", {prong}, {1}); return signal; } - if (!nameStr.compare("PhotonFromChic2")) { + if (nameStr == "PhotonFromChic2") { MCProng prong(2, {22, 445}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Photon from Chic2 decays", {prong}, {1}); return signal; } - if (!nameStr.compare("PhotonFromChic012")) { + if (nameStr == "PhotonFromChic012") { MCProng prong(2, {22, 904}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Photon from Chic0, Chic1, and Chic2 decays", {prong}, {-1}); return signal; } - if (!nameStr.compare("PhotonFromPi0")) { + if (nameStr == "PhotonFromPi0") { MCProng prong(2, {22, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); // prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Photon from Pi0 decays", {prong}, {1}); return signal; } - if (!nameStr.compare("PhotonPhotonFromPi0")) { + if (nameStr == "PhotonPhotonFromPi0") { MCProng prong(2, {22, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); prong.SetSourceBit(0, MCProng::kPhysicalPrimary); signal = new MCSignal(name, "Photon Photon from Pi0 decays", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("eePhotonFromChic1")) { + if (nameStr == "eePhotonFromChic1") { MCProng pronge(3, {11, 443, 20443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPhoton(2, {22, 20443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); pronge.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1832,7 +1832,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("eePhotonFromChic2")) { + if (nameStr == "eePhotonFromChic2") { MCProng pronge(3, {11, 443, 445}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPhoton(2, {22, 445}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); pronge.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1841,7 +1841,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("eePhotonFromChic12")) { + if (nameStr == "eePhotonFromChic12") { MCProng pronge(3, {11, 443, MCProng::kPDGCodeNotAssigned}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPhoton(2, {22, MCProng::kPDGCodeNotAssigned}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); pronge.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1850,7 +1850,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("eePhotonFromPi0")) { + if (nameStr == "eePhotonFromPi0") { MCProng pronge(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongPhoton(2, {22, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); pronge.SetSourceBit(0, MCProng::kPhysicalPrimary); @@ -1861,151 +1861,151 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) //-------------------------------------------------------------------------------- - if (!nameStr.compare("X3872")) { + if (nameStr == "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")) { + if (nameStr == "JpsiFromX3872") { MCProng prong(1, {443}, {true}, {false}, {0}, {0}, {false}, false, {9920443}, {false}); signal = new MCSignal(name, "Jpsi from X3872", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromX3872")) { + if (nameStr == "eFromX3872") { MCProng prong(3, {11, 443, 9920443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Electron from Jpsi from X3872", {prong}, {1}); return signal; } - if (!nameStr.compare("PionFromX3872")) { + if (nameStr == "PionFromX3872") { MCProng prong(1, {211}, {true}, {false}, {0}, {0}, {false}, false, {9920443}, {false}); signal = new MCSignal(name, "Pion from Jpsi from X3872", {prong}, {-1}); return signal; } - if (!nameStr.compare("JpsiFromPsi2S")) { + if (nameStr == "JpsiFromPsi2S") { MCProng prong(1, {443}, {true}, {false}, {0}, {0}, {false}, false, {100443}, {false}); signal = new MCSignal(name, "Jpsi from Psi2S", {prong}, {-1}); return signal; } - if (!nameStr.compare("JpsiFromPromptPsi2S")) { + if (nameStr == "JpsiFromPromptPsi2S") { MCProng prong(2, {443, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); signal = new MCSignal(name, "Jpsi from prompt Psi2S", {prong}, {-1}); return signal; } - if (!nameStr.compare("JpsiFromNonpromptPsi2S")) { + if (nameStr == "JpsiFromNonpromptPsi2S") { MCProng prong(2, {443, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); signal = new MCSignal(name, "Jpsi from non-prompt Psi2S", {prong}, {-1}); return signal; } - if (!nameStr.compare("eFromJpsiFromPsi2S")) { + if (nameStr == "eFromJpsiFromPsi2S") { MCProng prong(3, {11, 443, 100443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); signal = new MCSignal(name, "Electron from Jpsi from Psi2S", {prong}, {1}); return signal; } - if (!nameStr.compare("eFromJpsiFromPromptPsi2S")) { + if (nameStr == "eFromJpsiFromPromptPsi2S") { MCProng prong(3, {11, 443, 100443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false, {503}, {true}); signal = new MCSignal(name, "Electron from Jpsi from prompt Psi2S", {prong}, {1}); return signal; } - if (!nameStr.compare("eFromJpsiFromNonpromptPsi2S")) { + if (nameStr == "eFromJpsiFromNonpromptPsi2S") { MCProng prong(3, {11, 443, 100443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false, {503}, {false}); signal = new MCSignal(name, "Electron from Jpsi from non-prompt Psi2S", {prong}, {1}); return signal; } - if (!nameStr.compare("PionFromPsi2S")) { + if (nameStr == "PionFromPsi2S") { MCProng prong(1, {211}, {true}, {false}, {0}, {0}, {false}, false, {100443}, {false}); signal = new MCSignal(name, "Pion from Jpsi from Psi2S", {prong}, {-1}); return signal; } - if (!nameStr.compare("PionFromPromptPsi2S")) { + if (nameStr == "PionFromPromptPsi2S") { MCProng prong(2, {211, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); signal = new MCSignal(name, "Pion from prompt Psi2S", {prong}, {-1}); return signal; } - if (!nameStr.compare("PionFromNonpromptPsi2S")) { + if (nameStr == "PionFromNonpromptPsi2S") { MCProng prong(2, {211, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); signal = new MCSignal(name, "Pion from non-prompt Psi2S", {prong}, {-1}); return signal; } - if (!nameStr.compare("eeFromJpsiFromX3872")) { + if (nameStr == "eeFromJpsiFromX3872") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {9920443}, {false}); signal = new MCSignal(name, "Electron pair from Jpsi from X3872", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("JpsiPiPiFromX3872")) { + if (nameStr == "JpsiPiPiFromX3872") { MCProng prongJpsi(2, {443, 9920443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongPi(2, {211, 9920443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Jpsi and pion pair from X3872", {prongJpsi, prongPi, prongPi}, {1, 1, 1}); return signal; } - if (!nameStr.compare("eePiPiFromX3872")) { + if (nameStr == "eePiPiFromX3872") { MCProng pronge(3, {11, 443, 9920443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPi(2, {211, 9920443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electron pair and pion pair from X3872", {pronge, pronge, prongPi, prongPi}, {2, 2, 1, 1}); return signal; } - if (!nameStr.compare("eeFromJpsiFromPsi2S")) { + if (nameStr == "eeFromJpsiFromPsi2S") { MCProng prong(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {100443}, {false}); signal = new MCSignal(name, "Electron pair from Jpsi from Psi2S", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("eeFromJpsiFromPromptPsi2S")) { + if (nameStr == "eeFromJpsiFromPromptPsi2S") { MCProng prong(3, {11, 443, 100443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false, {503}, {true}); signal = new MCSignal(name, "Electron pair from Jpsi from prompt Psi2S", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("eeFromJpsiFromNonpromptPsi2S")) { + if (nameStr == "eeFromJpsiFromNonpromptPsi2S") { MCProng prong(3, {11, 443, 100443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false, {503}, {false}); signal = new MCSignal(name, "Electron pair from Jpsi from non-prompt Psi2S", {prong, prong}, {1, 1}); return signal; } - if (!nameStr.compare("JpsiPiPiFromPsi2S")) { + if (nameStr == "JpsiPiPiFromPsi2S") { MCProng prongJpsi(2, {443, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); MCProng prongPi(2, {211, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Jpsi and pion pair from Psi2S", {prongJpsi, prongPi, prongPi}, {1, 1, 1}); return signal; } - if (!nameStr.compare("eePiPiFromPsi2S")) { + if (nameStr == "eePiPiFromPsi2S") { MCProng pronge(3, {11, 443, 100443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); MCProng prongPi(2, {211, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); signal = new MCSignal(name, "Electron pair and pion pair from Psi2S", {pronge, pronge, prongPi, prongPi}, {2, 2, 1, 1}); return signal; } - if (!nameStr.compare("eePiPiFromPromptPsi2S")) { + if (nameStr == "eePiPiFromPromptPsi2S") { MCProng pronge(3, {11, 443, 100443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false, {503}, {true}); MCProng prongPi(2, {211, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); signal = new MCSignal(name, "Electron pair and pion pair from prompt Psi2S", {pronge, pronge, prongPi, prongPi}, {2, 2, 1, 1}); return signal; } - if (!nameStr.compare("eePiPiFromNonpromptPsi2S")) { + if (nameStr == "eePiPiFromNonpromptPsi2S") { MCProng pronge(3, {11, 443, 100443}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}, false, {503}, {false}); MCProng prongPi(2, {211, 100443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {false}); signal = new MCSignal(name, "Electron pair and pion pair from non-prompt Psi2S", {pronge, pronge, prongPi, prongPi}, {2, 2, 1, 1}); return signal; } - if (!nameStr.compare("eeFromPromptJpsiAnyPrimary")) { + if (nameStr == "eeFromPromptJpsiAnyPrimary") { MCProng pronge(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {503}, {true}); pronge.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongPrimary(1); @@ -2014,7 +2014,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("eeFromJpsiAnyPrimary")) { + if (nameStr == "eeFromJpsiAnyPrimary") { MCProng pronge(2, {11, 443}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}); pronge.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongPrimary(1); @@ -2023,7 +2023,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name) return signal; } - if (!nameStr.compare("eeFromNonPromptJpsiAnyPrimary")) { + if (nameStr == "eeFromNonPromptJpsiAnyPrimary") { MCProng pronge(3, {11, 443, 503}, {true, true, true}, {false, false, false}, {0, 0, 0}, {0, 0, 0}, {false, false, false}); pronge.SetSourceBit(0, MCProng::kPhysicalPrimary); MCProng prongPrimary(1); From 894ccc4174a9ca841963234cc21364b0ec86f60d Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 11:19:54 +0200 Subject: [PATCH 09/11] readability-string-compare --- PWGDQ/Core/MixingLibrary.cxx | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/PWGDQ/Core/MixingLibrary.cxx b/PWGDQ/Core/MixingLibrary.cxx index b152de7d27c..8bc00b6a53d 100644 --- a/PWGDQ/Core/MixingLibrary.cxx +++ b/PWGDQ/Core/MixingLibrary.cxx @@ -29,183 +29,183 @@ void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible) { std::string nameStr = mixingVarible; - if (!nameStr.compare("Centrality1")) { + if (nameStr == "Centrality1") { std::vector fCentLimsHashing = {0.0f, 20.0f, 40.0f, 60.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentVZERO, fCentLimsHashing); } - if (!nameStr.compare("Centrality2")) { + if (nameStr == "Centrality2") { std::vector fCentLimsHashing = {0.0f, 10.0f, 20.0f, 40.0f, 60.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentVZERO, fCentLimsHashing); } - if (!nameStr.compare("Centrality3")) { + if (nameStr == "Centrality3") { std::vector fCentLimsHashing = {0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 70.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentVZERO, fCentLimsHashing); } - if (!nameStr.compare("Centrality4")) { + if (nameStr == "Centrality4") { std::vector fCentLimsHashing = {0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentVZERO, fCentLimsHashing); } - if (!nameStr.compare("Centrality5")) { + if (nameStr == "Centrality5") { std::vector fCentLimsHashing = {0.0f, 5.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentVZERO, fCentLimsHashing); } - if (!nameStr.compare("Centrality6")) { + if (nameStr == "Centrality6") { std::vector fCentLimsHashing = {0.0f, 2.5f, 5.0f, 7.5f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentVZERO, fCentLimsHashing); } - if (!nameStr.compare("CentralityFT0C1")) { + if (nameStr == "CentralityFT0C1") { std::vector fCentFT0CLimsHashing = {0.0f, 20.0f, 40.0f, 60.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentFT0C, fCentFT0CLimsHashing); } - if (!nameStr.compare("CentralityFT0C2")) { + if (nameStr == "CentralityFT0C2") { std::vector fCentFT0CLimsHashing = {0.0f, 10.0f, 20.0f, 40.0f, 60.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentFT0C, fCentFT0CLimsHashing); } - if (!nameStr.compare("CentralityFT0C3")) { + if (nameStr == "CentralityFT0C3") { std::vector fCentFT0CLimsHashing = {0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 70.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentFT0C, fCentFT0CLimsHashing); } - if (!nameStr.compare("CentralityFT0C4")) { + if (nameStr == "CentralityFT0C4") { std::vector fCentFT0CLimsHashing = {0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentFT0C, fCentFT0CLimsHashing); } - if (!nameStr.compare("CentralityFT0C5")) { + if (nameStr == "CentralityFT0C5") { std::vector fCentFT0CLimsHashing = {0.0f, 5.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentFT0C, fCentFT0CLimsHashing); } - if (!nameStr.compare("CentralityFT0C6")) { + if (nameStr == "CentralityFT0C6") { std::vector fCentFT0CLimsHashing = {0.0f, 2.5f, 5.0f, 7.5f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f}; mh->AddMixingVariable(VarManager::kCentFT0C, fCentFT0CLimsHashing); } - if (!nameStr.compare("Mult1")) { + if (nameStr == "Mult1") { std::vector fMultLimsHashing = {0.0f, 10.0f, 20.0f, 40.0f, 60.0f, 80.0f, 100.0f, 120.0f, 160.0f, 350.0f}; mh->AddMixingVariable(VarManager::kVtxNcontrib, fMultLimsHashing); } - if (!nameStr.compare("Mult2")) { + if (nameStr == "Mult2") { std::vector fMultLimsHashing = {0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f, 100.0f, 120.0f, 140.0f, 180.0f, 350.0f}; mh->AddMixingVariable(VarManager::kVtxNcontrib, fMultLimsHashing); } - if (!nameStr.compare("Mult3")) { + if (nameStr == "Mult3") { std::vector fMultLimsHashing = {0.0f, 5.0f, 10.0f, 15.0f, 20.0f, 25.0f, 30.0f, 35.0f, 40.0f, 45.0f, 50.0f, 55.0f, 60.0f, 65.0f, 70.0f, 75.0f, 80.0f, 85.0f, 90.0f, 100.0f, 120.0f, 140.0f, 165.0f, 200.0f, 350.0f}; mh->AddMixingVariable(VarManager::kVtxNcontrib, fMultLimsHashing); } - if (!nameStr.compare("Vtx1")) { + if (nameStr == "Vtx1") { std::vector fZLimsHashing = {-10.0f, 0.0f, 10.0f}; mh->AddMixingVariable(VarManager::kVtxZ, fZLimsHashing); } - if (!nameStr.compare("Vtx2")) { + if (nameStr == "Vtx2") { std::vector fZLimsHashing = {-10.0f, -5.0f, 0.0f, 5.0f, 10.0f}; mh->AddMixingVariable(VarManager::kVtxZ, fZLimsHashing); } - if (!nameStr.compare("Vtx3")) { + if (nameStr == "Vtx3") { std::vector fZLimsHashing = {-10.0f, -7.5f, -5.0f, -2.5f, 0.0f, 2.5f, 5.0f, 7.5f, 10.0f}; mh->AddMixingVariable(VarManager::kVtxZ, fZLimsHashing); } - if (!nameStr.compare("Vtx4")) { + if (nameStr == "Vtx4") { std::vector fZLimsHashing = {-10.0f, -8.0f, -6.0f, -4.0f, -2.0f, 0.0f, 2.0f, 4.0f, 6.0f, 8.0f, 10.0f}; mh->AddMixingVariable(VarManager::kVtxZ, fZLimsHashing); } - if (!nameStr.compare("Vtx5")) { + if (nameStr == "Vtx5") { std::vector fZLimsHashing = {-10.0f, -9.0f, -8.0f, -7.0f, -6.0f, -5.0f, -4.0f, -3.0f, -2.0f, -1.0f, 0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f}; mh->AddMixingVariable(VarManager::kVtxZ, fZLimsHashing); } - if (!nameStr.compare("Occupancy1")) { + if (nameStr == "Occupancy1") { std::vector fOccLimsHashing = {0.0f, 500.0f, 1000.0f, 2000.0f, 3000.0f, 6000.0f, 50000.0f}; mh->AddMixingVariable(VarManager::kTrackOccupancyInTimeRange, fOccLimsHashing); } - if (!nameStr.compare("Occupancy2")) { + if (nameStr == "Occupancy2") { std::vector fOccLimsHashing = {0.0f, 250.0f, 500.0f, 750.0f, 1000.0f, 1500.0f, 2000.0f, 3000.0f, 6000.0f, 50000.0f}; mh->AddMixingVariable(VarManager::kTrackOccupancyInTimeRange, fOccLimsHashing); } - if (!nameStr.compare("Occupancy3")) { + if (nameStr == "Occupancy3") { std::vector fOccLimsHashing = {0.0f, 250.0f, 500.0f, 750.0f, 1000.0f, 1500.0f, 2000.0f, 3000.0f, 4500.0f, 6000.0f, 8000.0f, 10000.0f, 50000.0f}; mh->AddMixingVariable(VarManager::kTrackOccupancyInTimeRange, fOccLimsHashing); } - if (!nameStr.compare("Psi2A1")) { + if (nameStr == "Psi2A1") { std::vector fPsi2A = {-TMath::Pi() / 2., 0.0f, TMath::Pi() / 2.}; mh->AddMixingVariable(VarManager::kPsi2A, fPsi2A); } - if (!nameStr.compare("Psi2A2")) { + if (nameStr == "Psi2A2") { std::vector fPsi2A = {-TMath::Pi() / 2., -TMath::Pi() / 4., 0.0f, TMath::Pi() / 4., TMath::Pi() / 2.}; mh->AddMixingVariable(VarManager::kPsi2A, fPsi2A); } - if (!nameStr.compare("Psi2A3")) { + if (nameStr == "Psi2A3") { std::vector fPsi2A = {-4 * TMath::Pi() / 8., -3 * TMath::Pi() / 8., -2 * TMath::Pi() / 8., -TMath::Pi() / 8., 0.0f, TMath::Pi() / 8., 2 * TMath::Pi() / 8., 3 * TMath::Pi() / 8., 4 * TMath::Pi() / 8.}; mh->AddMixingVariable(VarManager::kPsi2A, fPsi2A); } - if (!nameStr.compare("Psi2A4")) { + if (nameStr == "Psi2A4") { std::vector fPsi2A = {-8 * TMath::Pi() / 16., -7 * TMath::Pi() / 16., -6 * TMath::Pi() / 16., -5 * TMath::Pi() / 16., -4 * TMath::Pi() / 16., -3 * TMath::Pi() / 16., -2 * TMath::Pi() / 16., -TMath::Pi() / 16., 0.0f, TMath::Pi() / 16., 2 * TMath::Pi() / 16., 3 * TMath::Pi() / 16., 4 * TMath::Pi() / 16., 5 * TMath::Pi() / 16., 6 * TMath::Pi() / 16., 7 * TMath::Pi() / 16., 8 * TMath::Pi() / 16.}; mh->AddMixingVariable(VarManager::kPsi2A, fPsi2A); } - if (!nameStr.compare("Psi2A5")) { + if (nameStr == "Psi2A5") { std::vector fPsi2A = {-12 * TMath::Pi() / 24., -11 * TMath::Pi() / 24., -10 * TMath::Pi() / 24., -9 * TMath::Pi() / 24., -8 * TMath::Pi() / 24., -7 * TMath::Pi() / 24., -6 * TMath::Pi() / 24., -5 * TMath::Pi() / 24., -4 * TMath::Pi() / 24., -3 * TMath::Pi() / 24., -2 * TMath::Pi() / 24., -TMath::Pi() / 24., 0.0f, TMath::Pi() / 24., 2 * TMath::Pi() / 24., 3 * TMath::Pi() / 24., 4 * TMath::Pi() / 24., 5 * TMath::Pi() / 24., 6 * TMath::Pi() / 24., 7 * TMath::Pi() / 24., 8 * TMath::Pi() / 24., 9 * TMath::Pi() / 24., 10 * TMath::Pi() / 24., 11 * TMath::Pi() / 24., 12 * TMath::Pi() / 24.}; mh->AddMixingVariable(VarManager::kPsi2A, fPsi2A); } - if (!nameStr.compare("Psi2B1")) { + if (nameStr == "Psi2B1") { std::vector fPsi2B = {-TMath::Pi() / 2., 0.0f, TMath::Pi() / 2.}; mh->AddMixingVariable(VarManager::kPsi2B, fPsi2B); } - if (!nameStr.compare("Psi2B2")) { + if (nameStr == "Psi2B2") { std::vector fPsi2B = {-TMath::Pi() / 2., -TMath::Pi() / 4., 0.0f, TMath::Pi() / 4., TMath::Pi() / 2.}; mh->AddMixingVariable(VarManager::kPsi2B, fPsi2B); } - if (!nameStr.compare("Psi2B3")) { + if (nameStr == "Psi2B3") { std::vector fPsi2B = {-4 * TMath::Pi() / 8., -3 * TMath::Pi() / 8., -2 * TMath::Pi() / 8., -TMath::Pi() / 8., 0.0f, TMath::Pi() / 8., 2 * TMath::Pi() / 8., 3 * TMath::Pi() / 8., 4 * TMath::Pi() / 8.}; mh->AddMixingVariable(VarManager::kPsi2B, fPsi2B); } - if (!nameStr.compare("Psi2B4")) { + if (nameStr == "Psi2B4") { std::vector fPsi2B = {-8 * TMath::Pi() / 16., -7 * TMath::Pi() / 16., -6 * TMath::Pi() / 16., -5 * TMath::Pi() / 16., -4 * TMath::Pi() / 16., -3 * TMath::Pi() / 16., -2 * TMath::Pi() / 16., -TMath::Pi() / 16., 0.0f, TMath::Pi() / 16., 2 * TMath::Pi() / 16., 3 * TMath::Pi() / 16., 4 * TMath::Pi() / 16., 5 * TMath::Pi() / 16., 6 * TMath::Pi() / 16., 7 * TMath::Pi() / 16., 8 * TMath::Pi() / 16.}; mh->AddMixingVariable(VarManager::kPsi2B, fPsi2B); } - if (!nameStr.compare("Psi2B5")) { + if (nameStr == "Psi2B5") { std::vector fPsi2B = {-12 * TMath::Pi() / 24., -11 * TMath::Pi() / 24., -10 * TMath::Pi() / 24., -9 * TMath::Pi() / 24., -8 * TMath::Pi() / 24., -7 * TMath::Pi() / 24., -6 * TMath::Pi() / 24., -5 * TMath::Pi() / 24., -4 * TMath::Pi() / 24., -3 * TMath::Pi() / 24., -2 * TMath::Pi() / 24., -TMath::Pi() / 24., 0.0f, TMath::Pi() / 24., 2 * TMath::Pi() / 24., 3 * TMath::Pi() / 24., 4 * TMath::Pi() / 24., 5 * TMath::Pi() / 24., 6 * TMath::Pi() / 24., 7 * TMath::Pi() / 24., 8 * TMath::Pi() / 24., 9 * TMath::Pi() / 24., 10 * TMath::Pi() / 24., 11 * TMath::Pi() / 24., 12 * TMath::Pi() / 24.}; mh->AddMixingVariable(VarManager::kPsi2B, fPsi2B); } - if (!nameStr.compare("Psi2C1")) { + if (nameStr == "Psi2C1") { std::vector fPsi2C = {-TMath::Pi() / 2., 0.0f, TMath::Pi() / 2.}; mh->AddMixingVariable(VarManager::kPsi2C, fPsi2C); } - if (!nameStr.compare("Psi2C2")) { + if (nameStr == "Psi2C2") { std::vector fPsi2C = {-TMath::Pi() / 2., -TMath::Pi() / 4., 0.0f, TMath::Pi() / 4., TMath::Pi() / 2.}; mh->AddMixingVariable(VarManager::kPsi2C, fPsi2C); } - if (!nameStr.compare("Psi2C3")) { + if (nameStr == "Psi2C3") { std::vector fPsi2C = {-4 * TMath::Pi() / 8., -3 * TMath::Pi() / 8., -2 * TMath::Pi() / 8., -TMath::Pi() / 8., 0.0f, TMath::Pi() / 8., 2 * TMath::Pi() / 8., 3 * TMath::Pi() / 8., 4 * TMath::Pi() / 8.}; mh->AddMixingVariable(VarManager::kPsi2C, fPsi2C); } - if (!nameStr.compare("Psi2C4")) { + if (nameStr == "Psi2C4") { std::vector fPsi2C = {-8 * TMath::Pi() / 16., -7 * TMath::Pi() / 16., -6 * TMath::Pi() / 16., -5 * TMath::Pi() / 16., -4 * TMath::Pi() / 16., -3 * TMath::Pi() / 16., -2 * TMath::Pi() / 16., -TMath::Pi() / 16., 0.0f, TMath::Pi() / 16., 2 * TMath::Pi() / 16., 3 * TMath::Pi() / 16., 4 * TMath::Pi() / 16., 5 * TMath::Pi() / 16., 6 * TMath::Pi() / 16., 7 * TMath::Pi() / 16., 8 * TMath::Pi() / 16.}; mh->AddMixingVariable(VarManager::kPsi2C, fPsi2C); } - if (!nameStr.compare("Psi2C5")) { + if (nameStr == "Psi2C5") { std::vector fPsi2C = {-12 * TMath::Pi() / 24., -11 * TMath::Pi() / 24., -10 * TMath::Pi() / 24., -9 * TMath::Pi() / 24., -8 * TMath::Pi() / 24., -7 * TMath::Pi() / 24., -6 * TMath::Pi() / 24., -5 * TMath::Pi() / 24., -4 * TMath::Pi() / 24., -3 * TMath::Pi() / 24., -2 * TMath::Pi() / 24., -TMath::Pi() / 24., 0.0f, TMath::Pi() / 24., 2 * TMath::Pi() / 24., 3 * TMath::Pi() / 24., 4 * TMath::Pi() / 24., 5 * TMath::Pi() / 24., 6 * TMath::Pi() / 24., 7 * TMath::Pi() / 24., 8 * TMath::Pi() / 24., 9 * TMath::Pi() / 24., 10 * TMath::Pi() / 24., 11 * TMath::Pi() / 24., 12 * TMath::Pi() / 24.}; mh->AddMixingVariable(VarManager::kPsi2C, fPsi2C); } - if (!nameStr.compare("MedianTimeA1")) { + if (nameStr == "MedianTimeA1") { std::vector fMTLimsHashing = {-100.0f, -40.0f, -20.0f, 20.0f, 40.0f, 100.0f}; mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing); } - if (!nameStr.compare("MedianTimeA2")) { + if (nameStr == "MedianTimeA2") { std::vector fMTLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -20.0f, 0.0f, 20.0f, 40.0f, 60.0f, 80.0f, 100.0f}; mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing); } - if (!nameStr.compare("MedianTimeA3")) { + if (nameStr == "MedianTimeA3") { std::vector fMTLimsHashing = {-100.0f, -80.0f, -60.0f, -40.0f, -30.0f, -20.0f, -10.0f, 0.0f, 10.0f, 20.0f, 30.0f, 40.0f, 60.0f, 80.0f, 100.0f}; mh->AddMixingVariable(VarManager::kNTPCmedianTimeLongA, fMTLimsHashing); } - if (!nameStr.compare("PileUpA1")) { + if (nameStr == "PileUpA1") { std::vector fPileUpLimsHashing = {0.0f, 1000.0f, 2000.0f, 6000.0f, 10000.0f, 20000.0f}; mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing); } - if (!nameStr.compare("PileUpA2")) { + if (nameStr == "PileUpA2") { std::vector fPileUpLimsHashing = {0.0f, 1000.0f, 2000.0f, 4000.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing); } - if (!nameStr.compare("PileUpA3")) { + if (nameStr == "PileUpA3") { std::vector fPileUpLimsHashing = {0.0f, 1000.0f, 2000.0f, 3000.0f, 4000.0f, 5000.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing); } - if (!nameStr.compare("PileUpA4")) { + if (nameStr == "PileUpA4") { std::vector fPileUpLimsHashing = {0.0f, 500.0f, 1000.0f, 1500.0f, 2000.0f, 2500.0f, 3000.0f, 3500.0f, 4000.0f, 4500.0f, 5000.0f, 5500.0f, 6000.0f, 8000.0f, 10000.0f, 20000.0f}; mh->AddMixingVariable(VarManager::kNTPCcontribLongA, fPileUpLimsHashing); } From 85cc012fbe03eda2568403ff26f6b4bad766b123 Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 11:22:52 +0200 Subject: [PATCH 10/11] clang format --- PWGDQ/Core/CutsLibrary.cxx | 10 ++--- PWGDQ/Core/HistogramsLibrary.cxx | 74 ++++++++++++++++---------------- PWGDQ/Core/MCSignalLibrary.cxx | 2 +- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/PWGDQ/Core/CutsLibrary.cxx b/PWGDQ/Core/CutsLibrary.cxx index 0c6e3f2ab09..8c069d64920 100644 --- a/PWGDQ/Core/CutsLibrary.cxx +++ b/PWGDQ/Core/CutsLibrary.cxx @@ -865,7 +865,7 @@ AnalysisCompositeCut* o2::aod::dqcuts::GetCompositeCut(const char* cutName) return cut; } - if (nameStr == "kaonPID3_withDCA") { // same as kaonPID3 but with cut on DCA and SPDAny->ITSAny + if (nameStr == "kaonPID3_withDCA") { // same as kaonPID3 but with cut on DCA and SPDAny->ITSAny cut->AddCut(GetAnalysisCut("AssocKine")); // standard kine cuts usually are applied via Filter in the task cut->AddCut(GetAnalysisCut("electronStandardQualityForO2MCdebug4")); cut->AddCut(GetAnalysisCut("dcaCut1_ionut")); @@ -7861,7 +7861,7 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro TString centKey = centMember->name.GetString(); if (!centKey.Contains("AddCentCut")) { continue; -} + } const auto& centCut = centMember->value; @@ -7877,7 +7877,7 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro TString ptKey = ptMember->name.GetString(); if (!ptKey.Contains("AddPtCut")) { continue; -} + } const auto& ptCut = ptMember->value; @@ -7897,7 +7897,7 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro TString mlKey = mlMember->name.GetString(); if (!mlKey.Contains("AddMLCut")) { continue; -} + } const auto& mlcut = mlMember->value; @@ -7930,7 +7930,7 @@ o2::aod::dqmlcuts::BdtScoreConfig o2::aod::dqmlcuts::GetBdtScoreCutsAndConfigFro msg += std::to_string(binCuts[i]); if (i != binCuts.size() - 1) { msg += ", "; -} + } } msg += "] and direction: "; msg += (exclude ? "CutGreater" : "CutSmaller"); diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index 36f88a90a39..31e12549166 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -747,22 +747,22 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array pIN_bins; for (int i = 0; i <= 200; i++) { pIN_bins[i] = 0.01 * i; -} + } for (int i = 1; i <= 80; i++) { pIN_bins[200 + i] = 2. + 0.1 * i; -} + } int nbins_pIN = static_cast(pIN_bins.size()) - 1; std::array TPCdEdx_bins; for (int i = 0; i <= 200; i++) { TPCdEdx_bins[i] = i; -} + } int nbins_TPCdEdx = static_cast(TPCdEdx_bins.size()) - 1; std::array nSigma_bins; for (int i = 0; i <= 100; i++) { nSigma_bins[i] = -5. + 0.1 * i; -} + } int nbins_nSigma = static_cast(nSigma_bins.size()) - 1; hm->AddHistogram(histClass, "TPCdedx_pIN", "TPC dE/dx vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_TPCdEdx, TPCdEdx_bins.data(), VarManager::kTPCsignal); @@ -825,7 +825,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array tpcNsigmaBinLims; for (int i = 0; i <= kTPCnsigmaNbins; ++i) { tpcNsigmaBinLims[i] = -7.0 + 0.2 * i; -} + } const int kPinEleNbins = 20; std::array pinEleBinLims = {0.1, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0, 6.0, 8.0, 10.0, 12.0, 16.0, 20.0}; @@ -837,7 +837,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array tpcNclusterBinLims; for (int i = 0; i <= kTPCnClusterbins; ++i) { tpcNclusterBinLims[i] = 10 * i; -} + } std::array nSigBinLimits; nSigBinLimits[0] = TArrayD(kTPCnsigmaNbins + 1, tpcNsigmaBinLims.data()); @@ -885,22 +885,22 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array pIN_bins; for (int i = 0; i <= 200; i++) { pIN_bins[i] = 0.01 * i; -} + } for (int i = 1; i <= 80; i++) { pIN_bins[200 + i] = 2. + 0.1 * i; -} + } int nbins_pIN = static_cast(pIN_bins.size()) - 1; std::array TOFbeta_bins; for (int i = 0; i <= 240; i++) { TOFbeta_bins[i] = 0.005 * i; -} + } int nbins_TOFbeta = static_cast(TOFbeta_bins.size()) - 1; std::array nSigma_bins; for (int i = 0; i <= 100; i++) { nSigma_bins[i] = -5. + 0.1 * i; -} + } int nbins_nSigma = static_cast(nSigma_bins.size()) - 1; hm->AddHistogram(histClass, "TOFbeta_pIN", "TOF #beta vs pIN", false, nbins_pIN, pIN_bins.data(), VarManager::kPin, nbins_TOFbeta, TOFbeta_bins.data(), VarManager::kTOFbeta); @@ -922,22 +922,22 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array pIN_bins; for (int i = 0; i <= 140; i++) { pIN_bins[i] = 0.01 * i + 0.1; -} + } for (int i = 1; i <= 15; i++) { pIN_bins[140 + i] = 1.5 + 0.1 * i; -} + } for (int i = 1; i <= 14; i++) { pIN_bins[155 + i] = 3. + 0.5 * i; -} + } const int kNbins_pINmore = 135; std::array pIN_binsmore; for (int i = 0; i <= 120; i++) { pIN_binsmore[i] = 0.01 * i + 0.3; -} + } for (int i = 1; i <= 10; i++) { pIN_binsmore[120 + i] = 1.5 + 0.2 * i; -} + } pIN_binsmore[131] = 4.; pIN_binsmore[132] = 5.; pIN_binsmore[133] = 6.; @@ -948,31 +948,31 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array nSigma_bins; for (int i = 0; i <= kNbins_nSigma; i++) { nSigma_bins[i] = -5. + 0.1 * i; -} + } const int kNbins_nSigmamore = 50; std::array nSigma_binsmore; for (int i = 0; i <= kNbins_nSigmamore; i++) { nSigma_binsmore[i] = -5. + 0.2 * i; -} + } const int kNbins_nSigmagrob = 24; std::array nSigma_binsgrob; for (int i = 0; i <= kNbins_nSigmagrob; i++) { nSigma_binsgrob[i] = -6. + 0.5 * i; -} + } const int kNbins_TOFbeta = 120; std::array TOFbeta_bins; for (int i = 0; i <= kNbins_TOFbeta; i++) { TOFbeta_bins[i] = 0.01 * i; -} + } const int kNbins_TPCdEdx = 140; std::array TPCdEdx_bins; for (int i = 0; i <= kNbins_TPCdEdx; i++) { TPCdEdx_bins[i] = i + 20; -} + } std::array nSigmaBinLimits; nSigmaBinLimits[0] = TArrayD(kNbins_pIN + 1, pIN_bins.data()); @@ -1566,7 +1566,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array TauBinLims; for (int i = 0; i <= kTauNBins; ++i) { TauBinLims[i] = -0.3 + (0.0015 * i); -} + } std::array nCutsBinLimits; nCutsBinLimits[0] = TArrayD(kInvMassNbins + 1, InvMassBinLims.data()); @@ -2082,13 +2082,13 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array mee_bins; for (int i = 0; i <= 20; i++) { mee_bins[i] = 0.01 * i; -} + } for (int i = 1; i <= 8; i++) { mee_bins[20 + i] = 0.2 + 0.1 * i; -} + } for (int i = 1; i <= 8; i++) { mee_bins[28 + i] = 1. + 0.5 * i; -} + } int nbins_mee = static_cast(mee_bins.size()) - 1; // binning for ptee at large scales: @@ -2096,7 +2096,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array ptee_bins; for (int i = 0; i <= 50; i++) { ptee_bins[i] = 0.2 * i; -} + } int nbins_ptee = static_cast(ptee_bins.size()) - 1; // binning for phiv: @@ -2130,16 +2130,16 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array mee_bins; for (int i = 0; i <= 110; i++) { mee_bins[i] = 0.01 * i; -} + } for (int i = 1; i <= 32; i++) { mee_bins[110 + i] = 1.1 + 0.05 * i; -} + } for (int i = 1; i <= 50; i++) { mee_bins[142 + i] = 2.7 + 0.01 * i; -} + } for (int i = 1; i <= 176; i++) { mee_bins[192 + i] = 3.2 + 0.05 * i; -} + } int nbins_mee = static_cast(mee_bins.size()) - 1; // binning for ptee at large scales: @@ -2148,10 +2148,10 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array ptee_bins; for (int i = 0; i <= 100; i++) { ptee_bins[i] = 0.1 * i; -} + } for (int i = 1; i <= 100; i++) { ptee_bins[100 + i] = 10 + 0.2 * i; -} + } int nbins_ptee = static_cast(ptee_bins.size()) - 1; // binning for dca at large scales: @@ -2161,13 +2161,13 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array dca_bins; for (int i = 0; i <= 50; i++) { dca_bins[i] = 0.1 * i; -} + } for (int i = 1; i <= 10; i++) { dca_bins[50 + i] = 5 + 0.5 * i; -} + } for (int i = 1; i <= 30; i++) { dca_bins[60 + i] = 10 + 1 * i; -} + } int nbins_dca = static_cast(dca_bins.size()) - 1; hm->AddHistogram(histClass, "Mass_QuadDCAsigXY", "", false, nbins_mee, mee_bins.data(), VarManager::kMass, nbins_dca, dca_bins.data(), VarManager::kQuadDCAsigXY); @@ -2254,7 +2254,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array InvMassBinLims; for (int i = 0; i <= kInvMassNbins; ++i) { InvMassBinLims[i] = 4.0 + 0.02 * i; -} + } const int kPtNbins = 6; std::array PtBinLims = {0., 2., 4., 6., 8., 10., 20.}; @@ -2282,13 +2282,13 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array InvMassBinLims; for (int i = 0; i <= kInvMassBins; i++) { InvMassBinLims[i] = 0 + i * 0.01; -} + } const int kDelEtaBins = 20; std::array DelEtaBinLims; for (int i = 0; i <= kDelEtaBins; i++) { DelEtaBinLims[i] = -2 + i * 0.2; -} + } const int kDelPhiBins = 26; std::array DelPhiBinLims = {-1.69647, -1.44513, -1.19381, -0.94248, -0.69115, -0.43982, -0.18850, 0.06283, 0.31416, 0.56549, 0.81681, 1.06814, 1.31947, 1.57080, 1.82212, 2.07345, 2.32478, 2.57611, 2.82743, 3.07876, 3.33009, 3.58142, 3.83274, 4.08407, 4.33540, 4.58673, 4.83806}; diff --git a/PWGDQ/Core/MCSignalLibrary.cxx b/PWGDQ/Core/MCSignalLibrary.cxx index 33aa1bafe5a..19dcbbc8aa9 100644 --- a/PWGDQ/Core/MCSignalLibrary.cxx +++ b/PWGDQ/Core/MCSignalLibrary.cxx @@ -2423,7 +2423,7 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa // Calling the MCProng constructor auto* prong = new MCProng(n, pdgs, checkBothCharges, excludePDG, sBitsVec, sBitsExcludeVec, useANDonSourceBitMap, - checkGenerationsInTime, checkIfPDGInHistory, excludePDGInHistory); + checkGenerationsInTime, checkIfPDGInHistory, excludePDGInHistory); // Print the configuration prong->Print(); return prong; From 694ea3fe8bcf52710b5a58a6aef2c4e63626129f Mon Sep 17 00:00:00 2001 From: Maurice Coquet Date: Wed, 1 Jul 2026 11:46:58 +0200 Subject: [PATCH 11/11] fixing bugs introduced in HistogramsLibrary --- PWGDQ/Core/HistogramsLibrary.cxx | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index 31e12549166..a2a3dcc005a 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -2545,7 +2545,7 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist) } // Check if the histogram uses constant binning bool isConstantBinning = true; - if (!(hist->HasMember("xmin.data()") && hist->HasMember("xmax.data()"))) { + if (!(hist->HasMember("xmin") && hist->HasMember("xmax"))) { isConstantBinning = false; } @@ -2556,17 +2556,17 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist) bool isProfile = (hist->HasMember("isProfile") ? hist->FindMember("isProfile")->value.GetBool() : false); if (isConstantBinning) { - if (!hist->HasMember("xmin.data()") || !hist->HasMember("xmax.data()")) { - LOG(fatal) << "Missing xmin.data() or xmax.data() information for histogram"; + if (!hist->HasMember("xmin") || !hist->HasMember("xmax")) { + LOG(fatal) << "Missing xmin or xmax information for histogram"; return false; } if (isTHn) { - if (!hist->FindMember("xmin.data()")->value.IsArray()) { - LOG(fatal) << "xmin.data() field should be an array of arrays"; + if (!hist->FindMember("xmin")->value.IsArray()) { + LOG(fatal) << "xmin field should be an array of arrays"; return false; } - if (!hist->FindMember("xmax.data()")->value.IsArray()) { - LOG(fatal) << "xmax.data() field should be an array of arrays"; + if (!hist->FindMember("xmax")->value.IsArray()) { + LOG(fatal) << "xmax field should be an array of arrays"; return false; } } @@ -2594,8 +2594,8 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist) } if (isTHn) { - if (!hist->HasMember("nDimensions") || !hist->HasMember("vars.data()")) { - LOG(fatal) << "Missing nDimensions or vars.data() fields for histogram"; + if (!hist->HasMember("nDimensions") || !hist->HasMember("vars")) { + LOG(fatal) << "Missing nDimensions or vars fields for histogram"; return false; } if (isConstantBinning) { @@ -2683,9 +2683,9 @@ bool o2::aod::dqhistograms::ValidateJSONHistogram(T hist) } } if (isTHn) { - for (auto& v : hist->FindMember("vars.data()")->value.GetArray()) { + for (auto& v : hist->FindMember("vars")->value.GetArray()) { if (VarManager::fgVarNamesMap.find(v.GetString()) == VarManager::fgVarNamesMap.end()) { - LOG(fatal) << "Bad variable in vars.data() (" << v.GetString() << ") specified for histogram"; + LOG(fatal) << "Bad variable in vars (" << v.GetString() << ") specified for histogram"; return false; } } @@ -2740,7 +2740,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch bool isTH3 = (histTypeStr.CompareTo("TH3") == 0); bool isTHn = (histTypeStr.CompareTo("THn") == 0); bool isConstantBinning = true; - if (!(hist.HasMember("xmin.data()") && hist.HasMember("xmax.data()"))) { + if (!(hist.HasMember("xmin") && hist.HasMember("xmax"))) { isConstantBinning = false; } @@ -2757,7 +2757,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch int* vars = new int[nDimensions]; int iDim = 0; - for (auto& v : hist.FindMember("vars.data()")->value.GetArray()) { + for (auto& v : hist.FindMember("vars")->value.GetArray()) { LOG(debug) << "iDim " << iDim << ": " << v.GetString(); vars[iDim++] = VarManager::fgVarNamesMap[v.GetString()]; } @@ -2776,14 +2776,14 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch LOG(debug) << "nBins " << iDim << ": " << nBins[iDim - 1]; } iDim = 0; - for (auto& v : hist.FindMember("xmin.data()")->value.GetArray()) { + for (auto& v : hist.FindMember("xmin")->value.GetArray()) { xmin[iDim++] = v.GetDouble(); - LOG(debug) << "xmin.data() " << iDim << ": " << xmin[iDim - 1]; + LOG(debug) << "xmin " << iDim << ": " << xmin[iDim - 1]; } iDim = 0; - for (auto& v : hist.FindMember("xmax.data()")->value.GetArray()) { + for (auto& v : hist.FindMember("xmax")->value.GetArray()) { xmax[iDim++] = v.GetDouble(); - LOG(debug) << "xmax.data() " << iDim << ": " << xmax[iDim - 1]; + LOG(debug) << "xmax " << iDim << ": " << xmax[iDim - 1]; } } else { int iDim = 0; @@ -2813,11 +2813,11 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch if (isConstantBinning) { for (auto histClass : histClasses) { - hm->AddHistogram(histClass, histName, title, nDimensions, vars.data(), nBins, xmin.data(), xmax.data(), axLabels, varW, useSparse, isDouble); + hm->AddHistogram(histClass, histName, title, nDimensions, vars, nBins, xmin, xmax, axLabels, varW, useSparse, isDouble); } } else { for (auto histClass : histClasses) { - hm->AddHistogram(histClass, histName, title, nDimensions, vars.data(), binLimits, axLabels, varW, useSparse, isDouble); + hm->AddHistogram(histClass, histName, title, nDimensions, vars, binLimits, axLabels, varW, useSparse, isDouble); } } @@ -2834,11 +2834,11 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch const char* varX = hist.FindMember("varX")->value.GetString(); LOG(debug) << "varX: " << varX; - double xmin = (hist.HasMember("xmin.data()") ? hist.FindMember("xmin.data()")->value.GetDouble() : 0.0); - LOG(debug) << "xmin.data(): " << xmin.data(); + double xmin = (hist.HasMember("xmin") ? hist.FindMember("xmin")->value.GetDouble() : 0.0); + LOG(debug) << "xmin: " << xmin; - double xmax = (hist.HasMember("xmax.data()") ? hist.FindMember("xmax.data()")->value.GetDouble() : 0.0); - LOG(debug) << "xmax.data(): " << xmax.data(); + double xmax = (hist.HasMember("xmax") ? hist.FindMember("xmax")->value.GetDouble() : 0.0); + LOG(debug) << "xmax: " << xmax; std::vector xbinsVec; if (hist.HasMember("xbins")) { @@ -2915,7 +2915,7 @@ void o2::aod::dqhistograms::AddHistogramsFromJSON(HistogramManager* hm, const ch if (isConstantBinning) { for (auto histClass : histClasses) { hm->AddHistogram(histClass, histName, title, isProfile, - nXbins, xmin.data(), xmax.data(), VarManager::fgVarNamesMap[varX], + nXbins, xmin, xmax, VarManager::fgVarNamesMap[varX], nYbins, ymin, ymax, VarManager::fgVarNamesMap[varY], nZbins, zmin, zmax, VarManager::fgVarNamesMap[varZ], xLabels, yLabels, zLabels,