Skip to content

Commit 2318a0e

Browse files
dsekihatdsekihat
authored
[PWGEM/PhotonMeson] remove track::x,y,z from derived data (#12474)
1 parent 7ead8e1 commit 2318a0e

19 files changed

+51
-100
lines changed

‎PWGEM/Dilepton/Core/PhotonHBT.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ struct PhotonHBT {
161161
Configurable<float> cfg_min_cospa{"cfg_min_cospa", 0.997, "min V0 CosPA"};
162162
Configurable<float> cfg_max_pca{"cfg_max_pca", 3.0, "max distance btween 2 legs"};
163163
Configurable<float> cfg_max_chi2kf{"cfg_max_chi2kf", 1e+10, "max chi2/ndf with KF"};
164-
Configurable<bool> cfg_require_v0_with_correct_xz{"cfg_require_v0_with_correct_xz", true, "flag to select V0s with correct xz"};
165164
Configurable<bool> cfg_reject_v0_on_itsib{"cfg_reject_v0_on_itsib", true, "flag to reject V0s on ITSib"};
166165

167166
Configurable<bool> cfg_disable_itsonly_track{"cfg_disable_itsonly_track", false, "flag to disable ITSonly tracks"};
@@ -536,7 +535,6 @@ struct PhotonHBT {
536535
fV0PhotonCut.SetDisableTPConly(pcmcuts.cfg_disable_tpconly_track);
537536
fV0PhotonCut.SetNClustersITS(0, 7);
538537
fV0PhotonCut.SetMeanClusterSizeITSob(0.0, 16.0);
539-
fV0PhotonCut.SetIsWithinBeamPipe(pcmcuts.cfg_require_v0_with_correct_xz);
540538
fV0PhotonCut.SetRequireITSTPC(pcmcuts.cfg_require_v0_with_itstpc);
541539
fV0PhotonCut.SetRequireITSonly(pcmcuts.cfg_require_v0_with_itsonly);
542540
fV0PhotonCut.SetRequireTPConly(pcmcuts.cfg_require_v0_with_tpconly);

‎PWGEM/Dilepton/DataModel/dileptonTables.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,11 @@ using EMPrimaryElectronsCov = EMPrimaryElectronsCov_001;
641641
// iterators
642642
using EMPrimaryElectronCov = EMPrimaryElectronsCov::iterator;
643643

644+
DECLARE_SOA_TABLE_VERSIONED(EMPrimaryElectronsDeDxMC_000, "AOD", "EMPRMELDEDXMC", 0, mcpidtpc::DeDxTunedMc, o2::soa::Marker<1>);
645+
using EMPrimaryElectronsDeDxMC = EMPrimaryElectronsDeDxMC_000;
646+
// iterators
647+
using EMPrimaryElectronDeDxMC = EMPrimaryElectronsDeDxMC::iterator;
648+
644649
DECLARE_SOA_TABLE(EMPrimaryElectronEMEventIds, "AOD", "PRMELMEVENTID", emprimaryelectron::EMEventId); // To be joined with EMPrimaryElectrons table at analysis level.
645650
// iterators
646651
using EMPrimaryElectronEMEventId = EMPrimaryElectronEMEventIds::iterator;

‎PWGEM/PhotonMeson/Core/CutsLibrary.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ V0PhotonCut* o2::aod::pwgem::photon::pcmcuts::GetCut(const char* cutName)
132132
cut->SetChi2PerClusterITS(-1e+10, 5.0);
133133
cut->SetNClustersITS(2, 4);
134134
cut->SetMeanClusterSizeITSob(0.0, 16.0);
135-
cut->SetIsWithinBeamPipe(true);
135+
// cut->SetIsWithinBeamPipe(true);
136136
// for v0
137137
cut->SetMinCosPA(0.99);
138138
cut->SetMaxPCA(3.0);
@@ -201,7 +201,7 @@ V0PhotonCut* o2::aod::pwgem::photon::pcmcuts::GetCut(const char* cutName)
201201
cut->SetChi2PerClusterITS(-1e+10, 5.0);
202202
cut->SetNClustersITS(2, 4);
203203
cut->SetMeanClusterSizeITSob(0.0, 16.0);
204-
cut->SetIsWithinBeamPipe(true);
204+
// cut->SetIsWithinBeamPipe(true);
205205
// for v0
206206
cut->SetMinCosPA(0.995);
207207
cut->SetMaxPCA(0.5);
@@ -216,7 +216,7 @@ V0PhotonCut* o2::aod::pwgem::photon::pcmcuts::GetCut(const char* cutName)
216216
cut->SetChi2PerClusterITS(-1e+10, 5.0);
217217
cut->SetNClustersITS(2, 4);
218218
cut->SetMeanClusterSizeITSob(0.0, 16.0);
219-
cut->SetIsWithinBeamPipe(true);
219+
// cut->SetIsWithinBeamPipe(true);
220220
cut->SetRequireITSTPC(true);
221221
// for v0
222222
cut->SetMinCosPA(0.99);
@@ -232,7 +232,7 @@ V0PhotonCut* o2::aod::pwgem::photon::pcmcuts::GetCut(const char* cutName)
232232
cut->SetChi2PerClusterITS(-1e+10, 5.0);
233233
cut->SetNClustersITS(2, 4);
234234
cut->SetMeanClusterSizeITSob(0.0, 16.0);
235-
cut->SetIsWithinBeamPipe(true);
235+
// cut->SetIsWithinBeamPipe(true);
236236
// for v0
237237
cut->SetMinCosPA(0.99);
238238
cut->SetMaxPCA(3.0);
@@ -249,7 +249,7 @@ V0PhotonCut* o2::aod::pwgem::photon::pcmcuts::GetCut(const char* cutName)
249249
cut->SetChi2PerClusterITS(-1e+10, 5.0);
250250
cut->SetNClustersITS(2, 4);
251251
cut->SetMeanClusterSizeITSob(0.0, 16.0);
252-
cut->SetIsWithinBeamPipe(false);
252+
// cut->SetIsWithinBeamPipe(false);
253253
// for v0
254254
cut->SetMinCosPA(0.95);
255255
cut->SetMaxPCA(3.0);
@@ -265,7 +265,7 @@ V0PhotonCut* o2::aod::pwgem::photon::pcmcuts::GetCut(const char* cutName)
265265
cut->SetChi2PerClusterITS(-1e+10, 5.0);
266266
cut->SetNClustersITS(2, 4);
267267
cut->SetMeanClusterSizeITSob(0.0, 16.0);
268-
cut->SetIsWithinBeamPipe(false);
268+
// cut->SetIsWithinBeamPipe(false);
269269
// for v0
270270
cut->SetMinCosPA(0.95);
271271
cut->SetMaxPCA(3.0);

‎PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ struct DiphotonHadronMPC {
152152
Configurable<float> cfg_min_cospa{"cfg_min_cospa", 0.997, "min V0 CosPA"};
153153
Configurable<float> cfg_max_pca{"cfg_max_pca", 3.0, "max distance btween 2 legs"};
154154
Configurable<float> cfg_max_chi2kf{"cfg_max_chi2kf", 1e+10, "max chi2/ndf with KF"};
155-
Configurable<bool> cfg_require_v0_with_correct_xz{"cfg_require_v0_with_correct_xz", false, "flag to select V0s with correct xz"};
156155
Configurable<bool> cfg_reject_v0_on_itsib{"cfg_reject_v0_on_itsib", true, "flag to reject V0s on ITSib"};
157156
Configurable<bool> cfg_apply_cuts_from_prefilter_derived{"cfg_apply_cuts_from_prefilter_derived", false, "flag to apply prefilter to V0"};
158157

@@ -415,7 +414,6 @@ struct DiphotonHadronMPC {
415414
fV0PhotonCut.SetChi2PerClusterITS(-1e+10, pcmcuts.cfg_max_chi2its);
416415
fV0PhotonCut.SetNClustersITS(0, 7);
417416
fV0PhotonCut.SetMeanClusterSizeITSob(0.0, 16.0);
418-
fV0PhotonCut.SetIsWithinBeamPipe(pcmcuts.cfg_require_v0_with_correct_xz);
419417
fV0PhotonCut.SetDisableITSonly(pcmcuts.cfg_disable_itsonly_track);
420418
fV0PhotonCut.SetDisableTPConly(pcmcuts.cfg_disable_tpconly_track);
421419
fV0PhotonCut.SetRequireITSTPC(pcmcuts.cfg_require_v0_with_itstpc);

‎PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ struct Pi0EtaToGammaGamma {
148148
Configurable<float> cfg_min_cospa{"cfg_min_cospa", 0.999, "min V0 CosPA"};
149149
Configurable<float> cfg_max_pca{"cfg_max_pca", 1.5, "max distance btween 2 legs"};
150150
Configurable<float> cfg_max_chi2kf{"cfg_max_chi2kf", 1e+10, "max chi2/ndf with KF"};
151-
Configurable<bool> cfg_require_v0_with_correct_xz{"cfg_require_v0_with_correct_xz", false, "flag to select V0s with correct xz"};
152151
Configurable<bool> cfg_reject_v0_on_itsib{"cfg_reject_v0_on_itsib", true, "flag to reject V0s on ITSib"};
153152
Configurable<bool> cfg_apply_cuts_from_prefilter_derived{"cfg_apply_cuts_from_prefilter_derived", false, "flag to apply prefilter to V0"};
154153

@@ -374,7 +373,6 @@ struct Pi0EtaToGammaGamma {
374373
fV0PhotonCut.SetChi2PerClusterITS(-1e+10, pcmcuts.cfg_max_chi2its);
375374
fV0PhotonCut.SetNClustersITS(0, 7);
376375
fV0PhotonCut.SetMeanClusterSizeITSob(0.0, 16.0);
377-
fV0PhotonCut.SetIsWithinBeamPipe(pcmcuts.cfg_require_v0_with_correct_xz);
378376
fV0PhotonCut.SetDisableITSonly(pcmcuts.cfg_disable_itsonly_track);
379377
fV0PhotonCut.SetDisableTPConly(pcmcuts.cfg_disable_tpconly_track);
380378
fV0PhotonCut.SetRequireITSTPC(pcmcuts.cfg_require_v0_with_itstpc);

‎PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ struct Pi0EtaToGammaGammaMC {
134134
Configurable<float> cfg_min_cospa{"cfg_min_cospa", 0.999, "min V0 CosPA"};
135135
Configurable<float> cfg_max_pca{"cfg_max_pca", 1.5, "max distance btween 2 legs"};
136136
Configurable<float> cfg_max_chi2kf{"cfg_max_chi2kf", 1e+10, "max chi2/ndf with KF"};
137-
Configurable<bool> cfg_require_v0_with_correct_xz{"cfg_require_v0_with_correct_xz", false, "flag to select V0s with correct xz"};
138137
Configurable<bool> cfg_reject_v0_on_itsib{"cfg_reject_v0_on_itsib", true, "flag to reject V0s on ITSib"};
139138
Configurable<bool> cfg_apply_cuts_from_prefilter_derived{"cfg_apply_cuts_from_prefilter_derived", false, "flag to apply prefilter to V0"};
140139

@@ -333,7 +332,6 @@ struct Pi0EtaToGammaGammaMC {
333332
fV0PhotonCut.SetChi2PerClusterITS(-1e+10, pcmcuts.cfg_max_chi2its);
334333
fV0PhotonCut.SetNClustersITS(0, 7);
335334
fV0PhotonCut.SetMeanClusterSizeITSob(0.0, 16.0);
336-
fV0PhotonCut.SetIsWithinBeamPipe(pcmcuts.cfg_require_v0_with_correct_xz);
337335
fV0PhotonCut.SetDisableITSonly(pcmcuts.cfg_disable_itsonly_track);
338336
fV0PhotonCut.SetDisableTPConly(pcmcuts.cfg_disable_tpconly_track);
339337
fV0PhotonCut.SetRequireITSTPC(pcmcuts.cfg_require_v0_with_itstpc);

‎PWGEM/PhotonMeson/Core/TaggingPi0.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ struct TaggingPi0 {
138138
Configurable<float> cfg_min_cospa{"cfg_min_cospa", 0.997, "min V0 CosPA"};
139139
Configurable<float> cfg_max_pca{"cfg_max_pca", 3.0, "max distance btween 2 legs"};
140140
Configurable<float> cfg_max_chi2kf{"cfg_max_chi2kf", 1e+10, "max chi2/ndf with KF"};
141-
Configurable<bool> cfg_require_v0_with_correct_xz{"cfg_require_v0_with_correct_xz", true, "flag to select V0s with correct xz"};
142141
Configurable<bool> cfg_reject_v0_on_itsib{"cfg_reject_v0_on_itsib", true, "flag to reject V0s on ITSib"};
143142

144143
Configurable<int> cfg_min_ncluster_tpc{"cfg_min_ncluster_tpc", 10, "min ncluster tpc"};
@@ -369,7 +368,6 @@ struct TaggingPi0 {
369368
fV0PhotonCut.SetChi2PerClusterITS(-1e+10, pcmcuts.cfg_max_chi2its);
370369
fV0PhotonCut.SetNClustersITS(0, 7);
371370
fV0PhotonCut.SetMeanClusterSizeITSob(0.0, 16.0);
372-
fV0PhotonCut.SetIsWithinBeamPipe(pcmcuts.cfg_require_v0_with_correct_xz);
373371
fV0PhotonCut.SetDisableITSonly(pcmcuts.cfg_disable_itsonly_track);
374372
fV0PhotonCut.SetDisableTPConly(pcmcuts.cfg_disable_tpconly_track);
375373
fV0PhotonCut.SetRequireITSTPC(pcmcuts.cfg_require_v0_with_itstpc);

‎PWGEM/PhotonMeson/Core/TaggingPi0MC.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ struct TaggingPi0MC {
130130
Configurable<float> cfg_min_cospa{"cfg_min_cospa", 0.997, "min V0 CosPA"};
131131
Configurable<float> cfg_max_pca{"cfg_max_pca", 3.0, "max distance btween 2 legs"};
132132
Configurable<float> cfg_max_chi2kf{"cfg_max_chi2kf", 1e+10, "max chi2/ndf with KF"};
133-
Configurable<bool> cfg_require_v0_with_correct_xz{"cfg_require_v0_with_correct_xz", true, "flag to select V0s with correct xz"};
134133
Configurable<bool> cfg_reject_v0_on_itsib{"cfg_reject_v0_on_itsib", true, "flag to reject V0s on ITSib"};
135134

136135
Configurable<int> cfg_min_ncluster_tpc{"cfg_min_ncluster_tpc", 10, "min ncluster tpc"};
@@ -339,7 +338,6 @@ struct TaggingPi0MC {
339338
fV0PhotonCut.SetChi2PerClusterITS(-1e+10, pcmcuts.cfg_max_chi2its);
340339
fV0PhotonCut.SetNClustersITS(0, 7);
341340
fV0PhotonCut.SetMeanClusterSizeITSob(0.0, 16.0);
342-
fV0PhotonCut.SetIsWithinBeamPipe(pcmcuts.cfg_require_v0_with_correct_xz);
343341
fV0PhotonCut.SetDisableITSonly(pcmcuts.cfg_disable_itsonly_track);
344342
fV0PhotonCut.SetDisableTPConly(pcmcuts.cfg_disable_tpconly_track);
345343
fV0PhotonCut.SetRequireITSTPC(pcmcuts.cfg_require_v0_with_itstpc);

‎PWGEM/PhotonMeson/Core/V0PhotonCut.cxx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,6 @@ void V0PhotonCut::SetMeanClusterSizeITSob(float min, float max)
193193
LOG(info) << "V0 Photon Cut, set mean cluster size ITS range: " << mMinMeanClusterSizeITS << " - " << mMaxMeanClusterSizeITS;
194194
}
195195

196-
void V0PhotonCut::SetIsWithinBeamPipe(bool flag)
197-
{
198-
mIsWithinBP = flag;
199-
LOG(info) << "V0 Photon Cut, propagated to within beam pipe: " << mIsWithinBP;
200-
}
201-
202196
void V0PhotonCut::SetRequireITSTPC(bool flag)
203197
{
204198
mRequireITSTPC = flag;

‎PWGEM/PhotonMeson/Core/V0PhotonCut.h‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ class V0PhotonCut : public TNamed
6666
kITSNCls,
6767
kITSChi2NDF,
6868
kITSClusterSize,
69-
kIsWithinBeamPipe,
7069
kRequireITSTPC,
7170
kRequireITSonly,
7271
kRequireTPConly,
@@ -142,9 +141,6 @@ class V0PhotonCut : public TNamed
142141
if (!IsSelectedTrack(track, V0PhotonCuts::kDCAz)) {
143142
return false;
144143
}
145-
if (mIsWithinBP && !IsSelectedTrack(track, V0PhotonCuts::kIsWithinBeamPipe)) {
146-
return false;
147-
}
148144
if (!track.hasITS() && !track.hasTPC()) { // track has to be ITSonly or TPConly or ITS-TPC
149145
return false;
150146
}
@@ -271,11 +267,6 @@ class V0PhotonCut : public TNamed
271267
if (v0.v0radius() < mMinRxy || mMaxRxy < v0.v0radius()) {
272268
return false;
273269
}
274-
if (mRejectITSib) {
275-
if (v0.v0radius() < 4.f || v0.pca() < -0.05 * v0.v0radius() + 0.3) {
276-
return false;
277-
}
278-
}
279270
return true;
280271
}
281272

@@ -390,28 +381,6 @@ class V0PhotonCut : public TNamed
390381
return mMinMeanClusterSizeITS < track.meanClusterSizeITSob() * std::cos(std::atan(track.tgl())) && track.meanClusterSizeITSob() * std::cos(std::atan(track.tgl())) < mMaxMeanClusterSizeITS;
391382
}
392383

393-
case V0PhotonCuts::kIsWithinBeamPipe: {
394-
if (!isTPConlyTrack(track)) { // TPC-TRD, TPC-TOF, TPC-TRD-TOF are constrained.
395-
return true;
396-
}
397-
398-
// if (abs(track.y()) > abs(track.x() * TMath::Tan(10.f * TMath::DegToRad())) + 15.f) {
399-
// return false;
400-
// }
401-
if (track.x() < 0.1 && std::fabs(track.y()) > 15.f) {
402-
return false;
403-
}
404-
if (track.x() > 82.9 && std::fabs(track.y()) > std::fabs(track.x() * std::tan(10.f * TMath::DegToRad())) + 5.f) {
405-
return false;
406-
}
407-
if (track.x() > 82.9 && std::fabs(track.y()) < 15.0 && abs(abs(track.z()) - 44.5) < 2.5) {
408-
return false;
409-
}
410-
return true;
411-
// const float slope = TMath::Tan(2 * TMath::ATan(TMath::Exp(-0.5)));
412-
// return !(track.x() > 82.9 && abs(track.y()) < 15.f && abs(abs(track.z()) - track.x() / slope) < 3.f && 15.f < abs(track.dcaXY()));
413-
//// return !(track.x() > 82.9 && abs(track.y()) < 40.f && abs(abs(track.z()) - 47.f) < 3.f && 15.f < abs(track.dcaXY()));
414-
}
415384
case V0PhotonCuts::kRequireITSTPC:
416385
return isITSTPCTrack(track);
417386

@@ -517,7 +486,6 @@ class V0PhotonCut : public TNamed
517486
float mMaxDcaXY{1e10f}; // max dca in xy plane
518487
float mMaxDcaZ{1e10f}; // max dca in z direction
519488
std::function<float(float)> mMaxDcaXYPtDep{}; // max dca in xy plane as function of pT
520-
bool mIsWithinBP{false};
521489
bool mRequireITSTPC{false};
522490
bool mRequireITSonly{false};
523491
bool mRequireTPConly{false};

0 commit comments

Comments
 (0)