Skip to content

Commit d1498bd

Browse files
tutripattutripat
authored
Fixing formatting issues
Removed unused constants and refactored event selection logic.
1 parent cce97ca commit d1498bd

1 file changed

Lines changed: 26 additions & 36 deletions

File tree

‎PWGLF/Tasks/GlobalEventProperties/PseudorapidityDensityMFT.cxx‎

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -295,18 +295,8 @@ struct PseudorapidityDensityMFT {
295295
}
296296
static constexpr int NoCompatibleCollisions = 0;
297297
static constexpr int SingleCompatibleCollision = 1;
298-
299-
static constexpr int OrphanAmbDegree = 0;
300-
static constexpr int NonAmbiguousAmbDegree = 1;
301-
302298
static constexpr int ChargeUnitTimesThree = 3;
303299

304-
struct EvSelStep {
305-
bool enabled;
306-
uint32_t bit;
307-
GenRecoCutBin bin;
308-
};
309-
310300
void initMagField(FullBCs::iterator const& bc)
311301
{
312302
if (magRunNumber == bc.runNumber()) {
@@ -446,20 +436,20 @@ struct PseudorapidityDensityMFT {
446436
"enabled!");
447437
}
448438
AxisSpec multAxis = {multBinning, "N_{trk}"};
449-
auto hstat = registry.get<TH1>(HIST("EventSelection"));
450-
auto* x = hstat->GetXaxis();
451-
x->SetBinLabel(static_cast<int>(EventSelectionBin::All), "All");
452-
x->SetBinLabel(static_cast<int>(EventSelectionBin::Vz), "Vz");
453-
x->SetBinLabel(static_cast<int>(EventSelectionBin::VzItsRof), "Vz+ITSRof");
454-
x->SetBinLabel(static_cast<int>(EventSelectionBin::VzSelected), "Vz+Selected");
455-
x->SetBinLabel(static_cast<int>(EventSelectionBin::Sel8VzInelGt0), "Sel8+Vz+INEL>0");
456-
x->SetBinLabel(static_cast<int>(EventSelectionBin::SelInelInelFwdGt0), "Sel INEL,INEL_fwd>0");
457-
x->SetBinLabel(static_cast<int>(EventSelectionBin::Rejected), "Rejected");
458-
x->SetBinLabel(static_cast<int>(EventSelectionBin::GoodBCs), "Good BCs");
459-
x->SetBinLabel(static_cast<int>(EventSelectionBin::BCsWithCollisions), "BCs with collisions");
460-
x->SetBinLabel(static_cast<int>(EventSelectionBin::BCsWithPileupSplitting), "BCs with pile-up/splitting");
461-
x->SetBinLabel(static_cast<int>(EventSelectionBin::PerCollisionSampleGt0), "percollisionSample>0");
462-
x->SetBinLabel(static_cast<int>(EventSelectionBin::MidtracksAndPerCollisionSampleGt0), "midtracks+percollisionSample>0");
439+
auto eventSelectionHist = registry.get<TH1>(HIST("EventSelection"));
440+
auto* eventSelectionAxis = eventSelectionHist->GetXaxis();
441+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::All), "All");
442+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::Vz), "Vz");
443+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::VzItsRof), "Vz+ITSRof");
444+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::VzSelected), "Vz+Selected");
445+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::Sel8VzInelGt0), "Sel8+Vz+INEL>0");
446+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::SelInelInelFwdGt0), "Sel INEL,INEL_fwd>0");
447+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::Rejected), "Rejected");
448+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::GoodBCs), "Good BCs");
449+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::BCsWithCollisions), "BCs with collisions");
450+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::BCsWithPileupSplitting), "BCs with pile-up/splitting");
451+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::PerCollisionSampleGt0), "percollisionSample>0");
452+
eventSelectionAxis->SetBinLabel(static_cast<int>(EventSelectionBin::MidtracksAndPerCollisionSampleGt0), "midtracks+percollisionSample>0");
463453
registry.add({"EventSelectionData",
464454
";cut;events",
465455
{HistType::kTH1F, {{16, 0.5, 16.5}}}});
@@ -1160,12 +1150,12 @@ struct PseudorapidityDensityMFT {
11601150
";status;centrality;events",
11611151
{HistType::kTH1F, {{5, 0.5, 5.5}}}});
11621152
auto heff = registry.get<TH1>(HIST("EventEfficiencymc"));
1163-
x = heff->GetXaxis();
1164-
x->SetBinLabel(static_cast<int>(EventEfficiencyBin::Generated), "Generated");
1165-
x->SetBinLabel(static_cast<int>(EventEfficiencyBin::GeneratedInelGt0), "Generated INEL>0");
1166-
x->SetBinLabel(static_cast<int>(EventEfficiencyBin::Reconstructed), "Reconstructed");
1167-
x->SetBinLabel(static_cast<int>(EventEfficiencyBin::Selected), "Selected");
1168-
x->SetBinLabel(static_cast<int>(EventEfficiencyBin::SelectedInelGt0), "Selected INEL>0");
1153+
auto* eventEfficiencyAxis = heff->GetXaxis();
1154+
eventEfficiencyAxis->SetBinLabel(static_cast<int>(EventEfficiencyBin::Generated), "Generated");
1155+
eventEfficiencyAxis->SetBinLabel(static_cast<int>(EventEfficiencyBin::GeneratedInelGt0), "Generated INEL>0");
1156+
eventEfficiencyAxis->SetBinLabel(static_cast<int>(EventEfficiencyBin::Reconstructed), "Reconstructed");
1157+
eventEfficiencyAxis->SetBinLabel(static_cast<int>(EventEfficiencyBin::Selected), "Selected");
1158+
eventEfficiencyAxis->SetBinLabel(static_cast<int>(EventEfficiencyBin::SelectedInelGt0), "Selected INEL>0");
11691159
}
11701160

