Skip to content

Commit 554d998

Browse files
dsekihatdsekihat
authored
PWGEM/Dilepton: implement protection (#7076)
1 parent f1b255d commit 554d998

6 files changed

Lines changed: 108 additions & 60 deletions

File tree

‎PWGEM/Dilepton/Core/SingleTrackQC.h‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;
5151
using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent>;
5252
using MyCollision = MyCollisions::iterator;
5353

54+
using MyCollisionsWithSWT = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent, aod::EMEventsQvec, aod::EMSWTriggerInfos>;
55+
using MyCollisionWithSWT = MyCollisionsWithSWT::iterator;
56+
5457
using MyElectrons = soa::Join<aod::EMPrimaryElectrons, aod::EMPrimaryElectronsCov, aod::EMPrimaryElectronEMEventIds, aod::EMPrimaryElectronsPrefilterBit>;
5558
using MyElectron = MyElectrons::iterator;
5659
using FilteredMyElectrons = soa::Filtered<MyElectrons>;
@@ -70,6 +73,7 @@ struct SingleTrackQC {
7073
Configurable<int> cfgCentEstimator{"cfgCentEstimator", 2, "FT0M:0, FT0A:1, FT0C:2, NTPV:3"};
7174
Configurable<float> cfgCentMin{"cfgCentMin", 0, "min. centrality"};
7275
Configurable<float> cfgCentMax{"cfgCentMax", 999.f, "max. centrality"};
76+
Configurable<std::string> cfg_swt_name{"cfg_swt_name", "fHighTrackMult", "desired software trigger name"}; // 1 trigger name per 1 task. fHighTrackMult, fHighFt0Mult
7377

7478
ConfigurableAxis ConfPtlBins{"ConfPtlBins", {VARIABLE_WIDTH, 0.00, 0.05, 0.10, 0.15, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80, 0.90, 1.00, 1.10, 1.20, 1.30, 1.40, 1.50, 1.60, 1.70, 1.80, 1.90, 2.00, 2.50, 3.00, 3.50, 4.00, 4.50, 5.00, 6.00, 7.00, 8.00, 9.00, 10.00}, "pTl bins for output histograms"};
7579

@@ -232,6 +236,7 @@ struct SingleTrackQC {
232236
}
233237
}
234238

239+
int mRunNumber;
235240
void init(InitContext&)
236241
{
237242
ccdb->setURL(ccdburl);
@@ -243,6 +248,27 @@ struct SingleTrackQC {
243248
DefineDielectronCut();
244249
DefineDimuonCut();
245250
addhistograms();
251+
mRunNumber = 0;
252+
253+
if (doprocessQC_TriggeredData) {
254+
fRegistry.add("Event/hNInspectedTVX", "N inspected TVX;run number;N_{TVX}", kTProfile, {{80000, 520000.5, 600000.5}}, true);
255+
}
256+
}
257+
258+
template <bool isTriggerAnalysis, typename TCollision>
259+
void initCCDB(TCollision const& collision)
260+
{
261+
if (mRunNumber == collision.runNumber()) {
262+
return;
263+
}
264+
265+
mRunNumber = collision.runNumber();
266+
267+
if constexpr (isTriggerAnalysis) {
268+
LOGF(info, "Trigger analysis is enabled. Desired trigger name = %s", cfg_swt_name.value);
269+
LOGF(info, "total inspected TVX events = %d in run number %d", collision.nInspectedTVX(), collision.runNumber());
270+
fRegistry.fill(HIST("Event/hNInspectedTVX"), collision.runNumber(), collision.nInspectedTVX());
271+
}
246272
}
247273

248274
void DefineEMEventCut()
@@ -436,14 +462,20 @@ struct SingleTrackQC {
436462
}
437463
}
438464

439-
template <typename TCollisions, typename TTracks, typename TPreslice, typename TCut>
465+
template <bool isTriggerAnalysis, typename TCollisions, typename TTracks, typename TPreslice, typename TCut>
440466
void runQC(TCollisions const& collisions, TTracks const& tracks, TPreslice const& perCollision, TCut const& cut)
441467
{
442468
for (auto& collision : collisions) {
469+
initCCDB<isTriggerAnalysis>(collision);
443470
float centralities[4] = {collision.centFT0M(), collision.centFT0A(), collision.centFT0C(), collision.centNTPV()};
444471
if (centralities[cfgCentEstimator] < cfgCentMin || cfgCentMax < centralities[cfgCentEstimator]) {
445472
continue;
446473
}
474+
if constexpr (isTriggerAnalysis) {
475+
if (!collision.swtalias_bit(o2::aod::pwgem::dilepton::swt::aliasLabels.at(cfg_swt_name.value))) {
476+
continue;
477+
}
478+
}
447479

448480
o2::aod::pwgem::dilepton::utils::eventhistogram::fillEventInfo<0, -1>(&fRegistry, collision);
449481
if (!fEMEventCut.IsSelected(collision)) {
@@ -496,13 +528,26 @@ struct SingleTrackQC {
496528
{
497529
if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
498530
auto electrons = std::get<0>(std::tie(args...));
499-
runQC(collisions, electrons, perCollision_electron, fDielectronCut);
531+
runQC<false>(collisions, electrons, perCollision_electron, fDielectronCut);
532+
} else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
533+
auto muons = std::get<0>(std::tie(args...));
534+
runQC<false>(collisions, muons, perCollision_muon, fDimuonCut);
535+
}
536+
}
537+
PROCESS_SWITCH(SingleTrackQC, processQC, "run single track QC", true);
538+
539+
using FilteredMyCollisionsWithSWT = soa::Filtered<MyCollisionsWithSWT>;
540+
void processQC_TriggeredData(FilteredMyCollisionsWithSWT const& collisions, Types const&... args)
541+
{
542+
if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
543+
auto electrons = std::get<0>(std::tie(args...));
544+
runQC<true>(collisions, electrons, perCollision_electron, fDielectronCut);
500545
} else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
501546
auto muons = std::get<0>(std::tie(args...));
502-
runQC(collisions, muons, perCollision_muon, fDimuonCut);
547+
runQC<true>(collisions, muons, perCollision_muon, fDimuonCut);
503548
}
504549
}
505-
PROCESS_SWITCH(SingleTrackQC, processQC, "run dielectron QC", true);
550+
PROCESS_SWITCH(SingleTrackQC, processQC_TriggeredData, "run single track QC on triggered data", false);
506551

507552
void processDummy(MyCollisions const&) {}
508553
PROCESS_SWITCH(SingleTrackQC, processDummy, "Dummy function", false);

‎PWGEM/Dilepton/DataModel/dileptonTables.h‎

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -63,43 +63,45 @@ DECLARE_SOA_COLUMN(NInspectedTVX, nInspectedTVX, uint64_t);
6363
DECLARE_SOA_COLUMN(NeeULS, neeuls, int);
6464
DECLARE_SOA_COLUMN(NeeLSpp, neelspp, int);
6565
DECLARE_SOA_COLUMN(NeeLSmm, neelsmm, int);
66-
DECLARE_SOA_COLUMN(Bz, bz, float); //! kG
67-
DECLARE_SOA_COLUMN(Q2xFT0M, q2xft0m, float); //! Qx for 2nd harmonics in FT0M
68-
DECLARE_SOA_COLUMN(Q2yFT0M, q2yft0m, float); //! Qy for 2nd harmonics in FT0M
69-
DECLARE_SOA_COLUMN(Q2xFT0A, q2xft0a, float); //! Qx for 2nd harmonics in FT0A (i.e. positive eta)
70-
DECLARE_SOA_COLUMN(Q2yFT0A, q2yft0a, float); //! Qy for 2nd harmonics in FT0A (i.e. positive eta)
71-
DECLARE_SOA_COLUMN(Q2xFT0C, q2xft0c, float); //! Qx for 2nd harmonics in FT0C (i.e. negative eta)
72-
DECLARE_SOA_COLUMN(Q2yFT0C, q2yft0c, float); //! Qy for 2nd harmonics in FT0C (i.e. negative eta)
73-
DECLARE_SOA_COLUMN(Q2xBPos, q2xbpos, float); //! Qx for 2nd harmonics in Barrel positive eta region
74-
DECLARE_SOA_COLUMN(Q2yBPos, q2ybpos, float); //! Qy for 2nd harmonics in Barrel positive eta region
75-
DECLARE_SOA_COLUMN(Q2xBNeg, q2xbneg, float); //! Qx for 2nd harmonics in Barrel negative eta region
76-
DECLARE_SOA_COLUMN(Q2yBNeg, q2ybneg, float); //! Qy for 2nd harmonics in Barrel negative eta region
77-
DECLARE_SOA_COLUMN(Q2xBTot, q2xbtot, float); //! Qx for 2nd harmonics in Barrel full eta region
78-
DECLARE_SOA_COLUMN(Q2yBTot, q2ybtot, float); //! Qy for 2nd harmonics in Barrel full eta region
79-
DECLARE_SOA_COLUMN(Q3xFT0M, q3xft0m, float); //! Qx for 3rd harmonics in FT0M
80-
DECLARE_SOA_COLUMN(Q3yFT0M, q3yft0m, float); //! Qy for 3rd harmonics in FT0M
81-
DECLARE_SOA_COLUMN(Q3xFT0A, q3xft0a, float); //! Qx for 3rd harmonics in FT0A (i.e. positive eta)
82-
DECLARE_SOA_COLUMN(Q3yFT0A, q3yft0a, float); //! Qy for 3rd harmonics in FT0A (i.e. positive eta)
83-
DECLARE_SOA_COLUMN(Q3xFT0C, q3xft0c, float); //! Qx for 3rd harmonics in FT0C (i.e. negative eta)
84-
DECLARE_SOA_COLUMN(Q3yFT0C, q3yft0c, float); //! Qy for 3rd harmonics in FT0C (i.e. negative eta)
85-
DECLARE_SOA_COLUMN(Q3xBPos, q3xbpos, float); //! Qx for 3rd harmonics in Barrel positive eta region
86-
DECLARE_SOA_COLUMN(Q3yBPos, q3ybpos, float); //! Qy for 3rd harmonics in Barrel positive eta region
87-
DECLARE_SOA_COLUMN(Q3xBNeg, q3xbneg, float); //! Qx for 3rd harmonics in Barrel negative eta region
88-
DECLARE_SOA_COLUMN(Q3yBNeg, q3ybneg, float); //! Qy for 3rd harmonics in Barrel negative eta region
89-
DECLARE_SOA_COLUMN(Q3xBTot, q3xbtot, float); //! Qx for 3rd harmonics in Barrel full eta region
90-
DECLARE_SOA_COLUMN(Q3yBTot, q3ybtot, float); //! Qy for 3rd harmonics in Barrel full eta region
91-
DECLARE_SOA_COLUMN(Q4xFT0M, q4xft0m, float); //! Qx for 4th harmonics in FT0M
92-
DECLARE_SOA_COLUMN(Q4yFT0M, q4yft0m, float); //! Qy for 4th harmonics in FT0M
93-
DECLARE_SOA_COLUMN(Q4xFT0A, q4xft0a, float); //! Qx for 4th harmonics in FT0A (i.e. positive eta)
94-
DECLARE_SOA_COLUMN(Q4yFT0A, q4yft0a, float); //! Qy for 4th harmonics in FT0A (i.e. positive eta)
95-
DECLARE_SOA_COLUMN(Q4xFT0C, q4xft0c, float); //! Qx for 4th harmonics in FT0C (i.e. negative eta)
96-
DECLARE_SOA_COLUMN(Q4yFT0C, q4yft0c, float); //! Qy for 4th harmonics in FT0C (i.e. negative eta)
97-
DECLARE_SOA_COLUMN(Q4xBPos, q4xbpos, float); //! Qx for 4th harmonics in Barrel positive eta region
98-
DECLARE_SOA_COLUMN(Q4yBPos, q4ybpos, float); //! Qy for 4th harmonics in Barrel positive eta region
99-
DECLARE_SOA_COLUMN(Q4xBNeg, q4xbneg, float); //! Qx for 4th harmonics in Barrel negative eta region
100-
DECLARE_SOA_COLUMN(Q4yBNeg, q4ybneg, float); //! Qy for 4th harmonics in Barrel negative eta region
101-
DECLARE_SOA_COLUMN(Q4xBTot, q4xbtot, float); //! Qx for 4th harmonics in Barrel full eta region
102-
DECLARE_SOA_COLUMN(Q4yBTot, q4ybtot, float); //! Qy for 4th harmonics in Barrel full eta region
66+
DECLARE_SOA_COLUMN(Bz, bz, float); //! kG
67+
DECLARE_SOA_COLUMN(Q2xFT0M, q2xft0m, float); //! Qx for 2nd harmonics in FT0M
68+
DECLARE_SOA_COLUMN(Q2yFT0M, q2yft0m, float); //! Qy for 2nd harmonics in FT0M
69+
DECLARE_SOA_COLUMN(Q2xFT0A, q2xft0a, float); //! Qx for 2nd harmonics in FT0A (i.e. positive eta)
70+
DECLARE_SOA_COLUMN(Q2yFT0A, q2yft0a, float); //! Qy for 2nd harmonics in FT0A (i.e. positive eta)
71+
DECLARE_SOA_COLUMN(Q2xFT0C, q2xft0c, float); //! Qx for 2nd harmonics in FT0C (i.e. negative eta)
72+
DECLARE_SOA_COLUMN(Q2yFT0C, q2yft0c, float); //! Qy for 2nd harmonics in FT0C (i.e. negative eta)
73+
DECLARE_SOA_COLUMN(Q2xBPos, q2xbpos, float); //! Qx for 2nd harmonics in Barrel positive eta region
74+
DECLARE_SOA_COLUMN(Q2yBPos, q2ybpos, float); //! Qy for 2nd harmonics in Barrel positive eta region
75+
DECLARE_SOA_COLUMN(Q2xBNeg, q2xbneg, float); //! Qx for 2nd harmonics in Barrel negative eta region
76+
DECLARE_SOA_COLUMN(Q2yBNeg, q2ybneg, float); //! Qy for 2nd harmonics in Barrel negative eta region
77+
DECLARE_SOA_COLUMN(Q2xBTot, q2xbtot, float); //! Qx for 2nd harmonics in Barrel full eta region
78+
DECLARE_SOA_COLUMN(Q2yBTot, q2ybtot, float); //! Qy for 2nd harmonics in Barrel full eta region
79+
DECLARE_SOA_COLUMN(Q3xFT0M, q3xft0m, float); //! Qx for 3rd harmonics in FT0M
80+
DECLARE_SOA_COLUMN(Q3yFT0M, q3yft0m, float); //! Qy for 3rd harmonics in FT0M
81+
DECLARE_SOA_COLUMN(Q3xFT0A, q3xft0a, float); //! Qx for 3rd harmonics in FT0A (i.e. positive eta)
82+
DECLARE_SOA_COLUMN(Q3yFT0A, q3yft0a, float); //! Qy for 3rd harmonics in FT0A (i.e. positive eta)
83+
DECLARE_SOA_COLUMN(Q3xFT0C, q3xft0c, float); //! Qx for 3rd harmonics in FT0C (i.e. negative eta)
84+
DECLARE_SOA_COLUMN(Q3yFT0C, q3yft0c, float); //! Qy for 3rd harmonics in FT0C (i.e. negative eta)
85+
DECLARE_SOA_COLUMN(Q3xBPos, q3xbpos, float); //! Qx for 3rd harmonics in Barrel positive eta region
86+
DECLARE_SOA_COLUMN(Q3yBPos, q3ybpos, float); //! Qy for 3rd harmonics in Barrel positive eta region
87+
DECLARE_SOA_COLUMN(Q3xBNeg, q3xbneg, float); //! Qx for 3rd harmonics in Barrel negative eta region
88+
DECLARE_SOA_COLUMN(Q3yBNeg, q3ybneg, float); //! Qy for 3rd harmonics in Barrel negative eta region
89+
DECLARE_SOA_COLUMN(Q3xBTot, q3xbtot, float); //! Qx for 3rd harmonics in Barrel full eta region
90+
DECLARE_SOA_COLUMN(Q3yBTot, q3ybtot, float); //! Qy for 3rd harmonics in Barrel full eta region
91+
DECLARE_SOA_COLUMN(Q4xFT0M, q4xft0m, float); //! Qx for 4th harmonics in FT0M
92+
DECLARE_SOA_COLUMN(Q4yFT0M, q4yft0m, float); //! Qy for 4th harmonics in FT0M
93+
DECLARE_SOA_COLUMN(Q4xFT0A, q4xft0a, float); //! Qx for 4th harmonics in FT0A (i.e. positive eta)
94+
DECLARE_SOA_COLUMN(Q4yFT0A, q4yft0a, float); //! Qy for 4th harmonics in FT0A (i.e. positive eta)
95+
DECLARE_SOA_COLUMN(Q4xFT0C, q4xft0c, float); //! Qx for 4th harmonics in FT0C (i.e. negative eta)
96+
DECLARE_SOA_COLUMN(Q4yFT0C, q4yft0c, float); //! Qy for 4th harmonics in FT0C (i.e. negative eta)
97+
DECLARE_SOA_COLUMN(Q4xBPos, q4xbpos, float); //! Qx for 4th harmonics in Barrel positive eta region
98+
DECLARE_SOA_COLUMN(Q4yBPos, q4ybpos, float); //! Qy for 4th harmonics in Barrel positive eta region
99+
DECLARE_SOA_COLUMN(Q4xBNeg, q4xbneg, float); //! Qx for 4th harmonics in Barrel negative eta region
100+
DECLARE_SOA_COLUMN(Q4yBNeg, q4ybneg, float); //! Qy for 4th harmonics in Barrel negative eta region
101+
DECLARE_SOA_COLUMN(Q4xBTot, q4xbtot, float); //! Qx for 4th harmonics in Barrel full eta region
102+
DECLARE_SOA_COLUMN(Q4yBTot, q4ybtot, float); //! Qy for 4th harmonics in Barrel full eta region
103+
DECLARE_SOA_COLUMN(Sphericity, sphericity, float); //! transverse sphericity
104+
DECLARE_SOA_COLUMN(Spherocity, spherocity, float); //! transverse spherocity
103105

104106
DECLARE_SOA_DYNAMIC_COLUMN(Sel8, sel8, [](uint64_t selection_bit) -> bool { return (selection_bit & BIT(o2::aod::evsel::kIsTriggerTVX)) && (selection_bit & BIT(o2::aod::evsel::kNoTimeFrameBorder)) && (selection_bit & BIT(o2::aod::evsel::kNoITSROFrameBorder)); });
105107
DECLARE_SOA_DYNAMIC_COLUMN(EP2FT0M, ep2ft0m, [](float q2x, float q2y) -> float { return std::atan2(q2y, q2x) / 2.0; });
@@ -174,10 +176,14 @@ DECLARE_SOA_TABLE(EMEventsQvec, "AOD", "EMEVENTQVEC", //! event q vector table
174176
emevent::EP4BTot<emevent::Q4xBTot, emevent::Q4yBTot>);
175177
using EMEventQvec = EMEventsQvec::iterator;
176178

177-
DECLARE_SOA_TABLE(EMSWTriggerInfos, "AOD", "EMSWTRIGGERINFO", //!
179+
DECLARE_SOA_TABLE(EMSWTriggerInfos, "AOD", "EMSWTRIGGERINFO", //! joinable to EMEvents
178180
emevent::SWTAlias, emevent::NInspectedTVX);
179181
using EMSWTriggerInfo = EMSWTriggerInfos::iterator;
180182

183+
DECLARE_SOA_TABLE(EMEventsProperty, "AOD", "EMEVENTPROP", //! joinable to EMEvents
184+
emevent::Sphericity, emevent::Spherocity);
185+
using EMEventProperty = EMEventsProperty::iterator;
186+
181187
DECLARE_SOA_TABLE(EMEventsNee, "AOD", "EMEVENTNEE", emevent::NeeULS, emevent::NeeLSpp, emevent::NeeLSmm); // joinable to EMEvents
182188
using EMEventNee = EMEventsNee::iterator;
183189

‎PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ struct skimmerPrimaryElectron {
6363
Configurable<bool> skipGRPOquery{"skipGRPOquery", true, "skip grpo query"};
6464
Configurable<bool> enable_swt{"enable_swt", false, "flag to process skimmed data (swt triggered)"};
6565
Configurable<std::string> cfg_swt_names{"cfg_swt_names", "", "comma-separated software trigger names"};
66-
Configurable<bool> force_enable_swt{"force_enable_swt", false, "flag to force process skimmed data (swt triggered)"}; // this is only for non-EM users.
67-
Configurable<std::string> cfg_swt_names_force{"cfg_swt_names_force", "", "comma-separated software trigger names"}; // this is only for non-EM users.
66+
Configurable<bool> inherit_from_emevent_dilepton{"inherit_from_emevent_dilepton", false, "flag to inherit task options from emevent-dilepton"};
6867

6968
// Operation and minimisation criteria
7069
Configurable<bool> fillQAHistogram{"fillQAHistogram", false, "flag to fill QA histograms"};
@@ -112,11 +111,10 @@ struct skimmerPrimaryElectron {
112111
ccdb->setLocalObjectValidityChecking();
113112
ccdb->setFatalWhenNull(false);
114113

115-
getTaskOptionValue(initContext, "create-emevent-dilepton", "enable_swt", enable_swt.value, true); // for EM users.
116-
getTaskOptionValue(initContext, "create-emevent-dilepton", "cfg_swt_names", cfg_swt_names.value, true); // for EM users.
117-
if (force_enable_swt) { // for non-EM users.
118-
enable_swt = force_enable_swt;
119-
cfg_swt_names = cfg_swt_names_force;
114+
if (inherit_from_emevent_dilepton) {
115+
getTaskOptionValue(initContext, "create-emevent-dilepton", "applyEveSel_at_skimming", applyEveSel_at_skimming.value, true); // for EM users.
116+
getTaskOptionValue(initContext, "create-emevent-dilepton", "enable_swt", enable_swt.value, true); // for EM users.
117+
getTaskOptionValue(initContext, "create-emevent-dilepton", "cfg_swt_names", cfg_swt_names.value, true); // for EM users.
120118
}
121119

122120
if (fillQAHistogram) {

‎PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ struct skimmerPrimaryMuon {
8585
Configurable<float> maxRabs{"maxRabs", 89.5, "max. R at absorber end"};
8686
Configurable<bool> enable_swt{"enable_swt", false, "flag to process skimmed data (swt triggered)"};
8787
Configurable<std::string> cfg_swt_names{"cfg_swt_names", "", "comma-separated software trigger names"};
88-
Configurable<bool> force_enable_swt{"force_enable_swt", false, "flag to force process skimmed data (swt triggered)"}; // this is only for non-EM users.
89-
Configurable<std::string> cfg_swt_names_force{"cfg_swt_names_force", "", "comma-separated software trigger names"}; // this is only for non-EM users.
88+
Configurable<bool> inherit_from_emevent_dilepton{"inherit_from_emevent_dilepton", false, "flag to inherit task options from emevent-dilepton"};
9089

9190
Zorro zorro;
9291
o2::ccdb::CcdbApi ccdbApi;
@@ -110,11 +109,10 @@ struct skimmerPrimaryMuon {
110109

111110
mRunNumber = 0;
112111

113-
getTaskOptionValue(initContext, "create-emevent-dilepton", "enable_swt", enable_swt.value, true); // for EM users.
114-
getTaskOptionValue(initContext, "create-emevent-dilepton", "cfg_swt_names", cfg_swt_names.value, true); // for EM users.
115-
if (force_enable_swt) { // for non-EM users.
116-
enable_swt = force_enable_swt;
117-
cfg_swt_names = cfg_swt_names_force;
112+
if (inherit_from_emevent_dilepton) {
113+
getTaskOptionValue(initContext, "create-emevent-dilepton", "applyEveSel_at_skimming", applyEveSel_at_skimming.value, true); // for EM users.
114+
getTaskOptionValue(initContext, "create-emevent-dilepton", "enable_swt", enable_swt.value, true); // for EM users.
115+
getTaskOptionValue(initContext, "create-emevent-dilepton", "cfg_swt_names", cfg_swt_names.value, true); // for EM users.
118116
}
119117
}
120118

‎PWGEM/Dilepton/Utils/EventHistograms.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ void addEventHistograms(HistogramRegistry* fRegistry)
4545
fRegistry->add("Event/before/hCentFT0A", "hCentFT0A;centrality FT0A (%)", kTH1F, {{110, 0, 110}}, false);
4646
fRegistry->add("Event/before/hCentFT0C", "hCentFT0C;centrality FT0C (%)", kTH1F, {{110, 0, 110}}, false);
4747
fRegistry->add("Event/before/hCentFT0M", "hCentFT0M;centrality FT0M (%)", kTH1F, {{110, 0, 110}}, false);
48-
fRegistry->add("Event/before/hCentFT0CvsMultNTracksPV", "hCentFT0CvsMultNTracksPV;centrality FT0C (%);N_{track} to PV", kTH2F, {{110, 0, 110}, {500, 0, 5000}}, false);
49-
fRegistry->add("Event/before/hMultFT0CvsMultNTracksPV", "hMultFT0CvsMultNTracksPV;mult. FT0C;N_{track} to PV", kTH2F, {{60, 0, 60000}, {500, 0, 5000}}, false);
48+
fRegistry->add("Event/before/hCentFT0CvsMultNTracksPV", "hCentFT0CvsMultNTracksPV;centrality FT0C (%);N_{track} to PV", kTH2F, {{110, 0, 110}, {600, 0, 6000}}, false);
49+
fRegistry->add("Event/before/hMultFT0CvsMultNTracksPV", "hMultFT0CvsMultNTracksPV;mult. FT0C;N_{track} to PV", kTH2F, {{60, 0, 60000}, {600, 0, 6000}}, false);
5050
fRegistry->add("Event/before/hMultFT0CvsOccupancy", "hMultFT0CvsOccupancy;mult. FT0C;N_{track} in time range", kTH2F, {{60, 0, 60000}, {2000, 0, 20000}}, false);
5151

5252
if constexpr (nmod == 2) { // Q2

‎PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,9 @@ struct PhotonConversionBuilder {
177177
ccdb->setFatalWhenNull(false);
178178

179179
if (inherit_from_emevent_dilepton) {
180-
getTaskOptionValue(initContext, "create-emevent-dilepton", "enable_swt", enable_swt.value, true); // for EM users.
181-
getTaskOptionValue(initContext, "create-emevent-dilepton", "cfg_swt_names", cfg_swt_names.value, true); // for EM users.
180+
getTaskOptionValue(initContext, "create-emevent-dilepton", "applyEveSel_at_skimming", applyEveSel_at_skimming.value, true); // for EM users.
181+
getTaskOptionValue(initContext, "create-emevent-dilepton", "enable_swt", enable_swt.value, true); // for EM users.
182+
getTaskOptionValue(initContext, "create-emevent-dilepton", "cfg_swt_names", cfg_swt_names.value, true); // for EM users.
182183
}
183184

184185
if (useMatCorrType == 1) {

0 commit comments

Comments
 (0)