Skip to content

[PWGCF] Please consider the following formatting changes to #10479 #40

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
cnkoster merged 1 commit into from
Mar 13, 2025
+33 −33
Merged

[PWGCF] Please consider the following formatting changes to #10479 #40

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
66 changes: 33 additions & 33 deletions PWGCF/Flow/Tasks/flowSP.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,16 @@
ConfigurableAxis axisCl = {"axisCl", {160, 0, 160}, "Number of cl. TPC"};

Filter collisionFilter = nabs(aod::collision::posZ) < cfgVtxZ;
Filter trackFilter = nabs(aod::track::eta) < cfgEta && aod::track::pt > cfgPtmin&& aod::track::pt < cfgPtmax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && nabs(aod::track::dcaXY) < cfgDCAxy && nabs(aod::track::dcaZ) < cfgDCAz;
Filter trackFilterMC = nabs(aod::mcparticle::eta) < cfgEta && aod::mcparticle::pt > cfgPtmin && aod::mcparticle::pt < cfgPtmax;
Filter trackFilter = nabs(aod::track::eta) < cfgEta && aod::track::pt > cfgPtmin&& aod::track::pt < cfgPtmax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && nabs(aod::track::dcaXY) < cfgDCAxy&& nabs(aod::track::dcaZ) < cfgDCAz;
Filter trackFilterMC = nabs(aod::mcparticle::eta) < cfgEta && aod::mcparticle::pt > cfgPtmin&& aod::mcparticle::pt < cfgPtmax;
using UsedCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentFV0As, aod::CentNGlobals, aod::SPTableZDC>>;
using UsedTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>>;

// For MC Reco and Gen
using CCs = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentFV0As, aod::CentNGlobals, aod::McCollisionLabels>>;
using CC = CCs::iterator;
using TCs = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA, aod::McTrackLabels>;
using FilteredTCs = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA, aod::McTrackLabels>>;
using CCs = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentFV0As, aod::CentNGlobals, aod::McCollisionLabels>>;
using CC = CCs::iterator;
using TCs = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA, aod::McTrackLabels>;
using FilteredTCs = soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA, aod::McTrackLabels>>;
using TC = TCs::iterator;
using MCs = soa::Filtered<aod::McParticles>;

Expand Down Expand Up @@ -196,7 +196,7 @@
trackSel_Pt,
trackSel_DCAxy,
trackSel_DCAz,
trackSel_GlobalTracks,
trackSel_GlobalTracks,
trackSel_NCls,
trackSel_FshCls,
trackSel_TPCBoundary,
Expand Down Expand Up @@ -264,8 +264,8 @@
registry.add("QA/after/CentFT0C_vs_CentFV0A", " ; Cent FT0C (%); Cent FV0A (%) ", {HistType::kTH2D, {axisCent, axisCent}});
registry.add("QA/after/CentFT0C_vs_CentNGlobal", " ; Cent FT0C (%); Cent NGlobal (%) ", {HistType::kTH2D, {axisCent, axisCent}});

if (doprocessData || doprocessMCReco){
// track QA for pos, neg, incl
if (doprocessData || doprocessMCReco) {
// track QA for pos, neg, incl
registry.add<TH1>("incl/QA/hPt", "", kTH1D, {axisPt});
registry.add<TH1>("incl/QA/hPhi", "", kTH1D, {axisPhi});
registry.add<TH1>("incl/QA/hPhiCorrected", "", kTH1D, {axisPhi});
Expand All @@ -279,9 +279,9 @@
}

if (doprocessMCReco) {
registry.add("trackMCReco/after/hIsPhysicalPrimary", "", {HistType::kTH1D, {{2,0,2}}});
registry.add("trackMCReco/hTrackSize_unFiltered", "", {HistType::kTH1D, {{100,0,20000}}});
registry.add("trackMCReco/hTrackSize_Filtered", "", {HistType::kTH1D, {{100,0,20000}}});
registry.add("trackMCReco/after/hIsPhysicalPrimary", "", {HistType::kTH1D, {{2, 0, 2}}});
registry.add("trackMCReco/hTrackSize_unFiltered", "", {HistType::kTH1D, {{100, 0, 20000}}});
registry.add("trackMCReco/hTrackSize_Filtered", "", {HistType::kTH1D, {{100, 0, 20000}}});
registry.get<TH1>(HIST("trackMCReco/after/hIsPhysicalPrimary"))->GetXaxis()->SetBinLabel(1, "Secondary");
registry.get<TH1>(HIST("trackMCReco/after/hIsPhysicalPrimary"))->GetXaxis()->SetBinLabel(2, "Primary");

Expand Down Expand Up @@ -395,8 +395,8 @@
registry.addClone("incl/", "pos/");
registry.addClone("incl/", "neg/");
}
}
}

