Skip to content

Fix size of arrays in MillePedeDQMModule to store new HG thresholds #38367

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
cmsbuild merged 2 commits into from
Jun 15, 2022
Merged

Fix size of arrays in MillePedeDQMModule to store new HG thresholds #38367

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c597a1d
Fix size of arrays to store new HG thresholds
dmeuser Jun 14, 2022
6b7b2f6
Store length of threshold and LG result array in enums
dmeuser Jun 14, 2022
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
20 changes: 10 additions & 10 deletions Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ void MillePedeDQMModule ::fillStatusHisto(MonitorElement* statusHisto) {
}

void MillePedeDQMModule ::fillExpertHistos() {
std::array<double, 6> Xcut_, sigXcut_, maxMoveXcut_, maxErrorXcut_;
std::array<double, 6> tXcut_, sigtXcut_, maxMovetXcut_, maxErrortXcut_;
std::array<double, 8> Xcut_, sigXcut_, maxMoveXcut_, maxErrorXcut_;
std::array<double, 8> tXcut_, sigtXcut_, maxMovetXcut_, maxErrortXcut_;

std::array<double, 6> Ycut_, sigYcut_, maxMoveYcut_, maxErrorYcut_;
std::array<double, 6> tYcut_, sigtYcut_, maxMovetYcut_, maxErrortYcut_;
std::array<double, 8> Ycut_, sigYcut_, maxMoveYcut_, maxErrorYcut_;
std::array<double, 8> tYcut_, sigtYcut_, maxMovetYcut_, maxErrortYcut_;

std::array<double, 6> Zcut_, sigZcut_, maxMoveZcut_, maxErrorZcut_;
std::array<double, 6> tZcut_, sigtZcut_, maxMovetZcut_, maxErrortZcut_;
std::array<double, 8> Zcut_, sigZcut_, maxMoveZcut_, maxErrorZcut_;
std::array<double, 8> tZcut_, sigtZcut_, maxMovetZcut_, maxErrortZcut_;

auto myMap = mpReader_->getThresholdMap();

Expand Down Expand Up @@ -196,10 +196,10 @@ void MillePedeDQMModule ::fillExpertHistos() {
}

void MillePedeDQMModule ::fillExpertHisto(MonitorElement* histo,
const std::array<double, 6>& cut,
const std::array<double, 6>& sigCut,
const std::array<double, 6>& maxMoveCut,
const std::array<double, 6>& maxErrorCut,
const std::array<double, 8>& cut,
const std::array<double, 8>& sigCut,
const std::array<double, 8>& maxMoveCut,
const std::array<double, 8>& maxErrorCut,
const std::array<double, 6>& obs,
Copy link
Contributor

@perrotta perrotta Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why still "6"?

Copy link
Contributor Author

@dmeuser dmeuser Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the fillExpertHisto method will only take care of the low granularity result, which has 6 different structures. We will add a new method in an upcoming PR to take care of the high granularity result.

const std::array<double, 6>& obsErr) {
TH1F* histo_0 = histo->getTH1F();
Expand Down
8 changes: 4 additions & 4 deletions Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ class MillePedeDQMModule : public DQMEDHarvester {
void fillExpertHistos();

void fillExpertHisto(MonitorElement* histo,
const std::array<double, 6>& cut,
const std::array<double, 6>& sigCut,
const std::array<double, 6>& maxMoveCut,
const std::array<double, 6>& maxErrorCut,
const std::array<double, 8>& cut,
Copy link
Contributor

@mmusich mmusich Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as a suggestion, since this number doesn't need to be different for the various arrays, could it be a named constant defined somewhere and then used everywhere?

Copy link
Contributor Author

@dmeuser dmeuser Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, do you want me to change it in this PR or the in the upcoming one?

Copy link
Contributor

@mmusich mmusich Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe could be done directly here.

Copy link
Contributor

@perrotta perrotta Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please, do it here.
As such you can also better identify if anything is missing the update (for example: shouldn't also the dimensions and number of bins of the histos get modified accordingly?)

Copy link
Contributor Author

@dmeuser dmeuser Jun 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same argument as below(#38367 (comment)). We want to keep the new HG alignment separated from the LG one, thus we will add additional histograms for the HG result in an upcoming PR. Most of the changes were already collected here: https://github.com/dmeuser/cmssw/tree/hgPCL_PR, where we still need some adaptions to make the next PR

const std::array<double, 8>& sigCut,
const std::array<double, 8>& maxMoveCut,
const std::array<double, 8>& maxErrorCut,
const std::array<double, 6>& obs,
const std::array<double, 6>& obsErr);

Expand Down