Skip to content

Commit 704c070

Browse files
dsekihatdsekihat
committed
PWGEM/Dilepton: remove track cov
1 parent 6a56488 commit 704c070

File tree

3 files changed

+24
-110
lines changed

3 files changed

+24
-110
lines changed

‎PWGEM/Dilepton/Core/Dilepton.h‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ using MyMuon = MyMuons::iterator;
8484
using FilteredMyMuons = soa::Filtered<MyMuons>;
8585
using FilteredMyMuon = FilteredMyMuons::iterator;
8686

87-
using MyEMH_electron = o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, EMTrackWithCov>;
87+
using MyEMH_electron = o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, EMTrack>;
8888
using MyEMH_muon = o2::aod::pwgem::dilepton::utils::EventMixingHandler<std::tuple<int, int, int, int>, std::pair<int, int>, EMFwdTrack>;
8989

9090
template <o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType pairtype, typename TEMH, typename... Types>
@@ -1038,27 +1038,19 @@ struct Dilepton {
10381038
used_trackIds.emplace_back(pair_tmp_id1);
10391039
if (cfgDoMix) {
10401040
if (t1.sign() > 0) {
1041-
emh_pos->AddTrackToEventPool(key_df_collision, EMTrackWithCov(ndf, t1.globalIndex(), collision.globalIndex(), t1.trackId(), t1.pt(), t1.eta(), t1.phi(), leptonM1, t1.sign(), t1.dcaXY(), t1.dcaZ(), possibleIds1,
1042-
t1.x(), t1.y(), t1.z(), t1.alpha(), t1.snp(), t1.tgl(), t1.cYY(), t1.cZY(), t1.cZZ(),
1043-
t1.cSnpY(), t1.cSnpZ(), t1.cSnpSnp(), t1.cTglY(), t1.cTglZ(), t1.cTglSnp(), t1.cTglTgl(), t1.c1PtY(), t1.c1PtZ(), t1.c1PtSnp(), t1.c1PtTgl(), t1.c1Pt21Pt2()));
1041+
emh_pos->AddTrackToEventPool(key_df_collision, EMTrack(ndf, t1.globalIndex(), collision.globalIndex(), t1.trackId(), t1.pt(), t1.eta(), t1.phi(), leptonM1, t1.sign(), t1.dcaXY(), t1.dcaZ(), t1.cYY(), t1.cZY(), t1.cZZ(), possibleIds1));
10441042
} else {
1045-
emh_neg->AddTrackToEventPool(key_df_collision, EMTrackWithCov(ndf, t1.globalIndex(), collision.globalIndex(), t1.trackId(), t1.pt(), t1.eta(), t1.phi(), leptonM1, t1.sign(), t1.dcaXY(), t1.dcaZ(), possibleIds1,
1046-
t1.x(), t1.y(), t1.z(), t1.alpha(), t1.snp(), t1.tgl(), t1.cYY(), t1.cZY(), t1.cZZ(),
1047-
t1.cSnpY(), t1.cSnpZ(), t1.cSnpSnp(), t1.cTglY(), t1.cTglZ(), t1.cTglSnp(), t1.cTglTgl(), t1.c1PtY(), t1.c1PtZ(), t1.c1PtSnp(), t1.c1PtTgl(), t1.c1Pt21Pt2()));
1043+
emh_neg->AddTrackToEventPool(key_df_collision, EMTrack(ndf, t1.globalIndex(), collision.globalIndex(), t1.trackId(), t1.pt(), t1.eta(), t1.phi(), leptonM1, t1.sign(), t1.dcaXY(), t1.dcaZ(), t1.cYY(), t1.cZY(), t1.cZZ(), possibleIds1));
10481044
}
10491045
}
10501046
}
10511047
if (std::find(used_trackIds.begin(), used_trackIds.end(), pair_tmp_id2) == used_trackIds.end()) {
10521048
used_trackIds.emplace_back(pair_tmp_id2);
10531049
if (cfgDoMix) {
10541050
if (t2.sign() > 0) {
1055-
emh_pos->AddTrackToEventPool(key_df_collision, EMTrackWithCov(ndf, t2.globalIndex(), collision.globalIndex(), t2.trackId(), t2.pt(), t2.eta(), t2.phi(), leptonM2, t2.sign(), t2.dcaXY(), t2.dcaZ(), possibleIds2,
1056-
t2.x(), t2.y(), t2.z(), t2.alpha(), t2.snp(), t2.tgl(), t2.cYY(), t2.cZY(), t2.cZZ(),
1057-
t2.cSnpY(), t2.cSnpZ(), t2.cSnpSnp(), t2.cTglY(), t2.cTglZ(), t2.cTglSnp(), t2.cTglTgl(), t2.c1PtY(), t2.c1PtZ(), t2.c1PtSnp(), t2.c1PtTgl(), t2.c1Pt21Pt2()));
1051+
emh_pos->AddTrackToEventPool(key_df_collision, EMTrack(ndf, t2.globalIndex(), collision.globalIndex(), t2.trackId(), t2.pt(), t2.eta(), t2.phi(), leptonM2, t2.sign(), t2.dcaXY(), t2.dcaZ(), t2.cYY(), t2.cZY(), t2.cZZ(), possibleIds2));
10581052
} else {
1059-
emh_neg->AddTrackToEventPool(key_df_collision, EMTrackWithCov(ndf, t2.globalIndex(), collision.globalIndex(), t2.trackId(), t2.pt(), t2.eta(), t2.phi(), leptonM2, t2.sign(), t2.dcaXY(), t2.dcaZ(), possibleIds2,
1060-
t2.x(), t2.y(), t2.z(), t2.alpha(), t2.snp(), t2.tgl(), t2.cYY(), t2.cZY(), t2.cZZ(),
1061-
t2.cSnpY(), t2.cSnpZ(), t2.cSnpSnp(), t2.cTglY(), t2.cTglZ(), t2.cTglSnp(), t2.cTglTgl(), t2.c1PtY(), t2.c1PtZ(), t2.c1PtSnp(), t2.c1PtTgl(), t2.c1Pt21Pt2()));
1053+
emh_neg->AddTrackToEventPool(key_df_collision, EMTrack(ndf, t2.globalIndex(), collision.globalIndex(), t2.trackId(), t2.pt(), t2.eta(), t2.phi(), leptonM2, t2.sign(), t2.dcaXY(), t2.dcaZ(), t2.cYY(), t2.cZY(), t2.cZZ(), possibleIds2));
10621054
}
10631055
}
10641056
}
@@ -1070,23 +1062,19 @@ struct Dilepton {
10701062
used_trackIds.emplace_back(pair_tmp_id1);
10711063
if (cfgDoMix) {
10721064
if (t1.sign() > 0) {
1073-
emh_pos->AddTrackToEventPool(key_df_collision, EMFwdTrack(ndf, t1.globalIndex(), collision.globalIndex(), t1.fwdtrackId(), t1.pt(), t1.eta(), t1.phi(), o2::constants::physics::MassMuon, t1.sign(), t1.fwdDcaX(), t1.fwdDcaY(), possibleIds1,
1074-
t1.cXXatDCA(), t1.cXYatDCA(), t1.cYYatDCA()));
1065+
emh_pos->AddTrackToEventPool(key_df_collision, EMFwdTrack(ndf, t1.globalIndex(), collision.globalIndex(), t1.fwdtrackId(), t1.pt(), t1.eta(), t1.phi(), o2::constants::physics::MassMuon, t1.sign(), t1.fwdDcaX(), t1.fwdDcaY(), t1.cXXatDCA(), t1.cXYatDCA(), t1.cYYatDCA(), possibleIds1));
10751066
} else {
1076-
emh_neg->AddTrackToEventPool(key_df_collision, EMFwdTrack(ndf, t1.globalIndex(), collision.globalIndex(), t1.fwdtrackId(), t1.pt(), t1.eta(), t1.phi(), o2::constants::physics::MassMuon, t1.sign(), t1.fwdDcaX(), t1.fwdDcaY(), possibleIds1,
1077-
t1.cXXatDCA(), t1.cXYatDCA(), t1.cYYatDCA()));
1067+
emh_neg->AddTrackToEventPool(key_df_collision, EMFwdTrack(ndf, t1.globalIndex(), collision.globalIndex(), t1.fwdtrackId(), t1.pt(), t1.eta(), t1.phi(), o2::constants::physics::MassMuon, t1.sign(), t1.fwdDcaX(), t1.fwdDcaY(), t1.cXXatDCA(), t1.cXYatDCA(), t1.cYYatDCA(), possibleIds1));
10781068
}
10791069
}
10801070
}
10811071
if (std::find(used_trackIds.begin(), used_trackIds.end(), pair_tmp_id2) == used_trackIds.end()) {
10821072
used_trackIds.emplace_back(pair_tmp_id2);
10831073
if (cfgDoMix) {
10841074
if (t2.sign() > 0) {
1085-
emh_pos->AddTrackToEventPool(key_df_collision, EMFwdTrack(ndf, t2.globalIndex(), collision.globalIndex(), t2.fwdtrackId(), t2.pt(), t2.eta(), t2.phi(), o2::constants::physics::MassMuon, t2.sign(), t2.fwdDcaX(), t2.fwdDcaY(), possibleIds2,
1086-
t2.cXXatDCA(), t2.cXYatDCA(), t2.cYYatDCA()));
1075+
emh_pos->AddTrackToEventPool(key_df_collision, EMFwdTrack(ndf, t2.globalIndex(), collision.globalIndex(), t2.fwdtrackId(), t2.pt(), t2.eta(), t2.phi(), o2::constants::physics::MassMuon, t2.sign(), t2.fwdDcaX(), t2.fwdDcaY(), t2.cXXatDCA(), t2.cXYatDCA(), t2.cYYatDCA(), possibleIds2));
10871076
} else {
1088-
emh_neg->AddTrackToEventPool(key_df_collision, EMFwdTrack(ndf, t2.globalIndex(), collision.globalIndex(), t2.fwdtrackId(), t2.pt(), t2.eta(), t2.phi(), o2::constants::physics::MassMuon, t2.sign(), t2.fwdDcaX(), t2.fwdDcaY(), possibleIds2,
1089-
t2.cXXatDCA(), t2.cXYatDCA(), t2.cYYatDCA()));
1077+
emh_neg->AddTrackToEventPool(key_df_collision, EMFwdTrack(ndf, t2.globalIndex(), collision.globalIndex(), t2.fwdtrackId(), t2.pt(), t2.eta(), t2.phi(), o2::constants::physics::MassMuon, t2.sign(), t2.fwdDcaX(), t2.fwdDcaY(), t2.cXXatDCA(), t2.cXYatDCA(), t2.cYYatDCA(), possibleIds2));
10901078
}
10911079
}
10921080
}

