Skip to content

Commit 75c8b79

Browse files
axti98axti98
committed
Fix linter errors
1 parent 5cb03c2 commit 75c8b79

2 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎ALICE3/DataModel/ReducedTablesAlice3.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ namespace o2::aod
3939
namespace reducedeventalice3
4040
{
4141
DECLARE_SOA_COLUMN(MultDensity, multDensity, float);
42-
DECLARE_SOA_COLUMN(MCPosX, mcPosX, float); //! MC event position X
43-
DECLARE_SOA_COLUMN(MCPosY, mcPosY, float); //! MC event position Y
44-
DECLARE_SOA_COLUMN(MCPosZ, mcPosZ, float); //! MC event position Z
42+
DECLARE_SOA_COLUMN(McPosX, mcPosX, float); //! MC event position X
43+
DECLARE_SOA_COLUMN(McPosY, mcPosY, float); //! MC event position Y
44+
DECLARE_SOA_COLUMN(McPosZ, mcPosZ, float); //! MC event position Z
4545
} // namespace reducedeventalice3
4646

4747
DECLARE_SOA_TABLE_STAGED(ReA3Events, "REA3EVENT", //! Main event information table
@@ -63,7 +63,7 @@ DECLARE_SOA_TABLE(ReducedA3EventsInfo, "AOD", "REA3EVENTINFO", //! Main event
6363

6464
DECLARE_SOA_TABLE(ReA3MCEvents, "AOD", "REA3MCEVENT", //! Event level MC truth information
6565
o2::soa::Index<>,
66-
mccollision::GeneratorsID, reducedeventalice3::MCPosX, reducedeventalice3::MCPosY, reducedeventalice3::MCPosZ,
66+
mccollision::GeneratorsID, reducedeventalice3::McPosX, reducedeventalice3::McPosY, reducedeventalice3::McPosZ,
6767
mccollision::T, mccollision::Weight, mccollision::ImpactParameter,
6868
mcmult_alice3::MultMC, mcmult_alice3::MultMC25, mcmult_alice3::MultMC125, mcmult_alice3::MultMC09);
6969

@@ -73,7 +73,7 @@ using ReA3Event = ReA3Events::iterator;
7373
namespace reducedtrackalice3
7474
{
7575
// basic track information
76-
DECLARE_SOA_INDEX_COLUMN(ReA3Event, rea3event); //!
76+
DECLARE_SOA_INDEX_COLUMN(ReA3Event, reA3Event); //!
7777
DECLARE_SOA_INDEX_COLUMN(Track, track); //!
7878
// ---- flags reserved for storing various information during filtering
7979
DECLARE_SOA_BITMAP_COLUMN(FilteringFlags, filteringFlags, 64); //!
@@ -124,7 +124,7 @@ DECLARE_SOA_TABLE(ReducedA3TracksBarrelCov, "AOD", "REA3BARRELCOV", //!
124124
track::CSnpSnp, track::CTglY, track::CTglZ, track::CTglSnp, track::CTglTgl,
125125
track::C1PtY, track::C1PtZ, track::C1PtSnp, track::C1PtTgl, track::C1Pt21Pt2);
126126

127-
namespace reducedA3trackMC
127+
namespace reduceda3trackmc
128128
{
129129
DECLARE_SOA_INDEX_COLUMN(ReA3MCEvent, reA3MCEvent); //!
130130
DECLARE_SOA_COLUMN(McReducedFlags, mcReducedFlags, uint16_t); //! Flags to hold compressed MC selection information
@@ -154,23 +154,23 @@ DECLARE_SOA_DYNAMIC_COLUMN(Y, y, //! Particle rapidity
154154
}
155155
return -999.0f;
156156
});
157-
} // namespace reducedA3trackMC
157+
} // namespace reduceda3trackmc
158158

