Skip to content

Commit b0aa3b8

Browse files
dsekihatdsekihat
committed
PWGEM/PhotonMeson: remove unnecessary data
1 parent f4b1ee8 commit b0aa3b8

File tree

4 files changed

+77
-97
lines changed

4 files changed

+77
-97
lines changed

‎PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ using MyTracksIUMC = soa::Join<MyTracksIU, aod::McTrackLabels>;
7070

7171
struct PhotonConversionBuilder {
7272
Produces<aod::V0PhotonsKF> v0photonskf;
73-
Produces<aod::V0PhotonsKFCov> v0photonskfcov;
73+
// Produces<aod::V0PhotonsKFCov> v0photonskfcov;
7474
Produces<aod::V0Legs> v0legs;
7575
Produces<aod::EMEventsNgPCM> events_ngpcm;
7676

@@ -665,7 +665,7 @@ struct PhotonConversionBuilder {
665665
v0_sv.M(), dca_xy_v0_to_pv, dca_z_v0_to_pv,
666666
cospa_kf, cospaXY_kf, cospaRZ_kf, pca_kf, alpha, qt, chi2kf);
667667

668-
v0photonskfcov(gammaKF_PV.GetCovariance(9), gammaKF_PV.GetCovariance(14), gammaKF_PV.GetCovariance(20), gammaKF_PV.GetCovariance(13), gammaKF_PV.GetCovariance(19), gammaKF_PV.GetCovariance(18));
668+
// v0photonskfcov(gammaKF_PV.GetCovariance(9), gammaKF_PV.GetCovariance(14), gammaKF_PV.GetCovariance(20), gammaKF_PV.GetCovariance(13), gammaKF_PV.GetCovariance(19), gammaKF_PV.GetCovariance(18));
669669

670670
fillTrackTable(pos, pTrack, kfp_pos_DecayVtx, posdcaXY, posdcaZ); // positive leg first
671671
fillTrackTable(ele, nTrack, kfp_ele_DecayVtx, eledcaXY, eledcaZ); // negative leg second

‎PWGEM/PhotonMeson/Tasks/pcmQC.cxx‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace o2::aod::pwgem::photon;
3737
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent>;
3838
using MyCollision = MyCollisions::iterator;
3939

40-
using MyV0Photons = soa::Join<aod::V0PhotonsKF, aod::V0PhotonsKFCov, aod::V0KFEMEventIds>;
40+
using MyV0Photons = soa::Join<aod::V0PhotonsKF, aod::V0KFEMEventIds>;
4141
using MyV0Photon = MyV0Photons::iterator;
4242

4343
struct PCMQC {
@@ -151,11 +151,6 @@ struct PCMQC {
151151
fRegistry.add("V0/hKFChi2vsX", "KF chi2 vs. conversion point in X;X (cm);KF chi2/NDF", kTH2F, {{200, -100.0f, 100.0f}, {100, 0.f, 100.0f}}, false);
152152
fRegistry.add("V0/hKFChi2vsY", "KF chi2 vs. conversion point in Y;Y (cm);KF chi2/NDF", kTH2F, {{200, -100.0f, 100.0f}, {100, 0.f, 100.0f}}, false);
153153
fRegistry.add("V0/hKFChi2vsZ", "KF chi2 vs. conversion point in Z;Z (cm);KF chi2/NDF", kTH2F, {{200, -100.0f, 100.0f}, {100, 0.f, 100.0f}}, false);
154-
fRegistry.add("V0/hPResolution", "p resolution;p_{#gamma} (GeV/c);#Deltap/p", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.1}}, false);
155-
fRegistry.add("V0/hPtResolution", "p_{T} resolution;p_{#gamma} (GeV/c);#Deltap_{T}/p_{T}", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.1}}, false);
156-
fRegistry.add("V0/hEtaResolution", "#eta resolution;p_{#gamma} (GeV/c);#Delta#eta", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.01}}, false);
157-
fRegistry.add("V0/hThetaResolution", "#theta resolution;p_{#gamma} (GeV/c);#Delta#theta (rad.)", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.01}}, false);
158-
fRegistry.add("V0/hPhiResolution", "#varphi resolution;p_{#gamma} (GeV/c);#Delta#varphi (rad.)", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.01}}, false);
159154
fRegistry.add("V0/hsConvPoint", "photon conversion point;r_{xy} (cm);#varphi (rad.);#eta;", kTHnSparseF, {{100, 0.0f, 100}, {90, 0, 2 * M_PI}, {80, -2, +2}}, false);
160155
fRegistry.add("V0/hNgamma", "Number of #gamma candidates per collision", kTH1F, {{101, -0.5f, 100.5f}});
161156

