Skip to content

Commit 6239fab

Browse files
Filter task separated in its own task dptdpt-filter (#265)
* Filter task separated in its own task dptdpt-filter It feeds - match-reco-gen independent separated from the filter-qa task - dptdptcorrelations independent - dptdpt-filter-qa independent separated from the match-reco-gen task * Using bool columns and proper columns and table names Also - getting rid of long qualifiers for int - using float pi constants
1 parent 9dde9d2 commit 6239fab

8 files changed

Lines changed: 1694 additions & 2416 deletions

File tree

PWGCF/DataModel/DptDptFiltered.h

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
#ifndef O2_ANALYSIS_DPTDPTFILTERED_H
12+
#define O2_ANALYSIS_DPTDPTFILTERED_H
13+
14+
#include "Framework/ASoA.h"
15+
#include "Framework/AnalysisDataModel.h"
16+
17+
namespace o2
18+
{
19+
namespace aod
20+
{
21+
/* we have to change from int to bool when bool columns work properly */
22+
namespace dptdptfilter
23+
{
24+
DECLARE_SOA_COLUMN(DptDptCFCollisionAccepted, collisionaccepted, bool); //! If the collision/event has been accepted or not
25+
DECLARE_SOA_COLUMN(DptDptCFCollisionCentMult, centmult, float); //! The centrality/multiplicity pecentile
26+
} // namespace dptdptfilter
27+
DECLARE_SOA_TABLE(DptDptCFAcceptedCollisions, "AOD", "DPTDPTCFACCCOLL", //! Accepted reconstructed collisions/events filtered table
28+
o2::soa::Index<>,
29+
collision::BCId,
30+
collision::PosZ,
31+
dptdptfilter::DptDptCFCollisionAccepted,
32+
dptdptfilter::DptDptCFCollisionCentMult);
33+
using DptDptCFAcceptedCollision = DptDptCFAcceptedCollisions::iterator;
34+
DECLARE_SOA_TABLE(DptDptCFAcceptedTrueCollisions, "AOD", "DPTCFACCGENCOLL", //! Accepted generated collisions/events filtered table
35+
o2::soa::Index<>,
36+
collision::BCId,
37+
mccollision::PosZ,
38+
dptdptfilter::DptDptCFCollisionAccepted,
39+
dptdptfilter::DptDptCFCollisionCentMult);
40+
using DptDptCFAcceptedTrueCollision = DptDptCFAcceptedTrueCollisions::iterator;
41+
namespace dptdptfilter
42+
{
43+
DECLARE_SOA_INDEX_COLUMN(DptDptCFAcceptedCollision, event); //! Reconstructed collision/event
44+
DECLARE_SOA_INDEX_COLUMN(DptDptCFAcceptedTrueCollision, mcevent); //! Generated collision/event
45+
DECLARE_SOA_COLUMN(TrackacceptedAsOne, trackacceptedasone, bool); //! Track accepted as type one
46+
DECLARE_SOA_COLUMN(TrackacceptedAsTwo, trackacceptedastwo, bool); //! Track accepted as type two
47+
DECLARE_SOA_COLUMN(Pt, pt, float); //! The track transverse momentum
48+
DECLARE_SOA_COLUMN(Eta, eta, float); //! The track pseudorapidity
49+
DECLARE_SOA_COLUMN(Phi, phi, float); //! The track azimuthal angle
50+
} // namespace dptdptfilter
51+
DECLARE_SOA_TABLE(ScannedTracks, "AOD", "SCANNEDTRACKS", //! The reconstructed tracks filtered table
52+
dptdptfilter::DptDptCFAcceptedCollisionId,
53+
dptdptfilter::TrackacceptedAsOne,
54+
dptdptfilter::TrackacceptedAsTwo,
55+
dptdptfilter::Pt,
56+
dptdptfilter::Eta,
57+
dptdptfilter::Phi);
58+
DECLARE_SOA_TABLE(ScannedTrueTracks, "AOD", "SCANTRUETRACKS", //! The generated particles filtered table
59+
dptdptfilter::DptDptCFAcceptedTrueCollisionId,
60+
dptdptfilter::TrackacceptedAsOne,
61+
dptdptfilter::TrackacceptedAsTwo,
62+
dptdptfilter::Pt,
63+
dptdptfilter::Eta,
64+
dptdptfilter::Phi);
65+
} // namespace aod
66+
} // namespace o2
67+
68+
#endif // O2_ANALYSIS_DPTDPTFILTERED_H

PWGCF/TableProducer/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@ o2physics_add_dpl_workflow(filter-correlations
1313
SOURCES filterCorrelations.cxx
1414
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
1515
COMPONENT_NAME Analysis)
16+
17+
o2physics_add_dpl_workflow(dptdpt-filter
18+
SOURCES dptdptfilter.cxx
19+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGCFCore
20+
COMPONENT_NAME Analysis)

0 commit comments

Comments
 (0)