Skip to content

Commit 009e0bb

Browse files
authored
Merge pull request #55 from alibuild/alibot-cleanup-10309
[PWGUD] Please consider the following formatting changes to AliceO2Group#10309
2 parents 0cf20c0 + bca4a3d commit 009e0bb

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

PWGUD/TableProducer/Converters/UDCollisionSelExtrasV002Converter.cxx

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,25 @@ struct UDCollisionSelExtrasV002Converter {
7474
collision.trs(),
7575
collision.trofs(),
7676
collision.hmpr(),
77-
0, // dummy tfb
78-
0, // dummy itsROFb
79-
0, // dummy sbp
80-
0, // dummy zVtxFT0vPV
81-
0); // dummy vtxITSTPC
77+
0, // dummy tfb
78+
0, // dummy itsROFb
79+
0, // dummy sbp
80+
0, // dummy zVtxFT0vPV
81+
0); // dummy vtxITSTPC
8282
}
8383
}
8484
PROCESS_SWITCH(UDCollisionSelExtrasV002Converter, processV001ToV002, "process v001-to-v002 conversion", true);
85-
8685
};
8786

8887
/// Spawn the extended table for UDCollisionSelExtras002 to avoid the call to the internal spawner and a consequent circular dependency
89-
//struct UDCollisionSelExtrasSpawner {
90-
// Spawns<aod::UDCollisionSelExtras_002> udCollisionSelExtras_002;
91-
//};
88+
// struct UDCollisionSelExtrasSpawner {
89+
// Spawns<aod::UDCollisionSelExtras_002> udCollisionSelExtras_002;
90+
// };
9291

9392
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
9493
{
9594
return WorkflowSpec{
9695
adaptAnalysisTask<UDCollisionSelExtrasV002Converter>(cfgc),
97-
// adaptAnalysisTask<UDCollisionSelExtrasSpawner>(cfgc),
96+
// adaptAnalysisTask<UDCollisionSelExtrasSpawner>(cfgc),
9897
};
9998
}

PWGUD/Tasks/upcTauRl.cxx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ DECLARE_SOA_COLUMN(TrkTOFnSigmaPi, trkTOFnSigmaPi, float[2]);
102102
DECLARE_SOA_COLUMN(TrkTOFnSigmaKa, trkTOFnSigmaKa, float[2]);
103103
DECLARE_SOA_COLUMN(TrkTOFnSigmaPr, trkTOFnSigmaPr, float[2]);
104104

105-
} // namespace reco_tree
105+
} // namespace tau_tree
106106
DECLARE_SOA_TABLE(TauTwoTracks, "AOD", "TAUTWOTRACK",
107107
tau_tree::RunNumber, tau_tree::Bc, tau_tree::TotalTracks, tau_tree::NumContrib, tau_tree::GlobalNonPVtracks, tau_tree::PosX, tau_tree::PosY, tau_tree::PosZ,
108108
tau_tree::RecoMode, tau_tree::OccupancyInTime, tau_tree::HadronicRate,
@@ -115,7 +115,6 @@ DECLARE_SOA_TABLE(TauTwoTracks, "AOD", "TAUTWOTRACK",
115115

116116
} // namespace o2::aod
117117

118-
119118
struct UpcTauRl {
120119
Produces<o2::aod::TauTwoTracks> tauTwoTracks;
121120

@@ -601,7 +600,6 @@ struct UpcTauRl {
601600
histos.add("EventTwoTracks/ElectronMuPi/PID/hTOFnSigmaVsMPofO", ";Not-electron #it{p} (GeV/c);n#sigma^{#mu}_{TOF} (arb. units)", HistType::kTH2D, {confAxis.zzAxisMom, confAxis.zzAxisNsigma});
602601
histos.add("EventTwoTracks/ElectronMuPi/PID/hTOFnSigmaVsPPofO", ";Not-electron #it{p} (GeV/c);n#sigma^{#pi}_{TOF} (arb. units)", HistType::kTH2D, {confAxis.zzAxisMom, confAxis.zzAxisNsigma});
603602
histos.add("EventTwoTracks/ElectronMuPi/PID/hTOFnSigmaEvsnSigmaPofO", ";Not-electron n#sigma^{e}_{TOF} (arb. units);Not-electron n#sigma^{#pi}_{TOF} (arb. units)", HistType::kTH2D, {confAxis.zzAxisNsigma, confAxis.zzAxisNsigma});
604-
605603
}
606604

607605
if (doTruthHistos) {
@@ -1999,7 +1997,8 @@ struct UpcTauRl {
19991997
}
20001998

20011999
template <typename C, typename Ts>
2002-
void outputTauEventCandidates(C const& collision, Ts const& tracks){
2000+
void outputTauEventCandidates(C const& collision, Ts const& tracks)
2001+
{
20032002

20042003
int countTracksPerCollision = 0;
20052004
int countGoodNonPVtracks = 0;
@@ -2026,7 +2025,7 @@ struct UpcTauRl {
20262025
}
20272026
} // Loop over tracks with selections
20282027

2029-
if (countPVGTel == 2 || (countPVGTel == 1 && countPVGTmupi == 1)){
2028+
if (countPVGTel == 2 || (countPVGTel == 1 && countPVGTmupi == 1)) {
20302029
const auto& trk1 = tracks.iteratorAt(vecTrkIdx[0]);
20312030
const auto& trk2 = tracks.iteratorAt(vecTrkIdx[1]);
20322031

@@ -2058,10 +2057,8 @@ struct UpcTauRl {
20582057
tpcSignal, tpcEl, tpcMu, tpcPi, tpcKa, tpcPr,
20592058
tofSignal, tofEl, tofMu, tofPi, tofKa, tofPr);
20602059
}
2061-
20622060
}
20632061

2064-
20652062
void processDataDG(FullUDCollision const& reconstructedCollision,
20662063
FullUDTracks const& reconstructedBarrelTracks)
20672064
{

0 commit comments

Comments
 (0)