Skip to content

Commit 377367d

Browse files
authored
Merge pull request #63 from alibuild/alibot-cleanup-10905
[PWGUD] Please consider the following formatting changes to AliceO2Group#10905
2 parents 8328bd9 + e17bd31 commit 377367d

3 files changed

Lines changed: 20 additions & 25 deletions

File tree

PWGUD/TableProducer/tauEventTableProducer.cxx

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ struct TauEventTableProducer {
194194
using FullUDTracks = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksDCA, aod::UDTracksPID, aod::UDTracksFlags>;
195195
using FullSGUDCollisions = soa::Join<aod::UDCollisions, aod::UDCollisionsSels, aod::UDCollisionSelExtras, aod::SGCollisions, aod::UDZdcsReduced>;
196196
using FullSGUDCollision = FullSGUDCollisions::iterator;
197-
using FullMCUDTracks = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksDCA, aod::UDTracksPID, aod::UDTracksFlags, aod::UDMcTrackLabels>;
198-
using FullMCSGUDCollisions = soa::Join<aod::UDCollisions, aod::UDCollisionsSels, aod::UDCollisionSelExtras, aod::SGCollisions, aod::UDMcCollsLabels>;
199-
using FullMCSGUDCollision = FullMCSGUDCollisions::iterator;
200-
using UDMcParticlesWithUDTracks = soa::Join<aod::UDMcParticles, aod::UDMcParticlesToUDTracks>;
201-
using UDMcCollisionsWithUDCollisions = soa::Join<aod::UDMcCollisions, aod::UDMcCollisionsToUDCollisions>;
202-
using UDMcCollisionsWithUDCollision = UDMcCollisionsWithUDCollisions::iterator;
197+
using FullMCUDTracks = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksDCA, aod::UDTracksPID, aod::UDTracksFlags, aod::UDMcTrackLabels>;
198+
using FullMCSGUDCollisions = soa::Join<aod::UDCollisions, aod::UDCollisionsSels, aod::UDCollisionSelExtras, aod::SGCollisions, aod::UDMcCollsLabels>;
199+
using FullMCSGUDCollision = FullMCSGUDCollisions::iterator;
200+
using UDMcParticlesWithUDTracks = soa::Join<aod::UDMcParticles, aod::UDMcParticlesToUDTracks>;
201+
using UDMcCollisionsWithUDCollisions = soa::Join<aod::UDMcCollisions, aod::UDMcCollisionsToUDCollisions>;
202+
using UDMcCollisionsWithUDCollision = UDMcCollisionsWithUDCollisions::iterator;
203203

204204
// init
205205
void init(InitContext&)
@@ -477,25 +477,22 @@ struct TauEventTableProducer {
477477
tpcSignal, tpcEl, tpcMu, tpcPi, tpcKa, tpcPr, tpcIP,
478478
tofSignal, tofEl, tofMu, tofPi, tofKa, tofPr, tofEP);
479479
}
480-
481480
}
482-
PROCESS_SWITCH(TauEventTableProducer, processDataSG, "Iterate UD tables with measured data created by SG-Candidate-Producer.", false);
483-
484-
void processMonteCarlo(UDMcCollisionsWithUDCollision const& mccollision,
485-
FullMCSGUDCollisions const&,
486-
FullUDTracks const&,
487-
UDMcParticlesWithUDTracks const&)
488-
{
489-
LOGF(info,"mccollision idx %i",mccollision.globalIndex());
490-
// LOGF(info,"mccollision idx %i, related collision idx %i",mccollision.globalIndex(),mccollision.udcollisionIds());
491-
if (mccollision.has_udcollisions()){
492-
auto const& collFromMcColl = mccollision.udcollisions_as<FullMCSGUDCollisions>();
493-
LOGF(info,"collision size %i ",collFromMcColl.size());
494-
}
495-
496-
}
497-
PROCESS_SWITCH(TauEventTableProducer, processMonteCarlo, "Iterate UD tables with simulated data created by SG-Candidate-Producer.", false);
481+
PROCESS_SWITCH(TauEventTableProducer, processDataSG, "Iterate UD tables with measured data created by SG-Candidate-Producer.", false);
498482

483+
void processMonteCarlo(UDMcCollisionsWithUDCollision const& mccollision,
484+
FullMCSGUDCollisions const&,
485+
FullUDTracks const&,
486+
UDMcParticlesWithUDTracks const&)
487+
{
488+
LOGF(info, "mccollision idx %i", mccollision.globalIndex());
489+
// LOGF(info,"mccollision idx %i, related collision idx %i",mccollision.globalIndex(),mccollision.udcollisionIds());
490+
if (mccollision.has_udcollisions()) {
491+
auto const& collFromMcColl = mccollision.udcollisions_as<FullMCSGUDCollisions>();
492+
LOGF(info, "collision size %i ", collFromMcColl.size());
493+
}
494+
}
495+
PROCESS_SWITCH(TauEventTableProducer, processMonteCarlo, "Iterate UD tables with simulated data created by SG-Candidate-Producer.", false);
499496
};
500497

501498
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

PWGUD/TableProducer/udMcCollisions2udCollisions.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ struct UDMcCollisions2UDCollisions {
6565
udmcc2udc(collisionIds);
6666
}
6767
PROCESS_SWITCH(UDMcCollisions2UDCollisions, processIndexingCentral, "Create reverse index from mccollisions to collision", false);
68-
6968
};
7069

7170
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

PWGUD/TableProducer/udMcParticles2udTracks.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ struct UDMcParticlesToUDTracks {
6565
udp2udt(trackIds);
6666
}
6767
PROCESS_SWITCH(UDMcParticlesToUDTracks, processIndexingCentral, "Create reverse index from particles to tracks", false);
68-
6968
};
7069

7170
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)

0 commit comments

Comments
 (0)