Skip to content

Commit c8b8dc1

Browse files
dsekihatdsekihat
authored
[PWGEM/PhotonMeson] reduce dependency in MC (#12588)
1 parent 4f47c95 commit c8b8dc1

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

‎PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ struct Pi0EtaToGammaGamma {
114114
EMPhotonEventCut fEMEventCut;
115115
struct : ConfigurableGroup {
116116
std::string prefix = "eventcut_group";
117-
Configurable<float> cfgZvtxMax{"cfgZvtxMax", 10.f, "max. Zvtx"};
117+
Configurable<float> cfgZvtxMin{"cfgZvtxMin", -10.f, "min. Zvtx"};
118+
Configurable<float> cfgZvtxMax{"cfgZvtxMax", +10.f, "max. Zvtx"};
118119
Configurable<bool> cfgRequireSel8{"cfgRequireSel8", true, "require sel8 in event cut"};
119120
Configurable<bool> cfgRequireFT0AND{"cfgRequireFT0AND", true, "require FT0AND in event cut"};
120121
Configurable<bool> cfgRequireNoTFB{"cfgRequireNoTFB", false, "require No time frame border in event cut"};
@@ -339,7 +340,7 @@ struct Pi0EtaToGammaGamma {
339340
fEMEventCut = EMPhotonEventCut("fEMEventCut", "fEMEventCut");
340341
fEMEventCut.SetRequireSel8(eventcuts.cfgRequireSel8);
341342
fEMEventCut.SetRequireFT0AND(eventcuts.cfgRequireFT0AND);
342-
fEMEventCut.SetZvtxRange(-eventcuts.cfgZvtxMax, +eventcuts.cfgZvtxMax);
343+
fEMEventCut.SetZvtxRange(eventcuts.cfgZvtxMin, eventcuts.cfgZvtxMax);
343344
fEMEventCut.SetRequireNoTFB(eventcuts.cfgRequireNoTFB);
344345
fEMEventCut.SetRequireNoITSROFB(eventcuts.cfgRequireNoITSROFB);
345346
fEMEventCut.SetRequireNoSameBunchPileup(eventcuts.cfgRequireNoSameBunchPileup);

‎PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ using namespace o2::aod::pwgem::photonmeson::photonpair;
5757
using namespace o2::aod::pwgem::photonmeson::utils::mcutil;
5858
using namespace o2::aod::pwgem::dilepton::utils::mcutil;
5959

60-
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec, aod::EMMCEventLabels>;
60+
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMMCEventLabels>;
6161
using MyCollision = MyCollisions::iterator;
6262

6363
using MyCollisionsWithJJMC = soa::Join<MyCollisions, aod::EMEventsWeight>;
@@ -91,7 +91,7 @@ struct Pi0EtaToGammaGammaMC {
9191

9292
Configurable<int> cfgQvecEstimator{"cfgQvecEstimator", 0, "FT0M:0, FT0A:1, FT0C:2"};
9393
Configurable<int> cfgCentEstimator{"cfgCentEstimator", 2, "FT0M:0, FT0A:1, FT0C:2"};
94-
Configurable<float> cfgCentMin{"cfgCentMin", 0, "min. centrality"};
94+
Configurable<float> cfgCentMin{"cfgCentMin", -1, "min. centrality"};
9595
Configurable<float> cfgCentMax{"cfgCentMax", 999, "max. centrality"};
9696
Configurable<float> maxY_rec{"maxY_rec", 0.9, "maximum rapidity for reconstructed particles"};
9797
Configurable<std::string> fd_k0s_to_pi0{"fd_k0s_pi0", "1.0", "feed down correction to pi0"};
@@ -100,10 +100,11 @@ struct Pi0EtaToGammaGammaMC {
100100
EMPhotonEventCut fEMEventCut;
101101
struct : ConfigurableGroup {
102102
std::string prefix = "eventcut_group";
103-
Configurable<float> cfgZvtxMax{"cfgZvtxMax", 10.f, "max. Zvtx"};
104-
Configurable<bool> cfgRequireSel8{"cfgRequireSel8", true, "require sel8 in event cut"};
103+
Configurable<float> cfgZvtxMin{"cfgZvtxMin", -10.f, "min. Zvtx"};
104+
Configurable<float> cfgZvtxMax{"cfgZvtxMax", +10.f, "max. Zvtx"};
105+
Configurable<bool> cfgRequireSel8{"cfgRequireSel8", false, "require sel8 in event cut"};
105106
Configurable<bool> cfgRequireFT0AND{"cfgRequireFT0AND", true, "require FT0AND in event cut"};
106-
Configurable<bool> cfgRequireNoTFB{"cfgRequireNoTFB", false, "require No time frame border in event cut"};
107+
Configurable<bool> cfgRequireNoTFB{"cfgRequireNoTFB", true, "require No time frame border in event cut"};
107108
Configurable<bool> cfgRequireNoITSROFB{"cfgRequireNoITSROFB", false, "require no ITS readout frame border in event cut"};
108109
Configurable<bool> cfgRequireNoSameBunchPileup{"cfgRequireNoSameBunchPileup", false, "require no same bunch pileup in event cut"};
109110
Configurable<bool> cfgRequireVertexITSTPC{"cfgRequireVertexITSTPC", false, "require Vertex ITSTPC in event cut"}; // ITS-TPC matched track contributes PV.
@@ -298,7 +299,7 @@ struct Pi0EtaToGammaGammaMC {
298299
fEMEventCut = EMPhotonEventCut("fEMEventCut", "fEMEventCut");
299300
fEMEventCut.SetRequireSel8(eventcuts.cfgRequireSel8);
300301
fEMEventCut.SetRequireFT0AND(eventcuts.cfgRequireFT0AND);
301-
fEMEventCut.SetZvtxRange(-eventcuts.cfgZvtxMax, +eventcuts.cfgZvtxMax);
302+
fEMEventCut.SetZvtxRange(eventcuts.cfgZvtxMin, eventcuts.cfgZvtxMax);
302303
fEMEventCut.SetRequireNoTFB(eventcuts.cfgRequireNoTFB);
303304
fEMEventCut.SetRequireNoITSROFB(eventcuts.cfgRequireNoITSROFB);
304305
fEMEventCut.SetRequireNoSameBunchPileup(eventcuts.cfgRequireNoSameBunchPileup);

‎PWGEM/PhotonMeson/Core/TaggingPi0MC.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ using namespace o2::aod::pwgem::photonmeson::photonpair;
5656
using namespace o2::aod::pwgem::photonmeson::utils::mcutil;
5757
using namespace o2::aod::pwgem::dilepton::utils::mcutil;
5858

59-
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec, aod::EMMCEventLabels, aod::EMEventsWeight>;
59+
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMMCEventLabels, aod::EMEventsWeight>;
6060
using MyCollision = MyCollisions::iterator;
6161

6262
using MyMCCollisions = soa::Join<aod::EMMCEvents, aod::BinnedGenPts>;
@@ -87,7 +87,7 @@ struct TaggingPi0MC {
8787

8888
Configurable<int> cfgQvecEstimator{"cfgQvecEstimator", 0, "FT0M:0, FT0A:1, FT0C:2"};
8989
Configurable<int> cfgCentEstimator{"cfgCentEstimator", 2, "FT0M:0, FT0A:1, FT0C:2"};
90-
Configurable<float> cfgCentMin{"cfgCentMin", 0, "min. centrality"};
90+
Configurable<float> cfgCentMin{"cfgCentMin", -1, "min. centrality"};
9191
Configurable<float> cfgCentMax{"cfgCentMax", 999, "max. centrality"};
9292
Configurable<std::string> fd_k0s_to_pi0{"fd_k0s_pi0", "1.0", "feed down correction to pi0"};
9393
Configurable<bool> cfgRequireTrueAssociation{"cfgRequireTrueAssociation", false, "flag to require true mc collision association"};
@@ -96,6 +96,7 @@ struct TaggingPi0MC {
9696
EMPhotonEventCut fEMEventCut;
9797
struct : ConfigurableGroup {
9898
std::string prefix = "eventcut_group";
99+
Configurable<float> cfgZvtxMin{"cfgZvtxMin", -10.f, "min. Zvtx"};
99100
Configurable<float> cfgZvtxMax{"cfgZvtxMax", 10.f, "max. Zvtx"};
100101
Configurable<bool> cfgRequireSel8{"cfgRequireSel8", true, "require sel8 in event cut"};
101102
Configurable<bool> cfgRequireFT0AND{"cfgRequireFT0AND", true, "require FT0AND in event cut"};
@@ -304,7 +305,7 @@ struct TaggingPi0MC {
304305
fEMEventCut = EMPhotonEventCut("fEMEventCut", "fEMEventCut");
305306
fEMEventCut.SetRequireSel8(eventcuts.cfgRequireSel8);
306307
fEMEventCut.SetRequireFT0AND(eventcuts.cfgRequireFT0AND);
307-
fEMEventCut.SetZvtxRange(-eventcuts.cfgZvtxMax, +eventcuts.cfgZvtxMax);
308+
fEMEventCut.SetZvtxRange(eventcuts.cfgZvtxMin, eventcuts.cfgZvtxMax);
308309
fEMEventCut.SetRequireNoTFB(eventcuts.cfgRequireNoTFB);
309310
fEMEventCut.SetRequireNoITSROFB(eventcuts.cfgRequireNoITSROFB);
310311
fEMEventCut.SetRequireNoSameBunchPileup(eventcuts.cfgRequireNoSameBunchPileup);

0 commit comments

Comments
 (0)