From 7ef3d00da75c6d3b4362f61101b0a5249fa089e7 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 5 Sep 2024 16:05:24 +0200 Subject: [PATCH] [DB] Changes suggested by new llvm18 clang-format --- .../HcalOnlineDb/interface/HcalQIEManager.h | 8 +-- CaloOnlineTools/HcalOnlineDb/interface/LMap.h | 10 +-- .../HcalOnlineDb/plugins/HcalLutAnalyzer.cc | 2 +- .../interface/ConditionDBWriter.h | 26 +++---- .../plugins/PCLMetadataWriter.cc | 4 +- .../AlignmentPayloadInspectorHelper.h | 6 +- ...AlignmentErrorExtended_PayloadInspector.cc | 6 +- .../TrackerAlignment_PayloadInspector.cc | 6 +- ...kerSurfaceDeformations_PayloadInspector.cc | 12 ++-- CondCore/CondDB/src/CoralMsgReporter.h | 2 +- CondCore/CondDB/src/blowfish.h | 2 +- .../ESChannelStatus_PayloadInspector.cc | 8 +-- .../ESIntercalibConstants_PayloadInspector.cc | 10 +-- .../plugins/EcalAlignment_PayloadInspector.cc | 4 +- .../EcalChannelStatus_PayloadInspector.cc | 16 ++--- .../EcalDQMChannelStatus_PayloadInspector.cc | 18 ++--- .../EcalDQMTowerStatus_PayloadInspector.cc | 2 +- ...oatCondObjectContainer_PayloadInspector.cc | 14 ++-- .../EcalGainRatios_PayloadInspector.cc | 6 +- ...lIntercalibConstantsMC_PayloadInspector.cc | 10 +-- ...calIntercalibConstants_PayloadInspector.cc | 14 ++-- .../EcalIntercalibErrors_PayloadInspector.cc | 12 ++-- ...calLaserAPDPNRatiosRef_PayloadInspector.cc | 10 +-- .../EcalLaserAPDPNRatios_PayloadInspector.cc | 14 ++-- .../EcalLaserAlphas_PayloadInspector.cc | 12 ++-- .../EcalLinearCorrections_PayloadInspector.cc | 20 +++--- ...EcalPFRecHitThresholds_PayloadInspector.cc | 12 ++-- .../plugins/EcalPedestals_PayloadInspector.cc | 70 +++++++++---------- .../EcalPulseCovariances_PayloadInspector.cc | 12 ++-- .../EcalPulseShapes_PayloadInspector.cc | 12 ++-- .../EcalTPGCrystalStatus_PayloadInspector.cc | 14 ++-- ...calTPGFineGrainTowerEE_PayloadInspector.cc | 2 +- ...lTPGLinearizationConst_PayloadInspector.cc | 18 ++--- .../EcalTPGLutGroup_PayloadInspector.cc | 2 +- .../EcalTPGPedestals_PayloadInspector.cc | 18 ++--- .../EcalTPGStripStatus_PayloadInspector.cc | 12 ++-- .../EcalTPGTowerStatus_PayloadInspector.cc | 12 ++-- .../EcalTPGWeightGroup_PayloadInspector.cc | 2 +- ...EcalTimeCalibConstants_PayloadInspector.cc | 12 ++-- .../EcalTimeCalibErrors_PayloadInspector.cc | 12 ++-- .../EcalWeightXtalGroups_PayloadInspector.cc | 2 +- .../HcalPlugins/interface/HcalObjRepresent.h | 14 ++-- .../plugins/JetCorrector_PayloadInspector.cc | 2 +- .../plugins/JetResolution_PayloadInspector.cc | 4 +- ...elAliPCLThresholdsPayloadInspectorHelper.h | 8 +-- .../interface/SiPixelGainCalibHelper.h | 26 +++---- ...xelDynamicInefficiency_PayloadInspector.cc | 2 +- ...xelFEDChannelContainer_PayloadInspector.cc | 14 ++-- .../SiPixelLorentzAngle_PayloadInspector.cc | 2 +- ...elQualityProbabilities_PayloadInspector.cc | 2 +- .../SiPixelQuality_PayloadInspector.cc | 4 +- ...iPixelTemplateDBObject_PayloadInspector.cc | 2 +- .../plugins/SiPixelVCal_PayloadInspector.cc | 2 +- .../SiStripApvGain_PayloadInspector.cc | 60 ++++++++-------- ...ripBackPlaneCorrection_PayloadInspector.cc | 2 +- .../SiStripBadStrip_PayloadInspector.cc | 2 +- .../SiStripConfObject_PayloadInspector.cc | 2 +- .../SiStripDetVOff_PayloadInspector.cc | 10 +-- .../SiStripLorentzAngle_PayloadInspector.cc | 2 +- .../plugins/SiStripNoises_PayloadInspector.cc | 24 +++---- .../SiStripPedestals_PayloadInspector.cc | 12 ++-- .../Utilities/bin/conddb_test_gt_perf.cpp | 4 +- .../GEMObjects/interface/GEMROMapping.h | 2 +- CondFormats/GEMObjects/interface/GEMROmap.h | 2 +- .../JetMETObjects/interface/Utilities.h | 4 +- .../test/test_catch2_SerializationHelper.cc | 6 +- .../Ecal/interface/EcalErrorDictionary.h | 4 +- .../interface/EcalWeightSetXMLTranslator.h | 2 +- CondTools/Ecal/plugins/EcalPedestalHistory.cc | 10 +-- CondTools/Ecal/plugins/StoreESCondition.cc | 8 +-- CondTools/Ecal/src/DOMHelperFunctions.cc | 2 +- .../Ecal/src/EcalChannelStatusHandler.cc | 4 +- CondTools/Ecal/src/EcalDAQHandler.cc | 32 ++++----- CondTools/Ecal/src/EcalDCSHandler.cc | 10 +-- .../src/EcalLaser_weekly_Linearization.cc | 2 +- .../EcalLaser_weekly_Linearization_Check.cc | 2 +- CondTools/Ecal/src/EcalPedestalsHandler.cc | 42 +++++------ CondTools/Ecal/src/EcalSRPHandler.cc | 8 +-- CondTools/Ecal/src/EcalTPGBadXTHandler.cc | 2 +- .../src/EcalTPGCrystalStatusXMLTranslator.cc | 6 +- .../Ecal/src/EcalTPGFineGrainStripfromFile.cc | 2 +- CondTools/Ecal/src/EcalTPGLinPed.cc | 2 +- CondTools/Ecal/src/EcalTPGPedfromFile.cc | 2 +- CondTools/Ecal/src/EcalTestDevDB.cc | 4 +- .../Hcal/test/makeHFPhase1PMTParamsPlots.cc | 4 +- .../Hcal/test/write_HBHENegativeEFilter.cc | 4 +- .../Hcal/test/write_HFPhase1PMTParams.cc | 4 +- .../JetMET/plugins/QGLikelihoodDBReader.cc | 6 +- .../QGLikelihoodSystematicsDBReader.cc | 6 +- .../RunInfo/interface/BTransitionAnalyzer.h | 8 +-- ...xelBadFEDChannelSimulationSanityChecker.cc | 10 +-- .../plugins/SiPixelBadModuleByHandBuilder.cc | 6 +- .../SiPixel/plugins/SiPixelGainCalibScaler.cc | 2 +- .../plugins/SiPixelLorentzAngleDBLoader.cc | 4 +- .../plugins/SiStripApvGainInspector.cc | 12 ++-- .../SiStrip/plugins/SiStripApvGainRescaler.cc | 2 +- .../plugins/SiStripCablingTrackerMap.cc | 2 +- .../SiStripChannelGainFromDBMiscalibrator.cc | 2 +- .../SiStrip/plugins/SiStripCondVisualizer.cc | 8 +-- CondTools/SiStrip/plugins/SiStripDB2Tree.cc | 2 +- .../plugins/SiStripFedCablingBuilder.cc | 2 +- .../plugins/SiStripFedCablingReader.cc | 4 +- .../SiStripGainPayloadCopyAndExclude.cc | 2 +- .../plugins/SiStripMiscalibrateHelper.cc | 4 +- .../SiStripNoisesFromDBMiscalibrator.cc | 2 +- .../CSCCondDB/src/CSCAFEBConnectAnalysis.cc | 6 +- OnlineDB/CSCCondDB/src/CSCAFEBThrAnalysis.cc | 8 +-- OnlineDB/EcalCondDB/interface/DataReducer.h | 2 +- OnlineDB/EcalCondDB/interface/ITimingDat.h | 2 +- .../interface/LMFCorrCoefDatComponent.h | 2 +- OnlineDB/EcalCondDB/src/ODWeightsDat.cc | 2 +- .../src/SiStripCondObjBuilderFromDb.cc | 2 +- .../src/SiStripFedCablingBuilderFromDb.cc | 18 ++--- .../plugins/SiStripPopConConfigDbObjHandler.h | 4 +- .../SiStripPopConHandlerUnitTestGain.h | 4 +- .../SiStripPopConHandlerUnitTestNoise.h | 4 +- 116 files changed, 487 insertions(+), 487 deletions(-) diff --git a/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h b/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h index 0bd1b3db4ab4b..e2287d14de316 100644 --- a/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h +++ b/CaloOnlineTools/HcalOnlineDb/interface/HcalQIEManager.h @@ -19,8 +19,8 @@ class HcalChannelId { public: - HcalChannelId(){}; - ~HcalChannelId(){}; + HcalChannelId() {} + ~HcalChannelId() {} int eta, phi, depth; std::string subdetector; @@ -30,8 +30,8 @@ class HcalChannelId { class HcalQIECaps { public: - HcalQIECaps(){}; - ~HcalQIECaps(){}; + HcalQIECaps() {} + ~HcalQIECaps() {} // cap0 offset x 4, cap1 offset x 4... // cap0 slope x 4, cap1 slope x 4... diff --git a/CaloOnlineTools/HcalOnlineDb/interface/LMap.h b/CaloOnlineTools/HcalOnlineDb/interface/LMap.h index 6c92a29ae357a..14a595e9f884f 100644 --- a/CaloOnlineTools/HcalOnlineDb/interface/LMap.h +++ b/CaloOnlineTools/HcalOnlineDb/interface/LMap.h @@ -30,8 +30,8 @@ class LMapRow { public: - LMapRow(){}; - ~LMapRow(){}; + LMapRow() {} + ~LMapRow() {} int side; int eta, phi, dphi, depth; @@ -55,8 +55,8 @@ class LMapRow { class LMapDetId { public: - LMapDetId(){}; - ~LMapDetId(){}; + LMapDetId() {} + ~LMapDetId() {} int side; int eta, phi, depth; @@ -110,7 +110,7 @@ class EMap { zdc_channel = 0; zdc_section = "UNKNOWN"; } - ~EMapRow(){}; + ~EMapRow() {} bool operator<(const EMapRow& other) const; diff --git a/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc b/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc index 7319de22cac22..cd3e4d42ececa 100644 --- a/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc +++ b/CaloOnlineTools/HcalOnlineDb/plugins/HcalLutAnalyzer.cc @@ -49,7 +49,7 @@ class HcalLutAnalyzer : public edm::one::EDAnalyzer { public: explicit HcalLutAnalyzer(const edm::ParameterSet&); - ~HcalLutAnalyzer() override{}; + ~HcalLutAnalyzer() override {} static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: diff --git a/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h b/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h index 7cd0e05bd23a2..560b68561c70d 100644 --- a/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h +++ b/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h @@ -33,17 +33,17 @@ * The user can optionally implement the following methods * * //Will be called at the beginning of the job - * virtual void algoBeginJob(const edm::EventSetup&){}; + * virtual void algoBeginJob(const edm::EventSetup&){} * //Will be called at the beginning of each run in the job - * virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &){}; + * virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &){} * //Will be called at the beginning of each luminosity block in the run - * virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){}; + * virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){} * //Will be called at every event - * virtual void algoAnalyze(const edm::Event&, const edm::EventSetup&){}; + * virtual void algoAnalyze(const edm::Event&, const edm::EventSetup&){} * //Will be called at the end of each run in the job - * virtual void algoEndRun(const edm::Run &, const edm::EventSetup &){}; + * virtual void algoEndRun(const edm::Run &, const edm::EventSetup &){} * //Will be called at the end of the job - * virtual void algoEndJob(){}; + * virtual void algoEndJob(){} * * where he can access information needed to build his object. For instance, if * he is computing a calibration that is computed as the mean of a certain @@ -202,17 +202,17 @@ class ConditionDBWriter // Optional methods that may be implemented (technically "overridden") in the derived classes if needed //Will be called at the beginning of the job - virtual void algoBeginJob(const edm::EventSetup &){}; + virtual void algoBeginJob(const edm::EventSetup &) {} //Will be called at the beginning of each run in the job - virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &){}; + virtual void algoBeginRun(const edm::Run &, const edm::EventSetup &) {} //Will be called at the beginning of each luminosity block in the run - virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){}; + virtual void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) {} //Will be called at every event - virtual void algoAnalyze(const edm::Event &, const edm::EventSetup &){}; + virtual void algoAnalyze(const edm::Event &, const edm::EventSetup &) {} //Will be called at the end of each run in the job - virtual void algoEndRun(const edm::Run &, const edm::EventSetup &){}; + virtual void algoEndRun(const edm::Run &, const edm::EventSetup &) {} //Will be called at the end of the job - virtual void algoEndJob(){}; + virtual void algoEndJob() {} void beginJob() override {} @@ -268,7 +268,7 @@ class ConditionDBWriter } } - virtual void algoEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &){}; + virtual void algoEndLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) {} void endRun(const edm::Run &run, const edm::EventSetup &es) override { edm::LogInfo("ConditionDBWriter") << "endRun"; diff --git a/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc b/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc index 2dd54670c5a82..9f68e2d2aba36 100644 --- a/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc +++ b/CommonTools/ConditionDBWriter/plugins/PCLMetadataWriter.cc @@ -29,8 +29,8 @@ class PCLMetadataWriter : public edm::one::EDAnalyzer { ~PCLMetadataWriter() override = default; // Operations - void analyze(const edm::Event &, const edm::EventSetup &) override{}; - void beginRun(const edm::Run &, const edm::EventSetup &) override{}; + void analyze(const edm::Event &, const edm::EventSetup &) override {} + void beginRun(const edm::Run &, const edm::EventSetup &) override {} void endRun(const edm::Run &, const edm::EventSetup &) override; protected: diff --git a/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h b/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h index 69f126e719999..e10b2d44ff966 100644 --- a/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h +++ b/CondCore/AlignmentPlugins/interface/AlignmentPayloadInspectorHelper.h @@ -1100,8 +1100,8 @@ namespace AlignmentPI { edm::LogError("TrackerAlignment_PayloadInspector") << "Unrecognized coordinate " << coord << std::endl; break; } // switch on the coordinate - } // check on the same detID - } // loop on the components + } // check on the same detID + } // loop on the components } /*--------------------------------------------------------------------*/ @@ -1181,7 +1181,7 @@ namespace AlignmentPI { } } // if it's the same detid - } // loop on detids + } // loop on detids } /*--------------------------------------------------------------------*/ diff --git a/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc index 1fa0aafc23f6b..9cd9c8b9d7981 100644 --- a/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc +++ b/CondCore/AlignmentPlugins/plugins/TrackerAlignmentErrorExtended_PayloadInspector.cc @@ -87,8 +87,8 @@ namespace { // to be used to fill the histogram fillWithValue(sqrt(errMatrix[indices.first][indices.second]) * AlignmentPI::cmToUm); } // loop on the vector of modules - } // payload - } // iovs + } // payload + } // iovs return true; } // fill }; @@ -430,7 +430,7 @@ namespace { APE_spectraByRegion[hash]->Fill(sqrt(errMatrix[indices.first][indices.second]) * AlignmentPI::cmToUm); } // loop on the coordinate indices - } // loop over detIds + } // loop over detIds // plotting section diff --git a/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc index 38c5e5a9ce363..6841e0e4baf38 100644 --- a/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc +++ b/CondCore/AlignmentPlugins/plugins/TrackerAlignment_PayloadInspector.cc @@ -1143,8 +1143,8 @@ namespace { edm::LogError("TrackerAlignment_PayloadInspector") << "Unrecognized coordinate " << myCoord << std::endl; break; } // switch on the coordinate - } // check on the same detID - } // loop on the components + } // check on the same detID + } // loop on the components } }; @@ -1215,7 +1215,7 @@ namespace { edm::LogError("TrackerAlignment_PayloadInspector") << "Unrecognized coordinate " << coord << std::endl; break; } // switch on the coordinate (only X,Y,Z are interesting) - } // ends loop on the alignments + } // ends loop on the alignments edm::LogInfo("TrackerAlignment_PayloadInspector") << "barycenter (" << barycenter << ")/n. modules (" << nmodules << ") = " << barycenter / nmodules << std::endl; diff --git a/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc b/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc index 0f9f366fdaf8b..db903115d5534 100644 --- a/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc +++ b/CondCore/AlignmentPlugins/plugins/TrackerSurfaceDeformations_PayloadInspector.cc @@ -77,7 +77,7 @@ namespace { } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -135,7 +135,7 @@ namespace { summaries[nPar]->Fill(par); nPar++; } // ends loop on the parameters - } // ends loop on the item vector + } // ends loop on the item vector TLatex t1; @@ -603,8 +603,8 @@ namespace { surfDefMap[f_entry.first] = delta; } } // if not phase-0 - } // loop on the last payload map - } // loop on the first payload map + } // loop on the last payload map + } // loop on the first payload map //========================= @@ -772,8 +772,8 @@ namespace { surfDefMap[f_entry.first] = delta; } } // if not phase-0 - } // loop on the last payload map - } // loop on the first payload map + } // loop on the last payload map + } // loop on the first payload map //========================= diff --git a/CondCore/CondDB/src/CoralMsgReporter.h b/CondCore/CondDB/src/CoralMsgReporter.h index 7d51372c58b43..ef88fc6dd9c0d 100644 --- a/CondCore/CondDB/src/CoralMsgReporter.h +++ b/CondCore/CondDB/src/CoralMsgReporter.h @@ -34,7 +34,7 @@ namespace cond { CoralMsgReporter(); /// Destructor - ~CoralMsgReporter() override{}; + ~CoralMsgReporter() override {} /// Release reference to reporter void release() override { delete this; } diff --git a/CondCore/CondDB/src/blowfish.h b/CondCore/CondDB/src/blowfish.h index dba9e6150f68a..190a9ff0419d6 100644 --- a/CondCore/CondDB/src/blowfish.h +++ b/CondCore/CondDB/src/blowfish.h @@ -31,7 +31,7 @@ typedef unsigned int uInt32; #endif #ifndef S_ISREG -#define S_ISREG(x) (((x)&S_IFMT) == S_IFREG) +#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) #endif #define MAXKEYBYTES 56 /* 448 bits */ diff --git a/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc index 1f02e9b428bd2..66e4bb1200fda 100644 --- a/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/ESChannelStatus_PayloadInspector.cc @@ -70,7 +70,7 @@ namespace { } } } // validHashIndex - } // payload + } // payload gStyle->SetOptStat(0); gStyle->SetPalette(1); @@ -189,9 +189,9 @@ namespace { } } } // 2nd IOV - } // validHashIndex - } // payload - } // loop over IOVs + } // validHashIndex + } // payload + } // loop over IOVs gStyle->SetOptStat(0); gStyle->SetPalette(1); diff --git a/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc index d04270dcc2c26..e403c4ab60707 100644 --- a/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/ESIntercalibConstants_PayloadInspector.cc @@ -66,7 +66,7 @@ namespace { valmin = value; } } // validHashIndex - } // payload + } // payload gStyle->SetOptStat(0); gStyle->SetPalette(1); @@ -180,9 +180,9 @@ namespace { valmin = diff; } } // 2nd IOV - } // validHashIndex - } // payload - } // loop over IOVs + } // validHashIndex + } // payload + } // loop over IOVs gStyle->SetOptStat(0); gStyle->SetPalette(1); @@ -228,7 +228,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class ESIntercalibConstantsDiffBase + }; // class ESIntercalibConstantsDiffBase using ESIntercalibConstantsDiffOneTag = ESIntercalibConstantsDiffBase; using ESIntercalibConstantsDiffTwoTags = ESIntercalibConstantsDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc index 58251537869de..f450fc486da89 100644 --- a/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalAlignment_PayloadInspector.cc @@ -25,7 +25,7 @@ namespace { MIN_IPHI = 1, MAX_IETA = 85, MAX_IPHI = 360 - }; // barrel (EB) lower and upper bounds on eta and phi + }; // barrel (EB) lower and upper bounds on eta and phi enum { IX_MIN = 1, IY_MIN = 1, IX_MAX = 100, IY_MAX = 100 }; // endcaps (EE) lower and upper bounds on x and y /***************************************** @@ -257,7 +257,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalAlignmentDiffBase + }; // class EcalAlignmentDiffBase using EcalAlignmentDiffOneTag = EcalAlignmentDiffBase; using EcalAlignmentDiffTwoTags = EcalAlignmentDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc index 1238ad2d4ec29..0963d3a693e97 100644 --- a/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalChannelStatus_PayloadInspector.cc @@ -64,7 +64,7 @@ namespace { ebmap_coarse->Fill(phi, eta); } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; @@ -181,7 +181,7 @@ namespace { } } } // validDetId - } // payload + } // payload gStyle->SetOptStat(0); //set the background color to white @@ -337,7 +337,7 @@ namespace { } } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; } // loop over IOV's @@ -489,11 +489,11 @@ namespace { eecount++; eemap_coarse->Fill(ix + IX_MAX - 1, iy - 1, tmp3); } // z side - } // any difference ? - } // 2nd IOV, fill the plots - } // validDetId - } // get the payload - } // loop over payloads + } // any difference ? + } // 2nd IOV, fill the plots + } // validDetId + } // get the payload + } // loop over payloads gStyle->SetOptStat(0); //set the background color to white diff --git a/CondCore/EcalPlugins/plugins/EcalDQMChannelStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalDQMChannelStatus_PayloadInspector.cc index 2756f2101c5a8..6d529aa61e65e 100644 --- a/CondCore/EcalPlugins/plugins/EcalDQMChannelStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalDQMChannelStatus_PayloadInspector.cc @@ -67,7 +67,7 @@ namespace { ebmap_coarse->Fill(phi, eta); } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; @@ -350,7 +350,7 @@ namespace { } } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; } // loop over IOV's @@ -421,7 +421,7 @@ namespace { c1.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalDQMChannelStatusEBDiffBase + }; // class EcalDQMChannelStatusEBDiffBase using EcalDQMChannelStatusEBDiffOneTag = EcalDQMChannelStatusEBDiffBase; using EcalDQMChannelStatusEBDiffTwoTags = EcalDQMChannelStatusEBDiffBase; @@ -499,11 +499,11 @@ namespace { eecount++; eemap_coarse->Fill(ix + IX_MAX - 1, iy - 1, tmp3); } // z side - } // any difference ? - } // 2nd IOV, fill the plots - } // validDetId - } // get the payload - } // loop over payloads + } // any difference ? + } // 2nd IOV, fill the plots + } // validDetId + } // get the payload + } // loop over payloads gStyle->SetOptStat(0); //set the background color to white @@ -593,7 +593,7 @@ namespace { c1.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalDQMChannelStatusEEDiffBase + }; // class EcalDQMChannelStatusEEDiffBase using EcalDQMChannelStatusEEDiffOneTag = EcalDQMChannelStatusEEDiffBase; using EcalDQMChannelStatusEEDiffTwoTags = EcalDQMChannelStatusEEDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalDQMTowerStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalDQMTowerStatus_PayloadInspector.cc index 5eaee06035cc2..66aa1b914919a 100644 --- a/CondCore/EcalPlugins/plugins/EcalDQMTowerStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalDQMTowerStatus_PayloadInspector.cc @@ -281,7 +281,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalDQMTowerStatusDiffBase + }; // class EcalDQMTowerStatusDiffBase using EcalDQMTowerStatusDiffOneTag = EcalDQMTowerStatusDiffBase; using EcalDQMTowerStatusDiffTwoTags = EcalDQMTowerStatusDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalFloatCondObjectContainer_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalFloatCondObjectContainer_PayloadInspector.cc index bf3aa9c15c0bc..8a719073244e9 100644 --- a/CondCore/EcalPlugins/plugins/EcalFloatCondObjectContainer_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalFloatCondObjectContainer_PayloadInspector.cc @@ -76,9 +76,9 @@ namespace { else endc_m->Fill(ix, iy, val); } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload double vt = (double)EBtot; EBmean = EBmean / vt; EBrms = EBrms / vt - (EBmean * EBmean); @@ -219,9 +219,9 @@ namespace { endc_m->Fill(ix, iy, diff); } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload else return false; } // loop over IOVs @@ -279,7 +279,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalFloatCondObjectContainerDiffBase + }; // class EcalFloatCondObjectContainerDiffBase using EcalFloatCondObjectContainerDiffOneTag = EcalFloatCondObjectContainerDiffBase; using EcalFloatCondObjectContainerDiffTwoTags = diff --git a/CondCore/EcalPlugins/plugins/EcalGainRatios_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalGainRatios_PayloadInspector.cc index b4ba47864b8d6..866eb91b87dd0 100644 --- a/CondCore/EcalPlugins/plugins/EcalGainRatios_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalGainRatios_PayloadInspector.cc @@ -79,7 +79,7 @@ namespace { e_12O6->Fill((*payload)[rawid].gain12Over6()); e_6O1->Fill((*payload)[rawid].gain6Over1()); } // validDetId - } // if payload.get() + } // if payload.get() else return false; @@ -261,7 +261,7 @@ namespace { e_6O1->Fill(diff2); } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; } // loop over IOVs @@ -352,7 +352,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalGainRatiosDiffBase + }; // class EcalGainRatiosDiffBase using EcalGainRatiosDiffOneTag = EcalGainRatiosDiffBase; using EcalGainRatiosDiffTwoTags = EcalGainRatiosDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalIntercalibConstantsMC_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalIntercalibConstantsMC_PayloadInspector.cc index b49f84e172529..acca25d126256 100644 --- a/CondCore/EcalPlugins/plugins/EcalIntercalibConstantsMC_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalIntercalibConstantsMC_PayloadInspector.cc @@ -86,7 +86,7 @@ namespace { } // loop over cellid } // if payload.get() - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; @@ -144,10 +144,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -274,7 +274,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -324,7 +324,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalIntercalibConstantsMCDiffBase + }; // class EcalIntercalibConstantsMCDiffBase using EcalIntercalibConstantsMCDiffOneTag = EcalIntercalibConstantsMCBase; using EcalIntercalibConstantsMCDiffTwoTags = EcalIntercalibConstantsMCBase; using EcalIntercalibConstantsMCRatioOneTag = EcalIntercalibConstantsMCBase; diff --git a/CondCore/EcalPlugins/plugins/EcalIntercalibConstants_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalIntercalibConstants_PayloadInspector.cc index 45feb502be069..a21f3e3afa7ee 100644 --- a/CondCore/EcalPlugins/plugins/EcalIntercalibConstants_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalIntercalibConstants_PayloadInspector.cc @@ -80,8 +80,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method @@ -131,9 +131,9 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid - } // payload - } // loop over IOV's (1 in this case) + } // loop over cellid + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -256,7 +256,7 @@ namespace { return false; fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -303,7 +303,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalIntercalibConstantsDiffBase + }; // class EcalIntercalibConstantsDiffBase using EcalIntercalibConstantsDiffOneTag = EcalIntercalibConstantsBase; using EcalIntercalibConstantsDiffTwoTags = EcalIntercalibConstantsBase; using EcalIntercalibConstantsRatioOneTag = EcalIntercalibConstantsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalIntercalibErrors_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalIntercalibErrors_PayloadInspector.cc index f80d29238b246..75996339b43f5 100644 --- a/CondCore/EcalPlugins/plugins/EcalIntercalibErrors_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalIntercalibErrors_PayloadInspector.cc @@ -84,8 +84,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -140,10 +140,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -264,7 +264,7 @@ namespace { return false; fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -314,7 +314,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalIntercalibErrorsDiffBase + }; // class EcalIntercalibErrorsDiffBase using EcalIntercalibErrorsDiffOneTag = EcalIntercalibErrorsBase; using EcalIntercalibErrorsDiffTwoTags = EcalIntercalibErrorsBase; using EcalIntercalibErrorsRatioOneTag = EcalIntercalibErrorsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatiosRef_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatiosRef_PayloadInspector.cc index 1e645f7380352..47dc22b0d3394 100644 --- a/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatiosRef_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatiosRef_PayloadInspector.cc @@ -81,8 +81,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -137,10 +137,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -267,7 +267,7 @@ namespace { if (!payload->endcapItems().empty()) fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); diff --git a/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatios_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatios_PayloadInspector.cc index 1dcf99fed7acb..cbbc41cc9234d 100644 --- a/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatios_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalLaserAPDPNRatios_PayloadInspector.cc @@ -72,8 +72,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), p2); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method @@ -118,8 +118,8 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), p2); } // loop over cellid - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -208,7 +208,7 @@ namespace { endc_m[2]->Fill(myEEId.ix(), myEEId.iy(), p3); } } // validDetId - } // if payload.get() + } // if payload.get() else return false; @@ -464,7 +464,7 @@ namespace { } } } // loop over cellid - } // if payload.get() + } // if payload.get() else return false; } // loop over IOVs @@ -572,7 +572,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalLaserAPDPNRatiosDiffBase + }; // class EcalLaserAPDPNRatiosDiffBase using EcalLaserAPDPNRatiosDiffOneTag = EcalLaserAPDPNRatiosBase; using EcalLaserAPDPNRatiosDiffTwoTags = EcalLaserAPDPNRatiosBase; using EcalLaserAPDPNRatiosRatioOneTag = EcalLaserAPDPNRatiosBase; diff --git a/CondCore/EcalPlugins/plugins/EcalLaserAlphas_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalLaserAlphas_PayloadInspector.cc index 0f821cfd8c9ac..cfe232e4e8040 100644 --- a/CondCore/EcalPlugins/plugins/EcalLaserAlphas_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalLaserAlphas_PayloadInspector.cc @@ -80,8 +80,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -136,10 +136,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -263,7 +263,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -312,7 +312,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalLaserAlphasDiffBase + }; // class EcalLaserAlphasDiffBase using EcalLaserAlphasDiffOneTag = EcalLaserAlphasBase; using EcalLaserAlphasDiffTwoTags = EcalLaserAlphasBase; using EcalLaserAlphasRatioOneTag = EcalLaserAlphasBase; diff --git a/CondCore/EcalPlugins/plugins/EcalLinearCorrections_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalLinearCorrections_PayloadInspector.cc index 6c676367a200c..b59a94db5e33b 100644 --- a/CondCore/EcalPlugins/plugins/EcalLinearCorrections_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalLinearCorrections_PayloadInspector.cc @@ -91,7 +91,7 @@ namespace { EBrms[2] = EBrms[2] + val * val; EBtot[2]++; } // iphi - } // ieta + } // ieta for (int sign = 0; sign < kSides; sign++) { int thesign = sign == 1 ? 1 : -1; @@ -125,9 +125,9 @@ namespace { else endc_m[2]->Fill(ix, iy, val); } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; @@ -200,7 +200,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalLinearCorrectionsPlot + }; // class EcalLinearCorrectionsPlot /**************************************************************** 2d plot of ECAL LinearCorrections difference between 2 IOVs @@ -312,7 +312,7 @@ namespace { EBtot[2]++; } } // iphi - } // ieta + } // ieta for (int sign = 0; sign < kSides; sign++) { int thesign = sign == 1 ? 1 : -1; @@ -362,9 +362,9 @@ namespace { endc_m[2]->Fill(ix, iy, diff); } } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; } // loop over IOVs @@ -454,7 +454,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalLinearCorrectionsDiffBase + }; // class EcalLinearCorrectionsDiffBase using EcalLinearCorrectionsDiffOneTag = EcalLinearCorrectionsDiffBase; using EcalLinearCorrectionsDiffTwoTags = EcalLinearCorrectionsDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalPFRecHitThresholds_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPFRecHitThresholds_PayloadInspector.cc index 88c846b191586..7954193cb8852 100644 --- a/CondCore/EcalPlugins/plugins/EcalPFRecHitThresholds_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalPFRecHitThresholds_PayloadInspector.cc @@ -83,8 +83,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -142,10 +142,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -271,7 +271,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -317,7 +317,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalPFRecHitThresholdsDiffBase + }; // class EcalPFRecHitThresholdsDiffBase using EcalPFRecHitThresholdsDiffOneTag = EcalPFRecHitThresholdsBase; using EcalPFRecHitThresholdsDiffTwoTags = EcalPFRecHitThresholdsBase; using EcalPFRecHitThresholdsRatioOneTag = EcalPFRecHitThresholdsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc index aaab0deb4b4a5..1c80115f7e322 100644 --- a/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc @@ -83,7 +83,7 @@ namespace { endcap_m[2]->Fill((*payload)[rawid].mean_x1); endcap_r[2]->Fill((*payload)[rawid].rms_x1); } // validDetId - } // if payload.get() + } // if payload.get() else return false; @@ -125,7 +125,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalPedestalsHist + }; // class EcalPedestalsHist /************************************** 2d plot of ECAL pedestal of 1 IOV @@ -310,7 +310,7 @@ namespace { } } } // validDetId - } // if payload.get() + } // if payload.get() else return false; @@ -605,7 +605,7 @@ namespace { } } } // loop over cellid - } // barrel data present + } // barrel data present if (payload->endcapItems().empty()) { // looping over the EE channels for (int iz = -1; iz < 2; iz = iz + 2) { // -1 or +1 @@ -730,12 +730,12 @@ namespace { EEtot[2]++; } } // second run - } // validDetId - } // loop over ix - } // loop over iy - } // loop over iz - } // endcap data present - } // if payload.get() + } // validDetId + } // loop over ix + } // loop over iy + } // loop over iz + } // endcap data present + } // if payload.get() else return false; } // loop over IOVs @@ -823,7 +823,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalPedestalsBase + }; // class EcalPedestalsBase using EcalPedestalsDiffOneTag = EcalPedestalsBase; using EcalPedestalsDiffTwoTags = EcalPedestalsBase; using EcalPedestalsRatioOneTag = EcalPedestalsBase; @@ -881,8 +881,8 @@ namespace { // if(valped < 150.) valped = 150.; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valped); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -929,8 +929,8 @@ namespace { // if(valped < 150.) valped = 150.; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valped); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -977,8 +977,8 @@ namespace { // if(valped < 150.) valped = 150.; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valped); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1030,8 +1030,8 @@ namespace { fillWithValue(ix + IX_MAX + 20, iy, valped); } // validDetId - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1081,8 +1081,8 @@ namespace { else fillWithValue(ix + IX_MAX + 20, iy, valped); } // validDetId - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1132,8 +1132,8 @@ namespace { else fillWithValue(ix + IX_MAX + 20, iy, valped); } // validDetId - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1184,8 +1184,8 @@ namespace { valrms = 4.0; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valrms); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1231,8 +1231,8 @@ namespace { valrms = 2.5; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valrms); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1278,8 +1278,8 @@ namespace { valrms = 1.2; fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), valrms); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1330,8 +1330,8 @@ namespace { fillWithValue(ix + IX_MAX + 20, iy, valrms); } // validDetId - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1380,8 +1380,8 @@ namespace { else fillWithValue(ix + IX_MAX + 20, iy, valrms); } // validDetId - } // payload - } // loop over IOV's (1 in this case) + } // payload + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -1430,8 +1430,8 @@ namespace { else fillWithValue(ix + IX_MAX + 20, iy, valrms); } // validDetId - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; } // fill method }; diff --git a/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc index 8dc01b8aff950..6670d169764f0 100644 --- a/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalPulseCovariances_PayloadInspector.cc @@ -124,9 +124,9 @@ namespace { endc_m[s]->Fill(ix, iy, val); } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload /* for(int s = 0; s < TEMPLATESAMPLES; ++s) { std::cout << "EB sample " << s << " mean " << EBmean[s] << " rms " << EBrms[s] << " entries " << EBtot[s] @@ -260,9 +260,9 @@ namespace { } } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload TH2F* barrel_m = new TH2F("EBm", "EB mean", TEMPLATESAMPLES, 0, TEMPLATESAMPLES, TEMPLATESAMPLES, 0., TEMPLATESAMPLES); diff --git a/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc index a7656d9b6f7b1..ca6caf0af5290 100644 --- a/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalPulseShapes_PayloadInspector.cc @@ -104,9 +104,9 @@ namespace { endc_m[s]->Fill(ix, iy, val); } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload for (int s = 0; s < TEMPLATESAMPLES; s++) { std::cout << "EB sample " << s << " mean " << EBmean[s] << " rms " << EBrms[s] << " entries " << EBtot[s] @@ -228,9 +228,9 @@ namespace { endcap->Fill(s, val); } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload gStyle->SetPalette(1); gStyle->SetOptStat(0); diff --git a/CondCore/EcalPlugins/plugins/EcalTPGCrystalStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGCrystalStatus_PayloadInspector.cc index 071b35d6dab00..c45d218743cee 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGCrystalStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGCrystalStatus_PayloadInspector.cc @@ -78,9 +78,9 @@ namespace { EEstat[0]++; } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -213,9 +213,9 @@ namespace { } } } // iy - } // ix - } // side - } // payload + } // ix + } // side + } // payload else return false; } // loop over IOVs @@ -270,7 +270,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTPGCrystalStatusDiffBase + }; // class EcalTPGCrystalStatusDiffBase using EcalTPGCrystalStatusDiffOneTag = EcalTPGCrystalStatusDiffBase; using EcalTPGCrystalStatusDiffTwoTags = EcalTPGCrystalStatusDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGFineGrainTowerEE_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGFineGrainTowerEE_PayloadInspector.cc index 3078529cc851d..ec5f51a7988d9 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGFineGrainTowerEE_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGFineGrainTowerEE_PayloadInspector.cc @@ -64,7 +64,7 @@ namespace { minEE = weight; } } //tower map - } //payload + } //payload TCanvas canvas("CC map", "CC map", 800, 800); TLatex t1; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGLinearizationConst_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGLinearizationConst_PayloadInspector.cc index 75cdfcb4a91f5..427cdfbc55dc7 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGLinearizationConst_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGLinearizationConst_PayloadInspector.cc @@ -154,7 +154,7 @@ namespace { if (val > rEBmax[2]) rEBmax[2] = val; } // iphi - } // ieta + } // ieta for (int ix = 0; ix < IX_MAX; ix++) { for (int iy = 0; iy < IY_MAX; iy++) { @@ -217,9 +217,9 @@ namespace { rEEmax[2] = val; // fout << " x " << ix << " y " << " val " << val << std::endl; } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; // std::cout << " min " << rEEmin[2] << " max " << rEEmax[2] << std::endl; @@ -510,7 +510,7 @@ namespace { rEBmax[2] = dr; } } // iphi - } // ieta + } // ieta for (int ix = 0; ix < IX_MAX; ix++) { for (int iy = 0; iy < IY_MAX; iy++) { @@ -664,9 +664,9 @@ namespace { } // fout << " x " << ix << " y " << " dr " << dr << std::endl; } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; } // loop over IOVs @@ -727,7 +727,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalPedestalsDiffBase + }; // class EcalPedestalsDiffBase using EcalTPGLinearizationConstDiffOneTag = EcalTPGLinearizationConstBase; using EcalTPGLinearizationConstDiffTwoTags = EcalTPGLinearizationConstBase; using EcalTPGLinearizationConstRatioOneTag = EcalTPGLinearizationConstBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGLutGroup_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGLutGroup_PayloadInspector.cc index 51ccd78a58935..f4d3bb6e4fa61 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGLutGroup_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGLutGroup_PayloadInspector.cc @@ -27,7 +27,7 @@ namespace { IY_MAX = 100, EEhistXMax = 220 }; // endcaps lower and upper bounds on x and y - /*********************************************** + /*********************************************** 2d plot of EcalTPGLutGroup of 1 IOV ************************************************/ class EcalTPGLutGroupPlot : public cond::payloadInspector::PlotImage { diff --git a/CondCore/EcalPlugins/plugins/EcalTPGPedestals_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGPedestals_PayloadInspector.cc index f918fe1df145e..01fd23d13bb54 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGPedestals_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGPedestals_PayloadInspector.cc @@ -103,7 +103,7 @@ namespace { if (val > mEBmax[2]) mEBmax[2] = val; } // iphi - } // ieta + } // ieta for (int ix = 0; ix < IX_MAX; ix++) { for (int iy = 0; iy < IY_MAX; iy++) { @@ -139,9 +139,9 @@ namespace { mEEmax[2] = val; // fout << " x " << ix << " y " << " val " << val << std::endl; } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; // std::cout << " min " << rEEmin[2] << " max " << rEEmax[2] << std::endl; @@ -328,7 +328,7 @@ namespace { mEBmax[2] = dr; } } // iphi - } // ieta + } // ieta for (int ix = 0; ix < IX_MAX; ix++) { for (int iy = 0; iy < IY_MAX; iy++) { @@ -410,9 +410,9 @@ namespace { } // fout << " x " << ix << " y " << " dr " << dr << std::endl; } // iy - } // ix - } // side - } // if payload.get() + } // ix + } // side + } // if payload.get() else return false; } // loop over IOVs @@ -467,7 +467,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTPGPedestalsDiffBase + }; // class EcalTPGPedestalsDiffBase using EcalTPGPedestalsDiffOneTag = EcalTPGPedestalsBase; using EcalTPGPedestalsDiffTwoTags = EcalTPGPedestalsBase; using EcalTPGPedestalsRatioOneTag = EcalTPGPedestalsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGStripStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGStripStatus_PayloadInspector.cc index dea0df97092c2..cf49e9572236e 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGStripStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGStripStatus_PayloadInspector.cc @@ -285,11 +285,11 @@ namespace { } // std::cout << " x " << x << " y " << y << " z " << iz << std::endl; } // loop over crystals in strip - } // new strip - } // second run + } // new strip + } // second run } } // loop over strips - } // payload + } // payload else return false; // std::cout << " nb of strips " << istat << std::endl; @@ -328,8 +328,8 @@ namespace { } // std::cout << " x " << x << " y " << y << " z " << iz << std::endl; } // loop over crystals in strip - } // new strip - } // loop over run 1 strips + } // new strip + } // loop over run 1 strips gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -385,7 +385,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTPGStripStatusDiffBase + }; // class EcalTPGStripStatusDiffBase using EcalTPGStripStatusDiffOneTag = EcalTPGStripStatusDiffBase; using EcalTPGStripStatusDiffTwoTags = EcalTPGStripStatusDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGTowerStatus_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGTowerStatus_PayloadInspector.cc index 24734b898d9d1..39cb72562eef6 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGTowerStatus_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGTowerStatus_PayloadInspector.cc @@ -155,8 +155,8 @@ namespace { if (towerId >= kEBTotalTowers) std::cout << " strange tower Id " << towerId << std::endl; } - } // barrel - } // 1st run + } // barrel + } // 1st run else { // 2nd run if (ttId.subDet() == 1) { // barrel if (stat > 0) { // bad tower @@ -172,9 +172,9 @@ namespace { // vEB[towerId] = 0; EBstat += diff; } // barrel - } // 2nd run - } // loop over towers - } // payload + } // 2nd run + } // loop over towers + } // payload else return false; } // loop over IOVs @@ -242,7 +242,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTPGTowerStatusDiffBase + }; // class EcalTPGTowerStatusDiffBase using EcalTPGTowerStatusDiffOneTag = EcalTPGTowerStatusDiffBase; using EcalTPGTowerStatusDiffTwoTags = EcalTPGTowerStatusDiffBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTPGWeightGroup_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTPGWeightGroup_PayloadInspector.cc index e27ebe7b91612..6129fe30fb15f 100644 --- a/CondCore/EcalPlugins/plugins/EcalTPGWeightGroup_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTPGWeightGroup_PayloadInspector.cc @@ -27,7 +27,7 @@ namespace { IY_MAX = 100, EEhistXMax = 220 }; // endcaps lower and upper bounds on x and y - /*********************************************** + /*********************************************** 2d plot of EcalTPGWeightGroup of 1 IOV ************************************************/ class EcalTPGWeightGroupPlot : public cond::payloadInspector::PlotImage { diff --git a/CondCore/EcalPlugins/plugins/EcalTimeCalibConstants_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTimeCalibConstants_PayloadInspector.cc index 64384b0718b5b..97196ddf78611 100644 --- a/CondCore/EcalPlugins/plugins/EcalTimeCalibConstants_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTimeCalibConstants_PayloadInspector.cc @@ -84,8 +84,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -141,10 +141,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -270,7 +270,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -316,7 +316,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTimeCalibConstantsDiffBase + }; // class EcalTimeCalibConstantsDiffBase using EcalTimeCalibConstantsDiffOneTag = EcalTimeCalibConstantsBase; using EcalTimeCalibConstantsDiffTwoTags = EcalTimeCalibConstantsBase; using EcalTimeCalibConstantsRatioOneTag = EcalTimeCalibConstantsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalTimeCalibErrors_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalTimeCalibErrors_PayloadInspector.cc index 05cd1fd2d580e..13b322a400c0b 100644 --- a/CondCore/EcalPlugins/plugins/EcalTimeCalibErrors_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalTimeCalibErrors_PayloadInspector.cc @@ -84,8 +84,8 @@ namespace { // fill the Histogram2D here fillWithValue((EBDetId(rawid)).iphi(), (EBDetId(rawid)).ieta(), weight); } // loop over cellid - } // if payload.get() - } // loop over IOV's (1 in this case) + } // if payload.get() + } // loop over IOV's (1 in this case) return true; @@ -143,10 +143,10 @@ namespace { else fillWithValue(myEEId.ix() + IX_MAX + EEhistSplit, myEEId.iy(), weight); } // validDetId - } // loop over cellid + } // loop over cellid } // payload - } // loop over IOV's (1 in this case) + } // loop over IOV's (1 in this case) return true; } // fill method }; @@ -271,7 +271,7 @@ namespace { fillEEMap_TwoIOVs(payload, endc_m, endc_p, irun, pEE, pEEmin, pEEmax, method); } // payload - } // loop over IOVs + } // loop over IOVs gStyle->SetPalette(1); gStyle->SetOptStat(0); @@ -320,7 +320,7 @@ namespace { canvas.SaveAs(ImageName.c_str()); return true; } // fill method - }; // class EcalTimeCalibErrorsDiffBase + }; // class EcalTimeCalibErrorsDiffBase using EcalTimeCalibErrorsDiffOneTag = EcalTimeCalibErrorsBase; using EcalTimeCalibErrorsDiffTwoTags = EcalTimeCalibErrorsBase; using EcalTimeCalibErrorsRatioOneTag = EcalTimeCalibErrorsBase; diff --git a/CondCore/EcalPlugins/plugins/EcalWeightXtalGroups_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalWeightXtalGroups_PayloadInspector.cc index 1294c4b47f890..e3e2049e20c68 100644 --- a/CondCore/EcalPlugins/plugins/EcalWeightXtalGroups_PayloadInspector.cc +++ b/CondCore/EcalPlugins/plugins/EcalWeightXtalGroups_PayloadInspector.cc @@ -89,7 +89,7 @@ namespace { else endc_m->Fill(ix, iy, weight); } // validDetId - } // payload + } // payload gStyle->SetPalette(1); gStyle->SetOptStat(0); diff --git a/CondCore/HcalPlugins/interface/HcalObjRepresent.h b/CondCore/HcalPlugins/interface/HcalObjRepresent.h index 38f51b84d4be3..1f0fa83d9433f 100644 --- a/CondCore/HcalPlugins/interface/HcalObjRepresent.h +++ b/CondCore/HcalPlugins/interface/HcalObjRepresent.h @@ -42,7 +42,7 @@ namespace HcalObjRepresent { PlotMode_ = "Map"; } - virtual ~HcalDataContainer(){}; + virtual ~HcalDataContainer() {} // For easier channel mapping typedef std::tuple Coord; typedef std::map tHcalValCont; @@ -1006,8 +1006,8 @@ namespace HcalObjRepresent { hh[d].SetBinContent(eta + 1, (iphi + 2) % 72 + 1, hh[d].GetBinContent(eta + 1, iphi)); } } // for (int phi...) - } // for (int eta...) - } // for (int d=0;...) + } // for (int eta...) + } // for (int d=0;...) // no corrections needed for HO (depth 4) return; } // FillUnphysicalHEHFBins(MonitorElement* hh) @@ -1037,7 +1037,7 @@ namespace HcalObjRepresent { { binval = hh.GetBinContent(eta + 1, iphi); hh.SetBinContent(eta + 1, iphi + 1, binval); - } // if (iphi%2==1...) + } // if (iphi%2==1...) else if (abs(ieta) > 39 && iphi % 4 == 3 && iphi < 73) // 20 degree phi binning condition { // Set last two eta strips where each cell spans 20 degrees in phi @@ -1046,7 +1046,7 @@ namespace HcalObjRepresent { hh.SetBinContent(eta + 1, (iphi + 1) % 72 + 1, hh.GetBinContent(eta + 1, iphi)); hh.SetBinContent(eta + 1, (iphi + 2) % 72 + 1, hh.GetBinContent(eta + 1, iphi)); } // else if (abs(ieta)>39 ...) - } // for (int phi=0;phi<72;++phi) + } // for (int phi=0;phi<72;++phi) } // for (int eta=0; eta< (etaBins_-2);++eta) @@ -1207,8 +1207,8 @@ namespace HcalObjRepresent { class ADataRepr //Sample base class for c++ inheritance tutorial { public: - ADataRepr(unsigned int d) : m_total(d){}; - virtual ~ADataRepr(){}; + ADataRepr(unsigned int d) : m_total(d) {} + virtual ~ADataRepr() {} unsigned int nr, id; std::stringstream filename, rootname, plotname; diff --git a/CondCore/JetMETPlugins/plugins/JetCorrector_PayloadInspector.cc b/CondCore/JetMETPlugins/plugins/JetCorrector_PayloadInspector.cc index 20e3bab7bef06..ff7f9154baba3 100644 --- a/CondCore/JetMETPlugins/plugins/JetCorrector_PayloadInspector.cc +++ b/CondCore/JetMETPlugins/plugins/JetCorrector_PayloadInspector.cc @@ -293,7 +293,7 @@ namespace { } // for iovs return false; } // fill - }; // class + }; // class class JetCorrectorVsEtaSummary : public cond::payloadInspector::PlotImage { diff --git a/CondCore/JetMETPlugins/plugins/JetResolution_PayloadInspector.cc b/CondCore/JetMETPlugins/plugins/JetResolution_PayloadInspector.cc index 5c5a1a96aafdd..14ff5796ab544 100644 --- a/CondCore/JetMETPlugins/plugins/JetResolution_PayloadInspector.cc +++ b/CondCore/JetMETPlugins/plugins/JetResolution_PayloadInspector.cc @@ -528,7 +528,7 @@ namespace JME { } // for return true; } // fill - }; // class + }; // class typedef JetScaleFactorVsEta JetScaleFactorVsEtaNORM; typedef JetScaleFactorVsEta JetScaleFactorVsEtaDOWN; @@ -590,7 +590,7 @@ namespace JME { } // for return true; } // fill - }; // class + }; // class typedef JetScaleFactorVsPt JetScaleFactorVsPtNORM; typedef JetScaleFactorVsPt JetScaleFactorVsPtDOWN; diff --git a/CondCore/PCLConfigPlugins/plugins/SiPixelAliPCLThresholdsPayloadInspectorHelper.h b/CondCore/PCLConfigPlugins/plugins/SiPixelAliPCLThresholdsPayloadInspectorHelper.h index 2454f1eb53b41..a93f774cf24c8 100644 --- a/CondCore/PCLConfigPlugins/plugins/SiPixelAliPCLThresholdsPayloadInspectorHelper.h +++ b/CondCore/PCLConfigPlugins/plugins/SiPixelAliPCLThresholdsPayloadInspectorHelper.h @@ -176,8 +176,8 @@ namespace AlignPCLThresholdPlotHelper { yBin--; } // loop on types - } // loop on coordinates - } // loop on alignables + } // loop on coordinates + } // loop on alignables Thresholds->GetXaxis()->LabelsOption(isHighGranularity_ ? "v" : "h"); Thresholds->Draw("TEXT"); @@ -378,8 +378,8 @@ namespace AlignPCLThresholdPlotHelper { yBin--; } // loop on types - } // loop on coordinates - } // loop on alignables + } // loop on coordinates + } // loop on alignables ThresholdsColor->Draw("COLZ0"); ThresholdsColor->GetXaxis()->LabelsOption(isHighGranularity_ ? "v" : "h"); diff --git a/CondCore/SiPixelPlugins/interface/SiPixelGainCalibHelper.h b/CondCore/SiPixelPlugins/interface/SiPixelGainCalibHelper.h index 824c54cc592eb..640f86c651cc6 100644 --- a/CondCore/SiPixelPlugins/interface/SiPixelGainCalibHelper.h +++ b/CondCore/SiPixelPlugins/interface/SiPixelGainCalibHelper.h @@ -101,8 +101,8 @@ namespace gainCalibHelper { v_diffs.push_back(diff); v_ratios.push_back(ratio); } // loop on rows - } // loop on cols - } // loop on detids + } // loop on cols + } // loop on detids std::sort(v_diffs.begin(), v_diffs.end()); std::sort(v_ratios.begin(), v_ratios.end()); @@ -177,9 +177,9 @@ namespace gainCalibHelper { } h1->Fill(quid); } // loop on rows - } // loop on cols - } // loop on detids - } // fillTheHisto + } // loop on cols + } // loop on detids + } // fillTheHisto //============================================================================ // helper method to fill the gain / pedestal averages per module maps @@ -220,12 +220,12 @@ namespace gainCalibHelper { edm::LogError("gainCalibPI::fillThePerModuleMap") << "Unrecognized type " << theType << std::endl; break; } // switch on the type - } // rows - } // columns + } // rows + } // columns // fill the return value map map[d] = sumOfX / nPixels; } // loop on the detId - } // fillThePerModuleMap + } // fillThePerModuleMap //============================================================================ // helper method to fill the gain / pedestals distributions @@ -279,11 +279,11 @@ namespace gainCalibHelper { edm::LogError("gainCalibPI::fillTheHistos") << d << " is not a Pixel DetId" << std::endl; break; } // switch on subid - } // row loop - } // column loop - } // detid loop - } // filltheHistos - } // namespace gainCalibPI + } // row loop + } // column loop + } // detid loop + } // filltheHistos + } // namespace gainCalibPI constexpr char const* TypeName[2] = {"Gains", "Pedestals"}; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelDynamicInefficiency_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelDynamicInefficiency_PayloadInspector.cc index 6259304aa37a0..f63d1c1109640 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelDynamicInefficiency_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelDynamicInefficiency_PayloadInspector.cc @@ -436,7 +436,7 @@ namespace { edm::LogPrint("SiPixelDynamicInefficiencyTest") << " theInstLumiScaleFactor = " << theInstLumiScaleFactor_db; } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelFEDChannelContainer_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelFEDChannelContainer_PayloadInspector.cc index 20d5bfc3c4a52..c2870979eeca8 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelFEDChannelContainer_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelFEDChannelContainer_PayloadInspector.cc @@ -215,8 +215,8 @@ namespace { else { throw cms::Exception("LogicError") << "Unknown Pixel SubDet ID " << std::endl; } // else nonsense - } // loop on the channels - } // loop on the scenarios + } // loop on the channels + } // loop on the scenarios gStyle->SetOptStat(0); //========================= @@ -379,8 +379,8 @@ namespace { else { throw cms::Exception("LogicError") << "Unknown Pixel SubDet ID " << std::endl; } // else nonsense - } // loop on the channels - } // loop on the scenarios + } // loop on the channels + } // loop on the scenarios gStyle->SetOptStat(0); //========================= @@ -602,8 +602,8 @@ namespace { else { throw cms::Exception("LogicError") << "Unknown Pixel SubDet ID " << std::endl; } // else nonsense - } // loop on the channels - } // loop on the scenarios + } // loop on the channels + } // loop on the scenarios gStyle->SetOptStat(0); //========================= @@ -708,7 +708,7 @@ namespace { int local_bad_rocs = ch.roc_last - ch.roc_first; badRocCount += local_bad_rocs; } // loop on the channels - } // loop on the DetSetVector + } // loop on the DetSetVector h1->SetBinContent(scenarioIndex, badRocCount); } // loop on scenarios diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelLorentzAngle_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelLorentzAngle_PayloadInspector.cc index 278ce3dfae7cd..0e963c110d612 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelLorentzAngle_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelLorentzAngle_PayloadInspector.cc @@ -58,7 +58,7 @@ namespace { fillWithValue(element.second); } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelQualityProbabilities_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelQualityProbabilities_PayloadInspector.cc index 8715ed5d90210..c3bfc7abc63b2 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelQualityProbabilities_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelQualityProbabilities_PayloadInspector.cc @@ -193,7 +193,7 @@ namespace { probVec.emplace_back(pair.first, average); } } // if the first PU bin is not 0 - } // if we're asking for all the PU bins + } // if we're asking for all the PU bins TCanvas canvas("Canv", "Canv", 1200, 1000); canvas.cd(); diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelQuality_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelQuality_PayloadInspector.cc index 8fce9fb96b901..3c1e838c56fee 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelQuality_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelQuality_PayloadInspector.cc @@ -70,7 +70,7 @@ namespace { COUT << "detId:" << mod.DetID << " error type:" << mod.errorType << " BadRocs:" << BadRocCount << std::endl; } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -113,7 +113,7 @@ namespace { } } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelTemplateDBObject_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelTemplateDBObject_PayloadInspector.cc index 724a489753074..d22e91c741b78 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelTemplateDBObject_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelTemplateDBObject_PayloadInspector.cc @@ -103,7 +103,7 @@ namespace { fillWithValue(1.); } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiPixelPlugins/plugins/SiPixelVCal_PayloadInspector.cc b/CondCore/SiPixelPlugins/plugins/SiPixelVCal_PayloadInspector.cc index 9f937d1ffdb3b..ef3d160fea0a6 100644 --- a/CondCore/SiPixelPlugins/plugins/SiPixelVCal_PayloadInspector.cc +++ b/CondCore/SiPixelPlugins/plugins/SiPixelVCal_PayloadInspector.cc @@ -67,7 +67,7 @@ namespace { } } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/plugins/SiStripApvGain_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripApvGain_PayloadInspector.cc index 5350bb9d5e138..7491079983562 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripApvGain_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripApvGain_PayloadInspector.cc @@ -86,7 +86,7 @@ namespace { objContainer->printAll(); } // payload - } // iovs + } // iovs return true; } // fill }; @@ -242,9 +242,9 @@ namespace { fillWithValue(payload->getApvGain(it, range)); } // loop over APVs - } // loop over detIds - } // payload - } // iovs + } // loop over detIds + } // payload + } // iovs return true; } // fill }; @@ -296,7 +296,7 @@ namespace { sumOfGainsByLayer[layer].first += payload->getApvGain(it, range); sumOfGainsByLayer[layer].second += 1.; } // loop over APVs - } // loop over detIds + } // loop over detIds // loop on the map to fill the plot for (auto& data : sumOfGainsByLayer) { @@ -304,7 +304,7 @@ namespace { } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -348,8 +348,8 @@ namespace { (gain > 2.0) ? 2.0 : gain); } } //loop over detIds - } // loop over payloads - } // loop over iovs + } // loop over payloads + } // loop over iovs return true; } // fill }; @@ -409,7 +409,7 @@ namespace { sumOfGainsByDisk[disk].first += payload->getApvGain(it, range); sumOfGainsByDisk[disk].second += 1.; } // loop over APVs - } // loop over detIds + } // loop over detIds // loop on the map to fill the plot for (auto& data : sumOfGainsByDisk) { @@ -417,7 +417,7 @@ namespace { } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -478,7 +478,7 @@ namespace { sumOfGainsByDisk[disk].first += payload->getApvGain(it, range); sumOfGainsByDisk[disk].second += 1.; } // loop over APVs - } // loop over detIds + } // loop over detIds // loop on the map to fill the plot for (auto& data : sumOfGainsByDisk) { @@ -486,7 +486,7 @@ namespace { } } // payload - } // iovs + } // iovs return true; } // fill }; @@ -542,7 +542,7 @@ namespace { float gain = payload->getApvGain(it, range); fillWithValue((float)disk - 1, (gain > 2.0) ? 2.0 : gain); } // apvs - } // detids + } // detids } } // iovs return true; @@ -599,7 +599,7 @@ namespace { float gain = payload->getApvGain(it, range); fillWithValue((float)disk - 1, (gain > 2.0) ? 2.0 : gain); } //apvs - } //detids + } //detids } } // iovs return true; @@ -911,7 +911,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); lastmap[index] = Gain; } // loop over APVs - } // loop over detIds + } // loop over detIds detid.clear(); @@ -927,7 +927,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); firstmap[index] = Gain; } // loop over APVs - } // loop over detIds + } // loop over detIds // find the largest deviation std::map cachedRatio; @@ -1099,7 +1099,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; } // payload @@ -1139,7 +1139,7 @@ namespace { sumOfGains += gain; rmsOfGains += (gain * gain); } // loop over APVs - } // loop over detIds + } // loop over detIds meanOfGains = sumOfGains / nAPVs; @@ -1201,7 +1201,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; @@ -1235,7 +1235,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; @@ -1269,7 +1269,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; @@ -1304,7 +1304,7 @@ namespace { nAPVs += 1; sumOfGains += payload.getApvGain(it, range); } // loop over APVs - } // loop over detIds + } // loop over detIds return sumOfGains / nAPVs; @@ -1349,7 +1349,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill private: @@ -1406,7 +1406,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); lastmap[index] = Gain; } // end loop on APVs - } // end loop on detids + } // end loop on detids detid.clear(); first_payload->getDetIds(detid); @@ -1422,7 +1422,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); firstmap[index] = Gain; } // end loop on APVs - } // end loop on detids + } // end loop on detids TCanvas canvas("Payload comparison", "payload comparison", 1400, 1000); canvas.Divide(2, 1); @@ -1622,7 +1622,7 @@ namespace { float gain = payload->getApvGain(it, range); h_gains[region]->Fill(gain); } // end loop on APVs - } // end loop on detids + } // end loop on detids TCanvas canvas("Payload breakout", "payload breakout", 1200, 800); canvas.Divide(2, 1); @@ -1831,7 +1831,7 @@ namespace { auto index = std::make_pair(d, nAPV); lastmap[index] = last_payload->getApvGain(it, range); } // end loop on APVs - } // end loop on detids + } // end loop on detids detid.clear(); first_payload->getDetIds(detid); @@ -1845,7 +1845,7 @@ namespace { auto index = std::make_pair(d, nAPV); firstmap[index] = last_payload->getApvGain(it, range); } // end loop on APVs - } // end loop on detids + } // end loop on detids TCanvas canvas("Payload comparison", "payload comparison", 1000, 1000); canvas.cd(); @@ -2014,7 +2014,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); lastmap[index] = Gain; } // end loop on APVs - } // end loop on detids + } // end loop on detids detid.clear(); first_payload->getDetIds(detid); @@ -2030,7 +2030,7 @@ namespace { std::pair index = std::make_pair(d, nAPV); firstmap[index] = Gain; } // end loop on APVs - } // end loop on detids + } // end loop on detids TCanvas canvas("Payload comparison by Tracker Region", "payload comparison by Tracker Region", 1800, 800); canvas.Divide(2, 1); diff --git a/CondCore/SiStripPlugins/plugins/SiStripBackPlaneCorrection_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripBackPlaneCorrection_PayloadInspector.cc index bea719907a3b1..c3ef93ede147c 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripBackPlaneCorrection_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripBackPlaneCorrection_PayloadInspector.cc @@ -57,7 +57,7 @@ namespace { fillWithValue(element.second); } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc index ffe50b0cfd481..2316e1818575b 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripBadStrip_PayloadInspector.cc @@ -87,7 +87,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/plugins/SiStripConfObject_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripConfObject_PayloadInspector.cc index a637f6f1022aa..c6ade88bd1cd5 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripConfObject_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripConfObject_PayloadInspector.cc @@ -63,7 +63,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/plugins/SiStripDetVOff_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripDetVOff_PayloadInspector.cc index 7945c48a716ee..fd3944a51dda1 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripDetVOff_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripDetVOff_PayloadInspector.cc @@ -176,11 +176,11 @@ namespace { default: edm::LogError("SiStripDetVOffListOfModules") << "Unrecognized type: " << my_type << std::endl; break; - } // switch + } // switch i++; // increase counting of modules - } // loop on detids - } // if gets the payload - } // loop on iovs + } // loop on detids + } // if gets the payload + } // loop on iovs return true; } // fill() }; @@ -233,7 +233,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill private: diff --git a/CondCore/SiStripPlugins/plugins/SiStripLorentzAngle_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripLorentzAngle_PayloadInspector.cc index 74c0ece942a57..d40d13dfd7944 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripLorentzAngle_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripLorentzAngle_PayloadInspector.cc @@ -162,7 +162,7 @@ namespace { fillWithValue(element.second); } } // payload - } // iovs + } // iovs return true; } // fill }; diff --git a/CondCore/SiStripPlugins/plugins/SiStripNoises_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripNoises_PayloadInspector.cc index 8bb5f6180dfa2..eef75a8dc3b68 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripNoises_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripNoises_PayloadInspector.cc @@ -253,7 +253,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill private: @@ -452,9 +452,9 @@ namespace { //to be used to fill the histogram fillWithValue(noise); } // loop over APVs - } // loop over detIds - } // payload - } // iovs + } // loop over detIds + } // payload + } // iovs return true; } // fill }; @@ -490,8 +490,8 @@ namespace { //to be used to fill the histogram fillWithValue(noise); } // loop over APVs - } // payload - } // iovs + } // payload + } // iovs return true; } // fill }; @@ -1590,7 +1590,7 @@ namespace { std::get<1>(noisePerStripLength[stripL]) += noise; std::get<2>(noisePerStripLength[stripL]) += (noise * noise); } // loop over strips - } // loop over detIds + } // loop over detIds TCanvas canvas("Noise linearity", "noise linearity", 1200, 1000); canvas.cd(); @@ -1710,7 +1710,7 @@ namespace { sum += noise; sum2 += (noise * noise); } // loop on strips - } // loop on detIds + } // loop on detIds float mean = sum / nStrips; float rms = (sum2 / nStrips - mean * mean) > 0. ? sqrt(sum2 / nStrips - mean * mean) : 0.; @@ -1755,7 +1755,7 @@ namespace { sum += noise; sum2 += (noise * noise); } // loop on strips - } // loop on detIds + } // loop on detIds float mean = sum / nStrips; float rms = (sum2 / nStrips - mean * mean) > 0. ? sqrt(sum2 / nStrips - mean * mean) : 0.; @@ -1800,7 +1800,7 @@ namespace { sum += noise; sum2 += (noise * noise); } // loop on strips - } // loop on detIds + } // loop on detIds float mean = sum / nStrips; float rms = (sum2 / nStrips - mean * mean) > 0. ? sqrt(sum2 / nStrips - mean * mean) : 0.; @@ -1874,7 +1874,7 @@ namespace { noises.emplace(layer, std::vector{}); noises[layer].push_back(noise); } // loop on strips - } // loop on detIds + } // loop on detIds for (auto& entry : noises) { double sum = std::accumulate(entry.second.begin(), entry.second.end(), 0.0); @@ -1891,7 +1891,7 @@ namespace { noises_err.emplace(entry.first, std::vector{}); noises_err[entry.first].push_back(0); } //get - } //run on iov + } //run on iov } TCanvas canvas("Partition summary", "partition summary", 2000, 1000); canvas.cd(); diff --git a/CondCore/SiStripPlugins/plugins/SiStripPedestals_PayloadInspector.cc b/CondCore/SiStripPlugins/plugins/SiStripPedestals_PayloadInspector.cc index 5d3d183b21aa7..6b3e066480264 100644 --- a/CondCore/SiStripPlugins/plugins/SiStripPedestals_PayloadInspector.cc +++ b/CondCore/SiStripPlugins/plugins/SiStripPedestals_PayloadInspector.cc @@ -215,7 +215,7 @@ namespace { std::cout << ss.str() << std::endl; } // payload - } // iovs + } // iovs return true; } // fill private: @@ -414,9 +414,9 @@ namespace { //to be used to fill the histogram fillWithValue(ped); } // loop over APVs - } // loop over detIds - } // payload - } // iovs + } // loop over detIds + } // payload + } // iovs return true; } // fill }; @@ -452,8 +452,8 @@ namespace { //to be used to fill the histogram fillWithValue(noise); } // loop over APVs - } // payload - } // iovs + } // payload + } // iovs return true; } // fill }; diff --git a/CondCore/Utilities/bin/conddb_test_gt_perf.cpp b/CondCore/Utilities/bin/conddb_test_gt_perf.cpp index c795a4090330d..46448140c61b3 100644 --- a/CondCore/Utilities/bin/conddb_test_gt_perf.cpp +++ b/CondCore/Utilities/bin/conddb_test_gt_perf.cpp @@ -606,8 +606,8 @@ int cond::TestGTPerf::execute() { std::cout << "for payload type name: " << payloadTypeName << std::endl; } timex.deserInt(p->getBufferSize()); // keep track of time vs. size - } // single-thread - index++; // increment index into payloads + } // single-thread + index++; // increment index into payloads } std::cout << std::endl; diff --git a/CondFormats/GEMObjects/interface/GEMROMapping.h b/CondFormats/GEMObjects/interface/GEMROMapping.h index aecf3418b4832..934f52cb24c80 100644 --- a/CondFormats/GEMObjects/interface/GEMROMapping.h +++ b/CondFormats/GEMObjects/interface/GEMROMapping.h @@ -96,7 +96,7 @@ class GEMROMapping { } }; - GEMROMapping(){}; + GEMROMapping() {} bool isValidChipID(const vfatEC& r) const { return vfatMap_.find(r) != vfatMap_.end(); } bool isValidChamber(const chamEC& r) const { return chamberMap_.find(r) != chamberMap_.end(); } diff --git a/CondFormats/GEMObjects/interface/GEMROmap.h b/CondFormats/GEMObjects/interface/GEMROmap.h index fec6b4bdbf65e..fd95410127b34 100644 --- a/CondFormats/GEMObjects/interface/GEMROmap.h +++ b/CondFormats/GEMObjects/interface/GEMROmap.h @@ -61,7 +61,7 @@ class GEMROmap { } }; - GEMROmap(){}; + GEMROmap() {} bool isValidChipID(const eCoord& r) const { return roMapED_.find(r) != roMapED_.end(); } const dCoord& hitPosition(const eCoord& r) const { return roMapED_.at(r); } diff --git a/CondFormats/JetMETObjects/interface/Utilities.h b/CondFormats/JetMETObjects/interface/Utilities.h index 3f64051bdadfa..0a27c94a6887e 100644 --- a/CondFormats/JetMETObjects/interface/Utilities.h +++ b/CondFormats/JetMETObjects/interface/Utilities.h @@ -56,8 +56,8 @@ namespace std { //Return a tuple which is a subset of the original tuple //This function pops an entry off the font of the tuple template - auto tuple_subset(const Tuple& tpl, ct_integers_list) - -> decltype(std::make_tuple(std::get(tpl)...)) { + auto tuple_subset(const Tuple& tpl, + ct_integers_list) -> decltype(std::make_tuple(std::get(tpl)...)) { return std::make_tuple(std::get(tpl)...); // this means: // make_tuple(get(tpl), get(tpl), ...) diff --git a/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc b/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc index 773ce8e14727e..2d6b2477b7031 100644 --- a/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc +++ b/CondFormats/SerializationHelper/test/test_catch2_SerializationHelper.cc @@ -26,8 +26,8 @@ namespace { template void serialize(Archive& ar, const unsigned int version) { - ar& a_; - ar& b_; + ar & a_; + ar & b_; ++counter_; } @@ -50,7 +50,7 @@ namespace { template void serialize(Archive& ar, const unsigned int version) { - ar& value_; + ar & value_; } int value_ = 3145; }; diff --git a/CondTools/Ecal/interface/EcalErrorDictionary.h b/CondTools/Ecal/interface/EcalErrorDictionary.h index b0a4e484eab4a..2d347d1df502a 100644 --- a/CondTools/Ecal/interface/EcalErrorDictionary.h +++ b/CondTools/Ecal/interface/EcalErrorDictionary.h @@ -55,8 +55,8 @@ class EcalErrorDictionary { } private: - EcalErrorDictionary(){}; // Hidden to force static use - ~EcalErrorDictionary(){}; // Hidden to force static use + EcalErrorDictionary() {} // Hidden to force static use + ~EcalErrorDictionary() {} // Hidden to force static use const static unsigned int DICTSIZE = 55; diff --git a/CondTools/Ecal/interface/EcalWeightSetXMLTranslator.h b/CondTools/Ecal/interface/EcalWeightSetXMLTranslator.h index eba651619984d..5210b75289fc5 100644 --- a/CondTools/Ecal/interface/EcalWeightSetXMLTranslator.h +++ b/CondTools/Ecal/interface/EcalWeightSetXMLTranslator.h @@ -17,7 +17,7 @@ class EcalWeightSetXMLTranslator { public: - EcalWeightSetXMLTranslator(){}; + EcalWeightSetXMLTranslator() {} static int readXML(const std::string& filename, EcalCondHeader& header, EcalWeightSet& record); diff --git a/CondTools/Ecal/plugins/EcalPedestalHistory.cc b/CondTools/Ecal/plugins/EcalPedestalHistory.cc index 92823de12d49a..d64fa74116c37 100644 --- a/CondTools/Ecal/plugins/EcalPedestalHistory.cc +++ b/CondTools/Ecal/plugins/EcalPedestalHistory.cc @@ -329,14 +329,14 @@ void EcalPedestalHistory::beginRun(edm::Run const&, edm::EventSetup const& c) { PedVal.Mean[iChanEE] = rd_ped.getPedMeanG12(); PedVal.RMS[iChanEE] = rd_ped.getPedRMSG12(); } // valid ee Id - } // Endcaps - } // loop over channels + } // Endcaps + } // loop over channels tPedHist->Fill(); cout << " We got a good run " << irun << endl; } // good run - } // mon_run_vec - } // loop over all runs - } // number of runs > 0 + } // mon_run_vec + } // loop over all runs + } // number of runs > 0 cout << "Exiting beginRun" << endl; for (int NbChan = 0; NbChan < 15; NbChan++) { if (hMean[NbChan]->GetEntries() > 0.) { // save only when filled! diff --git a/CondTools/Ecal/plugins/StoreESCondition.cc b/CondTools/Ecal/plugins/StoreESCondition.cc index 85ae02da22807..d7ec0b0bfb285 100644 --- a/CondTools/Ecal/plugins/StoreESCondition.cc +++ b/CondTools/Ecal/plugins/StoreESCondition.cc @@ -424,10 +424,10 @@ std::shared_ptr StoreESCondition::readESChannelStatusFromFile(c } // valid DetId // catch ( cms::Exception &e ) { } } // loop over z - } // loop over plane - } // loop over y - } // loop over x - } // loop over strips + } // loop over plane + } // loop over y + } // loop over x + } // loop over strips edm::LogInfo("StoreESCondition") << " Nb of strips " << Nbstrip << " Number of bad channels " << Nbstatus << "\n"; statusFile.close(); diff --git a/CondTools/Ecal/src/DOMHelperFunctions.cc b/CondTools/Ecal/src/DOMHelperFunctions.cc index 5a1d6f10bfe86..019661a191fc4 100644 --- a/CondTools/Ecal/src/DOMHelperFunctions.cc +++ b/CondTools/Ecal/src/DOMHelperFunctions.cc @@ -143,7 +143,7 @@ DOMNode* xuti::getChildNode(DOMNode* node, const std::string& nodename) { if (foundName == nodename) return childNode; } // if element - } // for child + } // for child return nullptr; } diff --git a/CondTools/Ecal/src/EcalChannelStatusHandler.cc b/CondTools/Ecal/src/EcalChannelStatusHandler.cc index 603c762b8c77b..145adaa598b87 100644 --- a/CondTools/Ecal/src/EcalChannelStatusHandler.cc +++ b/CondTools/Ecal/src/EcalChannelStatusHandler.cc @@ -2154,8 +2154,8 @@ void popcon::EcalChannelStatusHandler::getNewObjects() { } // cosmics analysis } // subruns - } // runs loop - } // we have the DQM info + } // runs loop + } // we have the DQM info delete econn; std::cout << "Ecal - > end of getNewObjects -----------\n"; diff --git a/CondTools/Ecal/src/EcalDAQHandler.cc b/CondTools/Ecal/src/EcalDAQHandler.cc index bd5ddf6f1d11f..36e1348556fb1 100644 --- a/CondTools/Ecal/src/EcalDAQHandler.cc +++ b/CondTools/Ecal/src/EcalDAQHandler.cc @@ -484,7 +484,7 @@ void popcon::EcalDAQHandler::getNewObjects() { << std::endl; } } // end loop over ieta - } // end loop over iphi + } // end loop over iphi // endcap for (int ix = 1; ix < 21; ix++) { @@ -504,9 +504,9 @@ void popcon::EcalDAQHandler::getNewObjects() { std::cout << "endcap side " << k << " x " << ix << " y " << iy << " status " << dbStatus << std::endl; } } // end loop over iy - } // end loop over ix - } // end loop over k (side) - } // check if there is already a payload + } // end loop over ix + } // end loop over k (side) + } // check if there is already a payload else { if (m_debug) std::cout << " No db found : set default values " << std::endl; @@ -524,8 +524,8 @@ void popcon::EcalDAQHandler::getNewObjects() { oldEBStatus[iphi - 1][ieta - 1][k] = dbStatus; daq_temp->setValue(ebid, dbStatus); } // valid Id - } // end loop over ieta - } // end loop over iphi + } // end loop over ieta + } // end loop over iphi // endcap for (int ix = 1; ix < 21; ix++) { for (int iy = 1; iy < 21; iy++) { @@ -535,10 +535,10 @@ void popcon::EcalDAQHandler::getNewObjects() { oldEEStatus[ix - 1][iy - 1][k] = dbStatus; daq_temp->setValue(eeid, dbStatus); } // valid Id - } // end loop over iy - } // end loop over ix - } // end loop over k (side) - } // no payload set default values + } // end loop over iy + } // end loop over ix + } // end loop over k (side) + } // no payload set default values // now read the actual status from the online DB @@ -691,8 +691,8 @@ void popcon::EcalDAQHandler::getNewObjects() { } } } // loop over all possible SC in a sector - } // not read out sector - } // not all FED are read out + } // not read out sector + } // not all FED are read out typedef std::map::const_iterator feConfIter; // EcalLogicID ecid_xt; @@ -869,7 +869,7 @@ void popcon::EcalDAQHandler::getNewObjects() { daq_pop->setValue(ebid, dbStatus); } } // end loop over ieta - } // end loop over iphi + } // end loop over iphi // endcap for (int ix = 1; ix < 21; ix++) { @@ -885,8 +885,8 @@ void popcon::EcalDAQHandler::getNewObjects() { daq_pop->setValue(eeid, dbStatus); } } // end loop over iy - } // end loop over ix - } // end loop over k (side) + } // end loop over ix + } // end loop over k (side) std::cout << "Generating popcon record for run " << irun << std::endl; @@ -904,7 +904,7 @@ void popcon::EcalDAQHandler::getNewObjects() { // hlt } // check on number of already transferred runs } // loop over runs - } // check on run number > 0 + } // check on run number > 0 // disconnect from DB delete econn; diff --git a/CondTools/Ecal/src/EcalDCSHandler.cc b/CondTools/Ecal/src/EcalDCSHandler.cc index a813fb9a4f8be..91291e507b0d7 100644 --- a/CondTools/Ecal/src/EcalDCSHandler.cc +++ b/CondTools/Ecal/src/EcalDCSHandler.cc @@ -302,11 +302,11 @@ bool popcon::EcalDCSHandler::insertHVDataSetToOffline(const std::mapsetValue((int)ebId, corr ); // cryst =""; - } // end loop over EB channels + } // end loop over EB channels getline(fWeek, line); // cmment before EE crystals std::cout << " comment line " << line << std::endl; for (int iChannel = 0; iChannel < kEEChannels; iChannel++) { diff --git a/CondTools/Ecal/src/EcalLaser_weekly_Linearization_Check.cc b/CondTools/Ecal/src/EcalLaser_weekly_Linearization_Check.cc index 02ad3b297bf91..3feacdde158be 100644 --- a/CondTools/Ecal/src/EcalLaser_weekly_Linearization_Check.cc +++ b/CondTools/Ecal/src/EcalLaser_weekly_Linearization_Check.cc @@ -158,7 +158,7 @@ void popcon::EcalLaser_weekly_Linearization_Check::getNewObjects() { std::cout << " shift1 file " << fDB << " " << shift1EB[ich] << " file " << fname << " " << shift[2] << "\n"; exit(-1); } - } // end loop over EB channels + } // end loop over EB channels getline(fWeek, line); // comment before EE crystals std::cout << " comment line " << line << std::endl; int chm12 = 0, chm6 = 0, chm1 = 0, chs12 = 0, chs6 = 0, chs1 = 0; diff --git a/CondTools/Ecal/src/EcalPedestalsHandler.cc b/CondTools/Ecal/src/EcalPedestalsHandler.cc index 6711278a5635a..8c5cf130ff074 100644 --- a/CondTools/Ecal/src/EcalPedestalsHandler.cc +++ b/CondTools/Ecal/src/EcalPedestalsHandler.cc @@ -450,12 +450,12 @@ void popcon::EcalPedestalsHandler::getNewObjectsP5() { ss << "Run=" << irun << "_WAS_BAD_" << std::endl; m_userTextLog = ss.str() + ";"; } // bad run : do not write in DB - } // SubRunNumber - } // loop over runs + } // SubRunNumber + } // loop over runs delete econn; delete peds; // this is the only one that popcon does not delete - } // runs to analyze ? + } // runs to analyze ? edm::LogInfo("Ecal - > end of getNewObjects -----------\n"); } @@ -708,8 +708,8 @@ void popcon::EcalPedestalsHandler::readPedestalFile() { item.rms_x12 = EBrms12[hieb]; ped->insert(std::make_pair(ebdetid.rawId(), item)); } // valid EBId - } // loop over phi - } // loop over eta + } // loop over phi + } // loop over eta // endcaps // std::ofstream fout; // fout.open("Pedestal.check"); @@ -729,9 +729,9 @@ void popcon::EcalPedestalsHandler::readPedestalFile() { item.rms_x12 = EErms12[hiee]; ped->insert(std::make_pair(eedetid.rawId(), item)); } // val EEId - } // loop over y - } // loop over x - } // loop over z + } // loop over y + } // loop over x + } // loop over z // fout.close(); unsigned int irun = m_firstRun; @@ -926,7 +926,7 @@ void popcon::EcalPedestalsHandler::readPedestalMC() { if (ring == 16) fout << "***** End caps ***** EE- EE+" << std::endl; } // loop over rings - } // loop over gains + } // loop over gains // read also the ring value from Crystal file @@ -984,8 +984,8 @@ void popcon::EcalPedestalsHandler::readPedestalMC() { edm::LogInfo(" Channel ") << hieb << " 12 " << item.rms_x12 << " 6 " << item.rms_x6 << " 1 " << item.rms_x1; ped->insert(std::make_pair(ebdetid.rawId(), item)); } // valid EBId - } // loop over phi - } // loop over eta + } // loop over phi + } // loop over eta // endcaps for (int iz = -1; iz < 2; iz = iz + 2) { // z : -1 and +1 @@ -1029,9 +1029,9 @@ void popcon::EcalPedestalsHandler::readPedestalMC() { } ped->insert(std::make_pair(eedetid.rawId(), item)); } // val EEId - } // loop over y - } // loop over x - } // loop over z + } // loop over y + } // loop over x + } // loop over z fout.close(); unsigned int irun = m_firstRun; @@ -1184,8 +1184,8 @@ void popcon::EcalPedestalsHandler::readPedestal2017() { item.rms_x12 = previous_ped.rms_x12; ped->insert(std::make_pair(ebdetid.rawId(), item)); } // valid EBId - } // loop over phi - } // loop over eta + } // loop over phi + } // loop over eta // endcaps // std::ofstream fout; // fout.open("Pedestal.check"); @@ -1229,9 +1229,9 @@ void popcon::EcalPedestalsHandler::readPedestal2017() { item.rms_x12 = previous_ped.rms_x12; ped->insert(std::make_pair(eedetid.rawId(), item)); } // val EEId - } // loop over y - } // loop over x - } // loop over z + } // loop over y + } // loop over x + } // loop over z // fout.close(); unsigned int irun = m_firstRun; @@ -1630,7 +1630,7 @@ void popcon::EcalPedestalsHandler::readPedestalTree() { } } } // new run - } // end loop over all entries + } // end loop over all entries // write also the last run fout << " last entry fill " << fill_num << " run " << runold << " nb of events " << RunEntry << " time " << run_time << " " << run_time_stablebeam << " " << time[0] << " run type " << run_type << std::endl; @@ -2033,7 +2033,7 @@ void popcon::EcalPedestalsHandler::readPedestalTimestamp() { } fxml.close(); } // found a new gain 1 6 file - } // check gain 1 and 6 results only for new runs + } // check gain 1 and 6 results only for new runs EcalPedestals* pedestal = new EcalPedestals(); EcalPedestals::Item item; diff --git a/CondTools/Ecal/src/EcalSRPHandler.cc b/CondTools/Ecal/src/EcalSRPHandler.cc index 1ea782057507e..5bd7cecf95cb9 100644 --- a/CondTools/Ecal/src/EcalSRPHandler.cc +++ b/CondTools/Ecal/src/EcalSRPHandler.cc @@ -391,7 +391,7 @@ void popcon::EcalSRPHandler::getNewObjects() { if (m_debug) fout << " weight size after DB " << sr->dccNormalizedWeights_.size() << std::endl; } // WEI_ID != 0 - } // weights got from FE + } // weights got from FE // check if we have found the weights if (sr->dccNormalizedWeights_.empty()) { // use the firmware default weights @@ -726,8 +726,8 @@ void popcon::EcalSRPHandler::getNewObjects() { m_i_version = myconfig_version; fe_conf_id_old = fe_conf_id; } // different tag or version or fe config - } // loop over runs - } // test on number of runs + } // loop over runs + } // test on number of runs // disconnect from DB delete econn; @@ -808,7 +808,7 @@ void popcon::EcalSRPHandler::importDccConfigFile(EcalSRSettings& sr, const std:: } } // loop over subchild } - } // loop over child + } // loop over child sr.srpLowInterestChannelZS_.push_back(L1ZS[0] * 0.035 / 4); // EB sr.srpLowInterestChannelZS_.push_back(L1ZS[1] * 0.060 / 4); // EE sr.srpHighInterestChannelZS_.push_back(L2ZS[0] * 0.035 / 4); // EB diff --git a/CondTools/Ecal/src/EcalTPGBadXTHandler.cc b/CondTools/Ecal/src/EcalTPGBadXTHandler.cc index ece34c6dfdb9e..c73fab0a87680 100644 --- a/CondTools/Ecal/src/EcalTPGBadXTHandler.cc +++ b/CondTools/Ecal/src/EcalTPGBadXTHandler.cc @@ -294,7 +294,7 @@ void popcon::EcalTPGBadXTHandler::getNewObjects() { } } //end for over kr (nr of runs) - } //end if + } //end if delete econn; diff --git a/CondTools/Ecal/src/EcalTPGCrystalStatusXMLTranslator.cc b/CondTools/Ecal/src/EcalTPGCrystalStatusXMLTranslator.cc index ba5e08e1db329..5d2c956da1944 100644 --- a/CondTools/Ecal/src/EcalTPGCrystalStatusXMLTranslator.cc +++ b/CondTools/Ecal/src/EcalTPGCrystalStatusXMLTranslator.cc @@ -69,7 +69,7 @@ std::string EcalTPGCrystalStatusXMLTranslator::dumpXML(const EcalCondHeader& hea WriteNodeWithValue(cellnode, TPGCrystalStatus_tag, record[id.rawId()].getStatusCode()); } } // iphi - } // ieta + } // ieta for (int ix = 0; ix < kEndcWedgesX; ix++) { for (int iy = 0; iy < kEndcWedgesY; iy++) { @@ -81,8 +81,8 @@ std::string EcalTPGCrystalStatusXMLTranslator::dumpXML(const EcalCondHeader& hea WriteNodeWithValue(cellnode, TPGCrystalStatus_tag, record[id.rawId()].getStatusCode()); } } // iy - } // ix - } // side + } // ix + } // side std::string dump = cms::xerces::toString(writer->writeToString(root)); doc->release(); diff --git a/CondTools/Ecal/src/EcalTPGFineGrainStripfromFile.cc b/CondTools/Ecal/src/EcalTPGFineGrainStripfromFile.cc index e11b752472534..ca156cb43c413 100644 --- a/CondTools/Ecal/src/EcalTPGFineGrainStripfromFile.cc +++ b/CondTools/Ecal/src/EcalTPGFineGrainStripfromFile.cc @@ -67,7 +67,7 @@ void popcon::EcalTPGFineGrainStripfromFile::getNewObjects() { fgrStripEE->setValue(stripId, item); if (istrip == 12239) getline(fLin, line); // 1 empty line between EB and EE - } // end loop over EB + EE strips + } // end loop over EB + EE strips fLin.close(); m_to_transfer.push_back(std::make_pair(fgrStripEE, fileIOV)); diff --git a/CondTools/Ecal/src/EcalTPGLinPed.cc b/CondTools/Ecal/src/EcalTPGLinPed.cc index cc78b12c4e9d3..7a508b17f21ce 100644 --- a/CondTools/Ecal/src/EcalTPGLinPed.cc +++ b/CondTools/Ecal/src/EcalTPGLinPed.cc @@ -72,7 +72,7 @@ void popcon::EcalTPGLinPed::getNewObjects() { linC->insert(std::make_pair(id, item)); peds->insert(std::make_pair(id, itemPed)); - } // end loop over EB channels + } // end loop over EB channels getline(fLin, line); // comment before EE crystals std::cout << " comment line " << line << std::endl; for (int iChannel = 0; iChannel < kEEChannels; iChannel++) { diff --git a/CondTools/Ecal/src/EcalTPGPedfromFile.cc b/CondTools/Ecal/src/EcalTPGPedfromFile.cc index 7f66c9cf3d650..3503c6ce9e8ae 100644 --- a/CondTools/Ecal/src/EcalTPGPedfromFile.cc +++ b/CondTools/Ecal/src/EcalTPGPedfromFile.cc @@ -73,7 +73,7 @@ void popcon::EcalTPGPedfromFile::getNewObjects() { linC->insert(std::make_pair(id, item)); peds->insert(std::make_pair(id, itemPed)); - } // end loop over EB channels + } // end loop over EB channels getline(fLin, line); // comment before EE crystals std::cout << " comment line " << line << std::endl; for (int iChannel = 0; iChannel < kEEChannels; iChannel++) { diff --git a/CondTools/Ecal/src/EcalTestDevDB.cc b/CondTools/Ecal/src/EcalTestDevDB.cc index 875621d0333dc..344e3d025511b 100644 --- a/CondTools/Ecal/src/EcalTestDevDB.cc +++ b/CondTools/Ecal/src/EcalTestDevDB.cc @@ -250,7 +250,7 @@ std::shared_ptr EcalTestDevDB::generateEcalIntercalibCo double r = (double)std::rand() / (double(RAND_MAX) + double(1)); ical->setValue(ebid.rawId(), 0.85 + r * 0.3); } // loop over phi - } // loop over eta + } // loop over eta return ical; } @@ -337,7 +337,7 @@ std::shared_ptr EcalTestDevDB::generateEcalGainRatios() { gratio->setValue(ebid.rawId(), gr); } // loop over phi - } // loop over eta + } // loop over eta return gratio; } diff --git a/CondTools/Hcal/test/makeHFPhase1PMTParamsPlots.cc b/CondTools/Hcal/test/makeHFPhase1PMTParamsPlots.cc index a0cf2a83835cb..5ac1bb6e64967 100644 --- a/CondTools/Hcal/test/makeHFPhase1PMTParamsPlots.cc +++ b/CondTools/Hcal/test/makeHFPhase1PMTParamsPlots.cc @@ -126,7 +126,7 @@ int main(int argc, char* argv[]) { return 1; } eos::portable_iarchive ar(is); - ar& cuts; + ar & cuts; } // Load the reference table of cuts @@ -139,7 +139,7 @@ int main(int argc, char* argv[]) { return 1; } eos::portable_iarchive ar(is); - ar& refcuts; + ar & refcuts; refptr = &refcuts; } diff --git a/CondTools/Hcal/test/write_HBHENegativeEFilter.cc b/CondTools/Hcal/test/write_HBHENegativeEFilter.cc index 469d8084c63a8..e9b2bcd139241 100644 --- a/CondTools/Hcal/test/write_HBHENegativeEFilter.cc +++ b/CondTools/Hcal/test/write_HBHENegativeEFilter.cc @@ -76,10 +76,10 @@ int main(int argc, char *argv[]) { std::ifstream is(outputfile, mode); if (usingTxt) { boost::archive::text_iarchive ar(is); - ar &f2; + ar & f2; } else { eos::portable_iarchive ar(is); - ar &f2; + ar & f2; } } diff --git a/CondTools/Hcal/test/write_HFPhase1PMTParams.cc b/CondTools/Hcal/test/write_HFPhase1PMTParams.cc index 054f550aeb564..549bfc7f2e5d3 100644 --- a/CondTools/Hcal/test/write_HFPhase1PMTParams.cc +++ b/CondTools/Hcal/test/write_HFPhase1PMTParams.cc @@ -97,10 +97,10 @@ int main(int argc, char *argv[]) { std::ifstream is(outputfile, mode); if (usingTxt) { boost::archive::text_iarchive ar(is); - ar &p2; + ar & p2; } else { eos::portable_iarchive ar(is); - ar &p2; + ar & p2; } } diff --git a/CondTools/JetMET/plugins/QGLikelihoodDBReader.cc b/CondTools/JetMET/plugins/QGLikelihoodDBReader.cc index aa27fc64b1906..8247a185a4bc4 100644 --- a/CondTools/JetMET/plugins/QGLikelihoodDBReader.cc +++ b/CondTools/JetMET/plugins/QGLikelihoodDBReader.cc @@ -13,12 +13,12 @@ class QGLikelihoodDBReader : public edm::one::EDAnalyzer<> { public: explicit QGLikelihoodDBReader(const edm::ParameterSet&); - ~QGLikelihoodDBReader() override{}; + ~QGLikelihoodDBReader() override {} private: - void beginJob() override{}; + void beginJob() override {} void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override{}; + void endJob() override {} std::string mPayloadName; edm::ESGetToken mPayloadToken; diff --git a/CondTools/JetMET/plugins/QGLikelihoodSystematicsDBReader.cc b/CondTools/JetMET/plugins/QGLikelihoodSystematicsDBReader.cc index 401234969ccf3..28468a75be829 100644 --- a/CondTools/JetMET/plugins/QGLikelihoodSystematicsDBReader.cc +++ b/CondTools/JetMET/plugins/QGLikelihoodSystematicsDBReader.cc @@ -13,12 +13,12 @@ class QGLikelihoodSystematicsDBReader : public edm::one::EDAnalyzer<> { public: explicit QGLikelihoodSystematicsDBReader(const edm::ParameterSet&); - ~QGLikelihoodSystematicsDBReader() override{}; + ~QGLikelihoodSystematicsDBReader() override {} private: - void beginJob() override{}; + void beginJob() override {} void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override{}; + void endJob() override {} std::string mPayloadName; edm::ESGetToken mPayloadToken; diff --git a/CondTools/RunInfo/interface/BTransitionAnalyzer.h b/CondTools/RunInfo/interface/BTransitionAnalyzer.h index d077bbcb646ab..401abd0954c14 100644 --- a/CondTools/RunInfo/interface/BTransitionAnalyzer.h +++ b/CondTools/RunInfo/interface/BTransitionAnalyzer.h @@ -28,9 +28,9 @@ namespace cond { // implicit copy constructor // implicit assignment operator // implicit destructor - void beginJob() final{}; - void beginRun(edm::Run const&, edm::EventSetup const&) final{}; - void analyze(edm::Event const&, edm::EventSetup const&) final{}; + void beginJob() final {} + void beginRun(edm::Run const&, edm::EventSetup const&) final {} + void analyze(edm::Event const&, edm::EventSetup const&) final {} void endRun(edm::Run const& run, edm::EventSetup const& eventSetup) final { edm::ESHandle runInfoHandle = eventSetup.getHandle(m_RunInfoToken); edm::ESHandle payloadHandle, payloadRefHandle; @@ -69,7 +69,7 @@ namespace cond { edm::LogError("BTransitionAnalyzer") << "PoolDBOutputService unavailable"; } } - void endJob() final{}; + void endJob() final {} virtual bool equalPayloads(edm::ESHandle const& payloadHandle, edm::ESHandle const& payloadRefHandle) = 0; private: diff --git a/CondTools/SiPixel/plugins/SiPixelBadFEDChannelSimulationSanityChecker.cc b/CondTools/SiPixel/plugins/SiPixelBadFEDChannelSimulationSanityChecker.cc index 6aeffaf59df7c..97c28bd3915e6 100644 --- a/CondTools/SiPixel/plugins/SiPixelBadFEDChannelSimulationSanityChecker.cc +++ b/CondTools/SiPixel/plugins/SiPixelBadFEDChannelSimulationSanityChecker.cc @@ -96,8 +96,8 @@ void SiPixelBadFEDChannelSimulationSanityChecker::analyze(const edm::Event& e, c // } } // if prob!=0 - } // loop on the scenarios for that PU bin - } // loop on PU bins + } // loop on the scenarios for that PU bin + } // loop on PU bins std::vector notFound; std::copy_if(allScenariosInProb.begin(), @@ -122,9 +122,9 @@ void SiPixelBadFEDChannelSimulationSanityChecker::analyze(const edm::Event& e, c edm::LogVerbatim("SiPixelBadFEDChannelSimulationSanityChecker") << " - PU bin " << PUbin << " with probability: " << pair.second << std::endl; } // if the scenario matches - } // loop on scenarios - } // loop on PU - } // if printdebug + } // loop on scenarios + } // loop on PU + } // if printdebug edm::LogVerbatim("SiPixelBadFEDChannelSimulationSanityChecker") << "==============================================" << std::endl; } // loop on scenarios not found diff --git a/CondTools/SiPixel/plugins/SiPixelBadModuleByHandBuilder.cc b/CondTools/SiPixel/plugins/SiPixelBadModuleByHandBuilder.cc index 679a0a1d0897f..bd9adbe9cc0a3 100644 --- a/CondTools/SiPixel/plugins/SiPixelBadModuleByHandBuilder.cc +++ b/CondTools/SiPixel/plugins/SiPixelBadModuleByHandBuilder.cc @@ -144,15 +144,15 @@ std::unique_ptr SiPixelBadModuleByHandBuilder::getNewObject() { if (it.second == 65535) { // "whole" BadModule.errorType = 0; BadModule.BadRocs = 65535; - } //corresponds to all rocs being bad + } //corresponds to all rocs being bad else if (it.second == 255) { // "tbmA" BadModule.errorType = 1; BadModule.BadRocs = 255; - } //corresponds to Rocs 0-7 being bad + } //corresponds to Rocs 0-7 being bad else if (it.second == 65280) { // "tbmB" BadModule.errorType = 2; BadModule.BadRocs = 65280; - } //corresponds to Rocs 8-15 being bad + } //corresponds to Rocs 8-15 being bad else { // "none" BadModule.errorType = 3; BadModule.BadRocs = it.second; diff --git a/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc b/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc index fffe50128f500..565084b4f088b 100644 --- a/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc +++ b/CondTools/SiPixel/plugins/SiPixelGainCalibScaler.cc @@ -307,7 +307,7 @@ void SiPixelGainCalibScaler::computeAndStorePalyoads(const edm::EventSetup& iSet } } } // loop on rows - } // loop on columns + } // loop on columns typename PayloadType::Range outrange(theSiPixelGainCalibration.begin(), theSiPixelGainCalibration.end()); if (!SiPixelGainCalibration_.put(d, outrange, ncols)) diff --git a/CondTools/SiPixel/plugins/SiPixelLorentzAngleDBLoader.cc b/CondTools/SiPixel/plugins/SiPixelLorentzAngleDBLoader.cc index 912ae6497e3d5..99e77c3ecca37 100644 --- a/CondTools/SiPixel/plugins/SiPixelLorentzAngleDBLoader.cc +++ b/CondTools/SiPixel/plugins/SiPixelLorentzAngleDBLoader.cc @@ -223,8 +223,8 @@ void SiPixelLorentzAngleDBLoader::analyze(const edm::Event& e, const edm::EventS } else LogError("SiPixelLorentzAngleDBLoader") << " ERROR!: detid already exists"; } // end loop on FPixParameters_ - } // condition to read from config - } // end on being barrel or endcap + } // condition to read from config + } // end on being barrel or endcap } } diff --git a/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc b/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc index 3203328cd36c5..46286e129df8b 100644 --- a/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc +++ b/CondTools/SiStrip/plugins/SiStripApvGainInspector.cc @@ -421,8 +421,8 @@ void SiStripApvGainInspector::checkBookAPVColls(const edm::EventSetup& es) { Index++; NStripAPVs++; } // loop on APVs - } // if is Strips - } // loop on dets + } // if is Strips + } // loop on dets for (unsigned int i = 0; i < Det.size(); i++) { //Make two loop such that the Pixel information is added at the end --> make transition simpler @@ -469,10 +469,10 @@ void SiStripApvGainInspector::checkBookAPVColls(const edm::EventSetup& es) { NPixelDets++; } // loop on ROC cols - } // loop on ROC rows - } // if Pixel - } // loop on Dets - } //if (!bareTkGeomPtr_) ... + } // loop on ROC rows + } // if Pixel + } // loop on Dets + } //if (!bareTkGeomPtr_) ... bareTkGeomPtr_ = newBareTkGeomPtr; } diff --git a/CondTools/SiStrip/plugins/SiStripApvGainRescaler.cc b/CondTools/SiStrip/plugins/SiStripApvGainRescaler.cc index d4815ebede91f..de98120303ae6 100644 --- a/CondTools/SiStrip/plugins/SiStripApvGainRescaler.cc +++ b/CondTools/SiStrip/plugins/SiStripApvGainRescaler.cc @@ -116,7 +116,7 @@ void SiStripApvGainRescaler::analyze(const edm::Event& iEvent, const edm::EventS } } // loop over APVs - } // loop over DetIds + } // loop over DetIds std::unique_ptr theAPVGains = this->getNewObject(theMap); diff --git a/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc b/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc index cdf1042ad00b8..ab342956564cb 100644 --- a/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc +++ b/CondTools/SiStrip/plugins/SiStripCablingTrackerMap.cc @@ -18,7 +18,7 @@ class SiStripCablingTrackerMap : public edm::one::EDAnalyzergetNewObject(theMap); diff --git a/CondTools/SiStrip/plugins/SiStripCondVisualizer.cc b/CondTools/SiStrip/plugins/SiStripCondVisualizer.cc index 7de5a1096a47b..c849f141bddc4 100644 --- a/CondTools/SiStrip/plugins/SiStripCondVisualizer.cc +++ b/CondTools/SiStrip/plugins/SiStripCondVisualizer.cc @@ -99,7 +99,7 @@ class SiStripCondVisualizer : public edm::one::EDAnalyzer setTopoInfo(uint32_t detId, const TrackerTopology* tTopo); @@ -208,7 +208,7 @@ void SiStripCondVisualizer::fillTheQualityMap(const SiStripQuality* obj, HistoMa theMap[detid]->SetBinContent(istrip_, quant_); } } // loop on the strips - } // loop on the active detids + } // loop on the active detids return; } @@ -248,7 +248,7 @@ void SiStripCondVisualizer::fillTheHistoMap(const Payload* obj, HistoMap& theMap theMap[detid]->SetBinContent(istrip_, quant_); } } // loop on the strips - } // loop on the active detids + } // loop on the active detids } // ------------ method called for each event ------------ @@ -301,7 +301,7 @@ void SiStripCondVisualizer::beginRun(const edm::Run& iRun, edm::EventSetup const } } } // loop on the bitset of plotted conditions - } // loop on modules + } // loop on modules if (doNoise_) { LOGINFO("SiStripCondVisualizer") << "@SUB=SiStripCondVisualizer::beginRun() \n Before booking NoisMap_.size(): " diff --git a/CondTools/SiStrip/plugins/SiStripDB2Tree.cc b/CondTools/SiStrip/plugins/SiStripDB2Tree.cc index 78e4685cbe0ad..d397f74bedecb 100644 --- a/CondTools/SiStrip/plugins/SiStripDB2Tree.cc +++ b/CondTools/SiStrip/plugins/SiStripDB2Tree.cc @@ -81,7 +81,7 @@ class SiStripDB2Tree : public edm::one::EDAnalyzer diff --git a/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.cc b/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.cc index 638aab28c71a5..9b21026b20ffa 100644 --- a/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.cc +++ b/CondTools/SiStrip/plugins/SiStripFedCablingBuilder.cc @@ -29,7 +29,7 @@ class SiStripFedCablingBuilder : public edm::one::EDAnalyzer ~SiStripFedCablingReader() override = default; void beginRun(const edm::Run&, const edm::EventSetup&) override; - void endRun(const edm::Run&, const edm::EventSetup&) override{}; - void analyze(const edm::Event&, const edm::EventSetup&) override{}; + void endRun(const edm::Run&, const edm::EventSetup&) override {} + void analyze(const edm::Event&, const edm::EventSetup&) override {} private: bool printFecCabling_; diff --git a/CondTools/SiStrip/plugins/SiStripGainPayloadCopyAndExclude.cc b/CondTools/SiStrip/plugins/SiStripGainPayloadCopyAndExclude.cc index bac00aa99d3b0..c5b497bc2ffe7 100644 --- a/CondTools/SiStrip/plugins/SiStripGainPayloadCopyAndExclude.cc +++ b/CondTools/SiStrip/plugins/SiStripGainPayloadCopyAndExclude.cc @@ -135,7 +135,7 @@ void SiStripGainPayloadCopyAndExclude::analyze(const edm::Event& iEvent, const e } } // loop over APVs - } // loop over DetIds + } // loop over DetIds std::unique_ptr theAPVGains = this->getNewObject(theMap); diff --git a/CondTools/SiStrip/plugins/SiStripMiscalibrateHelper.cc b/CondTools/SiStrip/plugins/SiStripMiscalibrateHelper.cc index f5dbdb25e8b6c..9d1f7ff21ae50 100644 --- a/CondTools/SiStrip/plugins/SiStripMiscalibrateHelper.cc +++ b/CondTools/SiStrip/plugins/SiStripMiscalibrateHelper.cc @@ -101,8 +101,8 @@ std::pair SiStripMiscalibrate::getTruncatedRange(const TrackerMap* info_per_detid[key] = mod->value; } } // loop on modules - } // loop on ring - } // loop on layers + } // loop on ring + } // loop on layers auto range = SiStripPI::getTheRange(info_per_detid, 2); return range; diff --git a/CondTools/SiStrip/plugins/SiStripNoisesFromDBMiscalibrator.cc b/CondTools/SiStrip/plugins/SiStripNoisesFromDBMiscalibrator.cc index a6cb0d4da738f..d089926fb2c5d 100644 --- a/CondTools/SiStrip/plugins/SiStripNoisesFromDBMiscalibrator.cc +++ b/CondTools/SiStrip/plugins/SiStripNoisesFromDBMiscalibrator.cc @@ -212,7 +212,7 @@ void SiStripNoisesFromDBMiscalibrator::analyze(const edm::Event& iEvent, const e nStrips += 1; } // loop over APVs - } // loop over DetIds + } // loop over DetIds SiStripNoises theSiStripNoises{}; if (!m_fillDefaults) { diff --git a/OnlineDB/CSCCondDB/src/CSCAFEBConnectAnalysis.cc b/OnlineDB/CSCCondDB/src/CSCAFEBConnectAnalysis.cc index 72c8b15ad7916..f85e7d0a4018b 100644 --- a/OnlineDB/CSCCondDB/src/CSCAFEBConnectAnalysis.cc +++ b/OnlineDB/CSCCondDB/src/CSCAFEBConnectAnalysis.cc @@ -175,8 +175,8 @@ void CSCAFEBConnectAnalysis::analyze(const CSCWireDigiCollection& wirecltn) { wireplane[iwire - 1] = 1; } // end if wireplane[iwire-1]==0 - } // end if iwire<=csctoafeb.getMaxWire(id.station(),id.ring() - } // end of for digis in layer + } // end if iwire<=csctoafeb.getMaxWire(id.station(),id.ring() + } // end of for digis in layer if (m_wire_ev.count(idlayer) == 0) m_wire_ev[idlayer] = wireplane; @@ -217,7 +217,7 @@ void CSCAFEBConnectAnalysis::analyze(const CSCWireDigiCollection& wirecltn) { vvfIt->second[i][3] = vvfIt->second[i][3] + (*viIt).second[i]; } } // end of adding hits to the maps - } // end of if(wirecltn.begin() != wirecltn.end()) + } // end of if(wirecltn.begin() != wirecltn.end()) } // end of void CSCAFEBConnectAnalysis void CSCAFEBConnectAnalysis::done() { diff --git a/OnlineDB/CSCCondDB/src/CSCAFEBThrAnalysis.cc b/OnlineDB/CSCCondDB/src/CSCAFEBThrAnalysis.cc index 0ea3e9adb191e..54daaacc9d489 100644 --- a/OnlineDB/CSCCondDB/src/CSCAFEBThrAnalysis.cc +++ b/OnlineDB/CSCCondDB/src/CSCAFEBThrAnalysis.cc @@ -183,8 +183,8 @@ void CSCAFEBThrAnalysis::analyze(const CSCWireDigiCollection& wirecltn) { hf2ForId(mh_FirstTime, 100, idchamber, x, y, 1.0); } // end if wireplane[iwire-1]==0 - } // end if iwire<=csctoafeb.getMaxWire(id.station(),id.ring() - } // end of for digis in layer + } // end if iwire<=csctoafeb.getMaxWire(id.station(),id.ring() + } // end of for digis in layer /// Store time bin of the first hit into map @@ -213,7 +213,7 @@ void CSCAFEBThrAnalysis::analyze(const CSCWireDigiCollection& wirecltn) { if ((*intIt).second[i] > 0) wiredacIt->second[i][indDac] = wiredacIt->second[i][indDac] + 1; } // end of adding hits to the map of wire/DAC - } // end of if wire collection not empty + } // end of if wire collection not empty indDac++; if (dac == (float)EndDac) indDac = 0; @@ -351,7 +351,7 @@ void CSCAFEBThrAnalysis::done() { inputy.clear(); } // end for(int iwire=0) - } // end of iteration thru m_wire_dac map + } // end of iteration thru m_wire_dac map std::cout << "Size of map for DB " << m_res_for_db.size() << std::endl; diff --git a/OnlineDB/EcalCondDB/interface/DataReducer.h b/OnlineDB/EcalCondDB/interface/DataReducer.h index a52c763a5e0b7..23840241b2ab1 100644 --- a/OnlineDB/EcalCondDB/interface/DataReducer.h +++ b/OnlineDB/EcalCondDB/interface/DataReducer.h @@ -42,7 +42,7 @@ class DataReducer { typedef typename std::list >::iterator iterator; DataReducer() { m_printout = false; }; - ~DataReducer(){}; + ~DataReducer() {} static const int TIMELIMIT = 60; // the time limit in seconds to consider two events in the same IOV creation diff --git a/OnlineDB/EcalCondDB/interface/ITimingDat.h b/OnlineDB/EcalCondDB/interface/ITimingDat.h index 3c23e05d7aa97..859cd14cbdb2f 100644 --- a/OnlineDB/EcalCondDB/interface/ITimingDat.h +++ b/OnlineDB/EcalCondDB/interface/ITimingDat.h @@ -31,7 +31,7 @@ class ITimingDat : public IDataItem { m_taskStatus = false; }; - ~ITimingDat() override{}; + ~ITimingDat() override {} // User data methods inline std::string getTable() override { return m_table_name; } diff --git a/OnlineDB/EcalCondDB/interface/LMFCorrCoefDatComponent.h b/OnlineDB/EcalCondDB/interface/LMFCorrCoefDatComponent.h index 5116dbbec92ca..63befbae65942 100644 --- a/OnlineDB/EcalCondDB/interface/LMFCorrCoefDatComponent.h +++ b/OnlineDB/EcalCondDB/interface/LMFCorrCoefDatComponent.h @@ -25,7 +25,7 @@ class LMFCorrCoefDatComponent : public LMFDat { LMFCorrCoefDatComponent(); LMFCorrCoefDatComponent(EcalDBConnection *c); LMFCorrCoefDatComponent(oracle::occi::Environment *env, oracle::occi::Connection *conn); - ~LMFCorrCoefDatComponent() override{}; + ~LMFCorrCoefDatComponent() override {} LMFCorrCoefDatComponent &setLMFLmrSubIOV(const LMFLmrSubIOV &iov); LMFCorrCoefDatComponent &setP123(const EcalLogicID &id, float p1, float p2, float p3); diff --git a/OnlineDB/EcalCondDB/src/ODWeightsDat.cc b/OnlineDB/EcalCondDB/src/ODWeightsDat.cc index 38f1a67d7dfe9..d5f5e89ceee1f 100644 --- a/OnlineDB/EcalCondDB/src/ODWeightsDat.cc +++ b/OnlineDB/EcalCondDB/src/ODWeightsDat.cc @@ -134,7 +134,7 @@ void ODWeightsDat::fetchData(ODWeightsDat* p) noexcept(false) { } std::vector dccwei(m_wei, m_wei + 6); dccw.push_back(dccwei); // vector vector - } // loop on all rows in the table + } // loop on all rows in the table std::cout << " table " << getTable() << " total nb of rows " << row << std::endl; } catch (SQLException& e) { diff --git a/OnlineDB/SiStripESSources/src/SiStripCondObjBuilderFromDb.cc b/OnlineDB/SiStripESSources/src/SiStripCondObjBuilderFromDb.cc index 51e6525ef5b3e..0158fdf70f20b 100644 --- a/OnlineDB/SiStripESSources/src/SiStripCondObjBuilderFromDb.cc +++ b/OnlineDB/SiStripESSources/src/SiStripCondObjBuilderFromDb.cc @@ -851,7 +851,7 @@ void SiStripCondObjBuilderFromDb::buildFECRelatedObjects(SiStripConfigDb* const } apvnr += 2; } //connections - // compact Latency Object + // compact Latency Object } //detids latency_->compress(); diff --git a/OnlineDB/SiStripESSources/src/SiStripFedCablingBuilderFromDb.cc b/OnlineDB/SiStripESSources/src/SiStripFedCablingBuilderFromDb.cc index 497b77efc2a93..3678866029bda 100644 --- a/OnlineDB/SiStripESSources/src/SiStripFedCablingBuilderFromDb.cc +++ b/OnlineDB/SiStripESSources/src/SiStripFedCablingBuilderFromDb.cc @@ -919,13 +919,13 @@ void SiStripFedCablingBuilderFromDb::assignDcuAndDetIds(SiStripFecCabling& fec_c in.erase(iter); } // Set for DCU in static table - } // Check for null DetId + } // Check for null DetId } // Module loop - } // CCU loop - } // FEC ring loop - } // FEC loop - } // FEC crate loop + } // CCU loop + } // FEC ring loop + } // FEC loop + } // FEC crate loop std::stringstream sss; sss << "[SiStripFedCablingBuilderFromDb::" << __func__ << "]" << std::endl @@ -1027,10 +1027,10 @@ void SiStripFedCablingBuilderFromDb::assignDcuAndDetIds(SiStripFecCabling& fec_c } } // Module loop - } // CCU loop - } // FEC ring loop - } // FEC loop - } // FEC crate loop + } // CCU loop + } // FEC ring loop + } // FEC loop + } // FEC crate loop LogTrace(mlCabling_) << "[SiStripFedCablingBuilderFromDb::" << __func__ << "]" << " Finished assigning \"random\" DetIds to modules with DCU ids not found in static table..."; diff --git a/OnlineDB/SiStripO2O/plugins/SiStripPopConConfigDbObjHandler.h b/OnlineDB/SiStripO2O/plugins/SiStripPopConConfigDbObjHandler.h index c4c6d0025f210..de880f12aab68 100644 --- a/OnlineDB/SiStripO2O/plugins/SiStripPopConConfigDbObjHandler.h +++ b/OnlineDB/SiStripO2O/plugins/SiStripPopConConfigDbObjHandler.h @@ -30,11 +30,11 @@ namespace popcon { SiStripPopConConfigDbObjHandler(const edm::ParameterSet& pset) : m_name(pset.getUntrackedParameter("name", "SiStripPopPopConConfigDbObjHandler")), m_since(pset.getUntrackedParameter("since", 5)), - m_debugMode(pset.getUntrackedParameter("debug", false)){}; + m_debugMode(pset.getUntrackedParameter("debug", false)) {} //--------------------------------------- // - ~SiStripPopConConfigDbObjHandler() override{}; + ~SiStripPopConConfigDbObjHandler() override {} //--------------------------------------- // diff --git a/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestGain.h b/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestGain.h index a26aa17cf0d2e..2802d6e0ab9ba 100644 --- a/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestGain.h +++ b/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestGain.h @@ -40,11 +40,11 @@ namespace popcon { SiStripPopConHandlerUnitTestGain(const edm::ParameterSet& pset) : m_name(pset.getUntrackedParameter("name", "SiStripPopPopConConfigDbObjHandler")), m_since(pset.getUntrackedParameter("since", 5)), - m_debugMode(pset.getUntrackedParameter("debug", true)){}; + m_debugMode(pset.getUntrackedParameter("debug", true)) {} //--------------------------------------- // - ~SiStripPopConHandlerUnitTestGain() override{}; + ~SiStripPopConHandlerUnitTestGain() override {} //--------------------------------------- // diff --git a/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestNoise.h b/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestNoise.h index cc5a3e615da18..906410cdc2dfb 100644 --- a/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestNoise.h +++ b/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestNoise.h @@ -40,11 +40,11 @@ namespace popcon { SiStripPopConHandlerUnitTestNoise(const edm::ParameterSet& pset) : m_name(pset.getUntrackedParameter("name", "SiStripPopPopConConfigDbObjHandler")), m_since(pset.getUntrackedParameter("since", 5)), - m_debugMode(pset.getUntrackedParameter("debug", false)){}; + m_debugMode(pset.getUntrackedParameter("debug", false)) {} //--------------------------------------- // - ~SiStripPopConHandlerUnitTestNoise() override{}; + ~SiStripPopConHandlerUnitTestNoise() override {} //--------------------------------------- //