Skip to content

Commit 4082306

Browse files
dsekihatdsekihat
authored
[PWGEM/Dilepton] bug fix in dimuon analyses (#10700)
1 parent 40a5cda commit 4082306

File tree

4 files changed

+6
-97
lines changed

4 files changed

+6
-97
lines changed

‎PWGEM/Dilepton/Core/Dilepton.h‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
#include "Framework/ASoAHelpers.h"
3535
#include "Common/Core/RecoDecay.h"
3636
#include "Common/Core/trackUtilities.h"
37-
#include "DCAFitter/DCAFitterN.h"
38-
#include "DCAFitter/FwdDCAFitterN.h"
3937
#include "CommonConstants/LHCConstants.h"
4038
#include "DataFormatsParameters/GRPLHCIFData.h"
4139
#include "DataFormatsParameters/GRPECSObject.h"
@@ -282,8 +280,6 @@ struct Dilepton {
282280
Service<o2::ccdb::BasicCCDBManager> ccdb;
283281
int mRunNumber;
284282
float d_bz;
285-
// o2::vertexing::DCAFitterN<2> fitter;
286-
// o2::vertexing::FwdDCAFitterN<2> fwdfitter;
287283
o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
288284

289285
HistogramRegistry fRegistry{"output", {}, OutputObjHandlingPolicy::AnalysisObject, false, false};
@@ -396,26 +392,10 @@ struct Dilepton {
396392
DefineDielectronCut();
397393
leptonM1 = o2::constants::physics::MassElectron;
398394
leptonM2 = o2::constants::physics::MassElectron;
399-
// fitter.setPropagateToPCA(true);
400-
// fitter.setMaxR(5.f);
401-
// fitter.setMinParamChange(1e-3);
402-
// fitter.setMinRelChi2Change(0.9);
403-
// fitter.setMaxDZIni(1e9);
404-
// fitter.setMaxChi2(1e9);
405-
// fitter.setUseAbsDCA(true);
406-
// fitter.setWeightedFinalPCA(false);
407-
// fitter.setMatCorrType(matCorr);
408395
} else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
409396
DefineDimuonCut();
410397
leptonM1 = o2::constants::physics::MassMuon;
411398
leptonM2 = o2::constants::physics::MassMuon;
412-
// fwdfitter.setPropagateToPCA(true);
413-
// fwdfitter.setMaxR(90.f);
414-
// fwdfitter.setMinParamChange(1e-3);
415-
// fwdfitter.setMinRelChi2Change(0.9);
416-
// fwdfitter.setMaxChi2(1e9);
417-
// fwdfitter.setUseAbsDCA(true);
418-
// fwdfitter.setTGeoMat(false);
419399
}
420400

421401
fRegistry.add("Pair/mix/hDiffBC", "diff. global BC in mixed event;|BC_{current} - BC_{mixed}|", kTH1D, {{10001, -0.5, 10000.5}}, true);
@@ -444,8 +424,6 @@ struct Dilepton {
444424
}
445425
o2::base::Propagator::initFieldFromGRP(&grpmag);
446426
mRunNumber = collision.runNumber();
447-
// fitter.setBz(d_bz);
448-
// fwdfitter.setBz(d_bz);
449427
return;
450428
}
451429

@@ -470,8 +448,6 @@ struct Dilepton {
470448
LOG(info) << "Retrieved GRP for timestamp " << run3grp_timestamp << " with magnetic field of " << d_bz << " kZG";
471449
}
472450
mRunNumber = collision.runNumber();
473-
// fitter.setBz(d_bz);
474-
// fwdfitter.setBz(d_bz);
475451

