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 all commits
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
24 changes: 12 additions & 12 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, SIZE_INDEX> Xcut_, sigXcut_, maxMoveXcut_, maxErrorXcut_;
std::array<double, SIZE_INDEX> tXcut_, sigtXcut_, maxMovetXcut_, maxErrortXcut_;

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

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

auto myMap = mpReader_->getThresholdMap();

Expand Down Expand Up @@ -196,12 +196,12 @@ 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, 6>& obs,
const std::array<double, 6>& obsErr) {
const std::array<double, SIZE_INDEX>& cut,
const std::array<double, SIZE_INDEX>& sigCut,
const std::array<double, SIZE_INDEX>& maxMoveCut,
const std::array<double, SIZE_INDEX>& maxErrorCut,
const std::array<double, SIZE_LG_STRUCTS>& obs,
const std::array<double, SIZE_LG_STRUCTS>& obsErr) {
TH1F* histo_0 = histo->getTH1F();

double max_ = *std::max_element(maxMoveCut.begin(), maxMoveCut.end());
Expand Down
14 changes: 8 additions & 6 deletions Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ class MillePedeDQMModule : public DQMEDHarvester {

void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;

enum { SIZE_LG_STRUCTS = 6, SIZE_INDEX = 8 };

//========================= PRIVATE METHODS ==================================
private: //===================================================================
void beginRun(const edm::Run&, const edm::EventSetup&) override;
Expand All @@ -64,12 +66,12 @@ 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, 6>& obs,
const std::array<double, 6>& obsErr);
const std::array<double, SIZE_INDEX>& cut,
const std::array<double, SIZE_INDEX>& sigCut,
const std::array<double, SIZE_INDEX>& maxMoveCut,
const std::array<double, SIZE_INDEX>& maxErrorCut,
const std::array<double, SIZE_LG_STRUCTS>& obs,
const std::array<double, SIZE_LG_STRUCTS>& obsErr);

bool setupChanged(const edm::EventSetup&);
int getIndexFromString(const std::string& alignableId);
Expand Down