Skip to content

Fixes to support version 1 #491

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
jgrosseo merged 2 commits into from
Feb 1, 2022
Merged

Fixes to support version 1 #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e0dcaf
Fixes to support version 1
jgrosseo Feb 1, 2022
f3ac6ba
typo
jgrosseo Feb 1, 2022
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
8 changes: 4 additions & 4 deletions DPG/Tasks/qaEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/// \author Henrique J C Zanoli <[email protected]>, Utrecht University
/// \author Nicolo' Jacazio <[email protected]>, CERN

// O2 inlcudes
// O2 includes
#include "Framework/AnalysisTask.h"
#include "Framework/HistogramRegistry.h"
#include "ReconstructionDataFormats/DCA.h"
Expand Down Expand Up @@ -216,7 +216,7 @@ struct QaTrackingEfficiency {
}
}

void process(const o2::aod::McParticles_000& mcParticles,
void process(const o2::aod::McParticles& mcParticles,
const o2::soa::Join<o2::aod::Collisions, o2::aod::McCollisionLabels, o2::aod::EvSels>& collisions,
const o2::soa::Join<o2::aod::Tracks, o2::aod::TracksExtra, o2::aod::McTrackLabels, o2::aod::TrackSelection>& tracks,
const o2::aod::McCollisions&)
Expand Down Expand Up @@ -311,7 +311,7 @@ struct QaTrackingEfficiency {
histos.fill(HIST("fakeTrackNoiseHits"), 0.5);
continue;
}
const auto mcParticle = track.mcParticle_as<o2::aod::McParticles_000>();
const auto mcParticle = track.mcParticle();
if (rejectParticle(mcParticle, HIST("trackSelection"))) {
continue;
}
Expand Down Expand Up @@ -358,7 +358,7 @@ struct QaTrackingEfficiency {

float dNdEta = 0;
for (const auto& mcParticle : mcParticles) {
if (TMath::Abs(mcParticle.eta()) <= 2.f && !mcParticle.has_daughter0() && !mcParticle.has_daughter1()) {
if (TMath::Abs(mcParticle.eta()) <= 2.f && !mcParticle.has_daughters()) {
dNdEta += 1.f;
}
if (rejectParticle(mcParticle, HIST("partSelection"))) {
Expand Down
4 changes: 2 additions & 2 deletions DPG/Tasks/qaEventTrack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ bool qaEventTrack::isSelectedTrack(const T& track)
return true;
}
}
auto particle = track.template mcParticle_as<aod::McParticles_000>();
auto particle = track.mcParticle();
const bool isPrimary = particle.isPhysicalPrimary();
if (selectPrim && !isPrimary) {
return false;
Expand Down Expand Up @@ -348,7 +348,7 @@ void qaEventTrack::processReco(const C& collision, const T& tracks)

if constexpr (IS_MC) {
// resolution plots
auto particle = track.template mcParticle_as<aod::McParticles_000>();
auto particle = track.mcParticle();
histos.fill(HIST("Tracks/Kine/resoPt"), track.pt() - particle.pt(), track.pt());
histos.fill(HIST("Tracks/Kine/resoEta"), track.eta() - particle.eta(), track.eta());
histos.fill(HIST("Tracks/Kine/resoPhi"), track.phi() - particle.phi(), track.phi());
Expand Down
6 changes: 3 additions & 3 deletions PWGLF/Tasks/mcspectraefficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ struct GeneratedTask {
int particles = 0;
int primaryparticles = 0;

void process(aod::McCollision const& mcCollision, aod::McParticles_000& mcParticles)
void process(aod::McCollision const& mcCollision, aod::McParticles& mcParticles)
{
LOGF(info, "MC. vtx-z = %f", mcCollision.posZ());
for (auto& mcParticle : mcParticles) {
Expand Down Expand Up @@ -107,11 +107,11 @@ struct ReconstructedTask {

void process(soa::Join<aod::Collisions, aod::McCollisionLabels>::iterator const& collision,
soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksExtended, aod::McTrackLabels, aod::TrackSelection>> const& tracks,
aod::McParticles_000& mcParticles, aod::McCollisions const& mcCollisions)
aod::McParticles& mcParticles, aod::McCollisions const& mcCollisions)
{
LOGF(info, "vtx-z (data) = %f | vtx-z (MC) = %f", collision.posZ(), collision.mcCollision().posZ());
for (auto& track : tracks) {
const auto particle = track.mcParticle_as<aod::McParticles_000>();
const auto particle = track.mcParticle();
const auto pdg = Form("%i", particle.pdgCode());
if (!particle.isPhysicalPrimary()) {
pdgsecH->Fill(pdg, 1);
Expand Down