Skip to content

Commit f522ca8

Browse files
dsekihatdsekihat
committed
PWGEM/Dilepton: update electron table 005
1 parent 5e4f15a commit f522ca8

File tree

5 files changed

+212
-3
lines changed

5 files changed

+212
-3
lines changed

‎PWGEM/Dilepton/DataModel/dileptonTables.h‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,40 @@ DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_004, "AOD", "EMPRIMARYEL", 4, //!
599599
emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
600600
emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
601601

602-
using EMPrimaryElectrons = EMPrimaryElectrons_004;
602+
DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectrons_005, "AOD", "EMPRIMARYEL", 5, //!
603+
o2::soa::Index<>, emprimaryelectron::CollisionId,
604+
emprimaryelectron::TrackId, emprimaryelectron::Sign,
605+
track::Pt, track::Eta, track::Phi,
606+
track::DcaXY, track::DcaZ, aod::track::CYY, aod::track::CZY, aod::track::CZZ,
607+
track::TPCNClsFindable, track::TPCNClsFindableMinusFound, track::TPCNClsFindableMinusPID, track::TPCNClsFindableMinusCrossedRows, track::TPCNClsShared,
608+
track::TPCChi2NCl, track::TPCInnerParam,
609+
track::TPCSignal, pidtpc::TPCNSigmaEl, pidtpc::TPCNSigmaPi, pidtpc::TPCNSigmaKa, pidtpc::TPCNSigmaPr,
610+
pidtofbeta::Beta, pidtof::TOFNSigmaEl, /*pidtof::TOFNSigmaPi, pidtof::TOFNSigmaKa, pidtof::TOFNSigmaPr,*/
611+
track::ITSClusterSizes, track::ITSChi2NCl, track::TOFChi2, track::DetectorMap, /*track::Tgl,*/
612+
emprimaryelectron::IsAssociatedToMPC, emprimaryelectron::IsAmbiguous, emprimaryelectron::ProbElBDT,
613+
mcpidtpc::DeDxTunedMc,
614+
615+
// dynamic column
616+
track::TPCNClsFound<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
617+
track::TPCNClsPID<track::TPCNClsFindable, track::TPCNClsFindableMinusPID>,
618+
track::TPCNClsCrossedRows<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
619+
track::TPCCrossedRowsOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusCrossedRows>,
620+
track::TPCFoundOverFindableCls<track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
621+
track::TPCFractionSharedCls<track::TPCNClsShared, track::TPCNClsFindable, track::TPCNClsFindableMinusFound>,
622+
track::v001::ITSClusterMap<track::ITSClusterSizes>, track::v001::ITSNCls<track::ITSClusterSizes>, track::v001::ITSNClsInnerBarrel<track::ITSClusterSizes>,
623+
track::HasITS<track::DetectorMap>, track::HasTPC<track::DetectorMap>, track::HasTRD<track::DetectorMap>, track::HasTOF<track::DetectorMap>,
624+
625+
emprimaryelectron::Signed1Pt<track::Pt, emprimaryelectron::Sign>,
626+
emprimaryelectron::P<track::Pt, track::Eta>,
627+
emprimaryelectron::Px<track::Pt, track::Phi>,
628+
emprimaryelectron::Py<track::Pt, track::Phi>,
629+
emprimaryelectron::Pz<track::Pt, track::Eta>,
630+
emprimaryelectron::Tgl<track::Eta>,
631+
emprimaryelectron::MeanClusterSizeITS<track::ITSClusterSizes>,
632+
emprimaryelectron::MeanClusterSizeITSib<track::ITSClusterSizes>,
633+
emprimaryelectron::MeanClusterSizeITSob<track::ITSClusterSizes>);
634+
635+
using EMPrimaryElectrons = EMPrimaryElectrons_005;
603636
// iterators
604637
using EMPrimaryElectron = EMPrimaryElectrons::iterator;
605638

