Skip to content

Commit 844e750

Browse files
yakparoyakparo
authored
Merge branch 'AliceO2Group:master' into master
2 parents 93b2367 + 8f5d7dc commit 844e750

File tree

305 files changed

+13698
-7967
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+13698
-7967
lines changed

‎.clang-tidy‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ CheckOptions:
44
- { key: readability-identifier-naming.ClassMemberPrefix, value: m }
55
- { key: readability-identifier-naming.ConceptCase, value: CamelCase }
66
- { key: readability-identifier-naming.ConstexprVariableCase, value: CamelCase }
7-
- { key: readability-identifier-naming.ConstexprVariableIgnoredRegexp, value: "^k[A-Z][a-zA-Z0-9]*$" } # Allow "k" prefix.
87
- { key: readability-identifier-naming.EnumCase, value: CamelCase }
98
- { key: readability-identifier-naming.EnumConstantCase, value: CamelCase }
10-
- { key: readability-identifier-naming.EnumConstantIgnoredRegexp, value: "^k?[A-Z][a-zA-Z0-9_]*$" } # Allow "k" prefix and underscores.
9+
- { key: readability-identifier-naming.EnumConstantIgnoredRegexp, value: "^k?[A-Z][a-zA-Z0-9_]*$" } # Allow "k" prefix and non-trailing underscores in PDG names.
1110
- { key: readability-identifier-naming.FunctionCase, value: camelBack }
1211
- { key: readability-identifier-naming.MacroDefinitionCase, value: UPPER_CASE }
1312
- { key: readability-identifier-naming.MacroDefinitionIgnoredRegexp, value: "^[A-Z][A-Z0-9_]*_$" } # Allow the trailing underscore in header guards.

‎.github/workflows/mega-linter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
id: ml
3939
# You can override MegaLinter flavor used to have faster performances
4040
# More info at https://megalinter.io/flavors/
41-
uses: oxsecurity/megalinter@v9.0.1
41+
uses: oxsecurity/megalinter@v9.1.0
4242
env:
4343
# All available variables are described in documentation:
4444
# https://megalinter.io/configuration/
@@ -49,7 +49,7 @@ jobs:
4949

5050
# Upload MegaLinter artifacts
5151
- name: Archive production artifacts
52-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@v5
5353
if: success() || failure()
5454
with:
5555
name: MegaLinter reports

‎Common/Core/TrackSelectorPID.h‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct TrackSelectorPID {
3737
};
3838
};
3939

