Skip to content

Commit d0a7e3f

Browse files
committed
adding correct namespace for JE tables
1 parent 8337d62 commit d0a7e3f

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

PWGJE/TableProducer/emcalCorrectionTask.cxx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,15 @@ struct EmcalCorrectionTask {
184184
o2Axis energyAxis{200, 0., 100., "E (GeV)"},
185185
timeAxis{300, -100, 200., "t (ns)"},
186186
etaAxis{160, -0.8, 0.8, "#eta"},
187-
phiAxis{72, 0, 2 * 3.14159, "phi"};
187+
phiAxis{72, 0, 2 * 3.14159, "phi"},
188+
nlmAxis{50, -0.5, 49.5, "NLM"};
188189
mHistManager.add("hCellE", "hCellE", o2HistType::kTH1F, {energyAxis});
189190
mHistManager.add("hCellTowerID", "hCellTowerID", o2HistType::kTH1D, {{20000, 0, 20000}});
190191
mHistManager.add("hCellEtaPhi", "hCellEtaPhi", o2HistType::kTH2F, {etaAxis, phiAxis});
191192
// NOTE: Reversed column and row because it's more natural for presentation.
192193
mHistManager.add("hCellRowCol", "hCellRowCol;Column;Row", o2HistType::kTH2D, {{97, 0, 97}, {600, 0, 600}});
193194
mHistManager.add("hClusterE", "hClusterE", o2HistType::kTH1F, {energyAxis});
195+
mHistManager.add("hClusterNLM", "hClusterNLM", o2HistType::kTH1F, {nlmAxis});
194196
mHistManager.add("hClusterEtaPhi", "hClusterEtaPhi", o2HistType::kTH2F, {etaAxis, phiAxis});
195197
mHistManager.add("hClusterTime", "hClusterTime", o2HistType::kTH1F, {timeAxis});
196198
mHistManager.add("hGlobalTrackEtaPhi", "hGlobalTrackEtaPhi", o2HistType::kTH2F, {etaAxis, phiAxis});
@@ -627,6 +629,7 @@ struct EmcalCorrectionTask {
627629
} // end of cells of cluser loop
628630
// fill histograms
629631
mHistManager.fill(HIST("hClusterE"), cluster.E());
632+
mHistManager.fill(HIST("hClusterNLM"), cluster.getNExMax());
630633
mHistManager.fill(HIST("hClusterTime"), cluster.getClusterTime());
631634
mHistManager.fill(HIST("hClusterEtaPhi"), pos.Eta(), TVector2::Phi_0_2pi(pos.Phi()));
632635
if (IndexMapPair && trackGlobalIndex) {

PWGJE/Tasks/gammajettreeproducer.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ struct GammaJetTreeProducer {
154154
return true;
155155
}
156156

157-
double ch_iso_in_cone(const auto& cluster, JetTracks const& tracks, float radius = 0.4)
157+
double ch_iso_in_cone(const auto& cluster, aod::JetTracks const& tracks, float radius = 0.4)
158158
{
159159
double iso = 0;
160160
for (auto track : tracks) {
@@ -170,7 +170,7 @@ struct GammaJetTreeProducer {
170170
return iso;
171171
}
172172

173-
void runTrackQA(const auto& collision, JetTracks const& tracks)
173+
void runTrackQA(const auto& collision, aod::JetTracks const& tracks)
174174
{
175175
for (auto track : tracks) {
176176
if (!isTrackSelected(track)) {
@@ -182,7 +182,7 @@ struct GammaJetTreeProducer {
182182
}
183183
}
184184

185-
double ch_perp_cone_rho(const auto& object, JetTracks const& tracks, float radius = 0.4)
185+
double ch_perp_cone_rho(const auto& object, aod::JetTracks const& tracks, float radius = 0.4)
186186
{
187187
double ptSumLeft = 0;
188188
double ptSumRight = 0;
@@ -217,7 +217,7 @@ struct GammaJetTreeProducer {
217217
// ---------------------
218218
// Processing functions
219219
// ---------------------
220-
void processClearMaps(JetCollisions const&)
220+
void processClearMaps(aod::JetCollisions const&)
221221
{
222222
collisionMapping.clear();
223223
}
@@ -230,7 +230,7 @@ struct GammaJetTreeProducer {
230230
PresliceUnsorted<aod::JEMCTracks> EMCTrackPerTrack = aod::jemctrack::trackId;
231231

232232
// Process clusters
233-
void processClusters(soa::Join<JetCollisions, aod::BkgChargedRhos, aod::JCollisionBCs>::iterator const& collision, selectedClusters const& clusters, JetTracks const& tracks, aod::JEMCTracks const& emctracks)
233+
void processClusters(soa::Join<aod::JetCollisions, aod::BkgChargedRhos, aod::JCollisionBCs>::iterator const& collision, selectedClusters const& clusters, aod::JetTracks const& tracks, aod::JEMCTracks const& emctracks)
234234
{
235235
if (!isEventAccepted(collision)) {
236236
return;
@@ -258,7 +258,7 @@ struct GammaJetTreeProducer {
258258
double p = -1;
259259

260260
// do track matching
261-
auto tracksofcluster = cluster.matchedTracks_as<JetTracks>();
261+
auto tracksofcluster = cluster.matchedTracks_as<aod::JetTracks>();
262262
for (auto track : tracksofcluster) {
263263
if (!isTrackSelected(track)) {
264264
continue;
@@ -288,7 +288,7 @@ struct GammaJetTreeProducer {
288288

289289
Filter jetCuts = aod::jet::pt > jetPtMin;
290290
// Process charged jets
291-
void processChargedJets(soa::Join<JetCollisions, aod::BkgChargedRhos, aod::JCollisionBCs>::iterator const& collision, soa::Filtered<soa::Join<aod::ChargedJets, aod::ChargedJetConstituents>> const& chargedJets, JetTracks const& tracks)
291+
void processChargedJets(soa::Join<aod::JetCollisions, aod::BkgChargedRhos, aod::JCollisionBCs>::iterator const& collision, soa::Filtered<soa::Join<aod::ChargedJets, aod::ChargedJetConstituents>> const& chargedJets, aod::JetTracks const& tracks)
292292
{
293293
// event selection
294294
if (!isEventAccepted(collision)) {
@@ -303,7 +303,7 @@ struct GammaJetTreeProducer {
303303
nconst = 0;
304304
leadingTrackPt = 0;
305305
// loop over constituents
306-
for (auto& constituent : jet.template tracks_as<JetTracks>()) {
306+
for (auto& constituent : jet.template tracks_as<aod::JetTracks>()) {
307307
mHistograms.fill(HIST("chjetpt_vs_constpt"), jet.pt(), constituent.pt());
308308
nconst++;
309309
if (constituent.pt() > leadingTrackPt) {

0 commit comments

Comments
 (0)