Skip to content

Commit 4dcc306

Browse files
christianreckziegelchristianreckziegel
authored
Merge pull request #8 from alibuild/alibot-cleanup-17976
Please consider the following formatting changes to #17976
2 parents 516bbf4 + 610fd2e commit 4dcc306

1 file changed

Lines changed: 26 additions & 26 deletions

File tree

‎PWGJE/Tasks/hfFragmentationFunction.cxx‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ double deltaPhi(double phi1, double phi2)
7070
/// function, this namespace with enums is create
7171
namespace collisionSelections
7272
{
73-
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
82-
};
73+
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
82+
};
8383
}
8484
// creating table for storing distance data
8585
namespace o2::aod
@@ -525,14 +525,14 @@ struct HfFragmentationFunction {
525525
}
526526
} else {
527527
// store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
528-
matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size() + mcpjet.template candidates_as<TCandidatesMCP>().size(), // particle level jet
529-
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
530-
std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions, // MC collision selections
531-
-2, -2, -2, -2, -2, // no detector-level jet found
532-
-2, -2, -2, -2, -2, false, // no detector-level jet found
533-
-2, -2, -2, // no detector-level jet found
534-
-2, -2, // no detector-level jet found
535-
false, false); // no detector-level jet found
528+
matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size() + mcpjet.template candidates_as<TCandidatesMCP>().size(), // particle level jet
529+
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
530+
std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions, // MC collision selections
531+
-2, -2, -2, -2, -2, // no detector-level jet found
532+
-2, -2, -2, -2, -2, false, // no detector-level jet found
533+
-2, -2, -2, // no detector-level jet found
534+
-2, -2, // no detector-level jet found
535+
false, false); // no detector-level jet found
536536
}
537537
} // end of mcpjets loop
538538

@@ -564,14 +564,14 @@ struct HfFragmentationFunction {
564564
}
565565

566566
// store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
567-
matchJetTable(-2, -2, -2, -2, -2, // particle level jet
568-
-2, -2, -2, -2, false, // particle level HF
569-
std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions, // MC collision selections
570-
jetutilities::deltaR(mcdjet, mcdcand), mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.template tracks_as<aod::JetTracks>().size() + mcdjet.template candidates_as<TCandidatesMCD>().size(), // detector level jet
571-
mcdcand.pt(), mcdcand.eta(), mcdcand.phi(), mcdcand.m(), mcdcand.y(), (mcdcand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level HF
572-
mcdcand.mlScores()[0], mcdcand.mlScores()[1], mcdcand.mlScores()[2], // Machine Learning PID scores: background, prompt, non-prompt
573-
static_cast<int>(mcdcand.flagMcMatchRec()), selectedAs, // HF = +1, HFbar = -1, neither = 0
574-
std::abs(collision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(collision, eventSelectionBits)); // Reconstructed collision selections
567+
matchJetTable(-2, -2, -2, -2, -2, // particle level jet
568+
-2, -2, -2, -2, false, // particle level HF
569+
std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions, // MC collision selections
570+
jetutilities::deltaR(mcdjet, mcdcand), mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.template tracks_as<aod::JetTracks>().size() + mcdjet.template candidates_as<TCandidatesMCD>().size(), // detector level jet
571+
mcdcand.pt(), mcdcand.eta(), mcdcand.phi(), mcdcand.m(), mcdcand.y(), (mcdcand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level HF
572+
mcdcand.mlScores()[0], mcdcand.mlScores()[1], mcdcand.mlScores()[2], // Machine Learning PID scores: background, prompt, non-prompt
573+
static_cast<int>(mcdcand.flagMcMatchRec()), selectedAs, // HF = +1, HFbar = -1, neither = 0
574+
std::abs(collision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(collision, eventSelectionBits)); // Reconstructed collision selections
575575
}
576576
} // end of non-matched detector level jets loop
577577
} // end of collisions loop

0 commit comments

Comments
 (0)