@@ -68,19 +68,19 @@ double deltaPhi(double phi1, double phi2)
6868// / The collision selection is done and stored in multiple steps, for later QA analysis.
6969// / In order not to hard code which bins should be filled throughout different process
7070// / function, this namespace with enums is create
71- namespace collisionSelections
71+ namespace collision_selections
7272{
7373 enum CollisionSelectionStep {
74- kMCCollisions = 0 , // /< raw mccollisions with no selection, starts with 0
75- kMCCollisionsZCut , // /< mccollisions with z vtx selection
76- kMCCollisionsZCutSel8 , // /< mccollisions with z vtx and sel8 mc emulated selections
77- kMCCollisionsZCutSel8HasCollisions , // /< mccollisions with z vtx and sel8 mc emulated selections, with at least one reconstructed collisions
78- kMCCollisionsZCutSel8SplitCollisions , // /< mccollisions with z vtx and sel8 mc emulated selections, with no split reconstructed collisions
79- kRecoCollisions , // /< raw reconstructed collisions after previous mccollisions selection
80- kRecoCollisionsZcut , // /< reconstructed collisions with z vtx selection after previous mccollisions selection
81- kRecoCollisionsZcutSel8 // /< reconstructed collisions with z vtx and sel8 selections after previous mccollisions selection
74+ StepMcCollisions = 0 , // /< raw mccollisions with no selection, starts with 0
75+ StepMcCollisionsZCut , // /< mccollisions with z vtx selection
76+ StepMcCollisionsZCutSel8 , // /< mccollisions with z vtx and sel8 mc emulated selections
77+ StepMcCollisionsZCutSel8HasCollisions , // /< mccollisions with z vtx and sel8 mc emulated selections, with at least one reconstructed collisions
78+ StepMcCollisionsZCutSel8NoSplitCollisions , // /< mccollisions with z vtx and sel8 mc emulated selections, with no split reconstructed collisions
79+ StepRecoCollisions , // /< raw reconstructed collisions after previous mccollisions selection
80+ StepRecoCollisionsZcut , // /< reconstructed collisions with z vtx selection after previous mccollisions selection
81+ StepRecoCollisionsZcutSel8 // /< reconstructed collisions with z vtx and sel8 selections after previous mccollisions selection
8282 };
83- }
83+ } // namespace collision_selections
8484// creating table for storing distance data
8585namespace o2 ::aod
8686{
@@ -275,11 +275,11 @@ struct HfFragmentationFunction {
275275 aod::JetTracks const &)
276276 {
277277 // apply event selection and fill histograms for sanity check
278- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kRecoCollisions );
278+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepRecoCollisions );
279279 if (applyRecoEventSelection && (!jetderiveddatautilities::selectCollision (collision, eventSelectionBits) || !(std::abs (collision.posZ ()) < vertexZCut))) {
280280 return ;
281281 }
282- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kRecoCollisionsZcutSel8 );
282+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepRecoCollisionsZcutSel8 );
283283
284284 for (const auto & jet : jets) {
285285 // fill jet counter histogram
@@ -350,22 +350,22 @@ struct HfFragmentationFunction {
350350 {
351351 for (const auto & mccollision : mccollisions) {
352352
353- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kMCCollisions );
353+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepMcCollisions );
354354 // skip collisions outside of |z| < vertexZCut
355355 if (applyMcEventSelection && (!jetderiveddatautilities::selectCollision (mccollision, eventSelectionBits) || !(std::abs (mccollision.posZ ()) < vertexZCut))) {
356356 continue ;
357357 }
358- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kMCCollisionsZCutSel8 );
358+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepMcCollisionsZCutSel8 );
359359
360360 // reconstructed collisions associated to same mccollision
361361 const auto collisionsPerMCCollision = collisions.sliceBy (collisionsPerMCCollisionPreslice, mccollision.globalIndex ());
362362 for (const auto & collision : collisionsPerMCCollision) {
363363
364- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kRecoCollisions );
364+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepRecoCollisions );
365365 if (applyRecoEventSelection && (!jetderiveddatautilities::selectCollision (collision, eventSelectionBits) || !(std::abs (collision.posZ ()) < vertexZCut))) {
366366 continue ;
367367 }
368- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kRecoCollisionsZcutSel8 );
368+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepRecoCollisionsZcutSel8 );
369369
370370 // d0 detector level jets associated to the current same collision
371371 const auto d0mcdJetsPerCollision = mcdjets.sliceBy (d0MCDJetsPerCollisionPreslice, collision.globalIndex ());
@@ -437,16 +437,16 @@ struct HfFragmentationFunction {
437437 for (const auto & mccollision : mccollisions) {
438438
439439 // --- begin event selection
440- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kMCCollisions );
440+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepMcCollisions );
441441 // skip collisions outside of |z| < vertexZCut
442442 if (applyMcEventSelection && !(std::abs (mccollision.posZ ()) < vertexZCut)) {
443443 continue ;
444444 }
445- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kMCCollisionsZCut );
445+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepMcCollisionsZCut );
446446 if (applyMcEventSelection && !jetderiveddatautilities::selectCollision (mccollision, eventSelectionBits)) {
447447 continue ;
448448 }
449- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kMCCollisionsZCutSel8 );
449+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepMcCollisionsZCutSel8 );
450450
451451 // reconstructed collisions associated to this mccollision
452452 const auto collisionsPerMCCollision = collisions.sliceBy (collisionsPerMCCollisionPreslice, mccollision.globalIndex ());
@@ -455,24 +455,24 @@ struct HfFragmentationFunction {
455455 continue ;
456456 }
457457 // only consider events with no split vertices (one mccollision-to-one collision)
458- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kMCCollisionsZCutSel8HasCollisions );
458+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepMcCollisionsZCutSel8HasCollisions );
459459 if (rejectSplitCollisions && collisionsPerMCCollision.size () > 1 ) {
460460 continue ;
461461 }
462- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kMCCollisionsZCutSel8SplitCollisions );
462+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepMcCollisionsZCutSel8NoSplitCollisions );
463463
464464 int numSelectedCollisions = 0 ;
465465 for (const auto & collision : collisionsPerMCCollision) {
466466
467- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kRecoCollisions );
467+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepRecoCollisions );
468468 if (!(std::abs (collision.posZ ()) < vertexZCut)) {
469469 continue ;
470470 }
471- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kRecoCollisionsZcut );
471+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepRecoCollisionsZcut );
472472 if (!jetderiveddatautilities::selectCollision (collision, eventSelectionBits)) {
473473 continue ;
474474 }
475- registry.fill (HIST (" h_collision_counter" ), collisionSelections:: kRecoCollisionsZcutSel8 );
475+ registry.fill (HIST (" h_collision_counter" ), collision_selections::StepRecoCollisionsZcutSel8 );
476476 numSelectedCollisions++;
477477 } // end of collisions loop
478478
0 commit comments