476452
auto grplhcif = ccdb->getForTimeStamp<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", collision.timestamp());
477453
int beamZ1 = grplhcif->getBeamZ(o2::constants::lhc::BeamC);
@@ -746,7 +722,7 @@ struct Dilepton {
746722
fDimuonCut.SetTrackType(dimuoncuts.cfg_track_type);
747723
fDimuonCut.SetTrackPtRange(dimuoncuts.cfg_min_pt_track, dimuoncuts.cfg_max_pt_track);
748724
fDimuonCut.SetTrackEtaRange(dimuoncuts.cfg_min_eta_track, dimuoncuts.cfg_max_eta_track);
749-
fDimuonCut.SetTrackEtaRange(dimuoncuts.cfg_min_phi_track, dimuoncuts.cfg_max_phi_track);
725+
fDimuonCut.SetTrackPhiRange(dimuoncuts.cfg_min_phi_track, dimuoncuts.cfg_max_phi_track);
750726
fDimuonCut.SetNClustersMFT(dimuoncuts.cfg_min_ncluster_mft, 10);
751727
fDimuonCut.SetNClustersMCHMID(dimuoncuts.cfg_min_ncluster_mch, 16);
752728
fDimuonCut.SetChi2(0.f, dimuoncuts.cfg_max_chi2);
@@ -834,7 +810,7 @@ struct Dilepton {
834810
}
835811
}
836812
} else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
837-
if (!cut.template IsSelectedTrack(t1) || !cut.template IsSelectedTrack(t2)) {
813+
if (!cut.template IsSelectedTrack<false>(t1) || !cut.template IsSelectedTrack<false>(t2)) {
838814
return false;
839815
}
840816
}
@@ -850,10 +826,6 @@ struct Dilepton {
850826
}
851827
}
852828

853-
// float pca = 999.f, lxy = 999.f; // in unit of cm
854-
// o2::aod::pwgem::dilepton::utils::pairutil::isSVFound(fitter, collision, t1, t2, pca, lxy);
855-
// o2::aod::pwgem::dilepton::utils::pairutil::isSVFoundFwd(fwdfitter, collision, t1, t2, pca, lxy);
856-
857829
float weight = 1.f;
858830
if (cfgApplyWeightTTCA) {
859831
weight = map_weight[std::make_pair(t1.globalIndex(), t2.globalIndex())];

‎PWGEM/Dilepton/Core/DileptonMC.h‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040

4141
#include "Common/Core/RecoDecay.h"
4242
#include "Common/Core/trackUtilities.h"
43-
#include "DCAFitter/DCAFitterN.h"
44-
#include "DCAFitter/FwdDCAFitterN.h"
4543

4644
#include "PWGEM/Dilepton/DataModel/dileptonTables.h"
4745
#include "PWGEM/Dilepton/Core/DielectronCut.h"
@@ -272,8 +270,6 @@ struct DileptonMC {
272270

273271
o2::ccdb::CcdbApi ccdbApi;
274272
Service<o2::ccdb::BasicCCDBManager> ccdb;
275-
// o2::vertexing::DCAFitterN<2> fitter;
276-
// o2::vertexing::FwdDCAFitterN<2> fwdfitter;
277273
o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
278274
int mRunNumber;
279275
float d_bz;
@@ -506,27 +502,11 @@ struct DileptonMC {
506502
leptonM1 = o2::constants::physics::MassElectron;
507503
leptonM2 = o2::constants::physics::MassElectron;
508504
pdg_lepton = 11;
509-
// fitter.setPropagateToPCA(true);
510-
// fitter.setMaxR(5.f);
511-
// fitter.setMinParamChange(1e-3);
512-
// fitter.setMinRelChi2Change(0.9);
513-
// fitter.setMaxDZIni(1e9);
514-
// fitter.setMaxChi2(1e9);
515-
// fitter.setUseAbsDCA(true);
516-
// fitter.setWeightedFinalPCA(false);
517-
// fitter.setMatCorrType(matCorr);
518505
} else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
519506
DefineDimuonCut();
520507
leptonM1 = o2::constants::physics::MassMuon;
521508
leptonM2 = o2::constants::physics::MassMuon;
522509
pdg_lepton = 13;
523-
// fwdfitter.setPropagateToPCA(true);
524-
// fwdfitter.setMaxR(90.f);
525-
// fwdfitter.setMinParamChange(1e-3);
526-
// fwdfitter.setMinRelChi2Change(0.9);
527-
// fwdfitter.setMaxChi2(1e9);
528-
// fwdfitter.setUseAbsDCA(true);
529-
// fwdfitter.setTGeoMat(false);
530510
}
531511
if (doprocessNorm) {
532512
fRegistry.addClone("Event/before/hCollisionCounter", "Event/norm/hCollisionCounter");
@@ -549,8 +529,6 @@ struct DileptonMC {
549529
}
550530
o2::base::Propagator::initFieldFromGRP(&grpmag);
551531
mRunNumber = collision.runNumber();
552-
// fitter.setBz(d_bz);
553-
// fwdfitter.setBz(d_bz);
554532
return;
555533
}
556534

@@ -575,8 +553,6 @@ struct DileptonMC {
575553
LOG(info) << "Retrieved GRP for timestamp " << run3grp_timestamp << " with magnetic field of " << d_bz << " kZG";
576554
}
577555
mRunNumber = collision.runNumber();
578-
// fitter.setBz(d_bz);
579-
// fwdfitter.setBz(d_bz);
580556

581557
//// for muon
582558
// o2::base::Propagator::initFieldFromGRP(grpmag);
@@ -818,8 +794,6 @@ struct DileptonMC {
818794
}
819795
}
820796

