Skip to content

[PWGUD] Please consider the following formatting changes to #10905 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolavick merged 1 commit into from
Apr 17, 2025
Merged

[PWGUD] Please consider the following formatting changes to #10905 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions PWGUD/TableProducer/tauEventTableProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "PWGUD/Core/SGSelector.h"

// ROOT headers
#include "TLorentzVector.h"

Check warning on line 47 in PWGUD/TableProducer/tauEventTableProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/lorentz-vector] 

Do not use the TLorentzVector legacy class. Use std::array with RecoDecay methods or the ROOT::Math::LorentzVector template instead.
#include "TPDGCode.h"

using namespace o2;
Expand Down Expand Up @@ -194,12 +194,12 @@
using FullUDTracks = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksDCA, aod::UDTracksPID, aod::UDTracksFlags>;
using FullSGUDCollisions = soa::Join<aod::UDCollisions, aod::UDCollisionsSels, aod::UDCollisionSelExtras, aod::SGCollisions, aod::UDZdcsReduced>;
using FullSGUDCollision = FullSGUDCollisions::iterator;
using FullMCUDTracks = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksDCA, aod::UDTracksPID, aod::UDTracksFlags, aod::UDMcTrackLabels>;
using FullMCSGUDCollisions = soa::Join<aod::UDCollisions, aod::UDCollisionsSels, aod::UDCollisionSelExtras, aod::SGCollisions, aod::UDMcCollsLabels>;
using FullMCSGUDCollision = FullMCSGUDCollisions::iterator;
using UDMcParticlesWithUDTracks = soa::Join<aod::UDMcParticles, aod::UDMcParticlesToUDTracks>;
using UDMcCollisionsWithUDCollisions = soa::Join<aod::UDMcCollisions, aod::UDMcCollisionsToUDCollisions>;
using UDMcCollisionsWithUDCollision = UDMcCollisionsWithUDCollisions::iterator;
using FullMCUDTracks = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksDCA, aod::UDTracksPID, aod::UDTracksFlags, aod::UDMcTrackLabels>;
using FullMCSGUDCollisions = soa::Join<aod::UDCollisions, aod::UDCollisionsSels, aod::UDCollisionSelExtras, aod::SGCollisions, aod::UDMcCollsLabels>;
using FullMCSGUDCollision = FullMCSGUDCollisions::iterator;
using UDMcParticlesWithUDTracks = soa::Join<aod::UDMcParticles, aod::UDMcParticlesToUDTracks>;
using UDMcCollisionsWithUDCollisions = soa::Join<aod::UDMcCollisions, aod::UDMcCollisionsToUDCollisions>;
using UDMcCollisionsWithUDCollision = UDMcCollisionsWithUDCollisions::iterator;

// init
void init(InitContext&)
Expand All @@ -216,11 +216,11 @@
{

// FTOA
if ((std::abs(coll.timeFT0A()) > maxFITtime) && coll.timeFT0A() > -998.)

Check warning on line 219 in PWGUD/TableProducer/tauEventTableProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;

// FTOC
if ((std::abs(coll.timeFT0C()) > maxFITtime) && coll.timeFT0C() > -998.)

Check warning on line 223 in PWGUD/TableProducer/tauEventTableProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
return false;

return true;
Expand Down Expand Up @@ -418,7 +418,7 @@
// Apply weak condition on track PID
int countPVGTel = 0;
int countPVGTmupi = 0;
if (countGoodPVtracks == 2) {

Check warning on line 421 in PWGUD/TableProducer/tauEventTableProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
for (const auto& vecMember : vecTrkIdx) {
const auto& thisTrk = tracks.iteratorAt(vecMember);
if (isElectronCandidate(thisTrk)) {
Expand All @@ -431,7 +431,7 @@
}
}

if (cutPreselect.preselUseTrackPID ? ((countPVGTel == 2 && countPVGTmupi == 0) || (countPVGTel == 1 && countPVGTmupi == 1)) : countGoodPVtracks == cutPreselect.preselNgoodPVtracs) {

Check warning on line 434 in PWGUD/TableProducer/tauEventTableProducer.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
const auto& trk1 = tracks.iteratorAt(vecTrkIdx[0]);
const auto& trk2 = tracks.iteratorAt(vecTrkIdx[1]);

Expand Down Expand Up @@ -477,25 +477,22 @@
tpcSignal, tpcEl, tpcMu, tpcPi, tpcKa, tpcPr, tpcIP,
tofSignal, tofEl, tofMu, tofPi, tofKa, tofPr, tofEP);
}

}
PROCESS_SWITCH(TauEventTableProducer, processDataSG, "Iterate UD tables with measured data created by SG-Candidate-Producer.", false);