159159
// NOTE: This table is nearly identical to the one from Framework (except that it points to the event ID, not the BC id)
160160
// This table contains all MC truth tracks (both barrel and muon)
161161
DECLARE_SOA_TABLE(ReA3MCTracks, "AOD", "REA3MCTRACK", //! MC track information (on disk)
162-
o2::soa::Index<>, reducedA3trackMC::ReA3MCEventId,
162+
o2::soa::Index<>, reduceda3trackmc::ReA3MCEventId,
163163
mcparticle::PdgCode, mcparticle::StatusCode, mcparticle::Flags,
164-
reducedA3trackMC::MothersIds, reducedA3trackMC::DaughtersIdSlice,
164+
reduceda3trackmc::MothersIds, reduceda3trackmc::DaughtersIdSlice,
165165
mcparticle::Weight,
166-
reducedA3trackMC::Pt, reducedA3trackMC::Eta, reducedA3trackMC::Phi, reducedA3trackMC::E,
166+
reduceda3trackmc::Pt, reduceda3trackmc::Eta, reduceda3trackmc::Phi, reduceda3trackmc::E,
167167
mcparticle::Vx, mcparticle::Vy, mcparticle::Vz, mcparticle::Vt,
168-
reducedA3trackMC::McReducedFlags,
169-
reducedA3trackMC::Px<reducedA3trackMC::Pt, reducedA3trackMC::Phi>,
170-
reducedA3trackMC::Py<reducedA3trackMC::Pt, reducedA3trackMC::Phi>,
171-
reducedA3trackMC::Pz<reducedA3trackMC::Pt, reducedA3trackMC::Eta>,
172-
reducedA3trackMC::P<reducedA3trackMC::Pt, reducedA3trackMC::Eta>,
173-
reducedA3trackMC::Y<reducedA3trackMC::Pt, reducedA3trackMC::Eta, reducedA3trackMC::E>,
168+
reduceda3trackmc::McReducedFlags,
169+
reduceda3trackmc::Px<reduceda3trackmc::Pt, reduceda3trackmc::Phi>,
170+
reduceda3trackmc::Py<reduceda3trackmc::Pt, reduceda3trackmc::Phi>,
171+
reduceda3trackmc::Pz<reduceda3trackmc::Pt, reduceda3trackmc::Eta>,
172+
reduceda3trackmc::P<reduceda3trackmc::Pt, reduceda3trackmc::Eta>,
173+
reduceda3trackmc::Y<reduceda3trackmc::Pt, reduceda3trackmc::Eta, reduceda3trackmc::E>,
174174
mcparticle::ProducedByGenerator<mcparticle::Flags>,
175175
mcparticle::FromBackgroundEvent<mcparticle::Flags>,
176176
mcparticle::GetGenStatusCode<mcparticle::Flags, mcparticle::StatusCode>,
@@ -189,7 +189,7 @@ DECLARE_SOA_COLUMN(McMask, mcMask, uint16_t);
189189
// NOTE: MC labels. This table has one entry for each reconstructed track (joinable with the track tables)
190190
// The McParticleId points to the position of the MC truth track from the ReducedTracksMC table
191191
DECLARE_SOA_TABLE(ReducedA3TracksBarrelLabels, "AOD", "REA3BARLA", //!
192-
reduceda3barreltracklabel::ReA3MCTrackId, reduceda3barreltracklabel::McMask, reducedA3trackMC::McReducedFlags);
192+
reduceda3barreltracklabel::ReA3MCTrackId, reduceda3barreltracklabel::McMask, reduceda3trackmc::McReducedFlags);
193193

194194
using ReducedA3TrackBarrelLabel = ReducedA3TracksBarrelLabels::iterator;
195195

@@ -221,15 +221,15 @@ DECLARE_SOA_TABLE(ReducedA3MCEventLabels, "AOD", "REA3MCCOLLBL", //! Table joine
221221

222222
using ReducedA3MCEventLabel = ReducedA3MCEventLabels::iterator;
223223

224-
namespace reducedA3track_association
224+
namespace reduceda3trackassociation
225225
{
226-
DECLARE_SOA_INDEX_COLUMN(ReA3Event, reA3event); //! ReducedEvent index
227-
DECLARE_SOA_INDEX_COLUMN(ReA3Track, reA3track); //! ReducedTrack index
228-
} // namespace reducedA3track_association
226+
DECLARE_SOA_INDEX_COLUMN(ReA3Event, reA3Event); //! ReducedEvent index
227+
DECLARE_SOA_INDEX_COLUMN(ReA3Track, reA3Track); //! ReducedTrack index
228+
} // namespace reduceda3trackassociation
229229

230230
DECLARE_SOA_TABLE(ReducedA3TracksAssoc, "AOD", "REA3ASSOC", //! Table for reducedtrack-to-reducedcollision association
231-
reducedA3track_association::ReA3EventId,
232-
reducedA3track_association::ReA3TrackId);
231+
reduceda3trackassociation::ReA3EventId,
232+
reduceda3trackassociation::ReA3TrackId);
233233