821-
// float pca = 999.f, lxy = 999.f; // in unit of cm
822-
// o2::aod::pwgem::dilepton::utils::pairutil::isSVFound(fitter, collision, t1, t2, pca, lxy);
823797
float pt1 = 0.f, eta1 = 0.f, phi1 = 0.f, pt2 = 0.f, eta2 = 0.f, phi2 = 0.f;
824798
if constexpr (isSmeared) {
825799
if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {

‎PWGEM/Dilepton/Core/DimuonCut.h‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -158,43 +158,6 @@ class DimuonCut : public TNamed
158158
return true;
159159
}
160160

161-
// template <typename TTrack>
162-
// bool IsSelectedTrackWoPtEta(TTrack const& track) const
163-
// {
164-
// if (!IsSelectedTrack(track, DimuonCuts::kTrackType)) {
165-
// return false;
166-
// }
167-
// if (!IsSelectedTrack(track, DimuonCuts::kTrackPhiRange)) {
168-
// return false;
169-
// }
170-
// if (!IsSelectedTrack(track, DimuonCuts::kDCAxy)) {
171-
// return false;
172-
// }
173-
// if (track.trackType() == static_cast<uint8_t>(o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack) && !IsSelectedTrack(track, DimuonCuts::kMFTNCls)) {
174-
// return false;
175-
// }
176-
// if (!IsSelectedTrack(track, DimuonCuts::kMCHMIDNCls)) {
177-
// return false;
178-
// }
179-
// if (!IsSelectedTrack(track, DimuonCuts::kChi2)) {
180-
// return false;
181-
// }
182-
// if (track.trackType() == static_cast<uint8_t>(o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack) && !IsSelectedTrack(track, DimuonCuts::kMatchingChi2MCHMFT)) {
183-
// return false;
184-
// }
185-
// if (!IsSelectedTrack(track, DimuonCuts::kMatchingChi2MCHMID)) {
186-
// return false;
187-
// }
188-
// if (!IsSelectedTrack(track, DimuonCuts::kPDCA)) {
189-
// return false;
190-
// }
191-
// if (!IsSelectedTrack(track, DimuonCuts::kRabs)) {
192-
// return false;
193-
// }
194-
//
195-
// return true;
196-
// }
197-
198161
template <typename T>
199162
bool IsSelectedTrack(T const& track, const DimuonCuts& cut) const
200163
{

‎PWGEM/Dilepton/Tasks/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,22 @@ o2physics_add_dpl_workflow(single-muon-qc-mc
8888

8989
o2physics_add_dpl_workflow(dielectron
9090
SOURCES dielectron.cxx
91-
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::MLCore O2::DCAFitter O2Physics::PWGEMDileptonCore
91+
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::MLCore O2Physics::PWGEMDileptonCore
9292
COMPONENT_NAME Analysis)
9393

9494
o2physics_add_dpl_workflow(dielectron-mc
9595
SOURCES dielectronMC.cxx
96-
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::MLCore O2::DCAFitter O2Physics::PWGEMDileptonCore
96+
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::MLCore O2Physics::PWGEMDileptonCore
9797
COMPONENT_NAME Analysis)
9898

9999
o2physics_add_dpl_workflow(dimuon
100100
SOURCES dimuon.cxx
101-
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2::DCAFitter O2Physics::PWGEMDileptonCore
101+
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::PWGEMDileptonCore
102102
COMPONENT_NAME Analysis)
103103

104104
o2physics_add_dpl_workflow(dimuon-mc
105105
SOURCES dimuonMC.cxx
106-
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2::DCAFitter O2Physics::PWGEMDileptonCore
106+
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::PWGEMDileptonCore
107107
COMPONENT_NAME Analysis)
108108

109109
o2physics_add_dpl_workflow(photon-hbt-pcmpcm

0 commit comments

Comments
 (0)