@@ -176,17 +176,17 @@ struct Alice3DqEfficiencyAnalysisEventSelection {
176176 fEventCut = new AnalysisCompositeCut (true );
177177 TString eventCutStr = cfgEventCuts.value ;
178178 if (eventCutStr != " " ) {
179- AnalysisCut* cut = dqcuts::GetAnalysisCut (eventCutStr.Data ());
179+ AnalysisCut* cut = dqcuts::getAnalysisCut (eventCutStr.Data ());
180180 if (cut != nullptr ) {
181- fEventCut ->AddCut (cut);
181+ fEventCut ->addCut (cut);
182182 }
183183 }
184184 // Additional cuts via JSON
185185 TString eventCutJSONStr = cfgEventCutsJSON.value ;
186186 if (eventCutJSONStr != " " ) {
187- std::vector<AnalysisCut*> jsonCuts = dqcuts::GetCutsFromJSON (eventCutJSONStr.Data ());
187+ std::vector<AnalysisCut*> jsonCuts = dqcuts::getCutsFromJSON (eventCutJSONStr.Data ());
188188 for (const auto & cutIt : jsonCuts) {
189- fEventCut ->AddCut (cutIt);
189+ fEventCut ->addCut (cutIt);
190190 }
191191 }
192192
@@ -231,7 +231,7 @@ struct Alice3DqEfficiencyAnalysisEventSelection {
231231 if (cfgQA) {
232232 fHistMan ->FillHistClass (" Event_BeforeCuts" , dqefficiency_helpers::varValues ()); // automatically fill all the histograms in the class Event
233233 }
234- if (fEventCut ->IsSelected (dqefficiency_helpers::varValues ())) {
234+ if (fEventCut ->isSelected (dqefficiency_helpers::varValues ())) {
235235 if (cfgQA) {
236236 fHistMan ->FillHistClass (" Event_AfterCuts" , dqefficiency_helpers::varValues ());
237237 }
@@ -319,13 +319,13 @@ struct Alice3DqEfficiencyAnalysisTrackSelection {
319319 if (!cutNamesStr.IsNull ()) {
320320 std::unique_ptr<TObjArray> objArray (cutNamesStr.Tokenize (" ," ));
321321 for (int icut = 0 ; icut < objArray->GetEntries (); ++icut) {
322- fTrackCuts .push_back (dqcuts::GetCompositeCut (objArray->At (icut)->GetName ()));
322+ fTrackCuts .push_back (dqcuts::getCompositeCut (objArray->At (icut)->GetName ()));
323323 }
324324 }
325325 // add extra cuts from JSON
326326 TString addTrackCutsStr = cfgBarrelTrackCutsJSON.value ;
327327 if (addTrackCutsStr != " " ) {
328- std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON (addTrackCutsStr.Data ());
328+ std::vector<AnalysisCut*> addTrackCuts = dqcuts::getCutsFromJSON (addTrackCutsStr.Data ());
329329 for (const auto & t : addTrackCuts) {
330330 fTrackCuts .push_back (t);
331331 }
@@ -434,7 +434,7 @@ struct Alice3DqEfficiencyAnalysisTrackSelection {
434434 int iCut = 0 ;
435435 auto filterMap = static_cast <uint32_t >(0 );
436436 for (auto cut = fTrackCuts .begin (); cut != fTrackCuts .end (); cut++, iCut++) {
437- if ((*cut)->IsSelected (dqefficiency_helpers::varValues ())) {
437+ if ((*cut)->isSelected (dqefficiency_helpers::varValues ())) {
438438 filterMap |= (static_cast <uint32_t >(1 ) << iCut);
439439 if (cfgQA) {
440440 fHistMan ->FillHistClass (fHistNamesReco [iCut], dqefficiency_helpers::varValues ());
@@ -600,7 +600,7 @@ struct Alice3DqEfficiencyAnalysisPrefilterSelection {
600600 getTaskOptionValue<string>(context, " alice3-dq-efficiency-analysis-track-selection" , " cfgBarrelTrackCutsJSON" , trackCuts, false );
601601 TString addTrackCutsStr = trackCuts;
602602 if (addTrackCutsStr != " " ) {
603- std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON (addTrackCutsStr.Data ());
603+ std::vector<AnalysisCut*> addTrackCuts = dqcuts::getCutsFromJSON (addTrackCutsStr.Data ());
604604 for (const auto & t : addTrackCuts) {
605605 allTrackCutsStr += Form (" ,%s" , t->GetName ());
606606 }
@@ -626,7 +626,7 @@ struct Alice3DqEfficiencyAnalysisPrefilterSelection {
626626 fPairCut = new AnalysisCompositeCut (true );
627627 TString pairCutStr = cfgPrefilterPairCut.value ;
628628 if (!pairCutStr.IsNull ()) {
629- fPairCut = dqcuts::GetCompositeCut (pairCutStr.Data ());
629+ fPairCut = dqcuts::getCompositeCut (pairCutStr.Data ());
630630 }
631631 }
632632 if (fPrefilterMask == static_cast <uint32_t >(0 ) || fPrefilterCutBit < 0 ) {
@@ -672,7 +672,7 @@ struct Alice3DqEfficiencyAnalysisPrefilterSelection {
672672 VarManager::FillPairCollision<VarManager::kDecayToEE , GkTrackFillMap>(event, track1, track2);
673673 }
674674 // if the pair fullfils the criteria, add an entry into the prefilter map for the two tracks
675- if (fPairCut ->IsSelected (dqefficiency_helpers::varValues ())) {
675+ if (fPairCut ->isSelected (dqefficiency_helpers::varValues ())) {
676676 if (!fPrefilterMap .contains (track1.globalIndex ()) && track1Candidate > 0 ) {
677677 fPrefilterMap [track1.globalIndex ()] = track1Candidate;
678678 }
@@ -803,7 +803,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
803803 if (!pairCutNamesStr.IsNull ()) {
804804 std::unique_ptr<TObjArray> objArray (pairCutNamesStr.Tokenize (" ," ));
805805 for (int icut = 0 ; icut < objArray->GetEntries (); ++icut) {
806- fPairCuts .push_back (*dqcuts::GetCompositeCut (objArray->At (icut)->GetName ()));
806+ fPairCuts .push_back (*dqcuts::getCompositeCut (objArray->At (icut)->GetName ()));
807807 }
808808 }
809809
@@ -848,7 +848,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
848848 getTaskOptionValue<string>(context, " alice3-dq-efficiency-analysis-track-selection" , " cfgBarrelTrackCutsJSON" , tempCuts, false );
849849 TString addTrackCutsStr = tempCuts;
850850 if (addTrackCutsStr != " " ) {
851- std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON (addTrackCutsStr.Data ());
851+ std::vector<AnalysisCut*> addTrackCuts = dqcuts::getCutsFromJSON (addTrackCutsStr.Data ());
852852 for (const auto & t : addTrackCuts) {
853853 tempCutsStr += Form (" ,%s" , t->GetName ());
854854 }
@@ -857,9 +857,9 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
857857 // get the mc generated acceptance cut
858858 TString mcGenAccCutStr = cfgTrackCuts.cfgMCGenAccCut .value ;
859859 if (mcGenAccCutStr != " " ) {
860- AnalysisCut* cut = dqcuts::GetAnalysisCut (mcGenAccCutStr.Data ());
860+ AnalysisCut* cut = dqcuts::getAnalysisCut (mcGenAccCutStr.Data ());
861861 if (cut != nullptr ) {
862- fMCGenAccCut .AddCut (cut);
862+ fMCGenAccCut .addCut (cut);
863863 }
864864 fUseMCGenAccCut = true ;
865865 }
@@ -1154,7 +1154,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
11541154 }
11551155 for (unsigned int iPairCut = 0 ; iPairCut < fPairCuts .size (); iPairCut++) {
11561156 AnalysisCompositeCut cut = fPairCuts .at (iPairCut);
1157- if (!(cut.IsSelected (dqefficiency_helpers::varValues ()))) { // apply pair cuts
1157+ if (!(cut.isSelected (dqefficiency_helpers::varValues ()))) { // apply pair cuts
11581158 continue ;
11591159 }
11601160 if (sign1 * sign2 < 0 ) {
@@ -1181,7 +1181,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
11811181 VarManager::FillTrackMC (mcTracks, mctrack);
11821182 // if we have a mc generated acceptance cut, apply it here
11831183 if (fUseMCGenAccCut ) {
1184- if (!fMCGenAccCut .IsSelected (dqefficiency_helpers::varValues ())) {
1184+ if (!fMCGenAccCut .isSelected (dqefficiency_helpers::varValues ())) {
11851185 continue ;
11861186 }
11871187 }
@@ -1210,7 +1210,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
12101210 VarManager::FillTrackMC (mcTracks, track);
12111211 // if we have a mc generated acceptance cut, apply it here
12121212 if (fUseMCGenAccCut ) {
1213- if (!fMCGenAccCut .IsSelected (dqefficiency_helpers::varValues ())) {
1213+ if (!fMCGenAccCut .isSelected (dqefficiency_helpers::varValues ())) {
12141214 continue ;
12151215 }
12161216 }
@@ -1235,7 +1235,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
12351235 if (sig->CheckSignal (true , t1Raw, t2Raw)) {
12361236 VarManager::FillPairMC<VarManager::kDecayToEE >(t1, t2);
12371237 if (fUseMCGenAccCut ) {
1238- if (!fMCGenAccCut .IsSelected (dqefficiency_helpers::varValues ())) {
1238+ if (!fMCGenAccCut .isSelected (dqefficiency_helpers::varValues ())) {
12391239 continue ;
12401240 }
12411241 }
@@ -1267,7 +1267,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
12671267 if (sig->CheckSignal (true , t1Raw, t2Raw)) {
12681268 VarManager::FillPairMC<VarManager::kDecayToEE >(t1, t2);
12691269 if (fUseMCGenAccCut ) {
1270- if (!fMCGenAccCut .IsSelected (dqefficiency_helpers::varValues ())) {
1270+ if (!fMCGenAccCut .isSelected (dqefficiency_helpers::varValues ())) {
12711271 continue ;
12721272 }
12731273 }
@@ -1560,13 +1560,13 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
15601560 if (!pairCutNamesStr.IsNull ()) {
15611561 std::unique_ptr<TObjArray> objArray (pairCutNamesStr.Tokenize (" ," ));
15621562 for (int icut = 0 ; icut < objArray->GetEntries (); ++icut) {
1563- fPairCuts .push_back (dqcuts::GetCompositeCut (objArray->At (icut)->GetName ()));
1563+ fPairCuts .push_back (dqcuts::getCompositeCut (objArray->At (icut)->GetName ()));
15641564 }
15651565 }
15661566 // Extra pair cuts via JSON
15671567 TString addPairCutsStr = cfgPairCutsJSON.value ;
15681568 if (addPairCutsStr != " " ) {
1569- std::vector<AnalysisCut*> addPairCuts = dqcuts::GetCutsFromJSON (addPairCutsStr.Data ());
1569+ std::vector<AnalysisCut*> addPairCuts = dqcuts::getCutsFromJSON (addPairCutsStr.Data ());
15701570 for (const auto & t : addPairCuts) {
15711571 fPairCuts .push_back (t);
15721572 pairCutNamesStr += Form (" ,%s" , t->GetName ());
@@ -1613,7 +1613,7 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
16131613 getTaskOptionValue<string>(context, " alice3-dq-efficiency-analysis-track-selection" , " cfgBarrelTrackCutsJSON" , tempCuts, false );
16141614 TString addTrackCutsStr = tempCuts;
16151615 if (addTrackCutsStr != " " ) {
1616- std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON (addTrackCutsStr.Data ());
1616+ std::vector<AnalysisCut*> addTrackCuts = dqcuts::getCutsFromJSON (addTrackCutsStr.Data ());
16171617 for (const auto & t : addTrackCuts) {
16181618 tempCutsStr += Form (" ,%s" , t->GetName ());
16191619 }
@@ -2056,7 +2056,7 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
20562056 } // end loop (common cuts)
20572057 int iPairCut = 0 ;
20582058 for (auto cut = fPairCuts .begin (); cut != fPairCuts .end (); cut++, iPairCut++) {
2059- if (!((*cut)->IsSelected (dqefficiency_helpers::varValues ()))) { // apply pair cuts
2059+ if (!((*cut)->isSelected (dqefficiency_helpers::varValues ()))) { // apply pair cuts
20602060 continue ;
20612061 }
20622062 // Histograms with pair cuts
@@ -2267,7 +2267,7 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
22672267 } // end loop (common cuts)
22682268 int iPairCut = 0 ;
22692269 for (auto cut = fPairCuts .begin (); cut != fPairCuts .end (); cut++, iPairCut++) {
2270- if (!((*cut)->IsSelected (dqefficiency_helpers::varValues ()))) { // apply pair cuts
2270+ if (!((*cut)->isSelected (dqefficiency_helpers::varValues ()))) { // apply pair cuts
22712271 continue ;
22722272 }
22732273 // Histograms with pair cuts
0 commit comments