Skip to content

Commit 9a79e13

Browse files
yakparoyakparo
committed
Formatting
1 parent 268c0e7 commit 9a79e13

File tree

1 file changed

+51
-53
lines changed

1 file changed

+51
-53
lines changed

‎PWGLF/Tasks/Strangeness/strangeCascTrack.cxx‎

Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ struct StrangeCascTrack {
119119
Configurable<float> cutZVertex{"cutZVertex", 10.0f, "max Z-vertex position"};
120120
Configurable<bool> cutDoSel8{"cutDoSel8", true, "choose events with sel8"};
121121
Configurable<bool> cutDoNoPileup{"cutDoNoPileup", true, "choose events with no bunch pileup"};
122-
Configurable<bool> cutDoGoodFT0 {"cutDoGoodFT0", true, "choose events with IsGoodZvtxFT0VsPV"};
122+
Configurable<bool> cutDoGoodFT0{"cutDoGoodFT0", true, "choose events with IsGoodZvtxFT0VsPV"};
123123
// cascade cuts
124124
Configurable<bool> cutDoPropagateDCA{"cutDoPropagateDCA", false, "choose events with sel8"};
125125
Configurable<float> cutPropDCAtoPVxy{"cutPropDCAtoPVxy", 0.02f, "max cascade dca to PV in xy - propagated"};
@@ -132,8 +132,7 @@ struct StrangeCascTrack {
132132
Configurable<std::vector<float>> cutMinCascCosPaVsPt{
133133
"cutMinCascCosPaVsPt",
134134
{0.993, 0.994, 0.995, 0.996, 0.997, 0.997, 0.998, 0.998, 0.999, 0.999, 0.999},
135-
"Min Casc CosPA per pT bin (same binning as axisPt)"
136-
};
135+
"Min Casc CosPA per pT bin (same binning as axisPt)"};
137136
Configurable<float> cutRapidity{"cutRapidity", 0.5f, "max rapidity"};
138137
Configurable<float> cutDauEta{"cutDauEta", 1.0f, "max eta of dau tracks"};
139138
Configurable<float> cutCompMassRej{"cutCompMassRej", 0.008f, "Competing mass rejection"};
@@ -405,11 +404,10 @@ struct StrangeCascTrack {
405404
bool passedCascCosPA = true;
406405
double casccospa = cascade.casccosPA(collision.posX(), collision.posY(), collision.posZ());
407406
const auto& edges = axesConfig.axisPt.value;
408-
int ptBin = std::upper_bound(edges.begin(), edges.end(), cascade.pt())
409-
- edges.begin() - 1;
407+
int ptBin = std::upper_bound(edges.begin(), edges.end(), cascade.pt()) - edges.begin() - 1;
410408
if (ptBin < 0 || ptBin >= (int)selCuts.cutMinCascCosPaVsPt->size()) {
411409
ptBin = 1;
412-
} // safety check - if pt bin not determined, default to loosest cut
410+
} // safety check - if pt bin not determined, default to loosest cut
413411
if (casccospa < selCuts.cutMinCascCosPaVsPt->at(ptBin)) {
414412
passedCascCosPA = false;
415413
passedAllSels = false;
@@ -976,22 +974,22 @@ struct StrangeCascTrack {
976974
histos.fill(HIST(TypeNames[Type]) + HIST("/NoSel-Truth/GenRecPt"), genPt, pt);
977975
if (passedAllSelsOmega || passedAllSelsXi) {
978976
histos.fill(HIST(TypeNames[Type]) + HIST("/Rec/GenRecPt"), genPt, pt);
979-
if (fillTruthXi || fillTruthOmega)
980-
histos.fill(HIST(TypeNames[Type]) + HIST("/Rec-Truth/GenRecPt"), genPt, pt);
977+
if (fillTruthXi || fillTruthOmega)
978+
histos.fill(HIST(TypeNames[Type]) + HIST("/Rec-Truth/GenRecPt"), genPt, pt);
981979
}
982980
if (fillTruthXi)
983981
histos.fill(HIST(TypeNames[Type]) + HIST("/NoSel-Truth/GenRecRapidityXi"), genYXi, cascade.yXi());
984982
if (passedAllSelsXi) {
985983
histos.fill(HIST(TypeNames[Type]) + HIST("/Rec/GenRecRapidityXi"), genYXi, cascade.yXi());
986-
if (fillTruthXi)
987-
histos.fill(HIST(TypeNames[Type]) + HIST("/Rec-Truth/GenRecRapidityXi"), genYXi, cascade.yXi());
984+
if (fillTruthXi)
985+
histos.fill(HIST(TypeNames[Type]) + HIST("/Rec-Truth/GenRecRapidityXi"), genYXi, cascade.yXi());
988986
}
989987
if (fillTruthOmega)
990988
histos.fill(HIST(TypeNames[Type]) + HIST("/NoSel-Truth/GenRecRapidityOmega"), genYOmega, cascade.yOmega());
991989
if (passedAllSelsOmega) {
992990
histos.fill(HIST(TypeNames[Type]) + HIST("/Rec/GenRecRapidityOmega"), genYOmega, cascade.yOmega());
993-
if (fillTruthOmega)
994-
histos.fill(HIST(TypeNames[Type]) + HIST("/Rec-Truth/GenRecRapidityOmega"), genYOmega, cascade.yOmega());
991+
if (fillTruthOmega)
992+
histos.fill(HIST(TypeNames[Type]) + HIST("/Rec-Truth/GenRecRapidityOmega"), genYOmega, cascade.yOmega());
995993
}
996994
}
997995
}
@@ -1002,7 +1000,7 @@ struct StrangeCascTrack {
10021000
{
10031001
// check if cut configuration is valid
10041002
if (selCuts.cutMinCascCosPaVsPt->size() != axesConfig.axisPt.value.size() - 1) {
1005-
LOGF(fatal, "cutMinCascCosPaVsPt size does not match axisPt binning");
1003+
LOGF(fatal, "cutMinCascCosPaVsPt size does not match axisPt binning");
10061004
}
10071005
// for all events processing
10081006
histos.add("NoSel-Events/EvCounter", "Event Counter", kTH1D, {{1, 0, 1}});
@@ -1121,17 +1119,17 @@ struct StrangeCascTrack {
11211119
histos.add("MC/Gen/EvCounter", "Event Counter", kTH1D, {{1, 0, 1}});
11221120
histos.add("MC/Gen/Mult", "Event charged multiplicty (all gen events)", kTH1D, {{3200, 0, 3200}});
11231121
histos.add("MC/Gen/RapidityXi", "Generated y (Xi)", kTH1D, {{200, -1.0, 1.0}});
1124-
histos.add("MC/Gen/Xi", "Xi", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated Xis
1125-
histos.add("MC/Gen/PrimaryXi", "Xi primaries", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Xis
1126-
histos.add("MC/Gen/PrimaryXiRapidity", "Xi primaries in |y|", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Xis in selected rapidity range
1127-
histos.add("MC/Gen/PrimaryXiMinusRapidity", "Xi- primaries in |y| ", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Xi-minus in selected rapidity range
1128-
histos.add("MC/Gen/PrimaryXiPlusRapidity", "Xi+ primaries in |y|", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Xi-plus in selected rapidity range
1122+
histos.add("MC/Gen/Xi", "Xi", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated Xis
1123+
histos.add("MC/Gen/PrimaryXi", "Xi primaries", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Xis
1124+
histos.add("MC/Gen/PrimaryXiRapidity", "Xi primaries in |y|", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Xis in selected rapidity range
1125+
histos.add("MC/Gen/PrimaryXiMinusRapidity", "Xi- primaries in |y| ", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Xi-minus in selected rapidity range
1126+
histos.add("MC/Gen/PrimaryXiPlusRapidity", "Xi+ primaries in |y|", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Xi-plus in selected rapidity range
11291127
histos.add("MC/Gen/RapidityOmega", "Generated y (Omega)", kTH1D, {{200, -1.0, 1.0}});
1130-
histos.add("MC/Gen/Omega", "Omega", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated Omegas
1131-
histos.add("MC/Gen/PrimaryOmega", "Omega primaries", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Omegas
1132-
histos.add("MC/Gen/PrimaryOmegaRapidity", "Omega primaries in |y|", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Omegas in selected rapidity range
1133-
histos.add("MC/Gen/PrimaryOmegaMinusRapidity", "Omega- primaries in |y| ", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Omega-minus in selected rapidity range
1134-
histos.add("MC/Gen/PrimaryOmegaPlusRapidity", "Omega+ primaries in |y|", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Omega-plus in selected rapidity range
1128+
histos.add("MC/Gen/Omega", "Omega", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated Omegas
1129+
histos.add("MC/Gen/PrimaryOmega", "Omega primaries", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Omegas
1130+
histos.add("MC/Gen/PrimaryOmegaRapidity", "Omega primaries in |y|", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Omegas in selected rapidity range
1131+
histos.add("MC/Gen/PrimaryOmegaMinusRapidity", "Omega- primaries in |y| ", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Omega-minus in selected rapidity range
1132+
histos.add("MC/Gen/PrimaryOmegaPlusRapidity", "Omega+ primaries in |y|", kTH2D, {{3200, 0, 3200}, {100, 0.0, 10.0}}); // generated primary Omega-plus in selected rapidity range
11351133
// generated events with reco >= 1:
11361134
histos.add("MC/EvRec/EvCounter", "Event Counter", kTH1D, {{1, 0, 1}});
11371135
histos.add("MC/EvRec/Mult", "Event charged multiplicty (gen events with reco>=1)", kTH1D, {{3200, 0, 3200}});
@@ -1141,11 +1139,11 @@ struct StrangeCascTrack {
11411139
histos.add("MC/EvRec/PrimaryXiRapidity", "Xi primaries in |y|", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Xis in selected rapidity range in reco>=1
11421140
histos.add("MC/EvRec/PrimaryXiMinusRapidity", "Xi- primaries in |y| ", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Xi-minus in selected rapidity range in reco>=1
11431141
histos.add("MC/EvRec/PrimaryXiPlusRapidity", "Xi+ primaries in |y|", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Xi-plus in selected rapidity range in reco>=1
1144-
histos.add("MC/EvRec/Omega", "Omega", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated Omegas in reco>=1
1145-
histos.add("MC/EvRec/PrimaryOmega", "Omega primaries", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Omegas in reco>=1
1146-
histos.add("MC/EvRec/PrimaryOmegaRapidity", "Omega primaries in |y|", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Omegas in selected rapidity range in reco>=1
1147-
histos.add("MC/EvRec/PrimaryOmegaMinusRapidity", "Omega- primaries in |y|", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Omega-minus in selected rapidity range in reco>=1
1148-
histos.add("MC/EvRec/PrimaryOmegaPlusRapidity", "Omega+ primaries in |y|", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Omega-plus in selected rapidity range in reco>=1
1142+
histos.add("MC/EvRec/Omega", "Omega", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated Omegas in reco>=1
1143+
histos.add("MC/EvRec/PrimaryOmega", "Omega primaries", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Omegas in reco>=1
1144+
histos.add("MC/EvRec/PrimaryOmegaRapidity", "Omega primaries in |y|", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Omegas in selected rapidity range in reco>=1
1145+
histos.add("MC/EvRec/PrimaryOmegaMinusRapidity", "Omega- primaries in |y|", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Omega-minus in selected rapidity range in reco>=1
1146+
histos.add("MC/EvRec/PrimaryOmegaPlusRapidity", "Omega+ primaries in |y|", kTH2D, {axesConfig.axisPt, axesConfig.axisMult}); // generated primary Omega-plus in selected rapidity range in reco>=1
11491147
// label filter statistic bins for standard cascs
11501148
histos.get<TH1>(HIST("Standard/Rec/FiltersXi"))->GetXaxis()->SetBinLabel(1, "p_{T}");
11511149
histos.get<TH1>(HIST("Standard/Rec/FiltersXi"))->GetXaxis()->SetBinLabel(2, "gen");
@@ -1293,35 +1291,35 @@ struct StrangeCascTrack {
12931291
auto slicedGenCascs = genCascs.sliceBy(cascsPerMcCollision, genColl.globalIndex());
12941292
for (auto const& casc : slicedGenCascs) {
12951293
if (casc.straMCCollisionId() != genColl.index())
1296-
continue; // safety check for correct slicing
1294+
continue; // safety check for correct slicing
12971295
// fill generated Xi and Omega (all) for statistics
12981296
double cascPt = casc.ptMC();
12991297
if (isValidPDG(casc, "Xi"))
1300-
histos.fill(HIST("MC/Gen/Xi"), genMult, cascPt);
1298+
histos.fill(HIST("MC/Gen/Xi"), genMult, cascPt);
13011299
if (isValidPDG(casc, "Omega"))
1302-
histos.fill(HIST("MC/Gen/Omega"), genMult, cascPt);
1300+
histos.fill(HIST("MC/Gen/Omega"), genMult, cascPt);
13031301
if (casc.isPhysicalPrimary()) {
13041302
// fill generated primary Xi and Omega for statistics
1305-
if (isValidPDG(casc, "Xi"))
1306-
histos.fill(HIST("MC/Gen/PrimaryXi"), genMult, cascPt);
1307-
if (isValidPDG(casc, "Omega"))
1308-
histos.fill(HIST("MC/Gen/PrimaryOmega"), genMult, cascPt);
1303+
if (isValidPDG(casc, "Xi"))
1304+
histos.fill(HIST("MC/Gen/PrimaryXi"), genMult, cascPt);
1305+
if (isValidPDG(casc, "Omega"))
1306+
histos.fill(HIST("MC/Gen/PrimaryOmega"), genMult, cascPt);
13091307
// fill generated primary Xi within rapidity for corrections
1310-
if (isValidPDG(casc, "Xi") && std::abs(casc.rapidityMC(0)) < selCuts.cutRapidity) {
1311-
histos.fill(HIST("MC/Gen/PrimaryXiRapidity"), genMult, cascPt);
1312-
if (casc.pdgCode() == PDG_t::kXiMinus)
1313-
histos.fill(HIST("MC/Gen/PrimaryXiMinusRapidity"), genMult, cascPt);
1314-
if (casc.pdgCode() == PDG_t::kXiPlusBar)
1315-
histos.fill(HIST("MC/Gen/PrimaryXiPlusRapidity"), genMult, cascPt);
1316-
}
1308+
if (isValidPDG(casc, "Xi") && std::abs(casc.rapidityMC(0)) < selCuts.cutRapidity) {
1309+
histos.fill(HIST("MC/Gen/PrimaryXiRapidity"), genMult, cascPt);
1310+
if (casc.pdgCode() == PDG_t::kXiMinus)
1311+
histos.fill(HIST("MC/Gen/PrimaryXiMinusRapidity"), genMult, cascPt);
1312+
if (casc.pdgCode() == PDG_t::kXiPlusBar)
1313+
histos.fill(HIST("MC/Gen/PrimaryXiPlusRapidity"), genMult, cascPt);
1314+
}
13171315
// fill generated primary Omega within rapidity for corrections
1318-
if (isValidPDG(casc, "Omega") && std::abs(casc.rapidityMC(2)) < selCuts.cutRapidity) {
1319-
histos.fill(HIST("MC/Gen/PrimaryOmegaRapidity"), genMult, cascPt);
1320-
if (casc.pdgCode() == PDG_t::kOmegaMinus)
1321-
histos.fill(HIST("MC/Gen/PrimaryOmegaMinusRapidity"), genMult, cascPt);
1322-
if (casc.pdgCode() == PDG_t::kOmegaPlusBar)
1323-
histos.fill(HIST("MC/Gen/PrimaryOmegaPlusRapidity"), genMult, cascPt);
1324-
}
1316+
if (isValidPDG(casc, "Omega") && std::abs(casc.rapidityMC(2)) < selCuts.cutRapidity) {
1317+
histos.fill(HIST("MC/Gen/PrimaryOmegaRapidity"), genMult, cascPt);
1318+
if (casc.pdgCode() == PDG_t::kOmegaMinus)
1319+
histos.fill(HIST("MC/Gen/PrimaryOmegaMinusRapidity"), genMult, cascPt);
1320+
if (casc.pdgCode() == PDG_t::kOmegaPlusBar)
1321+
histos.fill(HIST("MC/Gen/PrimaryOmegaPlusRapidity"), genMult, cascPt);
1322+
}
13251323
}
13261324
// fill gen rapidity for statistics
13271325
if (isValidPDG(casc, "Xi"))
@@ -1332,13 +1330,13 @@ struct StrangeCascTrack {
13321330
// look at rec. ev. >= 1 for corrections
13331331
auto slicedRecColls = recColls.sliceBy(perMcCollision, genColl.globalIndex());
13341332
if (slicedRecColls.size() > 0) {
1335-
histos.fill(HIST("MC/EvRec/EvCounter"), 0.5);
1336-
histos.fill(HIST("MC/EvRec/Mult"), genMult);
1333+
histos.fill(HIST("MC/EvRec/EvCounter"), 0.5);
1334+
histos.fill(HIST("MC/EvRec/Mult"), genMult);
13371335
}
13381336
for (auto const& recColl : slicedRecColls) {
13391337
int64_t genCollId = recColl.straMCCollisionId();
13401338
if (genColl.index() != genCollId)
1341-
continue; // safety check for correct slicing
1339+
continue; // safety check for correct slicing
13421340
// fill multiplicity-centrality distribution
13431341
double recoMult = (doProcessIons) ? recColl.centFT0C() : recColl.centFT0M();
13441342
histos.fill(HIST("MC/EvRec/MultCent"), recoMult, genMult);
@@ -1405,4 +1403,4 @@ WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
14051403
return WorkflowSpec{
14061404
adaptAnalysisTask<StrangeCascTrack>(cfgc),
14071405
};
1408-
}
1406+
}

0 commit comments

Comments
 (0)