Skip to content

Add SPD clusters L0&L1 multiplicities #428

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

Add SPD clusters L0&L1 multiplicities #428

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
6 changes: 3 additions & 3 deletions Common/TableProducer/multCentTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct MultCentTable {
module.init(opts, initContext);
}

void processRun2(soa::Join<aod::Collisions, aod::EvSels, aod::Run2MatchedSparse> const& collisions,
void processRun2(soa::Join<aod::Collisions, aod::Run2MatchedSparse> const& collisions,
soa::Join<aod::Tracks, aod::TracksExtra> const& tracks,
soa::Join<aod::BCs, aod::Run2BCInfos, aod::Timestamps> const& bcs,
aod::Zdcs const&,
Expand All @@ -88,10 +88,10 @@ struct MultCentTable {
mults.clear();
for (auto const& collision : collisions) {
o2::common::multiplicity::multEntry mult;
// const auto& bc = collision.bc_as<soa::Join<aod::BCs, aod::Run2BCInfos, aod::Timestamps, aod::Run2MatchedToBCSparse>>();
const auto& bc = bcs.rawIteratorAt(collision.getId<aod::indices::BCId>());
const uint64_t collIdx = collision.globalIndex();
auto tracksThisCollision = tracks.sliceBy(slicerTrackRun2, collIdx);
mult = module.collisionProcessRun2(collision, tracksThisCollision, bcs, products);
mult = module.collisionProcessRun2(collision, tracksThisCollision, bc, products);
mults.push_back(mult);
}
}
Expand Down
8 changes: 4 additions & 4 deletions Common/Tools/MultModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,15 +472,15 @@
}

//__________________________________________________
template <typename TCollision, typename TTracks, typename TBCs, typename TOutputGroup>
o2::common::multiplicity::multEntry collisionProcessRun2(TCollision const& collision, TTracks const& tracks, TBCs const& bcs, TOutputGroup& cursors)
template <typename TCollision, typename TTracks, typename TBC, typename TOutputGroup>
o2::common::multiplicity::multEntry collisionProcessRun2(TCollision const& collision, TTracks const& tracks, TBC const& bc, TOutputGroup& cursors)
{
// initialize properties
o2::common::multiplicity::multEntry mults;

mults.posZ = collision.posZ();
// mults.spdClustersL0 = bc.spdClustersL0();
// mults.spdClustersL1 = bc.spdClustersL1();
mults.spdClustersL0 = bc.spdClustersL0();
mults.spdClustersL1 = bc.spdClustersL1();
//_______________________________________________________________________
// forward detector signals, raw
if (collision.has_fv0a()) {
Expand Down Expand Up @@ -521,9 +521,9 @@
if (internalOpts.mEnabledTables[kPVMults]) {
if (std::abs(track.eta()) < 1.0) {
mults.multNContribsEta1++; // pvmults
if (std::abs(track.eta()) < 0.8) {

Check failure on line 524 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNContribs++; // pvmults
if (std::abs(track.eta()) < 0.5) {

Check failure on line 526 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNContribsEtaHalf++; // pvmults
}
}
Expand Down Expand Up @@ -619,7 +619,7 @@
auto amplitude = fv0.amplitude()[ii];
auto channel = fv0.channel()[ii];
mults.multFV0A += amplitude;
if (channel > 7) {

Check failure on line 622 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multFV0AOuter += amplitude;
}
}
Expand Down Expand Up @@ -735,9 +735,9 @@
if (track.isPVContributor()) {
if (std::abs(track.eta()) < 1.0) {
mults.multNContribsEta1++; // pvmults
if (std::abs(track.eta()) < 0.8) {

Check failure on line 738 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNContribs++; // pvmults
if (std::abs(track.eta()) < 0.5) {

Check failure on line 740 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNContribsEtaHalf++; // pvmults
}
}
Expand Down Expand Up @@ -772,14 +772,14 @@
}
mults.multNbrContribsEta10GlobalTrackWoDCA++;

if (std::abs(track.eta()) < 0.8) {

Check failure on line 775 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNbrContribsEta08GlobalTrackWoDCA++;
}
if (std::abs(track.eta()) < 0.5) {

Check failure on line 778 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
mults.multNbrContribsEta05GlobalTrackWoDCA++;
}
}
if (std::fabs(track.eta()) < 0.8 && track.tpcNClsFound() >= 80 && track.tpcNClsCrossedRows() >= 100) {

Check failure on line 782 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (track.isGlobalTrack()) {
mults.multGlobalTracks++;
}
Expand Down Expand Up @@ -842,13 +842,13 @@
if (p != nullptr) {
charge = p->Charge();
}
if (std::abs(charge) < 1e-3) {

Check failure on line 845 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
continue; // reject neutral particles in counters
}

if (std::abs(mcPart.eta()) < 1.0) {
multBarrelEta10++;
if (std::abs(mcPart.eta()) < 0.8) {

Check failure on line 851 in Common/Tools/MultModule.h

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
multBarrelEta08++;
if (std::abs(mcPart.eta()) < 0.5) {
multBarrelEta05++;
Expand Down
Loading