Skip to content

Commit ae259aa

Browse files
victor-gonzalezVictor Gonzalez
victor-gonzalez
and
Victor Gonzalez
authored
[PWGCF] DptDpt - Incorporating deuterons (#17975)
Co-authored-by: Victor Gonzalez <victor@cern.ch>
1 parent 5b38f03 commit ae259aa

5 files changed

Lines changed: 89 additions & 88 deletions

File tree

‎PWGCF/TableProducer/dptDptFilter.cxx‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ namespace o2::analysis::dptdptfilter
7272
{
7373
using DptDptFullTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>;
7474
using DptDptFullTracksAmbiguous = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA, aod::TrackCompColls>;
75-
using DptDptTracksPID = soa::Join<aod::pidTPCEl, aod::pidTPCMu, aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr, aod::pidTOFEl, aod::pidTOFMu, aod::pidTOFPi, aod::pidTOFKa, aod::pidTOFPr, aod::pidTOFbeta>;
76-
using DptDptTracksFullPID = soa::Join<aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta>;
75+
using DptDptTracksPID = soa::Join<aod::pidTPCEl, aod::pidTPCMu, aod::pidTPCPi, aod::pidTPCKa, aod::pidTPCPr, aod::pidTPCDe, aod::pidTOFEl, aod::pidTOFMu, aod::pidTOFPi, aod::pidTOFKa, aod::pidTOFPr, aod::pidTOFDe, aod::pidTOFbeta>;
76+
using DptDptTracksFullPID = soa::Join<aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTPCFullDe, aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFbeta>;
7777
using DptDptFullTracksPID = soa::Join<DptDptFullTracks, DptDptTracksPID>;
7878
using DptDptFullTracksPIDAmbiguous = soa::Join<DptDptFullTracksAmbiguous, DptDptTracksPID>;
7979
using DptDptFullTracksFullPID = soa::Join<DptDptFullTracks, DptDptTracksFullPID>;
@@ -1160,7 +1160,7 @@ struct DptDptFilterTracks {
11601160
Configurable<int> cfgTrackType{"cfgTrackType", 4, "Type of selected tracks: 0 = no selection;1 = Run2 global tracks FB96;3 = Run3 tracks;4 = Run3 tracks MM sel;5 = Run2 TPC only tracks;7 = Run 3 TPC only tracks;30-33 = any/two on 3 ITS,any/all in 7 ITS;40-43 same as 30-33 w tighter DCAxy;50-53 w tighter pT DCAz. Default 4"};
11611161
Configurable<bool> cfgOnlyInOneSide{"cfgOnlyInOneSide", false, "select tracks that don't cross the TPC central membrane. Default false"};
11621162
Configurable<o2::analysis::CheckRangeCfg> cfgTraceDCAOutliers{"cfgTraceDCAOutliers", {false, 0.0, 0.0}, "Track the generator level DCAxy outliers: false/true, low dcaxy, up dcaxy. Default {false,0.0,0.0}"};
1163-
Configurable<float> cfgTraceOutOfSpeciesParticles{"cfgTraceOutOfSpeciesParticles", false, "Track the particles which are not e,mu,pi,K,p: false/true. Default false"};
1163+
Configurable<float> cfgTraceOutOfSpeciesParticles{"cfgTraceOutOfSpeciesParticles", false, "Track the particles which are not e,mu,pi,K,p,d: false/true. Default false"};
11641164
Configurable<int> cfgRecoIdMethod{"cfgRecoIdMethod", 0, "Method for identifying reconstructed tracks: 0 No PID, 1 PID, 2 mcparticle, 3 mcparticle only primaries, 4 mcparticle only sec, 5 mcparicle only sec from decays, 6 mcparticle only sec from material. Default 0"};
11651165
Configurable<o2::analysis::TrackSelectionTuneCfg> cfgTuneTrackSelection{"cfgTuneTrackSelection", {}, "Track selection: {useit: true/false, tpccls-useit, tpcxrws-useit, tpcxrfc-useit, tpcshcls-useit, dcaxy-useit, dcaz-useit}. Default {false,0.70,false,0.8,false,0.4,false,2.4,false,3.2,false}"};
11661166
Configurable<o2::analysis::TrackSelectionPIDCfg> cfgPionPIDSelection{"cfgPionPIDSelection",
@@ -1178,6 +1178,9 @@ struct DptDptFilterTracks {
11781178
Configurable<o2::analysis::TrackSelectionPIDCfg> cfgMuonPIDSelection{"cfgMuonPIDSelection",
11791179
{},
11801180
"PID criteria for muons"};
1181+
Configurable<o2::analysis::TrackSelectionPIDCfg> cfgDeuteronPIDSelection{"cfgDeuteronPIDSelection",
1182+
{},
1183+
"PID criteria for deuterons"};
11811184

11821185
OutputObj<TList> fOutput{"DptDptFilterTracksInfo", OutputObjHandlingPolicy::AnalysisObject};
11831186
Service<o2::framework::O2DatabasePDG> fPDG;
@@ -1280,6 +1283,7 @@ struct DptDptFilterTracks {
12801283
insertInPIDselector(cfgPionPIDSelection, 2);
12811284
insertInPIDselector(cfgKaonPIDSelection, 3);
12821285
insertInPIDselector(cfgProtonPIDSelection, 4);
1286+
insertInPIDselector(cfgDeuteronPIDSelection, 5);
12831287

12841288
if ((fDataType == kData) || (fDataType == kDataNoEvtSel) || (fDataType == kMC)) {
12851289
/* create the reconstructed data histograms */
@@ -1481,7 +1485,7 @@ struct DptDptFilterTracks {
14811485
/* the debug info output file if required */
14821486
if (cfgOutDebugInfo) {
14831487
debugstream.open("tracings.csv");
1484-
debugstream << "p,piw,pt,hastof,dEdx,beta,tpcnEl,tpcnMu,tpcnPi,tpcnKa,tpcnPr,tofnEl,tofnMu,tofnPi,tofnKa,tofnPr,tpcnElSft,tpcnMuSft,tpcnPiSft,tpcnKaSft,tpcnPrSft,tofnElSft,tofnMuSft,tofnPiSft,tofnKaSft,tofnPrSft,idcode,pid,pid2,truepid,phprim,process\n";
1488+
debugstream << "p,piw,pt,hastof,dEdx,beta,tpcnEl,tpcnMu,tpcnPi,tpcnKa,tpcnPr,tpcnDe,tofnEl,tofnMu,tofnPi,tofnKa,tofnPr,tofnDe,tpcnElSft,tpcnMuSft,tpcnPiSft,tpcnKaSft,tpcnPrSft,tpcnDeSft,tofnElSft,tofnMuSft,tofnPiSft,tofnKaSft,tofnPrSft,tofnDeSft,idcode,pid,pid2,truepid,phprim,process\n";
14851489
debugstream.close();
14861490
}
14871491
}

‎PWGCF/TableProducer/dptDptFilter.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1733,12 +1733,12 @@ inline bool acceptParticle(ParticleObject& particle, MCCollisionObject const&)
17331733
//////////////////////////////////////////////////////////////////////////////////
17341734

17351735
struct PIDSpeciesSelection {
1736-
const std::vector<int> pdgcodes = {kElectron, kMuonMinus, kPiPlus, kKPlus, kProton};
1737-
const std::vector<std::string_view> spnames = {"e", "mu", "pi", "ka", "p"};
1738-
const std::vector<std::string_view> sptitles = {"e", "#mu", "#pi", "K", "p"};
1739-
const std::vector<std::string_view> spfnames = {"E", "Mu", "Pi", "Ka", "Pr"};
1740-
const std::vector<std::string_view> spadjnames = {"Electron", "Muon", "Pion", "Kaon", "Proton"};
1741-
const std::vector<double> spmasses = {o2::constants::physics::MassElectron, o2::constants::physics::MassMuon, o2::constants::physics::MassPionCharged, o2::constants::physics::MassKaonCharged, o2::constants::physics::MassProton};
1736+
const std::vector<int> pdgcodes = {kElectron, kMuonMinus, kPiPlus, kKPlus, kProton, o2::constants::physics::kDeuteron};
1737+
const std::vector<std::string_view> spnames = {"e", "mu", "pi", "ka", "p", "d"};
1738+
const std::vector<std::string_view> sptitles = {"e", "#mu", "#pi", "K", "p", "d"};
1739+
const std::vector<std::string_view> spfnames = {"E", "Mu", "Pi", "Ka", "Pr", "De"};
1740+
const std::vector<std::string_view> spadjnames = {"Electron", "Muon", "Pion", "Kaon", "Proton", "Deuteron"};
1741+
const std::vector<double> spmasses = {o2::constants::physics::MassElectron, o2::constants::physics::MassMuon, o2::constants::physics::MassPionCharged, o2::constants::physics::MassKaonCharged, o2::constants::physics::MassProton, o2::constants::physics::MassDeuteron};
17421742
const std::vector<std::string_view> chadjnames = {"P", "M"};
17431743
const char* hadname = "h";
17441744
const char* hadtitle = "h";
@@ -1787,10 +1787,10 @@ struct PIDSpeciesSelection {
17871787
auto last = config[config.size() - 1];
17881788
uint8_t lastsp = species[config.size() - 1];
17891789
LOGF(info, "Inserted species %d with", lastsp);
1790-
LOGF(info, " minTPC nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f", last->mMinNSigmasTPC[0], last->mMinNSigmasTPC[1], last->mMinNSigmasTPC[2], last->mMinNSigmasTPC[3], last->mMinNSigmasTPC[4]);
1791-
LOGF(info, " maxTPC nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f", last->mMaxNSigmasTPC[0], last->mMaxNSigmasTPC[1], last->mMaxNSigmasTPC[2], last->mMaxNSigmasTPC[3], last->mMaxNSigmasTPC[4]);
1792-
LOGF(info, " minTOF nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f", last->mMinNSigmasTOF[0], last->mMinNSigmasTOF[1], last->mMinNSigmasTOF[2], last->mMinNSigmasTOF[3], last->mMinNSigmasTOF[4]);
1793-
LOGF(info, " maxTOF nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f", last->mMaxNSigmasTOF[0], last->mMaxNSigmasTOF[1], last->mMaxNSigmasTOF[2], last->mMaxNSigmasTOF[3], last->mMaxNSigmasTOF[4]);
1790+
LOGF(info, " minTPC nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f, de: %.2f", last->mMinNSigmasTPC[0], last->mMinNSigmasTPC[1], last->mMinNSigmasTPC[2], last->mMinNSigmasTPC[3], last->mMinNSigmasTPC[4], last->mMinNSigmasTPC[5]);
1791+
LOGF(info, " maxTPC nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f, de: %.2f", last->mMaxNSigmasTPC[0], last->mMaxNSigmasTPC[1], last->mMaxNSigmasTPC[2], last->mMaxNSigmasTPC[3], last->mMaxNSigmasTPC[4], last->mMaxNSigmasTPC[5]);
1792+
LOGF(info, " minTOF nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f, de: %.2f", last->mMinNSigmasTOF[0], last->mMinNSigmasTOF[1], last->mMinNSigmasTOF[2], last->mMinNSigmasTOF[3], last->mMinNSigmasTOF[4], last->mMinNSigmasTOF[5]);
1793+
LOGF(info, " maxTOF nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f, de: %.2f", last->mMaxNSigmasTOF[0], last->mMaxNSigmasTOF[1], last->mMaxNSigmasTOF[2], last->mMaxNSigmasTOF[3], last->mMaxNSigmasTOF[4], last->mMaxNSigmasTOF[5]);
17941794
LOGF(info, " %.1f < pT < %.1f", last->mPtMin, last->mPtMax);
17951795
}
17961796
void addExcludedSpecies(uint8_t sp, const o2::analysis::TrackSelectionPIDCfg* incfg)
@@ -1802,18 +1802,18 @@ struct PIDSpeciesSelection {
18021802
uint8_t lastsp = speciesexclude[configexclude.size() - 1];
18031803

18041804
LOGF(info, "Inserted species %d for exclusion with", lastsp);
1805-
LOGF(info, " minTPC nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f", last->mMinNSigmasTPC[0], last->mMinNSigmasTPC[1], last->mMinNSigmasTPC[2], last->mMinNSigmasTPC[3], last->mMinNSigmasTPC[4]);
1806-
LOGF(info, " maxTPC nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f", last->mMaxNSigmasTPC[0], last->mMaxNSigmasTPC[1], last->mMaxNSigmasTPC[2], last->mMaxNSigmasTPC[3], last->mMaxNSigmasTPC[4]);
1807-
LOGF(info, " minTOF nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f", last->mMinNSigmasTOF[0], last->mMinNSigmasTOF[1], last->mMinNSigmasTOF[2], last->mMinNSigmasTOF[3], last->mMinNSigmasTOF[4]);
1808-
LOGF(info, " maxTOF nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f", last->mMaxNSigmasTOF[0], last->mMaxNSigmasTOF[1], last->mMaxNSigmasTOF[2], last->mMaxNSigmasTOF[3], last->mMaxNSigmasTOF[4]);
1805+
LOGF(info, " minTPC nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f, de: %.2f", last->mMinNSigmasTPC[0], last->mMinNSigmasTPC[1], last->mMinNSigmasTPC[2], last->mMinNSigmasTPC[3], last->mMinNSigmasTPC[4], last->mMinNSigmasTPC[5]);
1806+
LOGF(info, " maxTPC nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f, de: %.2f", last->mMaxNSigmasTPC[0], last->mMaxNSigmasTPC[1], last->mMaxNSigmasTPC[2], last->mMaxNSigmasTPC[3], last->mMaxNSigmasTPC[4], last->mMaxNSigmasTPC[5]);
1807+
LOGF(info, " minTOF nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f, de: %.2f", last->mMinNSigmasTOF[0], last->mMinNSigmasTOF[1], last->mMinNSigmasTOF[2], last->mMinNSigmasTOF[3], last->mMinNSigmasTOF[4], last->mMinNSigmasTOF[5]);
1808+
LOGF(info, " maxTOF nsigmas: el: %.2f, mu: %.2f, pi: %.2f, ka: %.2f, pr: %.2f, de: %.2f", last->mMaxNSigmasTOF[0], last->mMaxNSigmasTOF[1], last->mMaxNSigmasTOF[2], last->mMaxNSigmasTOF[3], last->mMaxNSigmasTOF[4], last->mMaxNSigmasTOF[5]);
18091809
LOGF(info, " %.1f < pT < %.1f", last->mPtMin, last->mPtMax);
18101810
}
18111811
template <StrongDebugging outdebug, typename TrackObject>
18121812
int8_t whichSpecies(TrackObject const& track)
18131813
{
18141814
TString debuginfo;
1815-
std::vector<float> tpcnsigmas = {track.tpcNSigmaEl(), track.tpcNSigmaMu(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr()};
1816-
std::vector<float> tofnsigmas = {track.tofNSigmaEl(), track.tofNSigmaMu(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr()};
1815+
std::vector<float> tpcnsigmas = {track.tpcNSigmaEl(), track.tpcNSigmaMu(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(), track.tpcNSigmaDe()};
1816+
std::vector<float> tofnsigmas = {track.tofNSigmaEl(), track.tofNSigmaMu(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(), track.tofNSigmaDe()};
18171817

18181818
auto outmomentumdebug = [&]() {
18191819
if constexpr (outdebug != 0) {

‎PWGCF/Tasks/dptDptCorrelations.cxx‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -287,17 +287,17 @@ struct DptDptCorrelations {
287287
photon = p1+p2;
288288
photon.M()*/
289289

290-
constexpr float kLARGETANTHETA = 1e10;
291-
constexpr float kVERYSMALLETA = 1e-10;
292-
float tantheta1 = kLARGETANTHETA;
290+
constexpr float LARGETANTHETA = 1e10;
291+
constexpr float VERYSMALLETA = 1e-10;
292+
float tantheta1 = LARGETANTHETA;
293293

294-
if (track1.eta() < -kVERYSMALLETA || track1.eta() > kVERYSMALLETA) {
294+
if (track1.eta() < -VERYSMALLETA || track1.eta() > VERYSMALLETA) {
295295
float expTmp = std::exp(-track1.eta());
296296
tantheta1 = 2.0 * expTmp / (1.0 - expTmp * expTmp);
297297
}
298298

299-
float tantheta2 = kLARGETANTHETA;
300-
if (track2.eta() < -kVERYSMALLETA || track2.eta() > kVERYSMALLETA) {
299+
float tantheta2 = LARGETANTHETA;
300+
if (track2.eta() < -VERYSMALLETA || track2.eta() > VERYSMALLETA) {
301301
float expTmp = std::exp(-track2.eta());
302302
tantheta2 = 2.0 * expTmp / (1.0 - expTmp * expTmp);
303303
}
@@ -918,8 +918,8 @@ struct DptDptCorrelations {
918918
std::string cfgCCDBSuffix{""};
919919

920920
/* pair conversion suppression defaults */
921-
static constexpr float kCfgPairCutDefaults[1][5] = {{-1, -1, -1, -1, -1}};
922-
Configurable<LabeledArray<float>> cfgPairCut{"cfgPairCut", {kCfgPairCutDefaults[0], 5, {"Photon", "K0", "Lambda", "Phi", "Rho"}}, "Conversion suppressions"};
921+
static constexpr float KCfgPairCutDefaults[1][5] = {{-1, -1, -1, -1, -1}};
922+
Configurable<LabeledArray<float>> cfgPairCut{"cfgPairCut", {KCfgPairCutDefaults[0], 5, {"Photon", "K0", "Lambda", "Phi", "Rho"}}, "Conversion suppressions"};
923923
/* two tracks cut */
924924
Configurable<float> cfgTwoTrackCut{"cfgTwoTrackCut", -1, "Two-tracks cut: -1 = off; >0 otherwise distance value (suggested: 0.02"};
925925
Configurable<float> cfgTwoTrackCutMinRadius{"cfgTwoTrackCutMinRadius", 0.8f, "Two-tracks cut: radius in m from which two-tracks cut is applied"};
@@ -1020,8 +1020,7 @@ struct DptDptCorrelations {
10201020
{
10211021
/* self configure the desired species */
10221022
o2::analysis::dptdptfilter::PIDSpeciesSelection pidselector;
1023-
std::vector<std::string> cfgnames = {"cfgElectronPIDSelection", "cfgMuonPIDSelection", "cfgPionPIDSelection", "cfgKaonPIDSelection", "cfgProtonPIDSelection"};
1024-
std::vector<uint8_t> spids = {0, 1, 2, 3, 4};
1023+
std::vector<std::string> cfgnames = {"cfgElectronPIDSelection", "cfgMuonPIDSelection", "cfgPionPIDSelection", "cfgKaonPIDSelection", "cfgProtonPIDSelection", "cfgDeuteronPIDSelection"};
10251024
for (uint i = 0; i < cfgnames.size(); ++i) {
10261025
auto includeIt = [&pidselector, &initContext](int spid, const auto& name) {
10271026
bool mUseIt = false;
@@ -1036,7 +1035,7 @@ struct DptDptCorrelations {
10361035
}
10371036
}
10381037
};
1039-
includeIt(spids[i], cfgnames[i]);
1038+
includeIt(i, cfgnames[i]);
10401039
}
10411040
uint nspecies = pidselector.getNSpecies();
10421041
if (nspecies == 0) {
@@ -1224,8 +1223,8 @@ struct DptDptCorrelations {
12241223
{
12251224
using namespace correlationstask;
12261225

1227-
static constexpr std::string_view kStrDim[] = {"", "", "2D", "3D", "4D"};
1228-
return kStrDim[nNoOfDimensions].data();
1226+
static constexpr std::string_view KStrDim[] = {"", "", "2D", "3D", "4D"};
1227+
return KStrDim[nNoOfDimensions].data();
12291228
}
12301229

12311230
template <bool gen, typename FilterdCollision, typename FilteredTracks>
@@ -1491,7 +1490,7 @@ struct DptDptCorrelations {
14911490
SliceCache cache;
14921491
using BinningZVtxMultRec = ColumnBinningPolicy<aod::collision::PosZ, aod::dptdptfilter::DptDptCFCollisionCentMult>;
14931492
BinningZVtxMultRec bindingOnVtxAndMultRec{{vtxBinsEdges, multBinsEdges}, true}; // true is for 'ignore overflows' (true by default)
1494-
static constexpr int kNoOfLoggingCombinations = 10;
1493+
static constexpr int KNoOfLoggingCombinations = 10;
14951494

14961495
void processRecLevelMixed(soa::Filtered<aod::DptDptCFAcceptedCollisions> const& collisions, aod::BCsWithTimestamps const&, soa::Filtered<aod::ScannedTracks> const& tracks)
14971496
{
@@ -1501,7 +1500,7 @@ struct DptDptCorrelations {
15011500
LOGF(DPTDPTLOGCOLLISIONS, "Received %d collisions", collisions.size());
15021501
int logcomb = 0;
15031502
for (auto const& [collision1, tracks1, collision2, tracks2] : pairreco) {
1504-
if (logcomb < kNoOfLoggingCombinations) {
1503+
if (logcomb < KNoOfLoggingCombinations) {
15051504
LOGF(DPTDPTLOGCOLLISIONS, "Received collision pair: %ld (%f, %f): %s, %ld (%f, %f): %s",
15061505
collision1.globalIndex(), collision1.posZ(), collision1.centmult(), collision1.collisionaccepted() ? "accepted" : "not accepted",
15071506
collision2.globalIndex(), collision2.posZ(), collision2.centmult(), collision2.collisionaccepted() ? "accepted" : "not accepted");
@@ -1536,7 +1535,7 @@ struct DptDptCorrelations {
15361535
LOGF(DPTDPTLOGCOLLISIONS, "Received %d collisions", collisions.size());
15371536
int logcomb = 0;
15381537
for (auto const& [collision1, tracks1, collision2, tracks2] : pairreco) {
1539-
if (logcomb < kNoOfLoggingCombinations) {
1538+
if (logcomb < KNoOfLoggingCombinations) {
15401539
LOGF(DPTDPTLOGCOLLISIONS,
15411540
"Received collision pair: %ld (%f, %f): %s, %ld (%f, %f): %s",
15421541
collision1.globalIndex(),
@@ -1580,7 +1579,7 @@ struct DptDptCorrelations {
15801579
LOGF(DPTDPTLOGCOLLISIONS, "Received %d generated collisions", collisions.size());
15811580
int logcomb = 0;
15821581
for (auto const& [collision1, tracks1, collision2, tracks2] : pairgen) {
1583-
if (logcomb < kNoOfLoggingCombinations) {
1582+
if (logcomb < KNoOfLoggingCombinations) {
15841583
LOGF(DPTDPTLOGCOLLISIONS, "Received generated collision pair: %ld (%f, %f): %s, %ld (%f, %f): %s",
15851584
collision1.globalIndex(), collision1.posZ(), collision1.centmult(), collision1.collisionaccepted() ? "accepted" : "not accepted",
15861585
collision2.globalIndex(), collision2.posZ(), collision2.centmult(), collision2.collisionaccepted() ? "accepted" : "not accepted");
@@ -1611,7 +1610,7 @@ struct DptDptCorrelations {
16111610
LOGF(DPTDPTLOGCOLLISIONS, "Received %d generated collisions", collisions.size());
16121611
int logcomb = 0;
16131612
for (auto const& [collision1, tracks1, collision2, tracks2] : pairgen) {
1614-
if (logcomb < kNoOfLoggingCombinations) {
1613+
if (logcomb < KNoOfLoggingCombinations) {
16151614
LOGF(DPTDPTLOGCOLLISIONS,
16161615
"Received generated collision pair: %ld (%f, %f): %s, %ld (%f, %f): %s",
16171616
collision1.globalIndex(),

0 commit comments

Comments
 (0)