Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Common/Tools/Multiplicity/MultModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,12 @@
o2::framework::Configurable<int> minNclsITSGlobalTrack{"minNclsITSGlobalTrack", 5, "min. number of ITS clusters for global tracks"};
o2::framework::Configurable<int> minNclsITSibGlobalTrack{"minNclsITSibGlobalTrack", 1, "min. number of ITSib clusters for global tracks"};

// MFT track counter configurables
o2::framework::Configurable<int> minNclsMFTTrack{"minNclsMFTTrack", 5, "min. number of MFT clusters for MFT tracks"};
o2::framework::Configurable<float> maxDCAxyToPVMFTTrack{"maxDCAxyToPVMFTTrack", 2.0f, "max DCAxy to PV for MFT tracks (cm)"};
o2::framework::Configurable<float> minEtaMFTTrack{"minEtaMFTTrack", -3.9f, "min. pseudorapidity for MFT tracks (nominal: -3.6)"};
o2::framework::Configurable<float> maxEtaMFTTrack{"maxEtaMFTTrack", -2.0f, "max. pseudorapidity for MFT tracks (nominal: -2.45)"};

// ccdb information
o2::framework::Configurable<std::string> ccdbPathVtxZ{"ccdbPathVtxZ", "Centrality/Calibration", "The CCDB path for vertex-Z calibration"};
o2::framework::Configurable<std::string> ccdbPathCentrality{"ccdbPathCentrality", "Centrality/Estimators", "The CCDB path for centrality information"};
Expand Down Expand Up @@ -593,9 +599,9 @@
mults.multNContribs++; // pvmults
if (std::abs(track.eta()) < 0.5) {
mults.multNContribsEtaHalf++; // pvmults
}

Check failure on line 602 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
}
}

Check failure on line 604 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
}
}
// check whether the track is a global ITS-TPC track
Expand Down Expand Up @@ -699,7 +705,7 @@
mults.multFV0AOuter += amplitude;
}
}
} else {

Check failure on line 708 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multFV0A = -999.f;
mults.multFV0AOuter = -999.f;
}
Expand Down Expand Up @@ -778,7 +784,7 @@
mults.multFV0AZeq = 0.0f;
}
cursors.tableFV0Zeqs(mults.multFV0AZeq);
}

Check failure on line 787 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (internalOpts.mEnabledTables[kFT0MultZeqs]) {
if (mults.multFT0A > -1.0f && std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {
mults.multFT0AZeq = hVtxZFT0A->Interpolate(0.0) * mults.multFT0A / hVtxZFT0A->Interpolate(collision.posZ());
Expand All @@ -786,12 +792,12 @@
mults.multFT0AZeq = 0.0f;
}
if (mults.multFT0C > -1.0f && std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {
mults.multFT0CZeq = hVtxZFT0C->Interpolate(0.0) * mults.multFT0C / hVtxZFT0C->Interpolate(collision.posZ());

Check failure on line 795 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
} else {
mults.multFT0CZeq = 0.0f;
}
cursors.tableFT0Zeqs(mults.multFT0AZeq, mults.multFT0CZeq);
}

Check failure on line 800 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (internalOpts.mEnabledTables[kFDDMultZeqs]) {
if (mults.multFDDA > -1.0f && std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {
mults.multFDDAZeq = hVtxZFDDA->Interpolate(0.0) * mults.multFDDA / hVtxZFDDA->Interpolate(collision.posZ());
Expand All @@ -799,12 +805,12 @@
mults.multFDDAZeq = 0.0f;
}
if (mults.multFDDC > -1.0f && std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {
mults.multFDDCZeq = hVtxZFDDC->Interpolate(0.0) * mults.multFDDC / hVtxZFDDC->Interpolate(collision.posZ());

Check failure on line 808 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
} else {
mults.multFDDCZeq = 0.0f;
}
cursors.tableFDDZeqs(mults.multFDDAZeq, mults.multFDDCZeq);
}

Check failure on line 813 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.

//_______________________________________________________________________
// determine if barrel track loop is required, do it (once!) if so but save CPU if not
Expand All @@ -829,9 +835,9 @@
mults.multNContribsEtaHalf++; // pvmults
}
}
}

Check failure on line 838 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (track.hasITS()) {
mults.multHasITS++; // multsextra

Check failure on line 840 in Common/Tools/Multiplicity/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (track.hasTPC())
mults.multITSTPC++; // multsextra
if (!track.hasTPC() && !track.hasTOF() && !track.hasTRD()) {
Expand Down Expand Up @@ -976,21 +982,21 @@
int nTracks = 0;

for (const auto& track : mfttracks) {
if (track.nClusters() >= 5) { // hardcoded for now
if (track.nClusters() >= internalOpts.minNclsMFTTrack.value) {
nAllTracks++;
}
}

if (retracks.size() > 0) {
for (const auto& retrack : retracks) {
auto track = retrack.mfttrack();
if (track.nClusters() < 5) {
if (track.nClusters() < internalOpts.minNclsMFTTrack.value) {
continue; // min cluster requirement
}
if ((track.eta() > -2.0f) && (track.eta() < -3.9f)) {
if (track.eta() > internalOpts.maxEtaMFTTrack.value || track.eta() < internalOpts.minEtaMFTTrack.value) {
continue; // too far to be of true interest
}
if (std::abs(retrack.bestDCAXY()) > 2.0f) {
if (std::abs(retrack.bestDCAXY()) > internalOpts.maxDCAxyToPVMFTTrack.value) {
continue; // does not point to PV properly
}
nTracks++;
Expand Down
Loading