11711161
if (doprocessGen) {
@@ -1426,9 +1416,9 @@ struct PseudorapidityDensityMFT {
14261416

14271417
std::vector<typename std::decay_t<decltype(collisions)>::iterator> cols;
14281418
for (const auto& bc : bcs) {
1429-
if (!useEvSel ||
1430-
(useEvSel && ((bc.selection_bit(aod::evsel::kIsBBT0A) &&
1431-
bc.selection_bit(aod::evsel::kIsBBT0C)) != 0))) {
1419+
if (!useEvSel ||
1420+
(bc.selection_bit(aod::evsel::kIsBBT0A) &&
1421+
bc.selection_bit(aod::evsel::kIsBBT0C))) {
14321422
registry.fill(HIST("EventSelection"), static_cast<int>(EventSelectionBin::GoodBCs));
14331423
cols.clear();
14341424
for (const auto& collision : collisions) {
@@ -1518,7 +1508,7 @@ struct PseudorapidityDensityMFT {
15181508
{
15191509

15201510
registry.fill(HIST("EventSelection"), static_cast<int>(EventSelectionBin::All));
1521-
if (!useEvSel || (useEvSel && collision.sel8())) {
1511+
if (!useEvSel || collision.sel8()) {
15221512
registry.fill(HIST("EventSelection"), static_cast<int>(EventSelectionBin::VzSelected));
15231513
auto z = collision.posZ();
15241514
auto perCollisionSample = sampleCentral->sliceByCached(
@@ -2089,7 +2079,7 @@ struct PseudorapidityDensityMFT {
20892079
if constexpr (ExColsGenCent::template contains<aod::CentFT0Cs>()) {
20902080
cRec = collision.centFT0C();
20912081
}
2092-
if (!useEvSel || (useEvSel && collision.sel8())) {
2082+
if (!useEvSel || collision.sel8()) {
20932083
if constexpr (ExColsGenCent::template contains<aod::CentFT0Cs>()) {
20942084
if (!atLeastOne) {
20952085
cGen = cRec;
@@ -2165,7 +2155,7 @@ struct PseudorapidityDensityMFT {
21652155
soa::Join<aod::Collisions, aod::EvSels>::iterator const& collision,
21662156
MFTTracksLabeled const& tracks, aod::McParticles const&)
21672157
{
2168-
if (!useEvSel || (useEvSel && collision.sel8())) {
2158+
if (!useEvSel || collision.sel8()) {
21692159
for (const auto& track : tracks) {
21702160
if (!track.has_mcParticle()) {
21712161
continue;

0 commit comments

Comments
 (0)