‎PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ struct skimmerPrimaryElectron {
483483
emprimaryelectrons(collision.globalIndex(), track.globalIndex(), track.sign(),
484484
pt_recalc, eta_recalc, phi_recalc,
485485
dcaXY, dcaZ, trackParCov.getSigmaY2(), trackParCov.getSigmaZY(), trackParCov.getSigmaZ2(),
486-
track.tpcNClsFindable(), track.tpcNClsFindableMinusFound(), track.tpcNClsFindableMinusCrossedRows(), track.tpcNClsShared(),
486+
track.tpcNClsFindable(), track.tpcNClsFindableMinusFound(), track.tpcNClsFindableMinusPID(), track.tpcNClsFindableMinusCrossedRows(), track.tpcNClsShared(),
487487
track.tpcChi2NCl(), track.tpcInnerParam(),
488488
track.tpcSignal(), track.tpcNSigmaEl(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
489489
track.beta(), track.tofNSigmaEl(), /*track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),*/

‎PWGEM/Dilepton/TableProducer/skimmerPrimaryElectronQC.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ struct skimmerPrimaryElectronQC {
481481
emprimaryelectrons(collision.globalIndex(), track.globalIndex(), track.sign(),
482482
pt_recalc, eta_recalc, phi_recalc,
483483
dcaXY, dcaZ, trackParCov.getSigmaY2(), trackParCov.getSigmaZY(), trackParCov.getSigmaZ2(),
484-
track.tpcNClsFindable(), track.tpcNClsFindableMinusFound(), track.tpcNClsFindableMinusCrossedRows(), track.tpcNClsShared(),
484+
track.tpcNClsFindable(), track.tpcNClsFindableMinusFound(), track.tpcNClsFindableMinusPID(), track.tpcNClsFindableMinusCrossedRows(), track.tpcNClsShared(),
485485
track.tpcChi2NCl(), track.tpcInnerParam(),
486486
track.tpcSignal(), track.tpcNSigmaEl(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
487487
track.beta(), track.tofNSigmaEl(), /*track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),*/

‎PWGEM/Dilepton/Tasks/Converters/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ o2physics_add_dpl_workflow(electron-converter4
3535
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
3636
COMPONENT_NAME Analysis)
3737

38+
o2physics_add_dpl_workflow(electron-converter5
39+
SOURCES electronConverter5.cxx
40+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
41+
COMPONENT_NAME Analysis)
42+
3843
o2physics_add_dpl_workflow(track-converter1
3944
SOURCES trackConverter1.cxx
4045
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore

‎PWGEM/Dilepton/Tasks/Converters/electronConverter5.cxx‎

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
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+
//
12+
// ========================
13+
//
14+
// This code runs loop over ULS ee pars for virtual photon QC.
15+
// Please write to: daiki.sekihata@cern.ch
16+
17+
#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
18+
19+
#include "Framework/ASoAHelpers.h"
20+
#include "Framework/AnalysisTask.h"
21+
#include "Framework/runDataProcessing.h"
22+
23+
using namespace o2;
24+
using namespace o2::aod;
25+
using namespace o2::framework;
26+
using namespace o2::framework::expressions;
27+
using namespace o2::soa;
28+
29+
struct electronConverter5 {
30+
Produces<aod::EMPrimaryElectrons_005> track_005;
31+
32+
using MyElectrons002 = soa::Join<aod::EMPrimaryElectrons_002, aod::EMPrimaryElectronsCov_000>;
33+
void process002to005(MyElectrons002 const& tracks)
34+
{
35+
for (const auto& track : tracks) {
36+
track_005(track.collisionId(),
37+
track.trackId(),
38+
track.sign(),
39+
track.pt(),
40+
track.eta(),
41+
track.phi(),
42+
track.dcaXY(),
43+
track.dcaZ(),
44+
track.cYY(),
45+
track.cZY(),
46+
track.cZZ(),
47+
track.tpcNClsFindable(),
48+
track.tpcNClsFindableMinusFound(),
49+
0,
50+
track.tpcNClsFindableMinusCrossedRows(),
51+
track.tpcNClsShared(),
52+
track.tpcChi2NCl(),
53+
track.tpcInnerParam(),
54+
track.tpcSignal(),
55+
track.tpcNSigmaEl(),
56+
track.tpcNSigmaPi(),
57+
track.tpcNSigmaKa(),
58+
track.tpcNSigmaPr(),
59+
track.beta(),
60+
track.tofNSigmaEl(),
61+
// track.tofNSigmaPi(),
62+
// track.tofNSigmaKa(),
63+
// track.tofNSigmaPr(),
64+
track.itsClusterSizes(),
65+
track.itsChi2NCl(),
66+
track.tofChi2(),
67+
track.detectorMap(),
68+
// track.tgl(),
69+
track.isAssociatedToMPC(),
70+
false,
71+
0.f,
72+
0.f);
73+
} // end of track loop
74+
}
75+
PROCESS_SWITCH(electronConverter5, process002to005, "convert from 002 into 005", false);
76+
77+
using MyElectrons003 = soa::Join<aod::EMPrimaryElectrons_003, aod::EMPrimaryElectronsCov_000>;
78+
void process003to005(MyElectrons003 const& tracks)
79+
{
80+
for (const auto& track : tracks) {
81+
track_005(track.collisionId(),
82+
track.trackId(),
83+
track.sign(),
84+
track.pt(),
85+
track.eta(),
86+
track.phi(),
87+
track.dcaXY(),
88+
track.dcaZ(),
89+
track.cYY(),
90+
track.cZY(),
91+
track.cZZ(),
92+
track.tpcNClsFindable(),
93+
track.tpcNClsFindableMinusFound(),
94+
0,
95+
track.tpcNClsFindableMinusCrossedRows(),
96+
track.tpcNClsShared(),
97+
track.tpcChi2NCl(),
98+
track.tpcInnerParam(),
99+
track.tpcSignal(),
100+
track.tpcNSigmaEl(),
101+
track.tpcNSigmaPi(),
102+
track.tpcNSigmaKa(),
103+
track.tpcNSigmaPr(),
104+
track.beta(),
105+
track.tofNSigmaEl(),
106+
// track.tofNSigmaPi(),
107+
// track.tofNSigmaKa(),
108+
// track.tofNSigmaPr(),
109+
track.itsClusterSizes(),
110+
track.itsChi2NCl(),
111+
track.tofChi2(),
112+
track.detectorMap(),
113+
// track.tgl(),
114+
track.isAssociatedToMPC(),
115+
false,
116+
0.f,
117+
track.mcTunedTPCSignal());
118+
} // end of track loop
119+
}
120+
PROCESS_SWITCH(electronConverter5, process003to005, "convert from 003 into 005", false);
121+
122+
using MyElectrons004 = soa::Join<aod::EMPrimaryElectrons_004, aod::EMPrimaryElectronsCov_000>;
123+
void process004to005(MyElectrons004 const& tracks)
124+
{
125+
for (const auto& track : tracks) {
126+
track_005(track.collisionId(),
127+
track.trackId(),
128+
track.sign(),
129+
track.pt(),
130+
track.eta(),
131+
track.phi(),
132+
track.dcaXY(),
133+
track.dcaZ(),
134+
track.cYY(),
135+
track.cZY(),
136+
track.cZZ(),
137+
track.tpcNClsFindable(),
138+
track.tpcNClsFindableMinusFound(),
139+
0,
140+
track.tpcNClsFindableMinusCrossedRows(),
141+
track.tpcNClsShared(),
142+
track.tpcChi2NCl(),
143+
track.tpcInnerParam(),
144+
track.tpcSignal(),
145+
track.tpcNSigmaEl(),
146+
track.tpcNSigmaPi(),
147+
track.tpcNSigmaKa(),
148+
track.tpcNSigmaPr(),
149+
track.beta(),
150+
track.tofNSigmaEl(),
151+
// track.tofNSigmaPi(),
152+
// track.tofNSigmaKa(),
153+
// track.tofNSigmaPr(),
154+
track.itsClusterSizes(),
155+
track.itsChi2NCl(),
156+
track.tofChi2(),
157+
track.detectorMap(),
158+
// track.tgl(),
159+
track.isAssociatedToMPC(),
160+
track.isAmbiguous(),
161+
track.probElBDT(),
162+
track.mcTunedTPCSignal());
163+
} // end of track loop
164+
}
165+
PROCESS_SWITCH(electronConverter5, process004to005, "convert from 004 into 005", false);
166+
};
167+
168+
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
169+
{
170+
return WorkflowSpec{adaptAnalysisTask<electronConverter5>(cfgc, TaskName{"electron-converter5"})};
171+
}

0 commit comments

Comments
 (0)