Skip to content

Commit 617da9d

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 591bd1a commit 617da9d

File tree

2 files changed

+51
-53
lines changed

2 files changed

+51
-53
lines changed

‎PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static const int defaultParameters[nTablesConst][nParameters]{
9090
{-1},
9191
{-1},
9292
{-1}, // index 9
93-
{-1},
93+
{-1},
9494
{-1},
9595
{-1},
9696
{-1},
@@ -110,12 +110,11 @@ static const int defaultParameters[nTablesConst][nParameters]{
110110
{-1},
111111
{-1},
112112
{-1}, // index 29
113-
{-1},
114-
{-1},
115-
{-1},
116-
{-1},
117-
{-1}
118-
};
113+
{-1},
114+
{-1},
115+
{-1},
116+
{-1},
117+
{-1}};
119118

120119
// use parameters + cov mat non-propagated, aux info + (extension propagated)
121120
using FullTracksExt = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov>;
@@ -391,9 +390,9 @@ struct StrangenessBuilder {
391390

392391
for (int i = 0; i < nTables; i++) {
393392
// adjust bookkeeping histogram
394-
h->GetXaxis()->SetBinLabel(i+1, tableNames[i].c_str());
395-
h2->GetXaxis()->SetBinLabel(i+1, tableNames[i].c_str());
396-
h->SetBinContent(i+1, -1); // mark all as disabled to start
393+
h->GetXaxis()->SetBinLabel(i + 1, tableNames[i].c_str());
394+
h2->GetXaxis()->SetBinLabel(i + 1, tableNames[i].c_str());
395+
h->SetBinContent(i + 1, -1); // mark all as disabled to start
397396

398397
int f = enabledTables->get(tableNames[i].c_str(), "enable");
399398
if (f == 1) {
@@ -423,7 +422,7 @@ struct StrangenessBuilder {
423422
// printout to be improved in the future
424423
if (mEnabledTables[i]) {
425424
LOGF(info, " -~> Table enabled: %s", tableNames[i]);
426-
h->SetBinContent(i+1, 0); // mark enabled
425+
h->SetBinContent(i + 1, 0); // mark enabled
427426
}
428427
}
429428
LOGF(info, "*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*");
@@ -444,15 +443,14 @@ struct StrangenessBuilder {
444443
LOGF(info, "-~> Cascade | Lambda mass window .......: %f", cascadeBuilderOpts.lambdaMassWindow.value);
445444
LOGF(info, "-~> Cascade | Maximum daughter eta .....: %f", cascadeBuilderOpts.maxDaughterEta.value);
446445
LOGF(info, "*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*+-+*");
447-
448446

449447
ccdb->setURL(ccdbConfigurations.ccdburl);
450448
ccdb->setCaching(true);
451449
ccdb->setLocalObjectValidityChecking();
452450
ccdb->setFatalWhenNull(false);
453451

454-
// set V0 parameters in the helper
455-
straHelper.v0selections.minCrossedRows = v0BuilderOpts.minCrossedRows;
452+
// set V0 parameters in the helper
453+
straHelper.v0selections.minCrossedRows = v0BuilderOpts.minCrossedRows;
456454
straHelper.v0selections.dcanegtopv = v0BuilderOpts.dcanegtopv;
457455
straHelper.v0selections.dcapostopv = v0BuilderOpts.dcapostopv;
458456
straHelper.v0selections.v0cospa = v0BuilderOpts.v0cospa;
@@ -461,7 +459,7 @@ struct StrangenessBuilder {
461459
straHelper.v0selections.maxDaughterEta = v0BuilderOpts.maxDaughterEta;
462460

463461
// set cascade parameters in the helper
464-
straHelper.cascadeselections.minCrossedRows = cascadeBuilderOpts.minCrossedRows;
462+
straHelper.cascadeselections.minCrossedRows = cascadeBuilderOpts.minCrossedRows;
465463
straHelper.cascadeselections.dcabachtopv = cascadeBuilderOpts.dcabachtopv;
466464
straHelper.cascadeselections.cascradius = cascadeBuilderOpts.cascradius;
467465
straHelper.cascadeselections.casccospa = cascadeBuilderOpts.casccospa;

‎PWGLF/Utils/strangenessBuilderHelper.h‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@ class strangenessBuilderHelper
145145
fitter.setUseAbsDCA(true);
146146
fitter.setWeightedFinalPCA(false);
147147

148-
v0selections.minCrossedRows = -1;
148+
v0selections.minCrossedRows = -1;
149149
v0selections.dcanegtopv = -1.0f;
150150
v0selections.dcapostopv = -1.0f;
151-
v0selections.v0cospa = -2;
151+
v0selections.v0cospa = -2;
152152
v0selections.dcav0dau = 1e+6;
153-
v0selections.v0radius = 0.0f;
153+
v0selections.v0radius = 0.0f;
154154
v0selections.maxDaughterEta = 2.0;
155155

156156
// LUT has to be loaded later
@@ -168,19 +168,19 @@ class strangenessBuilderHelper
168168
bool useCollinearFit = false,
169169
bool calculateCovariance = false)
170170
{
171-
// verify track quality
172-
if(positiveTrack.tpcNClsCrossedRows() < v0selections.minCrossedRows){
171+
// verify track quality
172+
if (positiveTrack.tpcNClsCrossedRows() < v0selections.minCrossedRows) {
173173
return false;
174174
}
175-
if(negativeTrack.tpcNClsCrossedRows() < v0selections.minCrossedRows){
175+
if (negativeTrack.tpcNClsCrossedRows() < v0selections.minCrossedRows) {
176176
return false;
177177
}
178178

179179
// verify eta
180-
if(std::fabs(positiveTrack.eta()) > v0selections.maxDaughterEta){
180+
if (std::fabs(positiveTrack.eta()) > v0selections.maxDaughterEta) {
181181
return false;
182182
}
183-
if(std::fabs(negativeTrack.eta()) > v0selections.maxDaughterEta){
183+
if (std::fabs(negativeTrack.eta()) > v0selections.maxDaughterEta) {
184184
return false;
185185
}
186186

@@ -191,15 +191,15 @@ class strangenessBuilderHelper
191191
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, posTrackPar, 2.f, fitter.getMatCorrType(), &dcaInfo);
192192
v0.positiveDCAxy = dcaInfo[0];
193193

194-
if(std::fabs(v0.positiveDCAxy) < v0selections.dcanegtopv){
194+
if (std::fabs(v0.positiveDCAxy) < v0selections.dcanegtopv) {
195195
return false;
196196
}
197197

198198
auto negTrackPar = getTrackPar(negativeTrack);
199199
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, negTrackPar, 2.f, fitter.getMatCorrType(), &dcaInfo);
200200
v0.negativeDCAxy = dcaInfo[0];
201201

202-
if(std::fabs(v0.negativeDCAxy) < v0selections.dcanegtopv){
202+
if (std::fabs(v0.negativeDCAxy) < v0selections.dcanegtopv) {
203203
return false;
204204
}
205205

@@ -234,21 +234,21 @@ class strangenessBuilderHelper
234234
v0.position[i] = vtx[i];
235235
}
236236

237-
if(std::hypot(v0.position[0], v0.position[1]) < v0selections.v0radius){
237+
if (std::hypot(v0.position[0], v0.position[1]) < v0selections.v0radius) {
238238
return false;
239239
}
240240

241241
v0.daughterDCA = TMath::Sqrt(fitter.getChi2AtPCACandidate());
242242

243-
if(v0.daughterDCA > v0selections.dcav0dau){
243+
if (v0.daughterDCA > v0selections.dcav0dau) {
244244
return false;
245245
}
246246

247247
double cosPA = RecoDecay::cpa(
248248
std::array{collision.posX(), collision.posY(), collision.posZ()},
249249
std::array{v0.position[0], v0.position[1], v0.position[2]},
250250
std::array{v0.positiveMomentum[0] + v0.negativeMomentum[0], v0.positiveMomentum[1] + v0.negativeMomentum[1], v0.positiveMomentum[2] + v0.negativeMomentum[2]});
251-
if(cosPA < v0selections.v0cospa){
251+
if (cosPA < v0selections.v0cospa) {
252252
return false;
253253
}
254254

@@ -335,33 +335,33 @@ class strangenessBuilderHelper
335335
bool useCascadeMomentumAtPV = false,
336336
bool processCovariances = false)
337337
{
338-
// verify track quality
339-
if(positiveTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows){
338+
// verify track quality
339+
if (positiveTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows) {
340340
return false;
341341
}
342-
if(negativeTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows){
342+
if (negativeTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows) {
343343
return false;
344344
}
345-
if(bachelorTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows){
345+
if (bachelorTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows) {
346346
return false;
347347
}
348348

349349
// verify eta
350-
if(std::fabs(positiveTrack.eta()) > cascadeselections.maxDaughterEta){
350+
if (std::fabs(positiveTrack.eta()) > cascadeselections.maxDaughterEta) {
351351
return false;
352352
}
353-
if(std::fabs(negativeTrack.eta()) > cascadeselections.maxDaughterEta){
353+
if (std::fabs(negativeTrack.eta()) > cascadeselections.maxDaughterEta) {
354354
return false;
355355
}
356-
if(std::fabs(bachelorTrack.eta()) > cascadeselections.maxDaughterEta){
356+
if (std::fabs(bachelorTrack.eta()) > cascadeselections.maxDaughterEta) {
357357
return false;
358358
}
359359

360360
// verify lambda mass
361-
if (bachelorTrack.sign()<0 && std::fabs(v0input.massLambda - 1.116) > cascadeselections.lambdaMassWindow){
361+
if (bachelorTrack.sign() < 0 && std::fabs(v0input.massLambda - 1.116) > cascadeselections.lambdaMassWindow) {
362362
return false;
363363
}
364-
if (bachelorTrack.sign()>0 && std::fabs(v0input.massAntiLambda - 1.116) > cascadeselections.lambdaMassWindow){
364+
if (bachelorTrack.sign() > 0 && std::fabs(v0input.massAntiLambda - 1.116) > cascadeselections.lambdaMassWindow) {
365365
return false;
366366
}
367367

@@ -386,7 +386,7 @@ class strangenessBuilderHelper
386386
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, bachTrackPar, 2.f, fitter.getMatCorrType(), &dcaInfo);
387387
cascade.bachelorDCAxy = dcaInfo[0];
388388

389-
if(std::fabs(cascade.bachelorDCAxy) < cascadeselections.dcabachtopv){
389+
if (std::fabs(cascade.bachelorDCAxy) < cascadeselections.dcabachtopv) {
390390
return false;
391391
}
392392

@@ -423,7 +423,7 @@ class strangenessBuilderHelper
423423

424424
// DCA between cascade daughters
425425
cascade.cascadeDaughterDCA = TMath::Sqrt(fitter.getChi2AtPCACandidate());
426-
if(cascade.cascadeDaughterDCA > cascadeselections.dcacascdau){
426+
if (cascade.cascadeDaughterDCA > cascadeselections.dcacascdau) {
427427
return false;
428428
}
429429

@@ -433,7 +433,7 @@ class strangenessBuilderHelper
433433
for (int i = 0; i < 3; i++) {
434434
cascade.cascadePosition[i] = vtx[i];
435435
}
436-
if(std::hypot(cascade.cascadePosition[0], cascade.cascadePosition[1]) < cascadeselections.cascradius){
436+
if (std::hypot(cascade.cascadePosition[0], cascade.cascadePosition[1]) < cascadeselections.cascradius) {
437437
return false;
438438
}
439439

@@ -443,7 +443,7 @@ class strangenessBuilderHelper
443443
std::array{v0input.positiveMomentum[0] + v0input.negativeMomentum[0] + cascade.bachelorMomentum[0],
444444
v0input.positiveMomentum[1] + v0input.negativeMomentum[1] + cascade.bachelorMomentum[1],
445445
v0input.positiveMomentum[2] + v0input.negativeMomentum[2] + cascade.bachelorMomentum[2]});
446-
if(cosPA < cascadeselections.casccospa){
446+
if (cosPA < cascadeselections.casccospa) {
447447
return false;
448448
}
449449
cascade.pointingAngle = TMath::ACos(cosPA);
@@ -548,24 +548,24 @@ class strangenessBuilderHelper
548548
// dispenses prior V0 generation, uses constrained (re-)fit based on bachelor charge
549549
//*>~<*>~<*>~<*>~<*>~<*>~<*>~<*>~<*>~<*
550550

551-
if(positiveTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows){
551+
if (positiveTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows) {
552552
return false;
553553
}
554-
if(negativeTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows){
554+
if (negativeTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows) {
555555
return false;
556556
}
557-
if(bachelorTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows){
557+
if (bachelorTrack.tpcNClsCrossedRows() < cascadeselections.minCrossedRows) {
558558
return false;
559559
}
560560

561561
// verify eta
562-
if(std::fabs(positiveTrack.eta()) > cascadeselections.maxDaughterEta){
562+
if (std::fabs(positiveTrack.eta()) > cascadeselections.maxDaughterEta) {
563563
return false;
564564
}
565-
if(std::fabs(negativeTrack.eta()) > cascadeselections.maxDaughterEta){
565+
if (std::fabs(negativeTrack.eta()) > cascadeselections.maxDaughterEta) {
566566
return false;
567567
}
568-
if(std::fabs(bachelorTrack.eta()) > cascadeselections.maxDaughterEta){
568+
if (std::fabs(bachelorTrack.eta()) > cascadeselections.maxDaughterEta) {
569569
return false;
570570
}
571571

@@ -596,7 +596,7 @@ class strangenessBuilderHelper
596596
o2::base::Propagator::Instance()->propagateToDCABxByBz({collision.posX(), collision.posY(), collision.posZ()}, negTrackParCovForDCA, 2.f, fitter.getMatCorrType(), &dcaInfo);
597597
cascade.negativeDCAxy = dcaInfo[0];
598598

599-
if(std::fabs(cascade.bachelorDCAxy) < cascadeselections.dcabachtopv){
599+
if (std::fabs(cascade.bachelorDCAxy) < cascadeselections.dcabachtopv) {
600600
return false;
601601
}
602602

@@ -716,7 +716,7 @@ class strangenessBuilderHelper
716716

717717
// get DCA of daughters at vertex
718718
cascade.cascadeDaughterDCA = kfpBachPion.GetDistanceFromParticle(kfpV0);
719-
if(cascade.cascadeDaughterDCA > cascadeselections.dcacascdau){
719+
if (cascade.cascadeDaughterDCA > cascadeselections.dcacascdau) {
720720
return false;
721721
}
722722

@@ -785,7 +785,7 @@ class strangenessBuilderHelper
785785
cascade.cascadeMomentum[1] = KFOmega.GetPy();
786786
cascade.cascadeMomentum[2] = KFOmega.GetPz();
787787
}
788-
if(std::hypot(cascade.cascadePosition[0], cascade.cascadePosition[1]) < cascadeselections.cascradius){
788+
if (std::hypot(cascade.cascadePosition[0], cascade.cascadePosition[1]) < cascadeselections.cascradius) {
789789
return false;
790790
}
791791

@@ -794,7 +794,7 @@ class strangenessBuilderHelper
794794
std::array{collision.posX(), collision.posY(), collision.posZ()},
795795
std::array{cascade.cascadePosition[0], cascade.cascadePosition[1], cascade.cascadePosition[2]},
796796
std::array{cascade.cascadeMomentum[0], cascade.cascadeMomentum[1], cascade.cascadeMomentum[2]});
797-
if(cosPA < cascadeselections.casccospa){
797+
if (cosPA < cascadeselections.casccospa) {
798798
return false;
799799
}
800800
cascade.pointingAngle = TMath::ACos(cosPA);
@@ -840,7 +840,7 @@ class strangenessBuilderHelper
840840
v0candidate v0; // storage for V0 candidate properties
841841
cascadeCandidate cascade; // storage for cascade candidate properties
842842

843-
// v0 candidate criteria
843+
// v0 candidate criteria
844844
struct {
845845
int minCrossedRows;
846846
float dcanegtopv;
@@ -851,7 +851,7 @@ class strangenessBuilderHelper
851851
float maxDaughterEta;
852852
} v0selections;
853853

854-
// cascade candidate criteria
854+
// cascade candidate criteria
855855
struct {
856856
int minCrossedRows;
857857
float dcabachtopv;

0 commit comments

Comments
 (0)