From 8b050f6b93294cf495f7013a919b074759559e6b Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Tue, 15 Jun 2021 12:05:02 +0200 Subject: [PATCH 1/2] [ALCA] Apply code-checks with misc-definitions-in-headers --- .../CastorCalib/interface/CastorDbXml.h | 10 +++++----- CalibCalorimetry/HcalAlgos/interface/HcalDbXml.h | 14 +++++++------- Calibration/HcalCalibAlgos/interface/hcalCalib.h | 4 ++-- .../IsolatedParticles/interface/CaloSimInfo.icc | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h b/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h index 5b4193928bb94..e46c8abb96a3c 100644 --- a/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h +++ b/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h @@ -26,7 +26,7 @@ namespace CastorDbXml { const std::string& fTag, unsigned fVersion, const CastorPedestals& fObject); - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -50,7 +50,7 @@ namespace CastorDbXml { const std::string& fTag, unsigned fVersion, const CastorGains& fObject); - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -59,7 +59,7 @@ namespace CastorDbXml { const CastorGainWidths& fObject) { return false; } - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -68,7 +68,7 @@ namespace CastorDbXml { const CastorElectronicsMap& fObject) { return false; } - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -77,7 +77,7 @@ namespace CastorDbXml { const CastorQIEData& fObject) { return false; } - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalDbXml.h b/CalibCalorimetry/HcalAlgos/interface/HcalDbXml.h index bdfba690b9141..704d84367bb1f 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalDbXml.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalDbXml.h @@ -30,7 +30,7 @@ namespace HcalDbXml { const std::string& fTag, unsigned fVersion, const HcalPedestals& fObject); - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -54,7 +54,7 @@ namespace HcalDbXml { const std::string& fTag, unsigned fVersion, const HcalGains& fObject); - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -63,7 +63,7 @@ namespace HcalDbXml { const HcalGainWidths& fObject) { return false; } - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -72,7 +72,7 @@ namespace HcalDbXml { const HcalElectronicsMap& fObject) { return false; } - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -81,7 +81,7 @@ namespace HcalDbXml { const HcalQIEData& fObject) { return false; } - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -90,7 +90,7 @@ namespace HcalDbXml { const HcalCalibrationQIEData& fObject) { return false; } - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, @@ -99,7 +99,7 @@ namespace HcalDbXml { const HcalQIETypes& fObject) { return false; } - bool dumpObject(std::ostream& fOutput, + inline bool dumpObject(std::ostream& fOutput, unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, diff --git a/Calibration/HcalCalibAlgos/interface/hcalCalib.h b/Calibration/HcalCalibAlgos/interface/hcalCalib.h index 27da8ebd35585..c2311f816ac9f 100644 --- a/Calibration/HcalCalibAlgos/interface/hcalCalib.h +++ b/Calibration/HcalCalibAlgos/interface/hcalCalib.h @@ -206,7 +206,7 @@ class hcalCalib : public TSelector { #endif #ifdef hcalCalib_cxx -void hcalCalib::Init(TTree *tree) { +inline void hcalCalib::Init(TTree *tree) { // The Init() function is called when the selector needs to initialize // a new tree or chain. Typically here the branch addresses and branch // pointers of the tree will be set. @@ -250,7 +250,7 @@ void hcalCalib::Init(TTree *tree) { fChain->SetBranchAddress("probeJetP4", &probeJetP4, &b_probeJetP4); } -Bool_t hcalCalib::Notify() { +inline Bool_t hcalCalib::Notify() { // The Notify() function is called when a new file is opened. This // can be either for a new TTree in a TChain or when when a new TTree // is started when using PROOF. It is normaly not necessary to make changes diff --git a/Calibration/IsolatedParticles/interface/CaloSimInfo.icc b/Calibration/IsolatedParticles/interface/CaloSimInfo.icc index 0737fd17a4cea..0df11988356e5 100644 --- a/Calibration/IsolatedParticles/interface/CaloSimInfo.icc +++ b/Calibration/IsolatedParticles/interface/CaloSimInfo.icc @@ -435,7 +435,7 @@ namespace spr { } } - std::map eCaloSimInfo(spr::caloSimInfo& info) { + inline std::map eCaloSimInfo(spr::caloSimInfo& info) { std::map simInfo; simInfo.insert(std::pair("eMatched", info.eMatched)); simInfo.insert(std::pair("pdgMatched", info.pdgMatched)); From f66784714c92154532e61e358750cfaf0128a199 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Tue, 15 Jun 2021 12:24:05 +0200 Subject: [PATCH 2/2] [ALCA] code format --- .../CastorCalib/interface/CastorDbXml.h | 60 ++++++------- .../HcalAlgos/interface/HcalDbXml.h | 84 +++++++++---------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h b/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h index e46c8abb96a3c..eeec993f7937a 100644 --- a/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h +++ b/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h @@ -27,12 +27,12 @@ namespace CastorDbXml { unsigned fVersion, const CastorPedestals& fObject); inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const CastorPedestalWidths& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const CastorPedestalWidths& fObject) { return false; } bool dumpObject(std::ostream& fOutput, @@ -51,39 +51,39 @@ namespace CastorDbXml { unsigned fVersion, const CastorGains& fObject); inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const CastorGainWidths& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const CastorGainWidths& fObject) { return false; } inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const CastorElectronicsMap& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const CastorElectronicsMap& fObject) { return false; } inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const CastorQIEData& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const CastorQIEData& fObject) { return false; } inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const CastorCalibrationQIEData& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const CastorCalibrationQIEData& fObject) { return false; } } // namespace CastorDbXml diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalDbXml.h b/CalibCalorimetry/HcalAlgos/interface/HcalDbXml.h index 704d84367bb1f..fde882915a01f 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalDbXml.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalDbXml.h @@ -31,12 +31,12 @@ namespace HcalDbXml { unsigned fVersion, const HcalPedestals& fObject); inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const HcalPedestalWidths& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const HcalPedestalWidths& fObject) { return false; } bool dumpObject(std::ostream& fOutput, @@ -55,57 +55,57 @@ namespace HcalDbXml { unsigned fVersion, const HcalGains& fObject); inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const HcalGainWidths& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const HcalGainWidths& fObject) { return false; } inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const HcalElectronicsMap& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const HcalElectronicsMap& fObject) { return false; } inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const HcalQIEData& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const HcalQIEData& fObject) { return false; } inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const HcalCalibrationQIEData& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const HcalCalibrationQIEData& fObject) { return false; } inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const HcalQIETypes& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const HcalQIETypes& fObject) { return false; } inline bool dumpObject(std::ostream& fOutput, - unsigned fRun, - unsigned long fGMTIOVBegin, - unsigned long fGMTIOVEnd, - const std::string& fTag, - unsigned fVersion, - const HcalFrontEndMap& fObject) { + unsigned fRun, + unsigned long fGMTIOVBegin, + unsigned long fGMTIOVEnd, + const std::string& fTag, + unsigned fVersion, + const HcalFrontEndMap& fObject) { return false; } bool dumpObject(std::ostream& fOutput,