From ba52b887a72f7fe4b1ed2fd86f906fff5553e65e Mon Sep 17 00:00:00 2001 From: Laura Gansbartl Date: Wed, 5 Aug 2026 11:46:29 +0200 Subject: [PATCH 1/3] Fix MegaLinter and CodeCheck --- .../skimmerPrimaryElectronFromDalitzEE.cxx | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx index cdedb5d5f4a..955de0b01f7 100644 --- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx +++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx @@ -22,6 +22,7 @@ #include "Common/DataModel/PIDResponseTPC.h" #include "Common/DataModel/TrackSelectionTables.h" +#include "PID/PIDTOFParamService.h" #include #include #include @@ -32,13 +33,14 @@ #include #include #include +#include #include -#include #include #include #include #include #include +#include #include // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h) #include @@ -216,11 +218,11 @@ struct skimmerPrimaryElectronFromDalitzEE { fRegistry.add("Pair/uls/hMCutMvsPt", "m_{ee} vs. p_{T,ee};m_{ee} (GeV/c^{2});p_{T,ee} (GeV/c)", kTH2F, {{100, 0, 0.1}, {200, 0, 2}}, false); fRegistry.add("Pair/uls/hMPhiCutMvsPt", "m_{ee} vs. p_{T,ee};m_{ee} (GeV/c^{2});p_{T,ee} (GeV/c)", kTH2F, {{100, 0, 0.1}, {200, 0, 2}}, false); - fRegistry.add("Pair/uls/hTrackMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, M_PI}, {100, 0, 0.1}}, false); - fRegistry.add("Pair/uls/hCheckEMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, M_PI}, {100, 0, 0.1}}, false); - fRegistry.add("Pair/uls/hMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, M_PI}, {100, 0, 0.1}}, false); - fRegistry.add("Pair/uls/hMCutMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, M_PI}, {100, 0, 0.1}}, false); - fRegistry.add("Pair/uls/hMPhiCutMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, M_PI}, {100, 0, 0.1}}, false); + fRegistry.add("Pair/uls/hTrackMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, o2::constants::math::PI}, {100, 0, 0.1}}, false); + fRegistry.add("Pair/uls/hCheckEMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, o2::constants::math::PI}, {100, 0, 0.1}}, false); + fRegistry.add("Pair/uls/hMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, o2::constants::math::PI}, {100, 0, 0.1}}, false); + fRegistry.add("Pair/uls/hMCutMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, o2::constants::math::PI}, {100, 0, 0.1}}, false); + fRegistry.add("Pair/uls/hMPhiCutMvsPhiV", "m_{ee} vs. #varphi_{V};#varphi_{V} (rad.);m_{ee} (GeV/c^{2})", kTH2F, {{180, 0, o2::constants::math::PI}, {100, 0, 0.1}}, false); fRegistry.addClone("Pair/uls/", "Pair/lspp/"); fRegistry.addClone("Pair/uls/", "Pair/lsmm/"); @@ -377,7 +379,7 @@ struct skimmerPrimaryElectronFromDalitzEE { return false; } - if (!includeITSsa && (!track.hasITS() || !track.hasTPC())) { + if (!includeITSsa && !track.hasTPC()) { return false; } @@ -698,7 +700,6 @@ struct skimmerPrimaryElectronFromDalitzEE { std::vector acceptedPosTrackIds_per_collision; std::vector acceptedNegTrackIds_per_collision; std::vector acceptedTrackIds_per_collision; - std::vector> stored_trackIds; // Filter trackFilter = minpt < o2::aod::track::pt && nabs(o2::aod::track::eta) < maxeta && o2::aod::track::itsChi2NCl < maxchi2its && ncheckbit(aod::track::v001::detectorMap, (uint8_t)o2::aod::track::ITS) == true && nabs(o2::aod::track::dcaXY) < dca_xy_max && nabs(o2::aod::track::dcaZ) < dca_z_max; // Filter trackFilter // using MyFilteredTracks = soa::Filtered; @@ -718,11 +719,8 @@ struct skimmerPrimaryElectronFromDalitzEE { mTOFResponse->processSetup(bcs.iteratorAt(0)); for (const auto& track : tracks) { - if (mapCollisionTime.find(track.collisionId()) == mapCollisionTime.end()) { - // LOGF(info, "track.collisionId() = %d, track.tofEvTime() = %f, track.tofEvTimeErr() = %f", track.collisionId(), track.tofEvTime(), track.tofEvTimeErr()); - mapCollisionTime[track.collisionId()] = track.tofEvTime(); - mapCollisionTimeError[track.collisionId()] = track.tofEvTimeErr(); - } + mapCollisionTime.try_emplace(track.collisionId(), track.tofEvTime()); + mapCollisionTimeError.try_emplace(track.collisionId(), track.tofEvTimeErr()); } calculateTOFNSigmaWithReassociation(collisions, bcs, tracks, trackIndices); @@ -772,11 +770,8 @@ struct skimmerPrimaryElectronFromDalitzEE { // mTOFResponse->processSetup(bcs.iteratorAt(0)); // for (const auto& track : tracks) { - // if (mapCollisionTime.find(track.collisionId()) == mapCollisionTime.end()) { - // // LOGF(info, "track.collisionId() = %d, track.tofEvTime() = %f, track.tofEvTimeErr() = %f", track.collisionId(), track.tofEvTime(), track.tofEvTimeErr()); - // mapCollisionTime[track.collisionId()] = track.tofEvTime(); - // mapCollisionTimeError[track.collisionId()] = track.tofEvTimeErr(); - // } + // mapCollisionTime.try_emplace(track.collisionId(), track.tofEvTime()); + // mapCollisionTimeError.try_emplace(track.collisionId(), track.tofEvTimeErr()); // } // calculateTOFNSigmaWithReassociation(collisions, bcs, tracks, trackIndices); @@ -840,11 +835,8 @@ struct skimmerPrimaryElectronFromDalitzEE { mTOFResponse->processSetup(bcs.iteratorAt(0)); for (const auto& track : tracks) { - if (mapCollisionTime.find(track.collisionId()) == mapCollisionTime.end()) { - // LOGF(info, "track.collisionId() = %d, track.tofEvTime() = %f, track.tofEvTimeErr() = %f", track.collisionId(), track.tofEvTime(), track.tofEvTimeErr()); - mapCollisionTime[track.collisionId()] = track.tofEvTime(); - mapCollisionTimeError[track.collisionId()] = track.tofEvTimeErr(); - } + mapCollisionTime.try_emplace(track.collisionId(), track.tofEvTime()); + mapCollisionTimeError.try_emplace(track.collisionId(), track.tofEvTimeErr()); } calculateTOFNSigmaWithReassociation(collisions, bcs, tracks, trackIndices); From 56e9bc78f7735315b8ab0aac53db5afbe56f6915 Mon Sep 17 00:00:00 2001 From: Laura Gansbartl Date: Wed, 5 Aug 2026 13:18:02 +0200 Subject: [PATCH 2/3] Fix CodeChecker --- .../TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx index 955de0b01f7..f5c08cca355 100644 --- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx +++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx @@ -41,6 +41,7 @@ #include #include #include +#include #include // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h) #include @@ -96,7 +97,7 @@ struct skimmerPrimaryElectronFromDalitzEE { Preslice trackIndicesPerCollision = aod::track_association::collisionId; Produces emprimaryelectrons; Produces emprimaryelectronsDeDxMC; - Service mTOFResponse; + Service mTOFResponse{}; Produces emtofs; @@ -290,7 +291,7 @@ struct skimmerPrimaryElectronFromDalitzEE { if (track.hasTOF() && track.has_collision()) { // TTCA may use orphan tracks. auto bcTrack = track.template collision_as().template bc_as(); float tofNSigmaEl = mTOFResponse->nSigma(track.tofSignalInAnotherBC(bcTrack.globalBC(), bcCollision.globalBC()), track.tofExpMom(), track.length(), track.p(), track.eta(), mapCollisionTime[collision.globalIndex()], mapCollisionTimeError[collision.globalIndex()]); - float beta = track.length() / (track.tofSignalInAnotherBC(bcTrack.globalBC(), bcCollision.globalBC()) - mapCollisionTime[collision.globalIndex()]) / (TMath::C() * 1e+2 * 1e-12); + float beta = track.length() / (track.tofSignalInAnotherBC(bcTrack.globalBC(), bcCollision.globalBC()) - mapCollisionTime[collision.globalIndex()]) / (o2::constants::physics::LightSpeedCm2S * 1e-12); mapTOFNsigmaReassociated[std::make_pair(collision.globalIndex(), track.globalIndex())] = tofNSigmaEl; mapTOFBetaReassociated[std::make_pair(collision.globalIndex(), track.globalIndex())] = beta; emtofs(collision.globalIndex(), track.globalIndex(), mapTOFBetaReassociated[std::make_pair(collision.globalIndex(), track.globalIndex())], mapTOFNsigmaReassociated[std::make_pair(collision.globalIndex(), track.globalIndex())]); From 0b633e91093c422d617363d7d51c497ffc21ee37 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 5 Aug 2026 12:29:25 +0000 Subject: [PATCH 3/3] Please consider the following formatting changes --- .../TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx index f5c08cca355..fb843adc325 100644 --- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx +++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx @@ -22,7 +22,6 @@ #include "Common/DataModel/PIDResponseTPC.h" #include "Common/DataModel/TrackSelectionTables.h" -#include "PID/PIDTOFParamService.h" #include #include #include @@ -40,6 +39,7 @@ #include #include #include +#include #include #include