Skip to content

Commit 8ca985e

Browse files
committed
Fix linter warnings
1 parent c9e2123 commit 8ca985e

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

PWGUD/TableProducer/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ o2physics_add_dpl_workflow(tau-three-prong-event-table-producer
6262
COMPONENT_NAME Analysis)
6363

6464
o2physics_add_dpl_workflow(upccand-producer-muon
65-
SOURCES UPCCandidateProducerMuon.cxx
65+
SOURCES upccandProducerMuon.cxx
6666
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::UPCCutparHolder O2::GlobalTracking
6767
COMPONENT_NAME Analysis)

PWGUD/TableProducer/fwdTrackPropagation.cxx

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,27 @@
1212
/// \author Diana Krupova, diana.krupova@cern.ch
1313
/// \since 04.06.2024
1414

15-
#include "Framework/AnalysisDataModel.h"
16-
#include "Framework/AnalysisTask.h"
17-
#include "Framework/runDataProcessing.h"
15+
#include "PWGUD/DataModel/UDTables.h"
1816

1917
#include "CCDB/BasicCCDBManager.h"
2018
#include "DataFormatsParameters/GRPMagField.h"
21-
#include "TGeoGlobalMagField.h"
22-
#include "Field/MagneticField.h"
2319
#include "DetectorsBase/Propagator.h"
20+
#include "Field/MagneticField.h"
21+
#include "Framework/AnalysisDataModel.h"
22+
#include "Framework/AnalysisTask.h"
23+
#include "Framework/DataTypes.h"
24+
#include "Framework/runDataProcessing.h"
2425
#include "GlobalTracking/MatchGlobalFwd.h"
2526
#include "MCHTracking/TrackExtrap.h"
2627
#include "MCHTracking/TrackParam.h"
27-
#include "Math/SMatrix.h"
2828
#include "ReconstructionDataFormats/TrackFwd.h"
2929

30-
#include "PWGUD/DataModel/UDTables.h"
30+
#include "Math/SMatrix.h"
31+
#include "TGeoGlobalMagField.h"
3132

3233
using namespace o2::framework;
3334
using namespace o2::framework::expressions;
35+
using o2::aod::fwdtrack::ForwardTrackTypeEnum;
3436

3537
struct FwdTrackPropagation {
3638
using ForwardTracks = o2::soa::Join<o2::aod::FwdTracks, o2::aod::FwdTracksCov>;
@@ -67,7 +69,7 @@ struct FwdTrackPropagation {
6769
SMatrix55 tcovs(v1.begin(), v1.end());
6870
o2::dataformats::GlobalFwdTrack propmuon;
6971

70-
if (static_cast<int>(muon.trackType()) > 2) {
72+
if (muon.trackType() > ForwardTrackTypeEnum::GlobalForwardTrack) { // tracks without MFT
7173
o2::dataformats::GlobalFwdTrack track;
7274
track.setParameters(tpars);
7375
track.setZ(muon.z());
@@ -78,7 +80,7 @@ struct FwdTrackPropagation {
7880
propmuon.setParameters(proptrack.getParameters());
7981
propmuon.setZ(proptrack.getZ());
8082
propmuon.setCovariances(proptrack.getCovariances());
81-
} else if (static_cast<int>(muon.trackType()) < 2) {
83+
} else if (muon.trackType() <= ForwardTrackTypeEnum::GlobalForwardTrack) { // tracks with MFT
8284
double centerMFT[3] = {0, 0, -61.4};
8385
o2::track::TrackParCovFwd fwdtrack{muon.z(), tpars, tcovs, chi2};
8486
auto* field = dynamic_cast<o2::field::MagneticField*>(TGeoGlobalMagField::Instance()->GetField());
@@ -112,11 +114,12 @@ struct FwdTrackPropagation {
112114
propFwdTracks.reserve(fwdTracks.size());
113115
propFwdTracksCov.reserve(fwdTracks.size());
114116

117+
constexpr float zAbsorberFront = -90.f;
115118
for (const auto& t : fwdTracks) {
116-
if (t.z() < -90.f) {
119+
if (t.z() < zAbsorberFront) {
117120
std::array<float, 3> vtx = {0.f, 0.f, 0.f};
118121
std::array<float, 2> vtxCov = {0.f, 0.f};
119-
if (t.has_collision() && static_cast<int>(t.trackType()) < 2) { // propagate only global muon tracks to collision vtx
122+
if (t.has_collision() && t.trackType() < ForwardTrackTypeEnum::GlobalForwardTrack) { // propagate only global muon tracks to collision vtx
120123
auto col = cols.iteratorAt(t.collisionId());
121124
vtx[0] = col.posX();
122125
vtx[1] = col.posY();

PWGUD/TableProducer/UPCCandidateProducerMuon.cxx renamed to PWGUD/TableProducer/upccandProducerMuon.cxx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
#include "PWGUD/Core/UPCHelpers.h"
1414
#include "PWGUD/DataModel/UDTables.h"
1515

16-
#include "Framework/AnalysisDataModel.h"
17-
#include "Framework/AnalysisTask.h"
18-
#include "Framework/runDataProcessing.h"
19-
2016
#include "CCDB/BasicCCDBManager.h"
2117
#include "CommonConstants/LHCConstants.h"
2218
#include "DataFormatsParameters/GRPMagField.h"
2319
#include "DetectorsBase/Propagator.h"
2420
#include "Field/MagneticField.h"
21+
#include "Framework/AnalysisDataModel.h"
22+
#include "Framework/AnalysisTask.h"
23+
#include "Framework/runDataProcessing.h"
2524
#include "GlobalTracking/MatchGlobalFwd.h"
2625
#include "MCHTracking/TrackExtrap.h"
2726
#include "ReconstructionDataFormats/TrackFwd.h"
@@ -426,9 +425,9 @@ struct UpcCandProducerMuon {
426425
auto trackId = fwdTrack.globalIndex();
427426
int64_t indexBC = vAmbFwdTrackIndex[trackId] < 0 ? vColIndexBCs[fwdTrack.collisionId()] : vAmbFwdTrackIndexBCs[vAmbFwdTrackIndex[trackId]];
428427
auto globalBC = vGlobalBCs[indexBC] + TMath::FloorNint(fwdTrack.trackTime() / o2::constants::lhc::LHCBunchSpacingNS + 1.);
429-
if (fwdTrack.trackType() == MuonStandaloneTrack)
428+
if (fwdTrack.trackType() == MuonStandaloneTrack) // MCH-MID
430429
mapGlobalBcsWithMCHMIDTrackIds[globalBC].push_back(trackId);
431-
if (fwdTrack.trackType() == MCHStandaloneTrack)
430+
if (fwdTrack.trackType() == MCHStandaloneTrack) // MCH-only
432431
mapGlobalBcsWithMCHTrackIds[globalBC].push_back(trackId);
433432
}
434433

0 commit comments

Comments
 (0)