Skip to content

Commit 127ee6d

Browse files
nzardoshnzardosh
committed
embedding
1 parent 77b3b50 commit 127ee6d

11 files changed

Lines changed: 245 additions & 27 deletions

‎PWGJE/Core/JetFindingUtilities.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ constexpr bool isEMCALClusterTable()
9191
*/
9292

9393
template <typename T, typename U>
94-
bool isTrackSelected(T const& track, int trackSelection, const U* candidate = nullptr)
94+
bool isTrackSelected(T const& track, int trackSelection, bool isEmbedding, const U* candidate = nullptr)
9595
{
9696

97-
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
97+
if (!jetderiveddatautilities::selectTrack(track, trackSelection, isEmbedding)) {
9898
return false;
9999
}
100100
if (candidate != nullptr) {
@@ -115,10 +115,10 @@ bool isTrackSelected(T const& track, int trackSelection, const U* candidate = nu
115115
*/
116116

117117
template <typename T, typename U>
118-
void analyseTracks(std::vector<fastjet::PseudoJet>& inputParticles, T const& tracks, int trackSelection, const U* candidate = nullptr)
118+
void analyseTracks(std::vector<fastjet::PseudoJet>& inputParticles, T const& tracks, int trackSelection, bool isEmbedding, const U* candidate = nullptr)
119119
{
120120
for (auto& track : tracks) {
121-
if (isTrackSelected(track, trackSelection, candidate)) {
121+
if (isTrackSelected(track, trackSelection, isEmbedding, candidate)) {
122122
fastjetutilities::fillTracks(track, inputParticles, track.globalIndex());
123123
}
124124
}
@@ -134,10 +134,10 @@ void analyseTracks(std::vector<fastjet::PseudoJet>& inputParticles, T const& tra
134134
*/
135135

136136
template <typename T, typename U>
137-
void analyseTracksMultipleCandidates(std::vector<fastjet::PseudoJet>& inputParticles, T const& tracks, int trackSelection, U const& candidates)
137+
void analyseTracksMultipleCandidates(std::vector<fastjet::PseudoJet>& inputParticles, T const& tracks, int trackSelection, bool isEmbedding, U const& candidates)
138138
{
139139
for (auto& track : tracks) {
140-
if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
140+
if (!jetderiveddatautilities::selectTrack(track, trackSelection, isEmbedding)) {
141141
continue;
142142
}
143143
for (auto& candidate : candidates) {

‎PWGJE/JetFinders/jetFinder.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ struct JetFinderTask {
6464
o2::framework::Configurable<std::string> triggerMasks{"triggerMasks", "", "possible JE Trigger masks: fJetChLowPt,fJetChHighPt,fTrackLowPt,fTrackHighPt,fJetD0ChLowPt,fJetD0ChHighPt,fJetLcChLowPt,fJetLcChHighPt,fEMCALReadout,fJetFullHighPt,fJetFullLowPt,fJetNeutralHighPt,fJetNeutralLowPt,fGammaVeryHighPtEMCAL,fGammaVeryHighPtDCAL,fGammaHighPtEMCAL,fGammaHighPtDCAL,fGammaLowPtEMCAL,fGammaLowPtDCAL,fGammaVeryLowPtEMCAL,fGammaVeryLowPtDCAL"};
6565
o2::framework::Configurable<bool> skipMBGapEvents{"skipMBGapEvents", true, "decide to run over MB gap events or not"};
6666
o2::framework::Configurable<bool> applyRCTSelections{"applyRCTSelections", true, "decide to apply RCT selections"};
67+
o2::framework::Configurable<bool> isEmbedding{"isEmbedding", false, "running on an embedded dataset"};
6768

6869
// track level configurables
6970
o2::framework::Configurable<float> trackPtMin{"trackPtMin", 0.15, "minimum track pT"};
@@ -196,7 +197,7 @@ struct JetFinderTask {
196197
return;
197198
}
198199
inputParticles.clear();
199-
jetfindingutilities::analyseTracks<o2::soa::Filtered<o2::aod::JetTracks>, o2::soa::Filtered<o2::aod::JetTracks>::iterator>(inputParticles, tracks, trackSelection);
200+
jetfindingutilities::analyseTracks<o2::soa::Filtered<o2::aod::JetTracks>, o2::soa::Filtered<o2::aod::JetTracks>::iterator>(inputParticles, tracks, trackSelection, isEmbedding);
200201
jetfindingutilities::findJets(jetFinder, inputParticles, jetPtMin, jetPtMax, jetRadius, jetAreaFractionMin, collision, jetsTable, constituentsTable, fillTHnSparse ? registry.get<THn>(HIST("hJet")) : std::shared_ptr<THn>(nullptr), fillTHnSparse);
201202
}
202203

@@ -209,7 +210,7 @@ struct JetFinderTask {
209210
return;
210211
}
211212
inputParticles.clear();
212-
jetfindingutilities::analyseTracks<o2::soa::Filtered<o2::aod::JetTracksSub>, o2::soa::Filtered<o2::aod::JetTracksSub>::iterator>(inputParticles, tracks, trackSelection);
213+
jetfindingutilities::analyseTracks<o2::soa::Filtered<o2::aod::JetTracksSub>, o2::soa::Filtered<o2::aod::JetTracksSub>::iterator>(inputParticles, tracks, trackSelection, isEmbedding);
213214
jetfindingutilities::findJets(jetFinder, inputParticles, jetEWSPtMin, jetEWSPtMax, jetRadius, jetAreaFractionMin, collision, jetsEvtWiseSubTable, constituentsEvtWiseSubTable, fillTHnSparse ? registry.get<THn>(HIST("hJetEWS")) : std::shared_ptr<THn>(nullptr), fillTHnSparse);
214215
}
215216

@@ -241,7 +242,7 @@ struct JetFinderTask {
241242
for (auto const& clusterDefinition : clusterDefinitionsVec) {
242243
for (auto const& hadronicCorrectionType : hadronicCorrectionTypesVec) {
243244
inputParticles.clear();
244-
jetfindingutilities::analyseTracks<o2::soa::Filtered<o2::aod::JetTracks>, o2::soa::Filtered<o2::aod::JetTracks>::iterator>(inputParticles, tracks, trackSelection);
245+
jetfindingutilities::analyseTracks<o2::soa::Filtered<o2::aod::JetTracks>, o2::soa::Filtered<o2::aod::JetTracks>::iterator>(inputParticles, tracks, trackSelection, isEmbedding);
245246
jetfindingutilities::analyseClusters(inputParticles, clusters, clusterDefinition, hadronicCorrectionType);
246247
jetfindingutilities::findJets(jetFinder, inputParticles, jetPtMin, jetPtMax, jetRadius, jetAreaFractionMin, collision, jetsTable, constituentsTable, fillTHnSparse ? registry.get<THn>(HIST("hJet")) : std::shared_ptr<THn>(nullptr), fillTHnSparse);
247248
}

‎PWGJE/JetFinders/jetFinderHF.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ struct JetFinderHFTask {
6363
o2::framework::Configurable<std::string> triggerMasks{"triggerMasks", "", "possible JE Trigger masks: fJetChLowPt,fJetChHighPt,fTrackLowPt,fTrackHighPt,fJetD0ChLowPt,fJetD0ChHighPt,fJetLcChLowPt,fJetLcChHighPt,fEMCALReadout,fJetFullHighPt,fJetFullLowPt,fJetNeutralHighPt,fJetNeutralLowPt,fGammaVeryHighPtEMCAL,fGammaVeryHighPtDCAL,fGammaHighPtEMCAL,fGammaHighPtDCAL,fGammaLowPtEMCAL,fGammaLowPtDCAL,fGammaVeryLowPtEMCAL,fGammaVeryLowPtDCAL"};
6464
o2::framework::Configurable<bool> skipMBGapEvents{"skipMBGapEvents", true, "decide to run over MB gap events or not"};
6565
o2::framework::Configurable<bool> applyRCTSelections{"applyRCTSelections", true, "decide to apply RCT selections"};
66+
o2::framework::Configurable<bool> isEmbedding{"isEmbedding", false, "running on an embedded dataset"};
6667

6768
// track level configurables
6869
o2::framework::Configurable<float> trackPtMin{"trackPtMin", 0.15, "minimum track pT"};
@@ -228,9 +229,9 @@ struct JetFinderHFTask {
228229
}
229230
}
230231
if constexpr (isEvtWiseSub) {
231-
jetfindingutilities::analyseTracks<U, typename U::iterator>(inputParticles, tracks, trackSelection);
232+
jetfindingutilities::analyseTracks<U, typename U::iterator>(inputParticles, tracks, trackSelection, isEmbedding);
232233
} else {
233-
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, &candidate);
234+
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, isEmbedding, &candidate);
234235
}
235236
jetfindingutilities::findJets(jetFinder, inputParticles, minJetPt, maxJetPt, jetRadius, jetAreaFractionMin, collision, jetsTableInput, constituentsTableInput, registry.get<THn>(HIST("hJet")), fillTHnSparse, true);
236237
}

‎PWGJE/JetFinders/jetFinderHFHFBar.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ struct JetFinderHFHFBarTask {
6363
o2::framework::Configurable<std::string> triggerMasks{"triggerMasks", "", "possible JE Trigger masks: fJetChLowPt,fJetChHighPt,fTrackLowPt,fTrackHighPt,fJetD0ChLowPt,fJetD0ChHighPt,fJetLcChLowPt,fJetLcChHighPt,fEMCALReadout,fJetFullHighPt,fJetFullLowPt,fJetNeutralHighPt,fJetNeutralLowPt,fGammaVeryHighPtEMCAL,fGammaVeryHighPtDCAL,fGammaHighPtEMCAL,fGammaHighPtDCAL,fGammaLowPtEMCAL,fGammaLowPtDCAL,fGammaVeryLowPtEMCAL,fGammaVeryLowPtDCAL"};
6464
o2::framework::Configurable<bool> skipMBGapEvents{"skipMBGapEvents", true, "decide to run over MB gap events or not"};
6565
o2::framework::Configurable<bool> applyRCTSelections{"applyRCTSelections", true, "decide to apply RCT selections"};
66+
o2::framework::Configurable<bool> isEmbedding{"isEmbedding", false, "running on an embedded dataset"};
6667

6768
// track level configurables
6869
o2::framework::Configurable<float> trackPtMin{"trackPtMin", 0.15, "minimum track pT"};
@@ -233,7 +234,7 @@ struct JetFinderHFHFBarTask {
233234
return;
234235
}
235236
}
236-
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, &candidate);
237+
jetfindingutilities::analyseTracks(inputParticles, tracks, trackSelection, isEmbedding, &candidate);
237238

238239
jetfindingutilities::findJets(jetFinder, inputParticles, minJetPt, maxJetPt, jetRadius, jetAreaFractionMin, collision, jetsTableInput, constituentsTableInput, registry.get<THn>(HIST("hJet")), fillTHnSparse, true);
239240
}

‎PWGJE/JetFinders/jetFinderV0.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ struct JetFinderV0Task {
5858
o2::framework::Configurable<std::string> triggerMasks{"triggerMasks", "", "possible JE Trigger masks: fJetChLowPt,fJetChHighPt,fTrackLowPt,fTrackHighPt,fJetD0ChLowPt,fJetD0ChHighPt,fJetLcChLowPt,fJetLcChHighPt,fEMCALReadout,fJetFullHighPt,fJetFullLowPt,fJetNeutralHighPt,fJetNeutralLowPt,fGammaVeryHighPtEMCAL,fGammaVeryHighPtDCAL,fGammaHighPtEMCAL,fGammaHighPtDCAL,fGammaLowPtEMCAL,fGammaLowPtDCAL,fGammaVeryLowPtEMCAL,fGammaVeryLowPtDCAL"};
5959
o2::framework::Configurable<bool> skipMBGapEvents{"skipMBGapEvents", true, "decide to run over MB gap events or not"};
6060
o2::framework::Configurable<bool> applyRCTSelections{"applyRCTSelections", true, "decide to apply RCT selections"};
61+
o2::framework::Configurable<bool> isEmbedding{"isEmbedding", false, "running on an embedded dataset"};
6162

6263
// track level configurables
6364
o2::framework::Configurable<float> trackPtMin{"trackPtMin", 0.15, "minimum track pT"};
@@ -197,7 +198,7 @@ struct JetFinderV0Task {
197198
}
198199
}
199200
*/
200-
jetfindingutilities::analyseTracksMultipleCandidates(inputParticles, tracks, trackSelection, candidates);
201+
jetfindingutilities::analyseTracksMultipleCandidates(inputParticles, tracks, trackSelection, isEmbedding, candidates);
201202

202203
jetfindingutilities::findJets(jetFinder, inputParticles, minJetPt, maxJetPt, jetRadius, jetAreaFractionMin, collision, jetsTableInput, constituentsTableInput, registry.get<THn>(HIST("hJet")), fillTHnSparse, saveJetsWithCandidatesOnly);
203204
}

‎PWGJE/TableProducer/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ o2physics_add_dpl_workflow(jet-sv-reconstruction
8888
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
8989
COMPONENT_NAME Analysis)
9090

91+
o2physics_add_dpl_workflow(jet-embedding-producer
92+
SOURCES embeddingProducer.cxx
93+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
94+
COMPONENT_NAME Analysis)
95+
9196
endif()
9297

9398

0 commit comments

Comments
 (0)