Skip to content

[PWGLF] Updat PWGLF/Tasks/Nuspex/spectraTOF.cxx #9537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maciacco merged 4 commits into from
Jan 26, 2025
Merged

[PWGLF] Updat PWGLF/Tasks/Nuspex/spectraTOF.cxx #9537

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
995d51a
Update spectraTOF.cxx
RD0407 Jan 26, 2025
4c00db7
Merge pull request #119 from RD0407/RD0407-patch-42
RD0407 Jan 26, 2025
3cf3822
Please consider the following formatting changes
alibuild Jan 26, 2025
e5e4d74
Merge pull request #120 from alibuild/alibot-cleanup-9537
RD0407 Jan 26, 2025
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
11 changes: 7 additions & 4 deletions PWGLF/Tasks/Nuspex/spectraTOF.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@
Configurable<float> minTPCNClsFound{"minTPCNClsFound", 100.f, "Additional cut on the minimum value of the number of found clusters in the TPC"};
Configurable<bool> makeTHnSparseChoice{"makeTHnSparseChoice", false, "choose if produce thnsparse"}; // RD
Configurable<bool> enableTPCTOFvsEtaHistograms{"enableTPCTOFvsEtaHistograms", false, "choose if produce TPC tof vs Eta"};
Configurable<bool> includeCentralityMC{"includeCentralityMC", true, "choose if include Centrality to MC"};
Configurable<bool> includeCentralityMC{"includeCentralityMC", false, "choose if include Centrality to MC"};
Configurable<bool> isImpactParam{"isImpactParam", false, "choose if include impactparam to MC"};
Configurable<bool> enableTPCTOFVsMult{"enableTPCTOFVsMult", false, "Produce TPC-TOF plots vs multiplicity"};
Configurable<bool> includeCentralityToTracks{"includeCentralityToTracks", false, "choose if include Centrality to tracks"};

Expand Down Expand Up @@ -1381,7 +1382,7 @@
for (const auto& track : tracks) {
// Track selection criteria
/* if (track.tpcNClsCrossedRows() < minNCrossedRowsTPC || track.tpcChi2NCl() > maxChi2PerClusterTPC || track.tpcChi2NCl() > maxChi2PerClusterTPC ||
track.itsChi2NCl() > maxChi2PerClusterITS || std::abs(track.dcaXY()) > maxDcaXYFactor.value * (0.0105f + 0.0350f / pow(track.pt(), 1.1f)) || std::abs(track.dcaZ()) > maxDcaZ.value || track.eta() < trkselOptions.cfgCutEtaMin || track.eta() > trkselOptions.cfgCutEtaMax || track.tpcCrossedRowsOverFindableCls() < minNCrossedRowsOverFindableClustersTPC || track.tpcNClsFound() < minTPCNClsFound ||

Check warning on line 1385 in PWGLF/Tasks/Nuspex/spectraTOF.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix] 

Use std:: prefix for names from the std namespace.
!(o2::aod::track::ITSrefit) || !(o2::aod::track::TPCrefit)) {
continue;
}*/
Expand Down Expand Up @@ -1495,7 +1496,7 @@
} // end of the process function
PROCESS_SWITCH(tofSpectra, processDerived, "Derived data processor", false);

#define makeProcessFunction(processorName, inputPid, particleId, isFull, tofTable, tpcTable) /* o2-linter: disable=name/macro */ \

Check warning on line 1499 in PWGLF/Tasks/Nuspex/spectraTOF.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/macro] 

Use SCREAMING_SNAKE_CASE for names of macros. Leading and double underscores are not allowed.
void process##processorName##inputPid(CollisionCandidates::iterator const& collision, \
soa::Join<TrackCandidates, \
aod::pid##tofTable##inputPid, \
Expand Down Expand Up @@ -1679,7 +1680,7 @@
float multiplicity = getMultiplicityMC(mcCollision);
int occupancy = collision.trackOccupancyInTimeRange();
//************************************RD**************************************************
if (includeCentralityMC) {
if (isImpactParam) {
multiplicity = mcCollision.impactParameter();
}
//************************************RD**************************************************
Expand Down Expand Up @@ -1843,7 +1844,9 @@
if (!mcParticle.isPhysicalPrimary()) {
if (mcParticle.getProcess() == 4) {
if (includeCentralityMC) {
histos.fill(HIST(hpt_num_str[i]), track.pt(), multiplicity, track.dcaXY());
if (includeCentralityMC) {
histos.fill(HIST(hpt_num_str[i]), track.pt(), multiplicity, track.dcaXY());
}
} else {
histos.fill(HIST(hpt_num_str[i]), track.pt(), multiplicity);
}
Expand Down Expand Up @@ -2107,7 +2110,7 @@
const auto& particlesInCollision = mcParticles.sliceByCached(aod::mcparticle::mcCollisionId, mcCollision.globalIndex(), cache);
float multiplicity = getMultiplicity(collision);
//************************************RD**************************************************
if (includeCentralityMC) {
if (isImpactParam) {
multiplicity = mcCollision.impactParameter();
}
//************************************RD**************************************************
Expand Down
Loading