Skip to content

Commit dc36a2c

Browse files
axti98axti98
committed
Fix linter issues in GlobalTrack estimator
1 parent 1339f2b commit dc36a2c

2 files changed

Lines changed: 61 additions & 33 deletions

File tree

‎PWGDQ/TableProducer/CMakeLists.txt‎

Lines changed: 54 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,58 @@
1-
#Copyright 2019 - 2020 CERN and copyright holders of ALICE O2.
2-
#See https: // alice-o2.web.cern.ch/copyright for details of the copyright holders.
3-
#All rights not expressly granted are reserved.
1+
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
# All rights not expressly granted are reserved.
44
#
5-
#This software is distributed under the terms of the GNU General Public
6-
#License v3(GPL Version 3), copied verbatim in the file "COPYING".
5+
# This software is distributed under the terms of the GNU General Public
6+
# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
77
#
8-
#In applying this license CERN does not waive the privileges and immunities
9-
#granted to it by virtue of its status as an Intergovernmental Organization
8+
# In applying this license CERN does not waive the privileges and immunities
9+
# granted to it by virtue of its status as an Intergovernmental Organization
1010
# or submit itself to any jurisdiction.
1111

12-
o2physics_add_dpl_workflow(table - maker
13-
SOURCES tableMaker.cxx
14-
REUSE_FROM DQAnalysisPCH
15-
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::EventFilteringUtils
16-
COMPONENT_NAME Analysis)
17-
18-
o2physics_add_dpl_workflow(table - maker - with - assoc SOURCES tableMaker_withAssoc.cxx REUSE_FROM DQAnalysisPCH PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::EventFilteringUtils COMPONENT_NAME Analysis)
19-
20-
o2physics_add_dpl_workflow(table - maker - mc SOURCES tableMakerMC.cxx REUSE_FROM DQAnalysisPCH PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore COMPONENT_NAME Analysis)
21-
22-
o2physics_add_dpl_workflow(table - maker - mc - with - assoc SOURCES tableMakerMC_withAssoc.cxx REUSE_FROM DQAnalysisPCH PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore COMPONENT_NAME Analysis)
23-
24-
o2physics_add_dpl_workflow(table - maker - jpsi - hf SOURCES tableMakerJpsiHf.cxx REUSE_FROM DQAnalysisPCH PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGDQCore COMPONENT_NAME Analysis)
25-
26-
o2physics_add_dpl_workflow(table - maker - muon - mch - trk - eff SOURCES tableMakerMuonMchTrkEfficiency.cxx REUSE_FROM DQAnalysisPCH PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGDQCore COMPONENT_NAME Analysis)
27-
28-
o2physics_add_dpl_workflow(generated - quarkonia - mc SOURCES generatedQuarkoniaMC.cxx REUSE_FROM DQAnalysisPCH PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsBase O2Physics::PWGDQCore COMPONENT_NAME Analysis)
29-
30-
o2physics_add_dpl_workflow(global - track - estimator SOURCES globalTrackEstimator.cxx REUSE_FROM DQAnalysisPCH PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsBase O2Physics::PWGDQCore COMPONENT_NAME Analysis)
12+
o2physics_add_dpl_workflow(table-maker
13+
SOURCES tableMaker.cxx
14+
REUSE_FROM DQAnalysisPCH
15+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::EventFilteringUtils
16+
COMPONENT_NAME Analysis)
17+
18+
o2physics_add_dpl_workflow(table-maker-with-assoc
19+
SOURCES tableMaker_withAssoc.cxx
20+
REUSE_FROM DQAnalysisPCH
21+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::EventFilteringUtils
22+
COMPONENT_NAME Analysis)
23+
24+
o2physics_add_dpl_workflow(table-maker-mc
25+
SOURCES tableMakerMC.cxx
26+
REUSE_FROM DQAnalysisPCH
27+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore
28+
COMPONENT_NAME Analysis)
29+
30+
o2physics_add_dpl_workflow(table-maker-mc-with-assoc
31+
SOURCES tableMakerMC_withAssoc.cxx
32+
REUSE_FROM DQAnalysisPCH
33+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore
34+
COMPONENT_NAME Analysis)
35+
36+
o2physics_add_dpl_workflow(table-maker-jpsi-hf
37+
SOURCES tableMakerJpsiHf.cxx
38+
REUSE_FROM DQAnalysisPCH
39+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGDQCore
40+
COMPONENT_NAME Analysis)
41+
42+
o2physics_add_dpl_workflow(table-maker-muon-mch-trk-eff
43+
SOURCES tableMakerMuonMchTrkEfficiency.cxx
44+
REUSE_FROM DQAnalysisPCH
45+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGDQCore
46+
COMPONENT_NAME Analysis)
47+
48+
o2physics_add_dpl_workflow(generated-quarkonia-mc
49+
SOURCES generatedQuarkoniaMC.cxx
50+
REUSE_FROM DQAnalysisPCH
51+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsBase O2Physics::PWGDQCore
52+
COMPONENT_NAME Analysis)
53+
54+
o2physics_add_dpl_workflow(global-track-estimator
55+
SOURCES globalTrackEstimator.cxx
56+
REUSE_FROM DQAnalysisPCH
57+
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsBase O2Physics::PWGDQCore
58+
COMPONENT_NAME Analysis)