234234
DECLARE_SOA_TABLE(ReducedA3PIDTOF, "AOD", "REA3PIDTOF",
235235
upgrade_tof::TOFEventTime,

‎ALICE3/Tasks/alice3DqEfficiency.cxx‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ struct Alice3DqEfficiencyAnalysisTrackSelection {
401401

402402
// Loop over associations
403403
for (const auto& assoc : assocs) {
404-
auto event = assoc.template reA3event_as<MyEventsVtxCovSelected>();
404+
auto event = assoc.template reA3Event_as<MyEventsVtxCovSelected>();
405405
if (!event.isEventSelected_bit(0)) {
406406
trackSel(0);
407407
continue;
@@ -414,7 +414,7 @@ struct Alice3DqEfficiencyAnalysisTrackSelection {
414414
VarManager::FillEventAlice3<VarManager::ObjTypes::ReducedEventMC>(event.reA3MCEvent());
415415
}
416416

417-
auto track = assoc.template reA3track_as<MyBarrelTracksWithCov>();
417+
auto track = assoc.template reA3Track_as<MyBarrelTracksWithCov>();
418418
VarManager::FillTrackAlice3<GkTrackFillMapWithCov>(track);
419419
// compute quantities which depend on the associated collision, such as DCA
420420
VarManager::FillTrackCollision<GkTrackFillMapWithCov>(track, event);
@@ -563,7 +563,7 @@ struct Alice3DqEfficiencyAnalysisPrefilterSelection {
563563
uint32_t fPrefilterMask = 0;
564564
int fPrefilterCutBit = -1;
565565

566-
PresliceUnsorted<aod::ReducedA3TracksAssoc> trackAssocsPerCollision = aod::reducedA3track_association::reA3eventId;
566+
PresliceUnsorted<aod::ReducedA3TracksAssoc> trackAssocsPerCollision = aod::reduceda3trackassociation::reA3EventId;
567567

568568
void init(o2::framework::InitContext& context)
569569
{
@@ -650,8 +650,8 @@ struct Alice3DqEfficiencyAnalysisPrefilterSelection {
650650
}
651651

652652
for (const auto& [assoc1, assoc2] : o2::soa::combinations(assocs, assocs)) {
653-
auto track1 = assoc1.template reA3track_as<MyBarrelTracks>();
654-
auto track2 = assoc2.template reA3track_as<MyBarrelTracks>();
653+
auto track1 = assoc1.template reA3Track_as<MyBarrelTracks>();
654+
auto track2 = assoc2.template reA3Track_as<MyBarrelTracks>();
655655

656656
// NOTE: here we restrict to just pairs of opposite sign (conversions), but in principle this can be made
657657
// a configurable and check also same-sign pairs (track splitting)
@@ -707,7 +707,7 @@ struct Alice3DqEfficiencyAnalysisPrefilterSelection {
707707
} else {
708708
for (const auto& assoc : assocs) {
709709
// TODO: just use the index from the assoc (no need to cast the whole track)
710-
auto track = assoc.template reA3track_as<MyBarrelTracks>();
710+
auto track = assoc.template reA3Track_as<MyBarrelTracks>();
711711
mymap = -1;
712712
if (!fPrefilterMap.contains(track.globalIndex())) {
713713
// NOTE: publish the bitwise negated bits (~), so there will be zeroes for cuts that failed the prefiltering and 1 everywhere else
@@ -788,7 +788,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
788788

789789
bool fEnableBarrelHistos = false;
790790

791-
PresliceUnsorted<MyBarrelAssocsPrefilter> trackAssocsPerCollision = aod::reducedA3track_association::reA3eventId;
791+
PresliceUnsorted<MyBarrelAssocsPrefilter> trackAssocsPerCollision = aod::reduceda3trackassociation::reA3EventId;
792792

793793
void init(o2::framework::InitContext& context)
794794
{
@@ -1036,8 +1036,8 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
10361036
continue;
10371037
}
10381038

1039-
auto t1 = a1.template reA3track_as<MyBarrelTracksWithCovWithAmbiguities>();
1040-
auto t2 = a2.template reA3track_as<MyBarrelTracksWithCovWithAmbiguities>();
1039+
auto t1 = a1.template reA3Track_as<MyBarrelTracksWithCovWithAmbiguities>();
1040+
auto t2 = a2.template reA3Track_as<MyBarrelTracksWithCovWithAmbiguities>();
10411041
sign1 = t1.sign();
10421042
sign2 = t2.sign();
10431043
// store the ambiguity number of the two dilepton legs in the last 4 digits of the two-track filter
@@ -1176,7 +1176,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
11761176
} // end loop over events
11771177
}
11781178

1179-
PresliceUnsorted<ReA3MCTracks> perReducedMcEvent = aod::reducedA3trackMC::reA3MCEventId;
1179+
PresliceUnsorted<ReA3MCTracks> perReducedMcEvent = aod::reduceda3trackmc::reA3MCEventId;
11801180

11811181
void runMCGenWithGrouping(MyEventsVtxCovSelected const& events, ReA3MCEvents const& /*mcEvents*/, ReA3MCTracks const& mcTracks)
11821182
{
@@ -1291,7 +1291,7 @@ struct Alice3DqEfficiencyAnalysisSameEventPairing {
12911291
runMCGenWithGrouping(events, mcEvents, mcTracks);
12921292
}
12931293

1294-
PresliceUnsorted<ReA3MCTracks> perReducedMcGenEvent = aod::reducedA3trackMC::reA3MCEventId;
1294+
PresliceUnsorted<ReA3MCTracks> perReducedMcGenEvent = aod::reduceda3trackmc::reA3MCEventId;
12951295

12961296
void processMCGen(soa::Filtered<MyEventsVtxCovSelected> const& events, ReA3MCEvents const& /*mcEvents*/, ReA3MCTracks const& mcTracks)
12971297
{
@@ -1530,8 +1530,8 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
15301530

15311531
Filter eventFilter = aod::dqanalysisflags::isEventSelected > static_cast<uint32_t>(0);
15321532

1533-
PresliceUnsorted<MyBarrelAssocs> trackAssocsPerCollision = aod::reducedA3track_association::reA3eventId;
1534-
// PresliceUnsorted<aod::ReducedA3TracksAssoc> trackAssocsPerCollision = aod::reducedA3track_association::reA3eventId;
1533+
PresliceUnsorted<MyBarrelAssocs> trackAssocsPerCollision = aod::reduceda3trackassociation::reA3EventId;
1534+
// PresliceUnsorted<aod::ReducedA3TracksAssoc> trackAssocsPerCollision = aod::reduceda3trackassociation::reA3EventId;
15351535

15361536
// Partitions for triplets and asymmetric pairs
15371537
Partition<MyBarrelAssocs> legACandidateAssocs = (o2::aod::dqanalysisflags::isBarrelSelected & cfgLegAFilterMask) > static_cast<uint32_t>(0);
@@ -1932,8 +1932,8 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
19321932
// Find common track cuts both candidates pass
19331933
twoTrackCommonFilter |= a1.isBarrelSelected_raw() & a2.isBarrelSelected_raw() & fCommonTrackCutMask;
19341934

1935-
auto t1 = a1.template reA3track_as<MyBarrelTracksWithCovWithAmbiguities>();
1936-
auto t2 = a2.template reA3track_as<MyBarrelTracksWithCovWithAmbiguities>();
1935+
auto t1 = a1.template reA3Track_as<MyBarrelTracksWithCovWithAmbiguities>();
1936+
auto t2 = a2.template reA3Track_as<MyBarrelTracksWithCovWithAmbiguities>();
19371937

19381938
// Avoid self-pairs
19391939
if (t1.globalIndex() == t2.globalIndex()) {
@@ -2198,9 +2198,9 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
21982198
// Find common track cuts all candidates pass
21992199
threeTrackCommonFilter |= a1.isBarrelSelected_raw() & a2.isBarrelSelected_raw() & a3.isBarrelSelected_raw() & fCommonTrackCutMask;
22002200

2201-
auto t1 = a1.template reA3track_as<TTracks>();
2202-
auto t2 = a2.template reA3track_as<TTracks>();
2203-
auto t3 = a3.template reA3track_as<TTracks>();
2201+
auto t1 = a1.template reA3Track_as<TTracks>();
2202+
auto t2 = a2.template reA3Track_as<TTracks>();
2203+
auto t3 = a3.template reA3Track_as<TTracks>();
22042204

22052205
// Avoid self-pairs
22062206
if (t1 == t2 || t1 == t3 || t2 == t3) {
@@ -2325,7 +2325,7 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
23252325
{
23262326
// loop over mc stack and fill histograms for pure MC truth signals
23272327
// group all the MC tracks which belong to the MC event corresponding to the current reconstructed event
2328-
// auto groupedMCTracks = tracksMC.sliceBy(aod::reducedA3trackMC::reA3MCEventId, event.reducedMCevent().globalIndex());
2328+
// auto groupedMCTracks = tracksMC.sliceBy(aod::reduceda3trackmc::reA3MCEventId, event.reducedMCevent().globalIndex());
23292329
for (const auto& mctrack : mcTracks) {
23302330

23312331
VarManager::FillTrackMC(mcTracks, mctrack);
@@ -2340,7 +2340,7 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
23402340
}
23412341
}
23422342

2343-
PresliceUnsorted<ReA3MCTracks> perReducedMcEvent = aod::reducedA3trackMC::reA3MCEventId;
2343+
PresliceUnsorted<ReA3MCTracks> perReducedMcEvent = aod::reduceda3trackmc::reA3MCEventId;
23442344

23452345
void processMCGenWithEventSelection(soa::Filtered<MyEventsVtxCovSelected> const& events,
23462346
ReA3MCEvents const& /*mcEvents*/, ReA3MCTracks const& mcTracks)

0 commit comments

Comments
 (0)