Skip to content

Commit 7e7477c

Browse files
christianreckziegelchristianreckziegel
authored
Merge pull request #5 from alibuild/alibot-cleanup-15534
Please consider the following formatting changes to #15534
2 parents d8cef62 + faa1978 commit 7e7477c

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

‎PWGJE/Tasks/hfFragmentationFunction.cxx‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
#include "PWGJE/Core/JetDerivedDataUtilities.h"
2222
#include "PWGJE/Core/JetHFUtilities.h"
2323
#include "PWGJE/Core/JetUtilities.h"
24-
#include "PWGJE/Core/JetHFUtilities.h"
25-
#include "PWGJE/Core/JetUtilities.h"
2624
#include "PWGJE/DataModel/Jet.h"
2725
#include "PWGJE/DataModel/JetReducedData.h"
2826

@@ -368,7 +366,7 @@ struct HfFragmentationFunction {
368366

369367
// store data in MC detector level table
370368
mcddistJetTable(jetutilities::deltaR(mcdjet, mcdd0cand),
371-
mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.tracks_as<aod::JetTracks>().size() + mcdjet.candidates_as<aod::CandidatesD0MCD>().size(), // detector level jet
369+
mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.tracks_as<aod::JetTracks>().size() + mcdjet.candidates_as<aod::CandidatesD0MCD>().size(), // detector level jet
372370
mcdd0cand.pt(), mcdd0cand.eta(), mcdd0cand.phi(), mcdd0cand.m(), mcdd0cand.y(), (mcdd0cand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level D0 candidate
373371
mcdjet.has_matchedJetCand(), mcdd0cand.mlScores()[0], mcdd0cand.mlScores()[1], mcdd0cand.mlScores()[2], // // Machine Learning PID scores: background, prompt, non-prompt
374372
matchedFrom, selectedAs); // D0 = +1, D0bar = -1, neither = 0
@@ -390,8 +388,8 @@ struct HfFragmentationFunction {
390388

391389
// store data in MC detector level table (calculate angular distance in eta-phi plane on the fly)
392390
mcpdistJetTable(jetutilities::deltaR(mcpjet, mcpd0cand),
393-
mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.tracks_as<aod::JetParticles>().size() + mcpjet.candidates_as<aod::CandidatesD0MCP>().size(), // particle level jet
394-
mcpd0cand.pt(), mcpd0cand.eta(), mcpd0cand.phi(), mcpd0cand.y(), (mcpd0cand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level D0
391+
mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.tracks_as<aod::JetParticles>().size() + mcpjet.candidates_as<aod::CandidatesD0MCP>().size(), // particle level jet
392+
mcpd0cand.pt(), mcpd0cand.eta(), mcpd0cand.phi(), mcpd0cand.y(), (mcpd0cand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level D0
395393
mcpjet.has_matchedJetCand());
396394
}
397395
}
@@ -465,23 +463,23 @@ struct HfFragmentationFunction {
465463
} else if (mcdcand.candidateSelFlag() & BIT(1)) { // CandidateSelFlag == BIT(1) -> selected as HFbar
466464
selectedAs = -1;
467465
}
468-
466+
469467
// store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
470468
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
471469
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
472-
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
470+
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
473471
mcdcand.pt(), mcdcand.eta(), mcdcand.phi(), mcdcand.m(), mcdcand.y(), (mcdcand.originMcRec() == RecoDecay::OriginType::Prompt), // detector level HF
474472
mcdcand.mlScores()[0], mcdcand.mlScores()[1], mcdcand.mlScores()[2], // Machine Learning PID scores: background, prompt, non-prompt
475473
matchedFrom, selectedAs); // HF = +1, HFbar = -1, neither = 0
476474
}
477475
} else {
478476
// store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
479-
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
480-
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
481-
-2, -2, -2, -2, -2, // detector level jet
482-
-2, -2, -2, -2, -2, -2, // detector level HF
483-
-2, -2, -2, // Machine Learning PID scores: background, prompt, non-prompt
484-
-2, -2); // HF = +1, HFbar = -1, neither = 0
477+
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
478+
mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt), // particle level HF
479+
-2, -2, -2, -2, -2, // detector level jet
480+
-2, -2, -2, -2, -2, -2, // detector level HF
481+
-2, -2, -2, // Machine Learning PID scores: background, prompt, non-prompt
482+
-2, -2); // HF = +1, HFbar = -1, neither = 0
485483
}
486484
} // end of mcpjets loop
487485
} // end of mccollisions loop

0 commit comments

Comments
 (0)