Skip to content

Commit 6fee238

Browse files
authored
Merge branch 'master' into pcmtreat3
2 parents 98f723f + ee90738 commit 6fee238

File tree

117 files changed

+12071
-5015
lines changed

Some content is hidden

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

117 files changed

+12071
-5015
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
# Dependabot configuration
3+
# Reference: https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
4+
5+
version: 2
6+
updates:
7+
- package-ecosystem: "github-actions" # See documentation for possible values
8+
directory: "/" # Location of package manifests
9+
schedule:
10+
interval: "weekly"

.github/workflows/mega-linter.yml

Lines changed: 1 addition & 1 deletion
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@v8.4.2
41+
uses: oxsecurity/megalinter@v8.5.0
4242
env:
4343
# All available variables are described in documentation:
4444
# https://megalinter.io/configuration/

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
stale:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/stale@v1
15+
- uses: actions/stale@v9
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
stale-pr-message: 'This PR has not been updated in the last 30 days. Is it still needed? Unless further action is taken, it will be closed in 5 days.'

.pre-commit-config.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ repos:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
99
- repo: https://github.com/pre-commit/mirrors-clang-format
10-
rev: "v18.1.3" # clang-format version
10+
rev: v18.1.3 # clang-format version
1111
hooks:
1212
- id: clang-format
13+
- repo: https://github.com/cpplint/cpplint
14+
rev: 2.0.0
15+
hooks:
16+
- id: cpplint

