Skip to content
Merged
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
6 changes: 3 additions & 3 deletions PWGLF/Tasks/Nuspex/NucleiHistTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -589,9 +589,9 @@
float Chi2perClusterTPC = track.tpcChi2NCl();
float Chi2perClusterITS = track.itsChi2NCl();

bool insideDCAxy = (std::abs(track.dcaXY()) <= (maxDcaXYFactor.value * (0.0105f + 0.0350f / pow(track.pt(), 1.1f))));

Check warning on line 592 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.

if (!(insideDCAxy) || TMath::Abs(track.dcaZ()) > maxDCA_Z)

Check warning on line 594 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity]

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
continue;
histTrackcuts_data_spectra->AddBinContent(3);
if (TPCnumberClsFound < minTPCnClsFound || TPC_nCls_Crossed_Rows < minNCrossedRowsTPC)
Expand Down Expand Up @@ -640,7 +640,7 @@
return;

if (enable_pT_shift_tpc_nSigma) {
Particle_Tpc_nSigma_shift = new TF1("Particle_Tpc_nSigma_shift", "[0] * TMath::Exp([1] + [2] * x) + [3] + [4] * x + [5] * x * x", 0.f, 14.f);

Check warning on line 643 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity]

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
auto par = (std::vector<float>)parShiftPt;
Particle_Tpc_nSigma_shift->SetParameters(par[0], par[1], par[2], par[3], par[4], par[5]);
}
Expand Down Expand Up @@ -727,9 +727,9 @@
continue;
histTrackcuts_data_particle->AddBinContent(3);

bool insideDCAxy = (std::abs(track.dcaXY()) <= (maxDcaXYFactor.value * (0.0105f + 0.0350f / pow(momentum, 1.1f))));

Check warning on line 730 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.

if (!(insideDCAxy) || TMath::Abs(track.dcaZ()) > maxDCA_Z)

Check warning on line 732 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity]

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
continue;
histTrackcuts_data_particle->AddBinContent(4);
if (TPCnumberClsFound < minTPCnClsFound || TPC_nCls_Crossed_Rows < minNCrossedRowsTPC)
Expand Down Expand Up @@ -793,8 +793,8 @@
if (lastLayer < lastRequiredTrdCluster)
continue;
}
Float_t TOFmass2 = ((track.mass()) * (track.mass()));

Check warning on line 796 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity]

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
Float_t beta = track.beta();

Check warning on line 797 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity]

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
particle_reg.fill(HIST("histTOFm2"), momentum, TOFmass2);
particle_reg.fill(HIST("histTofSignalData"), momentum, beta);
particle_reg.fill(HIST("histTofNsigmaData"), momentum, TOFnSigma_particle);
Expand Down Expand Up @@ -823,7 +823,7 @@
if (lastLayer < lastRequiredTrdCluster)
continue;
}
Float_t TOFmass2 = ((track.mass()) * (track.mass()));

Check warning on line 826 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root-entity]

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
Float_t beta = track.beta();
aparticle_reg.fill(HIST("histTOFm2"), momentum, TOFmass2);
aparticle_reg.fill(HIST("histTofSignalData"), momentum, beta);
Expand Down Expand Up @@ -939,7 +939,7 @@
if (lorentzVector_particle.Rapidity() < yMin || lorentzVector_particle.Rapidity() > yMax)
continue;

bool insideDCAxy = (std::abs(track.dcaXY()) <= (maxDcaXYFactor.value * (0.0105f + 0.0350f / pow(momentum, 1.1f))));

Check warning on line 942 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.

if (!(insideDCAxy) || TMath::Abs(track.dcaZ()) > maxDCA_Z)
continue;
Expand Down Expand Up @@ -1332,7 +1332,7 @@
float Chi2perClusterTPC = track.tpcChi2NCl();
float Chi2perClusterITS = track.itsChi2NCl();

bool insideDCAxy = (std::abs(track.dcaXY()) <= (maxDcaXYFactor.value * (0.0105f + 0.0350f / pow(track.pt(), 1.1f))));

Check warning on line 1335 in PWGLF/Tasks/Nuspex/NucleiHistTask.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.

if (!(insideDCAxy) || TMath::Abs(track.dcaZ()) > maxDCA_Z)
continue;
Expand Down Expand Up @@ -1455,7 +1455,7 @@
PROCESS_SWITCH(NucleiHistTask, processMCreco, "process reconstructed MC", false);

void processMCdca(soa::Join<aod::Collisions, aod::McCollisionLabels, aod::EvSels, aod::CentFT0Cs>::iterator const& collisions, soa::Filtered<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::pidTPCLfFullPi, aod::pidTOFFullPi, aod::pidTPCLfFullKa, aod::pidTOFFullKa, aod::pidTPCLfFullPr, aod::pidTOFFullPr, aod::pidTPCLfFullDe, aod::pidTOFFullDe, aod::pidTPCLfFullTr, aod::pidTOFFullTr, aod::pidTPCLfFullHe, aod::pidTOFFullHe, aod::pidTPCLfFullAl, aod::pidTOFFullAl, aod::McTrackLabels, aod::TrackSelection, aod::TrackSelectionExtension, aod::TOFSignal, aod::pidTOFmass, aod::pidTOFbeta>> const& tracks,
aod::McParticles& /*mcParticles*/, aod::McCollisions const& /*mcCollisions*/)
aod::McParticles& /*mcParticles*/, aod::McCollisions const& /*mcCollisions*/)
{

if (event_selection_MC_sel8 && !collisions.sel8())
Expand Down Expand Up @@ -1530,10 +1530,10 @@
pdgbin = -1;
break;
}

if (lorentzVector_particle_MC.Rapidity() < yMin || lorentzVector_particle_MC.Rapidity() > yMax)
continue;

MC_DCA.fill(HIST("histEta"), track.eta(), pdgbin);

if (particle.isPhysicalPrimary()) {
Expand Down
Loading