Skip to content

[DPG] Fix includes #16087

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
vkucera wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −8
Open

[DPG] Fix includes #16087

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
2 changes: 0 additions & 2 deletions DPG/Tasks/AOTTrack/qaEventTrack.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
/// \brief Task to produce QA objects for the track and the event properties in the AOD.
///

#include "qaEventTrack.h"

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/Core/MetadataHelper.h"
#include "Common/DataModel/EventSelection.h"
Expand Down Expand Up @@ -133,11 +131,11 @@
// TODO: ask if one can have different filters for both process functions
Filter trackFilter = (trackSelection.node() == 0) ||
((trackSelection.node() == 1) && requireGlobalTrackInFilter()) ||
((trackSelection.node() == 2) && requireGlobalTrackWoPtEtaInFilter()) ||

Check failure on line 134 in DPG/Tasks/AOTTrack/qaEventTrack.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.
((trackSelection.node() == 3) && requireGlobalTrackWoDCAInFilter()) ||

Check failure on line 135 in DPG/Tasks/AOTTrack/qaEventTrack.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.
((trackSelection.node() == 4) && requireQualityTracksInFilter()) ||

Check failure on line 136 in DPG/Tasks/AOTTrack/qaEventTrack.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.
((trackSelection.node() == 5) && requireTrackCutInFilter(TrackSelectionFlags::kInAcceptanceTracks)) ||

Check failure on line 137 in DPG/Tasks/AOTTrack/qaEventTrack.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.
((trackSelection.node() == 6) && requireGlobalTrackWoTPCClusterInFilter()) ||

Check failure on line 138 in DPG/Tasks/AOTTrack/qaEventTrack.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.
((trackSelection.node() == 7) && requireGlobalTrackWoDCATPCClusterInFilter());

using TrackIUTable = soa::Join<aod::TracksIU, aod::TracksExtra, aod::TrackSelection, aod::TrackSelectionExtension>;
Expand Down Expand Up @@ -764,19 +762,19 @@
LOG(info) << "================================";
LOG(info) << "=== soa::Filtered<TrackTableData> const& tracks, size=" << tracks.size();
int iTrack = 0;
for (auto& t : tracks) {

Check failure on line 765 in DPG/Tasks/AOTTrack/qaEventTrack.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.
LOG(info) << "[" << iTrack << "] .index()=" << t.index() << ", .globalIndex()=" << t.globalIndex();
iTrack++;
}
LOG(info) << "=== aod::FullTracks const& tracksUnfiltered, size=" << tracksUnfiltered.size();
int iTrackUnfiltered = 0;
for (auto& tuf : tracksUnfiltered) {

Check failure on line 771 in DPG/Tasks/AOTTrack/qaEventTrack.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.
LOG(info) << "[" << iTrackUnfiltered << "] .index()=" << tuf.index() << ", .globalIndex()=" << tuf.globalIndex();
iTrackUnfiltered++;
}
LOG(info) << "=== aod::AmbiguousTracks const& ambitracks, size=" << ambitracks.size();
int iTrackAmbi = 0;
for (auto& tamb : ambitracks) {

Check failure on line 777 in DPG/Tasks/AOTTrack/qaEventTrack.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.
LOG(info) << "[" << iTrackAmbi << "] .index()=" << tamb.index() << ", .globalIndex()=" << tamb.globalIndex() << ", .trackId()=" << tamb.trackId();
iTrackAmbi++;
}
Expand Down Expand Up @@ -1093,7 +1091,7 @@

/// check correct track-to-vertex matching exploiting MC info
std::vector<int> vec_coll_index_mismatched = {};
for (auto& track : tracks) {

Check failure on line 1094 in DPG/Tasks/AOTTrack/qaEventTrack.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.
histos.fill(HIST("Tracks/TestMCtrackToVtxMatch/ptAllTracks"), track.pt());
bool has_MCparticle = track.has_mcParticle();
if (track.collisionId() >= 0) {
Expand Down Expand Up @@ -1653,7 +1651,7 @@
auto pdgInfo = pdgDB->GetParticle(particle.pdgCode());
int sign = 0;
if (pdgInfo != nullptr) {
sign = pdgInfo->Charge() / abs(pdgInfo->Charge());

Check failure on line 1654 in DPG/Tasks/AOTTrack/qaEventTrack.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
}
// resolution plots
if (doExtraPIDqa && track.pidForTracking() != static_cast<unsigned int>(std::abs(PartIdentifier))) {
Expand Down
3 changes: 2 additions & 1 deletion DPG/Tasks/AOTTrack/qaEventTrackLite.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/// This task runs on prefiltered data
///

#include "qaEventTrack.h"
#include "qaEventTrackLite.h"

#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisTask.h>
Expand All @@ -41,6 +41,7 @@
#include <cstdint>
#include <cstdlib>
#include <ostream>
#include <string>
#include <vector>

#include <math.h>
Expand Down
8 changes: 4 additions & 4 deletions DPG/Tasks/AOTTrack/qaEventTrack.h → DPG/Tasks/AOTTrack/qaEventTrackLite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
// or submit itself to any jurisdiction.

///
/// \file qaEventTrack.h
/// \file qaEventTrackLite.h
/// \author Mario Krüger <mario.kruger@cern.ch>
/// \author Mattia Faggin <mattia.faggin@cern.ch>
/// \author Nicolò Jacazio <nicolo.jacazio@cern.ch>
/// \brief Header file for QA tasks for the track and the event properties.
///

#ifndef DPG_TASKS_AOTTRACK_QAEVENTTRACK_H_
#define DPG_TASKS_AOTTRACK_QAEVENTTRACK_H_
#ifndef DPG_TASKS_AOTTRACK_QAEVENTTRACKLITE_H_
#define DPG_TASKS_AOTTRACK_QAEVENTTRACKLITE_H_

#include "Common/DataModel/TrackSelectionTables.h"

Expand Down Expand Up @@ -170,4 +170,4 @@ DECLARE_SOA_TABLE(DPGNonRecoParticles, "AOD", "DPGNonRecoPart", //! Table of the
mcparticle::Vx, mcparticle::Vy, mcparticle::Vz);
} // namespace o2::aod

#endif // DPG_TASKS_AOTTRACK_QAEVENTTRACK_H_
#endif // DPG_TASKS_AOTTRACK_QAEVENTTRACKLITE_H_
2 changes: 1 addition & 1 deletion DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
/// \brief Task to produce a table with reduced information used for correlation studies for track selection, ideally used with qaEventTrackite
///

#include "qaEventTrack.h"
#include "qaEventTrackLite.h"

#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/McCollisionExtra.h"
Expand Down
Loading