‎PWGEM/Dilepton/Utils/EMFwdTrack.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace o2::aod::pwgem::dilepton::utils
2222
class EMFwdTrack
2323
{
2424
public:
25-
EMFwdTrack(int dfId, int globalId, int collisionId, int trackId, float pt, float eta, float phi, float mass, int8_t charge, float dcaX, float dcaY, std::vector<int> amb_muon_self_ids, float cXX, float cXY, float cYY)
25+
EMFwdTrack(int dfId, int globalId, int collisionId, int trackId, float pt, float eta, float phi, float mass, int8_t charge, float dcaX, float dcaY, float cXX, float cXY, float cYY, std::vector<int> amb_muon_self_ids)
2626
{
2727
fDFId = dfId;
2828
fGlobalId = globalId;
@@ -90,12 +90,12 @@ class EMFwdTrack
9090
int8_t fCharge;
9191
float fDCAx;
9292
float fDCAy;
93-
float fPairDCAXYinSigmaOTF;
94-
bool fIsAmbiguous;
95-
std::vector<int> fAmbMuonSelfIds;
9693
float fCXX;
9794
float fCXY;
9895
float fCYY;
96+
float fPairDCAXYinSigmaOTF;
97+
bool fIsAmbiguous;
98+
std::vector<int> fAmbMuonSelfIds;
9999
};
100100

101101
} // namespace o2::aod::pwgem::dilepton::utils

