-
Notifications
You must be signed in to change notification settings - Fork 668
Filter task separated in its own task dptdpt-filter #265
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // 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. | ||
| // | ||
| // This software is distributed under the terms of the GNU General Public | ||
| // License v3 (GPL Version 3), copied verbatim in the file "COPYING". | ||
| // | ||
| // In applying this license CERN does not waive the privileges and immunities | ||
| // granted to it by virtue of its status as an Intergovernmental Organization | ||
| // or submit itself to any jurisdiction. | ||
| #ifndef O2_ANALYSIS_DPTDPTFILTERED_H | ||
| #define O2_ANALYSIS_DPTDPTFILTERED_H | ||
|
|
||
| #include "Framework/ASoA.h" | ||
| #include "Framework/AnalysisDataModel.h" | ||
|
|
||
| namespace o2 | ||
| { | ||
| namespace aod | ||
| { | ||
| /* we have to change from int to bool when bool columns work properly */ | ||
| namespace dptdptfilter | ||
| { | ||
| DECLARE_SOA_COLUMN(DptDptCFCollisionAccepted, collisionaccepted, bool); //! If the collision/event has been accepted or not | ||
| DECLARE_SOA_COLUMN(DptDptCFCollisionCentMult, centmult, float); //! The centrality/multiplicity pecentile | ||
| } // namespace dptdptfilter | ||
| DECLARE_SOA_TABLE(DptDptCFAcceptedCollisions, "AOD", "DPTDPTCFACCCOLL", //! Accepted reconstructed collisions/events filtered table | ||
| o2::soa::Index<>, | ||
| collision::BCId, | ||
| collision::PosZ, | ||
| dptdptfilter::DptDptCFCollisionAccepted, | ||
| dptdptfilter::DptDptCFCollisionCentMult); | ||
| using DptDptCFAcceptedCollision = DptDptCFAcceptedCollisions::iterator; | ||
| DECLARE_SOA_TABLE(DptDptCFAcceptedTrueCollisions, "AOD", "DPTCFACCGENCOLL", //! Accepted generated collisions/events filtered table | ||
| o2::soa::Index<>, | ||
| collision::BCId, | ||
| mccollision::PosZ, | ||
| dptdptfilter::DptDptCFCollisionAccepted, | ||
| dptdptfilter::DptDptCFCollisionCentMult); | ||
| using DptDptCFAcceptedTrueCollision = DptDptCFAcceptedTrueCollisions::iterator; | ||
| namespace dptdptfilter | ||
| { | ||
| DECLARE_SOA_INDEX_COLUMN(DptDptCFAcceptedCollision, event); //! Reconstructed collision/event | ||
| DECLARE_SOA_INDEX_COLUMN(DptDptCFAcceptedTrueCollision, mcevent); //! Generated collision/event | ||
| DECLARE_SOA_COLUMN(TrackacceptedAsOne, trackacceptedasone, bool); //! Track accepted as type one | ||
| DECLARE_SOA_COLUMN(TrackacceptedAsTwo, trackacceptedastwo, bool); //! Track accepted as type two | ||
| DECLARE_SOA_COLUMN(Pt, pt, float); //! The track transverse momentum | ||
| DECLARE_SOA_COLUMN(Eta, eta, float); //! The track pseudorapidity | ||
| DECLARE_SOA_COLUMN(Phi, phi, float); //! The track azimuthal angle | ||
| } // namespace dptdptfilter | ||
| DECLARE_SOA_TABLE(ScannedTracks, "AOD", "SCANNEDTRACKS", //! The reconstructed tracks filtered table | ||
| dptdptfilter::DptDptCFAcceptedCollisionId, | ||
| dptdptfilter::TrackacceptedAsOne, | ||
| dptdptfilter::TrackacceptedAsTwo, | ||
| dptdptfilter::Pt, | ||
| dptdptfilter::Eta, | ||
| dptdptfilter::Phi); | ||
| DECLARE_SOA_TABLE(ScannedTrueTracks, "AOD", "SCANTRUETRACKS", //! The generated particles filtered table | ||
| dptdptfilter::DptDptCFAcceptedTrueCollisionId, | ||
| dptdptfilter::TrackacceptedAsOne, | ||
| dptdptfilter::TrackacceptedAsTwo, | ||
| dptdptfilter::Pt, | ||
| dptdptfilter::Eta, | ||
| dptdptfilter::Phi); | ||
| } // namespace aod | ||
| } // namespace o2 | ||
|
|
||
| #endif // O2_ANALYSIS_DPTDPTFILTERED_H | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you keep the BCid?
Do you need the timestamp to later retrieve the magnetic field (or directly the magnetic field)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not really. I introduced it when we were tracking the reco-gen issues
I will keep it for a while and probably remove it at the end unless I find a way to remove close pairs the way you do without affecting the correlators (which is not the case today). But perhaps in that case directly the magnetic field will be better
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, another way to remove close pairs is better...