void processMonteCarlo(UDMcCollisionsWithUDCollision const& mccollision,
FullMCSGUDCollisions const&,
FullUDTracks const&,
UDMcParticlesWithUDTracks const&)
{
LOGF(info,"mccollision idx %i",mccollision.globalIndex());
// LOGF(info,"mccollision idx %i, related collision idx %i",mccollision.globalIndex(),mccollision.udcollisionIds());
if (mccollision.has_udcollisions()){
auto const& collFromMcColl = mccollision.udcollisions_as<FullMCSGUDCollisions>();
LOGF(info,"collision size %i ",collFromMcColl.size());
}

}
PROCESS_SWITCH(TauEventTableProducer, processMonteCarlo, "Iterate UD tables with simulated data created by SG-Candidate-Producer.", false);
PROCESS_SWITCH(TauEventTableProducer, processDataSG, "Iterate UD tables with measured data created by SG-Candidate-Producer.", false);

void processMonteCarlo(UDMcCollisionsWithUDCollision const& mccollision,
FullMCSGUDCollisions const&,
FullUDTracks const&,
UDMcParticlesWithUDTracks const&)
{
LOGF(info, "mccollision idx %i", mccollision.globalIndex());
// LOGF(info,"mccollision idx %i, related collision idx %i",mccollision.globalIndex(),mccollision.udcollisionIds());

Check failure on line 489 in PWGUD/TableProducer/tauEventTableProducer.cxx

View workflow job for this annotation

GitHub Actions / PR formatting / whitespace

Tab characters found 

Indent code using spaces instead of tabs.
if (mccollision.has_udcollisions()) {
auto const& collFromMcColl = mccollision.udcollisions_as<FullMCSGUDCollisions>();
LOGF(info, "collision size %i ", collFromMcColl.size());
}
}
PROCESS_SWITCH(TauEventTableProducer, processMonteCarlo, "Iterate UD tables with simulated data created by SG-Candidate-Producer.", false);
};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
Expand Down
1 change: 0 additions & 1 deletion PWGUD/TableProducer/udMcCollisions2udCollisions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
Expand All @@ -14,7 +14,7 @@
/// \author Roman Lavička
/// \since 2025-04-15
/// \brief A task to create a reverse index from UDMcCollisions to UDCollisions
///

Check warning on line 17 in PWGUD/TableProducer/udMcCollisions2udCollisions.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file] 

Documentation for \file is missing, incorrect or misplaced.

#include "Framework/runDataProcessing.h"
#include "Framework/AnalysisDataModel.h"
Expand Down Expand Up @@ -46,11 +46,11 @@
{
// faster version, but will use more memory due to pre-allocation
std::vector<std::vector<int>> mccoll2coll(mcCollisions.size());
for (auto& collision : collisions) {

Check warning on line 49 in PWGUD/TableProducer/udMcCollisions2udCollisions.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
if (collision.has_udMcCollision())
mccoll2coll[collision.udMcCollisionId()].push_back(collision.globalIndex());
}
for (auto& mcCollision : mcCollisions) {

Check warning on line 53 in PWGUD/TableProducer/udMcCollisions2udCollisions.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
udmcc2udc(mccoll2coll[mcCollision.globalIndex()]);
}
}
Expand All @@ -59,13 +59,12 @@
void processIndexingCentral(aod::UDMcCollisions const&, soa::SmallGroups<LabeledCollisions> const& collisions)
{
collisionIds.clear();
for (auto& collision : collisions) {

Check warning on line 62 in PWGUD/TableProducer/udMcCollisions2udCollisions.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[const-ref-in-for-loop] 

Use constant references for non-modified iterators in range-based for loops.
collisionIds.push_back(collision.globalIndex());
}
udmcc2udc(collisionIds);
}
PROCESS_SWITCH(UDMcCollisions2UDCollisions, processIndexingCentral, "Create reverse index from mccollisions to collision", false);

};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
Expand Down
1 change: 0 additions & 1 deletion PWGUD/TableProducer/udMcParticles2udTracks.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ struct UDMcParticlesToUDTracks {
udp2udt(trackIds);
}
PROCESS_SWITCH(UDMcParticlesToUDTracks, processIndexingCentral, "Create reverse index from particles to tracks", false);

};

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
Expand Down
Loading