‎PWGEM/Dilepton/Utils/EMTrack.h‎

Lines changed: 11 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace o2::aod::pwgem::dilepton::utils
2323
class EMTrack
2424
{
2525
public:
26-
EMTrack(int dfId, int globalId, int collisionId, int trackId, float pt, float eta, float phi, float mass, int8_t charge = 0, float dcaXY = 0.f, float dcaZ = 0.f, std::vector<int> amb_ele_self_ids = {})
26+
EMTrack(int dfId, int globalId, int collisionId, int trackId, float pt, float eta, float phi, float mass, int8_t charge = 0, float dcaXY = 0.f, float dcaZ = 0.f, float cYY = 0.f, float cZY = 0.f, float cZZ = 0.f, std::vector<int> amb_ele_self_ids = {})
2727
{
2828
fDFId = dfId;
2929
fGlobalId = globalId;
@@ -36,6 +36,10 @@ class EMTrack
3636
fCharge = charge;
3737
fDCAxy = dcaXY;
3838
fDCAz = dcaZ;
39+
fCYY = cYY;
40+
fCZY = cZY;
41+
fCZZ = cZZ;
42+
3943
fPairDCA3DinSigmaOTF = 0;
4044

4145
fAmbEleSelfIds = amb_ele_self_ids;
@@ -78,6 +82,9 @@ class EMTrack
7882
int8_t sign() const { return fCharge; }
7983
float dcaXY() const { return fDCAxy; }
8084
float dcaZ() const { return fDCAz; }
85+
float cYY() const { return fCYY; }
86+
float cZY() const { return fCZY; }
87+
float cZZ() const { return fCZZ; }
8188
float p() const { return fPt * std::cosh(fEta); }
8289
float px() const { return fPt * std::cos(fPhi); }
8390
float py() const { return fPt * std::sin(fPhi); }
@@ -142,6 +149,9 @@ class EMTrack
142149
int8_t fCharge;
143150
float fDCAxy;
144151
float fDCAz;
152+
float fCYY;
153+
float fCZY;
154+
float fCZZ;
145155
float fPairDCA3DinSigmaOTF;
146156
bool fIsAmbiguous;
147157
std::vector<int> fAmbEleSelfIds;
@@ -159,89 +169,5 @@ class EMTrack
159169
float fVz;
160170
};
161171

162-
class EMTrackWithCov : public EMTrack
163-
{
164-
public:
165-
EMTrackWithCov(int dfId, int globalId, int collisionId, int trackId, float pt, float eta, float phi, float mass, int8_t charge = 0, float dcaXY = 0.f, float dcaZ = 0.f, std::vector<int> amb_ele_self_ids = {},
166-
float X = 0.f, float Y = 0.f, float Z = 0.f, float Alpha = 0.f, float Snp = 0.f, float Tgl = 0.f,
167-
float CYY = 0.f, float CZY = 0.f, float CZZ = 0.f,
168-
float CSnpY = 0.f, float CSnpZ = 0.f, float CSnpSnp = 0.f,
169-
float CTglY = 0.f, float CTglZ = 0.f, float CTglSnp = 0.f, float CTglTgl = 0.f,
170-
float C1PtY = 0.f, float C1PtZ = 0.f, float C1PtSnp = 0.f, float C1PtTgl = 0.f, float C1Pt21Pt2 = 0.f) : EMTrack(dfId, globalId, collisionId, trackId, pt, eta, phi, mass, charge, dcaXY, dcaZ, amb_ele_self_ids)
171-
{
172-
fX = X;
173-
fY = Y;
174-
fZ = Z;
175-
fAlpha = Alpha;
176-
fSnp = Snp;
177-
fTgl = Tgl;
178-
fCYY = CYY;
179-
fCZY = CZY;
180-
fCZZ = CZZ;
181-
fCSnpY = CSnpY;
182-
fCSnpZ = CSnpZ;
183-
fCSnpSnp = CSnpSnp;
184-
fCTglY = CTglY;
185-
fCTglZ = CTglZ;
186-
fCTglSnp = CTglSnp;
187-
fCTglTgl = CTglTgl;
188-
fC1PtY = C1PtY;
189-
fC1PtZ = C1PtZ;
190-
fC1PtSnp = C1PtSnp;
191-
fC1PtTgl = C1PtTgl;
192-
fC1Pt21Pt2 = C1Pt21Pt2;
193-
}
194-
195-
float x() const { return fX; }
196-
float y() const { return fY; }
197-
float z() const { return fZ; }
198-
float alpha() const { return fAlpha; }
199-
float snp() const { return fSnp; }
200-
float tgl() const { return fTgl; }
201-
202-
float cYY() const { return fCYY; }
203-
float cZY() const { return fCZY; }
204-
float cZZ() const { return fCZZ; }
205-
float cSnpY() const { return fCSnpY; }
206-
float cSnpZ() const { return fCSnpZ; }
207-
float cSnpSnp() const { return fCSnpSnp; }
208-
float cTglY() const { return fCTglY; }
209-
float cTglZ() const { return fCTglZ; }
210-
float cTglSnp() const { return fCTglSnp; }
211-
float cTglTgl() const { return fCTglTgl; }
212-
float c1PtY() const { return fC1PtY; }
213-
float c1PtZ() const { return fC1PtZ; }
214-
float c1PtSnp() const { return fC1PtSnp; }
215-
float c1PtTgl() const { return fC1PtTgl; }
216-
float c1Pt21Pt2() const { return fC1Pt21Pt2; }
217-
218-
void setCYY(float cYY) { fCYY = cYY; }
219-
void setCZY(float cZY) { fCZY = cZY; }
220-
void setCZZ(float cZZ) { fCZZ = cZZ; }
221-
222-
protected:
223-
float fX;
224-
float fY;
225-
float fZ;
226-
float fAlpha;
227-
float fSnp;
228-
float fTgl;
229-
float fCYY;
230-
float fCZY;
231-
float fCZZ;
232-
float fCSnpY;
233-
float fCSnpZ;
234-
float fCSnpSnp;
235-
float fCTglY;
236-
float fCTglZ;
237-
float fCTglSnp;
238-
float fCTglTgl;
239-
float fC1PtY;
240-
float fC1PtZ;
241-
float fC1PtSnp;
242-
float fC1PtTgl;
243-
float fC1Pt21Pt2;
244-
};
245-
246172
} // namespace o2::aod::pwgem::dilepton::utils
247173
#endif // PWGEM_DILEPTON_UTILS_EMTRACK_H_

0 commit comments

Comments
 (0)