Skip to content

[O2-2018] Allow usage of Microsoft GSL v2 and v3 #613

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
knopers8 merged 1 commit into from
Feb 17, 2021
Merged

[O2-2018] Allow usage of Microsoft GSL v2 and v3 #613

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
4 changes: 1 addition & 3 deletions Modules/ITS/src/ITSClusterTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ void ITSClusterTask::monitorData(o2::framework::ProcessingContext& ctx)
auto clusArr = ctx.inputs().get<gsl::span<o2::itsmft::CompClusterExt>>("compclus");
auto clusRofArr = ctx.inputs().get<gsl::span<o2::itsmft::ROFRecord>>("clustersrof");
int lay, sta, ssta, mod, chip;
for (int iROF = 0; iROF < clusRofArr.size(); iROF++) {

auto& ROF = clusRofArr[iROF];
for (const auto& ROF : clusRofArr) {
for (int icl = ROF.getFirstEntry(); icl < ROF.getFirstEntry() + ROF.getNEntries(); icl++) {

auto& cluster = clusArr[icl];
Expand Down
4 changes: 1 addition & 3 deletions Modules/ITS/src/ITSTrackTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ void ITSTrackTask::monitorData(o2::framework::ProcessingContext& ctx)
auto rofArr = ctx.inputs().get<gsl::span<o2::itsmft::ROFRecord>>("rofs");
auto clusArr = ctx.inputs().get<gsl::span<o2::itsmft::CompClusterExt>>("compclus");

for (int iROF = 0; iROF < rofArr.size(); iROF++) {

auto& ROF = rofArr[iROF];
for (const auto& ROF : rofArr) {
for (int itrack = ROF.getFirstEntry(); itrack < ROF.getFirstEntry() + ROF.getNEntries(); itrack++) {

auto& track = trackArr[itrack];
Expand Down
9 changes: 3 additions & 6 deletions Modules/MUON/MCH/src/PhysicsTaskPreclusters.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ static void CoG(gsl::span<const o2::mch::Digit> precluster, double& Xcog, double
int detid = precluster[0].getDetID();
const o2::mch::mapping::Segmentation& segment = o2::mch::mapping::segmentation(detid);

for (ssize_t i = 0; i < precluster.size(); ++i) {
const o2::mch::Digit& digit = precluster[i];
for (const o2::mch::Digit& digit : precluster) {
int padid = digit.getPadID();

// position and size of current pad
Expand Down Expand Up @@ -247,8 +246,7 @@ bool PhysicsTaskPreclusters::plotPrecluster(const o2::mch::PreCluster& preCluste
int detid = preClusterDigits[0].getDetID();
const o2::mch::mapping::Segmentation& segment = o2::mch::mapping::segmentation(detid);

for (ssize_t i = 0; i < preClusterDigits.size(); ++i) {
const o2::mch::Digit& digit = preClusterDigits[i];
for (const o2::mch::Digit& digit : preClusterDigits) {
int padid = digit.getPadID();

// cathode index
Expand Down Expand Up @@ -329,8 +327,7 @@ void PhysicsTaskPreclusters::printPreclusters(gsl::span<const o2::mch::PreCluste
int detid = preClusterDigits[0].getDetID();
const o2::mch::mapping::Segmentation& segment = o2::mch::mapping::segmentation(detid);

for (ssize_t i = 0; i < preClusterDigits.size(); ++i) {
const o2::mch::Digit& digit = preClusterDigits[i];
for (const o2::mch::Digit& digit : preClusterDigits) {
int padid = digit.getPadID();

// cathode index
Expand Down