Skip to content

[Common] Prevent dangling reference error when switching from gsl::span to std::span #11699

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

Closed
aalkin wants to merge 4 commits into from
Closed

[Common] Prevent dangling reference error when switching from gsl::span to std::span #11699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
553e3e7
Prevent dangling reference error when switching from gsl to std::span
aalkin Jun 20, 2025
3270f58
eventSelectionQa.cxx
aalkin Jun 20, 2025
cb26757
flowZdcTask.cxx
aalkin Jun 20, 2025
a8502f7
flowGfwTask.cxx
aalkin Jun 20, 2025
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: 4 additions & 2 deletions Common/TableProducer/multiplicityTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
using Run2Tracks = soa::Join<aod::Tracks, aod::TracksExtra>;
Partition<Run2Tracks> run2tracklets = (aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Run2Tracklet));
Partition<Run2Tracks> tracksWithTPC = (aod::track::tpcNClsFindable > (uint8_t)0);
Partition<Run2Tracks> pvContribTracks = (nabs(aod::track::eta) < 0.8f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));

Check failure on line 114 in Common/TableProducer/multiplicityTable.cxx

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.
Partition<Run2Tracks> pvContribTracksEta1 = (nabs(aod::track::eta) < 1.0f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));
Preslice<aod::Tracks> perCol = aod::track::collisionId;
Preslice<aod::TracksIU> perColIU = aod::track::collisionId;
Expand Down Expand Up @@ -267,12 +267,14 @@
int multNContribsEtaHalf = 0;

if (collision.has_fv0a()) {
for (const auto& amplitude : collision.fv0a().amplitude()) {
auto fv0a = collision.fv0a();
for (const auto& amplitude : fv0a.amplitude()) {
multFV0A += amplitude;
}
}
if (collision.has_fv0c()) {
for (const auto& amplitude : collision.fv0c().amplitude()) {
auto fv0c = collision.fv0c();
for (const auto& amplitude : fv0c.amplitude()) {
multFV0C += amplitude;
}
}
Expand All @@ -296,10 +298,10 @@
if (std::abs(tracklet.eta()) < 1.0) {
multNContribsEta1++;
}
if (std::abs(tracklet.eta()) < 0.8) {

Check failure on line 301 in Common/TableProducer/multiplicityTable.cxx

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.
multNContribs++;
}
if (std::abs(tracklet.eta()) < 0.5) {

Check failure on line 304 in Common/TableProducer/multiplicityTable.cxx

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.
multNContribsEtaHalf++;
}
}
Expand All @@ -317,9 +319,9 @@
using Run3TracksIU = soa::Join<aod::TracksIU, aod::TracksExtra>;
Partition<Run3TracksIU> tracksIUWithTPC = (aod::track::tpcNClsFindable > (uint8_t)0);
Partition<Run3TracksIU> pvAllContribTracksIU = ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));
Partition<Run3TracksIU> pvContribTracksIU = (nabs(aod::track::eta) < 0.8f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));

Check failure on line 322 in Common/TableProducer/multiplicityTable.cxx

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.
Partition<Run3TracksIU> pvContribTracksIUEta1 = (nabs(aod::track::eta) < 1.0f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));
Partition<Run3TracksIU> pvContribTracksIUEtaHalf = (nabs(aod::track::eta) < 0.5f) && ((aod::track::flags & static_cast<uint32_t>(o2::aod::track::PVContributor)) == static_cast<uint32_t>(o2::aod::track::PVContributor));

Check failure on line 324 in Common/TableProducer/multiplicityTable.cxx

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.

