Commit e89854b4 authored by Shaun Roe's avatar Shaun Roe Committed by Frank Winklmeier
Browse files

22.0-cppcheck-TrigT1CaloMonitoring

parent 319da1c6
......@@ -1345,7 +1345,7 @@ void CPSimMon::compare(const CpmTobRoiMap &roiSimMap,
// Compare simulated CMX TOBs with data
void CPSimMon::compare(const CmxCpTobMap &simMap, const CmxCpTobMap &datMap,
const std::vector<int> parityMap, ErrorVector &errorsCPM,
const std::vector<int> & parityMap, ErrorVector &errorsCPM,
ErrorVector &errorsCMX) {
if (m_debug)
msg(MSG::DEBUG) << "Compare simulated CMX TOBs with data" << endmsg;
......
......@@ -202,20 +202,14 @@ private:
LocalSumMismatch, RemoteSumMismatch, TotalSumMismatch,
TopoMismatch, NumberOfSummaryBins };
//typedef DataVector<LVL1::CPMTower> CpmTowerCollection;
//typedef DataVector<LVL1::CMXCPTob> CmxCpTobCollection;
//typedef DataVector<LVL1::CMXCPHits> CmxCpHitsCollection;
//typedef DataVector<LVL1::TriggerTower> TriggerTowerCollection;
typedef DataVector<LVL1::CPAlgorithm> InternalRoiCollection;
typedef std::vector<int> ErrorVector;
//typedef maps @@
//typedef std::map<int, LVL1::TriggerTower*> TriggerTowerMap;
typedef std::map<int, const xAOD::TriggerTower*> TriggerTowerMapEm;
typedef std::map<int, const xAOD::TriggerTower*> TriggerTowerMapHad;
typedef xAOD::CPMTowerMap_t CpmTowerMap;
// typedef std::map<int, const xAOD::CPMTower*>* CpmTowerMapP;
typedef std::map<int, const xAOD::CMXCPTob*> CmxCpTobMap;
typedef std::map<int, const xAOD::CMXCPHits*> CmxCpHitsMap;
typedef xAOD::CPMTobRoIMap_t CpmTobRoiMap;
......@@ -234,7 +228,7 @@ private:
ErrorVector& errors);
/// Compare simulated CMX TOBs with data
void compare(const CmxCpTobMap& simMap, const CmxCpTobMap& datMap,
const std::vector<int> parityMap,
const std::vector<int> & parityMap,
ErrorVector& errorsCPM, ErrorVector& errorsCMX);
/// Compare Simulated CMX Hit Sums and Data CMX Hit Sums
void compare(const CmxCpHitsMap& cmxSimMap, const CmxCpHitsMap& cmxMap,
......
......@@ -22,55 +22,55 @@ class CpmMonitorAlgorithm : public AthMonitorAlgorithm {
// monitoring trigger tower structs for various towers
struct MonitorTT{
const xAOD::TriggerTower_v2* ttower;
double phi_scaled; // rescaled for 2D plots
const xAOD::TriggerTower_v2* ttower{};
double phi_scaled{}; // rescaled for 2D plots
};
struct MonitorCpmTT{
const xAOD::CPMTower_v2* ttower;
const xAOD::CPMTower_v2* ttower{};
// some modified/derived information
double phi_scaled; // rescaled for 2D plots
int slice; // crate * m_maxSlices + emEnergyVec()).size() - 1;
double phi_scaled{}; // rescaled for 2D plots
int slice{}; // crate * m_maxSlices + emEnergyVec()).size() - 1;
// errors
bool emParityError;
bool emLinkDownError;
bool emGLinkParityError[8];
bool hadParityError;
bool hadLinkDownError;
bool emParityError{};
bool emLinkDownError{};
bool emGLinkParityError[8]{};
bool hadParityError{};
bool hadLinkDownError{};
};
struct MonitorTobRoI{
const xAOD::CPMTobRoI_v1* tobroi;
// some modified/derived information
double etaMod;
double phiMod;
double etaMod{};
double phiMod{};
};
struct MonitorCmxCpTob{
const xAOD::CMXCPTob_v1* tob;
// some modified/derived information
uint8_t x; // crate * m_modules + cpm - 1
uint8_t y; // chip * 4 + location
int ybase; // cmx * 5
uint8_t x{}; // crate * m_modules + cpm - 1
uint8_t y{}; // chip * 4 + location
int ybase{}; // cmx * 5
// errors required to be used as masks
bool parityError;
int ybaseError;
bool parityError{};
int ybaseError{};
};
struct MonitorCmxCpHits{
const xAOD::CMXCPHits_v1* hit;
const xAOD::CMXCPHits_v1* hit{};
// some modified/derived information
uint8_t crateSlices; // crate * m_maxSlices + slices - 1
uint8_t crateCmx; // crate * 2 + cmx
uint8_t crateSlices{}; // crate * m_maxSlices + slices - 1
uint8_t crateCmx{}; // crate * 2 + cmx
// source flag
bool srcTopoCheckSum;
bool srcTopoCheckSum{};
};
private:
// Phi scale for trigger tower eta/phi plots
double m_phiScaleTT;
double m_phiScaleTT{};
StringProperty m_packageName{this,"PackageName","CpmMonitor","group name for histograming"};
......
......@@ -25,17 +25,12 @@ public:JepJemMonitorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator
virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
struct MonitorJepJemJE {
const xAOD::JetElement* jelement;
const xAOD::JetElement* jelement{};
// some modified/derived information
double eta;
double phi;
// errors
// bool emParityError;
// bool emLinkDownError;
// bool emGLinkParityError[8];
// bool hadParityError;
// bool hadLinkDownError;
double eta{};
double phi{};
};
......
......@@ -94,14 +94,14 @@ private:
ToolHandle<Trig::TrigDecisionTool> m_trigDec;
/// Histograms booked flag
bool m_histBooked;
bool m_histBooked{};
// Histograms
// Overview histos
// Overall selected events and cut flow of analysis
TH1F_LW* m_h_1d_cutFlow_mistimedStreamAna;
TH1F_LW* m_h_1d_cutFlow_mistimedStreamAna{};
// Selected events per lumi block
TH1F_LW* m_h_1d_selectedEvents_mistimedStreamAna;
TH1F_LW* m_h_1d_selectedEvents_mistimedStreamAna{};
//Variables for the properties
/// Root directory
......@@ -111,13 +111,13 @@ private:
/// L1Calo conditions
ServiceHandle<L1CaloCondSvc> m_l1CondSvc;
/// Database container for the run parameters
L1CaloRunParametersContainer* m_runParametersContainer;
L1CaloRunParametersContainer* m_runParametersContainer{};
/// Database container for the readout configuration
L1CaloReadoutConfigContainer* m_readoutConfigContainer;
L1CaloReadoutConfigContainer* m_readoutConfigContainer{};
//Control maximum number of histograms per job
int m_maxHistos;
int m_curHistos;
int m_maxHistos{};
int m_curHistos{};
// Athena hist service
ServiceHandle<ITHistSvc> m_thistSvc;
......
......@@ -151,7 +151,7 @@ private:
ServiceHandle<L1CaloCondSvc> m_l1CondSvc;
/// Database container
L1CaloRunParametersContainer* m_runParametersContainer;
L1CaloRunParametersContainer* m_runParametersContainer{};
/// Root directory name
std::string m_rootDir;
......@@ -160,49 +160,49 @@ private:
std::string m_triggerTowerLocation;
/// Cut on ADC digits for re-simulation
int m_simulationADCCut;
int m_simulationADCCut{};
/// Histograms booked flag
bool m_histBooked;
bool m_histBooked{};
//=======================
// Match/Mismatch plots
//=======================
// LUT-CP
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutCp_SimEqData; ///< PPM LUT EM Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutCp_SimNeData; ///< PPM LUT EM Data/Simulation Non-zero Mismatches
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutCp_SimNoData; ///< PPM LUT EM Simulation but no Data
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutCp_DataNoSim; ///< PPM LUT EM Data but no Simulation
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutCp_SimEqData; ///< PPM LUT HAD Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutCp_SimNeData; ///< PPM LUT HAD Data/Simulation Non-zero Mismatches
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutCp_SimNoData; ///< PPM LUT HAD Simulation but no Data
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutCp_DataNoSim; ///< PPM LUT HAD Data but no Simulation
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutCp_SimEqData{}; ///< PPM LUT EM Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutCp_SimNeData{}; ///< PPM LUT EM Data/Simulation Non-zero Mismatches
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutCp_SimNoData{}; ///< PPM LUT EM Simulation but no Data
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutCp_DataNoSim{}; ///< PPM LUT EM Data but no Simulation
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutCp_SimEqData{}; ///< PPM LUT HAD Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutCp_SimNeData{}; ///< PPM LUT HAD Data/Simulation Non-zero Mismatches
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutCp_SimNoData{}; ///< PPM LUT HAD Simulation but no Data
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutCp_DataNoSim{}; ///< PPM LUT HAD Data but no Simulation
// LUT-JEP
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutJep_SimEqData; ///< PPM LUT EM Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutJep_SimNeData; ///< PPM LUT EM Data/Simulation Non-zero Mismatches
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutJep_SimNoData; ///< PPM LUT EM Simulation but no Data
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutJep_DataNoSim; ///< PPM LUT EM Data but no Simulation
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutJep_SimEqData; ///< PPM LUT HAD Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutJep_SimNeData; ///< PPM LUT HAD Data/Simulation Non-zero Mismatches
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutJep_SimNoData; ///< PPM LUT HAD Simulation but no Data
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutJep_DataNoSim; ///< PPM LUT HAD Data but no Simulation
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutJep_SimEqData{}; ///< PPM LUT EM Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutJep_SimNeData{}; ///< PPM LUT EM Data/Simulation Non-zero Mismatches
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutJep_SimNoData{}; ///< PPM LUT EM Simulation but no Data
TH2F_LW* m_h_ppm_em_2d_etaPhi_tt_lutJep_DataNoSim{}; ///< PPM LUT EM Data but no Simulation
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutJep_SimEqData{}; ///< PPM LUT HAD Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutJep_SimNeData{}; ///< PPM LUT HAD Data/Simulation Non-zero Mismatches
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutJep_SimNoData{}; ///< PPM LUT HAD Simulation but no Data
TH2F_LW* m_h_ppm_had_2d_etaPhi_tt_lutJep_DataNoSim{}; ///< PPM LUT HAD Data but no Simulation
// BCID
TH2F_LW* m_h_ppm_2d_etaPhi_tt_peakf_NonZeroMatches; ///< PPM PEAKFINDER BCID Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_2d_etaPhi_tt_peakf_ZeroMatches; ///< PPM PEAKFINDER BCID Data/Simulation Zero Matches
TH2F_LW* m_h_ppm_2d_etaPhi_tt_peakf_SimNoData; ///< PPM PEAKFINDER BCID Data/Simulation Simulation but no Data
TH2F_LW* m_h_ppm_2d_etaPhi_tt_peakf_DataNoSim; ///< PPM PEAKFINDER BCID Data/Simulation Data but no Simulation
TH2F_LW* m_h_ppm_2d_etaPhi_tt_satBcid_NonZeroMatches; ///< PPM SATURATED BCID Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_2d_etaPhi_tt_satBcid_ZeroMatches; ///< PPM SATURATED BCID Data/Simulation Zero Matches
TH2F_LW* m_h_ppm_2d_etaPhi_tt_satBcid_SimNoData; ///< PPM SATURATED BCID Data/Simulation Simulation but no Data
TH2F_LW* m_h_ppm_2d_etaPhi_tt_satBcid_DataNoSim; ///< PPM SATURATED BCID Data/Simulation Data but no Simulation
TH2F_LW* m_h_ppm_2d_etaPhi_tt_peakf_NonZeroMatches{}; ///< PPM PEAKFINDER BCID Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_2d_etaPhi_tt_peakf_ZeroMatches{}; ///< PPM PEAKFINDER BCID Data/Simulation Zero Matches
TH2F_LW* m_h_ppm_2d_etaPhi_tt_peakf_SimNoData{}; ///< PPM PEAKFINDER BCID Data/Simulation Simulation but no Data
TH2F_LW* m_h_ppm_2d_etaPhi_tt_peakf_DataNoSim{}; ///< PPM PEAKFINDER BCID Data/Simulation Data but no Simulation
TH2F_LW* m_h_ppm_2d_etaPhi_tt_satBcid_NonZeroMatches{}; ///< PPM SATURATED BCID Data/Simulation Non-zero Matches
TH2F_LW* m_h_ppm_2d_etaPhi_tt_satBcid_ZeroMatches{}; ///< PPM SATURATED BCID Data/Simulation Zero Matches
TH2F_LW* m_h_ppm_2d_etaPhi_tt_satBcid_SimNoData{}; ///< PPM SATURATED BCID Data/Simulation Simulation but no Data
TH2F_LW* m_h_ppm_2d_etaPhi_tt_satBcid_DataNoSim{}; ///< PPM SATURATED BCID Data/Simulation Data but no Simulation
// Mismatch Event Number Histograms
TH2I_LW* m_h_ppm_2d_LUT_MismatchEvents_cr0cr1; ///< PPM LUT Mismatch Event Numbers Crates 0 and 1
TH2I_LW* m_h_ppm_2d_LUT_MismatchEvents_cr2cr3; ///< PPM LUT Mismatch Event Numbers Crates 2 and 3
TH2I_LW* m_h_ppm_2d_LUT_MismatchEvents_cr4cr5; ///< PPM LUT Mismatch Event Numbers Crates 4 and 5
TH2I_LW* m_h_ppm_2d_LUT_MismatchEvents_cr6cr7; ///< PPM LUT Mismatch Event Numbers Crates 6 and 7
TH2I_LW* m_h_ppm_2d_LUT_MismatchEvents_cr0cr1{}; ///< PPM LUT Mismatch Event Numbers Crates 0 and 1
TH2I_LW* m_h_ppm_2d_LUT_MismatchEvents_cr2cr3{}; ///< PPM LUT Mismatch Event Numbers Crates 2 and 3
TH2I_LW* m_h_ppm_2d_LUT_MismatchEvents_cr4cr5{}; ///< PPM LUT Mismatch Event Numbers Crates 4 and 5
TH2I_LW* m_h_ppm_2d_LUT_MismatchEvents_cr6cr7{}; ///< PPM LUT Mismatch Event Numbers Crates 6 and 7
// Mismatch Event Number Histograms for LUT-JEP
//TH2I_LW* m_h_ppm_2d_LUTJEP_MismatchEvents_cr0cr1; ///< PPM LUT-JEP Mismatch Event Numbers Crates 0 and 1
......
......@@ -87,29 +87,29 @@ namespace LVL1 {
/// Root directory
std::string m_rootDir;
/// Maximum energy plotted
int m_maxEnergyRange;
int m_maxEnergyRange{};
/// Histograms booked flag
bool m_histBooked;
float m_lowcutTag;
float m_lowcutProbe;
float m_inv_m_range;
float m_m_z;
int m_probe_et_bins;
int m_probe_eta_bins;
int m_probe_phi_bins;
double m_probe_et_min;
double m_probe_et_max;
double m_probe_eta_min;
double m_probe_eta_max;
double m_probe_phi_min;
double m_probe_phi_max;
int m_tag_charge;
std::vector<int> m_probelist;
int m_probe_check;
//TLorentzVector tagLV;
bool m_histBooked{};
float m_lowcutTag{};
float m_lowcutProbe{};
float m_inv_m_range{};
float m_m_z{};
int m_probe_et_bins{};
int m_probe_eta_bins{};
int m_probe_phi_bins{};
double m_probe_et_min{};
double m_probe_et_max{};
double m_probe_eta_min{};
double m_probe_eta_max{};
double m_probe_phi_min{};
double m_probe_phi_max{};
int m_tag_charge{};
std::vector<int> m_probelist{};
int m_probe_check{};
//TLorentzVector tagLV{};
TLorentzVector m_probeLV;
TLorentzVector m_combLV;
//TLorentzVector probeLV1;
//TLorentzVector probeLV1{};
TLorentzVector m_combLV1;
TLorentzVector m_tmpProbe;
......@@ -119,22 +119,22 @@ namespace LVL1 {
// Histograms used to make efficiency plots
static const int s_thresh_num=16; //16 EM Thresholds
TH1F_LW* m_h_probe_eta_pass[s_thresh_num];
TH1F_LW* m_h_probe_phi_pass[s_thresh_num];
TH1F_LW* m_h_probe_Et_pass[s_thresh_num];
TH1F_LW* m_h_lumib_int_Et_pass[s_thresh_num];
TH1F_LW* m_h_lumib_int_phi_pass[s_thresh_num];
TH1F_LW* m_h_lumib_int_eta_pass[s_thresh_num];
TH1F_LW* m_h_lumib_int_Et_tot;
TH1F_LW* m_h_lumib_int_phi_tot;
TH1F_LW* m_h_lumib_int_eta_tot;
TH1F_LW* m_h_eta_eff[s_thresh_num];
TH1F_LW* m_h_phi_eff[s_thresh_num];
TH1F_LW* m_h_Et_eff[s_thresh_num];
TH1F_LW* m_h_probe_eta_tot;
TH1F_LW* m_h_probe_phi_tot;
TH1F_LW* m_h_probe_Et_tot;
TH1F_LW* m_h_z_inv_mass;
TH1F_LW* m_h_probe_eta_pass[s_thresh_num]{};
TH1F_LW* m_h_probe_phi_pass[s_thresh_num]{};
TH1F_LW* m_h_probe_Et_pass[s_thresh_num]{};
TH1F_LW* m_h_lumib_int_Et_pass[s_thresh_num]{};
TH1F_LW* m_h_lumib_int_phi_pass[s_thresh_num]{};
TH1F_LW* m_h_lumib_int_eta_pass[s_thresh_num]{};
TH1F_LW* m_h_lumib_int_Et_tot{};
TH1F_LW* m_h_lumib_int_phi_tot{};
TH1F_LW* m_h_lumib_int_eta_tot{};
TH1F_LW* m_h_eta_eff[s_thresh_num]{};
TH1F_LW* m_h_phi_eff[s_thresh_num]{};
TH1F_LW* m_h_Et_eff[s_thresh_num]{};
TH1F_LW* m_h_probe_eta_tot{};
TH1F_LW* m_h_probe_phi_tot{};
TH1F_LW* m_h_probe_Et_tot{};
TH1F_LW* m_h_z_inv_mass{};
//==========================================
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment