Skip to content

Commit 320c062

Browse files
qgpqgp
committed
Fix formatting
1 parent 50e6122 commit 320c062

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎PWGJE/DataModel/Jet.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,20 @@
114114
constituentssub::P<constituentssub::Pt, constituentssub::Eta>);
115115

116116
// combine definition of tables for jets, constituents, and substructure
117-
#define JET_TABLES_DEF(_collision_name_, _jet_type_, _const_type_, _hfcand_type_) \
118-
JET_TABLE_DEF(_collision_name_, _jet_type_##Jet, _jet_type_##jet, #_jet_type_ "JET"); \
119-
using _jet_type_##Jet = _jet_type_##Jet##s::iterator; \
120-
using Matched##_jet_type_##Jet = Matched##_jet_type_##Jet##s::iterator; \
117+
#define JET_TABLES_DEF(_collision_name_, _jet_type_, _const_type_, _hfcand_type_) \
118+
JET_TABLE_DEF(_collision_name_, _jet_type_##Jet, _jet_type_##jet, #_jet_type_ "JET"); \
119+
using _jet_type_##Jet = _jet_type_##Jet##s::iterator; \
120+
using Matched##_jet_type_##Jet = Matched##_jet_type_##Jet##s::iterator; \
121121
JET_CONSTITUENTS_ARRAY_TABLE_DEF(_jet_type_##Jet, _jet_type_##jet, #_jet_type_, _const_type_, _hfcand_type_); \
122-
using _jet_type_##Jet##Constituent = _jet_type_##Jet##Constituents::iterator; \
123-
JET_CONSTITUENTS_SUB_TABLE_DEF(_jet_type_##Jet, _jet_type_##jet, #_jet_type_); \
122+
using _jet_type_##Jet##Constituent = _jet_type_##Jet##Constituents::iterator; \
123+
JET_CONSTITUENTS_SUB_TABLE_DEF(_jet_type_##Jet, _jet_type_##jet, #_jet_type_); \
124124
using _jet_type_##Jet##ConstituentSub = _jet_type_##Jet##ConstituentsSub::iterator;
125125

126126
// generate tables for data, generator- and detector-level jets
127-
#define JET_TABLES_LEVELS_DEF(_jet_type_, _hfcand_type_) \
128-
JET_TABLES_DEF(Collision, _jet_type_, Track, _hfcand_type_); \
129-
JET_TABLES_DEF(Collision, _jet_type_##MCD, Track, _hfcand_type_); \
130-
JET_TABLES_DEF(McCollision, _jet_type_##MCP, McParticle, McParticles); \
127+
#define JET_TABLES_LEVELS_DEF(_jet_type_, _hfcand_type_) \
128+
JET_TABLES_DEF(Collision, _jet_type_, Track, _hfcand_type_); \
129+
JET_TABLES_DEF(Collision, _jet_type_##MCD, Track, _hfcand_type_); \
130+
JET_TABLES_DEF(McCollision, _jet_type_##MCP, McParticle, McParticles); \
131131
DECLARE_SOA_TABLE(NewMatched##_jet_type_##MCPJets, "AOD", #_jet_type_ "JETMCHP", _jet_type_##MCDjetmatchingGeo::_jet_type_##MCDJetId, _jet_type_##MCDjetmatchingCand::_jet_type_##MCDJetId); \
132132
DECLARE_SOA_TABLE(NewMatched##_jet_type_##MCDJets, "AOD", #_jet_type_ "JETMCHD", _jet_type_##MCPjetmatchingGeo::_jet_type_##MCPJetId, _jet_type_##MCPjetmatchingCand::_jet_type_##MCPJetId);
133133

‎PWGJE/TableProducer/jetmatchinghf.cxx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ using namespace o2;
3030
using namespace o2::framework;
3131
using namespace o2::framework::expressions;
3232

33-
template <typename BaseJetCollection, typename TagJetCollection,
33+
template <typename BaseJetCollection, typename TagJetCollection,
3434
typename BaseToTagMatchingTable, typename TagToBaseMatchingTable, typename HfCandidates>
3535
struct JetMatchingHF {
3636
Configurable<float> maxMatchingDistance{"maxMatchingDistance", 0.4f, "Max matching distance"};
@@ -88,8 +88,8 @@ struct JetMatchingHF {
8888
const auto mother0Id = daughter0.template mcParticle_as<McParticles>().template mothers_as<McParticles>().front().globalIndex();
8989
const auto mother1Id = daughter1.template mcParticle_as<McParticles>().template mothers_as<McParticles>().front().globalIndex();
9090
LOGF(debug, "MC candidate %d with prongs: %d (MC %d), %d (MC %d)", cand.globalIndex(),
91-
daughter0.globalIndex(), daughter0.template mcParticle_as<McParticles>().globalIndex(),
92-
daughter1.globalIndex(), daughter1.template mcParticle_as<McParticles>().globalIndex());
91+
daughter0.globalIndex(), daughter0.template mcParticle_as<McParticles>().globalIndex(),
92+
daughter1.globalIndex(), daughter1.template mcParticle_as<McParticles>().globalIndex());
9393
LOGF(info, "MC ids of mothers: %d - %d", mother0Id, mother1Id);
9494
if ((mother0Id == mother1Id) &&
9595
std::abs(daughter0.template mcParticle_as<McParticles>().template mothers_as<McParticles>().front().flagMcMatchGen()) & (1 << aod::hf_cand_2prong::DecayType::D0ToPiK)) {
@@ -99,7 +99,7 @@ struct JetMatchingHF {
9999
if (mother0Id == cand.globalIndex()) {
100100
matchedIdx = pjet.globalIndex();
101101
LOGF(info, "Found match det to part: %d (pt %g) -> %d (pt %g)",
102-
jet.globalIndex(), jet.pt(), matchedIdx, pjet.pt());
102+
jet.globalIndex(), jet.pt(), matchedIdx, pjet.pt());
103103
}
104104
}
105105
}
@@ -160,8 +160,8 @@ struct JetMatchingHF {
160160
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
161161
{
162162
return WorkflowSpec{
163-
adaptAnalysisTask<JetMatchingHF<soa::Join<aod::D0MCDJets, aod::D0MCDJetConstituents>,
164-
soa::Join<aod::D0MCPJets, aod::D0MCPJetConstituents>,
165-
aod::NewMatchedD0MCDJets, aod::NewMatchedD0MCPJets,
166-
soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec> > >(cfgc, TaskName{"jet-matching-hf"})};
163+
adaptAnalysisTask<JetMatchingHF<soa::Join<aod::D0MCDJets, aod::D0MCDJetConstituents>,
164+
soa::Join<aod::D0MCPJets, aod::D0MCPJetConstituents>,
165+
aod::NewMatchedD0MCDJets, aod::NewMatchedD0MCPJets,
166+
soa::Join<aod::HfCand2Prong, aod::HfSelD0, aod::HfCand2ProngMcRec>>>(cfgc, TaskName{"jet-matching-hf"})};
167167
}

0 commit comments

Comments
 (0)