Skip to content

Please consider the following formatting changes to #12912 #474

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
Sep 9, 2025
Merged

Please consider the following formatting changes to #12912 #474

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
16 changes: 8 additions & 8 deletions PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
Produces<aod::StraEvSels> strangeEvSels; // characterises collisions / centrality / sel8 selection in Run 3
Produces<aod::StraEvSelsRun2> strangeEvSelsRun2; // characterises collisions / centrality / sel8 selection in Run 2
Produces<aod::StraStamps> strangeStamps; // provides timestamps, run numbers
Produces<aod::StraEvTimes> straEvTimes; // provides event times (FT0, TOF)
Produces<aod::StraEvTimes> straEvTimes; // provides event times (FT0, TOF)
Produces<aod::V0CollRefs> v0collref; // references collisions from V0s
Produces<aod::CascCollRefs> casccollref; // references collisions from cascades
Produces<aod::KFCascCollRefs> kfcasccollref; // references collisions from KF cascades
Expand Down Expand Up @@ -383,7 +383,7 @@
});

// Creation of histograms: MC generated
for (Int_t i = 0; i < nSpecies; i++) {

Check failure on line 386 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
histos.add(Form("hGenerated%s", particleNames[i].data()), Form("hGenerated%s", particleNames[i].data()), kTH1D, {axisPt});
histos.add(Form("h2dGenerated%s", particleNames[i].data()), Form("h2dGenerated%s", particleNames[i].data()), kTH2D, {axisCentrality, axisPt});
}
Expand Down Expand Up @@ -591,15 +591,15 @@
std::vector<double> collisionEventTime(collisions.size(), 0.0);
std::vector<int> collisionNtracks(collisions.size(), 0);
for (const auto& track : tracks) {
if(track.hasTOF() && track.collisionId()>=0){
if (track.hasTOF() && track.collisionId() >= 0) {
collisionEventTime[track.collisionId()] += track.tofEvTime();
collisionNtracks[track.collisionId()] ++;
collisionNtracks[track.collisionId()]++;
}
}
for (const auto& collision : collisions){
if(collisionNtracks[collision.globalIndex()] > 0){
for (const auto& collision : collisions) {
if (collisionNtracks[collision.globalIndex()] > 0) {
collisionEventTime[collision.globalIndex()] /= static_cast<double>(collisionNtracks[collision.globalIndex()]);
}else{
} else {
collisionEventTime[collision.globalIndex()] = -1e+6; // undefined
}
products.straEvTimes(collisionEventTime[collision.globalIndex()]);
Expand Down Expand Up @@ -966,7 +966,7 @@
void processPureSimulation(aod::McParticles const& mcParticles)
{
for (auto& mcp : mcParticles) {
if (TMath::Abs(mcp.y()) < 0.5) {

Check failure on line 969 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
static_for<0, nSpecies - 1>([&](auto i) {
constexpr int index = i.value;
if (mcp.pdgCode() == particlePDGCodes[index] && bitcheck(enabledBits, index)) {
Expand Down Expand Up @@ -996,7 +996,7 @@
histos.fill(HIST("h2dNVerticesVsCentrality"), bestCentrality, collisions.size());

for (auto& mcp : mcParticles) {
if (TMath::Abs(mcp.y()) < 0.5 && mcp.isPhysicalPrimary()) {

Check failure on line 999 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
static_for<0, nSpecies - 1>([&](auto i) {
constexpr int index = i.value;
if (mcp.pdgCode() == particlePDGCodes[index] && bitcheck(enabledBits, index)) {
Expand Down Expand Up @@ -1027,19 +1027,19 @@

auto mcParticles = mcParticlesEntireTable.sliceBy(mcParticlePerMcCollision, mcCollIndex);
for (auto& mcp : mcParticles) {
if (TMath::Abs(mcp.y()) < 0.5 && mcp.isPhysicalPrimary()) {

Check failure on line 1030 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[root/entity] 

Replace ROOT entities with equivalents from standard C++ or from O2.
auto binNumber = hBinFinder->FindBin(mcCollision.bestCollisionCentFT0C(), mcp.pt()); // caution: pack
if (mcp.pdgCode() == 310)

Check failure on line 1032 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genK0Short[binNumber]++;
if (mcp.pdgCode() == 3122)

Check failure on line 1034 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genLambda[binNumber]++;
if (mcp.pdgCode() == -3122)

Check failure on line 1036 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genAntiLambda[binNumber]++;
if (mcp.pdgCode() == 3312)

Check failure on line 1038 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genXiMinus[binNumber]++;
if (mcp.pdgCode() == -3312)

Check failure on line 1040 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genXiPlus[binNumber]++;
if (mcp.pdgCode() == 3334)

Check failure on line 1042 in PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
genOmegaMinus[binNumber]++;
if (mcp.pdgCode() == -3334)
genOmegaPlus[binNumber]++;
Expand Down Expand Up @@ -1135,9 +1135,9 @@
// Run 2: collision processing
PROCESS_SWITCH(strangederivedbuilder, processCollisionsRun2, "Produce collisions (Run2)", false);
PROCESS_SWITCH(strangederivedbuilder, processCollisionsRun2WithMC, "Produce collisions (Run 2) with MC info", false);
// Event times
// Event times
PROCESS_SWITCH(strangederivedbuilder, processPopulateEventTimes, "Populate event times", true);

// detailed information processing
PROCESS_SWITCH(strangederivedbuilder, processTrackExtrasV0sOnly, "Produce track extra information (V0s only)", true);
PROCESS_SWITCH(strangederivedbuilder, processTrackExtras, "Produce track extra information (V0s + casc)", true);
Expand Down
10 changes: 5 additions & 5 deletions PWGLF/TableProducer/Strangeness/strangenesstofpid.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,15 +1057,15 @@ struct strangenesstofpid {
std::vector<double> collisionEventTime(collisions.size(), 0.0);
std::vector<int> collisionNtracks(collisions.size(), 0);
for (const auto& track : tracks) {
if(track.hasTOF()){
if (track.hasTOF()) {
collisionEventTime[track.collisionId()] += track.tofEvTime();
collisionNtracks[track.collisionId()] ++;
collisionNtracks[track.collisionId()]++;
}
}
for (const auto& collision: collisions){
if(collisionNtracks[collision.globalIndex()] > 0){
for (const auto& collision : collisions) {
if (collisionNtracks[collision.globalIndex()] > 0) {
collisionEventTime[collision.globalIndex()] /= static_cast<double>(collisionNtracks[collision.globalIndex()]);
}else{
} else {
collisionEventTime[collision.globalIndex()] = -1e+6; // undefined
}
}
Expand Down
Loading