Skip to content

Commit 4a34d08

Browse files
wenyaCernwenyaCern
authored
Merge pull request #16 from alibuild/alibot-cleanup-15160
Please consider the following formatting changes to #15160
2 parents d0bdb89 + 76f6d91 commit 4a34d08

File tree

4 files changed

+49
-54
lines changed

4 files changed

+49
-54
lines changed

‎PWGCF/FemtoDream/Core/femtoDreamCollisionSelection.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,10 @@ class FemtoDreamCollisionSelection
223223
mHistogramQn->add("Event/centVsqnVsSpher", "; cent; qn; Sphericity", kTH3F, {{10, 0, 100}, {100, 0, 1000}, {100, 0, 1}});
224224
mHistogramQn->add("Event/qnBin", "; qnBin; entries", kTH1F, {{20, 0, 20}});
225225
mHistogramQn->add("Event/psiEP", "; #Psi_{EP} (deg); entries", kTH1F, {{100, 0, 180}});
226-
mHistogramQn->add("Event/epReso_FT0CTPC", "; cent; qnBin; reso_ft0c_tpc", kTH2F, {{10, 0, 100},{10,0,10}});
227-
mHistogramQn->add("Event/epReso_FT0ATPC", "; cent; qnBin; reso_ft0a_tpc", kTH2F, {{10, 0, 100},{10,0,10}});
228-
mHistogramQn->add("Event/epReso_FT0CFT0A", "; cent; qnBin; reso_ft0c_ft0a", kTH2F, {{10, 0, 100},{10,0,10}});
229-
mHistogramQn->add("Event/epReso_count", "; cent; qnBin; count", kTH2F, {{10, 0, 100},{10,0,10}});
226+
mHistogramQn->add("Event/epReso_FT0CTPC", "; cent; qnBin; reso_ft0c_tpc", kTH2F, {{10, 0, 100}, {10, 0, 10}});
227+
mHistogramQn->add("Event/epReso_FT0ATPC", "; cent; qnBin; reso_ft0a_tpc", kTH2F, {{10, 0, 100}, {10, 0, 10}});
228+
mHistogramQn->add("Event/epReso_FT0CFT0A", "; cent; qnBin; reso_ft0c_ft0a", kTH2F, {{10, 0, 100}, {10, 0, 10}});
229+
mHistogramQn->add("Event/epReso_count", "; cent; qnBin; count", kTH2F, {{10, 0, 100}, {10, 0, 10}});
230230