Common/Core/fwdtrackUtilities.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,9 @@ o2::dataformats::GlobalFwdTrack propagateMuon(TFwdTrack const& muon, TCollision
5959

6060
if (endPoint == propagationPoint::kToVertex) {
6161
o2::mch::TrackExtrap::extrapToVertex(mchTrack, collision.posX(), collision.posY(), collision.posZ(), collision.covXX(), collision.covYY());
62-
}
63-
if (endPoint == propagationPoint::kToDCA) {
62+
} else if (endPoint == propagationPoint::kToDCA) {
6463
o2::mch::TrackExtrap::extrapToVertexWithoutBranson(mchTrack, collision.posZ());
65-
}
66-
if (endPoint == propagationPoint::kToRabs) {
64+
} else if (endPoint == propagationPoint::kToRabs) {
6765
o2::mch::TrackExtrap::extrapToZ(mchTrack, -505.);
6866
}
6967

@@ -77,7 +75,11 @@ o2::dataformats::GlobalFwdTrack propagateMuon(TFwdTrack const& muon, TCollision
7775
auto Bz = field->getBz(centerMFT); // Get field at centre of MFT
7876
auto geoMan = o2::base::GeometryManager::meanMaterialBudget(muon.x(), muon.y(), muon.z(), collision.posX(), collision.posY(), collision.posZ());
7977
auto x2x0 = static_cast<float>(geoMan.meanX2X0);
80-
fwdtrack.propagateToVtxhelixWithMCS(collision.posZ(), {collision.posX(), collision.posY()}, {collision.covXX(), collision.covYY()}, Bz, x2x0);
78+
if (endPoint == propagationPoint::kToVertex) {
79+
fwdtrack.propagateToVtxhelixWithMCS(collision.posZ(), {collision.posX(), collision.posY()}, {collision.covXX(), collision.covYY()}, Bz, x2x0);
80+
} else if (endPoint == propagationPoint::kToDCA) {
81+
fwdtrack.propagateToZhelix(collision.posZ(), Bz);
82+
}
8183
propmuon.setParameters(fwdtrack.getParameters());
8284
propmuon.setZ(fwdtrack.getZ());
8385
propmuon.setCovariances(fwdtrack.getCovariances());

Common/DataModel/PropagatedFwdTrackTables.h

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@
1919
#define COMMON_DATAMODEL_PROPAGATEDFWDTRACKTABLES_H_
2020

2121
#include "Framework/AnalysisDataModel.h"
22+
#include "TrackSelectionTables.h"
2223

2324
namespace o2::aod
2425
{
2526
namespace propfwdtrack
2627
{
27-
DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack); //! FwdTrack index
28-
DECLARE_SOA_COLUMN(CXXatDCA, cXXatDCA, float); //! DCAx resolution squared at DCA
29-
DECLARE_SOA_COLUMN(CYYatDCA, cYYatDCA, float); //! DCAy resolution squared at DCA
30-
DECLARE_SOA_COLUMN(CXYatDCA, cXYatDCA, float); //! correlation term of DCAx,y resolution at DCA
31-
DECLARE_SOA_COLUMN(EtaMatchedMCHMID, etaMatchedMCHMID, float); //! eta of MCH-MID track in MFT-MCH-MID track at PV
32-
DECLARE_SOA_COLUMN(PhiMatchedMCHMID, phiMatchedMCHMID, float); //! phi of MCH-MID track in MFT-MCH-MID track at PV
33-
DECLARE_SOA_COLUMN(IsAssociatedToMPC, isAssociatedToMPC, bool); //! is assigned to the most probable collision (relevant to TTCA)
34-
DECLARE_SOA_COLUMN(IsAmbiguous, isAmbiguous, bool); //! is ambiguous (relevant to TTCA)
28+
DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack); //! FwdTrack index
29+
DECLARE_SOA_INDEX_COLUMN_FULL(MCHTrack, matchMCHTrack, int, FwdTracks, "_MatchMCHTrack"); //! Index of matched MCH track for GlobalMuonTracks and GlobalForwardTracks
30+
DECLARE_SOA_COLUMN(CXXatDCA, cXXatDCA, float); //! DCAx resolution squared at DCA
31+
DECLARE_SOA_COLUMN(CYYatDCA, cYYatDCA, float); //! DCAy resolution squared at DCA
32+
DECLARE_SOA_COLUMN(CXYatDCA, cXYatDCA, float); //! correlation term of DCAx,y resolution at DCA
33+
DECLARE_SOA_COLUMN(EtaMatchedMCHMID, etaMatchedMCHMID, float); //! eta of MCH-MID track in MFT-MCH-MID track at PV
34+
DECLARE_SOA_COLUMN(PhiMatchedMCHMID, phiMatchedMCHMID, float); //! phi of MCH-MID track in MFT-MCH-MID track at PV
35+
DECLARE_SOA_COLUMN(IsAssociatedToMPC, isAssociatedToMPC, bool); //! is assigned to the most probable collision (relevant to TTCA)
36+
DECLARE_SOA_COLUMN(IsAmbiguous, isAmbiguous, bool); //! is ambiguous (relevant to TTCA)
3537
} // namespace propfwdtrack
3638

3739
DECLARE_SOA_TABLE_FULL(StoredPropagatedFwdTracks, "PropagatedFwdTracks", "AOD", "PROPFWDTRACK",
@@ -43,9 +45,9 @@ DECLARE_SOA_TABLE_FULL(StoredPropagatedFwdTracks, "PropagatedFwdTracks", "AOD",
4345
fwdtrack::Pz<fwdtrack::Pt, fwdtrack::Tgl>,
4446
fwdtrack::Sign<fwdtrack::Signed1Pt>,
4547
fwdtrack::Chi2, fwdtrack::Chi2MatchMCHMID, fwdtrack::Chi2MatchMCHMFT,
46-
fwdtrack::MatchScoreMCHMFT, propfwdtrack::FwdTrackId, fwdtrack::MFTTrackId, fwdtrack::MCHTrackId,
48+
fwdtrack::MatchScoreMCHMFT, propfwdtrack::FwdTrackId, fwdtrack::MFTTrackId, propfwdtrack::MCHTrackId,
4749
fwdtrack::MCHBitMap, fwdtrack::MIDBitMap, fwdtrack::MIDBoards,
48-
fwdtrack::TrackTime, fwdtrack::TrackTimeRes,
50+
fwdtrack::TrackTime, fwdtrack::TrackTimeRes, fwdtrack::FwdDcaX, fwdtrack::FwdDcaY,
4951
propfwdtrack::CXXatDCA, propfwdtrack::CYYatDCA, propfwdtrack::CXYatDCA,
5052
propfwdtrack::EtaMatchedMCHMID, propfwdtrack::PhiMatchedMCHMID,
5153
propfwdtrack::IsAssociatedToMPC, propfwdtrack::IsAmbiguous, o2::soa::Marker<1>);

Common/TableProducer/centralityTable.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ struct CentralityTable {
238238
ccdb->setLocalObjectValidityChecking();
239239
ccdb->setFatalWhenNull(false);
240240
mRunNumber = 0;
241+
listCalib.setObject(new TList);
241242
if (!produceHistograms.value) {
242243
return;
243244
}
@@ -259,7 +260,6 @@ struct CentralityTable {
259260
histos.addClone("FT0A/", "sel8FT0A/");
260261

261262
histos.print();
262-
listCalib.setObject(new TList);
263263
}
264264

265265
using BCsWithTimestampsAndRun2Infos = soa::Join<aod::BCs, aod::Run2BCInfos, aod::Timestamps>;

Common/TableProducer/fwdtrackPropagation.cxx

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,25 @@ struct FwdTrackPropagation {
6161
Configurable<float> maxEtaSA{"maxEtaSA", -2.5, "max. eta acceptance for MCH-MID"};
6262
Configurable<float> minEtaGL{"minEtaGL", -3.6, "min. eta acceptance for MFT-MCH-MID"};
6363
Configurable<float> maxEtaGL{"maxEtaGL", -2.5, "max. eta acceptance for MFT-MCH-MID"};
64+
Configurable<float> minRabsGL{"minRabsGL", 27.6, "min. R at absorber end for global muon (min. eta = -3.6)"}; // std::tan(2.f * std::atan(std::exp(- -3.6)) ) * -505.
6465
Configurable<float> minRabs{"minRabs", 17.6, "min. R at absorber end"};
6566
Configurable<float> midRabs{"midRabs", 26.5, "middle R at absorber end for pDCA cut"};
6667
Configurable<float> maxRabs{"maxRabs", 89.5, "max. R at absorber end"};
68+
Configurable<float> maxDCAxy{"maxDCAxy", 1e+10, "max. DCAxy for global muons"};
6769
Configurable<float> maxPDCAforLargeR{"maxPDCAforLargeR", 324.f, "max. pDCA for large R at absorber end"};
6870
Configurable<float> maxPDCAforSmallR{"maxPDCAforSmallR", 594.f, "max. pDCA for small R at absorber end"};
6971
Configurable<float> maxMatchingChi2MCHMFT{"maxMatchingChi2MCHMFT", 50.f, "max. chi2 for MCH-MFT matching"};
70-
Configurable<float> maxChi2{"maxChi2", 1e+6, "max. chi2 for muon tracking"};
71-
Configurable<bool> refitGlobalMuon{"refitGlobalMuon", false, "flag to refit global muon"};
72+
Configurable<float> maxChi2SA{"maxChi2SA", 1e+6, "max. chi2 for standalone muon"};
73+
Configurable<float> maxChi2GL{"maxChi2GL", 50.f, "max. chi2 for global muon"};
74+
Configurable<bool> refitGlobalMuon{"refitGlobalMuon", true, "flag to refit global muon"};
7275

7376
HistogramRegistry fRegistry{"fRegistry"};
7477
static constexpr std::string_view muon_types[5] = {"MFTMCHMID/", "MFTMCHMIDOtherMatch/", "MFTMCH/", "MCHMID/", "MCH/"};
7578

7679
void init(o2::framework::InitContext&)
7780
{
78-
if (doprocessWithoutTTCA && doprocessWithTTCA) {
79-
LOGF(fatal, "Cannot enable doprocessWithoutTTCA and doprocessWithTTCA at the same time. Please choose one.");
81+
if (doprocessWithoutFTTCA && doprocessWithFTTCA) {
82+
LOGF(fatal, "Cannot enable doprocessWithoutFTTCA and doprocessWithFTTCA at the same time. Please choose one.");
8083
}
8184

8285
ccdb->setURL(ccdburl);
@@ -137,9 +140,9 @@ struct FwdTrackPropagation {
137140
fRegistry.add("MFTMCHMID/hChi2MatchMCHMID", "chi2 match MCH-MID;chi2", kTH1F, {{100, 0.0f, 100}}, false);
138141
fRegistry.add("MFTMCHMID/hChi2MatchMCHMFT", "chi2 match MCH-MFT;chi2", kTH1F, {{100, 0.0f, 100}}, false);
139142
fRegistry.add("MFTMCHMID/hMatchScoreMCHMFT", "match score MCH-MFT;score", kTH1F, {{100, 0.0f, 100}}, false);
140-
fRegistry.add("MFTMCHMID/hDCAxy2D", "DCA x vs. y;DCA_{x} (cm);DCA_{y} (cm)", kTH2F, {{200, -0.1, 0.1}, {200, -0.1, +0.1}}, false);
143+
fRegistry.add("MFTMCHMID/hDCAxy2D", "DCA x vs. y;DCA_{x} (cm);DCA_{y} (cm)", kTH2F, {{200, -0.5, 0.5}, {200, -0.5, +0.5}}, false);
141144
fRegistry.add("MFTMCHMID/hDCAxy2DinSigma", "DCA x vs. y in sigma;DCA_{x} (#sigma);DCA_{y} (#sigma)", kTH2F, {{200, -10, 10}, {200, -10, +10}}, false);
142-
fRegistry.add("MFTMCHMID/hDCAxy", "DCAxy;DCA_{xy} (cm);", kTH1F, {{100, 0, 0.1}}, false);
145+
fRegistry.add("MFTMCHMID/hDCAxy", "DCAxy;DCA_{xy} (cm);", kTH1F, {{100, 0, 1}}, false);
143146
fRegistry.add("MFTMCHMID/hDCAxyinSigma", "DCAxy in sigma;DCA_{xy} (#sigma);", kTH1F, {{100, 0, 10}}, false);
144147
fRegistry.addClone("MFTMCHMID/", "MCHMID/");
145148
fRegistry.add("MFTMCHMID/hDCAxResolutionvsPt", "DCA_{x} vs. p_{T};p_{T} (GeV/c);DCA_{x} resolution (#mum);", kTH2F, {{100, 0, 10.f}, {500, 0, 500}}, false);
@@ -148,59 +151,55 @@ struct FwdTrackPropagation {
148151
fRegistry.add("MCHMID/hDCAyResolutionvsPt", "DCA_{y} vs. p_{T};p_{T} (GeV/c);DCA_{y} resolution (#mum);", kTH2F, {{100, 0, 10.f}, {500, 0, 5e+5}}, false);
149152
}
150153

151-
bool isSelected(const float pt, const float eta, const float rAtAbsorberEnd, const float pDCA, const float chi2, const uint8_t trackType)
154+
bool isSelected(const float pt, const float eta, const float rAtAbsorberEnd, const float pDCA, const float chi2, const uint8_t trackType, const float dcaXY)
152155
{
153156
if (pt < minPt || maxPt < pt) {
154157
return false;
155158
}
156-
157159
if (rAtAbsorberEnd < minRabs || maxRabs < rAtAbsorberEnd) {
158160
return false;
159161
}
160-
161-
if (maxChi2 < chi2) {
162+
if (rAtAbsorberEnd < midRabs ? pDCA > maxPDCAforSmallR : pDCA > maxPDCAforLargeR) {
162163
return false;
163164
}
164165

165166
if (trackType == static_cast<uint8_t>(o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack)) {
166167
if (eta < minEtaGL || maxEtaGL < eta) {
167168
return false;
168169
}
170+
if (maxDCAxy < dcaXY) {
171+
return false;
172+
}
173+
if (chi2 < 0.f || maxChi2GL < chi2) {
174+
return false;
175+
}
176+
if (rAtAbsorberEnd < minRabsGL || maxRabs < rAtAbsorberEnd) {
177+
return false;
178+
}
169179
} else if (trackType == static_cast<uint8_t>(o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack)) {
170180
if (eta < minEtaSA || maxEtaSA < eta) {
171181
return false;
172182
}
183+
if (chi2 < 0.f || maxChi2SA < chi2) {
184+
return false;
185+
}
173186
} else {
174187
return false;
175188
}
176189

177-
if (rAtAbsorberEnd < midRabs ? pDCA > maxPDCAforSmallR : pDCA > maxPDCAforLargeR) {
178-
return false;
179-
}
180190
return true;
181191
}
182192

183193
template <typename TCollision, typename TFwdTrack, typename TFwdTracks, typename TMFTTracks>
184-
void fillFwdTrackTable(TCollision const& collision, TFwdTrack fwdtrack, TFwdTracks const& fwdtracks, TMFTTracks const&, const bool isAmbiguous)
194+
void fillFwdTrackTable(TCollision const& collision, TFwdTrack fwdtrack, TFwdTracks const&, TMFTTracks const&, const bool isAmbiguous)
185195
{
186-
if (fwdtrack.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack) {
187-
std::map<int64_t, float> map_chi2MFTMCH;
188-
const auto& matchedGlobalTracks = fwdtracks.sliceBy(perMFTTrack, fwdtrack.matchMFTTrackId()); // MFT-MCH-MID or MFT-MCH
189-
for (const auto& matchedtrack : matchedGlobalTracks) {
190-
if (matchedtrack.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack) {
191-
map_chi2MFTMCH[matchedtrack.globalIndex()] = matchedtrack.chi2MatchMCHMFT();
192-
}
193-
}
194-
if (map_chi2MFTMCH.begin()->first != fwdtrack.globalIndex()) { // search for minimum chi2
195-
map_chi2MFTMCH.clear();
196-
return;
197-
}
198-
map_chi2MFTMCH.clear();
196+
if (fwdtrack.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack && (fwdtrack.chi2MatchMCHMFT() > maxMatchingChi2MCHMFT || fwdtrack.chi2() > maxChi2GL)) {
197+
return;
198+
} // Users have to decide the best match between MFT and MCH-MID at analysis level. The same global muon is repeatedly stored.
199199

200-
if (fwdtrack.chi2MatchMCHMFT() > maxMatchingChi2MCHMFT) {
201-
return;
202-
}
203-
} // reduce useless propagation
200+
if (fwdtrack.chi2MatchMCHMID() < 0.f) { // this should never happen. only for protection.
201+
return;
202+
}
204203

205204
o2::dataformats::GlobalFwdTrack propmuonAtPV = propagateMuon(fwdtrack, collision, propagationPoint::kToVertex);
206205
o2::dataformats::GlobalFwdTrack propmuonAtDCA = propagateMuon(fwdtrack, collision, propagationPoint::kToDCA);
@@ -236,9 +235,6 @@ struct FwdTrackPropagation {
236235

237236
if (fwdtrack.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::GlobalMuonTrack) {
238237
const auto& mchtrack = fwdtrack.template matchMCHTrack_as<TFwdTracks>(); // MCH-MID
239-
// etaMatchedMCHMID = mchtrack.eta();
240-
// phiMatchedMCHMID = mchtrack.phi();
241-
// o2::math_utils::bringTo02Pi(phiMatchedMCHMID);
242238
o2::dataformats::GlobalFwdTrack propmuonAtPV_Matched = propagateMuon(mchtrack, collision, propagationPoint::kToVertex);
243239
etaMatchedMCHMID = propmuonAtPV_Matched.getEta();
244240
phiMatchedMCHMID = propmuonAtPV_Matched.getPhi();
@@ -251,18 +247,18 @@ struct FwdTrackPropagation {
251247

252248
const auto& mfttrack = fwdtrack.template matchMFTTrack_as<TMFTTracks>();
253249
nClustersMFT = mfttrack.nClusters();
250+
chi2mft = mfttrack.chi2();
254251
if (refitGlobalMuon) {
255252
eta = mfttrack.eta();
256253
phi = mfttrack.phi();
257254
o2::math_utils::bringTo02Pi(phi);
258-
pt = propmuonAtPV.getP() * std::sin(2.f * std::atan(std::exp(-eta)));
255+
pt = propmuonAtPV_Matched.getP() * std::sin(2.f * std::atan(std::exp(-eta)));
259256

260257
x = mfttrack.x();
261258
y = mfttrack.y();
262259
z = mfttrack.z();
263260
tgl = mfttrack.tgl();
264261
}
265-
chi2mft = mfttrack.chi2();
266262
} else if (fwdtrack.trackType() == o2::aod::fwdtrack::ForwardTrackTypeEnum::MuonStandaloneTrack) {
267263
o2::dataformats::GlobalFwdTrack propmuonAtRabs = propagateMuon(fwdtrack, collision, propagationPoint::kToRabs); // this is necessary only for MuonStandaloneTrack
268264
float xAbs = propmuonAtRabs.getX();
@@ -272,7 +268,7 @@ struct FwdTrackPropagation {
272268
return;
273269
}
274270

275-
if (!isSelected(pt, eta, rAtAbsorberEnd, pDCA, fwdtrack.chi2(), fwdtrack.trackType())) {
271+
if (!isSelected(pt, eta, rAtAbsorberEnd, pDCA, fwdtrack.chi2(), fwdtrack.trackType(), dcaXY)) {
276272
return;
277273
}
278274

@@ -302,7 +298,7 @@ struct FwdTrackPropagation {
302298
fwdtrack.sign() / pt, fwdtrack.nClusters(), pDCA, rAtAbsorberEnd,
303299
fwdtrack.chi2(), fwdtrack.chi2MatchMCHMID(), fwdtrack.chi2MatchMCHMFT(),
304300
fwdtrack.matchScoreMCHMFT(), fwdtrack.globalIndex(), fwdtrack.matchMFTTrackId(), fwdtrack.matchMCHTrackId(),
305-
fwdtrack.mchBitMap(), fwdtrack.midBitMap(), fwdtrack.midBoards(), fwdtrack.trackTime(), fwdtrack.trackTimeRes(),
301+
fwdtrack.mchBitMap(), fwdtrack.midBitMap(), fwdtrack.midBoards(), fwdtrack.trackTime(), fwdtrack.trackTimeRes(), dcaX, dcaY,
306302
cXXatDCA, cYYatDCA, cXYatDCA, etaMatchedMCHMID, phiMatchedMCHMID, isAssociatedToMPC, isAmbiguous);
307303

308304
propfwdtrackscov(
@@ -367,7 +363,7 @@ struct FwdTrackPropagation {
367363
Preslice<aod::FwdTrackAssoc> fwdtrackIndicesPerCollision = aod::track_association::collisionId;
368364
PresliceUnsorted<aod::FwdTrackAssoc> fwdtrackIndicesPerFwdTrack = aod::track_association::fwdtrackId;
369365

370-
void processWithoutTTCA(aod::Collisions const& collisions, MyFwdTracks const& fwdtracks, aod::MFTTracks const& mfttracks, aod::BCsWithTimestamps const&)
366+
void processWithoutFTTCA(aod::Collisions const& collisions, MyFwdTracks const& fwdtracks, aod::MFTTracks const& mfttracks, aod::BCsWithTimestamps const&)
371367
{
372368
for (const auto& collision : collisions) {
373369
const auto& bc = collision.template bc_as<aod::BCsWithTimestamps>();
@@ -382,9 +378,9 @@ struct FwdTrackPropagation {
382378
} // end of fwdtrack loop
383379
} // end of collision loop
384380
}
385-
PROCESS_SWITCH(FwdTrackPropagation, processWithoutTTCA, "process without TTCA", true);
381+
PROCESS_SWITCH(FwdTrackPropagation, processWithoutFTTCA, "process without FTTCA", true);
386382

387-
void processWithTTCA(aod::Collisions const& collisions, MyFwdTracks const& fwdtracks, aod::MFTTracks const& mfttracks, aod::BCsWithTimestamps const&, aod::FwdTrackAssoc const& fwdtrackIndices)
383+
void processWithFTTCA(aod::Collisions const& collisions, MyFwdTracks const& fwdtracks, aod::MFTTracks const& mfttracks, aod::BCsWithTimestamps const&, aod::FwdTrackAssoc const& fwdtrackIndices)
388384
{
389385
std::unordered_map<int64_t, bool> mapAmb; // fwdtrack.globalIndex() -> bool isAmb;
390386
for (const auto& fwdtrack : fwdtracks) {
@@ -408,7 +404,7 @@ struct FwdTrackPropagation {
408404
} // end of collision loop
409405
mapAmb.clear();
410406
}
411-
PROCESS_SWITCH(FwdTrackPropagation, processWithTTCA, "process with TTCA", false);
407+
PROCESS_SWITCH(FwdTrackPropagation, processWithFTTCA, "process with FTTCA", false);
412408
};
413409

414410
// Extends the PropagatedFwdTracks table for expression columns

Common/TableProducer/multiplicityTable.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,15 +227,14 @@ struct MultiplicityTable {
227227
ccdb->setLocalObjectValidityChecking();
228228
ccdb->setFatalWhenNull(false); // don't fatal, please - exception is caught explicitly (as it should)
229229

230+
listCalib.setObject(new TList);
230231
if (!produceHistograms.value) {
231232
return;
232233
}
233234
histos.add("FT0A", "FT0A vs FT0A eq.", HistType::kTH2D, {{1000, 0, 1000, "FT0A multiplicity"}, {1000, 0, 1000, "FT0A multiplicity eq."}});
234235
histos.add("FT0C", "FT0C vs FT0C eq.", HistType::kTH2D, {{1000, 0, 1000, "FT0C multiplicity"}, {1000, 0, 1000, "FT0C multiplicity eq."}});
235236
histos.add("FT0CMultvsPV", "FT0C vs mult.", HistType::kTH2D, {{1000, 0, 1000, "FT0C mult."}, {100, 0, 100, "PV mult."}});
236237
histos.add("FT0AMultvsPV", "FT0A vs mult.", HistType::kTH2D, {{1000, 0, 1000, "FT0A mult."}, {100, 0, 100, "PV mult."}});
237-
238-
listCalib.setObject(new TList);
239238
}
240239

241240
/// Dummy process function for BCs, needed in case both Run2 and Run3 process functions are disabled

0 commit comments

Comments
 (0)