Skip to content

[PWGCF] DptDpt - Incorporating deuterons #17975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
victor-gonzalez merged 1 commit into from
Sep 19, 2026
Merged

[PWGCF] DptDpt - Incorporating deuterons #17975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions PWGCF/TableProducer/dptDptFilter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ namespace o2::analysis::dptdptfilter
{
using DptDptFullTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>;
using DptDptFullTracksAmbiguous = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA, aod::TrackCompColls>;
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>;
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>;
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>;
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>;
using DptDptFullTracksPID = soa::Join<DptDptFullTracks, DptDptTracksPID>;
using DptDptFullTracksPIDAmbiguous = soa::Join<DptDptFullTracksAmbiguous, DptDptTracksPID>;
using DptDptFullTracksFullPID = soa::Join<DptDptFullTracks, DptDptTracksFullPID>;
Expand Down Expand Up @@ -1160,7 +1160,7 @@ struct DptDptFilterTracks {
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"};
Configurable<bool> cfgOnlyInOneSide{"cfgOnlyInOneSide", false, "select tracks that don't cross the TPC central membrane. Default false"};
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}"};
Configurable<float> cfgTraceOutOfSpeciesParticles{"cfgTraceOutOfSpeciesParticles", false, "Track the particles which are not e,mu,pi,K,p: false/true. Default false"};
Configurable<float> cfgTraceOutOfSpeciesParticles{"cfgTraceOutOfSpeciesParticles", false, "Track the particles which are not e,mu,pi,K,p,d: false/true. Default false"};
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"};
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}"};
Configurable<o2::analysis::TrackSelectionPIDCfg> cfgPionPIDSelection{"cfgPionPIDSelection",
Expand All @@ -1178,6 +1178,9 @@ struct DptDptFilterTracks {
Configurable<o2::analysis::TrackSelectionPIDCfg> cfgMuonPIDSelection{"cfgMuonPIDSelection",
{},
"PID criteria for muons"};
Configurable<o2::analysis::TrackSelectionPIDCfg> cfgDeuteronPIDSelection{"cfgDeuteronPIDSelection",
{},
"PID criteria for deuterons"};

OutputObj<TList> fOutput{"DptDptFilterTracksInfo", OutputObjHandlingPolicy::AnalysisObject};
Service<o2::framework::O2DatabasePDG> fPDG;
Expand Down Expand Up @@ -1280,6 +1283,7 @@ struct DptDptFilterTracks {
insertInPIDselector(cfgPionPIDSelection, 2);
insertInPIDselector(cfgKaonPIDSelection, 3);
insertInPIDselector(cfgProtonPIDSelection, 4);
insertInPIDselector(cfgDeuteronPIDSelection, 5);

if ((fDataType == kData) || (fDataType == kDataNoEvtSel) || (fDataType == kMC)) {
/* create the reconstructed data histograms */
Expand Down Expand Up @@ -1481,7 +1485,7 @@ struct DptDptFilterTracks {
/* the debug info output file if required */
if (cfgOutDebugInfo) {
debugstream.open("tracings.csv");
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";
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";
debugstream.close();
}
}
Expand Down
32 changes: 16 additions & 16 deletions PWGCF/TableProducer/dptDptFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1733,12 +1733,12 @@ inline bool acceptParticle(ParticleObject& particle, MCCollisionObject const&)
//////////////////////////////////////////////////////////////////////////////////

struct PIDSpeciesSelection {
const std::vector<int> pdgcodes = {kElectron, kMuonMinus, kPiPlus, kKPlus, kProton};
const std::vector<std::string_view> spnames = {"e", "mu", "pi", "ka", "p"};
const std::vector<std::string_view> sptitles = {"e", "#mu", "#pi", "K", "p"};
const std::vector<std::string_view> spfnames = {"E", "Mu", "Pi", "Ka", "Pr"};
const std::vector<std::string_view> spadjnames = {"Electron", "Muon", "Pion", "Kaon", "Proton"};
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};
const std::vector<int> pdgcodes = {kElectron, kMuonMinus, kPiPlus, kKPlus, kProton, o2::constants::physics::kDeuteron};
const std::vector<std::string_view> spnames = {"e", "mu", "pi", "ka", "p", "d"};
const std::vector<std::string_view> sptitles = {"e", "#mu", "#pi", "K", "p", "d"};
const std::vector<std::string_view> spfnames = {"E", "Mu", "Pi", "Ka", "Pr", "De"};
const std::vector<std::string_view> spadjnames = {"Electron", "Muon", "Pion", "Kaon", "Proton", "Deuteron"};
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};
const std::vector<std::string_view> chadjnames = {"P", "M"};
const char* hadname = "h";
const char* hadtitle = "h";
Expand Down Expand Up @@ -1787,10 +1787,10 @@ struct PIDSpeciesSelection {
auto last = config[config.size() - 1];
uint8_t lastsp = species[config.size() - 1];
LOGF(info, "Inserted species %d with", lastsp);
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]);
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]);
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]);
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]);
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]);
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]);
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]);
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]);
LOGF(info, " %.1f < pT < %.1f", last->mPtMin, last->mPtMax);
}
void addExcludedSpecies(uint8_t sp, const o2::analysis::TrackSelectionPIDCfg* incfg)
Expand All @@ -1802,18 +1802,18 @@ struct PIDSpeciesSelection {
uint8_t lastsp = speciesexclude[configexclude.size() - 1];

LOGF(info, "Inserted species %d for exclusion with", lastsp);
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]);
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]);
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]);
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]);
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]);
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]);
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]);
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]);
LOGF(info, " %.1f < pT < %.1f", last->mPtMin, last->mPtMax);
}
template <StrongDebugging outdebug, typename TrackObject>
int8_t whichSpecies(TrackObject const& track)
{
TString debuginfo;
std::vector<float> tpcnsigmas = {track.tpcNSigmaEl(), track.tpcNSigmaMu(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr()};
std::vector<float> tofnsigmas = {track.tofNSigmaEl(), track.tofNSigmaMu(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr()};
std::vector<float> tpcnsigmas = {track.tpcNSigmaEl(), track.tpcNSigmaMu(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(), track.tpcNSigmaDe()};
std::vector<float> tofnsigmas = {track.tofNSigmaEl(), track.tofNSigmaMu(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(), track.tofNSigmaDe()};

auto outmomentumdebug = [&]() {
if constexpr (outdebug != 0) {
Expand Down
35 changes: 17 additions & 18 deletions PWGCF/Tasks/dptDptCorrelations.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,17 +287,17 @@ struct DptDptCorrelations {
photon = p1+p2;
photon.M()*/

constexpr float kLARGETANTHETA = 1e10;
constexpr float kVERYSMALLETA = 1e-10;
float tantheta1 = kLARGETANTHETA;
constexpr float LARGETANTHETA = 1e10;
constexpr float VERYSMALLETA = 1e-10;
float tantheta1 = LARGETANTHETA;

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

float tantheta2 = kLARGETANTHETA;
if (track2.eta() < -kVERYSMALLETA || track2.eta() > kVERYSMALLETA) {
float tantheta2 = LARGETANTHETA;
if (track2.eta() < -VERYSMALLETA || track2.eta() > VERYSMALLETA) {
float expTmp = std::exp(-track2.eta());
tantheta2 = 2.0 * expTmp / (1.0 - expTmp * expTmp);
}
Expand Down Expand Up @@ -918,8 +918,8 @@ struct DptDptCorrelations {
std::string cfgCCDBSuffix{""};

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

static constexpr std::string_view kStrDim[] = {"", "", "2D", "3D", "4D"};
return kStrDim[nNoOfDimensions].data();
static constexpr std::string_view KStrDim[] = {"", "", "2D", "3D", "4D"};
return KStrDim[nNoOfDimensions].data();
}

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

void processRecLevelMixed(soa::Filtered<aod::DptDptCFAcceptedCollisions> const& collisions, aod::BCsWithTimestamps const&, soa::Filtered<aod::ScannedTracks> const& tracks)
{
Expand All @@ -1501,7 +1500,7 @@ struct DptDptCorrelations {
LOGF(DPTDPTLOGCOLLISIONS, "Received %d collisions", collisions.size());
int logcomb = 0;
for (auto const& [collision1, tracks1, collision2, tracks2] : pairreco) {
if (logcomb < kNoOfLoggingCombinations) {
if (logcomb < KNoOfLoggingCombinations) {
LOGF(DPTDPTLOGCOLLISIONS, "Received collision pair: %ld (%f, %f): %s, %ld (%f, %f): %s",
collision1.globalIndex(), collision1.posZ(), collision1.centmult(), collision1.collisionaccepted() ? "accepted" : "not accepted",
collision2.globalIndex(), collision2.posZ(), collision2.centmult(), collision2.collisionaccepted() ? "accepted" : "not accepted");
Expand Down Expand Up @@ -1536,7 +1535,7 @@ struct DptDptCorrelations {
LOGF(DPTDPTLOGCOLLISIONS, "Received %d collisions", collisions.size());
int logcomb = 0;
for (auto const& [collision1, tracks1, collision2, tracks2] : pairreco) {
if (logcomb < kNoOfLoggingCombinations) {
if (logcomb < KNoOfLoggingCombinations) {
LOGF(DPTDPTLOGCOLLISIONS,
"Received collision pair: %ld (%f, %f): %s, %ld (%f, %f): %s",
collision1.globalIndex(),
Expand Down Expand Up @@ -1580,7 +1579,7 @@ struct DptDptCorrelations {
LOGF(DPTDPTLOGCOLLISIONS, "Received %d generated collisions", collisions.size());
int logcomb = 0;
for (auto const& [collision1, tracks1, collision2, tracks2] : pairgen) {
if (logcomb < kNoOfLoggingCombinations) {
if (logcomb < KNoOfLoggingCombinations) {
LOGF(DPTDPTLOGCOLLISIONS, "Received generated collision pair: %ld (%f, %f): %s, %ld (%f, %f): %s",
collision1.globalIndex(), collision1.posZ(), collision1.centmult(), collision1.collisionaccepted() ? "accepted" : "not accepted",
collision2.globalIndex(), collision2.posZ(), collision2.centmult(), collision2.collisionaccepted() ? "accepted" : "not accepted");
Expand Down Expand Up @@ -1611,7 +1610,7 @@ struct DptDptCorrelations {
LOGF(DPTDPTLOGCOLLISIONS, "Received %d generated collisions", collisions.size());
int logcomb = 0;
for (auto const& [collision1, tracks1, collision2, tracks2] : pairgen) {
if (logcomb < kNoOfLoggingCombinations) {
if (logcomb < KNoOfLoggingCombinations) {
LOGF(DPTDPTLOGCOLLISIONS,
"Received generated collision pair: %ld (%f, %f): %s, %ld (%f, %f): %s",
collision1.globalIndex(),
Expand Down
Loading
Loading