231231
return;
232232
}
@@ -337,13 +337,13 @@ class FemtoDreamCollisionSelection
337337
float computeqnVec(T const& col, int qvecMod = 0)
338338
{
339339
double qn = -999.f;
340-
if (qvecMod == 0){
340+
if (qvecMod == 0) {
341341
qn = std::sqrt(col.qvecFT0CReVec()[0] * col.qvecFT0CReVec()[0] + col.qvecFT0CImVec()[0] * col.qvecFT0CImVec()[0]) * std::sqrt(col.sumAmplFT0C());
342-
} else if (qvecMod == 1){
342+
} else if (qvecMod == 1) {
343343
qn = std::sqrt(col.qvecFT0AReVec()[0] * col.qvecFT0AReVec()[0] + col.qvecFT0AImVec()[0] * col.qvecFT0AImVec()[0]) * std::sqrt(col.sumAmplFT0A());
344344
} else {
345-
LOGP(error, "no selected detector of Qvec for ESE ");
346-
return qn;
345+
LOGP(error, "no selected detector of Qvec for ESE ");
346+
return qn;
347347
}
348348
return qn;
349349
}
@@ -357,20 +357,20 @@ class FemtoDreamCollisionSelection
357357
float computeEP(T const& col, int nmode, int qvecMod)
358358
{
359359
double EP = -999.f;
360-
if (qvecMod == 0){
360+
if (qvecMod == 0) {
361361
EP = ((1. / nmode) * (TMath::ATan2(col.qvecFT0CImVec()[0], col.qvecFT0CReVec()[0])));
362362
} else if (qvecMod == 1) {
363-
EP = ((1. / nmode) * (TMath::ATan2(col.qvecFT0AImVec()[0], col.qvecFT0AReVec()[0])));
363+
EP = ((1. / nmode) * (TMath::ATan2(col.qvecFT0AImVec()[0], col.qvecFT0AReVec()[0])));
364364
} else if (qvecMod == 2) {
365-
EP = ((1. / nmode) * (TMath::ATan2(col.qvecTPCallImVec()[0], col.qvecTPCallReVec()[0])));
365+
EP = ((1. / nmode) * (TMath::ATan2(col.qvecTPCallImVec()[0], col.qvecTPCallReVec()[0])));
366366
} else {
367-
LOGP(error, "no selected detector of Qvec for EP");
368-
return EP;
367+
LOGP(error, "no selected detector of Qvec for EP");
368+
return EP;
369369
}
370-
371-
if (EP < 0){
370+
371+
if (EP < 0) {
372372
EP += TMath::Pi();
373-
} // atan2 return in rad -pi/2-pi/2, then make it 0-pi
373+
} // atan2 return in rad -pi/2-pi/2, then make it 0-pi
374374
return EP;
375375
}
376376

@@ -383,7 +383,7 @@ class FemtoDreamCollisionSelection
383383
{
384384
const float psi_ft0c = ((1. / nmode) * (TMath::ATan2(col.qvecFT0CImVec()[0], col.qvecFT0CReVec()[0])));
385385
const float psi_ft0a = ((1. / nmode) * (TMath::ATan2(col.qvecFT0AImVec()[0], col.qvecFT0AReVec()[0])));
386-
const float psi_tpc = ((1. / nmode) * (TMath::ATan2(col.qvecTPCallImVec()[0], col.qvecTPCallReVec()[0])));
386+
const float psi_tpc = ((1. / nmode) * (TMath::ATan2(col.qvecTPCallImVec()[0], col.qvecTPCallReVec()[0])));
387387

388388
mHistogramQn->fill(HIST("Event/epReso_FT0CTPC"), centrality, mQnBin + 0.f, std::cos((psi_ft0c - psi_tpc) * nmode));
389389
mHistogramQn->fill(HIST("Event/epReso_FT0ATPC"), centrality, mQnBin + 0.f, std::cos((psi_ft0a - psi_tpc) * nmode));

‎PWGCF/FemtoDream/Core/femtoDreamContainer.h‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -225,24 +225,24 @@ class FemtoDreamContainer
225225

226226
template <typename T>
227227
void init_3Dqn_MC(std::string folderName, std::string femtoDKout, std::string femtoDKside, std::string femtoDKlong,
228-
T& femtoDKoutAxis, T& femtoDKsideAxis, T& femtoDKlongAxis, bool smearingByOrigin=false)
228+
T& femtoDKoutAxis, T& femtoDKsideAxis, T& femtoDKlongAxis, bool smearingByOrigin = false)
229229
{
230230
mHistogramRegistry->add((folderName + "/hNoMCtruthPairsCounter").c_str(), "; Counter; Entries", kTH1I, {{1, 0, 1}});
231231
mHistogramRegistry->add((folderName + "/hFakePairsCounter").c_str(), "; Counter; Entries", kTH1I, {{1, 0, 1}});
232232
if (smearingByOrigin) {
233233
const int nOriginBins = o2::aod::femtodreamMCparticle::ParticleOriginMCTruth::kNOriginMCTruthTypes;
234-
mHistogramRegistry->add((folderName + "/relPair3dresolution").c_str(), (";" + femtoDKout + "mctruth;" + femtoDKout + "_reco;" + femtoDKside + "mctruth;" + femtoDKside + "_reco;" +femtoDKlong + "mctruth;" +femtoDKlong + "_reco;" + "MC origin particle 1; MC origin particle 2;").c_str(),
235-
kTHnSparseF, {femtoDKoutAxis, femtoDKoutAxis, femtoDKsideAxis, femtoDKsideAxis, femtoDKlongAxis, femtoDKlongAxis,
236-
{nOriginBins, 0, nOriginBins}, {nOriginBins, 0, nOriginBins}});
234+
mHistogramRegistry->add((folderName + "/relPair3dresolution").c_str(), (";" + femtoDKout + "mctruth;" + femtoDKout + "_reco;" + femtoDKside + "mctruth;" + femtoDKside + "_reco;" + femtoDKlong + "mctruth;" + femtoDKlong + "_reco;" + "MC origin particle 1; MC origin particle 2;").c_str(),
235+
kTHnSparseF, {femtoDKoutAxis, femtoDKoutAxis, femtoDKsideAxis, femtoDKsideAxis, femtoDKlongAxis, femtoDKlongAxis, {nOriginBins, 0, nOriginBins}, {nOriginBins, 0, nOriginBins}});
237236
} else {
238-
mHistogramRegistry->add((folderName + "/relPair3dresolution").c_str(), (";" + femtoDKout + "mctruth;" + femtoDKside + "mctruth;" +femtoDKlong + "mctruth;" + femtoDKout + "_reco;" + femtoDKside + "_reco;" +femtoDKlong + "_reco;").c_str(),
239-
kTHnSparseF, {femtoDKoutAxis, femtoDKoutAxis, femtoDKsideAxis, femtoDKsideAxis, femtoDKlongAxis, femtoDKlongAxis}); }
237+
mHistogramRegistry->add((folderName + "/relPair3dresolution").c_str(), (";" + femtoDKout + "mctruth;" + femtoDKside + "mctruth;" + femtoDKlong + "mctruth;" + femtoDKout + "_reco;" + femtoDKside + "_reco;" + femtoDKlong + "_reco;").c_str(),
238+
kTHnSparseF, {femtoDKoutAxis, femtoDKoutAxis, femtoDKsideAxis, femtoDKsideAxis, femtoDKlongAxis, femtoDKlongAxis});
239+
}
240240
}
241241

242242
template <typename T>
243243
void init_3Dqn(HistogramRegistry* registry,
244244
T& DKoutBins, T& DKsideBins, T& DKlongBins, T& mTBins4D, T& multPercentileBins4D,
245-
bool isMC, ConfigurableAxis qnBins = {"qnBins", {10, 0, 10}, "qn binning"}, ConfigurableAxis pairPhiBins = {"phiBins", {10, 0 - 0.05, TMath::Pi() + 0.05}, "pair phi binning"}, bool smearingByOrigin=false)
245+
bool isMC, ConfigurableAxis qnBins = {"qnBins", {10, 0, 10}, "qn binning"}, ConfigurableAxis pairPhiBins = {"phiBins", {10, 0 - 0.05, TMath::Pi() + 0.05}, "pair phi binning"}, bool smearingByOrigin = false)
246246
{
247247
mHistogramRegistry = registry;
248248

@@ -268,7 +268,7 @@ class FemtoDreamContainer
268268
init_base_3Dqn(folderName, femtoObsDKout, femtoObsDKside, femtoObsDKlong,
269269
DKoutAxis, DKsideAxis, DKlongAxis, mTAxis4D, multPercentileAxis4D, qnAxis, pairPhiAxis);
270270
init_3Dqn_MC(folderName, femtoObsDKout, femtoObsDKside, femtoObsDKlong,
271-
DKoutAxis, DKsideAxis, DKlongAxis, smearingByOrigin);
271+
DKoutAxis, DKsideAxis, DKlongAxis, smearingByOrigin);
272272
}
273273
}
274274

