Skip to content

Commit 6fd83ec

Browse files
jloemkerjloemker
committed
small adjustments to naming
1 parent 561e6eb commit 6fd83ec

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

‎PWGJE/Tasks/jetFormationTimeReclustering.cxx‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ DECLARE_SOA_COLUMN(SplittingMatchingHF, splittingMatchingHF, std::vector<int32_t
106106

107107
namespace jetoutput
108108
{
109-
DECLARE_SOA_COLUMN(JetPt, jetPt, float); //!
110-
DECLARE_SOA_COLUMN(JetPhi, jetPhi, float); //!
111-
DECLARE_SOA_COLUMN(JetEta, jetEta, float); //!
112-
DECLARE_SOA_COLUMN(JetY, jetY, float); //!
113-
DECLARE_SOA_COLUMN(JetR, jetR, float); //!
114-
DECLARE_SOA_COLUMN(JetArea, jetArea, float); //!
115-
DECLARE_SOA_COLUMN(JetRho, jetRho, float); //!
116-
DECLARE_SOA_COLUMN(JetPerpConeRho, jetPerpConeRho, float); //!
117-
DECLARE_SOA_COLUMN(JetNConstituents, jetNConstituents, int); //!
109+
DECLARE_SOA_COLUMN(PtJet, ptJet, float); //!
110+
DECLARE_SOA_COLUMN(PhiJet, phiJet, float); //!
111+
DECLARE_SOA_COLUMN(EtaJet, etaJet, float); //!
112+
DECLARE_SOA_COLUMN(Yjet, yJet, float); //!
113+
DECLARE_SOA_COLUMN(Rjet, rJet, float); //!
114+
DECLARE_SOA_COLUMN(areaJet, areaJet, float); //!
115+
DECLARE_SOA_COLUMN(RhoJet, rhoJet, float); //!
116+
DECLARE_SOA_COLUMN(PerpConeRhoJet, perpConeRhoJet, float); //!
117+
DECLARE_SOA_COLUMN(NConstituentsJet, nConstituentsJet, int); //!
118118
} // namespace jetoutput
119119

120120
#define MCCOLL_TABLE_DEF(_jet_type_, _jet_description_, _name_) \
@@ -154,8 +154,8 @@ DECLARE_SOA_COLUMN(JetNConstituents, jetNConstituents, int); //!
154154
DECLARE_SOA_INDEX_COLUMN_CUSTOM(_jet_type_##O, outputTable, _jet_description_ "OS"); \
155155
DECLARE_SOA_DYNAMIC_COLUMN(Dummy##_jet_type_, dummy##_jet_type_, []() -> int { return 0; }); \
156156
} \
157-
DECLARE_SOA_TABLE(_jet_type_##SSs, "AOD", _jet_description_ "SS", jetsubstructure::EnergyMother, jetsubstructure::PtLeading, jetsubstructure::PtSubLeading, jetsubstructure::Theta, jetsubstructure::PtLeadingConstituent, jetsubstructure::TauForm, jetsubstructure::Z, jetsubstructure::Ptg, jetsubstructure::Thetag, jetsubstructure::Zg, jetsubstructure::TauFromg, _name_##substructure::Dummy##_jet_type_<>); \
158-
DECLARE_SOA_TABLE(_jet_type_##SSOs, "AOD", _jet_description_ "SSO", _name_##substructure::_jet_type_##OId, jetsubstructure::EnergyMother, jetsubstructure::PtLeading, jetsubstructure::PtSubLeading, jetsubstructure::Theta, jetsubstructure::PtLeadingConstituent, jetsubstructure::TauForm, jetsubstructure::Z, jetsubstructure::Ptg, jetsubstructure::Thetag, jetsubstructure::Zg, jetsubstructure::TauFromg); \
157+
DECLARE_SOA_TABLE(_jet_type_##SSs, "AOD", _jet_description_ "SS", jetoutput::PtJet, jetoutput::EtaJet, jetsubstructure::EnergyMother, jetsubstructure::PtLeading, jetsubstructure::PtSubLeading, jetsubstructure::Theta, jetsubstructure::PtLeadingConstituent, jetsubstructure::TauForm, jetsubstructure::Z, jetsubstructure::Ptg, jetsubstructure::Thetag, jetsubstructure::Zg, jetsubstructure::TauFromg, _name_##substructure::Dummy##_jet_type_<>); \
158+
DECLARE_SOA_TABLE(_jet_type_##SSOs, "AOD", _jet_description_ "SSO", _name_##substructure::_jet_type_##OId, jetoutput::PtJet, jetoutput::EtaJet, jetsubstructure::EnergyMother, jetsubstructure::PtLeading, jetsubstructure::PtSubLeading, jetsubstructure::Theta, jetsubstructure::PtLeadingConstituent, jetsubstructure::TauForm, jetsubstructure::Z, jetsubstructure::Ptg, jetsubstructure::Thetag, jetsubstructure::Zg, jetsubstructure::TauFromg); \
159159
\
160160
using _jet_type_##O = _jet_type_##Os::iterator; \
161161
using _jet_type_##SSO = _jet_type_##SSOs::iterator;
@@ -237,6 +237,7 @@ struct FormationTimeReclustering {
237237
std::vector<fastjet::PseudoJet> jetReclustered;
238238
JetFinder jetReclusterer;
239239

240+
240241
std::vector<float> energyMotherVec;
241242
std::vector<float> ptLeadingVec;
242243
std::vector<float> ptSubLeadingVec;
@@ -251,7 +252,8 @@ struct FormationTimeReclustering {
251252
std::vector<float> taugVec;
252253

253254
float leadingConstituentPt;
254-
255+
float ptJet;
256+
float etaJet;
255257
HistogramRegistry registry;
256258

257259
void init(InitContext const&)
@@ -272,7 +274,6 @@ struct FormationTimeReclustering {
272274
registry.add("h2_jet_pt_jet_nsd_eventwiseconstituentsubtracted", ";#it{p}_{T,jet} (GeV/#it{c});#it{n}_{SD}", {HistType::kTH2F, {{200, 0., 200.}, {15, -0.5, 14.5}}});
273275

274276
jetReclusterer.isReclustering = true;
275-
//jetReclusterer.algorithm = fastjet::JetAlgorithm::cambridge_algorithm;
276277
jetReclusterer.fastjetExtraParam = genKTp;// in jetfinder we use p = -1 for anti kt jetfinding. Then we do time recl. with p=0.5, kt p =1, ca p=0
277278
jetReclusterer.algorithm = fastjet::JetAlgorithm::genkt_algorithm;// gen kt is enum 3 in jetfinder setup
278279

@@ -377,11 +378,13 @@ struct FormationTimeReclustering {
377378
void analyseCharged(T const& jet, U const& tracks, V const& trackSlicer, M& outputTable, N& splittingTable)
378379
{
379380
jetConstituents.clear();
381+
ptJet = jet.pt();
382+
etaJet = jet.eta();
380383
for (auto& jetConstituent : jet.template tracks_as<U>()) {
381384
fastjetutilities::fillTracks(jetConstituent, jetConstituents, jetConstituent.globalIndex());
382385
}
383386
jetReclustering<false, isSubtracted>(jet, splittingTable);
384-
outputTable(energyMotherVec, ptLeadingVec, ptSubLeadingVec, thetaVec, leadingConstituentPt, tauFormVec, zVec, ptgVec, thetagVec, zgVec, taugVec);
387+
outputTable(ptJet, etaJet, energyMotherVec, ptLeadingVec, ptSubLeadingVec, thetaVec, leadingConstituentPt, tauFormVec, zVec, ptgVec, thetagVec, zgVec, taugVec);
385388
}
386389

387390
void processDummy(aod::JetTracks const&)
@@ -414,11 +417,13 @@ struct FormationTimeReclustering {
414417
aod::JetParticles const& particles)
415418
{
416419
jetConstituents.clear();
420+
ptJet = jet.pt();
421+
etaJet = jet.eta();
417422
for (auto& jetConstituent : jet.template tracks_as<aod::JetParticles>()) {
418423
fastjetutilities::fillTracks(jetConstituent, jetConstituents, jetConstituent.globalIndex(), static_cast<int>(JetConstituentStatus::track), pdg->Mass(jetConstituent.pdgCode()));
419424
}
420425
jetReclustering<true, false>(jet, jetSplittingsMCPTable);
421-
jetSubstructureMCPTable(energyMotherVec, ptLeadingVec, ptSubLeadingVec, thetaVec, leadingConstituentPt, tauFormVec, zVec, ptgVec, thetagVec, zgVec, taugVec );
426+
jetSubstructureMCPTable(ptJet, etaJet, energyMotherVec, ptLeadingVec, ptSubLeadingVec, thetaVec, leadingConstituentPt, tauFormVec, zVec, ptgVec, thetagVec, zgVec, taugVec );
422427
}
423428
PROCESS_SWITCH(FormationTimeReclustering, processChargedJetsMCP, "charged jet substructure on MC particle level", false);
424429
};

0 commit comments

Comments
 (0)