Skip to content

Commit 7e6c1e6

Browse files
jjurackajjuracka
committed
reduce number of stored values
1 parent c6e268e commit 7e6c1e6

File tree

1 file changed

+9
-53
lines changed

1 file changed

+9
-53
lines changed

‎PWGUD/Tasks/upcRhoAnalysis.cxx‎

Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,14 @@ namespace reco_tree
4949
// event info
5050
DECLARE_SOA_COLUMN(RecoSetting, recoSetting, uint16_t);
5151
DECLARE_SOA_COLUMN(RunNumber, runNumber, int32_t);
52-
DECLARE_SOA_COLUMN(LocalBC, localBC, int);
53-
DECLARE_SOA_COLUMN(NumContrib, numContrib, int);
54-
DECLARE_SOA_COLUMN(PosX, posX, float);
55-
DECLARE_SOA_COLUMN(PosY, posY, float);
5652
DECLARE_SOA_COLUMN(PosZ, posZ, float);
57-
// FIT info
58-
DECLARE_SOA_COLUMN(TotalFT0AmplitudeA, totalFT0AmplitudeA, float);
59-
DECLARE_SOA_COLUMN(TotalFT0AmplitudeC, totalFT0AmplitudeC, float);
60-
DECLARE_SOA_COLUMN(TotalFV0AmplitudeA, totalFV0AmplitudeA, float);
61-
DECLARE_SOA_COLUMN(TotalFDDAmplitudeA, totalFDDAmplitudeA, float);
62-
DECLARE_SOA_COLUMN(TotalFDDAmplitudeC, totalFDDAmplitudeC, float);
63-
DECLARE_SOA_COLUMN(TimeFT0A, timeFT0A, float);
64-
DECLARE_SOA_COLUMN(TimeFT0C, timeFT0C, float);
65-
DECLARE_SOA_COLUMN(TimeFV0A, timeFV0A, float);
66-
DECLARE_SOA_COLUMN(TimeFDDA, timeFDDA, float);
67-
DECLARE_SOA_COLUMN(TimeFDDC, timeFDDC, float);
6853
// ZDC info
6954
DECLARE_SOA_COLUMN(EnergyCommonZNA, energyCommonZNA, float);
7055
DECLARE_SOA_COLUMN(EnergyCommonZNC, energyCommonZNC, float);
7156
DECLARE_SOA_COLUMN(TimeZNA, timeZNA, float);
7257
DECLARE_SOA_COLUMN(TimeZNC, timeZNC, float);
7358
DECLARE_SOA_COLUMN(NeutronClass, neutronClass, int);
74-
// pion tracks
75-
DECLARE_SOA_COLUMN(PhiRandom, phiRandom, float);
76-
DECLARE_SOA_COLUMN(PhiCharge, phiCharge, float);
59+
// tracks
7760
DECLARE_SOA_COLUMN(LeadingTrackSign, leadingTrackSign, int);
7861
DECLARE_SOA_COLUMN(SubleadingTrackSign, subleadingTrackSign, int);
7962
DECLARE_SOA_COLUMN(LeadingTrackPt, leadingTrackPt, float);
@@ -82,50 +65,33 @@ DECLARE_SOA_COLUMN(LeadingTrackEta, leadingTrackEta, float);
8265
DECLARE_SOA_COLUMN(SubleadingTrackEta, subleadingTrackEta, float);
8366
DECLARE_SOA_COLUMN(LeadingTrackPhi, leadingTrackPhi, float);
8467
DECLARE_SOA_COLUMN(SubleadingTrackPhi, subleadingTrackPhi, float);
68+
DECLARE_SOA_COLUMN(LeadingTrackPiPID, leadingTrackPiPID, float);
8569
DECLARE_SOA_COLUMN(SubleadingTrackPiPID, subleadingTrackPiPID, float);
8670
DECLARE_SOA_COLUMN(LeadingTrackElPID, leadingTrackElPID, float);
8771
DECLARE_SOA_COLUMN(SubleadingTrackElPID, subleadingTrackElPID, float);
8872
DECLARE_SOA_COLUMN(LeadingTrackKaPID, leadingTrackKaPID, float);
8973
DECLARE_SOA_COLUMN(SubleadingTrackKaPID, subleadingTrackKaPID, float);
9074
DECLARE_SOA_COLUMN(LeadingTrackPrPID, leadingTrackPrPID, float);
9175
DECLARE_SOA_COLUMN(SubleadingTrackPrPID, subleadingTrackPrPID, float);
92-
DECLARE_SOA_COLUMN(LeadingTrackDcaXY, leadingTrackDcaXY, float);
93-
DECLARE_SOA_COLUMN(SubleadingTrackDcaXY, subleadingTrackDcaXY, float);
94-
DECLARE_SOA_COLUMN(LeadingTrackDcaZ, leadingTrackDcaZ, float);
95-
DECLARE_SOA_COLUMN(SubleadingTrackDcaZ, subleadingTrackDcaZ, float);
96-
DECLARE_SOA_COLUMN(LeadingTrackTpcSignal, leadingTrackTpcSignal, float);
97-
DECLARE_SOA_COLUMN(SubleadingTrackTpcSignal, subleadingTrackTpcSignal, float);
9876
} // namespace reco_tree
9977
DECLARE_SOA_TABLE(RecoTree, "AOD", "RECOTREE",
100-
reco_tree::RecoSetting, reco_tree::RunNumber, reco_tree::LocalBC, reco_tree::NumContrib, reco_tree::PosX, reco_tree::PosY, reco_tree::PosZ,
101-
reco_tree::TotalFT0AmplitudeA, reco_tree::TotalFT0AmplitudeC, reco_tree::TotalFV0AmplitudeA, reco_tree::TotalFDDAmplitudeA, reco_tree::TotalFDDAmplitudeC,
102-
reco_tree::TimeFT0A, reco_tree::TimeFT0C, reco_tree::TimeFV0A, reco_tree::TimeFDDA, reco_tree::TimeFDDC,
78+
reco_tree::RecoSetting, reco_tree::RunNumber, reco_tree::PosZ,
10379
reco_tree::EnergyCommonZNA, reco_tree::EnergyCommonZNC, reco_tree::TimeZNA, reco_tree::TimeZNC, reco_tree::NeutronClass,
104-
reco_tree::PhiRandom, reco_tree::PhiCharge,
10580
reco_tree::LeadingTrackSign, reco_tree::SubleadingTrackSign,
10681
reco_tree::LeadingTrackPt, reco_tree::SubleadingTrackPt,
10782
reco_tree::LeadingTrackEta, reco_tree::SubleadingTrackEta,
10883
reco_tree::LeadingTrackPhi, reco_tree::SubleadingTrackPhi,
10984
reco_tree::LeadingTrackPiPID, reco_tree::SubleadingTrackPiPID,
11085
reco_tree::LeadingTrackElPID, reco_tree::SubleadingTrackElPID,
11186
reco_tree::LeadingTrackKaPID, reco_tree::SubleadingTrackKaPID,
112-
reco_tree::LeadingTrackPrPID, reco_tree::SubleadingTrackPrPID,
113-
reco_tree::LeadingTrackDcaXY, reco_tree::SubleadingTrackDcaXY,
114-
reco_tree::LeadingTrackDcaZ, reco_tree::SubleadingTrackDcaZ,
115-
reco_tree::LeadingTrackTpcSignal, reco_tree::SubleadingTrackTpcSignal);
87+
reco_tree::LeadingTrackPrPID, reco_tree::SubleadingTrackPrPID);
11688