@@ -511,16 +511,15 @@ class FemtoDreamContainer
511511
} else {
512512
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[o2::aod::femtodreamMCparticle::MCType::kTruth]) + HIST("_3Dqn") + HIST("/relPair3dresolution"), k3dMC[1], k3d[1], k3dMC[2], k3d[2], k3dMC[3], k3d[3]);
513513
}
514-
515514
}
516515

517516
template <bool isMC, typename T1, typename T2>
518517
void setPair_3Dqn(T1 const& part1, T2 const& part2, const float multPercentile, bool IsSameSpecies, const float myQnBin, const float eventPlane, bool smearingByOrigin = false)
519518
{
520519

521520
std::vector<double> k3d = FemtoDreamMath::newpairfunc(part1, mMassOne, part2, mMassTwo, IsSameSpecies);
522-
if (k3d.size()<4){
523-
LOG(error)<<"newpairfunc returned size="<< k3d.size();
521+
if (k3d.size() < 4) {
522+
LOG(error) << "newpairfunc returned size=" << k3d.size();
524523
return;
525524
}
526525
float DKout = k3d[1];
@@ -538,8 +537,8 @@ class FemtoDreamContainer
538537
if (part1.has_fdMCParticle() && part2.has_fdMCParticle()) {
539538

540539
std::vector<double> k3dMC = FemtoDreamMath::newpairfuncMC(part1.fdMCParticle(), mMassOne, part2.fdMCParticle(), mMassTwo, IsSameSpecies);
541-
if (k3dMC.size()<4){
542-
LOG(error)<<"newpairfunc returned size="<< k3d.size();
540+
if (k3dMC.size() < 4) {
541+
LOG(error) << "newpairfunc returned size=" << k3d.size();
543542
return;
544543
}
545544
const float mTMC = FemtoDreamMath::getmT(part1.fdMCParticle(), mMassOne, part2.fdMCParticle(), mMassTwo);
@@ -564,8 +563,8 @@ class FemtoDreamContainer
564563
{
565564

566565
std::vector<double> k3d = FemtoDreamMath::newpairfunc(part1, mMassOne, part2, mMassTwo, IsSameSpecies);
567-
if (k3d.size()<4){
568-
LOG(error)<<"newpairfunc returned size="<< k3d.size();
566+
if (k3d.size() < 4) {
567+
LOG(error) << "newpairfunc returned size=" << k3d.size();
569568
return;
570569
}
571570
float DKout = k3d[1];
@@ -583,10 +582,10 @@ class FemtoDreamContainer
583582
if (part1.has_fdMCParticle() && part2.has_fdMCParticle()) {
584583

585584
std::vector<double> k3dMC = FemtoDreamMath::newpairfuncMC(part1.fdMCParticle(), mMassOne, part2.fdMCParticle(), mMassTwo, IsSameSpecies);
586-
if (k3dMC.size()<4){
587-
LOG(error)<<"newpairfunc returned size="<< k3d.size();
585+
if (k3dMC.size() < 4) {
586+
LOG(error) << "newpairfunc returned size=" << k3d.size();
588587
return;
589-
}
588+
}
590589
const float mTMC = FemtoDreamMath::getmT(part1.fdMCParticle(), mMassOne, part2.fdMCParticle(), mMassTwo);
591590
const float pairPhiEPMC = FemtoDreamMath::getPairPhiEP(part1.fdMCParticle(), mMassOne, part2.fdMCParticle(), mMassTwo, EP1, EP2);
592591

‎PWGCF/FemtoDream/TableProducer/femtoDreamProducerTask.cxx‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,7 @@ struct femtoDreamProducerTask {
314314
if (doprocessData == false && doprocessData_noCentrality == false && doprocessData_CentPbPb == false && doprocessData_CentPbPb_EP == false && doprocessMC == false && doprocessMC_noCentrality == false && doprocessMC_CentPbPb == false && doprocessMC_CentPbPb_EP == false) {
315315
LOGF(fatal, "Neither processData nor processMC enabled. Please choose one.");
316316
}
317-
if ((doprocessData == true && doprocessMC == true) || (doprocessData == true && doprocessMC_noCentrality == true) || (doprocessMC == true && doprocessMC_noCentrality == true) || (doprocessData_noCentrality == true && doprocessData == true) || (doprocessData_noCentrality == true && doprocessMC == true) || (doprocessData_noCentrality == true && doprocessMC_noCentrality == true) || (doprocessData_CentPbPb == true && doprocessData == true) || (doprocessData_CentPbPb == true && doprocessData_noCentrality == true) || (doprocessData_CentPbPb == true && doprocessMC == true) || (doprocessData_CentPbPb == true && doprocessMC_noCentrality == true) || (doprocessData_CentPbPb == true && doprocessMC_CentPbPb == true)
318-
|| (doprocessData_CentPbPb_EP == true && doprocessData == true) || (doprocessData_CentPbPb_EP == true && doprocessData_noCentrality == true) || (doprocessData_CentPbPb_EP == true && doprocessMC == true) || (doprocessData_CentPbPb_EP == true && doprocessMC_noCentrality == true) || (doprocessData_CentPbPb_EP == true && doprocessMC_CentPbPb == true) || (doprocessData_CentPbPb_EP == true && doprocessData_CentPbPb == true) || (doprocessData_CentPbPb_EP == true && doprocessMC_CentPbPb_EP == true)
319-
|| (doprocessMC_CentPbPb_EP == true && doprocessData == true) || (doprocessMC_CentPbPb_EP == true && doprocessData_noCentrality == true) || (doprocessMC_CentPbPb_EP == true && doprocessMC == true) || (doprocessMC_CentPbPb_EP == true && doprocessMC_noCentrality == true) || (doprocessMC_CentPbPb_EP == true && doprocessMC_CentPbPb == true) || (doprocessMC_CentPbPb_EP == true && doprocessData_CentPbPb == true)) {
317+
if ((doprocessData == true && doprocessMC == true) || (doprocessData == true && doprocessMC_noCentrality == true) || (doprocessMC == true && doprocessMC_noCentrality == true) || (doprocessData_noCentrality == true && doprocessData == true) || (doprocessData_noCentrality == true && doprocessMC == true) || (doprocessData_noCentrality == true && doprocessMC_noCentrality == true) || (doprocessData_CentPbPb == true && doprocessData == true) || (doprocessData_CentPbPb == true && doprocessData_noCentrality == true) || (doprocessData_CentPbPb == true && doprocessMC == true) || (doprocessData_CentPbPb == true && doprocessMC_noCentrality == true) || (doprocessData_CentPbPb == true && doprocessMC_CentPbPb == true) || (doprocessData_CentPbPb_EP == true && doprocessData == true) || (doprocessData_CentPbPb_EP == true && doprocessData_noCentrality == true) || (doprocessData_CentPbPb_EP == true && doprocessMC == true) || (doprocessData_CentPbPb_EP == true && doprocessMC_noCentrality == true) || (doprocessData_CentPbPb_EP == true && doprocessMC_CentPbPb == true) || (doprocessData_CentPbPb_EP == true && doprocessData_CentPbPb == true) || (doprocessData_CentPbPb_EP == true && doprocessMC_CentPbPb_EP == true) || (doprocessMC_CentPbPb_EP == true && doprocessData == true) || (doprocessMC_CentPbPb_EP == true && doprocessData_noCentrality == true) || (doprocessMC_CentPbPb_EP == true && doprocessMC == true) || (doprocessMC_CentPbPb_EP == true && doprocessMC_noCentrality == true) || (doprocessMC_CentPbPb_EP == true && doprocessMC_CentPbPb == true) || (doprocessMC_CentPbPb_EP == true && doprocessData_CentPbPb == true)) {
320318
LOGF(fatal,
321319
"Cannot enable more than one process switch at the same time. "
322320
"Please choose one.");
@@ -1138,7 +1136,7 @@ struct femtoDreamProducerTask {
11381136
float myqn = 0.f;
11391137
float myEP = 0.f;
11401138

1141-
if (!isMC || epCal.ConfMCQvec){
1139+
if (!isMC || epCal.ConfMCQvec) {
11421140
myqn = colCuts.computeqnVec(col, epCal.ConfQvecDetector);
11431141
myEP = TMath::RadToDeg() * colCuts.computeEP(col, EPHarmonic, epCal.ConfEPDetector); // psi from rad(0-pi) to deg, in table psi would be in deg,from 0-180
11441142
}
@@ -1288,16 +1286,16 @@ struct femtoDreamProducerTask {
12881286
PROCESS_SWITCH(femtoDreamProducerTask, processMC_CentPbPb, "Provide MC data with centrality information for PbPb collisions", false);
12891287

12901288
void processMC_CentPbPb_EP(aod::FemtoFullCollisionMC_CentPbPb_qvec const& col,
1291-
aod::BCsWithTimestamps const&,
1292-
soa::Join<aod::FemtoFullTracks, aod::McTrackLabels> const& tracks,
1293-
aod::FemtoFullMCgenCollisions const&,
1294-
aod::McParticles const&,
1295-
soa::Join<o2::aod::V0Datas, aod::McV0Labels> const& fullV0s, /// \todo with FilteredFullV0s
1296-
soa::Join<o2::aod::CascDatas, aod::McCascLabels> const& fullCascades)
1289+
aod::BCsWithTimestamps const&,
1290+
soa::Join<aod::FemtoFullTracks, aod::McTrackLabels> const& tracks,
1291+
aod::FemtoFullMCgenCollisions const&,
1292+
aod::McParticles const&,
1293+
soa::Join<o2::aod::V0Datas, aod::McV0Labels> const& fullV0s, /// \todo with FilteredFullV0s
1294+
soa::Join<o2::aod::CascDatas, aod::McCascLabels> const& fullCascades)
12971295
{
12981296
// get magnetic field for run
12991297
initCCDB_Mag_Trig(col.bc_as<aod::BCsWithTimestamps>());
1300-
// fill the tables
1298+
// fill the tables
13011299
fillCollisionsAndTracksAndV0AndCascade<true, false, true, true, true>(col, tracks, tracks, fullV0s, fullCascades);
13021300
}
13031301
PROCESS_SWITCH(femtoDreamProducerTask, processMC_CentPbPb_EP, "Provide MC data with centrality and q-vector table for PbPb collisions", false);

‎PWGCF/FemtoDream/Tasks/femtoDreamPairTaskTrackTrack.cxx‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ struct femtoDreamPairTaskTrackTrack {
713713
float myEP = -999.f;
714714
int myqnBin = -999;
715715

716-
if (!isMC || EPCal.mcQvec){
716+
if (!isMC || EPCal.mcQvec) {
717717
myEP = TMath::DegToRad() * col.eventPlane();
718718
if (EPCal.doQnSeparation || EPCal.do3DFemto) {
719719
myqnBin = epCalculator.myqnBin(col.multV0M(), EPCal.centMax, EPCal.fillFlowQA, EPCal.qnBinSeparator, col.qnVal(), EPCal.numQnBins, EPCal.centBinWidth);
@@ -748,7 +748,7 @@ struct femtoDreamPairTaskTrackTrack {
748748
}
749749
if (EPCal.do3DFemto) {
750750
sameEventQnCont.setPair_3Dqn<isMC>(p1, p2, col.multV0M(), Option.SameSpecies.value, myqnBin + 0.f, myEP, Option.SmearingByOrigin);
751-
}
751+
}
752752
} else {
753753
if (EPCal.do1DFemto) {
754754
sameEventQnCont.setPair_EP<isMC>(p2, p1, col.multV0M(), EPCal.doQnSeparation, EPCal.doQnSeparation ? myqnBin + 0.f : myEP);
@@ -801,14 +801,14 @@ struct femtoDreamPairTaskTrackTrack {
801801
/// process function for to call doSameEventEP with MC Data
802802
/// \param col subscribe to the collision table (Data)
803803
/// \param parts subscribe to the femtoDreamParticleTable
804-
void processSameEventEPMC(FilteredMCQnCollision& col,
804+
void processSameEventEPMC(FilteredMCQnCollision& col,
805805
o2::aod::FDMCCollisions&,
806806
soa::Join<o2::aod::FDParticles, o2::aod::FDMCLabels>& parts,
807807
o2::aod::FDMCParticles&)
808808
{
809809
if (EPCal.storeEvtTrkInfo) {
810810
fillCollision<true>(col);
811-
}
811+
}
812812
auto SliceTrk1 = PartitionMCTrk1->sliceByCached(aod::femtodreamparticle::fdCollisionId, col.globalIndex(), cache);
813813
auto SliceTrk2 = PartitionMCTrk2->sliceByCached(aod::femtodreamparticle::fdCollisionId, col.globalIndex(), cache);
814814
if (SliceTrk1.size() == 0 && SliceTrk2.size() == 0) {
@@ -833,16 +833,14 @@ struct femtoDreamPairTaskTrackTrack {
833833
auto myEP_event1 = -999.f;
834834
auto myEP_event2 = -999.f;
835835

836-
if (!isMC || EPCal.mcQvec){
836+
if (!isMC || EPCal.mcQvec) {
837837
myEP_event1 = TMath::DegToRad() * collision1.eventPlane();
838838
myEP_event2 = TMath::DegToRad() * collision2.eventPlane();
839-
}
840-
else{
839+
} else {
841840
myEP_event1 = 0.f;
842841
myEP_event2 = 0.f;
843842
}
844843

845-
846844
for (auto& [p1, p2] : combinations(CombinationsFullIndexPolicy(SliceTrk1, SliceTrk2))) {
847845
if (Option.CPROn.value) {
848846
if (pairCloseRejectionME.isClosePair(p1, p2, parts, collision1.magField())) {

0 commit comments

Comments
 (0)