‎PWGDQ/TableProducer/globalTrackEstimator.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
// In applying this license CERN does not waive the privileges and immunities
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
11+
//
1112
/// \author Alexander Tiekoetter <alexander.tiekoetter@cern.ch>, Muenster
12-
/// \brief Global Track estimator with track-to-collision association, supposed
13-
/// to run on the DQ datamodel
13+
/// \brief Global Track estimator with track-to-collision association
1414
/// \file globalTrackEstimator.cxx
1515

1616
#include "PWGDQ/Core/AnalysisCompositeCut.h"
@@ -40,8 +40,8 @@ using namespace o2::aod;
4040
using MyEventsBasic = o2::soa::Join<o2::aod::ReducedEvents, o2::aod::ReducedEventsExtended>;
4141
using MyBarrelTracks = o2::soa::Join<o2::aod::ReducedTracks, o2::aod::ReducedTracksBarrel, o2::aod::ReducedTracksBarrelCov, o2::aod::ReducedTracksBarrelPID>;
4242

43-
constexpr static uint32_t gkEventFillMap = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended;
44-
constexpr static uint32_t gkTrackFillMap = VarManager::ObjTypes::ReducedTrackBarrel | VarManager::ObjTypes::ReducedTrackBarrelCov;
43+
constexpr static uint32_t GkEventFillMap = VarManager::ObjTypes::ReducedEvent | VarManager::ObjTypes::ReducedEventExtended;
44+
constexpr static uint32_t GkTrackFillMap = VarManager::ObjTypes::ReducedTrackBarrel | VarManager::ObjTypes::ReducedTrackBarrelCov;
4545

4646
struct GlobalTrackEstimator {
4747
Produces<o2::aod::ReducedEventsGlobalTrk> reducedEventsGlobalTrk;
@@ -91,7 +91,7 @@ struct GlobalTrackEstimator {
9191

9292
for (const auto& event : events) {
9393
VarManager::ResetValues(0, VarManager::kNBarrelTrackVariables);
94-
VarManager::FillEvent<gkEventFillMap>(event);
94+
VarManager::FillEvent<GkEventFillMap>(event);
9595

9696
auto groupedAssocs = assocs.sliceBy(preslice, event.globalIndex());
9797

@@ -104,8 +104,8 @@ struct GlobalTrackEstimator {
104104

105105
auto track = assoc.template reducedtrack_as<o2::soa::Filtered<MyBarrelTracks>>();
106106

107-
VarManager::FillTrack<gkTrackFillMap>(track);
108-
VarManager::FillTrackCollision<gkTrackFillMap>(track, event);
107+
VarManager::FillTrack<GkTrackFillMap>(track);
108+
VarManager::FillTrackCollision<GkTrackFillMap>(track, event);
109109

110110
const int nFindable = track.tpcNClsFindable();
111111
const int nCrossedRows = track.tpcNClsCrossedRows();

0 commit comments

Comments
 (0)