11789
namespace mc_tree
11890
{
11991
// misc event info
120-
DECLARE_SOA_COLUMN(LocalBc, localBc, int);
12192
DECLARE_SOA_COLUMN(RunNumber, runNumber, int);
122-
// event vertex
123-
DECLARE_SOA_COLUMN(PosX, posX, float);
124-
DECLARE_SOA_COLUMN(PosY, posY, float);
12593
DECLARE_SOA_COLUMN(PosZ, posZ, float);
126-
// pion tracks
127-
DECLARE_SOA_COLUMN(PhiRandom, phiRandom, float);
128-
DECLARE_SOA_COLUMN(PhiCharge, phiCharge, float);
94+
// tracks
12995
DECLARE_SOA_COLUMN(LeadingTrackSign, leadingTrackSign, int);
13096
DECLARE_SOA_COLUMN(SubleadingTrackSign, subleadingTrackSign, int);
13197
DECLARE_SOA_COLUMN(LeadingTrackPt, leadingTrackPt, float);
@@ -136,9 +102,7 @@ DECLARE_SOA_COLUMN(LeadingTrackPhi, leadingTrackPhi, float);
136102
DECLARE_SOA_COLUMN(SubleadingTrackPhi, subleadingTrackPhi, float);
137103
} // namespace mc_tree
138104
DECLARE_SOA_TABLE(McTree, "AOD", "MCTREE",
139-
mc_tree::LocalBc, mc_tree::RunNumber,
140-
mc_tree::PosX, mc_tree::PosY, mc_tree::PosZ,
141-
mc_tree::PhiRandom, mc_tree::PhiCharge,
105+
mc_tree::RunNumber, mc_tree::PosZ,
142106
mc_tree::LeadingTrackSign, mc_tree::SubleadingTrackSign,
143107
mc_tree::LeadingTrackPt, mc_tree::SubleadingTrackPt,
144108
mc_tree::LeadingTrackEta, mc_tree::SubleadingTrackEta,
@@ -810,22 +774,16 @@ struct UpcRhoAnalysis {
810774
float phiCharge = getPhiCharge(cutTracks, cutTracksLVs);
811775

812776
// fill recoTree
813-
recoTree(collision.flags(), collision.runNumber(), collision.globalBC() % o2::constants::lhc::LHCMaxBunches, collision.numContrib(), collision.posX(), collision.posY(), collision.posZ(),
814-
collision.totalFT0AmplitudeA(), collision.totalFT0AmplitudeC(), collision.totalFV0AmplitudeA(), collision.totalFDDAmplitudeA(), collision.totalFDDAmplitudeC(),
815-
collision.timeFT0A(), collision.timeFT0C(), collision.timeFV0A(), collision.timeFDDA(), collision.timeFDDC(),
777+
recoTree(collision.flags(), collision.runNumber(), collision.posZ(),
816778
energyCommonZNA, energyCommonZNC, timeZNA, timeZNC, neutronClass,
817-
phiRandom, phiCharge,
818779
leadingTrack.sign(), subleadingTrack.sign(),
819780
leadingPt, subleadingPt,
820781
leadingEta, subleadingEta,
821782
leadingPhi, subleadingPhi,
822783
leadingTrack.tpcNSigmaPi(), subleadingTrack.tpcNSigmaPi(),
823784
leadingTrack.tpcNSigmaEl(), subleadingTrack.tpcNSigmaEl(),
824785
leadingTrack.tpcNSigmaKa(), subleadingTrack.tpcNSigmaKa(),
825-
leadingTrack.tpcNSigmaPr(), subleadingTrack.tpcNSigmaPr(),
826-
leadingTrack.dcaXY(), subleadingTrack.dcaXY(),
827-
leadingTrack.dcaZ(), subleadingTrack.dcaZ(),
828-
leadingTrack.tpcSignal(), subleadingTrack.tpcSignal());
786+
leadingTrack.tpcNSigmaPr(), subleadingTrack.tpcNSigmaPr());
829787

830788
if (!tracksPassPID(cutTracks)) // apply PID cut
831789
return;
@@ -1014,9 +972,7 @@ struct UpcRhoAnalysis {
1014972
}
1015973

1016974
// fill mcTree
1017-
mcTree(mcCollision.globalBC() % o2::constants::lhc::LHCMaxBunches, runNumber,
1018-
mcCollision.posX(), mcCollision.posY(), mcCollision.posZ(),
1019-
phiRandom, phiCharge,
975+
mcTree(runNumber, mcCollision.posZ(),
1020976
leadingPion.pdgCode() / std::abs(leadingPion.pdgCode()), subleadingPion.pdgCode() / std::abs(subleadingPion.pdgCode()),
1021977
pt(leadingPion.px(), leadingPion.py()), pt(subleadingPion.px(), subleadingPion.py()),
1022978
eta(leadingPion.px(), leadingPion.py(), leadingPion.pz()), eta(subleadingPion.px(), subleadingPion.py(), subleadingPion.pz()),

0 commit comments

Comments
 (0)