Skip to content

Commit b9a3c68

Browse files
authored
Please consider the following formatting changes (#407)
1 parent f861107 commit b9a3c68

File tree

2 files changed

+29
-31
lines changed

2 files changed

+29
-31
lines changed

PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ struct StrangenessBuilder {
630630
// mmark this run as configured
631631
mRunNumber = bc.runNumber();
632632

633-
if(v0BuilderOpts.generatePhotonCandidates.value && v0BuilderOpts.moveTPCOnlyTracks.value){
633+
if (v0BuilderOpts.generatePhotonCandidates.value && v0BuilderOpts.moveTPCOnlyTracks.value) {
634634
// initialize only if needed, avoid unnecessary CCDB calls
635635
mVDriftMgr.init(&ccdb->instance());
636636
mVDriftMgr.update(timestamp);
@@ -1150,27 +1150,27 @@ struct StrangenessBuilder {
11501150
auto negTrackPar = getTrackParCov(negTrack);
11511151

11521152
// handle TPC-only tracks properly (photon conversions)
1153-
if(v0BuilderOpts.moveTPCOnlyTracks){
1153+
if (v0BuilderOpts.moveTPCOnlyTracks) {
11541154
bool isPosTPCOnly = (posTrack.hasTPC() && !posTrack.hasITS() && !posTrack.hasTRD() && !posTrack.hasTOF());
1155-
if(isPosTPCOnly){
1156-
// Nota bene: positive is TPC-only -> this entire V0 merits treatment as photon candidate
1155+
if (isPosTPCOnly) {
1156+
// Nota bene: positive is TPC-only -> this entire V0 merits treatment as photon candidate
11571157
posTrackPar.setPID(o2::track::PID::Electron);
11581158
negTrackPar.setPID(o2::track::PID::Electron);
11591159

11601160
auto const& collision = collisions.rawIteratorAt(v0.collisionId);
1161-
if(!mVDriftMgr.moveTPCTrack<TBCs, TCollisions>(collision, posTrack, posTrackPar)){
1161+
if (!mVDriftMgr.moveTPCTrack<TBCs, TCollisions>(collision, posTrack, posTrackPar)) {
11621162
return;
11631163
}
11641164
}
11651165

11661166
bool isNegTPCOnly = (negTrack.hasTPC() && !negTrack.hasITS() && !negTrack.hasTRD() && !negTrack.hasTOF());
1167-
if(isNegTPCOnly){
1168-
// Nota bene: negative is TPC-only -> this entire V0 merits treatment as photon candidate
1167+
if (isNegTPCOnly) {
1168+
// Nota bene: negative is TPC-only -> this entire V0 merits treatment as photon candidate
11691169
posTrackPar.setPID(o2::track::PID::Electron);
11701170
negTrackPar.setPID(o2::track::PID::Electron);
11711171

11721172
auto const& collision = collisions.rawIteratorAt(v0.collisionId);
1173-
if(!mVDriftMgr.moveTPCTrack<TBCs, TCollisions>(collision, negTrack, negTrackPar)){
1173+
if (!mVDriftMgr.moveTPCTrack<TBCs, TCollisions>(collision, negTrack, negTrackPar)) {
11741174
return;
11751175
}
11761176
}

PWGLF/Utils/strangenessBuilderHelper.h

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ class strangenessBuilderHelper
168168
float pvX, float pvY, float pvZ,
169169
TTrack const& positiveTrack,
170170
TTrack const& negativeTrack,
171-
TTrackParametrization& positiveTrackParam,
172-
TTrackParametrization& negativeTrackParam,
171+
TTrackParametrization& positiveTrackParam,
172+
TTrackParametrization& negativeTrackParam,
173173
bool useCollinearFit = false,
174174
bool calculateCovariance = false)
175175
{
@@ -195,7 +195,7 @@ class strangenessBuilderHelper
195195
// do DCA to PV on copies instead of originals
196196
auto positiveTrackParamCopy = positiveTrackParam;
197197
auto negativeTrackParamCopy = negativeTrackParam;
198-
198+
199199
o2::base::Propagator::Instance()->propagateToDCABxByBz({pvX, pvY, pvZ}, positiveTrackParamCopy, 2.f, fitter.getMatCorrType(), &dcaInfo);
200200
v0.positiveDCAxy = dcaInfo[0];
201201

@@ -235,7 +235,7 @@ class strangenessBuilderHelper
235235
// avoids misuse if mixed with KF particle use
236236
v0.momentum[i] = v0.positiveMomentum[i] + v0.negativeMomentum[i];
237237
}
238-
238+
239239
// get decay vertex coordinates
240240
const auto& vtx = fitter.getPCACandidate();
241241
for (int i = 0; i < 3; i++) {
@@ -315,17 +315,16 @@ class strangenessBuilderHelper
315315
}
316316

317317
template <typename TCollision, typename TTrack, typename TTrackParametrization>
318-
bool buildV0CandidateWithKF(TCollision const& collision,
318+
bool buildV0CandidateWithKF(TCollision const& collision,
319319
TTrack const& positiveTrack,
320320
TTrack const& negativeTrack,
321-
TTrackParametrization& positiveTrackParam,
322-
TTrackParametrization& negativeTrackParam,
323-
int kfConstructMethod = 2, // the typical used
321+
TTrackParametrization& positiveTrackParam,
322+
TTrackParametrization& negativeTrackParam,
323+
int kfConstructMethod = 2, // the typical used
324324
float kfConstrainedMassValue = 0.0f, // negative: no constraint
325-
bool kfConstrainToPrimaryVertex = true
326-
)
325+
bool kfConstrainToPrimaryVertex = true)
327326
{
328-
int collisionIndex = collision.globalIndex();
327+
int collisionIndex = collision.globalIndex();
329328
float pvX = collision.posX();
330329
float pvY = collision.posY();
331330
float pvZ = collision.posZ();
@@ -352,7 +351,7 @@ class strangenessBuilderHelper
352351
// do DCA to PV on copies instead of originals
353352
auto positiveTrackParamCopy = positiveTrackParam;
354353
auto negativeTrackParamCopy = negativeTrackParam;
355-
354+
356355
o2::base::Propagator::Instance()->propagateToDCABxByBz({pvX, pvY, pvZ}, positiveTrackParamCopy, 2.f, fitter.getMatCorrType(), &dcaInfo);
357356
v0.positiveDCAxy = dcaInfo[0];
358357

@@ -387,7 +386,7 @@ class strangenessBuilderHelper
387386
return false;
388387
}
389388

390-
if (kfConstrainedMassValue>-1e-4) {
389+
if (kfConstrainedMassValue > -1e-4) {
391390
// photon constraint: this one's got no mass
392391
KFV0.SetNonlinearMassConstraint(kfConstrainedMassValue);
393392
}
@@ -406,10 +405,9 @@ class strangenessBuilderHelper
406405
v0.negativeMomentum = {kfpNeg_DecayVtx.GetPx(), kfpNeg_DecayVtx.GetPy(), kfpNeg_DecayVtx.GetPz()};
407406

408407
v0.daughterDCA = std::hypot(
409-
kfpPos_DecayVtx.GetX()-kfpNeg_DecayVtx.GetX(),
410-
kfpPos_DecayVtx.GetY()-kfpNeg_DecayVtx.GetY(),
411-
kfpPos_DecayVtx.GetZ()-kfpNeg_DecayVtx.GetZ()
412-
);
408+
kfpPos_DecayVtx.GetX() - kfpNeg_DecayVtx.GetX(),
409+
kfpPos_DecayVtx.GetY() - kfpNeg_DecayVtx.GetY(),
410+
kfpPos_DecayVtx.GetZ() - kfpNeg_DecayVtx.GetZ());
413411

414412
if (v0.daughterDCA > v0selections.dcav0dau) {
415413
return false;
@@ -434,14 +432,14 @@ class strangenessBuilderHelper
434432
v0.pointingAngle = TMath::ACos(cosPA);
435433

436434
v0.dcaXY = CalculateDCAStraightToPV(
437-
v0.position[0], v0.position[1], v0.position[2],
438-
v0.momentum[0], v0.momentum[1], v0.momentum[2],
439-
pvX, pvY, pvZ);
435+
v0.position[0], v0.position[1], v0.position[2],
436+
v0.momentum[0], v0.momentum[1], v0.momentum[2],
437+
pvX, pvY, pvZ);
440438

441-
// apply topological constraint to PV if requested
442-
// might adjust px py pz
439+
// apply topological constraint to PV if requested
440+
// might adjust px py pz
443441
KFParticle KFV0_PV = KFV0;
444-
if(kfConstrainToPrimaryVertex){
442+
if (kfConstrainToPrimaryVertex) {
445443
KFV0_PV.SetProductionVertex(KFPV);
446444
}
447445
v0.momentum = {KFV0_PV.GetPx(), KFV0_PV.GetPy(), KFV0_PV.GetPz()};

0 commit comments

Comments
 (0)