Skip to content
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

Jump to bottom

Fix for gcc9 warning in HLTrigger/JSONMonitoring #28274

Merged
merged 4 commits into from Nov 4, 2019
Merged

Fix for gcc9 warning in HLTrigger/JSONMonitoring #28274

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0f05de
Fix for gcc9 warning in HLTrigger/JSONMonitoring
mrodozov Oct 25, 2019
a1a5d9f
Update L1TriggerJSONMonitoring.cc
mrodozov Oct 25, 2019
29ed083
Add suggested fixes
mrodozov Oct 28, 2019
36043c9
add latest suggestions
mrodozov Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc
View file
Open in desktop
Expand Up @@ -34,14 +34,15 @@

struct L1TriggerJSONMonitoringData {
// variables accumulated event by event in each stream
static constexpr const int kPrescaleUndefined = -2;
Copy link
Contributor

Choose a reason for hiding this comment

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

please do not duplicate this from the L1TriggerJSONMonitoring class

Copy link
Contributor

Choose a reason for hiding this comment

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

maybe you can move the whole block

  // special values for prescale index checks
  static constexpr const int kPrescaleUndefined = -2;
  static constexpr const int kPrescaleConflict = -1;

above the comment on line 36

// variables accumulated event by event in each stream

and modify L1TriggerJSONMonitoring to reuse it from L1TriggerJSONMonitoringData ?

struct stream {
unsigned int processed; // number of events processed
unsigned int processed = 0; // number of events processed
std::vector<unsigned int> l1tAccept; // number of events accepted by each L1 trigger
std::vector<unsigned int> l1tAcceptPhysics; // number of "physics" events accepted by each L1 trigger
std::vector<unsigned int> l1tAcceptCalibration; // number of "calibration" events accepted by each L1 trigger
std::vector<unsigned int> l1tAcceptRandom; // number of "random" events accepted by each L1 trigger
std::vector<unsigned int> tcdsAccept; // number of "physics", "calibration", "random" and other event types
int prescaleIndex; // prescale column index
std::vector<unsigned int> tcdsAccept; // number of "physics", "calibration", "random" and other event types
int prescaleIndex = kPrescaleUndefined; // prescale column index
};

// variables initialised for each run
Expand All @@ -61,7 +62,7 @@ struct L1TriggerJSONMonitoringData {
l1tAcceptCalibration; // number of "calibration" events accepted by each L1 trigger
jsoncollector::HistoJ<unsigned int> l1tAcceptRandom; // number of "random" events accepted by each L1 trigger
jsoncollector::HistoJ<unsigned int> tcdsAccept; // number of "physics", "calibration", "random" and other event types
int prescaleIndex; // prescale column index
int prescaleIndex = kPrescaleUndefined; // prescale column index
};
};

Expand Down