Skip to content

Please consider the following formatting changes to #11822 #126

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
fgrosa merged 1 commit into from
Jun 30, 2025
Merged

Please consider the following formatting changes to #11822 #126

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
26 changes: 13 additions & 13 deletions PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pwghf/struct-member-order] 

Declare struct members in the conventional order. See the PWGHF coding guidelines.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -38,6 +38,7 @@
#include "Common/DataModel/Qvectors.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/RunningWorkflowInfo.h"
#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/PhysicsConstants.h>
#include <DCAFitter/DCAFitterN.h>
Expand All @@ -55,7 +56,6 @@
#include <Framework/Logger.h>
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/runDataProcessing.h>
#include "Framework/RunningWorkflowInfo.h"
#include <ReconstructionDataFormats/DCA.h>
#include <ReconstructionDataFormats/Track.h>

Expand Down Expand Up @@ -244,7 +244,7 @@
Preslice<CandsLcFiltered> candsLcPerCollision = aod::track_association::collisionId;
Preslice<CandsLcFilteredWithMl> candsLcPerCollisionWithMl = aod::track_association::collisionId;
Preslice<aod::TrackAssoc> trackIndicesPerCollision = aod::track_association::collisionId;
PresliceUnsorted<CollisionsWCentAndMcLabels> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;

Check failure on line 247 in PWGHF/D2H/TableProducer/dataCreatorCharmHadPiReduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pwghf/struct-member-order] 

HfDataCreatorCharmHadPiReduced: PresliceUnsorted< appears too early (before end of Preslice<).
Preslice<aod::McParticles> mcParticlesPerMcCollision = aod::mcparticle::mcCollisionId;

std::shared_ptr<TH1> hCandidatesD0, hCandidatesDPlus, hCandidatesDs, hCandidatesLc;
Expand Down Expand Up @@ -948,8 +948,8 @@
{
registry.fill(HIST("hEvents"), 1 + Event::Processed);
float centrality = -1.f;
auto hfRejMap= hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
if (configs.skipRejectedCollisions && hfRejMap!= 0) {
auto hfRejMap = hfEvSel.getHfCollisionRejectionMask<true, o2::hf_centrality::CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);
if (configs.skipRejectedCollisions && hfRejMap != 0) {
return;
}

Expand Down Expand Up @@ -1333,8 +1333,8 @@
// Check event selection
float centDummy{-1.f}, centFT0C{-1.f}, centFT0M{-1.f};
const auto collSlice = collisions.sliceBy(colPerMcCollision, mcCollision.globalIndex());
auto hfRejMap= hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, o2::hf_centrality::CentralityEstimator::None>(mcCollision, collSlice, centDummy);
if (configs.skipRejectedCollisions && hfRejMap!= 0) {
auto hfRejMap = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, o2::hf_centrality::CentralityEstimator::None>(mcCollision, collSlice, centDummy);
if (configs.skipRejectedCollisions && hfRejMap != 0) {
return;
}

Expand Down Expand Up @@ -1990,7 +1990,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::B0ToDminusPi>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down Expand Up @@ -2027,7 +2027,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::B0ToDminusPi>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down Expand Up @@ -2064,7 +2064,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::BsToDsminusPi>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down Expand Up @@ -2101,7 +2101,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::BsToDsminusPi>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down Expand Up @@ -2138,7 +2138,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::BplusToD0barPi>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down Expand Up @@ -2175,7 +2175,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::BplusToD0barPi>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down Expand Up @@ -2212,7 +2212,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::LbToLcplusPi>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down Expand Up @@ -2249,7 +2249,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::LbToLcplusPi>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down
8 changes: 4 additions & 4 deletions PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pwghf/struct-member-order] 

Declare struct members in the conventional order. See the PWGHF coding guidelines.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand Down Expand Up @@ -34,6 +34,7 @@
#include "Common/DataModel/PIDResponseTPC.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include "Framework/RunningWorkflowInfo.h"
#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/PhysicsConstants.h>
#include <DCAFitter/DCAFitterN.h>
Expand All @@ -52,7 +53,6 @@
#include <Framework/O2DatabasePDGPlugin.h>
#include <Framework/WorkflowSpec.h>
#include <Framework/runDataProcessing.h>
#include "Framework/RunningWorkflowInfo.h"
#include <ReconstructionDataFormats/DCA.h>
#include <ReconstructionDataFormats/Track.h>

Expand Down Expand Up @@ -168,7 +168,7 @@

Preslice<aod::HfCand2ProngWPid> candsJpsiPerCollision = aod::track_association::collisionId;
Preslice<aod::TrackAssoc> trackIndicesPerCollision = aod::track_association::collisionId;
PresliceUnsorted<CollisionsWCMcLabels> colPerMcCollision = aod::mccollisionlabel::mcCollisionId;

Check failure on line 171 in PWGHF/D2H/TableProducer/dataCreatorJpsiHadReduced.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pwghf/struct-member-order] 

HfDataCreatorJpsiHadReduced: PresliceUnsorted< appears too early (before end of Preslice<).
Preslice<aod::McParticles> mcParticlesPerMcCollision = aod::mcparticle::mcCollisionId;

o2::base::Propagator::MatCorrType noMatCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
Expand Down Expand Up @@ -540,7 +540,7 @@
float centDummy{-1.f}, centFT0C{-1.f}, centFT0M{-1.f};
const auto collSlice = collisions.sliceBy(colPerMcCollision, mcCollision.globalIndex());
auto hfRejMap = hfEvSelMc.getHfMcCollisionRejectionMask<BCsInfo, o2::hf_centrality::CentralityEstimator::None>(mcCollision, collSlice, centDummy);
if (skipRejectedCollisions && hfRejMap!= 0) {
if (skipRejectedCollisions && hfRejMap != 0) {
return;
}

Expand Down Expand Up @@ -1109,7 +1109,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::BplusToJpsiK>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down Expand Up @@ -1146,7 +1146,7 @@
}
// handle normalization by the right number of collisions
hfCollisionCounter(collisions.tableSize(), zvtxColl, sel8Coll, zvtxAndSel8Coll, zvtxAndSel8CollAndSoftTrig, allSelColl);
for (const auto& mcCollision: mcCollisions) {
for (const auto& mcCollision : mcCollisions) {
runMcGen<DecayChannel::BsToJpsiPhi>(mcCollision, particlesMc, collisions, bcs);
}
}
Expand Down
Loading