Skip to content

[PWGLF,PWGMM] Update for the latest data model #17221

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

Open
aalkin wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −1
Open

[PWGLF,PWGMM] Update for the latest data model #17221

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
5 changes: 4 additions & 1 deletion PWGMM/Mult/Tasks/dndeta.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,11 @@
void processEventStatGeneral(FullBCs const& bcs, C const& collisions)
{
std::vector<int64_t> colids;
for (auto& bc : bcs) {

Check failure on line 386 in PWGMM/Mult/Tasks/dndeta.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 (!useEvSel || isBCSelected(bc)) {
commonRegistry.fill(HIST(BCSelection), 1.);
colids.clear();
for (auto& collision : collisions) {

Check failure on line 390 in PWGMM/Mult/Tasks/dndeta.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_foundBC()) {
if (collision.foundBCId() == bc.globalIndex()) {
colids.push_back(collision.globalIndex());
Expand All @@ -404,7 +404,7 @@
}
}
auto col = collisions.begin();
for (auto& colid : colids) {

Check failure on line 407 in PWGMM/Mult/Tasks/dndeta.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.
col.moveByIndex(colid - col.globalIndex());
float c = getRecoCent(c);
if constexpr (has_reco_cent<C>) {
Expand Down Expand Up @@ -479,7 +479,7 @@
int countTracks(T const& tracks, float z, float c, float o)
{
auto Ntrks = 0;
for (auto& track : tracks) {

Check failure on line 482 in PWGMM/Mult/Tasks/dndeta.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 (std::abs(track.eta()) < estimatorEta) {
++Ntrks;
}
Expand Down Expand Up @@ -536,7 +536,7 @@
if (Ntrks > 0) {
binnedRegistry.fill(HIST(EventSelection), static_cast<float>(EvSelBins::kSelectedgt0), c, o);
}
for (auto& track : tracks) {

Check failure on line 539 in PWGMM/Mult/Tasks/dndeta.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 (Ntrks > 0) {
binnedRegistry.fill(HIST(EtaZvtx_gt0), track.eta(), z, c, o);
}
Expand All @@ -555,7 +555,7 @@
if (Ntrks > 0) {
inclusiveRegistry.fill(HIST(EventSelection), static_cast<float>(EvSelBins::kSelectedgt0), o);
}
for (auto& track : tracks) {

Check failure on line 558 in PWGMM/Mult/Tasks/dndeta.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 (Ntrks > 0) {
inclusiveRegistry.fill(HIST(EtaZvtx_gt0), track.eta(), z, o);
}
Expand All @@ -580,7 +580,7 @@
int countTracksAmbiguous(T const& tracks, AT const& atracks, float z, float c, float o)
{
auto Ntrks = 0;
for (auto& track : atracks) {

Check failure on line 583 in PWGMM/Mult/Tasks/dndeta.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.
auto otrack = track.template track_as<T>();
// same filtering for ambiguous as for general
if (!otrack.hasITS()) {
Expand Down Expand Up @@ -647,7 +647,7 @@
}
}

for (auto& track : tracks) {

Check failure on line 650 in PWGMM/Mult/Tasks/dndeta.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 (std::find(usedTracksIds.begin(), usedTracksIds.end(), track.globalIndex()) != usedTracksIds.end()) {
continue;
}
Expand Down Expand Up @@ -711,7 +711,7 @@
if (Ntrks > 0) {
binnedRegistry.fill(HIST(EventSelection), static_cast<float>(EvSelBins::kSelectedgt0), c, o);
}
for (auto& track : atracks) {

Check failure on line 714 in PWGMM/Mult/Tasks/dndeta.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 (Ntrks > 0) {
binnedRegistry.fill(HIST(EtaZvtx_gt0), track.track_as<FiTracks>().eta(), z, c, o);
}
Expand All @@ -719,7 +719,7 @@
binnedRegistry.fill(HIST(EtaZvtx_PVgt0), track.track_as<FiTracks>().eta(), z, c, o);
}
}
for (auto& track : tracks) {

Check failure on line 722 in PWGMM/Mult/Tasks/dndeta.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 (std::find(usedTracksIds.begin(), usedTracksIds.end(), track.globalIndex()) != usedTracksIds.end()) {
continue;
}
Expand Down Expand Up @@ -842,7 +842,10 @@
using LabeledTracksEx = soa::Join<LabeledTracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>;
using FiLTracks = soa::Filtered<LabeledTracksEx>;
using ParticlesI = soa::Filtered<soa::Join<aod::McParticles, aod::ParticlesToTracks>>;
expressions::Filter primaries = ncheckbit(aod::mcparticle::flags, (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary);
expressions::Filter primaries =
ifnode(nsqrt(aod::mcparticle::vx * aod::mcparticle::vx + aod::mcparticle::vy * aod::mcparticle::vy) > 5.f,
false,
ncheckbit(aod::mcparticle_v2::storedFlags, (uint8_t)o2::aod::mcparticle::enums::PhysicalPrimary));

bool isChargedParticle(int code)
{
Expand Down
Loading