Skip to content

Commit 2e2f535

Browse files
author
Laura Gansbartl
committed
Fix
1 parent c1faef8 commit 2e2f535

1 file changed

Lines changed: 27 additions & 26 deletions

File tree

‎PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,18 @@ enum AlphaMesonCutOption {
7575

7676
template <o2::aod::pwgem::photonmeson::photonpair::PairType pairtype, o2::soa::is_table... Types>
7777
struct Pi0EtaToGammaGammaMC {
78-
o2::framework::Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
78+
o2::framework::Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
7979
o2::framework::Configurable<std::string> grpPath{"grpPath", "GLO/GRP/GRP", "Path of the grp file"};
8080
o2::framework::Configurable<std::string> grpmagPath{"grpmagPath", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object"};
8181
o2::framework::Configurable<bool> skipGRPOquery{"skipGRPOquery", true, "skip grpo query"};
82-
o2::framework::Configurable<float> d_bz_input{"d_bz_input", -999, "bz field in kG, -999 is automatic"};
82+
o2::framework::Configurable<float> dBzInput{"dBzInput", -999, "bz field in kG, -999 is automatic"};
8383

8484
o2::framework::Configurable<int> cfgQvecEstimator{"cfgQvecEstimator", 0, "FT0M:0, FT0A:1, FT0C:2"};
8585
o2::framework::Configurable<int> cfgCentEstimator{"cfgCentEstimator", 2, "FT0M:0, FT0A:1, FT0C:2"};
8686
o2::framework::Configurable<float> cfgCentMin{"cfgCentMin", -1, "min. centrality"};
8787
o2::framework::Configurable<float> cfgCentMax{"cfgCentMax", 999, "max. centrality"};
88-
o2::framework::Configurable<float> maxY_rec{"maxY_rec", 0.9, "maximum rapidity for reconstructed particles"};
89-
o2::framework::Configurable<std::string> fd_k0s_to_pi0{"fd_k0s_pi0", "1.0", "feed down correction to pi0"};
88+
o2::framework::Configurable<float> maxYRec{"maxYRec", 0.9, "maximum rapidity for reconstructed particles"};
89+
o2::framework::Configurable<std::string> fdK0sToPi0{"fdK0sPi0", "1.0", "feed down correction to pi0"};
9090
o2::framework::Configurable<bool> cfgRequireTrueAssociation{"cfgRequireTrueAssociation", false, "flag to require true mc collision association"};
9191

9292
o2::framework::Configurable<int> cfgAlphaMesonCut{"cfgAlphaMesonCut", 0, "flag for photon energy asymmetry distribution cut: 0: no cut, 1: cut specific value, 2: cut depending on pT"};
@@ -226,7 +226,7 @@ struct Pi0EtaToGammaGammaMC {
226226
o2::framework::Configurable<float> cfg_min_Ecluster{"cfg_min_Ecluster", 0.3, "Minimum cluster energy for PHOS in GeV"};
227227
} phoscuts;
228228

229-
TF1* f1fd_k0s_to_pi0;
229+
TF1* f1fdK0sToPi0;
230230
o2::framework::HistogramRegistry fRegistry{"output", {}, o2::framework::OutputObjHandlingPolicy::AnalysisObject, false, false};
231231
// static constexpr std::string_view event_types[2] = {"before/", "after/"};
232232
// static constexpr std::string_view event_pair_types[2] = {"same/", "mix/"};
@@ -251,7 +251,7 @@ struct Pi0EtaToGammaGammaMC {
251251
DefineEMCCut();
252252
DefinePHOSCut();
253253

254-
f1fd_k0s_to_pi0 = new TF1("f1fd_k0s_to_pi0", TString(fd_k0s_to_pi0), 0.f, 100.f);
254+
f1fdK0sToPi0 = new TF1("f1fdK0sToPi0", TString(fdK0sToPi0), 0.f, 100.f);
255255

256256
fRegistry.add("Event/hNrecPerMCCollision", "Nrec per mc collision;N_{rec} collisions per MC collision", o2::framework::HistType::kTH1F, {{21, -0.5f, 20.5f}}, false);
257257
if (cfgGGContaCheck) {
@@ -264,7 +264,7 @@ struct Pi0EtaToGammaGammaMC {
264264
mRunNumber = 0;
265265
d_bz = 0;
266266

267-
ccdb->setURL(ccdburl);
267+
ccdb->setURL(ccdbUrl);
268268
ccdb->setCaching(true);
269269
ccdb->setLocalObjectValidityChecking();
270270
ccdb->setFatalWhenNull(false);
@@ -279,10 +279,11 @@ struct Pi0EtaToGammaGammaMC {
279279

280280
// In case override, don't proceed, please - no CCDB access required
281281
constexpr float bzInput = -990.0f;
282-
if (d_bz_input > bzInput) {
283-
d_bz = d_bz_input;
282+
if (dBzInput > bzInput) {
283+
d_bz = dBzInput;
284284
o2::parameters::GRPMagField grpmag;
285-
if (std::fabs(d_bz) > 1e-5) {
285+
float bzThreshold = 1e-5;
286+
if (std::fabs(d_bz) > bzThreshold) {
286287
grpmag.setL3Current(30000.f / (d_bz / 5.0f));
287288
}
288289
mRunNumber = collision.runNumber();
@@ -313,8 +314,8 @@ struct Pi0EtaToGammaGammaMC {
313314

314315
~Pi0EtaToGammaGammaMC()
315316
{
316-
delete f1fd_k0s_to_pi0;
317-
f1fd_k0s_to_pi0 = 0x0;
317+
delete f1fdK0sToPi0;
318+
f1fdK0sToPi0 = 0x0;
318319
}
319320

320321
void DefineEMEventCut()
@@ -368,7 +369,7 @@ struct Pi0EtaToGammaGammaMC {
368369
fV0PhotonCut.SetLoadMlModelsFromCCDB(pcmcuts.cfg_load_ml_models_from_ccdb);
369370
fV0PhotonCut.SetNClassesMl(pcmcuts.cfg_nclasses_ml);
370371
fV0PhotonCut.SetMlTimestampCCDB(pcmcuts.cfg_timestamp_ccdb);
371-
fV0PhotonCut.SetCcdbUrl(ccdburl);
372+
fV0PhotonCut.SetCcdbUrl(ccdbUrl);
372373
CentType mCentralityTypeMlEnum;
373374
mCentralityTypeMlEnum = static_cast<CentType>(cfgCentEstimator.value);
374375
fV0PhotonCut.SetCentralityTypeMl(mCentralityTypeMlEnum);
@@ -690,7 +691,7 @@ struct Pi0EtaToGammaGammaMC {
690691
ROOT::Math::PtEtaPhiMVector v1(g1.pt(), g1.eta(), g1.phi(), 0.);
691692
ROOT::Math::PtEtaPhiMVector v2(g2.pt(), g2.eta(), g2.phi(), 0.);
692693
ROOT::Math::PtEtaPhiMVector v12 = v1 + v2;
693-
if (std::fabs(v12.Rapidity()) > maxY_rec) {
694+
if (std::fabs(v12.Rapidity()) > maxYRec) {
694695
continue;
695696
}
696697

@@ -742,13 +743,13 @@ struct Pi0EtaToGammaGammaMC {
742743
if (cfgRequireTrueAssociation && (pi0mc.emmceventId() != collision.emmceventId())) {
743744
continue;
744745
}
745-
o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, v12, pi0mc, mcparticles, mccollisions, f1fd_k0s_to_pi0, wpair);
746+
o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, v12, pi0mc, mcparticles, mccollisions, f1fdK0sToPi0, wpair);
746747
} else if (etaid > 0) {
747748
auto etamc = mcparticles.iteratorAt(etaid);
748749
if (cfgRequireTrueAssociation && (etamc.emmceventId() != collision.emmceventId())) {
749750
continue;
750751
}
751-
o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, v12, etamc, mcparticles, mccollisions, f1fd_k0s_to_pi0, wpair);
752+
o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, v12, etamc, mcparticles, mccollisions, f1fdK0sToPi0, wpair);
752753
}
753754
} // end of pairing loop
754755
} else if constexpr (pairtype == o2::aod::pwgem::photonmeson::photonpair::PairType::kPCMDalitzEE) {
@@ -829,7 +830,7 @@ struct Pi0EtaToGammaGammaMC {
829830
ROOT::Math::PtEtaPhiMVector v_pos(pos2.pt(), pos2.eta(), pos2.phi(), o2::constants::physics::MassElectron);
830831
ROOT::Math::PtEtaPhiMVector v_ele(ele2.pt(), ele2.eta(), ele2.phi(), o2::constants::physics::MassElectron);
831832
ROOT::Math::PtEtaPhiMVector veeg = v_gamma + v_pos + v_ele;
832-
if (std::fabs(veeg.Rapidity()) > maxY_rec) {
833+
if (std::fabs(veeg.Rapidity()) > maxYRec) {
833834
continue;
834835
}
835836
if (pi0id > 0) {
@@ -838,17 +839,17 @@ struct Pi0EtaToGammaGammaMC {
838839
if (cfgRequireTrueAssociation && (pi0mc.emmceventId() != collision.emmceventId())) {
839840
continue;
840841
}
841-
o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, veeg, pi0mc, mcparticles, mccollisions, f1fd_k0s_to_pi0, weight);
842+
o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, veeg, pi0mc, mcparticles, mccollisions, f1fdK0sToPi0, weight);
842843
} else if (etaid > 0) {
843844
auto etamc = mcparticles.iteratorAt(etaid);
844845
fRegistry.fill(HIST("Event/hNDalitzEtaPt"), etamc.pt());
845846
if (cfgRequireTrueAssociation && (etamc.emmceventId() != collision.emmceventId())) {
846847
continue;
847848
}
848-
o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, veeg, etamc, mcparticles, mccollisions, f1fd_k0s_to_pi0, weight);
849+
o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, veeg, etamc, mcparticles, mccollisions, f1fdK0sToPi0, weight);
849850
}
850-
} // end of dielectron loop
851-
} // end of pcm loop
851+
} // end of dielectron loop
852+
} // end of pcm loop
852853
} else { // PCM-EMC, PCM-PHOS.
853854
// TODO: implement proper functionality if we ever want to run this in Pb-Pb
854855
auto photons1_per_collision = photons1.sliceByCached(TDetectorTag1::perCollision(), collision.globalIndex(), cache);
@@ -884,19 +885,19 @@ struct Pi0EtaToGammaGammaMC {
884885
ROOT::Math::PtEtaPhiMVector v1(g1.pt(), g1.eta(), g1.phi(), 0.);
885886
ROOT::Math::PtEtaPhiMVector v2(g2.pt(), g2.eta(), g2.phi(), 0.);
886887
ROOT::Math::PtEtaPhiMVector v12 = v1 + v2;
887-
if (std::fabs(v12.Rapidity()) > maxY_rec) {
888+
if (std::fabs(v12.Rapidity()) > maxYRec) {
888889
continue;
889890
}
890891
// if (pi0id > 0) {
891892
// auto pi0mc = mcparticles.iteratorAt(pi0id);
892-
// o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, v12, pi0mc, mcparticles, mccollisions, f1fd_k0s_to_pi0, weight);
893+
// o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, v12, pi0mc, mcparticles, mccollisions, f1fdK0sToPi0, weight);
893894
// } else if (etaid > 0) {
894895
// auto etamc = mcparticles.iteratorAt(etaid);
895-
// o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, v12, etamc, mcparticles, mccollisions, f1fd_k0s_to_pi0, weight);
896+
// o2::aod::pwgem::photonmeson::utils::nmhistogram::fillTruePairInfo(&fRegistry, v12, etamc, mcparticles, mccollisions, f1fdK0sToPi0, weight);
896897
// }
897898
} // end of pairing loop
898-
} // end of pairing in same event
899-
} // end of collision loop
899+
} // end of pairing in same event
900+
} // end of collision loop
900901
}
901902

902903
template <int par_id, typename TBinnedData>

0 commit comments

Comments
 (0)