@@ -292,11 +287,6 @@ struct PCMQC {
292287
fRegistry.fill(HIST("V0/hKFChi2vsX"), v0.vx(), v0.chiSquareNDF());
293288
fRegistry.fill(HIST("V0/hKFChi2vsY"), v0.vy(), v0.chiSquareNDF());
294289
fRegistry.fill(HIST("V0/hKFChi2vsZ"), v0.vz(), v0.chiSquareNDF());
295-
fRegistry.fill(HIST("V0/hPResolution"), v0.p(), getPResolution(v0) / v0.p());
296-
fRegistry.fill(HIST("V0/hPtResolution"), v0.p(), getPtResolution(v0) / v0.pt());
297-
fRegistry.fill(HIST("V0/hEtaResolution"), v0.p(), getEtaResolution(v0));
298-
fRegistry.fill(HIST("V0/hThetaResolution"), v0.p(), getThetaResolution(v0));
299-
fRegistry.fill(HIST("V0/hPhiResolution"), v0.p(), getPhiResolution(v0));
300290

301291
float phi_cp = std::atan2(v0.vy(), v0.vx());
302292
o2::math_utils::bringTo02Pi(phi_cp);

‎PWGEM/PhotonMeson/Tasks/pcmQCMC.cxx‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ using MyCollision = MyCollisions::iterator;
4444
using MyMCCollisions = soa::Join<aod::EMMCEvents, aod::BinnedGenPts>;
4545
using MyMCCollision = MyMCCollisions::iterator;
4646

47-
using MyV0Photons = soa::Join<aod::V0PhotonsKF, aod::V0PhotonsKFCov, aod::V0KFEMEventIds>;
47+
using MyV0Photons = soa::Join<aod::V0PhotonsKF, aod::V0KFEMEventIds>;
4848
using MyV0Photon = MyV0Photons::iterator;
4949

5050
using MyMCV0Legs = soa::Join<aod::V0Legs, aod::V0LegMCLabels>;
@@ -196,11 +196,6 @@ struct PCMQCMC {
196196
fRegistry.add("V0/primary/hKFChi2vsX", "KF chi2 vs. conversion point in X;X (cm);KF chi2/NDF", kTH2F, {{200, -100.0f, 100.0f}, {100, 0.f, 100.0f}}, false);
197197
fRegistry.add("V0/primary/hKFChi2vsY", "KF chi2 vs. conversion point in Y;Y (cm);KF chi2/NDF", kTH2F, {{200, -100.0f, 100.0f}, {100, 0.f, 100.0f}}, false);
198198
fRegistry.add("V0/primary/hKFChi2vsZ", "KF chi2 vs. conversion point in Z;Z (cm);KF chi2/NDF", kTH2F, {{200, -100.0f, 100.0f}, {100, 0.f, 100.0f}}, false);
199-
fRegistry.add("V0/primary/hPResolution", "p resolution;p_{#gamma} (GeV/c);#Deltap/p", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.1}}, false);
200-
fRegistry.add("V0/primary/hPtResolution", "p_{T} resolution;p_{#gamma} (GeV/c);#Deltap_{T}/p_{T}", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.1}}, false);
201-
fRegistry.add("V0/primary/hEtaResolution", "#eta resolution;p_{#gamma} (GeV/c);#Delta#eta", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.01}}, false);
202-
fRegistry.add("V0/primary/hThetaResolution", "#theta resolution;p_{#gamma} (GeV/c);#Delta#theta (rad.)", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.01}}, false);
203-
fRegistry.add("V0/primary/hPhiResolution", "#varphi resolution;p_{#gamma} (GeV/c);#Delta#varphi (rad.)", kTH2F, {{1000, 0.0f, 10}, {100, 0, 0.01}}, false);
204199
fRegistry.add("V0/primary/hNgamma", "Number of true #gamma per collision;N_{#gamma} per event;Number of events", kTH1F, {{101, -0.5f, 100.5f}});
205200
fRegistry.add("V0/primary/hConvPoint_diffX", "conversion point diff X MC;X_{MC} (cm);X_{rec} - X_{MC} (cm)", kTH2F, {{200, -100, +100}, {100, -50.0f, 50.0f}}, true);
206201
fRegistry.add("V0/primary/hConvPoint_diffY", "conversion point diff Y MC;Y_{MC} (cm);Y_{rec} - Y_{MC} (cm)", kTH2F, {{200, -100, +100}, {100, -50.0f, 50.0f}}, true);
@@ -402,11 +397,6 @@ struct PCMQCMC {
402397
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hKFChi2vsX"), v0.vx(), v0.chiSquareNDF());
403398
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hKFChi2vsY"), v0.vy(), v0.chiSquareNDF());
404399
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hKFChi2vsZ"), v0.vz(), v0.chiSquareNDF());
405-
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hPResolution"), v0.p(), getPResolution(v0) / v0.p());
406-
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hPtResolution"), v0.p(), getPtResolution(v0) / v0.pt());
407-
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hEtaResolution"), v0.p(), getEtaResolution(v0));
408-
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hThetaResolution"), v0.p(), getThetaResolution(v0));
409-
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hPhiResolution"), v0.p(), getPhiResolution(v0));
410400
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hPtGen_DeltaPtOverPtGen"), mcphoton.pt(), (v0.pt() - mcphoton.pt()) / mcphoton.pt());
411401
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hPtGen_DeltaEta"), mcphoton.pt(), v0.eta() - mcphoton.eta());
412402
fRegistry.fill(HIST("V0/") + HIST(mcphoton_types[mctype]) + HIST("hPtGen_DeltaPhi"), mcphoton.pt(), v0.phi() - mcphoton.phi());

‎PWGEM/PhotonMeson/Utils/PCMUtilities.h‎

Lines changed: 73 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -105,79 +105,79 @@ inline void Vtx_recalculation(o2::base::Propagator* prop, T1 lTrackPos, T2 lTrac
105105
Vtx_recalculationParCov<TrackPrecision>(prop, trackPosInformation, trackNegInformation, xyz, matCorr);
106106
}
107107
//_______________________________________________________________________
108-
template <typename TV0>
109-
float getPtResolution(TV0 const& v0)
110-
{
111-
float px = v0.px();
112-
float py = v0.py();
113-
float pt = v0.pt();
114-
float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
115-
float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
116-
float pxy_err = v0.sigmaPxPy();
117-
return std::sqrt(std::pow(px / pt * px_err, 2) + std::pow(py / pt * py_err, 2) + 2.f * px / pt * py / pt * pxy_err);
118-
}
119-
//_______________________________________________________________________
120-
template <typename TV0>
121-
float getPhiResolution(TV0 const& v0)
122-
{
123-
float px = v0.px();
124-
float py = v0.py();
125-
float pt = v0.pt();
126-
float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
127-
float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
128-
float pxy_err = v0.sigmaPxPy();
129-
return std::sqrt(std::pow(px / pt / pt * py_err, 2) + std::pow(py / pt / pt * px_err, 2) - 2.f * px / pt / pt * py / pt / pt * pxy_err);
130-
}
131-
//_______________________________________________________________________
132-
template <typename TV0>
133-
float getThetaResolution(TV0 const& v0)
134-
{
135-
float px = v0.px();
136-
float py = v0.py();
137-
float pz = v0.pz();
138-
float pt = v0.pt();
139-
float p = v0.p();
140-
float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
141-
float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
142-
float pz_err = std::sqrt(std::fabs(v0.sigmaPz2()));
143-
float pxy_err = v0.sigmaPxPy();
144-
float pyz_err = v0.sigmaPyPz();
145-
float pzx_err = v0.sigmaPzPx();
146-
return std::sqrt(std::pow(pz * pz / p / p, 2) * (std::pow(px / pz / pt * px_err, 2) + std::pow(py / pz / pt * py_err, 2) + std::pow(pt / pz / pz * pz_err, 2) + 2.f * (px * py / pz / pz / pt / pt * pxy_err - py / pz / pz / pz * pyz_err - px / pz / pz / pz * pzx_err)));
147-
}
148-
//_______________________________________________________________________
149-
template <typename TV0>
150-
float getEtaResolution(TV0 const& v0)
151-
{
152-
float px = v0.px();
153-
float py = v0.py();
154-
float pz = v0.pz();
155-
float pt = v0.pt();
156-
float p = v0.p();
157-
float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
158-
float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
159-
float pz_err = std::sqrt(std::fabs(v0.sigmaPz2()));
160-
float pxy_err = v0.sigmaPxPy();
161-
float pyz_err = v0.sigmaPyPz();
162-
float pzx_err = v0.sigmaPzPx();
163-
return std::sqrt(std::pow(1.f / p / pt / pt, 2) * (std::pow(pz * px * px_err, 2) + std::pow(pz * py * py_err, 2) + std::pow(pt * pt * pz_err, 2) + 2.f * (pz * pz * px * py * pxy_err - pt * pt * py * pz * pyz_err - pt * pt * pz * px * pzx_err)));
164-
}
165-
//_______________________________________________________________________
166-
template <typename TV0>
167-
float getPResolution(TV0 const& v0)
168-
{
169-
float px = v0.px();
170-
float py = v0.py();
171-
float pz = v0.pz();
172-
float p = v0.p();
173-
float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
174-
float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
175-
float pz_err = std::sqrt(std::fabs(v0.sigmaPz2()));
176-
float pxy_err = v0.sigmaPxPy();
177-
float pyz_err = v0.sigmaPyPz();
178-
float pzx_err = v0.sigmaPzPx();
179-
return std::sqrt(std::pow(1.f / p, 2) * (std::pow(px * px_err, 2) + std::pow(py * py_err, 2) + std::pow(pz * pz_err, 2) + 2.f * (px * py * pxy_err + py * pz * pyz_err + pz * px * pzx_err)));
180-
}
108+
// template <typename TV0>
109+
// float getPtResolution(TV0 const& v0)
110+
// {
111+
// float px = v0.px();
112+
// float py = v0.py();
113+
// float pt = v0.pt();
114+
// float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
115+
// float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
116+
// float pxy_err = v0.sigmaPxPy();
117+
// return std::sqrt(std::pow(px / pt * px_err, 2) + std::pow(py / pt * py_err, 2) + 2.f * px / pt * py / pt * pxy_err);
118+
// }
119+
// //_______________________________________________________________________
120+
// template <typename TV0>
121+
// float getPhiResolution(TV0 const& v0)
122+
// {
123+
// float px = v0.px();
124+
// float py = v0.py();
125+
// float pt = v0.pt();
126+
// float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
127+
// float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
128+
// float pxy_err = v0.sigmaPxPy();
129+
// return std::sqrt(std::pow(px / pt / pt * py_err, 2) + std::pow(py / pt / pt * px_err, 2) - 2.f * px / pt / pt * py / pt / pt * pxy_err);
130+
// }
131+
// //_______________________________________________________________________
132+
// template <typename TV0>
133+
// float getThetaResolution(TV0 const& v0)
134+
// {
135+
// float px = v0.px();
136+
// float py = v0.py();
137+
// float pz = v0.pz();
138+
// float pt = v0.pt();
139+
// float p = v0.p();
140+
// float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
141+
// float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
142+
// float pz_err = std::sqrt(std::fabs(v0.sigmaPz2()));
143+
// float pxy_err = v0.sigmaPxPy();
144+
// float pyz_err = v0.sigmaPyPz();
145+
// float pzx_err = v0.sigmaPzPx();
146+
// return std::sqrt(std::pow(pz * pz / p / p, 2) * (std::pow(px / pz / pt * px_err, 2) + std::pow(py / pz / pt * py_err, 2) + std::pow(pt / pz / pz * pz_err, 2) + 2.f * (px * py / pz / pz / pt / pt * pxy_err - py / pz / pz / pz * pyz_err - px / pz / pz / pz * pzx_err)));
147+
// }
148+
// //_______________________________________________________________________
149+
// template <typename TV0>
150+
// float getEtaResolution(TV0 const& v0)
151+
// {
152+
// float px = v0.px();
153+
// float py = v0.py();
154+
// float pz = v0.pz();
155+
// float pt = v0.pt();
156+
// float p = v0.p();
157+
// float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
158+
// float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
159+
// float pz_err = std::sqrt(std::fabs(v0.sigmaPz2()));
160+
// float pxy_err = v0.sigmaPxPy();
161+
// float pyz_err = v0.sigmaPyPz();
162+
// float pzx_err = v0.sigmaPzPx();
163+
// return std::sqrt(std::pow(1.f / p / pt / pt, 2) * (std::pow(pz * px * px_err, 2) + std::pow(pz * py * py_err, 2) + std::pow(pt * pt * pz_err, 2) + 2.f * (pz * pz * px * py * pxy_err - pt * pt * py * pz * pyz_err - pt * pt * pz * px * pzx_err)));
164+
// }
165+
// //_______________________________________________________________________
166+
// template <typename TV0>
167+
// float getPResolution(TV0 const& v0)
168+
// {
169+
// float px = v0.px();
170+
// float py = v0.py();
171+
// float pz = v0.pz();
172+
// float p = v0.p();
173+
// float px_err = std::sqrt(std::fabs(v0.sigmaPx2()));
174+
// float py_err = std::sqrt(std::fabs(v0.sigmaPy2()));
175+
// float pz_err = std::sqrt(std::fabs(v0.sigmaPz2()));
176+
// float pxy_err = v0.sigmaPxPy();
177+
// float pyz_err = v0.sigmaPyPz();
178+
// float pzx_err = v0.sigmaPzPx();
179+
// return std::sqrt(std::pow(1.f / p, 2) * (std::pow(px * px_err, 2) + std::pow(py * py_err, 2) + std::pow(pz * pz_err, 2) + 2.f * (px * py * pxy_err + py * pz * pyz_err + pz * px * pzx_err)));
180+
// }
181181
//_______________________________________________________________________
182182
//_______________________________________________________________________
183183
#endif // PWGEM_PHOTONMESON_UTILS_PCMUTILITIES_H_

0 commit comments

Comments
 (0)