Skip to content

Please consider the following formatting changes to #10581 #406

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
ddobrigk merged 1 commit into from
Mar 19, 2025
Merged

Please consider the following formatting changes to #10581 #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@

float getMassSigmaK0Short(float pt)
{
return massCutK0->get("constant") + pt * massCutK0->get("linear") + massCutK0->get("expoConstant") * TMath::Exp(-pt / massCutK0->get("expoRelax"));

Check warning on line 297 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

Consider replacing ROOT entities with equivalents from standard C++ or from O2.
}
float getMassSigmaLambda(float pt)
{
Expand Down Expand Up @@ -704,7 +704,7 @@
d_bz = dcaFitterConfigurations.d_bz_input;
fitter.setBz(d_bz);
o2::parameters::GRPMagField grpmag;
if (fabs(d_bz) > 1e-5) {

Check warning on line 707 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

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 @@ -848,7 +848,7 @@
o2::base::Propagator::Instance()->propagateToDCABxByBz({primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ()}, negTrackPar, 2.f, fitter.getMatCorrType(), &dcaInfo);
auto negTrackdcaXY = dcaInfo[0];

if (fabs(posTrackdcaXY) < dcapostopv || fabs(negTrackdcaXY) < dcanegtopv) {

Check warning on line 851 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

Use std:: prefix for names from the std namespace.
return false;
}

Expand Down Expand Up @@ -910,7 +910,7 @@
if (!V0.has_collision())
statisticsRegistry.v0statsUnassociated[kV0DCADau]++;

v0candidate.cosPA = RecoDecay::cpa(array{primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ()}, array{v0candidate.pos[0], v0candidate.pos[1], v0candidate.pos[2]}, array{v0candidate.posP[0] + v0candidate.negP[0], v0candidate.posP[1] + v0candidate.negP[1], v0candidate.posP[2] + v0candidate.negP[2]});

Check warning on line 913 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

Use std:: prefix for names from the std namespace.
if (v0candidate.cosPA < v0cospa) {
return false;
}
Expand Down Expand Up @@ -967,12 +967,12 @@
statisticsRegistry.v0statsUnassociated[kWithinMomentumRange]++;

// Calculate masses
auto lGammaMass = RecoDecay::m(array{array{v0candidate.posP[0], v0candidate.posP[1], v0candidate.posP[2]}, array{v0candidate.negP[0], v0candidate.negP[1], v0candidate.negP[2]}}, array{o2::constants::physics::MassElectron, o2::constants::physics::MassElectron});

Check warning on line 970 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

Use std:: prefix for names from the std namespace.
v0candidate.k0ShortMass = RecoDecay::m(array{array{v0candidate.posP[0], v0candidate.posP[1], v0candidate.posP[2]}, array{v0candidate.negP[0], v0candidate.negP[1], v0candidate.negP[2]}}, array{o2::constants::physics::MassPionCharged, o2::constants::physics::MassPionCharged});

Check warning on line 971 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

Use std:: prefix for names from the std namespace.
v0candidate.lambdaMass = RecoDecay::m(array{array{v0candidate.posP[0], v0candidate.posP[1], v0candidate.posP[2]}, array{v0candidate.negP[0], v0candidate.negP[1], v0candidate.negP[2]}}, array{o2::constants::physics::MassProton, o2::constants::physics::MassPionCharged});

Check warning on line 972 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

Use std:: prefix for names from the std namespace.
v0candidate.antiLambdaMass = RecoDecay::m(array{array{v0candidate.posP[0], v0candidate.posP[1], v0candidate.posP[2]}, array{v0candidate.negP[0], v0candidate.negP[1], v0candidate.negP[2]}}, array{o2::constants::physics::MassPionCharged, o2::constants::physics::MassProton});

Check warning on line 973 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

Use std:: prefix for names from the std namespace.
auto lHypertritonMass = RecoDecay::m(array{array{2.0f * v0candidate.posP[0], 2.0f * v0candidate.posP[1], 2.0f * v0candidate.posP[2]}, array{v0candidate.negP[0], v0candidate.negP[1], v0candidate.negP[2]}}, array{o2::constants::physics::MassHelium3, o2::constants::physics::MassPionCharged});

Check warning on line 974 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

Use std:: prefix for names from the std namespace.
auto lAntiHypertritonMass = RecoDecay::m(array{array{v0candidate.posP[0], v0candidate.posP[1], v0candidate.posP[2]}, array{2.0f * v0candidate.negP[0], 2.0f * v0candidate.negP[1], 2.0f * v0candidate.negP[2]}}, array{o2::constants::physics::MassPionCharged, o2::constants::physics::MassHelium3});

Check warning on line 975 in PWGLF/TableProducer/Strangeness/lambdakzerobuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter 

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

// mass window check
bool keepCandidate = false;
Expand Down Expand Up @@ -1423,7 +1423,7 @@
h->GetXaxis()->SetBinLabel(5, "Used in Casc");
h->GetXaxis()->SetBinLabel(6, "Used in Tra-Casc");

if(qaCollisionAssociation){
if (qaCollisionAssociation) {
auto hCollAssocQA = histos.add<TH2>("hCollAssocQA", "hCollAssocQA", kTH2D, {{6, -0.5f, 5.5f}, {2, -0.5f, 1.5f}});
hCollAssocQA->GetXaxis()->SetBinLabel(1, "K0");
hCollAssocQA->GetXaxis()->SetBinLabel(2, "Lambda");
Expand Down Expand Up @@ -1507,7 +1507,7 @@
for (auto& lNegGrandMother : lNegMother.template mothers_as<aod::McParticles>()) {
if (lNegGrandMother.pdgCode() == dIfMCselectV0MotherPDG)
lPDG = lNegMother.pdgCode();
correctMcCollisionIndex = lNegMother.mcCollisionId();
correctMcCollisionIndex = lNegMother.mcCollisionId();
}
}
}
Expand All @@ -1518,32 +1518,32 @@
}
} // end association check