void processRun3(soa::Join<aod::Collisions, aod::EvSels> const& collisions,
Run3TracksIU const&,
Expand Down Expand Up @@ -467,7 +469,7 @@
auto amplitude = fv0.amplitude()[ii];
auto channel = fv0.channel()[ii];
multFV0A += amplitude;
if (channel > 7) {

Check failure on line 472 in Common/TableProducer/multiplicityTable.cxx

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.
multFV0AOuter += amplitude;
}
}
Expand Down Expand Up @@ -562,10 +564,10 @@
const auto& tracksThisCollision = pvContribTracksIUEta1.sliceByCached(aod::track::collisionId, collision.globalIndex(), cache);
multNContribsEta1 = tracksThisCollision.size();
for (const auto& track : tracksThisCollision) {
if (std::abs(track.eta()) < 0.8) {

Check failure on line 567 in Common/TableProducer/multiplicityTable.cxx

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.
multNContribs++;
}
if (std::abs(track.eta()) < 0.5) {

Check failure on line 570 in Common/TableProducer/multiplicityTable.cxx

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.
multNContribsEtaHalf++;
}
}
Expand Down Expand Up @@ -623,14 +625,14 @@
} break;
case kFV0MultZeqs: // Z equalized FV0
{
if (std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {

Check failure on line 628 in Common/TableProducer/multiplicityTable.cxx

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.
multZeqFV0A = hVtxZFV0A->Interpolate(0.0) * multFV0A / hVtxZFV0A->Interpolate(collision.posZ());
}
tableFV0Zeqs(multZeqFV0A);
} break;
case kFT0MultZeqs: // Z equalized FT0
{
if (std::fabs(collision.posZ()) < 15.0f && lCalibLoaded) {

Check failure on line 635 in Common/TableProducer/multiplicityTable.cxx

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.
multZeqFT0A = hVtxZFT0A->Interpolate(0.0) * multFT0A / hVtxZFT0A->Interpolate(collision.posZ());
multZeqFT0C = hVtxZFT0C->Interpolate(0.0) * multFT0C / hVtxZFT0C->Interpolate(collision.posZ());
}
Expand Down
6 changes: 4 additions & 2 deletions Common/Tools/MultModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,12 +500,14 @@ class MultModule
//_______________________________________________________________________
// forward detector signals, raw
if (collision.has_fv0a()) {
for (const auto& amplitude : collision.fv0a().amplitude()) {
auto fv0a = collision.fv0a();
for (const auto& amplitude : fv0a.amplitude()) {
mults.multFV0A += amplitude;
}
}
if (collision.has_fv0c()) {
for (const auto& amplitude : collision.fv0c().amplitude()) {
auto fv0c = collision.fv0c();
for (const auto& amplitude : fv0c.amplitude()) {
mults.multFV0C += amplitude;
}
}
Expand Down
12 changes: 8 additions & 4 deletions DPG/Tasks/AOTEvent/eventSelectionQa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,15 +448,17 @@ struct EventSelectionQaTask {
float multV0A = 0;
float multV0C = 0;
if (bc.has_fv0a()) {
for (unsigned int i = 0; i < bc.fv0a().amplitude().size(); ++i) {
auto fv0a = bc.fv0a();
for (unsigned int i = 0; i < fv0a.amplitude().size(); ++i) {
int ring = bc.fv0a().channel()[i] / 8;
multRingV0A[ring] += bc.fv0a().amplitude()[i];
multV0A += bc.fv0a().amplitude()[i];
}
}

if (bc.has_fv0c()) {
for (unsigned int i = 0; i < bc.fv0c().amplitude().size(); ++i) {
auto fv0c = bc.fv0c();
for (unsigned int i = 0; i < fv0c.amplitude().size(); ++i) {
int ring = bc.fv0c().channel()[i] / 8;
multRingV0C[ring] += bc.fv0c().amplitude()[i];
multV0C += bc.fv0c().amplitude()[i];
Expand Down Expand Up @@ -847,7 +849,8 @@ struct EventSelectionQaTask {
histos.fill(HIST("hOrbitFV0"), orbit - orbitSOR);
histos.fill(HIST("hBcFV0"), localBC);
float multV0A = 0;
for (const auto& amplitude : bc.fv0a().amplitude()) {
auto fv0a = bc.fv0a();
for (const auto& amplitude : fv0a.amplitude()) {
multV0A += amplitude;
}
histos.fill(HIST("hMultV0Aall"), multV0A);
Expand Down Expand Up @@ -1079,7 +1082,8 @@ struct EventSelectionQaTask {
// FV0
float multV0A = 0;
if (foundBC.has_fv0a()) {
for (const auto& amplitude : foundBC.fv0a().amplitude()) {
auto fv0a = foundBC.fv0a();
for (const auto& amplitude : fv0a.amplitude()) {
multV0A += amplitude;
}
}
Expand Down
5 changes: 3 additions & 2 deletions PWGCF/Flow/Tasks/flowGfwTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,10 +886,11 @@ struct FlowGfwTask {
double ft0mAmp = 0;

if (foundBC.has_ft0()) {
for (const auto& amplitude : foundBC.ft0().amplitudeA()) {
auto ft0 = foundBC.ft0();
for (const auto& amplitude : ft0.amplitudeA()) {
ft0aAmp += amplitude;
}
for (const auto& amplitude : foundBC.ft0().amplitudeC()) {
for (const auto& amplitude : ft0.amplitudeC()) {
ft0cAmp += amplitude;
}
} else {
Expand Down
8 changes: 5 additions & 3 deletions PWGCF/Flow/Tasks/flowZdcTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,18 +432,20 @@ struct FlowZdcTask {

float aT0A = 0., aT0C = 0., aV0A = 0.;
if (foundBC.has_ft0()) {
for (const auto& amplitude : foundBC.ft0().amplitudeA()) {
auto ft0 = foundBC.ft0();
for (const auto& amplitude : ft0.amplitudeA()) {
aT0A += amplitude;
}
for (const auto& amplitude : foundBC.ft0().amplitudeC()) {
for (const auto& amplitude : ft0.amplitudeC()) {
aT0C += amplitude;
}
} else {
return;
}
histos.fill(HIST("hEventCounter"), EvCutLabel::TZero);
if (foundBC.has_fv0a()) {
for (const auto& amplitude : foundBC.fv0a().amplitude()) {
auto fv0a = foundBC.fv0a();
for (const auto& amplitude : fv0a.amplitude()) {
aV0A += amplitude;
}
} else {
Expand Down
Loading