Skip to content

Commit f7f1685

Browse files
author
Stefanie Mrozinski
committed
fix code-checker + CMake
1 parent fe9c954 commit f7f1685

5 files changed

Lines changed: 17 additions & 9 deletions

File tree

PWGEM/PhotonMeson/Tasks/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,11 @@ o2physics_add_dpl_workflow(emcal-mc-task
196196
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGEMPhotonMesonCore
197197
COMPONENT_NAME Analysis)
198198

199+
o2physics_add_dpl_workflow(event-normalization-task
200+
SOURCES eventNormalizationTask.cxx
201+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
202+
COMPONENT_NAME Analysis)
203+
199204
o2physics_add_dpl_workflow(pair-qc-task
200205
SOURCES pairQcTask.cxx
201206
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::PWGEMPhotonMesonCore

PWGEM/PhotonMeson/Tasks/pairQcTask.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,28 @@
3131
#include <CommonConstants/PhysicsConstants.h>
3232
#include <DataFormatsParameters/GRPMagField.h>
3333
#include <Framework/ASoA.h>
34-
#include <Framework/ASoAHelpers.h>
3534
#include <Framework/AnalysisDataModel.h>
35+
#include <Framework/AnalysisHelpers.h>
3636
#include <Framework/AnalysisTask.h>
3737
#include <Framework/Configurable.h>
3838
#include <Framework/HistogramRegistry.h>
3939
#include <Framework/HistogramSpec.h>
4040
#include <Framework/InitContext.h>
4141
#include <Framework/Logger.h>
42+
#include <Framework/OutputObjHeader.h>
4243
#include <Framework/runDataProcessing.h>
43-
#include <MathUtils/Utils.h>
4444

4545
#include <Math/Vector3D.h> // IWYU pragma: keep
4646
#include <Math/Vector3Dfwd.h>
4747
#include <Math/Vector4D.h> // IWYU pragma: keep
4848
#include <Math/Vector4Dfwd.h>
4949
#include <TH1.h>
50-
#include <TH2.h>
5150
#include <TPDGCode.h>
5251

5352
#include <algorithm>
5453
#include <array>
5554
#include <cmath>
55+
#include <cstddef>
5656
#include <cstdint>
5757
#include <functional>
5858
#include <string>

PWGEM/PhotonMeson/Utils/AnalyticV0.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <CommonConstants/MathConstants.h>
2424
#include <DCAFitter/DCAFitterN.h>
25-
#include <MathUtils/Utils.h>
25+
#include <MathUtils/Cartesian.h>
2626
#include <ReconstructionDataFormats/HelixHelper.h>
2727
#include <ReconstructionDataFormats/Track.h>
2828

@@ -44,7 +44,7 @@ inline o2::track::TrackParCov trackFromLeg(LegParam const& leg)
4444
std::array<float, 21> cov{}; // o2-linter: disable=magic-number (lab-frame covariance has 21 elements)
4545
cov[0] = cov[2] = cov[5] = 0.01f; // o2-linter: disable=magic-number (placeholder sigma_xyz = 0.1 cm)
4646
cov[9] = cov[14] = cov[20] = 1e-4f; // o2-linter: disable=magic-number (placeholder sigma_p = 0.01 GeV/c)
47-
return o2::track::TrackParCov(leg.xyz, leg.mom, cov, leg.charge, true);
47+
return {leg.xyz, leg.mom, cov, leg.charge, true};
4848
}
4949

5050
inline std::array<float, 3> getPropMomentumFromTrackHelix(const float s, const o2::track::TrackParCov& track,
@@ -57,7 +57,7 @@ inline std::array<float, 3> getPropMomentumFromTrackHelix(const float s, const o
5757
if (dotProd < 0.f) {
5858
addPhi -= o2::constants::math::PI;
5959
}
60-
const float phi = RecoDecay::constrainAngle<float>(phi0 + dphi + addPhi);
60+
const auto phi = RecoDecay::constrainAngle<float>(phi0 + dphi + addPhi);
6161
return {std::cos(phi) * pt, std::sin(phi) * pt, track.getTgl() * pt};
6262
}
6363

@@ -126,7 +126,7 @@ inline AnalyticV0 buildAnalyticV0(LegParam const& pos, LegParam const& neg, floa
126126
const float r1 = h1.rC, r2 = h2.rC;
127127

128128
int nCand = 0;
129-
float c1x[2], c1y[2], c2x[2], c2y[2];
129+
std::array<float, 2> c1x{}, c1y{}, c2x{}, c2y{};
130130
float pcaXY = 0.f;
131131
if (d > r1 + r2) { // external gap: tangent points along the centre line
132132
c1x[0] = h1.xC + r1 * ux;

PWGEM/PhotonMeson/Utils/MCUtilities.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <cmath>
3131
#include <cstdint>
3232
#include <cstdlib>
33-
#include <ranges>
33+
#include <iterator>
3434
#include <vector>
3535

3636
//_______________________________________________________________________
@@ -838,7 +838,7 @@ inline MotherCensus censusMothers(std::array<int, 4> const& motherPhotonIds)
838838
const auto& mp = motherPhotonIds;
839839
MotherCensus c;
840840
for (int i = 0; i < kNLegs; ++i) {
841-
const size_t ui = static_cast<size_t>(i);
841+
const auto ui = static_cast<size_t>(i);
842842
if (mp[ui] < 0) {
843843
continue;
844844
}

PWGEM/PhotonMeson/Utils/PairUtilities.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@
2222

2323
#include <Math/GenVector/Boost.h>
2424
#include <Math/Vector3D.h>
25+
#include <Math/Vector3Dfwd.h>
2526
#include <Math/Vector4D.h>
27+
#include <Math/Vector4Dfwd.h>
2628

2729
#include <algorithm>
2830
#include <array>
2931
#include <cmath>
32+
#include <cstddef>
3033
#include <cstdint>
3134

3235
namespace o2::aod::pwgem::photonmeson::utils::pairutil

0 commit comments

Comments
 (0)