bool collisionAssociationOK = false;
if(correctMcCollisionIndex>-1 && correctMcCollisionIndex == mcCollisionId){
bool collisionAssociationOK = false;
if (correctMcCollisionIndex > -1 && correctMcCollisionIndex == mcCollisionId) {
collisionAssociationOK = true;
}

if (lPDG == 310){
if (lPDG == 310) {
bitset(maskElement, bitTrueK0Short);
if(qaCollisionAssociation){
if (qaCollisionAssociation) {
histos.fill(HIST("hCollAssocQA"), 0.0f, collisionAssociationOK);
}
}
if (lPDG == 3122){
if (lPDG == 3122) {
bitset(maskElement, bitTrueLambda);
if(qaCollisionAssociation){
if (qaCollisionAssociation) {
histos.fill(HIST("hCollAssocQA"), 1.0f, collisionAssociationOK);
}
}
if (lPDG == -3122){
if (lPDG == -3122) {
bitset(maskElement, bitTrueAntiLambda);
if(qaCollisionAssociation){
if (qaCollisionAssociation) {
histos.fill(HIST("hCollAssocQA"), 2.0f, collisionAssociationOK);
}
}
if (lPDG == 22){
if (lPDG == 22) {
bitset(maskElement, bitTrueGamma);
if(qaCollisionAssociation){
if (qaCollisionAssociation) {
histos.fill(HIST("hCollAssocQA"), 3.0f, collisionAssociationOK);
}
}
Expand Down
100 changes: 50 additions & 50 deletions PWGLF/TableProducer/Strangeness/strangenessbuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ struct StrangenessBuilder {
kCascFoundTags,
nTables };

struct : ProducesGroup{
struct : ProducesGroup {
//__________________________________________________
// V0 tables
Produces<aod::V0Indices> v0indices; // standard part of V0Datas
Expand Down Expand Up @@ -1148,7 +1148,7 @@ struct StrangenessBuilder {
if (mEnabledTables[kV0Indices]) {
// for referencing (especially - but not only - when using derived data)
products.v0indices(v0.posTrackId, v0.negTrackId,
v0.collisionId, iv0);
v0.collisionId, iv0);
histos.fill(HIST("hTableBuildingStatistics"), kV0Indices);
}
if (mEnabledTables[kV0TrackXs]) {
Expand All @@ -1159,21 +1159,21 @@ struct StrangenessBuilder {
if (mEnabledTables[kV0CoresBase]) {
// standard analysis
products.v0cores(straHelper.v0.position[0], straHelper.v0.position[1], straHelper.v0.position[2],
straHelper.v0.positiveMomentum[0], straHelper.v0.positiveMomentum[1], straHelper.v0.positiveMomentum[2],
straHelper.v0.negativeMomentum[0], straHelper.v0.negativeMomentum[1], straHelper.v0.negativeMomentum[2],
straHelper.v0.daughterDCA,
straHelper.v0.positiveDCAxy,
straHelper.v0.negativeDCAxy,
TMath::Cos(straHelper.v0.pointingAngle),
straHelper.v0.dcaXY,
v0.v0Type);
straHelper.v0.positiveMomentum[0], straHelper.v0.positiveMomentum[1], straHelper.v0.positiveMomentum[2],
straHelper.v0.negativeMomentum[0], straHelper.v0.negativeMomentum[1], straHelper.v0.negativeMomentum[2],
straHelper.v0.daughterDCA,
straHelper.v0.positiveDCAxy,
straHelper.v0.negativeDCAxy,
TMath::Cos(straHelper.v0.pointingAngle),
straHelper.v0.dcaXY,
v0.v0Type);
products.v0dataLink(products.v0cores.lastIndex(), -1);
histos.fill(HIST("hTableBuildingStatistics"), kV0CoresBase);
}
if (mEnabledTables[kV0TraPosAtDCAs]) {
// for tracking studies
products.v0dauPositions(straHelper.v0.positivePosition[0], straHelper.v0.positivePosition[1], straHelper.v0.positivePosition[2],
straHelper.v0.negativePosition[0], straHelper.v0.negativePosition[1], straHelper.v0.negativePosition[2]);
straHelper.v0.negativePosition[0], straHelper.v0.negativePosition[1], straHelper.v0.negativePosition[2]);
histos.fill(HIST("hTableBuildingStatistics"), kV0TraPosAtDCAs);
}
if (mEnabledTables[kV0TraPosAtIUs]) {
Expand All @@ -1185,7 +1185,7 @@ struct StrangenessBuilder {
positiveTrackParam.getXYZGlo(positivePositionIU);
negativeTrackParam.getXYZGlo(negativePositionIU);
products.v0dauPositionsIU(positivePositionIU[0], positivePositionIU[1], positivePositionIU[2],
negativePositionIU[0], negativePositionIU[1], negativePositionIU[2]);
negativePositionIU[0], negativePositionIU[1], negativePositionIU[2]);
histos.fill(HIST("hTableBuildingStatistics"), kV0TraPosAtIUs);
}
if (mEnabledTables[kV0Covs]) {
Expand Down Expand Up @@ -1589,21 +1589,21 @@ struct StrangenessBuilder {
// generate analysis tables as required
if (mEnabledTables[kCascIndices]) {
products.cascidx(cascade.globalId,
straHelper.cascade.positiveTrack, straHelper.cascade.negativeTrack,
straHelper.cascade.bachelorTrack, straHelper.cascade.collisionId);
straHelper.cascade.positiveTrack, straHelper.cascade.negativeTrack,
straHelper.cascade.bachelorTrack, straHelper.cascade.collisionId);
histos.fill(HIST("hTableBuildingStatistics"), kCascIndices);
}
if (mEnabledTables[kStoredCascCores]) {
products.cascdata(straHelper.cascade.charge, straHelper.cascade.massXi, straHelper.cascade.massOmega,
straHelper.cascade.cascadePosition[0], straHelper.cascade.cascadePosition[1], straHelper.cascade.cascadePosition[2],
straHelper.cascade.v0Position[0], straHelper.cascade.v0Position[1], straHelper.cascade.v0Position[2],
straHelper.cascade.positiveMomentum[0], straHelper.cascade.positiveMomentum[1], straHelper.cascade.positiveMomentum[2],
straHelper.cascade.negativeMomentum[0], straHelper.cascade.negativeMomentum[1], straHelper.cascade.negativeMomentum[2],
straHelper.cascade.bachelorMomentum[0], straHelper.cascade.bachelorMomentum[1], straHelper.cascade.bachelorMomentum[2],
straHelper.cascade.cascadeMomentum[0], straHelper.cascade.cascadeMomentum[1], straHelper.cascade.cascadeMomentum[2],
straHelper.cascade.v0DaughterDCA, straHelper.cascade.cascadeDaughterDCA,
straHelper.cascade.positiveDCAxy, straHelper.cascade.negativeDCAxy,
straHelper.cascade.bachelorDCAxy, straHelper.cascade.cascadeDCAxy, straHelper.cascade.cascadeDCAz);
straHelper.cascade.cascadePosition[0], straHelper.cascade.cascadePosition[1], straHelper.cascade.cascadePosition[2],
straHelper.cascade.v0Position[0], straHelper.cascade.v0Position[1], straHelper.cascade.v0Position[2],
straHelper.cascade.positiveMomentum[0], straHelper.cascade.positiveMomentum[1], straHelper.cascade.positiveMomentum[2],
straHelper.cascade.negativeMomentum[0], straHelper.cascade.negativeMomentum[1], straHelper.cascade.negativeMomentum[2],
straHelper.cascade.bachelorMomentum[0], straHelper.cascade.bachelorMomentum[1], straHelper.cascade.bachelorMomentum[2],
straHelper.cascade.cascadeMomentum[0], straHelper.cascade.cascadeMomentum[1], straHelper.cascade.cascadeMomentum[2],
straHelper.cascade.v0DaughterDCA, straHelper.cascade.cascadeDaughterDCA,
straHelper.cascade.positiveDCAxy, straHelper.cascade.negativeDCAxy,
straHelper.cascade.bachelorDCAxy, straHelper.cascade.cascadeDCAxy, straHelper.cascade.cascadeDCAz);
histos.fill(HIST("hTableBuildingStatistics"), kStoredCascCores);

// interlink always produced if cascades generated
Expand Down Expand Up @@ -1901,25 +1901,25 @@ struct StrangenessBuilder {
// generate analysis tables as required
if (mEnabledTables[kKFCascIndices]) {
products.kfcascidx(cascade.globalId,
straHelper.cascade.positiveTrack, straHelper.cascade.negativeTrack,
straHelper.cascade.bachelorTrack, straHelper.cascade.collisionId);
straHelper.cascade.positiveTrack, straHelper.cascade.negativeTrack,
straHelper.cascade.bachelorTrack, straHelper.cascade.collisionId);
histos.fill(HIST("hTableBuildingStatistics"), kKFCascIndices);
}
if (mEnabledTables[kStoredKFCascCores]) {
products.kfcascdata(straHelper.cascade.charge, straHelper.cascade.massXi, straHelper.cascade.massOmega,
straHelper.cascade.cascadePosition[0], straHelper.cascade.cascadePosition[1], straHelper.cascade.cascadePosition[2],
straHelper.cascade.v0Position[0], straHelper.cascade.v0Position[1], straHelper.cascade.v0Position[2],
straHelper.cascade.positivePosition[0], straHelper.cascade.positivePosition[1], straHelper.cascade.positivePosition[2],
straHelper.cascade.negativePosition[0], straHelper.cascade.negativePosition[1], straHelper.cascade.negativePosition[2],
straHelper.cascade.positiveMomentum[0], straHelper.cascade.positiveMomentum[1], straHelper.cascade.positiveMomentum[2],
straHelper.cascade.negativeMomentum[0], straHelper.cascade.negativeMomentum[1], straHelper.cascade.negativeMomentum[2],
straHelper.cascade.bachelorMomentum[0], straHelper.cascade.bachelorMomentum[1], straHelper.cascade.bachelorMomentum[2],
straHelper.cascade.v0Momentum[0], straHelper.cascade.v0Momentum[1], straHelper.cascade.v0Momentum[2],
straHelper.cascade.cascadeMomentum[0], straHelper.cascade.cascadeMomentum[1], straHelper.cascade.cascadeMomentum[2],
straHelper.cascade.v0DaughterDCA, straHelper.cascade.cascadeDaughterDCA,
straHelper.cascade.positiveDCAxy, straHelper.cascade.negativeDCAxy,
straHelper.cascade.bachelorDCAxy, straHelper.cascade.cascadeDCAxy, straHelper.cascade.cascadeDCAz,
straHelper.cascade.kfMLambda, straHelper.cascade.kfV0Chi2, straHelper.cascade.kfCascadeChi2);
straHelper.cascade.cascadePosition[0], straHelper.cascade.cascadePosition[1], straHelper.cascade.cascadePosition[2],
straHelper.cascade.v0Position[0], straHelper.cascade.v0Position[1], straHelper.cascade.v0Position[2],
straHelper.cascade.positivePosition[0], straHelper.cascade.positivePosition[1], straHelper.cascade.positivePosition[2],
straHelper.cascade.negativePosition[0], straHelper.cascade.negativePosition[1], straHelper.cascade.negativePosition[2],
straHelper.cascade.positiveMomentum[0], straHelper.cascade.positiveMomentum[1], straHelper.cascade.positiveMomentum[2],
straHelper.cascade.negativeMomentum[0], straHelper.cascade.negativeMomentum[1], straHelper.cascade.negativeMomentum[2],
straHelper.cascade.bachelorMomentum[0], straHelper.cascade.bachelorMomentum[1], straHelper.cascade.bachelorMomentum[2],
straHelper.cascade.v0Momentum[0], straHelper.cascade.v0Momentum[1], straHelper.cascade.v0Momentum[2],
straHelper.cascade.cascadeMomentum[0], straHelper.cascade.cascadeMomentum[1], straHelper.cascade.cascadeMomentum[2],
straHelper.cascade.v0DaughterDCA, straHelper.cascade.cascadeDaughterDCA,
straHelper.cascade.positiveDCAxy, straHelper.cascade.negativeDCAxy,
straHelper.cascade.bachelorDCAxy, straHelper.cascade.cascadeDCAxy, straHelper.cascade.cascadeDCAz,
straHelper.cascade.kfMLambda, straHelper.cascade.kfV0Chi2, straHelper.cascade.kfCascadeChi2);
histos.fill(HIST("hTableBuildingStatistics"), kStoredKFCascCores);

// interlink always produced if cascades generated
Expand Down Expand Up @@ -2009,22 +2009,22 @@ struct StrangenessBuilder {
// generate analysis tables as required
if (mEnabledTables[kTraCascIndices]) {
products.tracascidx(cascade.globalIndex(),
straHelper.cascade.positiveTrack, straHelper.cascade.negativeTrack,
straHelper.cascade.bachelorTrack, cascadeTrack.trackId(), straHelper.cascade.collisionId);
straHelper.cascade.positiveTrack, straHelper.cascade.negativeTrack,
straHelper.cascade.bachelorTrack, cascadeTrack.trackId(), straHelper.cascade.collisionId);
histos.fill(HIST("hTableBuildingStatistics"), kTraCascIndices);
}
if (mEnabledTables[kStoredTraCascCores]) {
products.tracascdata(straHelper.cascade.charge, cascadeTrack.xiMass(), cascadeTrack.omegaMass(),
cascadeTrack.decayX(), cascadeTrack.decayY(), cascadeTrack.decayZ(),
straHelper.cascade.v0Position[0], straHelper.cascade.v0Position[1], straHelper.cascade.v0Position[2],
straHelper.cascade.positiveMomentum[0], straHelper.cascade.positiveMomentum[1], straHelper.cascade.positiveMomentum[2],
straHelper.cascade.negativeMomentum[0], straHelper.cascade.negativeMomentum[1], straHelper.cascade.negativeMomentum[2],
straHelper.cascade.bachelorMomentum[0], straHelper.cascade.bachelorMomentum[1], straHelper.cascade.bachelorMomentum[2],
straHelper.cascade.cascadeMomentum[0], straHelper.cascade.cascadeMomentum[1], straHelper.cascade.cascadeMomentum[2],
straHelper.cascade.v0DaughterDCA, straHelper.cascade.cascadeDaughterDCA,
straHelper.cascade.positiveDCAxy, straHelper.cascade.negativeDCAxy,
straHelper.cascade.bachelorDCAxy, straHelper.cascade.cascadeDCAxy, straHelper.cascade.cascadeDCAz,
cascadeTrack.matchingChi2(), cascadeTrack.topologyChi2(), cascadeTrack.itsClsSize());
cascadeTrack.decayX(), cascadeTrack.decayY(), cascadeTrack.decayZ(),
straHelper.cascade.v0Position[0], straHelper.cascade.v0Position[1], straHelper.cascade.v0Position[2],
straHelper.cascade.positiveMomentum[0], straHelper.cascade.positiveMomentum[1], straHelper.cascade.positiveMomentum[2],
straHelper.cascade.negativeMomentum[0], straHelper.cascade.negativeMomentum[1], straHelper.cascade.negativeMomentum[2],
straHelper.cascade.bachelorMomentum[0], straHelper.cascade.bachelorMomentum[1], straHelper.cascade.bachelorMomentum[2],
straHelper.cascade.cascadeMomentum[0], straHelper.cascade.cascadeMomentum[1], straHelper.cascade.cascadeMomentum[2],
straHelper.cascade.v0DaughterDCA, straHelper.cascade.cascadeDaughterDCA,
straHelper.cascade.positiveDCAxy, straHelper.cascade.negativeDCAxy,
straHelper.cascade.bachelorDCAxy, straHelper.cascade.cascadeDCAxy, straHelper.cascade.cascadeDCAz,
cascadeTrack.matchingChi2(), cascadeTrack.topologyChi2(), cascadeTrack.itsClsSize());
histos.fill(HIST("hTableBuildingStatistics"), kStoredTraCascCores);

// interlink always produced if base core table generated
Expand Down
Loading