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
32 changes: 16 additions & 16 deletions PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
d_bz = d_bz_input;
fitter.setBz(d_bz);
o2::parameters::GRPMagField grpmag;
if (fabs(d_bz) > 1e-5) {

Check failure on line 287 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
grpmag.setL3Current(30000.f / (d_bz / 5.0f));
}
o2::base::Propagator::initFieldFromGRP(&grpmag);
Expand Down Expand Up @@ -347,15 +347,15 @@
if (mother1_pdg != mother2_pdg)
return -1;

if (abs(mother1_pdg) != 22 // photon

Check failure on line 350 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
&& abs(mother1_pdg) != 111 // pi0

Check failure on line 351 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
&& abs(mother1_pdg) != 221 // eta

Check failure on line 352 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
&& abs(mother1_pdg) != 331 // eta'

Check failure on line 353 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
&& abs(mother1_pdg) != 113 // rho

Check failure on line 354 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
&& abs(mother1_pdg) != 223 // omega

Check failure on line 355 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
&& abs(mother1_pdg) != 333 // phi

Check failure on line 356 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
&& abs(mother1_pdg) != 443 // Jpsi

Check failure on line 357 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
&& abs(mother1_pdg) != 100443 // psi2S

Check failure on line 358 in PWGEM/Dilepton/TableProducer/treeCreatorElectronML.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[std-prefix]

Use std:: prefix for names from the std namespace.
) {
return -1;
}
Expand Down Expand Up @@ -587,24 +587,24 @@

if constexpr (isDerived) {
mytrack(collisions_counter,
track.sign(), track.pt(), track.eta(), track.phi(), track.tgl(), track.dcaXY(), track.dcaZ(), sqrt(track.cYY()), sqrt(track.cZZ()), track.cZY(),
track.tpcNClsFindable(), track.tpcNClsFound(), track.tpcNClsCrossedRows(),
track.tpcChi2NCl(), track.tpcInnerParam(),
track.tpcSignal(), track.tpcNSigmaEl(), /*track.tpcNSigmaMu(),*/ track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
track.beta(), track.tofNSigmaEl(), /*track.tofNSigmaMu(),*/ 0, 0, 0,
track.tofChi2(), track.itsChi2NCl(), track.itsClusterSizes(),
mctrack.vx(), mctrack.vy(), mctrack.vz(),
mctrack.pdgCode(), mctrack.isPhysicalPrimary(), mothers_id, mothers_pdg);
track.sign(), track.pt(), track.eta(), track.phi(), track.tgl(), track.dcaXY(), track.dcaZ(), sqrt(track.cYY()), sqrt(track.cZZ()), track.cZY(),
track.tpcNClsFindable(), track.tpcNClsFound(), track.tpcNClsCrossedRows(),
track.tpcChi2NCl(), track.tpcInnerParam(),
track.tpcSignal(), track.tpcNSigmaEl(), /*track.tpcNSigmaMu(),*/ track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
track.beta(), track.tofNSigmaEl(), /*track.tofNSigmaMu(),*/ 0, 0, 0,
track.tofChi2(), track.itsChi2NCl(), track.itsClusterSizes(),
mctrack.vx(), mctrack.vy(), mctrack.vz(),
mctrack.pdgCode(), mctrack.isPhysicalPrimary(), mothers_id, mothers_pdg);
} else {
mytrack(collisions_counter,
track.sign(), track.pt(), track.eta(), track.phi(), track.tgl(), track.dcaXY(), track.dcaZ(), sqrt(track.cYY()), sqrt(track.cZZ()), track.cZY(),
track.tpcNClsFindable(), track.tpcNClsFound(), track.tpcNClsCrossedRows(),
track.tpcChi2NCl(), track.tpcInnerParam(),
track.tpcSignal(), track.tpcNSigmaEl(), /*track.tpcNSigmaMu(),*/ track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
track.beta(), track.tofNSigmaEl(), /*track.tofNSigmaMu(),*/ track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),
track.tofChi2(), track.itsChi2NCl(), track.itsClusterSizes(),
mctrack.vx(), mctrack.vy(), mctrack.vz(),
mctrack.pdgCode(), mctrack.isPhysicalPrimary(), mothers_id, mothers_pdg);
track.sign(), track.pt(), track.eta(), track.phi(), track.tgl(), track.dcaXY(), track.dcaZ(), sqrt(track.cYY()), sqrt(track.cZZ()), track.cZY(),
track.tpcNClsFindable(), track.tpcNClsFound(), track.tpcNClsCrossedRows(),
track.tpcChi2NCl(), track.tpcInnerParam(),
track.tpcSignal(), track.tpcNSigmaEl(), /*track.tpcNSigmaMu(),*/ track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(),
track.beta(), track.tofNSigmaEl(), /*track.tofNSigmaMu(),*/ track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(),
track.tofChi2(), track.itsChi2NCl(), track.itsClusterSizes(),
mctrack.vx(), mctrack.vy(), mctrack.vz(),
mctrack.pdgCode(), mctrack.isPhysicalPrimary(), mothers_id, mothers_pdg);
}

mothers_id.shrink_to_fit();
Expand Down
Loading