if (doprocessMCGen) {
registry.add("trackMCGen/nCollReconstructedPerMcCollision", "", {HistType::kTH1D, {{10, -5, 5}}});
registry.add("trackMCGen/before/incl/pt_gen", "", {HistType::kTH1D, {axisPt}});
Expand Down Expand Up @@ -425,7 +425,7 @@
registry.get<TH1>(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_Pt + 1, "Pt");
registry.get<TH1>(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_DCAxy + 1, "DCAxy");
registry.get<TH1>(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_DCAz + 1, "DCAz");
registry.get<TH1>(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_GlobalTracks + 1, "GlobalTracks" );
registry.get<TH1>(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_GlobalTracks + 1, "GlobalTracks");
registry.get<TH1>(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_NCls + 1, "nClusters TPC");
registry.get<TH1>(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_FshCls + 1, "Frac. sh. Cls TPC");
registry.get<TH1>(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_TPCBoundary + 1, "TPC Boundary");
Expand Down Expand Up @@ -643,10 +643,10 @@
template <typename TrackObject>
bool trackSelected(TrackObject track, const int& field)
{
if(std::fabs(track.eta()) < cfgEta )
if (std::fabs(track.eta()) < cfgEta)
return false;
registry.fill(HIST("hTrackCount"), trackSel_Eta);

if (track.pt() < cfgPtmin || track.pt() > cfgPtmax)
return false;

Expand Down Expand Up @@ -1025,8 +1025,7 @@
if (!eventSelected(collision, filteredTracks.size(), centrality))
return;


if(!collision.has_mcCollision()){
if (!collision.has_mcCollision()) {
LOGF(info, "No mccollision found for this collision");
return;
}
Expand All @@ -1053,7 +1052,7 @@

if (!mcParticle.isPhysicalPrimary()) {
registry.fill(HIST("trackMCReco/before/hIsPhysicalPrimary"), 0);
continue;
continue;
} else {
registry.fill(HIST("trackMCReco/before/hIsPhysicalPrimary"), 1);
}
Expand All @@ -1080,7 +1079,7 @@
{
// LOGF(info, "Size of mccollisions: %i", mcCollisions.size());

for (auto mcCollision : mcCollisions) {

Check warning on line 1082 in PWGCF/Flow/Tasks/flowSP.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

Use constant references for non-modified iterators in range-based for loops.
float centrality = -1;
bool colSelected = true;

Expand Down Expand Up @@ -1110,17 +1109,17 @@
if (cfgNGlobal)
centrality = col.centNGlobal();
fillEventQA<kBefore>(col, trackSlice);
if(trackSlice.size() < 1) {
colSelected=false;
if (trackSlice.size() < 1) {
colSelected = false;
continue;
}
if(!eventSelected(col, filteredTrackSlice.size(), centrality)){
colSelected=false;
if (!eventSelected(col, filteredTrackSlice.size(), centrality)) {
colSelected = false;
continue;
}
fillEventQA<kAfter>(col, trackSlice);

if(!colSelected)
if (!colSelected)
continue;

float vtxz = mcCollision.posZ();
Expand All @@ -1129,15 +1128,16 @@
if (!particle.isPhysicalPrimary())
continue;

int charge = 0;;
int charge = 0;
;

auto pdgCode = particle.pdgCode();
auto pdgInfo = pdg->GetParticle(pdgCode);
if (pdgInfo != nullptr) {
charge = pdgInfo->Charge();
}
charge = pdgInfo->Charge();
}

if (std::fabs(charge) <1)
if (std::fabs(charge) < 1)
continue;

LOGF(info, "Charge: %i \t pdgCode %d", charge, pdgCode);
Expand All @@ -1147,10 +1147,10 @@
registry.fill(HIST("trackMCGen/before/incl/pt_gen"), particle.pt());
registry.fill(HIST("trackMCGen/before/incl/phi_eta_vtxZ_gen"), particle.phi(), particle.eta(), vtxz);

if(pos){
if (pos) {
registry.fill(HIST("trackMCGen/before/pos/pt_gen"), particle.pt());
registry.fill(HIST("trackMCGen/before/pos/phi_eta_vtxZ_gen"), particle.phi(), particle.eta(), vtxz);
} else {
} else {
registry.fill(HIST("trackMCGen/before/neg/pt_gen"), particle.pt());
registry.fill(HIST("trackMCGen/before/neg/phi_eta_vtxZ_gen"), particle.phi(), particle.eta(), vtxz);
}
Expand All @@ -1161,10 +1161,10 @@
registry.fill(HIST("trackMCGen/after/incl/pt_gen"), particle.pt());
registry.fill(HIST("trackMCGen/after/incl/phi_eta_vtxZ_gen"), particle.phi(), particle.eta(), vtxz);

if(pos){
if (pos) {
registry.fill(HIST("trackMCGen/after/pos/pt_gen"), particle.pt());
registry.fill(HIST("trackMCGen/after/pos/phi_eta_vtxZ_gen"), particle.phi(), particle.eta(), vtxz);
} else {
} else {
registry.fill(HIST("trackMCGen/after/neg/pt_gen"), particle.pt());
registry.fill(HIST("trackMCGen/after/neg/phi_eta_vtxZ_gen"), particle.phi(), particle.eta(), vtxz);
}
Expand Down
Loading