40-
template <uint64_t pdg = kPiPlus>
40+
template <uint64_t pdg = PDG_t::kPiPlus>
4141
class TrackSelectorPidBase
4242
{
4343
public:
@@ -121,15 +121,15 @@ class TrackSelectorPidBase
121121

122122
// Get nσ for a given particle hypothesis.
123123
double nSigma = 100.;
124-
if constexpr (pdg == kElectron) {
124+
if constexpr (pdg == PDG_t::kElectron) {
125125
nSigma = track.tpcNSigmaEl();
126-
} else if constexpr (pdg == kMuonMinus) {
126+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
127127
nSigma = track.tpcNSigmaMu();
128-
} else if constexpr (pdg == kPiPlus) {
128+
} else if constexpr (pdg == PDG_t::kPiPlus) {
129129
nSigma = track.tpcNSigmaPi();
130-
} else if constexpr (pdg == kKPlus) {
130+
} else if constexpr (pdg == PDG_t::kKPlus) {
131131
nSigma = track.tpcNSigmaKa();
132-
} else if constexpr (pdg == kProton) {
132+
} else if constexpr (pdg == PDG_t::kProton) {
133133
nSigma = track.tpcNSigmaPr();
134134
} else if constexpr (pdg == o2::constants::physics::Pdg::kDeuteron) {
135135
nSigma = track.tpcNSigmaDe();
@@ -217,15 +217,15 @@ class TrackSelectorPidBase
217217

218218
// Get nσ for a given particle hypothesis.
219219
double nSigma = 100.;
220-
if constexpr (pdg == kElectron) {
220+
if constexpr (pdg == PDG_t::kElectron) {
221221
nSigma = track.tofNSigmaEl();
222-
} else if constexpr (pdg == kMuonMinus) {
222+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
223223
nSigma = track.tofNSigmaMu();
224-
} else if constexpr (pdg == kPiPlus) {
224+
} else if constexpr (pdg == PDG_t::kPiPlus) {
225225
nSigma = track.tofNSigmaPi();
226-
} else if constexpr (pdg == kKPlus) {
226+
} else if constexpr (pdg == PDG_t::kKPlus) {
227227
nSigma = track.tofNSigmaKa();
228-
} else if constexpr (pdg == kProton) {
228+
} else if constexpr (pdg == PDG_t::kProton) {
229229
nSigma = track.tofNSigmaPr();
230230
} else if constexpr (pdg == o2::constants::physics::Pdg::kDeuteron) {
231231
nSigma = track.tofNSigmaDe();
@@ -315,15 +315,15 @@ class TrackSelectorPidBase
315315

316316
// Get nσ for a given particle hypothesis.
317317
double nSigma = 100.;
318-
if constexpr (pdg == kElectron) {
318+
if constexpr (pdg == PDG_t::kElectron) {
319319
nSigma = track.rich().richNsigmaEl();
320-
} else if constexpr (pdg == kMuonMinus) {
320+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
321321
nSigma = track.rich().richNsigmaMu();
322-
} else if constexpr (pdg == kPiPlus) {
322+
} else if constexpr (pdg == PDG_t::kPiPlus) {
323323
nSigma = track.rich().richNsigmaPi();
324-
} else if constexpr (pdg == kKPlus) {
324+
} else if constexpr (pdg == PDG_t::kKPlus) {
325325
nSigma = track.rich().richNsigmaKa();
326-
} else if constexpr (pdg == kProton) {
326+
} else if constexpr (pdg == PDG_t::kProton) {
327327
nSigma = track.rich().richNsigmaPr();
328328
} else {
329329
errorPdg();
@@ -364,7 +364,7 @@ class TrackSelectorPidBase
364364
template <typename T>
365365
bool isValidForMid(const T& track)
366366
{
367-
if constexpr (pdg == kMuonMinus) {
367+
if constexpr (pdg == PDG_t::kMuonMinus) {
368368
return track.midId() > -1;
369369
} else {
370370
errorPdg();
@@ -378,7 +378,7 @@ class TrackSelectorPidBase
378378
template <typename T>
379379
bool isSelectedByMid(const T& track)
380380
{
381-
if constexpr (pdg == kMuonMinus) {
381+
if constexpr (pdg == PDG_t::kMuonMinus) {
382382
return track.mid().midIsMuon() == 1; // FIXME: change to return track.midIsMuon() once the column is bool.
383383
} else {
384384
errorPdg();
@@ -392,7 +392,7 @@ class TrackSelectorPidBase
392392
template <typename T>
393393
TrackSelectorPID::Status statusMid(const T& track)
394394
{
395-
if constexpr (pdg == kMuonMinus) {
395+
if constexpr (pdg == PDG_t::kMuonMinus) {
396396
if (!isValidForMid(track)) {
397397
return TrackSelectorPID::NotApplicable;
398398
}
@@ -555,15 +555,15 @@ class TrackSelectorPidBase
555555
bool isSelectedByBayes(const T& track)
556556
{
557557
// Get index of the most probable species for a given track.
558-
if constexpr (pdg == kElectron) {
558+
if constexpr (pdg == PDG_t::kElectron) {
559559
return track.bayesID() == o2::track::PID::Electron;
560-
} else if constexpr (pdg == kMuonMinus) {
560+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
561561
return track.bayesID() == o2::track::PID::Muon;
562-
} else if constexpr (pdg == kPiPlus) {
562+
} else if constexpr (pdg == PDG_t::kPiPlus) {
563563
return track.bayesID() == o2::track::PID::Pion;
564-
} else if constexpr (pdg == kKPlus) {
564+
} else if constexpr (pdg == PDG_t::kKPlus) {
565565
return track.bayesID() == o2::track::PID::Kaon;
566-
} else if constexpr (pdg == kProton) {
566+
} else if constexpr (pdg == PDG_t::kProton) {
567567
return track.bayesID() == o2::track::PID::Proton;
568568
} else if constexpr (pdg == o2::constants::physics::Pdg::kDeuteron) {
569569
return track.bayesID() == o2::track::PID::Deuteron;
@@ -585,15 +585,15 @@ class TrackSelectorPidBase
585585

586586
// Get probability for a given particle hypothesis.
587587
double prob = 0.;
588-
if constexpr (pdg == kElectron) {
588+
if constexpr (pdg == PDG_t::kElectron) {
589589
prob = track.bayesEl();
590-
} else if constexpr (pdg == kMuonMinus) {
590+
} else if constexpr (pdg == PDG_t::kMuonMinus) {
591591
prob = track.bayesMu();
592-
} else if constexpr (pdg == kPiPlus) {
592+
} else if constexpr (pdg == PDG_t::kPiPlus) {
593593
prob = track.bayesPi();
594-
} else if constexpr (pdg == kKPlus) {
594+
} else if constexpr (pdg == PDG_t::kKPlus) {
595595
prob = track.bayesKa();
596-
} else if constexpr (pdg == kProton) {
596+
} else if constexpr (pdg == PDG_t::kProton) {
597597
prob = track.bayesPr();
598598
} else if constexpr (pdg == o2::constants::physics::Pdg::kDeuteron) {
599599
prob = track.bayesDe();
@@ -674,11 +674,11 @@ class TrackSelectorPidBase
674674
};
675675

676676
// Predefined types
677-
using TrackSelectorEl = TrackSelectorPidBase<kElectron>; // El
678-
using TrackSelectorMu = TrackSelectorPidBase<kMuonMinus>; // Mu
679-
using TrackSelectorPi = TrackSelectorPidBase<kPiPlus>; // Pi
680-
using TrackSelectorKa = TrackSelectorPidBase<kKPlus>; // Ka
681-
using TrackSelectorPr = TrackSelectorPidBase<kProton>; // Pr
677+
using TrackSelectorEl = TrackSelectorPidBase<PDG_t::kElectron>; // El
678+
using TrackSelectorMu = TrackSelectorPidBase<PDG_t::kMuonMinus>; // Mu
679+
using TrackSelectorPi = TrackSelectorPidBase<PDG_t::kPiPlus>; // Pi
680+
using TrackSelectorKa = TrackSelectorPidBase<PDG_t::kKPlus>; // Ka
681+
using TrackSelectorPr = TrackSelectorPidBase<PDG_t::kProton>; // Pr
682682
using TrackSelectorDe = TrackSelectorPidBase<o2::constants::physics::Pdg::kDeuteron>; // De
683683

684684
#endif // COMMON_CORE_TRACKSELECTORPID_H_

‎Common/DataModel/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ o2physics_add_header_only_library(DataModel
2727
MatchMFTFT0.h
2828
MftmchMatchingML.h
2929
ZDCExtra.h
30+
ZDCLightIons.h
3031
EseTable.h
3132
FwdTrackReAlignTables.h)

‎Common/DataModel/ZDCLightIons.h‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
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.
4+
//
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".
7+
//
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
10+
// or submit itself to any jurisdiction.
11+
12+
/// \file ZDCLightIons.h
13+
/// \brief ZDC data model for O-O Ne-Ne and p-O collisions
14+
/// \author Chiara Oppedisano <chiara.oppedisano@cern.ch>
15+
16+
#ifndef PWGMM_DATAMODEL_ZDCLIGHTIONS_H_
17+
#define PWGMM_DATAMODEL_ZDCLIGHTIONS_H_
18+
19+
#include "Common/DataModel/Centrality.h"
20+
21+
#include "Framework/ASoAHelpers.h"
22+
#include "Framework/AnalysisDataModel.h"
23+
24+
namespace o2::aod
25+
{
26+
namespace zdclightions
27+
{
28+
DECLARE_SOA_COLUMN(ZnaTdc, znaTdc, float); //! TDC ZNA
29+
DECLARE_SOA_COLUMN(ZnaAmpl, znaAmpl, float); //! amplitude ZNA
30+
DECLARE_SOA_COLUMN(ZnaPmc, znaPmc, float); //! ADC PmC ZNA
31+
DECLARE_SOA_COLUMN(ZnaPm1, znaPm1, float); //! ADC PmQ1 ZNA
32+
DECLARE_SOA_COLUMN(ZnaPm2, znaPm2, float); //! ADC PmQ2 ZNA
33+
DECLARE_SOA_COLUMN(ZnaPm3, znaPm3, float); //! ADC PmQ3 ZNA
34+
DECLARE_SOA_COLUMN(ZnaPm4, znaPm4, float); //! ADC PmQ4 ZNA
35+
DECLARE_SOA_COLUMN(ZncTdc, zncTdc, float); //! TDC ZNC
36+
DECLARE_SOA_COLUMN(ZncAmpl, zncAmpl, float); //! amplitude ZNC
37+
DECLARE_SOA_COLUMN(ZncPmc, zncPmc, float); //! ADC PmC ZNC
38+
DECLARE_SOA_COLUMN(ZncPm1, zncPm1, float); //! ADC PmQ1 ZNC
39+
DECLARE_SOA_COLUMN(ZncPm2, zncPm2, float); //! ADC PmQ2 ZNC
40+
DECLARE_SOA_COLUMN(ZncPm3, zncPm3, float); //! ADC PmQ3 ZNC
41+
DECLARE_SOA_COLUMN(ZncPm4, zncPm4, float); //! ADC PmQ4 ZNC
42+
DECLARE_SOA_COLUMN(ZpaTdc, zpaTdc, float); //! TDC ZPA
43+
DECLARE_SOA_COLUMN(ZpaAmpl, zpaAmpl, float); //! amplitude ZPA
44+
DECLARE_SOA_COLUMN(ZpaPmc, zpaPmc, float); //! ADC PmC ZPA
45+
DECLARE_SOA_COLUMN(ZpcTdc, zpcTdc, float); //! TDC ZPC
46+
DECLARE_SOA_COLUMN(ZpcAmpl, zpcAmpl, float); //! amplitude ZPA
47+
DECLARE_SOA_COLUMN(ZpcPmc, zpcPmc, float); //! ADC PmC ZPA
48+
DECLARE_SOA_COLUMN(Zem1Tdc, zem1Tdc, float); //! TDC ZEM1
49+
DECLARE_SOA_COLUMN(Zem1Ampl, zem1Ampl, float); //! amplitude ZEM1
50+
DECLARE_SOA_COLUMN(Zem2Tdc, zem2Tdc, float); //! TDC ZEM2
51+
DECLARE_SOA_COLUMN(Zem2Ampl, zem2Ampl, float); //! amplitude ZEM2
52+
DECLARE_SOA_COLUMN(MultFt0a, multFt0a, float); //! mult. FIT-A
53+
DECLARE_SOA_COLUMN(MultFt0c, multFt0c, float); //! mult. FIT-C
54+
DECLARE_SOA_COLUMN(MultV0a, multV0a, float); //! mult. V0-A
55+
DECLARE_SOA_COLUMN(VertexZ, vertexZ, float); //! Z vertex
56+
DECLARE_SOA_COLUMN(CentralityFt0c, centralityFt0c, float); //! Centrality
57+
DECLARE_SOA_COLUMN(CentralityFt0a, centralityFt0a, float); //! Centrality
58+
DECLARE_SOA_COLUMN(CentralityFt0m, centralityFt0m, float); //! Centrality
59+
DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t); //! Timestamp
60+
DECLARE_SOA_COLUMN(SelectionBits, selectionBits, uint8_t); //! Selection Flags
61+
} // namespace zdclightions
62+
63+
DECLARE_SOA_TABLE(ZDCLightIons, "AOD", "ZDCTABLELIGHTIONS",
64+
zdclightions::ZnaTdc,
65+
zdclightions::ZnaAmpl,
66+
zdclightions::ZnaPmc,
67+
zdclightions::ZnaPm1,
68+
zdclightions::ZnaPm2,
69+
zdclightions::ZnaPm3,
70+
zdclightions::ZnaPm4,
71+
zdclightions::ZncTdc,
72+
zdclightions::ZncAmpl,
73+
zdclightions::ZncPmc,
74+
zdclightions::ZncPm1,
75+
zdclightions::ZncPm2,
76+
zdclightions::ZncPm3,
77+
zdclightions::ZncPm4,
78+
zdclightions::ZpaTdc,
79+
zdclightions::ZpaAmpl,
80+
zdclightions::ZpcTdc,
81+
zdclightions::ZpcAmpl,
82+
zdclightions::Zem1Tdc,
83+
zdclightions::Zem1Ampl,
84+
zdclightions::Zem2Tdc,
85+
zdclightions::Zem2Ampl,
86+
zdclightions::MultFt0a,
87+
zdclightions::MultFt0c,
88+
zdclightions::MultV0a,
89+
zdclightions::VertexZ,
90+
zdclightions::CentralityFt0c,
91+
zdclightions::CentralityFt0a,
92+
zdclightions::CentralityFt0m,
93+
zdclightions::Timestamp,
94+
zdclightions::SelectionBits);
95+
} // namespace o2::aod
96+
97+
#endif // COMMON_DATAMODEL_ZDCLIGHTIONS_H_

‎Common/TableProducer/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,8 @@ o2physics_add_dpl_workflow(selectionstudytable
182182
SOURCES selectionStudyTable.cxx
183183
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
184184
COMPONENT_NAME Analysis)
185+
186+
o2physics_add_dpl_workflow(zdc-task-light-ions
187+
SOURCES zdcTaskLightIons.cxx
188+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
189+
COMPONENT_NAME Analysis)

‎Common/TableProducer/centralityTable.cxx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ struct CentralityTable {
116116
Configurable<bool> embedINELgtZEROselection{"embedINELgtZEROselection", false, {"Option to do percentile 100.5 if not INELgtZERO"}};
117117
Configurable<bool> produceHistograms{"produceHistograms", false, {"Option to produce debug histograms"}};
118118
ConfigurableAxis binsPercentile{"binsPercentile", {VARIABLE_WIDTH, 0, 0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01, 0.011, 0.012, 0.013, 0.014, 0.015, 0.016, 0.017, 0.018, 0.019, 0.02, 0.021, 0.022, 0.023, 0.024, 0.025, 0.026, 0.027, 0.028, 0.029, 0.03, 0.031, 0.032, 0.033, 0.034, 0.035, 0.036, 0.037, 0.038, 0.039, 0.04, 0.041, 0.042, 0.043, 0.044, 0.045, 0.046, 0.047, 0.048, 0.049, 0.05, 0.051, 0.052, 0.053, 0.054, 0.055, 0.056, 0.057, 0.058, 0.059, 0.06, 0.061, 0.062, 0.063, 0.064, 0.065, 0.066, 0.067, 0.068, 0.069, 0.07, 0.071, 0.072, 0.073, 0.074, 0.075, 0.076, 0.077, 0.078, 0.079, 0.08, 0.081, 0.082, 0.083, 0.084, 0.085, 0.086, 0.087, 0.088, 0.089, 0.09, 0.091, 0.092, 0.093, 0.094, 0.095, 0.096, 0.097, 0.098, 0.099, 0.1, 0.11, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.2, 0.21, 0.22, 0.23, 0.24, 0.25, 0.26, 0.27, 0.28, 0.29, 0.3, 0.31, 0.32, 0.33, 0.34, 0.35, 0.36, 0.37, 0.38, 0.39, 0.4, 0.41, 0.42, 0.43, 0.44, 0.45, 0.46, 0.47, 0.48, 0.49, 0.5, 0.51, 0.52, 0.53, 0.54, 0.55, 0.56, 0.57, 0.58, 0.59, 0.6, 0.61, 0.62, 0.63, 0.64, 0.65, 0.66, 0.67, 0.68, 0.69, 0.7, 0.71, 0.72, 0.73, 0.74, 0.75, 0.76, 0.77, 0.78, 0.79, 0.8, 0.81, 0.82, 0.83, 0.84, 0.85, 0.86, 0.87, 0.88, 0.89, 0.9, 0.91, 0.92, 0.93, 0.94, 0.95, 0.96, 0.97, 0.98, 0.99, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 5.0, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.1, 6.2, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 6.9, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5, 8.6, 8.7, 8.8, 8.9, 9.0, 9.1, 9.2, 9.3, 9.4, 9.5, 9.6, 9.7, 9.8, 9.9, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 23.0, 24.0, 25.0, 26.0, 27.0, 28.0, 29.0, 30.0, 31.0, 32.0, 33.0, 34.0, 35.0, 36.0, 37.0, 38.0, 39.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0, 49.0, 50.0, 51.0, 52.0, 53.0, 54.0, 55.0, 56.0, 57.0, 58.0, 59.0, 60.0, 61.0, 62.0, 63.0, 64.0, 65.0, 66.0, 67.0, 68.0, 69.0, 70.0, 71.0, 72.0, 73.0, 74.0, 75.0, 76.0, 77.0, 78.0, 79.0, 80.0, 81.0, 82.0, 83.0, 84.0, 85.0, 86.0, 87.0, 88.0, 89.0, 90.0, 91.0, 92.0, 93.0, 94.0, 95.0, 96.0, 97.0, 98.0, 99.0, 100.0}, "Binning of the percentile axis"};
119+
ConfigurableAxis binsPVcontr{"binsPVcontr", {100, 0.f, 100.f}, "PV mult."};
119120

120121
int mRunNumber;
121122
struct TagRun2V0MCalibration {
@@ -254,16 +255,16 @@ struct CentralityTable {
254255
}
255256

256257
histos.add("FT0M/percentile", "FT0M percentile.", HistType::kTH1D, {{binsPercentile, "FT0M percentile"}});
257-
histos.add("FT0M/percentilevsPV", "percentile vs PV mult.", HistType::kTH2D, {{binsPercentile, "FT0M percentile"}, {100, 0, 100, "PV mult."}});
258-
histos.add("FT0M/MultvsPV", "FT0M mult. vs PV mult.", HistType::kTH2D, {{1000, 0, 5000, "FT0M mult."}, {100, 0, 100, "PV mult."}});
258+
histos.add("FT0M/percentilevsPV", "percentile vs PV mult.", HistType::kTH2D, {{binsPercentile, "FT0M percentile"}, {binsPVcontr, "PV mult."}});
259+
histos.add("FT0M/MultvsPV", "FT0M mult. vs PV mult.", HistType::kTH2D, {{1000, 0, 5000, "FT0M mult."}, {binsPVcontr, "PV mult."}});
259260

260261
histos.add("FT0A/percentile", "FT0A percentile.", HistType::kTH1D, {{binsPercentile, "FT0A percentile"}});
261-
histos.add("FT0A/percentilevsPV", "percentile vs PV mult.", HistType::kTH2D, {{binsPercentile, "FT0A percentile"}, {100, 0, 100, "PV mult."}});
262-
histos.add("FT0A/MultvsPV", "FT0A mult. vs PV mult.", HistType::kTH2D, {{1000, 0, 5000, "FT0A mult."}, {100, 0, 100, "PV mult."}});
262+
histos.add("FT0A/percentilevsPV", "percentile vs PV mult.", HistType::kTH2D, {{binsPercentile, "FT0A percentile"}, {binsPVcontr, "PV mult."}});
263+
histos.add("FT0A/MultvsPV", "FT0A mult. vs PV mult.", HistType::kTH2D, {{1000, 0, 5000, "FT0A mult."}, {binsPVcontr, "PV mult."}});
263264

264265
histos.add("FT0C/percentile", "FT0C percentile.", HistType::kTH1D, {{binsPercentile, "FT0C percentile"}});
265-
histos.add("FT0C/percentilevsPV", "percentile vs PV mult.", HistType::kTH2D, {{binsPercentile, "FT0C percentile"}, {100, 0, 100, "PV mult."}});
266-
histos.add("FT0C/MultvsPV", "FT0C mult. vs PV mult.", HistType::kTH2D, {{1000, 0, 5000, "FT0C mult."}, {100, 0, 100, "PV mult."}});
266+
histos.add("FT0C/percentilevsPV", "percentile vs PV mult.", HistType::kTH2D, {{binsPercentile, "FT0C percentile"}, {binsPVcontr, "PV mult."}});
267+
histos.add("FT0C/MultvsPV", "FT0C mult. vs PV mult.", HistType::kTH2D, {{1000, 0, 5000, "FT0C mult."}, {binsPVcontr, "PV mult."}});
267268

268269
histos.addClone("FT0M/", "sel8FT0M/");
269270
histos.addClone("FT0C/", "sel8FT0C/");

0 commit comments

Comments
 (0)