From dfd22836a3c269332bc222f9f911c3e0ac2d0dd7 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 5 Sep 2024 16:03:33 +0200 Subject: [PATCH] [ALCA] Changes suggested by new llvm18 clang-format --- .../interface/TrackerSectorStruct.h | 2 +- .../APEEstimation/plugins/ApeEstimator.cc | 4 +- .../interface/CocoaMaterialElementary.h | 2 +- .../interface/CocoaSolidShape.h | 2 +- .../interface/CocoaSolidShapeBox.h | 2 +- .../interface/CocoaSolidShapeTubs.h | 2 +- Alignment/CocoaDaq/interface/CocoaDaqReader.h | 4 +- .../CocoaDaq/interface/CocoaDaqRootEvent.h | 2 +- Alignment/CocoaFit/interface/Fit.h | 4 +- .../CocoaFit/interface/FittedEntriesManager.h | 4 +- .../CocoaFit/interface/FittedEntriesSet.h | 2 +- Alignment/CocoaFit/interface/FittedEntry.h | 4 +- Alignment/CocoaFit/interface/HistoDef.h | 4 +- Alignment/CocoaFit/interface/NtupleManager.h | 4 +- Alignment/CocoaModel/interface/ALILine.h | 4 +- .../CocoaModel/interface/ALIRmDataFromFile.h | 2 +- .../CocoaModel/interface/DeviationSensor2D.h | 4 +- .../interface/DeviationsFromFileSensor2D.h | 2 +- Alignment/CocoaModel/interface/EntryAngle.h | 2 +- .../interface/EntryAngleAffAngles.h | 2 +- Alignment/CocoaModel/interface/EntryLength.h | 2 +- .../interface/EntryLengthAffCentre.h | 2 +- Alignment/CocoaModel/interface/EntryMgr.h | 2 +- Alignment/CocoaModel/interface/EntryNoDim.h | 2 +- .../interface/ErrorCorrelationMgr.h | 2 +- Alignment/CocoaModel/interface/LightRay.h | 2 +- Alignment/CocoaModel/interface/Measurement.h | 8 ++-- .../CocoaModel/interface/MeasurementCOPS.h | 4 +- .../interface/MeasurementDiffEntry.h | 6 +-- .../interface/MeasurementDistancemeter.h | 6 +-- .../interface/MeasurementDistancemeter3dim.h | 6 +-- .../interface/MeasurementSensor2D.h | 6 +-- .../interface/MeasurementTiltmeter.h | 6 +-- Alignment/CocoaModel/interface/Model.h | 2 +- Alignment/CocoaModel/interface/OptOCOPS.h | 6 +-- .../CocoaModel/interface/OptOCameraDetector.h | 6 +-- .../CocoaModel/interface/OptOCubeSplitter.h | 6 +-- .../CocoaModel/interface/OptODistancemeter.h | 6 +-- .../interface/OptODistancemeter3dim.h | 6 +-- Alignment/CocoaModel/interface/OptOLaser.h | 6 +-- Alignment/CocoaModel/interface/OptOLens.h | 4 +- Alignment/CocoaModel/interface/OptOMirror.h | 6 +-- .../interface/OptOModifiedRhomboidPrism.h | 6 +-- .../CocoaModel/interface/OptOOpticalSquare.h | 6 +-- Alignment/CocoaModel/interface/OptOPinhole.h | 6 +-- .../CocoaModel/interface/OptOPlateSplitter.h | 6 +-- .../CocoaModel/interface/OptORisleyPrism.h | 6 +-- Alignment/CocoaModel/interface/OptOScreen.h | 6 +-- Alignment/CocoaModel/interface/OptOSensor2D.h | 6 +-- Alignment/CocoaModel/interface/OptOSource.h | 4 +- .../CocoaModel/interface/OptOTiltmeter.h | 6 +-- .../CocoaModel/interface/OptOUserDefined.h | 6 +-- Alignment/CocoaModel/interface/OptOXLaser.h | 6 +-- .../CocoaModel/interface/OpticalObject.h | 6 +-- .../CocoaModel/interface/OpticalObjectMgr.h | 4 +- Alignment/CocoaModel/interface/ParameterMgr.h | 2 +- .../CocoaToDDL/interface/CocoaToDDLMgr.h | 4 +- .../CocoaUtilities/interface/ALIFileIn.h | 2 +- .../CocoaUtilities/interface/ALIFileOut.h | 6 +-- Alignment/CocoaUtilities/interface/ALIUtils.h | 4 +- .../interface/GlobalOptionMgr.h | 4 +- .../CommonAlignment/interface/Alignable.h | 2 +- .../interface/AlignableComposite.h | 2 +- .../CommonAlignment/interface/AlignableMap.h | 4 +- .../interface/AlignmentLevel.h | 2 +- .../interface/AlignableDataIO.h | 4 +- .../interface/AlignmentAlgorithmBase.h | 12 ++--- .../interface/AlignmentParameterBuilder.h | 2 +- .../interface/AlignmentParametersIO.h | 2 +- .../interface/IntegratedCalibrationBase.h | 10 ++-- .../interface/TkModuleGroupSelector.h | 2 +- .../plugins/ApeSettingAlgorithm.cc | 2 +- .../plugins/AlignmentMonitorMuonResiduals.cc | 8 ++-- .../AlignmentMonitorMuonSystemMap1D.cc | 4 +- .../AlignmentMonitorMuonVsCurvature.cc | 6 +-- .../AlignmentMonitorSegmentDifferences.cc | 28 +++++------ .../plugins/AlignmentMonitorTemplate.cc | 8 ++-- .../plugins/AlignmentStats.cc | 2 +- .../BowedSurfaceAlignmentParameters.h | 2 +- .../CompositeAlignmentDerivativesExtractor.h | 2 +- .../interface/RigidBodyAlignmentParameters.h | 2 +- .../RigidBodyAlignmentParameters4D.h | 8 ++-- .../TwoBowedSurfacesAlignmentParameters.h | 2 +- .../AlignmentMuonHIPTrajectorySelector.cc | 8 ++-- .../src/AlignmentCSCBeamHaloSelector.cc | 2 +- .../src/AlignmentCSCOverlapSelector.cc | 2 +- .../src/AlignmentCSCTrackSelector.cc | 2 +- .../src/AlignmentTrackSelector.cc | 2 +- ...cksFromVertexCompositeCandidateSelector.cc | 4 +- .../src/AlignmentTracksFromVertexSelector.cc | 4 +- .../test/GlobalPositionRcdWrite.cpp | 2 +- Alignment/Geners/interface/AbsArchive.hh | 2 +- Alignment/Geners/interface/AbsRecord.hh | 2 +- .../interface/HIPAlignmentAlgorithm.h | 2 +- .../interface/HIPUserVariables.h | 2 +- .../src/HIPAlignmentAlgorithm.cc | 4 +- .../plugins/LaserAlignmentEventFilter.cc | 2 +- .../LaserAlignment/plugins/RawDataConverter.h | 2 +- .../src/LaserBeamsBarrel.cc | 4 +- .../src/LaserBeamsTEC1.cc | 6 +-- .../src/LaserBeamsTEC2.cc | 6 +-- .../plugins/MillePedeDQMModule.cc | 4 +- .../src/PedeReader.cc | 2 +- .../src/PedeSteerer.cc | 10 ++-- .../interface/MuonScenarioBuilder.h | 2 +- .../plugins/MuonGeometryArrange.cc | 12 ++--- .../plugins/MuonGeometryDBConverter.cc | 4 +- .../src/MuonAlignmentInputXML.cc | 28 +++++------ .../src/MuonAlignmentOutputXML.cc | 6 +-- .../interface/CSCPairConstraint.h | 4 +- .../interface/MuonResidualsTwoBin.h | 2 +- .../plugins/CSCAlignmentCorrections.h | 4 +- .../plugins/CSCChamberFitter.h | 2 +- .../plugins/CSCOverlapsTrackPreparation.cc | 4 +- .../plugins/CSCPairResidualsConstraint.cc | 2 +- .../plugins/CSCPairResidualsConstraint.h | 4 +- .../plugins/MuonAlignmentFromReference.cc | 14 +++--- .../OfflineValidation/bin/jetHtPlotter.cc | 34 +++++++------- .../interface/TrackerValidationVariables.h | 2 +- .../OfflineValidation/interface/pvTree.h | 8 ++-- .../OfflineValidation/macros/FitPVResiduals.C | 4 +- .../plugins/EopElecTreeWriter.cc | 2 +- .../plugins/JetHTAnalyzer.cc | 2 +- .../plugins/MuonAlignmentAnalyzer.cc | 2 +- .../plugins/PixelBaryCentreAnalyzer.cc | 4 +- .../plugins/PrimaryVertexValidation.cc | 6 +-- .../plugins/PrimaryVertexValidation.h | 2 +- .../plugins/SplitVertexResolution.cc | 2 +- .../plugins/TrackerOfflineValidation.cc | 2 +- .../TrackerOfflineValidationSummary.cc | 2 +- .../plugins/ValidationMisalignedTracker.cc | 4 +- .../src/GeometryComparisonPlotter.cc | 4 +- .../src/TrackerValidationVariables.cc | 3 +- .../SurveyAnalysis/interface/SurveyPxbDicer.h | 2 +- .../interface/SurveyPxbImageReader.h | 2 +- .../plugins/SurveyDataConverter.h | 2 +- .../interface/AlignableTracker.h | 2 +- .../interface/TrackerNameSpace.h | 2 +- .../interface/TrackerScenarioBuilder.h | 2 +- .../plugins/AlignmentPrescaler.cc | 2 +- .../plugins/TkAlCaOverlapTagger.cc | 4 +- .../src/AlignableTrackerBuilder.cc | 4 +- .../test/TrackerGeometryAnalyzer.h | 6 +-- .../MiscalibReaderFromXMLEcalBarrel.h | 2 +- .../MiscalibReaderFromXMLEcalEndcap.h | 2 +- .../interface/MiscalibReaderFromXMLHcal.h | 2 +- .../plugins/CastorHardcodeCalibrations.cc | 2 +- .../plugins/CastorTextCalibrations.cc | 2 +- .../CastorCalib/src/CastorLedAnalysis.cc | 2 +- .../src/TEcnaHistos.cc | 38 +++++++-------- .../src/TEcnaParHistos.cc | 4 +- .../src/TEcnaRun.cc | 4 +- .../src/EcnaAnalyzer.cc | 46 +++++++++---------- .../EcalLaserAnalyzer/interface/TFParams.h | 2 +- .../src/WatcherStreamFileReader.cc | 2 +- .../EcalPedestalOffsets/src/EcalPedOffset.cc | 2 +- .../EcalPedestalOffsets/src/TPedValues.cc | 8 ++-- .../EcalPedestalOffsets/src/testChannel.cc | 2 +- .../interface/EcalDccWeightBuilder.h | 2 +- .../src/EcalTrivialConditionRetriever.cc | 6 +-- .../HcalAlgos/interface/HcalTimeSlew.h | 2 +- .../HcalAlgos/src/HcalLedAnalysis.cc | 2 +- .../HcalPlugins/src/HcalTextCalibrations.h | 2 +- .../interface/HcalCalibrationWidths.h | 2 +- .../interface/PixelFECConfigInterface.h | 4 +- .../SiPixelObjects/interface/PixelFEDCard.h | 2 +- .../src/PixelCalibConfiguration.cc | 2 +- .../SiPixelObjects/src/PixelFEDCard.cc | 2 +- .../SiPixelObjects/src/PixelFEDConfig.cc | 2 +- .../src/PixelNameTranslation.cc | 2 +- .../SiPixelObjects/src/PixelPortCardConfig.cc | 6 +-- .../SiPixelObjects/src/PixelTrimAllPixels.cc | 2 +- .../SiStripObjects/interface/SiStripDelay.h | 4 +- .../SiStripObjects/interface/SiStripDetInfo.h | 4 +- CalibMuon/CSCCalibration/src/CSCConditions.cc | 8 ++-- .../test/old_indexers/CSCIndexerOldPostls1.h | 4 +- .../test/old_indexers/CSCIndexerOldStartup.h | 4 +- CalibMuon/DTCalibration/interface/DTTMax.h | 2 +- .../plugins/DTGeometryParserFromDDD.cc | 6 +-- .../plugins/DTNoiseCalibration.h | 2 +- .../plugins/DTNoiseComputation.cc | 6 +-- .../plugins/DTNoiseComputation.h | 2 +- .../plugins/DTResidualCalibration.h | 2 +- .../DTCalibration/plugins/DTT0Calibration.cc | 4 +- .../plugins/DTT0CalibrationRMS.cc | 4 +- .../DTCalibration/plugins/DTT0Correction.cc | 4 +- .../DTCalibration/plugins/DTT0Correction.h | 2 +- .../DTCalibration/plugins/DTTPDeadWriter.h | 2 +- .../DTCalibration/plugins/DTTTrigCorrection.h | 2 +- .../plugins/DTTTrigCorrectionFirst.h | 2 +- .../plugins/DTTTrigOffsetCalibration.cc | 2 +- .../plugins/DTTTrigOffsetCalibration.h | 2 +- .../plugins/DTVDriftCalibration.h | 4 +- .../plugins/DTVDriftSegmentCalibration.cc | 2 +- .../plugins/DTVDriftSegmentCalibration.h | 2 +- .../DTCalibration/plugins/DTVDriftWriter.h | 2 +- .../DTCalibration/test/DBTools/FakeTTrig.h | 4 +- .../src/PixelToFEDAssociateFromAscii.cc | 4 +- .../src/PixelToLNKAssociateFromAscii.cc | 2 +- .../interface/SiPixelDetInfoFileWriter.h | 2 +- .../SiPixelGainCalibrationForHLTService.h | 2 +- .../SiPixelGainCalibrationForHLTSimService.h | 2 +- .../SiPixelGainCalibrationOfflineService.h | 2 +- .../SiPixelGainCalibrationOfflineSimService.h | 2 +- .../interface/SiPixelGainCalibrationService.h | 2 +- .../SiPixelGainCalibrationServiceBase.h | 4 +- .../SiPixelFakeLorentzAngleESSource.cc | 8 ++-- .../PixelFEDChannelCollectionMapTestReader.cc | 6 +-- .../test/SiPixelFakeGainForHLTReader.h | 2 +- .../test/SiPixelFakeGainOfflineReader.h | 2 +- .../test/SiPixelFakeGainReader.h | 2 +- .../src/SiPixelLorentzAngle.cc | 2 +- .../src/SiPixelLorentzAnglePCLHarvester.cc | 2 +- .../src/SiPixelLorentzAnglePCLHarvesterMCS.cc | 2 +- .../src/SiPixelLorentzAnglePCLWorker.cc | 14 +++--- .../plugins/SiPixelStatusHarvester.cc | 2 +- .../plugins/SiPixelStatusProducer.cc | 2 +- .../plugins/SiPixelStatusProducer.h | 3 +- .../SiPixelQuality/src/SiPixelModuleStatus.cc | 2 +- .../SiPixelQuality/src/SiPixelTopoFinder.cc | 2 +- .../SiPixelFedFillerWordEventNumber.cc | 10 ++-- .../plugins/SiStripGainsCalibTreeWorker.cc | 12 ++--- .../src/SiStripGainsPCLHarvester.cc | 12 ++--- .../src/SiStripGainsPCLWorker.cc | 12 ++--- .../interface/SiStripDCSStatus.h | 2 +- CalibTracker/SiStripCommon/interface/poly.h | 4 +- .../plugins/ShallowTrackClustersProducer.cc | 2 +- .../SiStripCommon/plugins/ShallowTree.h | 2 +- .../plugins/SiStripDetInfoFileWriter.cc | 4 +- .../plugins/DBWriter/DummyCondDBWriter.h | 4 +- .../DBWriter/SiStripFedCablingManipulator.h | 4 +- .../fake/SiStripApvGainBuilderFromTag.h | 2 +- ...SiStripNoiseNormalizedWithApvGainBuilder.h | 2 +- .../plugins/fake/SiStripQualityFakeESSource.h | 2 +- .../fake/SiStripTemplateEmptyFakeESSource.h | 2 +- .../plugins/real/SiStripDelayESProducer.cc | 2 +- .../plugins/real/SiStripGainESProducer.cc | 2 +- .../plugins/real/SiStripGainSimESProducer.cc | 2 +- .../plugins/real/SiStripQualityESProducer.cc | 2 +- .../plugins/SiStripHitEfficiencyHarvester.cc | 16 +++---- .../interface/SiStripOverlapHit.h | 2 +- .../SiStripHitResolution/src/HitResol.cc | 6 +-- .../plugins/EnsembleCalibrationLA.cc | 2 +- .../SiStripLorentzAnglePCLHarvester.cc | 2 +- ...StripBadAPVAlgorithmFromClusterOccupancy.h | 2 +- ...ripHotStripAlgorithmFromClusterOccupancy.h | 2 +- .../SelectedElectronFEDListProducer.cc | 12 ++--- .../interface/Pi0FixedMassWindowCalibration.h | 2 +- .../interface/VEcalCalibBlock.h | 4 +- .../EcalCalibAlgos/interface/VFillMap.h | 2 +- .../EcalCalibAlgos/interface/ZeeCalibration.h | 2 +- .../plugins/EcalPhiSymRecHitProducers.cc | 14 +++--- .../src/EcalGeomPhiSymHelper.cc | 10 ++-- .../EcalCalibAlgos/src/IMACalibBlock.cc | 2 +- .../src/Pi0FixedMassWindowCalibration.cc | 2 +- .../plugins/AlCaHOCalibProducer.cc | 2 +- Calibration/HcalCalibAlgos/interface/TCell.h | 2 +- .../plugins/Analyzer_minbias.cc | 12 ++--- .../plugins/SimAnalyzerMinbias.cc | 4 +- .../HcalCalibAlgos/test/DiJetAnalyzer.cc | 40 ++++++++-------- .../HcalCalibAlgos/test/GammaJetAnalysis.cc | 20 ++++---- .../interface/CaloSimInfo.icc | 4 +- .../interface/eECALMatrix.icc | 2 +- .../plugins/IsoTrackCalibration.cc | 4 +- .../plugins/IsolatedGenParticles.cc | 2 +- .../plugins/IsolatedTracksNxN.cc | 6 +-- .../plugins/NearbyPixelClustersAnalyzer.cc | 2 +- .../plugins/NearbyPixelClustersProducer.cc | 4 +- Calibration/Tools/interface/CalibElectron.h | 4 +- Calibration/Tools/interface/DetIdAssociator.h | 6 +-- .../Tools/interface/EcalIndexingTools.h | 4 +- .../interface/EcalRingCalibrationTools.h | 4 +- .../Tools/src/EcalRingCalibrationTools.cc | 4 +- Calibration/Tools/src/InvMatrixUtils.cc | 2 +- .../PPSObjects/interface/TotemDAQMapping.h | 2 +- .../CaloPatterns/src/HtrXmlPatternTool.cc | 4 +- .../plugins/DTDDUFileReader.cc | 2 +- .../DTCommissioning/plugins/DTSpyHelper.h | 2 +- .../interface/Functions.h | 2 +- .../interface/SigmaPtDiff.h | 2 +- .../plugins/ErrorsAnalyzer.cc | 2 +- .../plugins/ErrorsPropagationAnalyzer.cc | 2 +- .../plugins/Histograms.h | 46 +++++++++---------- .../plugins/MuScleFitMuonSelector.cc | 4 +- .../plugins/MuScleFitUtils.h | 4 +- .../plugins/ResolutionAnalyzer.cc | 2 +- .../plugins/TestCorrection.cc | 2 +- .../plugins/TreeSplitter.cc | 2 +- 288 files changed, 664 insertions(+), 666 deletions(-) diff --git a/Alignment/APEEstimation/interface/TrackerSectorStruct.h b/Alignment/APEEstimation/interface/TrackerSectorStruct.h index ee36a999d913a..03e5f03eeff59 100644 --- a/Alignment/APEEstimation/interface/TrackerSectorStruct.h +++ b/Alignment/APEEstimation/interface/TrackerSectorStruct.h @@ -40,7 +40,7 @@ class TrackerSectorStruct { PProbXVsVar(nullptr), PSigmaXHitVsVar(nullptr), PSigmaXTrkVsVar(nullptr), - PSigmaXVsVar(nullptr){}; + PSigmaXVsVar(nullptr) {} inline void fillCorrHists(const TString, const TrackStruct::HitParameterStruct &hitParameterStruct, diff --git a/Alignment/APEEstimation/plugins/ApeEstimator.cc b/Alignment/APEEstimation/plugins/ApeEstimator.cc index 98310396ff9f4..9062fe00246e6 100644 --- a/Alignment/APEEstimation/plugins/ApeEstimator.cc +++ b/Alignment/APEEstimation/plugins/ApeEstimator.cc @@ -128,8 +128,8 @@ class ApeEstimator : public edm::one::EDAnalyzer<> { private: struct PositionAndError2 { - PositionAndError2() : posX(-999.F), posY(-999.F), errX2(-999.F), errY2(-999.F){}; - PositionAndError2(float x, float y, float eX, float eY) : posX(x), posY(y), errX2(eX), errY2(eY){}; + PositionAndError2() : posX(-999.F), posY(-999.F), errX2(-999.F), errY2(-999.F) {} + PositionAndError2(float x, float y, float eX, float eY) : posX(x), posY(y), errX2(eX), errY2(eY) {} float posX; float posY; float errX2; diff --git a/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h b/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h index 4d60f99c228b5..8cb528118490c 100644 --- a/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h +++ b/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h @@ -17,7 +17,7 @@ class CocoaMaterialElementary { public: //---------- Constructors / Destructor CocoaMaterialElementary(ALIstring name, float density, ALIstring symbol, float A, ALIint Z); - ~CocoaMaterialElementary(){}; + ~CocoaMaterialElementary() {} ALIstring getName() const { return theName; } float getDensity() const { return theDensity; } diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h index 942bde75b3bbb..610945cde6c07 100644 --- a/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h +++ b/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h @@ -17,7 +17,7 @@ class CocoaSolidShape { public: //---------- Constructors / Destructor CocoaSolidShape(ALIstring type); - virtual ~CocoaSolidShape(){}; + virtual ~CocoaSolidShape() {} ALIstring getType() const { return theType; } diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h index 25182e7d7f15d..f2c1f781e8ec9 100644 --- a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h +++ b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h @@ -14,7 +14,7 @@ class CocoaSolidShapeBox : public CocoaSolidShape { public: //---------- Constructors / Destructor CocoaSolidShapeBox(ALIstring type, ALIfloat xdim, ALIfloat ydim, ALIfloat zdim); - ~CocoaSolidShapeBox() override{}; + ~CocoaSolidShapeBox() override {} ALIfloat getXHalfLength() const { return theXHalfLength; } ALIfloat getYHalfLength() const { return theYHalfLength; } diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h index 9cb871337707c..50f822cb81ab2 100644 --- a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h +++ b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h @@ -20,7 +20,7 @@ class CocoaSolidShapeTubs : public CocoaSolidShape { ALIfloat pDz, ALIfloat pSPhi = 0. * CLHEP::deg, ALIfloat pDPhi = 360. * CLHEP::deg); - ~CocoaSolidShapeTubs() override{}; + ~CocoaSolidShapeTubs() override {} ALIfloat getInnerRadius() const { return theInnerRadius; } ALIfloat getOuterRadius() const { return theOuterRadius; } ALIfloat getZHalfLength() const { return theZHalfLength; } diff --git a/Alignment/CocoaDaq/interface/CocoaDaqReader.h b/Alignment/CocoaDaq/interface/CocoaDaqReader.h index c5a7550261823..fd727c660ab6c 100644 --- a/Alignment/CocoaDaq/interface/CocoaDaqReader.h +++ b/Alignment/CocoaDaq/interface/CocoaDaqReader.h @@ -7,11 +7,11 @@ class OpticalAlignMeasurementInfo; class CocoaDaqReader { public: - CocoaDaqReader(){}; + CocoaDaqReader() {} static CocoaDaqReader* GetDaqReader() { return theDaqReader; } static void SetDaqReader(CocoaDaqReader* reader); - virtual ~CocoaDaqReader(){}; + virtual ~CocoaDaqReader() {} virtual bool ReadNextEvent() = 0; virtual bool ReadEvent(int nev) { return false; }; diff --git a/Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h b/Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h index 14faac9476fa3..eb221633e0ca2 100644 --- a/Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h +++ b/Alignment/CocoaDaq/interface/CocoaDaqRootEvent.h @@ -195,7 +195,7 @@ class CocoaDaqRootEvent : public TObject { public: CocoaDaqRootEvent(); - ~CocoaDaqRootEvent() override{}; + ~CocoaDaqRootEvent() override {} void SetHeader(int run, int evt) { Header->SetRunEvt(run, evt); } void DumpIt(); diff --git a/Alignment/CocoaFit/interface/Fit.h b/Alignment/CocoaFit/interface/Fit.h index 6769adb726f19..1651155587398 100644 --- a/Alignment/CocoaFit/interface/Fit.h +++ b/Alignment/CocoaFit/interface/Fit.h @@ -32,8 +32,8 @@ enum FitQuality { FQsmallDistanceToMinimum, FQbigDistanceToMinimum, FQchiSquareW class Fit { public: //----- Constructor / Destructor - Fit(){}; - ~Fit(){}; + Fit() {} + ~Fit() {} //----- Gets the only instance of this class static Fit& getInstance(); diff --git a/Alignment/CocoaFit/interface/FittedEntriesManager.h b/Alignment/CocoaFit/interface/FittedEntriesManager.h index 8890a6a70bc50..d83f745bc9fc5 100644 --- a/Alignment/CocoaFit/interface/FittedEntriesManager.h +++ b/Alignment/CocoaFit/interface/FittedEntriesManager.h @@ -16,8 +16,8 @@ class FittedEntriesManager { public: //---------- Constructors / Destructor - FittedEntriesManager(){}; - ~FittedEntriesManager(){}; + FittedEntriesManager() {} + ~FittedEntriesManager() {} static FittedEntriesManager* getInstance(); void AddFittedEntriesSet(FittedEntriesSet* fents); void MakeHistos(); diff --git a/Alignment/CocoaFit/interface/FittedEntriesSet.h b/Alignment/CocoaFit/interface/FittedEntriesSet.h index e7eabc5dc5857..6c8ced66e2428 100644 --- a/Alignment/CocoaFit/interface/FittedEntriesSet.h +++ b/Alignment/CocoaFit/interface/FittedEntriesSet.h @@ -26,7 +26,7 @@ class FittedEntriesSet { FittedEntriesSet(const std::vector& wl); //---- Average a list of FittedEntriesSet's FittedEntriesSet(const std::vector& vSets); - ~FittedEntriesSet(){}; + ~FittedEntriesSet() {} void Fill(); void FillEntries(); void FillCorrelations(); diff --git a/Alignment/CocoaFit/interface/FittedEntry.h b/Alignment/CocoaFit/interface/FittedEntry.h index 66357c7e94201..37f6e9d813b22 100644 --- a/Alignment/CocoaFit/interface/FittedEntry.h +++ b/Alignment/CocoaFit/interface/FittedEntry.h @@ -17,11 +17,11 @@ class Entry; class FittedEntry { public: //---------- Constructors / Destructor - FittedEntry(){}; + FittedEntry() {} FittedEntry(Entry* entry, ALIint order, ALIdouble sigma); FittedEntry(ALIstring name, float value, float sigma); FittedEntry(const std::vector& vFEntry); - ~FittedEntry(){}; + ~FittedEntry() {} void BuildName(); diff --git a/Alignment/CocoaFit/interface/HistoDef.h b/Alignment/CocoaFit/interface/HistoDef.h index 565a43e5dc140..3d4379c324305 100644 --- a/Alignment/CocoaFit/interface/HistoDef.h +++ b/Alignment/CocoaFit/interface/HistoDef.h @@ -17,9 +17,9 @@ class Entry; class HistoDef { public: //---------- Constructors / Destructor - HistoDef(){}; + HistoDef() {} void init(ALIstring name); - ~HistoDef(){}; + ~HistoDef() {} ALIstring name() const { return theName; } float minimum() const { return theMin; } diff --git a/Alignment/CocoaFit/interface/NtupleManager.h b/Alignment/CocoaFit/interface/NtupleManager.h index 17750ff868b2c..8524a858711f0 100644 --- a/Alignment/CocoaFit/interface/NtupleManager.h +++ b/Alignment/CocoaFit/interface/NtupleManager.h @@ -20,8 +20,8 @@ class TClonesArray; class NtupleManager { public: //---------- Constructors / Destructor - NtupleManager(){}; - ~NtupleManager(){}; + NtupleManager() {} + ~NtupleManager() {} static NtupleManager* getInstance(); void BookNtuple(); void InitNtuple(); diff --git a/Alignment/CocoaModel/interface/ALILine.h b/Alignment/CocoaModel/interface/ALILine.h index 3250efe7bdd2a..142bfabbd5928 100644 --- a/Alignment/CocoaModel/interface/ALILine.h +++ b/Alignment/CocoaModel/interface/ALILine.h @@ -15,8 +15,8 @@ class ALIPlane; class ALILine { public: - ALILine(){}; - ~ALILine(){}; + ALILine() {} + ~ALILine() {} ALILine(const CLHEP::Hep3Vector& point, const CLHEP::Hep3Vector& direction); // Next 1 line was added with 22 Mar 2001 // CLHEP::Hep3Vector ALILine( const ALILine& l2, bool notParallel = 0); diff --git a/Alignment/CocoaModel/interface/ALIRmDataFromFile.h b/Alignment/CocoaModel/interface/ALIRmDataFromFile.h index 35043987627ee..d44bd64b15f7a 100644 --- a/Alignment/CocoaModel/interface/ALIRmDataFromFile.h +++ b/Alignment/CocoaModel/interface/ALIRmDataFromFile.h @@ -16,7 +16,7 @@ class ALIRmDataFromFile { public: //----- Constructor / destructor ALIRmDataFromFile(); - ~ALIRmDataFromFile(){}; + ~ALIRmDataFromFile() {} // Access DATA MEMBERS ALIbool setAngle(const ALIstring& coord, const ALIdouble val); diff --git a/Alignment/CocoaModel/interface/DeviationSensor2D.h b/Alignment/CocoaModel/interface/DeviationSensor2D.h index d422da6049cdb..b5089670facee 100644 --- a/Alignment/CocoaModel/interface/DeviationSensor2D.h +++ b/Alignment/CocoaModel/interface/DeviationSensor2D.h @@ -16,9 +16,9 @@ class DeviationSensor2D { public: //---------- Constructors / Destructor - DeviationSensor2D(){}; + DeviationSensor2D() {} DeviationSensor2D(ALIdouble posDimFactor, ALIdouble angDimFactor); - ~DeviationSensor2D(){}; + ~DeviationSensor2D() {} // read file void fillData(const std::vector& wl); diff --git a/Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h b/Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h index c331072fdb1e2..c85825e50d5d0 100644 --- a/Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h +++ b/Alignment/CocoaModel/interface/DeviationsFromFileSensor2D.h @@ -27,7 +27,7 @@ class DeviationsFromFileSensor2D { theOffsetX = 0.; theOffsetY = 0.; }; - ~DeviationsFromFileSensor2D(){}; + ~DeviationsFromFileSensor2D() {} // read file void readFile(ALIFileIn& ifdevi); diff --git a/Alignment/CocoaModel/interface/EntryAngle.h b/Alignment/CocoaModel/interface/EntryAngle.h index c76b6620d9dc9..0080d289cad77 100644 --- a/Alignment/CocoaModel/interface/EntryAngle.h +++ b/Alignment/CocoaModel/interface/EntryAngle.h @@ -20,7 +20,7 @@ class EntryAngle : public Entry { theDimType = ED_angle; //- std::cout << "entryangle " << type << std::endl; }; - ~EntryAngle() override{}; + ~EntryAngle() override {} //----- Return value and sigma dimension factors ALIdouble ValueDimensionFactor() const override { return ALIUtils::AngleValueDimensionFactor(); } diff --git a/Alignment/CocoaModel/interface/EntryAngleAffAngles.h b/Alignment/CocoaModel/interface/EntryAngleAffAngles.h index f2c914a8a8c00..bebc4ed8f2804 100644 --- a/Alignment/CocoaModel/interface/EntryAngleAffAngles.h +++ b/Alignment/CocoaModel/interface/EntryAngleAffAngles.h @@ -15,7 +15,7 @@ class EntryAngleAffAngles : public EntryAngle { public: EntryAngleAffAngles(const ALIstring& type); - ~EntryAngleAffAngles() override{}; + ~EntryAngleAffAngles() override {} virtual void FillName(const ALIstring& name); void displace(ALIdouble disp) override; diff --git a/Alignment/CocoaModel/interface/EntryLength.h b/Alignment/CocoaModel/interface/EntryLength.h index 17456eee4437d..c7a55da0449f0 100644 --- a/Alignment/CocoaModel/interface/EntryLength.h +++ b/Alignment/CocoaModel/interface/EntryLength.h @@ -20,7 +20,7 @@ class EntryLength : public Entry { // std::cout << "entrylength" << std::endl; theDimType = ED_length; }; - ~EntryLength() override{}; + ~EntryLength() override {} //----- Return value and sigma dimension factors ALIdouble ValueDimensionFactor() const override { return ALIUtils::LengthValueDimensionFactor(); } diff --git a/Alignment/CocoaModel/interface/EntryLengthAffCentre.h b/Alignment/CocoaModel/interface/EntryLengthAffCentre.h index 195cdb77e1044..d6635567f952b 100644 --- a/Alignment/CocoaModel/interface/EntryLengthAffCentre.h +++ b/Alignment/CocoaModel/interface/EntryLengthAffCentre.h @@ -15,7 +15,7 @@ class EntryLengthAffCentre : public EntryLength { public: EntryLengthAffCentre(const ALIstring& type); - ~EntryLengthAffCentre() override{}; + ~EntryLengthAffCentre() override {} virtual void FillName(const ALIstring& name); void displace(ALIdouble disp) override; diff --git a/Alignment/CocoaModel/interface/EntryMgr.h b/Alignment/CocoaModel/interface/EntryMgr.h index 983b927f8a960..b6fd79abd4691 100644 --- a/Alignment/CocoaModel/interface/EntryMgr.h +++ b/Alignment/CocoaModel/interface/EntryMgr.h @@ -14,7 +14,7 @@ class EntryData; class EntryMgr { private: - EntryMgr(){}; + EntryMgr() {} public: static EntryMgr* getInstance(); diff --git a/Alignment/CocoaModel/interface/EntryNoDim.h b/Alignment/CocoaModel/interface/EntryNoDim.h index 4ac52f4ff1559..3e69b5029b1d8 100644 --- a/Alignment/CocoaModel/interface/EntryNoDim.h +++ b/Alignment/CocoaModel/interface/EntryNoDim.h @@ -19,7 +19,7 @@ class EntryNoDim : public Entry { theDimType = ED_nodim; //std::cout << "entryNoDim" << std::endl; }; - ~EntryNoDim() override{}; + ~EntryNoDim() override {} // Access DATA MEMBERS //----------- Return value and sigma dimension factors (1. as object of this class have no dimension) diff --git a/Alignment/CocoaModel/interface/ErrorCorrelationMgr.h b/Alignment/CocoaModel/interface/ErrorCorrelationMgr.h index 3ba8e0d21bf22..479d0e204d960 100644 --- a/Alignment/CocoaModel/interface/ErrorCorrelationMgr.h +++ b/Alignment/CocoaModel/interface/ErrorCorrelationMgr.h @@ -18,7 +18,7 @@ typedef std::map > msd; class ErrorCorrelationMgr { private: - ErrorCorrelationMgr(){}; + ErrorCorrelationMgr() {} public: static ErrorCorrelationMgr* getInstance(); diff --git a/Alignment/CocoaModel/interface/LightRay.h b/Alignment/CocoaModel/interface/LightRay.h index e6bdcf0e1c713..7fd0c162e48fe 100644 --- a/Alignment/CocoaModel/interface/LightRay.h +++ b/Alignment/CocoaModel/interface/LightRay.h @@ -24,7 +24,7 @@ class LightRay { // Make a light ray out of the centre_glob points of two OptO:'source' and 'pointLens' LightRay(OpticalObject* p1, OpticalObject* p2); LightRay(CLHEP::Hep3Vector& vec1, CLHEP::Hep3Vector& vec2); - ~LightRay(){}; + ~LightRay() {} //@@@@@@@@@@@@@@@@@@@@ Methods for each OptO //----- Make a light ray out of the centre_glob and Z direction of one OptO: 'laser' or 'source' diff --git a/Alignment/CocoaModel/interface/Measurement.h b/Alignment/CocoaModel/interface/Measurement.h index 24d66b69efeca..951402f8747d0 100644 --- a/Alignment/CocoaModel/interface/Measurement.h +++ b/Alignment/CocoaModel/interface/Measurement.h @@ -28,7 +28,7 @@ class Measurement { public: //----- Constructors / destructor Measurement(const ALIint measdim, ALIstring& type, ALIstring& name); - Measurement(){}; + Measurement() {} virtual ~Measurement(); // construct Measurement reading date from file @@ -47,7 +47,7 @@ class Measurement { void addAffectingEntriesFromOptO(const OpticalObject* optoP); // Get simulated value (called every time a parameter is displaced) - virtual void calculateSimulatedValue(ALIbool firstTime){}; + virtual void calculateSimulatedValue(ALIbool firstTime) {} // Get simulated value original (called every time a parameter value is changed: after getting values from file and every non-linear fit iteration ) void calculateOriginalSimulatedValue(); @@ -63,7 +63,7 @@ class Measurement { // Get the previous OptOs in the list of OptO that take part in this measurement const OpticalObject* getPreviousOptO(const OpticalObject* Popto) const; //---------- Add any correction between the measurement data and the default format in COCOA - virtual void correctValueAndSigma(){}; + virtual void correctValueAndSigma() {} //---------- Convert from V to rad virtual void setConversionFactor(const std::vector& wordlist) { @@ -155,7 +155,7 @@ class Measurement { // Check is value is simulated bool valueIsSimulated(ALIint coor) { return theValueIsSimulated[coor]; } - virtual void setXlaserLine(ALIuint ii, int val){}; + virtual void setXlaserLine(ALIuint ii, int val) {} static ALIdouble cameraScaleFactor; diff --git a/Alignment/CocoaModel/interface/MeasurementCOPS.h b/Alignment/CocoaModel/interface/MeasurementCOPS.h index 285afc6393b7e..fdc2cc956bed8 100644 --- a/Alignment/CocoaModel/interface/MeasurementCOPS.h +++ b/Alignment/CocoaModel/interface/MeasurementCOPS.h @@ -21,8 +21,8 @@ class MeasurementCOPS : public Measurement { for (unsigned int ii = 0; ii < 4; ii++) theXlaserLine[ii] = -1; }; - MeasurementCOPS(){}; - ~MeasurementCOPS() override{}; + MeasurementCOPS() {} + ~MeasurementCOPS() override {} // Get simulated value (called every time a parameter is displaced) void calculateSimulatedValue(ALIbool firstTime) override; diff --git a/Alignment/CocoaModel/interface/MeasurementDiffEntry.h b/Alignment/CocoaModel/interface/MeasurementDiffEntry.h index ca8341c76e5db..42a1f77013813 100644 --- a/Alignment/CocoaModel/interface/MeasurementDiffEntry.h +++ b/Alignment/CocoaModel/interface/MeasurementDiffEntry.h @@ -17,9 +17,9 @@ class MeasurementDiffEntry : public Measurement { public: - MeasurementDiffEntry(const ALIint measdim, ALIstring& type, ALIstring& name) : Measurement(measdim, type, name){}; - MeasurementDiffEntry(){}; - ~MeasurementDiffEntry() override{}; + MeasurementDiffEntry(const ALIint measdim, ALIstring& type, ALIstring& name) : Measurement(measdim, type, name) {} + MeasurementDiffEntry() {} + ~MeasurementDiffEntry() override {} // separate OptO names and Entry names void buildOptONamesList(const std::vector& wl) override; diff --git a/Alignment/CocoaModel/interface/MeasurementDistancemeter.h b/Alignment/CocoaModel/interface/MeasurementDistancemeter.h index 1c8c7e80b939d..94c41927452dc 100644 --- a/Alignment/CocoaModel/interface/MeasurementDistancemeter.h +++ b/Alignment/CocoaModel/interface/MeasurementDistancemeter.h @@ -18,9 +18,9 @@ class MeasurementDistancemeter : public Measurement { public: MeasurementDistancemeter(const ALIint measdim, ALIstring& type, ALIstring& name) - : Measurement(measdim, type, name), theFactor(1.), theFactorSigma(0.){}; - MeasurementDistancemeter(){}; - ~MeasurementDistancemeter() override{}; + : Measurement(measdim, type, name), theFactor(1.), theFactorSigma(0.) {} + MeasurementDistancemeter() {} + ~MeasurementDistancemeter() override {} // Get simulated value (called every time a parameter is displaced) void calculateSimulatedValue(ALIbool firstTime) override; diff --git a/Alignment/CocoaModel/interface/MeasurementDistancemeter3dim.h b/Alignment/CocoaModel/interface/MeasurementDistancemeter3dim.h index 8fd9f52cb2edc..3696451e86dcb 100644 --- a/Alignment/CocoaModel/interface/MeasurementDistancemeter3dim.h +++ b/Alignment/CocoaModel/interface/MeasurementDistancemeter3dim.h @@ -18,9 +18,9 @@ class MeasurementDistancemeter3dim : public Measurement { public: MeasurementDistancemeter3dim(const ALIint measdim, ALIstring& type, ALIstring& name) - : Measurement(measdim, type, name), theFactor(1.), theFactorSigma(0.){}; - MeasurementDistancemeter3dim(){}; - ~MeasurementDistancemeter3dim() override{}; + : Measurement(measdim, type, name), theFactor(1.), theFactorSigma(0.) {} + MeasurementDistancemeter3dim() {} + ~MeasurementDistancemeter3dim() override {} // Get simulated value (called every time a parameter is displaced) void calculateSimulatedValue(ALIbool firstTime) override; diff --git a/Alignment/CocoaModel/interface/MeasurementSensor2D.h b/Alignment/CocoaModel/interface/MeasurementSensor2D.h index 7506853199aef..eb6ffc8b8ad49 100644 --- a/Alignment/CocoaModel/interface/MeasurementSensor2D.h +++ b/Alignment/CocoaModel/interface/MeasurementSensor2D.h @@ -17,9 +17,9 @@ class MeasurementSensor2D : public Measurement { public: - MeasurementSensor2D(const ALIint measdim, ALIstring& type, ALIstring& name) : Measurement(measdim, type, name){}; - MeasurementSensor2D(){}; - ~MeasurementSensor2D() override{}; + MeasurementSensor2D(const ALIint measdim, ALIstring& type, ALIstring& name) : Measurement(measdim, type, name) {} + MeasurementSensor2D() {} + ~MeasurementSensor2D() override {} // Get simulated value (called every time a parameter is displaced) void calculateSimulatedValue(ALIbool firstTime) override; diff --git a/Alignment/CocoaModel/interface/MeasurementTiltmeter.h b/Alignment/CocoaModel/interface/MeasurementTiltmeter.h index 2833b2e7263b2..c9d1f9200fe27 100644 --- a/Alignment/CocoaModel/interface/MeasurementTiltmeter.h +++ b/Alignment/CocoaModel/interface/MeasurementTiltmeter.h @@ -24,9 +24,9 @@ class MeasurementTiltmeter : public Measurement { theConstantTerm(0.), theConstantTermSigma(0.), thePedestal(0.), - thePedestalSigma(0.){}; - MeasurementTiltmeter(){}; - ~MeasurementTiltmeter() override{}; + thePedestalSigma(0.) {} + MeasurementTiltmeter() {} + ~MeasurementTiltmeter() override {} // Get simulated value (called every time a parameter is displaced) void calculateSimulatedValue(ALIbool firstTime) override; diff --git a/Alignment/CocoaModel/interface/Model.h b/Alignment/CocoaModel/interface/Model.h index 675ec35646783..79715e4f56c18 100644 --- a/Alignment/CocoaModel/interface/Model.h +++ b/Alignment/CocoaModel/interface/Model.h @@ -55,7 +55,7 @@ class Model { public: //---------- Constructor / destructor Model(); - ~Model(){}; + ~Model() {} ///---------- Gets the only instance of this class static Model& getInstance(); diff --git a/Alignment/CocoaModel/interface/OptOCOPS.h b/Alignment/CocoaModel/interface/OptOCOPS.h index 2c7b6b971d6f5..e0b50bbe698af 100644 --- a/Alignment/CocoaModel/interface/OptOCOPS.h +++ b/Alignment/CocoaModel/interface/OptOCOPS.h @@ -20,10 +20,10 @@ class DeviationsFromFileSensor2D; class OptOCOPS : public OpticalObject { public: //---------- Constructors / Destructor - OptOCOPS(){}; + OptOCOPS() {} OptOCOPS(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data), fdevi_from_file(false){}; - ~OptOCOPS() override{}; + : OpticalObject(parent, type, name, copy_data), fdevi_from_file(false) {} + ~OptOCOPS() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOCameraDetector.h b/Alignment/CocoaModel/interface/OptOCameraDetector.h index 9866d64f8ae56..bc6a24e3eaaac 100644 --- a/Alignment/CocoaModel/interface/OptOCameraDetector.h +++ b/Alignment/CocoaModel/interface/OptOCameraDetector.h @@ -18,10 +18,10 @@ class LightRay; class OptOCameraDetector : public OpticalObject { public: //---------- Constructors / Destructor - OptOCameraDetector(){}; + OptOCameraDetector() {} OptOCameraDetector(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOCameraDetector() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOCameraDetector() override {} //---------- Propagate light for measurement meas void participateInMeasurement(LightRay& lightray, Measurement& meas, const ALIstring& behav) override; diff --git a/Alignment/CocoaModel/interface/OptOCubeSplitter.h b/Alignment/CocoaModel/interface/OptOCubeSplitter.h index 57e24bcd3b401..d8903707ab3fb 100644 --- a/Alignment/CocoaModel/interface/OptOCubeSplitter.h +++ b/Alignment/CocoaModel/interface/OptOCubeSplitter.h @@ -18,10 +18,10 @@ class LightRay; class OptOCubeSplitter : public OpticalObject { public: //---------- Constructors / Destructor - OptOCubeSplitter(){}; + OptOCubeSplitter() {} OptOCubeSplitter(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOCubeSplitter() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOCubeSplitter() override {} //---------- Fast simulation of deviation of the light ray (reflection, shift, ...) void fastDeviatesLightRay(LightRay& lightray) override; diff --git a/Alignment/CocoaModel/interface/OptODistancemeter.h b/Alignment/CocoaModel/interface/OptODistancemeter.h index 1cd54f834bdbf..9b3400847b4fd 100644 --- a/Alignment/CocoaModel/interface/OptODistancemeter.h +++ b/Alignment/CocoaModel/interface/OptODistancemeter.h @@ -18,10 +18,10 @@ class LightRay; class OptODistancemeter : public OpticalObject { public: //---------- Constructors / Destructor - OptODistancemeter(){}; + OptODistancemeter() {} OptODistancemeter(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptODistancemeter() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptODistancemeter() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptODistancemeter3dim.h b/Alignment/CocoaModel/interface/OptODistancemeter3dim.h index bb744b2cd56c3..3d7d8a8e05774 100644 --- a/Alignment/CocoaModel/interface/OptODistancemeter3dim.h +++ b/Alignment/CocoaModel/interface/OptODistancemeter3dim.h @@ -18,10 +18,10 @@ class LightRay; class OptODistancemeter3dim : public OpticalObject { public: //---------- Constructors / Destructor - OptODistancemeter3dim(){}; + OptODistancemeter3dim() {} OptODistancemeter3dim(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptODistancemeter3dim() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptODistancemeter3dim() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOLaser.h b/Alignment/CocoaModel/interface/OptOLaser.h index 19d2935145e29..3e5945639a66c 100644 --- a/Alignment/CocoaModel/interface/OptOLaser.h +++ b/Alignment/CocoaModel/interface/OptOLaser.h @@ -18,10 +18,10 @@ class LightRay; class OptOLaser : public OpticalObject { public: //---------- Constructors / Destructor - OptOLaser(){}; + OptOLaser() {} OptOLaser(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOLaser() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOLaser() override {} //---------- Default behaviour: create a LightRay object void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOLens.h b/Alignment/CocoaModel/interface/OptOLens.h index 03673c25a9985..998f87a277946 100644 --- a/Alignment/CocoaModel/interface/OptOLens.h +++ b/Alignment/CocoaModel/interface/OptOLens.h @@ -20,8 +20,8 @@ class OptOLens : public OpticalObject { //---------- Constructors / Destructor OptOLens(); OptOLens(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOLens() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOLens() override {} //---------- Propagate light for measurement meas void participateInMeasurement(LightRay& lightray, Measurement& meas, const ALIstring& behav) override; diff --git a/Alignment/CocoaModel/interface/OptOMirror.h b/Alignment/CocoaModel/interface/OptOMirror.h index 62aa6b8808c68..2d4bda126029a 100644 --- a/Alignment/CocoaModel/interface/OptOMirror.h +++ b/Alignment/CocoaModel/interface/OptOMirror.h @@ -18,10 +18,10 @@ class LightRay; class OptOMirror : public OpticalObject { public: //---------- Constructors / Destructor - OptOMirror(){}; + OptOMirror() {} OptOMirror(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOMirror() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOMirror() override {} //---------- Propagate light for measurement meas //----- Default behaviour: detailed deviation diff --git a/Alignment/CocoaModel/interface/OptOModifiedRhomboidPrism.h b/Alignment/CocoaModel/interface/OptOModifiedRhomboidPrism.h index 808906336209f..3bbe807f71571 100644 --- a/Alignment/CocoaModel/interface/OptOModifiedRhomboidPrism.h +++ b/Alignment/CocoaModel/interface/OptOModifiedRhomboidPrism.h @@ -18,10 +18,10 @@ class LightRay; class OptOModifiedRhomboidPrism : public OpticalObject { public: //---------- Constructors / Destructor - OptOModifiedRhomboidPrism(){}; + OptOModifiedRhomboidPrism() {} OptOModifiedRhomboidPrism(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOModifiedRhomboidPrism() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOModifiedRhomboidPrism() override {} //---------- Fast simulation of deviation of the light ray (reflection, shift, ...) void fastDeviatesLightRay(LightRay& lightray) override; diff --git a/Alignment/CocoaModel/interface/OptOOpticalSquare.h b/Alignment/CocoaModel/interface/OptOOpticalSquare.h index 41b315db850e5..113a0c86820b6 100644 --- a/Alignment/CocoaModel/interface/OptOOpticalSquare.h +++ b/Alignment/CocoaModel/interface/OptOOpticalSquare.h @@ -18,10 +18,10 @@ class LightRay; class OptOOpticalSquare : public OpticalObject { public: //---------- Constructors / Destructor - OptOOpticalSquare(){}; + OptOOpticalSquare() {} OptOOpticalSquare(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOOpticalSquare() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOOpticalSquare() override {} //---------- Fast simulation of deviation of the light ray (reflection, shift, ...) void fastDeviatesLightRay(LightRay& lightray) override; diff --git a/Alignment/CocoaModel/interface/OptOPinhole.h b/Alignment/CocoaModel/interface/OptOPinhole.h index c853ce63a0f5c..ac264fe54e566 100644 --- a/Alignment/CocoaModel/interface/OptOPinhole.h +++ b/Alignment/CocoaModel/interface/OptOPinhole.h @@ -18,10 +18,10 @@ class LightRay; class OptOPinhole : public OpticalObject { public: //---------- Constructors / Destructor - OptOPinhole(){}; + OptOPinhole() {} OptOPinhole(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOPinhole() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOPinhole() override {} //---------- Default behaviour void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOPlateSplitter.h b/Alignment/CocoaModel/interface/OptOPlateSplitter.h index 7c2f04b22ee7a..db536739637a8 100644 --- a/Alignment/CocoaModel/interface/OptOPlateSplitter.h +++ b/Alignment/CocoaModel/interface/OptOPlateSplitter.h @@ -18,10 +18,10 @@ class LightRay; class OptOPlateSplitter : public OpticalObject { public: //---------- Constructors / Destructor - OptOPlateSplitter(){}; + OptOPlateSplitter() {} OptOPlateSplitter(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOPlateSplitter() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOPlateSplitter() override {} //---------- Detailed simulation of deviation of the light ray (reflection, shift, ...) void detailedDeviatesLightRay(LightRay& lightray) override; diff --git a/Alignment/CocoaModel/interface/OptORisleyPrism.h b/Alignment/CocoaModel/interface/OptORisleyPrism.h index 5877c2d55fa45..c7484c78527ba 100644 --- a/Alignment/CocoaModel/interface/OptORisleyPrism.h +++ b/Alignment/CocoaModel/interface/OptORisleyPrism.h @@ -18,10 +18,10 @@ class LightRay; class OptORisleyPrism : public OpticalObject { public: //---------- Constructors / Destructor - OptORisleyPrism(){}; + OptORisleyPrism() {} OptORisleyPrism(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptORisleyPrism() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptORisleyPrism() override {} //---------- Propagate light for measurement meas void participateInMeasurement(LightRay& lightray, Measurement& meas, const ALIstring& behav) override; diff --git a/Alignment/CocoaModel/interface/OptOScreen.h b/Alignment/CocoaModel/interface/OptOScreen.h index af0723be02957..36c628bcd06bc 100644 --- a/Alignment/CocoaModel/interface/OptOScreen.h +++ b/Alignment/CocoaModel/interface/OptOScreen.h @@ -18,10 +18,10 @@ class LightRay; class OptOScreen : public OpticalObject { public: //---------- Constructors / Destructor - OptOScreen(){}; + OptOScreen() {} OptOScreen(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOScreen() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOScreen() override {} //---------- defaultBehaviour: do nothing void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOSensor2D.h b/Alignment/CocoaModel/interface/OptOSensor2D.h index 738abcc5189c4..f7a65fa15dc6e 100644 --- a/Alignment/CocoaModel/interface/OptOSensor2D.h +++ b/Alignment/CocoaModel/interface/OptOSensor2D.h @@ -19,10 +19,10 @@ class DeviationsFromFileSensor2D; class OptOSensor2D : public OpticalObject { public: //---------- Constructors / Destructor - OptOSensor2D(){}; + OptOSensor2D() {} OptOSensor2D(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data), fdevi_from_file(false){}; - ~OptOSensor2D() override{}; + : OpticalObject(parent, type, name, copy_data), fdevi_from_file(false) {} + ~OptOSensor2D() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOSource.h b/Alignment/CocoaModel/interface/OptOSource.h index 15d2d9d51783a..d8f5a1c3d9386 100644 --- a/Alignment/CocoaModel/interface/OptOSource.h +++ b/Alignment/CocoaModel/interface/OptOSource.h @@ -20,8 +20,8 @@ class OptOSource : public OpticalObject { //---------- Constructors / Destructor OptOSource(); OptOSource(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOSource() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOSource() override {} #ifdef COCOA_VIS virtual void fillVRML(); diff --git a/Alignment/CocoaModel/interface/OptOTiltmeter.h b/Alignment/CocoaModel/interface/OptOTiltmeter.h index e5868419c8fbf..c9c1b64a8bc50 100644 --- a/Alignment/CocoaModel/interface/OptOTiltmeter.h +++ b/Alignment/CocoaModel/interface/OptOTiltmeter.h @@ -18,10 +18,10 @@ class LightRay; class OptOTiltmeter : public OpticalObject { public: //---------- Constructors / Destructor - OptOTiltmeter(){}; + OptOTiltmeter() {} OptOTiltmeter(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOTiltmeter() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOTiltmeter() override {} //---------- defaultBehaviour: make measurement void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OptOUserDefined.h b/Alignment/CocoaModel/interface/OptOUserDefined.h index 5d821c8cf9b1c..23602d60fb043 100644 --- a/Alignment/CocoaModel/interface/OptOUserDefined.h +++ b/Alignment/CocoaModel/interface/OptOUserDefined.h @@ -18,10 +18,10 @@ class LightRay; class OptOUserDefined : public OpticalObject { public: //---------- Constructors / Destructor - OptOUserDefined(){}; + OptOUserDefined() {} OptOUserDefined(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOUserDefined() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOUserDefined() override {} #ifdef COCOA_VIS virtual void fillVRML() override; diff --git a/Alignment/CocoaModel/interface/OptOXLaser.h b/Alignment/CocoaModel/interface/OptOXLaser.h index 751e67b42589c..d26a1e44c82d1 100644 --- a/Alignment/CocoaModel/interface/OptOXLaser.h +++ b/Alignment/CocoaModel/interface/OptOXLaser.h @@ -18,10 +18,10 @@ class LightRay; class OptOXLaser : public OpticalObject { public: //---------- Constructors / Destructor - OptOXLaser(){}; + OptOXLaser() {} OptOXLaser(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data) - : OpticalObject(parent, type, name, copy_data){}; - ~OptOXLaser() override{}; + : OpticalObject(parent, type, name, copy_data) {} + ~OptOXLaser() override {} //---------- Default behaviour: create a LightRay object void defaultBehaviour(LightRay& lightray, Measurement& meas) override; diff --git a/Alignment/CocoaModel/interface/OpticalObject.h b/Alignment/CocoaModel/interface/OpticalObject.h index 8f25d08e91db3..4275bc7a68bed 100644 --- a/Alignment/CocoaModel/interface/OpticalObject.h +++ b/Alignment/CocoaModel/interface/OpticalObject.h @@ -37,7 +37,7 @@ class OpticalObject { public: //---------- Constructors / destructor - OpticalObject(){}; + OpticalObject() {} OpticalObject(OpticalObject* parent, const ALIstring& type, const ALIstring& name, const ALIbool copy_data); virtual ~OpticalObject(); @@ -51,8 +51,8 @@ class OpticalObject { virtual void constructMaterial(); virtual void constructSolidShape(); - virtual void fillVRML(){}; - virtual void fillIguana(){}; + virtual void fillVRML() {} + virtual void fillIguana() {} // ACCESS DATA MEMBERS const ALIstring& name() const { return theName; }; diff --git a/Alignment/CocoaModel/interface/OpticalObjectMgr.h b/Alignment/CocoaModel/interface/OpticalObjectMgr.h index 05386b93190ed..71d3d634ab61e 100644 --- a/Alignment/CocoaModel/interface/OpticalObjectMgr.h +++ b/Alignment/CocoaModel/interface/OpticalObjectMgr.h @@ -18,8 +18,8 @@ class OpticalObject; class OpticalObjectMgr { public: - OpticalObjectMgr(){}; - ~OpticalObjectMgr(){}; + OpticalObjectMgr() {} + ~OpticalObjectMgr() {} /// Get the only instance static OpticalObjectMgr* getInstance(); diff --git a/Alignment/CocoaModel/interface/ParameterMgr.h b/Alignment/CocoaModel/interface/ParameterMgr.h index 365f583be155e..42b69e0a5bf9d 100644 --- a/Alignment/CocoaModel/interface/ParameterMgr.h +++ b/Alignment/CocoaModel/interface/ParameterMgr.h @@ -14,7 +14,7 @@ typedef std::map > msd; class ParameterMgr { private: - ParameterMgr(){}; + ParameterMgr() {} public: static ParameterMgr* getInstance(); diff --git a/Alignment/CocoaToDDL/interface/CocoaToDDLMgr.h b/Alignment/CocoaToDDL/interface/CocoaToDDLMgr.h index bd62a5e404cac..813667030c27a 100644 --- a/Alignment/CocoaToDDL/interface/CocoaToDDLMgr.h +++ b/Alignment/CocoaToDDL/interface/CocoaToDDLMgr.h @@ -25,8 +25,8 @@ class OpticalObject; class CocoaToDDLMgr { public: //---------- Constructors / Destructor - CocoaToDDLMgr(){}; - ~CocoaToDDLMgr(){}; + CocoaToDDLMgr() {} + ~CocoaToDDLMgr() {} static CocoaToDDLMgr* getInstance(); void writeDDDFile(ALIstring filename); diff --git a/Alignment/CocoaUtilities/interface/ALIFileIn.h b/Alignment/CocoaUtilities/interface/ALIFileIn.h index c39d748fc2b57..84b2c6f6bce0a 100644 --- a/Alignment/CocoaUtilities/interface/ALIFileIn.h +++ b/Alignment/CocoaUtilities/interface/ALIFileIn.h @@ -19,7 +19,7 @@ class ALIFileIn { public: - ALIFileIn(){}; + ALIFileIn() {} ~ALIFileIn() {} private: diff --git a/Alignment/CocoaUtilities/interface/ALIFileOut.h b/Alignment/CocoaUtilities/interface/ALIFileOut.h index 59d5b8944f18f..88e7d526f7340 100644 --- a/Alignment/CocoaUtilities/interface/ALIFileOut.h +++ b/Alignment/CocoaUtilities/interface/ALIFileOut.h @@ -20,9 +20,9 @@ class ALIFileOut : public std::ofstream { public: - ALIFileOut(){}; - ALIFileOut(const ALIstring& name) : std::ofstream(), theName(name){}; - ~ALIFileOut() override{}; + ALIFileOut() {} + ALIFileOut(const ALIstring& name) : std::ofstream(), theName(name) {} + ~ALIFileOut() override {} // get the instance of file with name filename static ALIFileOut& getInstance(const ALIstring& filename); diff --git a/Alignment/CocoaUtilities/interface/ALIUtils.h b/Alignment/CocoaUtilities/interface/ALIUtils.h index 5772049595d4b..8cba52fefe251 100644 --- a/Alignment/CocoaUtilities/interface/ALIUtils.h +++ b/Alignment/CocoaUtilities/interface/ALIUtils.h @@ -22,8 +22,8 @@ class ALIUtils { public: - ALIUtils(){}; - ~ALIUtils(){}; + ALIUtils() {} + ~ALIUtils() {} static int IsNumber(const ALIstring& str); static void dump3v(const CLHEP::Hep3Vector& vec, const std::string& msg); diff --git a/Alignment/CocoaUtilities/interface/GlobalOptionMgr.h b/Alignment/CocoaUtilities/interface/GlobalOptionMgr.h index 020c9ab862eae..0517f0eacb79f 100644 --- a/Alignment/CocoaUtilities/interface/GlobalOptionMgr.h +++ b/Alignment/CocoaUtilities/interface/GlobalOptionMgr.h @@ -17,11 +17,11 @@ class ALIFileIn; class GlobalOptionMgr { private: - GlobalOptionMgr(){}; + GlobalOptionMgr() {} public: //---------- Constructors / Destructor - ~GlobalOptionMgr(){}; + ~GlobalOptionMgr() {} static GlobalOptionMgr* getInstance(); public: diff --git a/Alignment/CommonAlignment/interface/Alignable.h b/Alignment/CommonAlignment/interface/Alignable.h index 3ded45fe5a925..0dd59f69c5e10 100644 --- a/Alignment/CommonAlignment/interface/Alignable.h +++ b/Alignment/CommonAlignment/interface/Alignable.h @@ -254,7 +254,7 @@ class Alignable { private: /// private default ctr. to enforce usage of the specialised ones - Alignable(){}; + Alignable() {} AlignmentParameters* theAlignmentParameters; diff --git a/Alignment/CommonAlignment/interface/AlignableComposite.h b/Alignment/CommonAlignment/interface/AlignableComposite.h index d770a66c73c82..ac2b24e2ee2ec 100644 --- a/Alignment/CommonAlignment/interface/AlignableComposite.h +++ b/Alignment/CommonAlignment/interface/AlignableComposite.h @@ -115,7 +115,7 @@ class AlignableComposite : public Alignable { private: /// default constructor hidden - AlignableComposite() : Alignable(0, RotationType()){}; + AlignableComposite() : Alignable(0, RotationType()) {} Alignables theComponents; // direct daughters }; diff --git a/Alignment/CommonAlignment/interface/AlignableMap.h b/Alignment/CommonAlignment/interface/AlignableMap.h index 2b070a93a615d..fa1b45c78562e 100644 --- a/Alignment/CommonAlignment/interface/AlignableMap.h +++ b/Alignment/CommonAlignment/interface/AlignableMap.h @@ -28,8 +28,8 @@ class AlignableMap { using Container = std::map; public: - AlignableMap(){}; - virtual ~AlignableMap(){}; + AlignableMap() {} + virtual ~AlignableMap() {} /// Get an object from map using its name. /// A new object is default-constructed if the name does not exist. diff --git a/Alignment/CommonAlignment/interface/AlignmentLevel.h b/Alignment/CommonAlignment/interface/AlignmentLevel.h index 3ed6cc5f6a920..c126230471b8f 100644 --- a/Alignment/CommonAlignment/interface/AlignmentLevel.h +++ b/Alignment/CommonAlignment/interface/AlignmentLevel.h @@ -10,7 +10,7 @@ class AlignmentLevel { //========================== PUBLIC METHODS ================================= public: //=================================================================== AlignmentLevel(align::StructureType levelType, unsigned int maxNumComponents, bool isFlat) - : levelType(levelType), maxNumComponents(maxNumComponents), isFlat(isFlat){}; + : levelType(levelType), maxNumComponents(maxNumComponents), isFlat(isFlat) {} // copy construction + assignment AlignmentLevel(const AlignmentLevel&) = default; AlignmentLevel& operator=(const AlignmentLevel&) = default; diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h index c7a243bb856a5..4d9dd6961c0ec 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h @@ -14,10 +14,10 @@ class AlignableDataIO { enum PosType { Abs, Org, Rel }; /// Constructor - AlignableDataIO(PosType p) : thePosType(p){}; + AlignableDataIO(PosType p) : thePosType(p) {} /// Destructor - virtual ~AlignableDataIO(){}; + virtual ~AlignableDataIO() {} /// Open IO handle virtual int open(const char* filename, int iteration, bool writemode) = 0; diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h index d0849fe78a119..872b08be88e14 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h @@ -112,10 +112,10 @@ class AlignmentAlgorithmBase { }; /// Constructor - AlignmentAlgorithmBase(const edm::ParameterSet &, const edm::ConsumesCollector &){}; + AlignmentAlgorithmBase(const edm::ParameterSet &, const edm::ConsumesCollector &) {} /// Destructor - virtual ~AlignmentAlgorithmBase(){}; + virtual ~AlignmentAlgorithmBase() {} /// Call at beginning of job (must be implemented in derived class) virtual void initialize(const edm::EventSetup &setup, @@ -161,16 +161,16 @@ class AlignmentAlgorithmBase { virtual void run(const edm::EventSetup &setup, const EventInfo &eventInfo) = 0; /// called at begin of run - virtual void beginRun(const edm::Run &, const edm::EventSetup &, bool changed){}; + virtual void beginRun(const edm::Run &, const edm::EventSetup &, bool changed) {} /// called at end of run - order of arguments like in EDProducer etc. - virtual void endRun(const EndRunInfo &runInfo, const edm::EventSetup &setup){}; + virtual void endRun(const EndRunInfo &runInfo, const edm::EventSetup &setup) {} /// called at begin of luminosity block (no lumi block info passed yet) - virtual void beginLuminosityBlock(const edm::EventSetup &setup){}; + virtual void beginLuminosityBlock(const edm::EventSetup &setup) {} /// called at end of luminosity block (no lumi block info passed yet) - virtual void endLuminosityBlock(const edm::EventSetup &setup){}; + virtual void endLuminosityBlock(const edm::EventSetup &setup) {} /// called in order to pass parameters to alignables for a specific run /// range in case the algorithm supports run range dependent alignment. diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h index fd52e6e3b2db3..372da591ecd08 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h @@ -45,7 +45,7 @@ class AlignmentParameterBuilder { const edm::ParameterSet &pSet); /// destructor - virtual ~AlignmentParameterBuilder(){}; + virtual ~AlignmentParameterBuilder() {} /// master initialisation method, PSet must have form as constructor wants it void addAllSelections(const edm::ParameterSet &pSet); diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h index 0732a12a3a3f0..5e68d38847c77 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h @@ -13,7 +13,7 @@ class AlignmentParametersIO { protected: - virtual ~AlignmentParametersIO(){}; + virtual ~AlignmentParametersIO() {} /// open IO virtual int open(const char* filename, int iteration, bool writemode) = 0; diff --git a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h index 20b8a61ab0700..126b7d0d6ee19 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h @@ -47,7 +47,7 @@ class IntegratedCalibrationBase { explicit IntegratedCalibrationBase(const edm::ParameterSet &cfg); /// Destructor - virtual ~IntegratedCalibrationBase(){}; + virtual ~IntegratedCalibrationBase() {} /// How many parameters does this calibration define? virtual unsigned int numParameters() const = 0; @@ -88,21 +88,21 @@ class IntegratedCalibrationBase { /// Call at beginning of job: /// default implementation is dummy, to be overwritten in derived class if useful. - virtual void beginOfJob(AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras){}; + virtual void beginOfJob(AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras) {} /// Call at beginning of run: /// default implementation is dummy, to be overwritten in derived class if useful. - virtual void beginRun(const edm::Run &, const edm::EventSetup &){}; + virtual void beginRun(const edm::Run &, const edm::EventSetup &) {} /// Called at beginning of a loop of the AlignmentProducer, /// to be used for iterative algorithms, default does nothing. /// FIXME: move call to algorithm? - virtual void startNewLoop(){}; + virtual void startNewLoop() {} /// Called at end of a loop of the AlignmentProducer, /// to be used for iterative algorithms, default does nothing. /// FIXME: move call to algorithm? - virtual void endOfLoop(){}; + virtual void endOfLoop() {} /// Called at end of a the job of the AlignmentProducer. /// Do here the necessary stuff with the results that should have been passed diff --git a/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h b/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h index cb955a6e410fb..b0ab14874879b 100644 --- a/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h +++ b/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h @@ -40,7 +40,7 @@ class TkModuleGroupSelector { const std::vector &sdets); /// Destructor - virtual ~TkModuleGroupSelector(){}; + virtual ~TkModuleGroupSelector() {} // Returns the number of parameters. unsigned int getNumberOfParameters() const; diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc b/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc index b1b7afe628f01..e5ef7c6e69c49 100644 --- a/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc +++ b/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc @@ -234,7 +234,7 @@ void ApeSettingAlgorithm::terminate(const edm::EventSetup &iSetup) { am[2][1] = rt.zy(); am[2][2] = rt.zz(); sm = sm.similarity(am); //symmetric matrix - } //transform to local + } //transform to local for (int j = 0; j < sm.num_row(); ++j) for (int k = 0; k <= j; ++k) apeSaveFile << " " << sm[j][k]; //always write full matrix diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc index d35477a8322cf..f80fb78e59b60 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonResiduals.cc @@ -34,7 +34,7 @@ class AlignmentMonitorMuonResiduals : public AlignmentMonitorBase { public: AlignmentMonitorMuonResiduals(const edm::ParameterSet &cfg, edm::ConsumesCollector iC); - ~AlignmentMonitorMuonResiduals() override{}; + ~AlignmentMonitorMuonResiduals() override {} void book() override; void event(const edm::Event &iEvent, @@ -2012,7 +2012,7 @@ void AlignmentMonitorMuonResiduals::event(const edm::Event &iEvent, } // else if CSC } // end if good hit - } // end loop over measurements + } // end loop over measurements } // end loop over track-trajectories } @@ -2264,7 +2264,7 @@ void AlignmentMonitorMuonResiduals::afterAlignment() { m_xerronmean_me41->Fill(xerronmean); } } // else itis CSC - } // end if xmean, xstdev exist + } // end if xmean, xstdev exist if (m_numy[id] > 0.) { double ymean = m_y_wy[id] / m_y_w[id]; @@ -2458,7 +2458,7 @@ void AlignmentMonitorMuonResiduals::afterAlignment() { m_yerronmean_me41->Fill(yerronmean); } } // else itis CSC - } // end if ymean, ystdev exist + } // end if ymean, ystdev exist } // end loop over chambers } diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc index a7cfa99f7ea56..ce4703de884ed 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonSystemMap1D.cc @@ -276,7 +276,7 @@ void AlignmentMonitorMuonSystemMap1D::book() { } } } // endcaps - } // stations + } // stations m_counter_event = 0; m_counter_track = 0; @@ -322,7 +322,7 @@ void AlignmentMonitorMuonSystemMap1D::event(const edm::Event &iEvent, processMuonResidualsFromTrack(muonResidualsFromTrack, iEvent); } } // end if track has acceptable momentum - } // end loop over tracks + } // end loop over tracks } else { const edm::Handle &muons = iEvent.getHandle(muonToken_); diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc index 4004983d9373a..0bc5dc043cdf7 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorMuonVsCurvature.cc @@ -221,7 +221,7 @@ void AlignmentMonitorMuonVsCurvature::event(const edm::Event &iEvent, builder, magneticField, globalGeometry, muonDetIdAssociator_, prop, traj, track, pNavigator(), 1000.); processMuonResidualsFromTrack(muonResidualsFromTrack, traj); } // end if track pT is within range - } // end loop over tracks + } // end loop over tracks } else { const edm::Handle &muons = iEvent.getHandle(muonToken_); @@ -287,7 +287,7 @@ void AlignmentMonitorMuonVsCurvature::processMuonResidualsFromTrack(MuonResidual tprofile_wheel_st_sector[wheel][station][sector][kDeltaDxDz]->Fill(qoverpt, resid_dxdz); } } // if it's a good segment - } // if DT + } // if DT if (m_doCSC && chamberId->subdetId() == MuonSubdetId::CSC) { CSCDetId cscid(chamberId->rawId()); @@ -310,7 +310,7 @@ void AlignmentMonitorMuonVsCurvature::processMuonResidualsFromTrack(MuonResidual tprofile_st_ring_chamber[station][ring][chamber][kDeltaDxDz]->Fill(qoverpz, resid_dxdz); } } // if it's a good segment - } // if CSC + } // if CSC } // end loop over chamberIds } diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc index f3603dda2fbdf..9abd676356b8b 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorSegmentDifferences.cc @@ -473,8 +473,8 @@ void AlignmentMonitorSegmentDifferences::processMuonResidualsFromTrack(MuonResid } } } // end other numhits - } // end this near other - } // end other is DT + } // end this near other + } // end other is DT // cross-system: other is CSC // only do it for DT stubs in W+-2 St1&2: @@ -516,8 +516,8 @@ void AlignmentMonitorSegmentDifferences::processMuonResidualsFromTrack(MuonResid } } } // end other is CSC - } // end loop over other - } // end if DT13 + } // end loop over other + } // end if DT13 // z-direction if (dt2 != nullptr && dt2->numHits() >= m_minDT2Hits && (dt2->chi2() / double(dt2->ndof())) < 2.0) { @@ -550,11 +550,11 @@ void AlignmentMonitorSegmentDifferences::processMuonResidualsFromTrack(MuonResid } } } // end other numhits - } // end this near other - } // end other is DT - } // end loop over other - } // end if DT2 - } // end if DT + } // end this near other + } // end other is DT + } // end loop over other + } // end if DT2 + } // end if DT // **************** CSC **************** else if (m_doCSC && chamberId->subdetId() == MuonSubdetId::CSC) { @@ -610,13 +610,13 @@ void AlignmentMonitorSegmentDifferences::processMuonResidualsFromTrack(MuonResid } } } // end of same ring&chamber - } // end other min numhits - } // end this near other - } // end other is CSC - } // end loop over other + } // end other min numhits + } // end this near other + } // end other is CSC + } // end loop over other } // end if this min numhits - } // end if CSC + } // end if CSC } // end loop over chamberIds } diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc index bb0cd79b49cec..06cbff3ec731f 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentMonitorTemplate.cc @@ -28,8 +28,8 @@ class AlignmentMonitorTemplate : public AlignmentMonitorBase { public: AlignmentMonitorTemplate(const edm::ParameterSet& cfg, edm::ConsumesCollector iC) - : AlignmentMonitorBase(cfg, iC, "AlignmentMonitorTemplate"){}; - ~AlignmentMonitorTemplate() override{}; + : AlignmentMonitorBase(cfg, iC, "AlignmentMonitorTemplate") {} + ~AlignmentMonitorTemplate() override {} void book() override; void event(const edm::Event& iEvent, @@ -123,8 +123,8 @@ void AlignmentMonitorTemplate::event(const edm::Event& iEvent, search->second->Fill(tsosc.localPosition().x() - hit->localPosition().x()); } } // end if hit is valid - } // end loop over hits - } // end loop over tracks/trajectories + } // end loop over hits + } // end loop over tracks/trajectories } void AlignmentMonitorTemplate::afterAlignment() { diff --git a/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc b/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc index e927cfdc9e747..5985da9f1745b 100644 --- a/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc +++ b/Alignment/CommonAlignmentMonitor/plugins/AlignmentStats.cc @@ -72,7 +72,7 @@ class AlignmentStats : public edm::one::EDAnalyzer { ~AlignmentStats() override = default; static void fillDescriptions(edm::ConfigurationDescriptions &descriptions); - void beginRun(edm::Run const &, edm::EventSetup const &) override{}; + void beginRun(edm::Run const &, edm::EventSetup const &) override {} void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override; void endRun(edm::Run const &iRun, edm::EventSetup const &iSetup) override; void beginJob() override; diff --git a/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h index d7009029e4376..06b2d9c85ef0f 100644 --- a/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h +++ b/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h @@ -56,7 +56,7 @@ class BowedSurfaceAlignmentParameters : public AlignmentParameters { const std::vector &selection); /// Destructor - ~BowedSurfaceAlignmentParameters() override{}; + ~BowedSurfaceAlignmentParameters() override {} void apply() override; int type() const override; diff --git a/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h b/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h index b2ace06ddadb7..a48abd1efcfac 100644 --- a/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h +++ b/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h @@ -30,7 +30,7 @@ class CompositeAlignmentDerivativesExtractor { const std::vector &tsos); /// destructor - ~CompositeAlignmentDerivativesExtractor(void){}; + ~CompositeAlignmentDerivativesExtractor(void) {} const AlgebraicMatrix &derivatives(void) const { return theDerivatives; } const AlgebraicVector &correctionTerm(void) const { return theCorrectionTerm; } diff --git a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h index 32bb452429cd8..213f71e014a17 100644 --- a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h +++ b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h @@ -40,7 +40,7 @@ class RigidBodyAlignmentParameters : public AlignmentParameters { const std::vector &selection); /// Destructor - ~RigidBodyAlignmentParameters() override{}; + ~RigidBodyAlignmentParameters() override {} void apply() override; int type() const override; diff --git a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h index a3a6303936036..d435b23b349e1 100644 --- a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h +++ b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h @@ -25,23 +25,23 @@ class RigidBodyAlignmentParameters4D : public RigidBodyAlignmentParameters { /// parameters (no covariance) created from current (mis-)placement of /// alignable (if calcMis = true). RigidBodyAlignmentParameters4D(Alignable *alignable, bool calcMis) - : RigidBodyAlignmentParameters(alignable, calcMis){}; + : RigidBodyAlignmentParameters(alignable, calcMis) {} /// Constructor for full set of parameters RigidBodyAlignmentParameters4D(Alignable *alignable, const AlgebraicVector ¶meters, const AlgebraicSymMatrix &covMatrix) - : RigidBodyAlignmentParameters(alignable, parameters, covMatrix){}; + : RigidBodyAlignmentParameters(alignable, parameters, covMatrix) {} /// Constructor for selection RigidBodyAlignmentParameters4D(Alignable *alignable, const AlgebraicVector ¶meters, const AlgebraicSymMatrix &covMatrix, const std::vector &selection) - : RigidBodyAlignmentParameters(alignable, parameters, covMatrix, selection){}; + : RigidBodyAlignmentParameters(alignable, parameters, covMatrix, selection) {} /// Destructor - ~RigidBodyAlignmentParameters4D() override{}; + ~RigidBodyAlignmentParameters4D() override {} int type() const override; diff --git a/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h index 7859141491bf9..72f2ff9590fdf 100644 --- a/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h +++ b/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h @@ -84,7 +84,7 @@ class TwoBowedSurfacesAlignmentParameters : public AlignmentParameters { const std::vector &selection); /// Destructor - ~TwoBowedSurfacesAlignmentParameters() override{}; + ~TwoBowedSurfacesAlignmentParameters() override {} void apply() override; int type() const override; diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc index 04e99668cc357..4366531e72e76 100644 --- a/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc +++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc @@ -206,14 +206,14 @@ void AlignmentMuonHIPTrajectorySelector::produce(edm::Event& iEvent, const edm:: m_resid_after->Fill(residual); } } // end if residuals pass cut - } // end second loop over hits - } // end if filling histograms + } // end second loop over hits + } // end if filling histograms if (tracker_forwardredchi2 < m_maxTrackerForwardRedChi2 && tracker_dof >= m_minTrackerDOF && !has_bad_residual) { newTrajTrackMap->insert((*iPair).key, (*iPair).val); } // end if passes tracker cuts - } // end if passes pT cut - } // end loop over original trajTrackMap + } // end if passes pT cut + } // end loop over original trajTrackMap // put it in the Event iEvent.put(std::move(newTrajTrackMap)); diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc index 6c5a325fdf700..1de9b85470c80 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc @@ -44,7 +44,7 @@ AlignmentCSCBeamHaloSelector::Tracks AlignmentCSCBeamHaloSelector::select(const } station_map[station]++; } // end if it's a CSC hit - } // end loop over hits + } // end loop over hits unsigned int stations = 0; for (std::map::const_iterator station_iter = station_map.begin(); diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc index a8edd189e46ee..97e9911a6d99c 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc @@ -103,7 +103,7 @@ AlignmentCSCOverlapSelector::Tracks AlignmentCSCOverlapSelector::select(const Tr } } // end if it's a CSC hit - } // end loop over hits + } // end loop over hits if ((m_station == 0 || m_station == -4) && (MEminus4_even >= m_minHitsPerChamber) && (MEminus4_odd >= m_minHitsPerChamber)) diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc index 545258e38ea53..a09f765c65f19 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc @@ -51,7 +51,7 @@ AlignmentCSCTrackSelector::Tracks AlignmentCSCTrackSelector::select(const Tracks hitsOnStationB++; } // end if CSC - } // end loop over hits + } // end loop over hits bool stationAokay; if (m_stationA == 0) diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc index 35b1b72f26acc..bce77755f2d26 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc @@ -710,7 +710,7 @@ AlignmentTrackSelector::Tracks AlignmentTrackSelector::checkPrescaledHits(const continue; } - } //end if hit in Strips + } //end if hit in Strips else { // test explicitely BPIX/FPIX const SiPixelRecHit* pixelhit = dynamic_cast(hit); if (pixelhit != nullptr) { diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexCompositeCandidateSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexCompositeCandidateSelector.cc index 8acd0f017a60b..3c4f0a0706a4d 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexCompositeCandidateSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexCompositeCandidateSelector.cc @@ -60,8 +60,8 @@ AlignmentTrackFromVertexCompositeCandidateSelector::Tracks AlignmentTrackFromVer LogDebug("AlignmentTrackFromVertexSelector") << "track index: " << indx << "filling result vector" << std::endl; result.push_back(&(*tk)); } // if a valid key is found - } // end loop over tracks - } // if the handle is valid + } // end loop over tracks + } // if the handle is valid LogDebug("AlignmentTrackFromVertexCompositeCandidateSelector") << "collection will have size: " << result.size() << std::endl; diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexSelector.cc index 76f42d997417b..4c77d64dccfbb 100644 --- a/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexSelector.cc +++ b/Alignment/CommonAlignmentProducer/src/AlignmentTracksFromVertexSelector.cc @@ -122,7 +122,7 @@ AlignmentTrackFromVertexSelector::Tracks AlignmentTrackFromVertexSelector::selec LogDebug("AlignmentTrackFromVertexSelector") << "track index: " << indx << "filling result vector" << std::endl; result.push_back(&(*tk)); } // if a valid key is found - } // end loop over tracks - } // if the handle is valid + } // end loop over tracks + } // if the handle is valid return result; } diff --git a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp index 7a802dc13ee3e..7eeb32fa6da32 100644 --- a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp +++ b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp @@ -29,7 +29,7 @@ class GlobalPositionRcdWrite : public edm::one::EDAnalyzer<> { m_ecal(iConfig.getParameter("ecal")), m_hcal(iConfig.getParameter("hcal")), m_calo(iConfig.getParameter("calo")), - nEventCalls_(0){}; + nEventCalls_(0) {} ~GlobalPositionRcdWrite() {} virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup); diff --git a/Alignment/Geners/interface/AbsArchive.hh b/Alignment/Geners/interface/AbsArchive.hh index 90939bc00ae38..0b3d0cfe3ab80 100644 --- a/Alignment/Geners/interface/AbsArchive.hh +++ b/Alignment/Geners/interface/AbsArchive.hh @@ -109,7 +109,7 @@ namespace gs { private: friend class AbsReference; - friend gs::AbsArchive & ::operator<<(gs::AbsArchive &ar, const gs::AbsRecord &record); + friend gs::AbsArchive & ::operator<<(gs::AbsArchive & ar, const gs::AbsRecord & record); // Search for items which correspond to the given reference. // The "reference" works both as the input and as the output in diff --git a/Alignment/Geners/interface/AbsRecord.hh b/Alignment/Geners/interface/AbsRecord.hh index 05ecdfeff4f87..3ecb3edcfb535 100644 --- a/Alignment/Geners/interface/AbsRecord.hh +++ b/Alignment/Geners/interface/AbsRecord.hh @@ -31,7 +31,7 @@ namespace gs { : ItemDescriptor(classId, ioPrototype, name, category), itemId_(0), itemLength_(0) {} private: - friend gs::AbsArchive & ::operator<<(gs::AbsArchive &ar, const gs::AbsRecord &record); + friend gs::AbsArchive & ::operator<<(gs::AbsArchive & ar, const gs::AbsRecord & record); // The following functions must be overriden by derived classes. // "writeData" should return "true" upon success. diff --git a/Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h b/Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h index eaa757e9202fe..b62ae3e41e59d 100644 --- a/Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h +++ b/Alignment/HIPAlignmentAlgorithm/interface/HIPAlignmentAlgorithm.h @@ -39,7 +39,7 @@ class HIPAlignmentAlgorithm : public AlignmentAlgorithmBase { HIPAlignmentAlgorithm(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC); /// Destructor - ~HIPAlignmentAlgorithm() override{}; + ~HIPAlignmentAlgorithm() override {} /// Call at beginning of job void initialize(const edm::EventSetup& setup, diff --git a/Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariables.h b/Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariables.h index ce1fd59c3e468..addfeda0b0221 100644 --- a/Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariables.h +++ b/Alignment/HIPAlignmentAlgorithm/interface/HIPUserVariables.h @@ -35,7 +35,7 @@ class HIPUserVariables : public AlignmentUserVariables { alierr(other.alierr) {} /** destructor */ - ~HIPUserVariables() override{}; + ~HIPUserVariables() override {} /** clone method (copy constructor) */ HIPUserVariables* clone(void) const override { return new HIPUserVariables(*this); } diff --git a/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc b/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc index 39c6612187990..2460a4c543f12 100644 --- a/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc +++ b/Alignment/HIPAlignmentAlgorithm/src/HIPAlignmentAlgorithm.cc @@ -848,7 +848,7 @@ void HIPAlignmentAlgorithm::run(const edm::EventSetup& setup, const EventInfo& e << "ERROR in : Dynamic cast of Strip RecHit failed! " << "TypeId of the TTRH: " << className(*hit); } //end if type == SiStripRecHit2D - } //end if hit from strips + } //end if hit from strips else { const SiPixelRecHit* pixelhit = dynamic_cast(rechit); if (pixelhit) { @@ -1375,7 +1375,7 @@ void HIPAlignmentAlgorithm::collector(void) { } iuvar++; } // End loop over alignables - } // End loop over subjobs + } // End loop over subjobs } for (int ijob = 1; ijob <= theCollectorNJobs; ijob++) { diff --git a/Alignment/LaserAlignment/plugins/LaserAlignmentEventFilter.cc b/Alignment/LaserAlignment/plugins/LaserAlignmentEventFilter.cc index 8afe573f21ccf..5aa17204f99b2 100644 --- a/Alignment/LaserAlignment/plugins/LaserAlignmentEventFilter.cc +++ b/Alignment/LaserAlignment/plugins/LaserAlignmentEventFilter.cc @@ -99,7 +99,7 @@ bool LaserAlignmentEventFilter::filter(edm::StreamID sid, edm::Event& iEvent, co } } } // channel loop - } // FED loop + } // FED loop // LogDebug("LaserAlignmentEventFilter") << det_ctr << " channels were tested for signal\n" // < { void beginJob() override; void beginRun(edm::Run const&, edm::EventSetup const&) override; void analyze(const edm::Event&, const edm::EventSetup&) override; - void endRun(edm::Run const&, edm::EventSetup const&) override{}; + void endRun(edm::Run const&, edm::EventSetup const&) override {} void endJob() override; void fillDetectorId(void); diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc index 9c2765af9fb25..998ab7225a37a 100644 --- a/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc +++ b/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc @@ -152,8 +152,8 @@ void LaserBeamsBarrel::GeneratePrimaries(G4Event *myEvent) { theParticleGun->GeneratePrimaryVertex(myEvent); } } // end looop over both beam directions - } // end looop over particles in beam - } // end loop over beams + } // end looop over particles in beam + } // end loop over beams } void LaserBeamsBarrel::setOptPhotonPolar(G4double Angle) { diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc index 54132dc5f26a7..aadfb0d604fbc 100644 --- a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc +++ b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc @@ -154,9 +154,9 @@ void LaserBeamsTEC1::GeneratePrimaries(G4Event *myEvent) { theParticleGun->GeneratePrimaryVertex(myEvent); } } // end loop over both beam directions - } // end loop over particles in beam - } // end loop over beams - } // end loop over rings + } // end loop over particles in beam + } // end loop over beams + } // end loop over rings } void LaserBeamsTEC1::setOptPhotonPolar(G4double Angle) { diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc index 858a303d00c58..9182b1792e953 100644 --- a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc +++ b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc @@ -154,9 +154,9 @@ void LaserBeamsTEC2::GeneratePrimaries(G4Event *myEvent) { theParticleGun->GeneratePrimaryVertex(myEvent); } } // end loop over both beam directions - } // end loop over particles in beam - } // end loop over beams - } // end loop over rings + } // end loop over particles in beam + } // end loop over beams + } // end loop over rings } void LaserBeamsTEC2::setOptPhotonPolar(G4double Angle) { diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc index 5d1740324b5f9..eec6bcd0f27cd 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/MillePedeDQMModule.cc @@ -160,8 +160,8 @@ void MillePedeDQMModule ::dqmEndJob(DQMStore::IBooker& booker, DQMStore::IGetter } else { vetoStr = "N/A"; } // if the alignment exceeds the cutoffs - } // LG case - } // if the alignment was not stored + } // LG case + } // if the alignment was not stored exitCode->Fill(exitCodeStr); isVetoed->Fill(vetoStr); diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/PedeReader.cc b/Alignment/MillePedeAlignmentAlgorithm/src/PedeReader.cc index 4218618857c85..6f9e25f424030 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/src/PedeReader.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/src/PedeReader.cc @@ -152,7 +152,7 @@ bool PedeReader::readIfSameLine(std::ifstream &aStream, T &outValue) const { return true; } } // switch - } // while + } // while edm::LogError("Alignment") << "@SUB=PedeReader::readIfSameLine" << "Should never come here!"; diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc index 90ca15e3e623a..e07f4ca9de14f 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc +++ b/Alignment/MillePedeAlignmentAlgorithm/src/PedeSteerer.cc @@ -528,7 +528,7 @@ void PedeSteerer::hierarchyConstraint(const Alignable *ali, } aConstr << "\n"; ++nParPerConstr; // OK, we used one. - } // end loop on params + } // end loop on params // if (nParPerConstr && nParPerConstr >= theMinHieraParPerConstr) { // Enough to make sense? @@ -585,9 +585,9 @@ unsigned int PedeSteerer::presigmas(const std::vector &cffPre } presigmas[iParam] = presigma; } // end if selected for presigma - } // end loop on params - } // end loop on alignables for given selection and presigma - } // end loop on PSets + } // end loop on params + } // end loop on alignables for given selection and presigma + } // end loop on PSets if (aliPresiMap.empty()) return 0; @@ -640,7 +640,7 @@ unsigned int PedeSteerer::presigmasFile(const std::string &fileName, ++nPresiParam; } // end loop on parameters for alignables with chosen presigmas - } // end loop on alignables + } // end loop on alignables delete filePtr; // close properly file return nPresiParam; diff --git a/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h b/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h index 07f503f6aec05..4bb61ded439ad 100644 --- a/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h +++ b/Alignment/MuonAlignment/interface/MuonScenarioBuilder.h @@ -22,7 +22,7 @@ class MuonScenarioBuilder : public MisalignmentScenarioBuilder { explicit MuonScenarioBuilder(Alignable* alignable); /// Destructor - ~MuonScenarioBuilder() override{}; + ~MuonScenarioBuilder() override {} /// Apply misalignment scenario to the Muon void applyScenario(const edm::ParameterSet& scenario) override; diff --git a/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc b/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc index c9149d0728084..44f23bf6aaca9 100644 --- a/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc +++ b/Alignment/MuonAlignment/plugins/MuonGeometryArrange.cc @@ -853,8 +853,8 @@ void MuonGeometryArrange::compareGeometries(Alignable* refAli, Alignable* curAli TotalX += Rtotal; break; } // end of else - } // end of for on int i - } // end of for on ich + } // end of for on int i + } // end of for on ich // At this point we should have a total displacement and total L TotalX = TotalX / nUsed; @@ -1134,8 +1134,8 @@ bool MuonGeometryArrange::isMother(Alignable* ali) { for (int i = 0; i < size; i++) { if (checkChosen(aliComp[i])) return true; // A ring has CSC chambers - } // as subcomponents - return false; // 1'st layer of subcomponents weren't CSC chambers + } // as subcomponents + return false; // 1'st layer of subcomponents weren't CSC chambers } ////////////////////////////////////////////////// @@ -1190,8 +1190,8 @@ bool MuonGeometryArrange::passChosen(Alignable* ali) { for (int i = 0; i < size; i++) { if (checkChosen(aliComp[i])) return true; // A ring has CSC chambers - } // as subcomponents - return false; // 1'st layer of subcomponents weren't CSC chambers + } // as subcomponents + return false; // 1'st layer of subcomponents weren't CSC chambers } ////////////////////////////////////////////////// bool MuonGeometryArrange::passIdCut(uint32_t id) { diff --git a/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc b/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc index b0ed1e6e198a3..ed600bb60ed52 100644 --- a/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc +++ b/Alignment/MuonAlignment/plugins/MuonGeometryDBConverter.cc @@ -47,8 +47,8 @@ class MuonGeometryDBConverter : public edm::one::EDAnalyzer<> { ~MuonGeometryDBConverter() override; static void fillDescriptions(edm::ConfigurationDescriptions &); - void beginJob() override{}; - void endJob() override{}; + void beginJob() override {} + void endJob() override {} private: void analyze(const edm::Event &, const edm::EventSetup &) override; diff --git a/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc b/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc index 5c9b74918d3ac..fed73e4c1677a 100644 --- a/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc +++ b/Alignment/MuonAlignment/src/MuonAlignmentInputXML.cc @@ -360,11 +360,11 @@ AlignableMuon *MuonAlignmentInputXML::newAlignableMuon() const { aliset[ali] = true; } // end if this node is an element - } // end loop over collection's children + } // end loop over collection's children alicollections[name] = aliset; } // end if this is a top-level collection - } // end loop over collections + } // end loop over collections for (unsigned int i = 0; i < operations->getLength(); i++) { DOMElement *operation = (DOMElement *)(operations->item(i)); @@ -415,7 +415,7 @@ AlignableMuon *MuonAlignmentInputXML::newAlignableMuon() const { } // anything else? assume it's a position/rotation directive } // end if node is node is an element - } // end first loop over operation's children + } // end first loop over operation's children // from now on, we only want to see position/rotation directives for (std::vector::const_iterator node = nodesToRemove.begin(); node != nodesToRemove.end(); ++node) { @@ -464,8 +464,8 @@ AlignableMuon *MuonAlignmentInputXML::newAlignableMuon() const { } } // end if node is an element - } // end second loop over operation's children - } // end loop over operations + } // end second loop over operation's children + } // end loop over operations delete parser; delete errHandler; @@ -586,10 +586,10 @@ Alignable *MuonAlignmentInputXML::getDTnode(align::StructureType structureType, } } // end if we need a layer number - } // end if we need a superlayer number - } // end if we need a sector number - } // end if we need a station number - } // end if we need a wheel number + } // end if we need a superlayer number + } // end if we need a sector number + } // end if we need a station number + } // end if we need a wheel number DTLayerId layerId(wheel, station, sector, superlayer, layer); rawId = layerId.rawId(); @@ -679,9 +679,9 @@ Alignable *MuonAlignmentInputXML::getCSCnode(align::StructureType structureType, } } // end if we need a layer number - } // end if we need a chamber number - } // end if we need a ring number - } // end if we need a station number + } // end if we need a chamber number + } // end if we need a ring number + } // end if we need a station number CSCDetId layerId(endcap, station, ring, chamber, layer); rawId = layerId.rawId(); @@ -759,8 +759,8 @@ Alignable *MuonAlignmentInputXML::getGEMnode(align::StructureType structureType, throw cms::Exception("XMLException") << "Value of \"superChamber\" must be an integer" << std::endl; } } // end if we need a superchamber number - } // end if we need a ring number - } // end if we need a station number + } // end if we need a ring number + } // end if we need a station number GEMDetId chamberId(endcap, ring, station, 0, superChamber, 0); rawId = chamberId.rawId(); diff --git a/Alignment/MuonAlignment/src/MuonAlignmentOutputXML.cc b/Alignment/MuonAlignment/src/MuonAlignmentOutputXML.cc index cdcdd656551a6..47ccb7a462be9 100644 --- a/Alignment/MuonAlignment/src/MuonAlignmentOutputXML.cc +++ b/Alignment/MuonAlignment/src/MuonAlignmentOutputXML.cc @@ -230,7 +230,7 @@ void MuonAlignmentOutputXML::writeComponents(align::Alignables &alignables, } } // end if not rawId - } // end if DT + } // end if DT if (doDet == doCSC) { // CSC if (m_rawIds && rawId != 0) { @@ -263,7 +263,7 @@ void MuonAlignmentOutputXML::writeComponents(align::Alignables &alignables, } } // end if not rawId - } // end if CSC + } // end if CSC if (doDet == doGEM) { // GEM if (m_rawIds && rawId != 0) { @@ -296,7 +296,7 @@ void MuonAlignmentOutputXML::writeComponents(align::Alignables &alignables, } } // end if not rawId - } // end if GEM + } // end if GEM align::PositionType pos = (*alignable)->globalPosition(); align::RotationType rot = (*alignable)->globalRotation(); diff --git a/Alignment/MuonAlignmentAlgorithms/interface/CSCPairConstraint.h b/Alignment/MuonAlignmentAlgorithms/interface/CSCPairConstraint.h index ab53d3e9e52fb..3cdb5f2cfe8f6 100644 --- a/Alignment/MuonAlignmentAlgorithms/interface/CSCPairConstraint.h +++ b/Alignment/MuonAlignmentAlgorithms/interface/CSCPairConstraint.h @@ -13,8 +13,8 @@ class CSCPairConstraint { public: - CSCPairConstraint(int i, int j, double value, double error) : m_i(i), m_j(j), m_value(value), m_error(error){}; - virtual ~CSCPairConstraint(){}; + CSCPairConstraint(int i, int j, double value, double error) : m_i(i), m_j(j), m_value(value), m_error(error) {} + virtual ~CSCPairConstraint() {} virtual int i() const { return m_i; }; virtual int j() const { return m_j; }; diff --git a/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsTwoBin.h b/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsTwoBin.h index 376f36ab22465..bc1b2917a4594 100644 --- a/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsTwoBin.h +++ b/Alignment/MuonAlignmentAlgorithms/interface/MuonResidualsTwoBin.h @@ -15,7 +15,7 @@ class MuonResidualsTwoBin { public: MuonResidualsTwoBin(bool twoBin, MuonResidualsFitter *pos, MuonResidualsFitter *neg) - : m_twoBin(twoBin), m_pos(pos), m_neg(neg){}; + : m_twoBin(twoBin), m_pos(pos), m_neg(neg) {} ~MuonResidualsTwoBin() { if (m_pos != nullptr) delete m_pos; diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCAlignmentCorrections.h b/Alignment/MuonAlignmentAlgorithms/plugins/CSCAlignmentCorrections.h index 072ce9168d5b4..48162c3ff4f23 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCAlignmentCorrections.h +++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCAlignmentCorrections.h @@ -23,8 +23,8 @@ class CSCAlignmentCorrections { public: CSCAlignmentCorrections(std::string fitterName, double oldchi2, double newchi2) - : m_fitterName(fitterName), m_oldchi2(oldchi2), m_newchi2(newchi2){}; - virtual ~CSCAlignmentCorrections(){}; + : m_fitterName(fitterName), m_oldchi2(oldchi2), m_newchi2(newchi2) {} + virtual ~CSCAlignmentCorrections() {} void insertCorrection(std::string name, CSCDetId id, double value) { m_name.push_back(name); diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCChamberFitter.h b/Alignment/MuonAlignmentAlgorithms/plugins/CSCChamberFitter.h index b5d6bab7a4a06..673508d3778a3 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCChamberFitter.h +++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCChamberFitter.h @@ -24,7 +24,7 @@ class CSCChamberFitter { public: CSCChamberFitter(const edm::ParameterSet &iConfig, std::vector &residualsConstraints); - virtual ~CSCChamberFitter(){}; + virtual ~CSCChamberFitter() {} bool fit(std::vector &corrections) const; void radiusCorrection(AlignableNavigator *alignableNavigator, diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc index 183cc137acbd1..5cd1c881e6193 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc +++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc @@ -160,7 +160,7 @@ void CSCOverlapsTrackPreparation::produce(edm::Event& iEvent, const edm::EventSe TSOSes.push_back( TrajectoryStateOnSurface(localTrajectoryParameters, localTrajectoryError, layerSurface, &*magneticField)); } // end if CSC - } // end loop over hits + } // end loop over hits assert(clonedHits.size() == transHits.size()); assert(transHits.size() == TSOSes.size()); @@ -186,7 +186,7 @@ void CSCOverlapsTrackPreparation::produce(edm::Event& iEvent, const edm::EventSe reference_map[trajCounter] = trackCounter; } // end if there are any clonedHits/TSOSes to work with - } // end loop over tracks + } // end loop over tracks unsigned int numTrajectories = trajectoryCollection->size(); diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCPairResidualsConstraint.cc b/Alignment/MuonAlignmentAlgorithms/plugins/CSCPairResidualsConstraint.cc index df460fa3d9ad9..8536003c60c79 100644 --- a/Alignment/MuonAlignmentAlgorithms/plugins/CSCPairResidualsConstraint.cc +++ b/Alignment/MuonAlignmentAlgorithms/plugins/CSCPairResidualsConstraint.cc @@ -558,7 +558,7 @@ bool CSCPairResidualsConstraint::dphidzFromTrack(const std::vectorGet( Form("jetHTAnalyzer/%s_%s", iovNames.at(iIov).Data(), histogramName[iHistogramType].Data())); } // if for drawing histogram - } // histogram type loop + } // histogram type loop for (int iProfileType = 0; iProfileType < knProfileTypes; iProfileType++) { if (drawProfile[iProfileType] || (drawTrend[kDzErrorTrend] && iProfileType == kDzErrorVsPtWide) || (drawTrend[kDxyErrorTrend] && iProfileType == kDxyErrorVsPtWide)) { jetHtProfiles[iFile][iProfileType][iIov] = (TProfile *)inputFile[iFile]->Get( Form("jetHTAnalyzer/%s_%s", iovNames.at(iIov).Data(), profileName[iProfileType].Data())); } // if for drawing profile - } // profile type loop - } // iov loop for reading histograms from file - } // Regular histogram loading - } // Loop over files + } // profile type loop + } // iov loop for reading histograms from file + } // Regular histogram loading + } // Loop over files // Collect the information for the trend graphs const int nRuns = iovVector.size() - 1; @@ -819,8 +819,8 @@ void jetHtPlotter(std::string configurationFileName) { } } // Wide pT bin loop - } // File loop - } // If for drawing trends + } // File loop + } // If for drawing trends // =============================================== // Draw the plots @@ -924,7 +924,7 @@ void jetHtPlotter(std::string configurationFileName) { << Form("%s_%s", iovNames.at(iIov).Data(), histogramName[iHistogramType].Data()) << std::endl; } } // if for drawing histogram - } // histogram type loop + } // histogram type loop } // Draw dz and dxy profiles @@ -1142,7 +1142,7 @@ void jetHtPlotter(std::string configurationFileName) { } } // iov loop for drawing - } // if for drawing profiles for each IOV + } // if for drawing profiles for each IOV // First, setup the legends for the all runs plots doNotDrawEta = (!drawCentralEtaSummaryProfile || iProfileType == kDxyErrorVsEta || iProfileType == kDzErrorVsEta); @@ -1242,7 +1242,7 @@ void jetHtPlotter(std::string configurationFileName) { gPad->GetCanvas()->SaveAs(Form("output/%s%s_allIovs.pdf", profileName[iProfileType].Data(), saveComment)); } } // if for drawing profile - } // profile type loop + } // profile type loop // Close the output file if (makeIovListForSlides) @@ -1345,7 +1345,7 @@ void jetHtPlotter(std::string configurationFileName) { } } // Wide pT loop - } // Trend type loop + } // Trend type loop } /* diff --git a/Alignment/OfflineValidation/interface/TrackerValidationVariables.h b/Alignment/OfflineValidation/interface/TrackerValidationVariables.h index d26430a681181..1c426baa791fa 100644 --- a/Alignment/OfflineValidation/interface/TrackerValidationVariables.h +++ b/Alignment/OfflineValidation/interface/TrackerValidationVariables.h @@ -86,7 +86,7 @@ class TrackerValidationVariables { dz(-999.), charge(-999), numberOfValidHits(0), - numberOfLostHits(0){}; + numberOfLostHits(0) {} float p; float pt; float ptError; diff --git a/Alignment/OfflineValidation/interface/pvTree.h b/Alignment/OfflineValidation/interface/pvTree.h index 5d9b7fdcc410a..d1f4b58557ca6 100644 --- a/Alignment/OfflineValidation/interface/pvTree.h +++ b/Alignment/OfflineValidation/interface/pvTree.h @@ -45,8 +45,8 @@ class pvCand { float minW_subVtx1; float minW_subVtx2; - pvCand(){}; - virtual ~pvCand(){}; + pvCand() {} + virtual ~pvCand() {} ClassDef(pvCand, 1) }; @@ -61,8 +61,8 @@ class pvEvent { std::vector pvs; - pvEvent(){}; - virtual ~pvEvent(){}; + pvEvent() {} + virtual ~pvEvent() {} ClassDef(pvEvent, 1) }; diff --git a/Alignment/OfflineValidation/macros/FitPVResiduals.C b/Alignment/OfflineValidation/macros/FitPVResiduals.C index 04fe43f26e13a..3b7221559b482 100644 --- a/Alignment/OfflineValidation/macros/FitPVResiduals.C +++ b/Alignment/OfflineValidation/macros/FitPVResiduals.C @@ -3669,8 +3669,8 @@ void FillMap(TH2F *trendMap, std::cout << "FitPVResiduals::FillMap() " << fitPar_ << " unknown estimator!" << std::endl; break; } // closes the switch statement - } // closes loop on eta bins - } // cloeses loop on phi bins + } // closes loop on eta bins + } // cloeses loop on phi bins } /*--------------------------------------------------------------------*/ diff --git a/Alignment/OfflineValidation/plugins/EopElecTreeWriter.cc b/Alignment/OfflineValidation/plugins/EopElecTreeWriter.cc index 5a2ed8122a40d..7803017416be7 100644 --- a/Alignment/OfflineValidation/plugins/EopElecTreeWriter.cc +++ b/Alignment/OfflineValidation/plugins/EopElecTreeWriter.cc @@ -108,7 +108,7 @@ class EopElecTreeWriter : public edm::one::EDAnalyzer bool checkBinOrdering(std::array& bins); diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc index cd4a3b60d0cda..57c058bf15de6 100644 --- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc +++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc @@ -1394,7 +1394,7 @@ void TrackerOfflineValidation::analyze(const edm::Event& iEvent, const edm::Even } } // finish loop over hit quantities - } // finish loop over track quantities + } // finish loop over track quantities if (useOverflowForRMS_) TH1::StatOverflows(kFALSE); diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc index c723981544efb..23f4f86a0e7e3 100644 --- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc +++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidationSummary.cc @@ -98,7 +98,7 @@ class TrackerOfflineValidationSummary : public edm::one::EDAnalyzerFill(); } // end of loop on muons - } // end of loop for tracking particle - } // end of loop for efficiency + } // end of loop for tracking particle + } // end of loop for efficiency // // Fake Rate diff --git a/Alignment/OfflineValidation/src/GeometryComparisonPlotter.cc b/Alignment/OfflineValidation/src/GeometryComparisonPlotter.cc index 36df70af29971..736104890eb2c 100644 --- a/Alignment/OfflineValidation/src/GeometryComparisonPlotter.cc +++ b/Alignment/OfflineValidation/src/GeometryComparisonPlotter.cc @@ -742,7 +742,7 @@ void GeometryComparisonPlotter::MakePlots( // printing will be performed after customisation (e.g. legend or title) just after the loops on ix and iy } } // end of loop on y - } // end of loop on x + } // end of loop on x // CUSTOMISATION gStyle->SetOptTitle(0); // otherwise, the title is repeated in every pad of the global canvases @@ -1066,7 +1066,7 @@ void GeometryComparisonPlotter::MakePlots( } } // end of loop on y - } // end of loop on x + } // end of loop on x // CUSTOMISATION gStyle->SetOptTitle(0); // otherwise, the title is repeated in every pad of the global canvases diff --git a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc index 3e25890a0cad9..4eb8b6cd2247b 100644 --- a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc +++ b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc @@ -427,8 +427,7 @@ void TrackerValidationVariables::fillHitQuantities(const Trajectory* trajectory, void TrackerValidationVariables::fillTrackQuantities(const edm::Event& event, const edm::EventSetup& eventSetup, std::vector& v_avtrackout) { - fillTrackQuantities( - event, eventSetup, [](const reco::Track&) -> bool { return true; }, v_avtrackout); + fillTrackQuantities(event, eventSetup, [](const reco::Track&) -> bool { return true; }, v_avtrackout); } void TrackerValidationVariables::fillTrackQuantities(const edm::Event& event, diff --git a/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h b/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h index 8e6fa74672304..2c2df308bf8f5 100644 --- a/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h +++ b/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h @@ -28,7 +28,7 @@ class SurveyPxbDicer { typedef std::pair idPair_t; // Constructors - SurveyPxbDicer(){}; + SurveyPxbDicer() {} // Constructor from VPSet SurveyPxbDicer(const std::vector &pars, unsigned int seed); diff --git a/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h b/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h index 6023b2afa8be1..8164bd1627e7f 100644 --- a/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h +++ b/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h @@ -18,7 +18,7 @@ class SurveyPxbImageReader { // Constructors //! Empty default constructor - SurveyPxbImageReader(){}; + SurveyPxbImageReader() {} //! Constructor with ifstream and destination vector SurveyPxbImageReader(std::ifstream &infile, measurements_t &measurements, SurveyPxbImage::count_t reserve = 800) { read(infile, measurements, reserve); diff --git a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h index 2ff4c50668976..47151a1d3652e 100644 --- a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h +++ b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h @@ -32,7 +32,7 @@ class SurveyDataConverter : public edm::one::EDAnalyzer<> { public: explicit SurveyDataConverter(const edm::ParameterSet& iConfig); void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override; - void endJob() override{}; + void endJob() override {} private: static const int NFILES = 2; diff --git a/Alignment/TrackerAlignment/interface/AlignableTracker.h b/Alignment/TrackerAlignment/interface/AlignableTracker.h index 60f09ff991a3f..209fcc64eb643 100644 --- a/Alignment/TrackerAlignment/interface/AlignableTracker.h +++ b/Alignment/TrackerAlignment/interface/AlignableTracker.h @@ -20,7 +20,7 @@ class AlignableTracker : public AlignableComposite { public: AlignableTracker(const TrackerGeometry*, const TrackerTopology*); - ~AlignableTracker() override{/* TODO: delete all tracker-alignables? */}; + ~AlignableTracker() override { /* TODO: delete all tracker-alignables? */ } /// Return alignables of subdet and hierarchy level determined by name /// as defined in tracker part of Alignment/CommonAlignment/StructureType.h diff --git a/Alignment/TrackerAlignment/interface/TrackerNameSpace.h b/Alignment/TrackerAlignment/interface/TrackerNameSpace.h index 707caac0396d0..037bd0902d627 100644 --- a/Alignment/TrackerAlignment/interface/TrackerNameSpace.h +++ b/Alignment/TrackerAlignment/interface/TrackerNameSpace.h @@ -266,5 +266,5 @@ namespace align { TID tid_; TEC tec_; }; -}; // namespace align +}; // namespace align #endif /* Alignment_TrackerAlignment_TrackerNameSpace_H */ diff --git a/Alignment/TrackerAlignment/interface/TrackerScenarioBuilder.h b/Alignment/TrackerAlignment/interface/TrackerScenarioBuilder.h index b9c2e50048b00..5a9e16cc51bcd 100644 --- a/Alignment/TrackerAlignment/interface/TrackerScenarioBuilder.h +++ b/Alignment/TrackerAlignment/interface/TrackerScenarioBuilder.h @@ -27,7 +27,7 @@ class TrackerScenarioBuilder : public MisalignmentScenarioBuilder { explicit TrackerScenarioBuilder(AlignableTracker* alignable); /// Destructor - ~TrackerScenarioBuilder() override{}; + ~TrackerScenarioBuilder() override {} /// Apply misalignment scenario to the tracker void applyScenario(const edm::ParameterSet& scenario) override; diff --git a/Alignment/TrackerAlignment/plugins/AlignmentPrescaler.cc b/Alignment/TrackerAlignment/plugins/AlignmentPrescaler.cc index d8dd16dc02325..e90407ed1d0cf 100644 --- a/Alignment/TrackerAlignment/plugins/AlignmentPrescaler.cc +++ b/Alignment/TrackerAlignment/plugins/AlignmentPrescaler.cc @@ -235,7 +235,7 @@ void AlignmentPrescaler::produce(edm::Event& iEvent, const edm::EventSetup& iSet } ntakenhits++; } //end if take this hit - } //end loop on RecHits + } //end loop on RecHits trackflags[ittrk - Tracks->begin()] = ntakenhits; } //end loop on tracks diff --git a/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc b/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc index c0386fec19d4e..4c554dbba6ba0 100644 --- a/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc +++ b/Alignment/TrackerAlignment/plugins/TkAlCaOverlapTagger.cc @@ -209,7 +209,7 @@ void TkAlCaOverlapTagger::produce(edm::Event& iEvent, const edm::EventSetup& iSe << className(*hit); } - } //end if hit in Strips + } //end if hit in Strips else { //pixel hit const SiPixelRecHit* transpixelhit = dynamic_cast(hit); if (transpixelhit != nullptr) { @@ -237,7 +237,7 @@ void TkAlCaOverlapTagger::produce(edm::Event& iEvent, const edm::EventSetup& iSe break; } } //end second loop on TM - } //end if a previous TM exists + } //end if a previous TM exists previousTM = &(*itTrajMeas); previousId = detid; diff --git a/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc b/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc index ad2bbbc8aceac..c3f71f06d32ef 100644 --- a/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc +++ b/Alignment/TrackerAlignment/src/AlignableTrackerBuilder.cc @@ -247,7 +247,7 @@ void AlignableTrackerBuilder ::buildStripDetectorAlignable( buildPixelDetectorAlignable(geomDet, subdetId, aliDets, aliDetUnits, update); } } // no else: glued components of AlignableDet constructed within - // AlignableSiStripDet -> AlignableDet, see above + // AlignableSiStripDet -> AlignableDet, see above } //_____________________________________________________________________________ @@ -293,7 +293,7 @@ void AlignableTrackerBuilder ::buildOuterTrackerDetectorAlignable( } numDetUnits += nAddedUnits; } // no else: stacked components of AlignableDet constructed within - // AlignableStackDet -> AlignableDet, see above + // AlignableStackDet -> AlignableDet, see above } //_____________________________________________________________________________ diff --git a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h index 07f3e67c0c5bb..92d5b9ec4c847 100644 --- a/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h +++ b/Alignment/TrackerAlignment/test/TrackerGeometryAnalyzer.h @@ -35,11 +35,11 @@ class TrackerGeometryAnalyzer : public edm::one::EDAnalyzer //========================== PUBLIC METHODS ================================= public: //=================================================================== TrackerGeometryAnalyzer(const edm::ParameterSet&); - virtual ~TrackerGeometryAnalyzer(){}; + virtual ~TrackerGeometryAnalyzer() {} virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; - virtual void analyze(const edm::Event&, const edm::EventSetup&) override{}; - virtual void endRun(const edm::Run&, const edm::EventSetup&) override{}; + virtual void analyze(const edm::Event&, const edm::EventSetup&) override {} + virtual void endRun(const edm::Run&, const edm::EventSetup&) override {} //========================= PRIVATE METHODS ================================= private: //================================================================== diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h index c9fa4bab7f27a..3f77c412a7cb7 100644 --- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h +++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h @@ -7,7 +7,7 @@ class MiscalibReaderFromXMLEcalBarrel : public MiscalibReaderFromXML { public: - MiscalibReaderFromXMLEcalBarrel(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map){}; + MiscalibReaderFromXMLEcalBarrel(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map) {} DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override; diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h index b2ee790f2994e..aaa8b92e654cc 100644 --- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h +++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h @@ -7,7 +7,7 @@ class MiscalibReaderFromXMLEcalEndcap : public MiscalibReaderFromXML { public: - MiscalibReaderFromXMLEcalEndcap(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map){}; + MiscalibReaderFromXMLEcalEndcap(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map) {} DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override; diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h index 2689a41d25079..052ef194df9ec 100644 --- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h +++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h @@ -7,7 +7,7 @@ class MiscalibReaderFromXMLHcal : public MiscalibReaderFromXML { public: - MiscalibReaderFromXMLHcal(CaloMiscalibMapHcal &map) : MiscalibReaderFromXML(map){}; + MiscalibReaderFromXMLHcal(CaloMiscalibMapHcal &map) : MiscalibReaderFromXML(map) {} DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override; diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc b/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc index 0f97bb2751411..ed80419a38058 100644 --- a/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc +++ b/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc @@ -41,7 +41,7 @@ class CastorHardcodeCalibrations : public edm::ESProducer, public edm::EventSetu CastorHardcodeCalibrations(const edm::ParameterSet&); ~CastorHardcodeCalibrations() override; - void produce(){}; + void produce() {} protected: void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&, diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc b/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc index cf6b8e1651a8b..c1a7f6f2871e8 100644 --- a/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc +++ b/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc @@ -37,7 +37,7 @@ class CastorTextCalibrations : public edm::ESProducer, public edm::EventSetupRec CastorTextCalibrations(const edm::ParameterSet&); ~CastorTextCalibrations() override; - void produce(){}; + void produce() {} protected: void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&, diff --git a/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc b/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc index 598f3f36eacbf..938b1f144b161 100644 --- a/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc +++ b/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc @@ -618,7 +618,7 @@ void CastorLedAnalysis::LedCastorHists(const HcalDetId& detid, if (adc < 0) { adc = 0; } // to prevent negative adcs after ped subtraction, which should really only happen - // if you're using the wrong peds. + // if you're using the wrong peds. double fC = m_coder->charge(*m_shape, adc, capid); //ta = (fC - m_ped->getValue(capid)); ta = fC; diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc index 770f563b1c5e6..a9f8eb4688f18 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaHistos.cc @@ -2060,9 +2060,9 @@ void TEcnaHistos::ViewMatrix(const TMatrixD& arg_read_matrix, fStatusDataExist = kFALSE; } } // end of if ((BetweenWhat == fLFBetweenStins) || (BetweenWhat == fHFBetweenStins) ) || - //( (BetweenWhat == fBetweenSamples) && (i0StinEcha>= 0) && (i0StinEchaMaxCrysInStin())) || - //( (BetweenWhat == fLFBetweenChannels || BetweenWhat == fHFBetweenChannels) - // /* && (i0Sample >= 0) && (i0Sample < fFapNbOfSamples ) */ ) ) + //( (BetweenWhat == fBetweenSamples) && (i0StinEcha>= 0) && (i0StinEchaMaxCrysInStin())) || + //( (BetweenWhat == fLFBetweenChannels || BetweenWhat == fHFBetweenChannels) + // /* && (i0Sample >= 0) && (i0Sample < fFapNbOfSamples ) */ ) ) else { if (BetweenWhat == fBetweenSamples) { std::cout << "*TEcnaHistos::ViewMatrix(...)> *ERROR* ==> Wrong channel number in " << fFapStinName.Data() @@ -3638,7 +3638,7 @@ void TEcnaHistos::ViewStex(const TVectorD& arg_read_histo, const Int_t& arg_Alre // delete MainCanvas; fCdeleteRoot++; } // end of if OKData == kTRUE ) - } // end of if OKFileExists == kTRUE ) + } // end of if OKFileExists == kTRUE ) else { fStatusFileFound = kFALSE; @@ -5457,9 +5457,9 @@ void TEcnaHistos::ViewStas(const TVectorD& arg_read_histo, const Int_t& arg_Alre h_geo_bid->Fill((Double_t)i_xgeo, (Double_t)i_ygeo, (Double_t)read_matrix(i_xgeo, i_ygeo)); } } // end of if( fFlagSubDet == "EE" ) - } // end of if(i_xgeo >=0 && i_xgeo < nb_binx && i_ygeo >=0 && i_ygeo < nb_biny) - } // end of for(Int_t i0StexStinEcna=0; i0StexStinEcnaMaxStinEcnaInStex(); i0StexStinEcna++) - } // end of if ( fMyRootFile->DataExist() == kTRUE ) + } // end of if(i_xgeo >=0 && i_xgeo < nb_binx && i_ygeo >=0 && i_ygeo < nb_biny) + } // end of for(Int_t i0StexStinEcna=0; i0StexStinEcnaMaxStinEcnaInStex(); i0StexStinEcna++) + } // end of if ( fMyRootFile->DataExist() == kTRUE ) else { fStatusDataExist = kFALSE; @@ -7560,7 +7560,7 @@ void TEcnaHistos::ViewHisto(const TVectorD& arg_read_histo, // << ". OUT OF RANGE ( range = [0,"<< SizeForPlot << "] " << std::endl; } } // end of if( fFlagSubDet == "EE" ) - } // end of for(Int_t i0StexStinEcna=0; i0StexStinEcnaMaxStinEcnaInStex(); i0StexStinEcna++) + } // end of for(Int_t i0StexStinEcna=0; i0StexStinEcnaMaxStinEcnaInStex(); i0StexStinEcna++) } else { std::cout << "!TEcnaHistos::ViewHisto(...)> " << " Data not available for " << fFapStexName << " " << iStasStex + 1 @@ -7756,7 +7756,7 @@ void TEcnaHistos::ViewHisto(const TVectorD& arg_read_histo, << ". OUT OF RANGE ( range = [0," << SizeForPlot << "] " << std::endl; } } // end of if( read_histo[i0DeeEcha] > 0 ) - } // end of if( SC_in_DS >= 1 && SC_in_DS <= fEcalNumbering->GetMaxSCInDS(DataSector) ) + } // end of if( SC_in_DS >= 1 && SC_in_DS <= fEcalNumbering->GetMaxSCInDS(DataSector) ) else { std::cout << "!TEcnaHistos::ViewHisto(...)> SC_in_DS = " << SC_in_DS << ". OUT OF RANGE ( range = [1," << fEcalNumbering->GetMaxSCInDS(DataSector) @@ -7787,8 +7787,8 @@ void TEcnaHistos::ViewHisto(const TVectorD& arg_read_histo, } } } // end of if( OKPlot == 1 && opt_plot != "ASCII" ) - } // end of if(fFlagSubDet == "EE") - } // end of if(ok_view_histo == kTRUE) + } // end of if(fFlagSubDet == "EE") + } // end of if(ok_view_histo == kTRUE) else { std::cout << "!TEcnaHistos::ViewHisto(...)> *ERROR* =====> " << " ok_view_histo != kTRUE " << fTTBELL << std::endl; @@ -8004,9 +8004,9 @@ void TEcnaHistos::ViewHisto(const TVectorD& arg_read_histo, SetXsupMemoFromValue(XsupProj); } } // end of if( (opt_plot == fOnlyOnePlot) || - // (opt_plot == fSeveralPlot && GetMemoFlag(HistoCode, opt_plot) == "Free") || - // (opt_plot == fSameOnePlot && GetMemoFlag(HistoCode, opt_plot) == "Free") ) - } // end of if( HistoType == "Proj" || HistoType == "SampProj" || HistoType == "H1BasicProj" ) + // (opt_plot == fSeveralPlot && GetMemoFlag(HistoCode, opt_plot) == "Free") || + // (opt_plot == fSameOnePlot && GetMemoFlag(HistoCode, opt_plot) == "Free") ) + } // end of if( HistoType == "Proj" || HistoType == "SampProj" || HistoType == "H1BasicProj" ) //=============== H I S T O B O O K I N G A N D F I L L I N G ======== (ViewHisto) //.............................. prepa histogram booking (ViewHisto) @@ -10972,7 +10972,7 @@ void TEcnaHistos::HistoPlot(TH1D* h_his0, if (yinf >= ysup) { yinf = (Double_t)0.; ysup += ysup; - } // ROOT default if ymin >= ymax + } // ROOT default if ymin >= ymax Double_t MaxMarginFactor = (Double_t)0.05; // frame top line = 5% above the maximum ysup += (ysup - yinf) * MaxMarginFactor; // ROOT default if ymin < ymax } @@ -11221,7 +11221,7 @@ void TEcnaHistos::HistoPlot(TH1D* h_his0, } } } // end of if( ( opt_plot == fOnlyOnePlot ) - // || ( (opt_plot == fSeveralPlot || opt_plot == fSameOnePlot) && xMemoPlotSame == 0 ) ) + // || ( (opt_plot == fSeveralPlot || opt_plot == fSameOnePlot) && xMemoPlotSame == 0 ) ) //..............................................Top Axis (HistoPlot) Int_t min_value = 0; @@ -12186,7 +12186,7 @@ void TEcnaHistos::TopAxisForHistos(TH1D* h_his0, if (Minih >= Maxih) { Minih = (Double_t)0.; Maxih += Maxih; - } // ROOT default if ymin >= ymax + } // ROOT default if ymin >= ymax Double_t MaxMarginFactor = (Double_t)0.05; // frame top line = 5% above the maximum Maxih += (Maxih - Minih) * MaxMarginFactor; // ROOT default if ymin < ymax } @@ -13082,7 +13082,7 @@ TVectorD TEcnaHistos::GetHistoValues(const TVectorD& arg_read_histo, << ", HisSizePlot = " << HisSizePlot << fTTBELL << std::endl; } } // end of if( HistoCode == "D_MSp_SpNb" || HistoCode == "D_SSp_SpNb" " || - // HistoCode == "D_SSp_SpNb" || HistoCode == "D_SSp_SpDs" ) + // HistoCode == "D_SSp_SpNb" || HistoCode == "D_SSp_SpDs" ) if (!(HistoCode == "D_MSp_SpNb" || HistoCode == "D_SSp_SpNb" || HistoCode == "D_MSp_SpDs" || HistoCode == "D_SSp_SpDs")) // = else of previous if @@ -13166,7 +13166,7 @@ TVectorD TEcnaHistos::GetHistoValues(const TVectorD& arg_read_histo, << " HisSizeRead = " << HisSizeRead << ", HisSizePlot = " << HisSizePlot << fTTBELL << std::endl; } } // end of if( !(HistoCode == "D_MSp_SpNb" || HistoCode == "D_SSp_SpNb") ) - } // end of if( arg_AlreadyRead == 0 ) + } // end of if( arg_AlreadyRead == 0 ) if (i_data_exist == 0) { std::cout << "!TEcnaHistos::GetHistoValues(...)> Histo not found." << fTTBELL << std::endl; diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParHistos.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParHistos.cc index eb255701c3798..97d999d76ee31 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParHistos.cc +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaParHistos.cc @@ -2451,8 +2451,8 @@ TString TEcnaParHistos::GetHistoType(const TString& HistoCode) { HistoCode == "D_SCs_ChNb") { HistoType = "Global"; } // X coordinate = Xtals for SM or Dee - // Tower for EB - // SC for EE + // Tower for EB + // SC for EE //.(1b)............................ Proj if (HistoCode == "D_NOE_ChDs" || HistoCode == "D_Ped_ChDs" || HistoCode == "D_TNo_ChDs" || HistoCode == "D_LFN_ChDs" || HistoCode == "D_HFN_ChDs" || HistoCode == "D_MCs_ChDs" || diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc index 67e72405e3973..4b07885cf5958 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/src/TEcnaRun.cc @@ -1104,7 +1104,7 @@ Bool_t TEcnaRun::GetSampleAdcValues(const Int_t& n1EventNumber, << " fT1d_StexStinFromIndex[] ALLOCATION NOT DONE" << fTTBELL << std::endl; ret_code = kFALSE; } //.................................................................. (GetSampleAdcValues) - } // end of if( i0Sample >= 0 && i0Sample < fNbSampForFic ) + } // end of if( i0Sample >= 0 && i0Sample < fNbSampForFic ) else { //.......Reading data => Message and error only if sample >= fEcal->MaxSampADC() // (not fNbSampForFic, the later is used only for calculations) @@ -1117,7 +1117,7 @@ Bool_t TEcnaRun::GetSampleAdcValues(const Int_t& n1EventNumber, ret_code = kTRUE; } } // else of if( i0Sample >= 0 && i0Sample < fNbSampForFic ) - } // end of if( i0StinEcha >= 0 && i0StinEcha < fEcal->MaxCrysInStin() ) + } // end of if( i0StinEcha >= 0 && i0StinEcha < fEcal->MaxCrysInStin() ) else { std::cout << "!TEcnaRun::GetSampleAdcValues(...) *** ERROR ***> " << " channel number in " << fStinName.Data() << " = " << i0StinEcha << ". OUT OF BOUNDS" diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc index ae0c95df6d1ae..eb53c9b839897 100644 --- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc +++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc @@ -687,7 +687,7 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet return; } } // end of if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS ) - } // end of if( fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" + } // end of if( fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" // ...) //.................. Increment FedId counters @@ -860,22 +860,22 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet << "EcnaAnalyzer::analyze(...)> NbOfSamplesFromDigis out of bounds = " << NbOfSamplesFromDigis; } } // end of if( (fStexNumber > 0 && i0SM == fStexNumber-1) || - // (fStexNumber == 0) ) - } // end of if( fStexNbOfTreatedEvents[i0SM] >= 1 && - // fStexNbOfTreatedEvents[i0SM] <= fReqNbOfEvts ) - } // end of if( fStexStatus[i0SM] < 2 ) - } // end of if( i0SM >= 0 && i0SMbegin(); - // digiItr != digisEB->end(); ++digiItr) + // (fStexNumber == 0) ) + } // end of if( fStexNbOfTreatedEvents[i0SM] >= 1 && + // fStexNbOfTreatedEvents[i0SM] <= fReqNbOfEvts ) + } // end of if( fStexStatus[i0SM] < 2 ) + } // end of if( i0SM >= 0 && i0SMbegin(); + // digiItr != digisEB->end(); ++digiItr) for (Int_t i0SM = 0; i0SM < fMaxTreatedStexCounter; i0SM++) { fStexDigiOK[i0SM] = 0; // reset fStexDigiOK[i0SM] after loop on digis } } // end of if( Int_t(digisEB->end()-digisEB->begin()) >= 0 && - // Int_t(digisEB->end()-digisEB->begin()) <= Int_t(digisEB->size()) ) - } // end of if( fStexName == "SM" && fSMIndexBegin < fSMIndexStop ) + // Int_t(digisEB->end()-digisEB->begin()) <= Int_t(digisEB->size()) ) + } // end of if( fStexName == "SM" && fSMIndexBegin < fSMIndexStop ) //=============================================================== Record // type EE (Dee) @@ -1014,8 +1014,8 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } } // end of if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS ) - } // end of if( fAnalysisName == "AdcPeg12" || fAnalysisName == - // "AdcSPeg12" .... ) + } // end of if( fAnalysisName == "AdcPeg12" || fAnalysisName == + // "AdcSPeg12" .... ) else { fStexDigiOK[i0Dee]++; if (fStexDigiOK[i0Dee] == 1) { @@ -1100,16 +1100,16 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet << "EcnaAnalyzer::analyze(...)> NbOfSamplesFromDigis out of bounds = " << NbOfSamplesFromDigis; } } // end of if( (fStexNumber > 0 && i0Dee == fStexNumber-1) || - // (fStexNumber == 0) ) - } // end of if( fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] - // >= 1 && + // (fStexNumber == 0) ) + } // end of if( fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] + // >= 1 && // fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] <= // fReqNbOfEvts ) } // end of if( fStexStatus[i0Dee] < 2 ) - } // end of if( i0Dee >= 0 && i0Deebegin(); - // digiItr != digisEB->end(); ++digiItr) + } // end of if( i0Dee >= 0 && i0Deebegin(); + // digiItr != digisEB->end(); ++digiItr) // reset fStexDigiOK[i0Dee] or fFedDigiOK[i0Dee] to zero after loop on // digis @@ -1130,10 +1130,10 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } // end of if( Int_t(digisEB->end()-digisEB->begin()) >= 0 && - // Int_t(digisEB->end()-digisEB->begin()) <= Int_t(digisEB->size()) ) + // Int_t(digisEB->end()-digisEB->begin()) <= Int_t(digisEB->size()) ) } // end of if( fStexName == "Dee" && fDeeIndexBegin < fDeeIndexStop ) - } // end of if( (fStexNumber > 0 && fNbOfTreatedStexs == 0) || (fStexNumber == + } // end of if( (fStexNumber > 0 && fNbOfTreatedStexs == 0) || (fStexNumber == // 0 && fNbOfTreatedStexs < MaxNbOfStex) ) //============================================================================================= @@ -1325,7 +1325,7 @@ void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet edm::LogVerbatim("ecnaAnal") << "*---------------------------------------------------------------------------- "; } // end of if( fStexStatus[i0Stex] == 1 ) - } // end of for(Int_t i0Stex=fStexIndexBegin; i0Stex { /**Destructor */ - ~EcalDccWeightBuilder() override{}; + ~EcalDccWeightBuilder() override {} //method(s) public: diff --git a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc index 838d1f8b39b8b..495edb966fde0 100644 --- a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc +++ b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc @@ -1402,8 +1402,8 @@ std::unique_ptr EcalTrivialConditionRetriever::produceEcalLaser ical->setValue(ebid, laserAlphaMean_ + r * laserAlphaSigma_); } } // loop over iphi - } // loop over ieta - } // do not read a file + } // loop over ieta + } // do not read a file edm::LogInfo(" produceEcalLaserAlphas EE"); // read mean laser per ring per year @@ -1546,7 +1546,7 @@ std::unique_ptr EcalTrivialConditionRetriever::produceEcalLaser ical->setValue(eedetidneg, laserAlphaMean_ + r1 * laserAlphaSigma_); } } // loop over iY - } // loop over iX + } // loop over iX } return ical; diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h b/CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h index a78ca29dc078c..91d6fd092b4e3 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h @@ -55,7 +55,7 @@ class HcalTimeSlew { tspar2_siPM(tspar2_siPMCon) {} }; - HcalTimeSlew(){}; + HcalTimeSlew() {} ~HcalTimeSlew() {} void addM2ParameterSet(float tzero, float slope, float tmax); diff --git a/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc b/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc index d14534442ca27..8ccee97bbde50 100644 --- a/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc +++ b/CalibCalorimetry/HcalAlgos/src/HcalLedAnalysis.cc @@ -894,7 +894,7 @@ void HcalLedAnalysis::LedHFHists(const HcalDetId& detid, if (adc < 0) { adc = 0; } // to prevent negative adcs after ped subtraction, which should really only happen - // if you're using the wrong peds. + // if you're using the wrong peds. double fC = m_coder->charge(*m_shape, adc, capid); //ta = (fC - m_ped->getValue(capid)); ta = fC; diff --git a/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h b/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h index 49563dd526768..0bc60e8dd41d0 100644 --- a/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h +++ b/CalibCalorimetry/HcalPlugins/src/HcalTextCalibrations.h @@ -49,7 +49,7 @@ class HcalTextCalibrations : public edm::ESProducer, public edm::EventSetupRecor HcalTextCalibrations(const edm::ParameterSet&); ~HcalTextCalibrations() override; - void produce(){}; + void produce() {} template class CheckGetObject { diff --git a/CalibFormats/HcalObjects/interface/HcalCalibrationWidths.h b/CalibFormats/HcalObjects/interface/HcalCalibrationWidths.h index 57dfc977ae095..f78a8268e51e1 100644 --- a/CalibFormats/HcalObjects/interface/HcalCalibrationWidths.h +++ b/CalibFormats/HcalObjects/interface/HcalCalibrationWidths.h @@ -8,7 +8,7 @@ */ class HcalCalibrationWidths { public: - HcalCalibrationWidths(){}; + HcalCalibrationWidths() {} HcalCalibrationWidths(const float fGain[4], const float fPedestal[4], const float fEffectivePedestal[4]); /// get gain width for capid=0..3 double gain(int fCapId) const { return mGain[fCapId]; } diff --git a/CalibFormats/SiPixelObjects/interface/PixelFECConfigInterface.h b/CalibFormats/SiPixelObjects/interface/PixelFECConfigInterface.h index 8440b59fdac16..546f8e8c7b189 100644 --- a/CalibFormats/SiPixelObjects/interface/PixelFECConfigInterface.h +++ b/CalibFormats/SiPixelObjects/interface/PixelFECConfigInterface.h @@ -22,9 +22,9 @@ namespace pos { */ class PixelFECConfigInterface { public: - PixelFECConfigInterface(){}; + PixelFECConfigInterface() {} - virtual ~PixelFECConfigInterface(){}; + virtual ~PixelFECConfigInterface() {} //Generate the commands needed to set the trim and mask bits that //are specified by the vector allPixels. diff --git a/CalibFormats/SiPixelObjects/interface/PixelFEDCard.h b/CalibFormats/SiPixelObjects/interface/PixelFEDCard.h index 6185cab716399..f3f87828f8314 100644 --- a/CalibFormats/SiPixelObjects/interface/PixelFEDCard.h +++ b/CalibFormats/SiPixelObjects/interface/PixelFEDCard.h @@ -41,7 +41,7 @@ namespace pos { PixelFEDCard(); // empty PixelFEDCard(std::string filename); // create from files PixelFEDCard(std::vector > &tab); // create from DB - ~PixelFEDCard() override{}; + ~PixelFEDCard() override {} void readDBTBMLevels(std::vector > &tableMat, int first, int last); void readDBROCLevels(std::vector > &tableMat, int first, int last); diff --git a/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc b/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc index 6ed5b750f5ad6..7daa3f07d1197 100644 --- a/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc +++ b/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc @@ -1148,7 +1148,7 @@ void PixelCalibConfiguration::nextFECState(std::map::iterator iPixelFEC = pixelFECs.begin(); diff --git a/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc b/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc index cfd81a124a322..5910b6c761d5d 100644 --- a/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc +++ b/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc @@ -356,7 +356,7 @@ PixelFEDCard::PixelFEDCard(vector > &tableMat) : PixelConfigBase( SPARE9 = atoi(tableMat[1][colM["SPARE9"]].c_str()); SPARE10 = atoi(tableMat[1][colM["SPARE10"]].c_str()); - } // end of 'first' condition + } // end of 'first' condition for (int r = 1; r < size[0]; r++) //Goes to every row of the FIRST Matrix (MUST BE 36, one for each FED channel) { //Number of ROCS per FED channel diff --git a/CalibFormats/SiPixelObjects/src/PixelFEDConfig.cc b/CalibFormats/SiPixelObjects/src/PixelFEDConfig.cc index 17641e5b6b453..8af5ea0182b6a 100644 --- a/CalibFormats/SiPixelObjects/src/PixelFEDConfig.cc +++ b/CalibFormats/SiPixelObjects/src/PixelFEDConfig.cc @@ -108,7 +108,7 @@ PixelFEDConfig::PixelFEDConfig(std::vector > &tableMat) fedconfig_.push_back(tmp); } } //end else - } //end for r + } //end for r /* std::cout << __LINE__ << "]\t" << mthn << std::endl; diff --git a/CalibFormats/SiPixelObjects/src/PixelNameTranslation.cc b/CalibFormats/SiPixelObjects/src/PixelNameTranslation.cc index afe9872c4d8ec..91ce3946fd189 100644 --- a/CalibFormats/SiPixelObjects/src/PixelNameTranslation.cc +++ b/CalibFormats/SiPixelObjects/src/PixelNameTranslation.cc @@ -71,7 +71,7 @@ PixelNameTranslation::PixelNameTranslation(std::vector } } } //end for - /* + /* for(unsigned int n=0; n> 0); // return bits 0 & 1 + return (((threeGainsValue) & 0x03) >> 0); // return bits 0 & 1 if (AOHNumber % 3 == 2) - return (((threeGainsValue)&0x0c) >> 2); // return bits 2 & 3 + return (((threeGainsValue) & 0x0c) >> 2); // return bits 2 & 3 if (AOHNumber % 3 == 0) - return (((threeGainsValue)&0x30) >> 4); // return bits 4 & 5 + return (((threeGainsValue) & 0x30) >> 4); // return bits 4 & 5 assert(0); } diff --git a/CalibFormats/SiPixelObjects/src/PixelTrimAllPixels.cc b/CalibFormats/SiPixelObjects/src/PixelTrimAllPixels.cc index c739fb7f5a1cd..6589b3d64b8a1 100644 --- a/CalibFormats/SiPixelObjects/src/PixelTrimAllPixels.cc +++ b/CalibFormats/SiPixelObjects/src/PixelTrimAllPixels.cc @@ -74,7 +74,7 @@ PixelTrimAllPixels::PixelTrimAllPixels(std::vector > &t tmp.read(rocid, base64_decode(tableMat[r][colM["TRIM_BITS"]])); trimbits_.push_back(tmp); } //end for r - //std::cout<channels[j].flag3; badStripWord_.set(chan - 1, true); // set bit 0-79 (111) in 80 (112)-bit // bitset representing this layer - } // j - } // i + } // j + } // i } void CSCConditions::fillBadWireWord(const CSCDetId &id) { @@ -216,8 +216,8 @@ void CSCConditions::fillBadWireWord(const CSCDetId &id) { // short f3 = theBadWires->channels[j].flag3; badWireWord_.set(chan - 1, true); // set bit 0-111 in 112-bit bitset representing this layer - } // j - } // i + } // j + } // i } bool CSCConditions::isInBadChamber(const CSCDetId &id) const { diff --git a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h index 1dd414d50b08b..76ea27088cd9b 100644 --- a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h +++ b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h @@ -72,8 +72,8 @@ class CSCIndexerOldPostls1 { static const IndexType MAX_CHIP_INDEX = 17064; static const IndexType MAX_GAS_GAIN_INDEX = 57240; - CSCIndexerOldPostls1(){}; - ~CSCIndexerOldPostls1(){}; + CSCIndexerOldPostls1() {} + ~CSCIndexerOldPostls1() {} /** * Starting index for first chamber in ring 'ir' of station 'is' in endcap diff --git a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h index 1973a0f46ed63..97802fff23284 100644 --- a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h +++ b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h @@ -54,8 +54,8 @@ class CSCIndexerOldStartup { typedef uint16_t IndexType; typedef uint32_t LongIndexType; - CSCIndexerOldStartup(){}; - ~CSCIndexerOldStartup(){}; + CSCIndexerOldStartup() {} + ~CSCIndexerOldStartup() {} /** * Linear index to label each CSC in CSC system. diff --git a/CalibMuon/DTCalibration/interface/DTTMax.h b/CalibMuon/DTCalibration/interface/DTTMax.h index 60f340b3b9bf3..f7f3e026d5d17 100644 --- a/CalibMuon/DTCalibration/interface/DTTMax.h +++ b/CalibMuon/DTCalibration/interface/DTTMax.h @@ -83,7 +83,7 @@ class DTTMax { InfoLayer*& getInfoLayer(int layer) { return theInfoLayers[layer - 1]; } private: - DTTMax(){}; // Hide default constructor + DTTMax() {} // Hide default constructor //debug flag bool debug; diff --git a/CalibMuon/DTCalibration/plugins/DTGeometryParserFromDDD.cc b/CalibMuon/DTCalibration/plugins/DTGeometryParserFromDDD.cc index 62462e6c70c59..2911af45b47de 100644 --- a/CalibMuon/DTCalibration/plugins/DTGeometryParserFromDDD.cc +++ b/CalibMuon/DTCalibration/plugins/DTGeometryParserFromDDD.cc @@ -55,15 +55,15 @@ void DTGeometryParserFromDDD::parseGeometry(DDFilteredView& fv, fv.parent(); doL = fv.nextSibling(); // go to next layer - } // layers + } // layers fv.parent(); doSL = fv.nextSibling(); // go to next SL - } // sls + } // sls fv.parent(); doChamber = fv.nextSibling(); // go to next chamber - } // chambers + } // chambers } void DTGeometryParserFromDDD::buildLayer(DDFilteredView& fv, diff --git a/CalibMuon/DTCalibration/plugins/DTNoiseCalibration.h b/CalibMuon/DTCalibration/plugins/DTNoiseCalibration.h index 386b785dfe6d4..6b2b1c6fff80e 100644 --- a/CalibMuon/DTCalibration/plugins/DTNoiseCalibration.h +++ b/CalibMuon/DTCalibration/plugins/DTNoiseCalibration.h @@ -41,7 +41,7 @@ class DTNoiseCalibration : public edm::one::EDAnalyzer { void beginJob() override; void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& e, const edm::EventSetup& c) override; - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; private: diff --git a/CalibMuon/DTCalibration/plugins/DTNoiseComputation.cc b/CalibMuon/DTCalibration/plugins/DTNoiseComputation.cc index e9be264db4b63..75b9dd51a986f 100644 --- a/CalibMuon/DTCalibration/plugins/DTNoiseComputation.cc +++ b/CalibMuon/DTCalibration/plugins/DTNoiseComputation.cc @@ -203,9 +203,9 @@ void DTNoiseComputation::beginRun(const edm::Run &, const EventSetup &setup) { } } // done if the layer has digi - } // loop over layers - } // loop over superlayers - } // loop over chambers + } // loop over layers + } // loop over superlayers + } // loop over chambers count++; } diff --git a/CalibMuon/DTCalibration/plugins/DTNoiseComputation.h b/CalibMuon/DTCalibration/plugins/DTNoiseComputation.h index 12e60796b08f3..b481f3b81ffd3 100644 --- a/CalibMuon/DTCalibration/plugins/DTNoiseComputation.h +++ b/CalibMuon/DTCalibration/plugins/DTNoiseComputation.h @@ -46,7 +46,7 @@ class DTNoiseComputation : public edm::one::EDAnalyzer { void analyze(const edm::Event& event, const edm::EventSetup& setup) override {} - void endRun(const edm::Run&, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run&, const edm::EventSetup& setup) override {} /// Endjob void endJob() override; diff --git a/CalibMuon/DTCalibration/plugins/DTResidualCalibration.h b/CalibMuon/DTCalibration/plugins/DTResidualCalibration.h index f402b597861f0..bd8cec801bec1 100644 --- a/CalibMuon/DTCalibration/plugins/DTResidualCalibration.h +++ b/CalibMuon/DTCalibration/plugins/DTResidualCalibration.h @@ -37,7 +37,7 @@ class DTResidualCalibration : public edm::one::EDAnalyzer { void beginJob() override; void beginRun(const edm::Run&, const edm::EventSetup&) override; void endJob() override; - void endRun(const edm::Run&, const edm::EventSetup&) override{}; + void endRun(const edm::Run&, const edm::EventSetup&) override {} void analyze(const edm::Event& event, const edm::EventSetup& setup) override; protected: diff --git a/CalibMuon/DTCalibration/plugins/DTT0Calibration.cc b/CalibMuon/DTCalibration/plugins/DTT0Calibration.cc index ee9d5055e90b9..5be848d0714ab 100644 --- a/CalibMuon/DTCalibration/plugins/DTT0Calibration.cc +++ b/CalibMuon/DTCalibration/plugins/DTT0Calibration.cc @@ -191,8 +191,8 @@ void DTT0Calibration::analyze(const edm::Event& event, const edm::EventSetup& ev mK[wireId] = mK[wireId] + (t0 - mK[wireId]) / nDigiPerWire[wireId]; } } //end if(nevents>1000) - } //end loop on digi - } //end loop on layer + } //end loop on digi + } //end loop on layer //Use the t0 per layer histos to have an indication about the t0 position if (nevents == eventsForLayerT0) { diff --git a/CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.cc b/CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.cc index bcfd9e027377f..df6afe69a325e 100644 --- a/CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.cc +++ b/CalibMuon/DTCalibration/plugins/DTT0CalibrationRMS.cc @@ -224,8 +224,8 @@ void DTT0CalibrationRMS::analyze(const edm::Event& event, const edm::EventSetup& mK[wireId] = mK[wireId] + (t0 - mK[wireId]) / nDigiPerWire[wireId]; } } //end if(nevents>1000) - } //end loop on digi - } //end loop on layer + } //end loop on digi + } //end loop on layer //Use the t0 per layer histos to have an indication about the t0 position if (nevents == eventsForLayerT0) { diff --git a/CalibMuon/DTCalibration/plugins/DTT0Correction.cc b/CalibMuon/DTCalibration/plugins/DTT0Correction.cc index e006d01deb419..90e8f3919a594 100644 --- a/CalibMuon/DTCalibration/plugins/DTT0Correction.cc +++ b/CalibMuon/DTCalibration/plugins/DTT0Correction.cc @@ -97,8 +97,8 @@ void DTT0Correction::endJob() { continue; } } // End of loop on wires - } // End of loop on layers - } // End of loop on superlayers + } // End of loop on layers + } // End of loop on superlayers //Write object to DB LogVerbatim("Calibration") << "[DTT0Correction]: Writing t0 object to DB!" << endl; diff --git a/CalibMuon/DTCalibration/plugins/DTT0Correction.h b/CalibMuon/DTCalibration/plugins/DTT0Correction.h index 7b32c526868ac..44a1a0e2eef25 100644 --- a/CalibMuon/DTCalibration/plugins/DTT0Correction.h +++ b/CalibMuon/DTCalibration/plugins/DTT0Correction.h @@ -33,7 +33,7 @@ class DTT0Correction : public edm::one::EDAnalyzer { void beginJob() override {} void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& event, const edm::EventSetup& setup) override {} - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; protected: diff --git a/CalibMuon/DTCalibration/plugins/DTTPDeadWriter.h b/CalibMuon/DTCalibration/plugins/DTTPDeadWriter.h index 0151bc396f8a6..151fa9d3e6872 100644 --- a/CalibMuon/DTCalibration/plugins/DTTPDeadWriter.h +++ b/CalibMuon/DTCalibration/plugins/DTTPDeadWriter.h @@ -41,7 +41,7 @@ class DTTPDeadWriter : public edm::one::EDAnalyzer { /// Compute the ttrig by fiting the TB rising edge void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override; - void endRun(const edm::Run&, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run&, const edm::EventSetup& setup) override {} /// Write ttrig in the DB void endJob() override; diff --git a/CalibMuon/DTCalibration/plugins/DTTTrigCorrection.h b/CalibMuon/DTCalibration/plugins/DTTTrigCorrection.h index e9d934f04a53d..84f9b94a22062 100644 --- a/CalibMuon/DTCalibration/plugins/DTTTrigCorrection.h +++ b/CalibMuon/DTCalibration/plugins/DTTTrigCorrection.h @@ -37,7 +37,7 @@ class DTTTrigCorrection : public edm::one::EDAnalyzer { void beginJob() override {} void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& event, const edm::EventSetup& setup) override {} - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; protected: diff --git a/CalibMuon/DTCalibration/plugins/DTTTrigCorrectionFirst.h b/CalibMuon/DTCalibration/plugins/DTTTrigCorrectionFirst.h index b33327fa2a781..a13d693191715 100644 --- a/CalibMuon/DTCalibration/plugins/DTTTrigCorrectionFirst.h +++ b/CalibMuon/DTCalibration/plugins/DTTTrigCorrectionFirst.h @@ -33,7 +33,7 @@ class DTTTrigCorrectionFirst : public edm::one::EDAnalyzer void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& event, const edm::EventSetup& setup) override {} - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; protected: diff --git a/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.cc b/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.cc index 3d2de78840d26..7121da94e1b82 100644 --- a/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.cc +++ b/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.cc @@ -126,7 +126,7 @@ void DTTTrigOffsetCalibration::analyze(const Event& event, const EventSetup& eve } } } // DTRecSegment4DCollection::const_iterator segment - } // DTRecSegment4DCollection::id_iterator chamberIdIt + } // DTRecSegment4DCollection::id_iterator chamberIdIt } // DTTTrigOffsetCalibration::analyze void DTTTrigOffsetCalibration::endJob() { diff --git a/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.h b/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.h index 596519324f276..067c5c38b5552 100644 --- a/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.h +++ b/CalibMuon/DTCalibration/plugins/DTTTrigOffsetCalibration.h @@ -37,7 +37,7 @@ class DTTTrigOffsetCalibration : public edm::one::EDAnalyzer { hTMaxCell* getHists() { return histos; } private: - cellInfo(){}; - cellInfo(const cellInfo&){}; + cellInfo() {} + cellInfo(const cellInfo&) {} std::vector addedCells; hTMaxCell* histos; diff --git a/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.cc b/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.cc index fc3e4dd0a58ac..1648772a3d603 100644 --- a/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.cc +++ b/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.cc @@ -116,7 +116,7 @@ void DTVDriftSegmentCalibration::analyze(const Event& event, const EventSetup& e } } } // DTRecSegment4DCollection::const_iterator segment - } // DTRecSegment4DCollection::id_iterator chamberIdIt + } // DTRecSegment4DCollection::id_iterator chamberIdIt } // DTVDriftSegmentCalibration::analyze void DTVDriftSegmentCalibration::endJob() { diff --git a/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.h b/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.h index 4c3b1a1e78eb0..a3dc05bc7b5e0 100644 --- a/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.h +++ b/CalibMuon/DTCalibration/plugins/DTVDriftSegmentCalibration.h @@ -32,7 +32,7 @@ class DTVDriftSegmentCalibration : public edm::one::EDAnalyzer { // Operations void beginRun(const edm::Run& run, const edm::EventSetup& setup) override; void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override {} - void endRun(const edm::Run& run, const edm::EventSetup& setup) override{}; + void endRun(const edm::Run& run, const edm::EventSetup& setup) override {} void endJob() override; private: diff --git a/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h b/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h index 7290ada051a5a..6ad62e4390902 100644 --- a/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h +++ b/CalibMuon/DTCalibration/test/DBTools/FakeTTrig.h @@ -35,8 +35,8 @@ class FakeTTrig : public edm::one::EDAnalyzer(id)) : - operator()(dynamic_cast(id)); + return id.isBarrel() ? operator()(dynamic_cast(id)) + : operator()(dynamic_cast(id)); } int PixelToFEDAssociateFromAscii::operator()(const PixelBarrelName& id) const { diff --git a/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc b/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc index 748d7816a4747..54ca0379bc5a7 100644 --- a/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc +++ b/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc @@ -461,7 +461,7 @@ void PixelToLNKAssociateFromAscii::addConnections(int fedId, int linkId, std::st theConnection.push_back(make_pair(detectorRocId, cablingRocId)); // cout <<"PLAQ:"< trackerGeomTokenBeginRun_; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h index 1618215f391b8..5d1a6bc33a447 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h @@ -23,7 +23,7 @@ class SiPixelGainCalibrationForHLTService final public: explicit SiPixelGainCalibrationForHLTService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) : SiPixelGainCalibrationServicePayloadGetter( - conf, std::move(iC)){}; + conf, std::move(iC)) {} void calibrate( uint32_t detID, DigiIterator b, DigiIterator e, float conversionFactor, float offset, int* electron) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h index f8a67dc0f834d..46d0a7d04a54e 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h @@ -25,7 +25,7 @@ class SiPixelGainCalibrationForHLTSimService public: explicit SiPixelGainCalibrationForHLTSimService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) : SiPixelGainCalibrationServicePayloadGetter( - conf, std::move(iC)){}; + conf, std::move(iC)) {} // column granularity float getPedestal(const uint32_t& detID, const int& col, const int& row) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h index fca47397bccc2..b6d50266e1810 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h @@ -23,7 +23,7 @@ class SiPixelGainCalibrationOfflineService public: explicit SiPixelGainCalibrationOfflineService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) : SiPixelGainCalibrationServicePayloadGetter( - conf, std::move(iC)){}; + conf, std::move(iC)) {} // pixel granularity float getPedestal(const uint32_t& detID, const int& col, const int& row) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h index 5566f4dd090d1..ac66f145157d8 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h @@ -24,7 +24,7 @@ class SiPixelGainCalibrationOfflineSimService SiPixelGainCalibrationOfflineSimRcd> { public: explicit SiPixelGainCalibrationOfflineSimService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) - : SiPixelGainCalibrationServicePayloadGetter(conf, iC){}; + : SiPixelGainCalibrationServicePayloadGetter(conf, iC) {} // pixel granularity float getPedestal(const uint32_t& detID, const int& col, const int& row) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h index ba33864201dce..b302dd6947c38 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h @@ -23,7 +23,7 @@ class SiPixelGainCalibrationService public: explicit SiPixelGainCalibrationService(const edm::ParameterSet& conf, edm::ConsumesCollector iC) : SiPixelGainCalibrationServicePayloadGetter(conf, - std::move(iC)){}; + std::move(iC)) {} // pixel granularity float getPedestal(const uint32_t& detID, const int& col, const int& row) override; diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h index b2cb324b171b8..cbe6721533929 100644 --- a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h +++ b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h @@ -31,8 +31,8 @@ class SiPixelGainCalibrationServiceBase { public: typedef edm::DetSet::const_iterator DigiIterator; - SiPixelGainCalibrationServiceBase(){}; - virtual ~SiPixelGainCalibrationServiceBase(){}; + SiPixelGainCalibrationServiceBase() {} + virtual ~SiPixelGainCalibrationServiceBase() {} static void fillPSetDescription(edm::ParameterSetDescription& desc) {} diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelFakeLorentzAngleESSource.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelFakeLorentzAngleESSource.cc index 2d9853aca49f5..9b08d5533e909 100644 --- a/CalibTracker/SiPixelESProducers/plugins/SiPixelFakeLorentzAngleESSource.cc +++ b/CalibTracker/SiPixelESProducers/plugins/SiPixelFakeLorentzAngleESSource.cc @@ -169,7 +169,7 @@ std::unique_ptr SiPixelFakeLorentzAngleESSource::produce(co edm::LogError("SiPixelFakeLorentzAngleESSource") << "ERROR!: detid " << rawId << " already exists" << std::endl; } // if - } // for + } // for //modules already put are automatically skipped for (const auto& it : FPixParameters_) { @@ -203,9 +203,9 @@ std::unique_ptr SiPixelFakeLorentzAngleESSource::produce(co edm::LogError("SiPixelFakeLorentzAngleESSource") << "ERROR!: detid" << rawId << "already exists" << std::endl; } // for - } // if - } // bpix/fpix - } // iterate on detids + } // if + } // bpix/fpix + } // iterate on detids edm::LogInfo("SiPixelFakeLorentzAngleESSource") << "Modules = " << nmodules << std::endl; diff --git a/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc b/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc index f77b7928d542f..804c9d0a1c4c2 100644 --- a/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc +++ b/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader.cc @@ -100,9 +100,9 @@ void PixelFEDChannelCollectionMapTestReader::analyze(const edm::Event& e, const ch.roc_last); //std::cout << disabledChannels.detId() << " "<< ch.fed << " " << ch.link << " " << ch.roc_first << " " << ch.roc_last << std::endl; } // loop over disable channels - } // loop over the detSetVector - } // main loop on the map - } // if file exists + } // loop over the detSetVector + } // main loop on the map + } // if file exists } void PixelFEDChannelCollectionMapTestReader::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h index 17f06edc7d653..30e54602e8aec 100644 --- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h +++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.h @@ -35,7 +35,7 @@ namespace cms { public: explicit SiPixelFakeGainForHLTReader(const edm::ParameterSet& iConfig); - ~SiPixelFakeGainForHLTReader(){}; + ~SiPixelFakeGainForHLTReader() {} virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; virtual void endRun(const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h index 4f5e3a3732c0c..7caf080a7e764 100644 --- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h +++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.h @@ -35,7 +35,7 @@ namespace cms { public: explicit SiPixelFakeGainOfflineReader(const edm::ParameterSet& iConfig); - ~SiPixelFakeGainOfflineReader(){}; + ~SiPixelFakeGainOfflineReader() {} virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; virtual void endRun(const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h index 6a08b1cbb555d..c7685373fa2e2 100644 --- a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h +++ b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.h @@ -35,7 +35,7 @@ namespace cms { public: explicit SiPixelFakeGainReader(const edm::ParameterSet& iConfig); - ~SiPixelFakeGainReader(){}; + ~SiPixelFakeGainReader() {} virtual void beginRun(const edm::Run&, const edm::EventSetup&) override; virtual void endRun(const edm::Run&, const edm::EventSetup&) override; virtual void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc index 0bf04b7a8d266..77d2a89cb3d09 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc @@ -464,7 +464,7 @@ void SiPixelLorentzAngle::analyze(const edm::Event& e, const edm::EventSetup& es SiPixelLorentzAngleTreeForward_->Fill(); } } //end iteration over trajectory measurements - } //end iteration over trajectories + } //end iteration over trajectories } } diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc index 9894715da5094..9171b36accc7e 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvester.cc @@ -731,7 +731,7 @@ SiPixelLAHarvest::fitResults SiPixelLorentzAnglePCLHarvester::fitAndStore( } cov00 = result->CovMatrix(0, 0); } // if the covariance matrix is valid - } // compute the error on the drift-at-half width only for the regular polynomial fit + } // compute the error on the drift-at-half width only for the regular polynomial fit res.dSq = dSq; diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvesterMCS.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvesterMCS.cc index 0c11795ec573c..9ec0c51dc2a4a 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvesterMCS.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLHarvesterMCS.cc @@ -502,7 +502,7 @@ void SiPixelLorentzAnglePCLHarvesterMCS::dqmEndJob(DQMStore::IBooker& iBooker, D fmh.bfield[2] = hists_.h_fpixMagField_[2][idx]->getMean(); fitMuH.add(fmh); } // if fut converged - } // loop over z sides + } // loop over z sides if (fitMuH.size() == hists_.nSides_) { std::string fpixPartNames = "R" + std::to_string(r + 1) + "_P" + std::to_string(p + 1); diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc index 732ec0febc758..75decdd6eae5a 100644 --- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc +++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAnglePCLWorker.cc @@ -719,7 +719,7 @@ void SiPixelLorentzAnglePCLWorker::analyze(edm::Event const& iEvent, edm::EventS } } } //end iteration over trajectory measurements - } //end iteration over trajectories + } //end iteration over trajectories } } @@ -903,8 +903,8 @@ void SiPixelLorentzAnglePCLWorker::bookHistograms(DQMStore::IBooker& iBooker, iHists.h_fpixMean_[idxBeta] = iBooker.book1D(name, title, 60, -3., 3.); } // loop over sides - } // loop over panels - } // loop over rings + } // loop over panels + } // loop over rings iBooker.setCurrentFolder(fmt::sprintf("%s/FPix", folder_.data())); for (int r = 0; r < iHists.nRings_; ++r) { for (int p = 0; p < iHists.nPanels_; ++p) { @@ -930,10 +930,10 @@ void SiPixelLorentzAnglePCLWorker::bookHistograms(DQMStore::IBooker& iBooker, title = fmt::sprintf("%s_magField%d;B_{%c} [T];Entries", baseTitle, m, bComp); iHists.h_fpixMagField_[m][idx] = iBooker.book1D(name, title, 10000, -5., 5.); } // mag. field comps - } // loop over sides - } // loop over panels - } // loop over rings - } // if MinimalClusterSize + } // loop over sides + } // loop over panels + } // loop over rings + } // if MinimalClusterSize // book the track monitoring plots iBooker.setCurrentFolder(fmt::sprintf("%s/TrackMonitoring", folder_.data())); diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc index e9288ca65c653..e6d8bbda02b51 100644 --- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc +++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc @@ -500,7 +500,7 @@ void SiPixelStatusHarvester::dqmEndRun(const edm::Run& iRun, const edm::EventSet histo[PROMPTBADROC].fill(detId, nullptr, column, row); //, 1.0/nLumiBlock_); } } // if bad - } // loop over all ROCs + } // loop over all ROCs // errorType 0 means the full module is bad if (BadRocListPrompt.size() == sensorSize_[detid]) diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc index 812ced2a3b4a2..086ff92c85f9c 100644 --- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc +++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.cc @@ -268,7 +268,7 @@ void SiPixelStatusProducer::endLuminosityBlock(edm::LuminosityBlock const&, edm: fDet_.fillFEDerror25(detid, chs[ich]); } } // loop over detIds - } // if non-empty FEDerror25 + } // if non-empty FEDerror25 } // only for non-zero events } diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h index 54d0eae8c2127..39f897e73aeec 100644 --- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h +++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusProducer.h @@ -115,8 +115,7 @@ class SiPixelStatusProducer : /* Do nothing */ } - static void globalEndJob(SiPixelStatusCache const*) { /* Do nothing */ - } + static void globalEndJob(SiPixelStatusCache const*) { /* Do nothing */ } static std::shared_ptr> globalBeginLuminosityBlockSummary( edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*) { diff --git a/CalibTracker/SiPixelQuality/src/SiPixelModuleStatus.cc b/CalibTracker/SiPixelQuality/src/SiPixelModuleStatus.cc index be64108c3c3e4..45bfa0063ef58 100644 --- a/CalibTracker/SiPixelQuality/src/SiPixelModuleStatus.cc +++ b/CalibTracker/SiPixelQuality/src/SiPixelModuleStatus.cc @@ -17,7 +17,7 @@ SiPixelModuleStatus::SiPixelModuleStatus(int detId, int nrocs) : fDetid_(detId), }; // ---------------------------------------------------------------------- -SiPixelModuleStatus::~SiPixelModuleStatus(){}; +SiPixelModuleStatus::~SiPixelModuleStatus() {} // ---------------------------------------------------------------------- void SiPixelModuleStatus::fillDIGI(int iroc) { diff --git a/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc b/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc index 8c01192c91068..7764f2752daef 100644 --- a/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc +++ b/CalibTracker/SiPixelQuality/src/SiPixelTopoFinder.cc @@ -68,7 +68,7 @@ void SiPixelTopoFinder::init(const TrackerGeometry* trackerGeometry, int value = roc; rocIdMap[key] = value; } // column - } // row + } // row fRocIds_[detid] = rocIdMap; diff --git a/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc b/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc index 5c77407fdc2d9..56f38417e20e0 100644 --- a/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc +++ b/CalibTracker/SiPixelTools/plugins/SiPixelFedFillerWordEventNumber.cc @@ -37,11 +37,11 @@ SiPixelFedFillerWordEventNumber ::~SiPixelFedFillerWordEventNumber() {} unsigned int SiPixelFedFillerWordEventNumber ::CalibStatFillWord(unsigned int totword, int status) { //===== Variables to get each filler word out of the totword and // to conform the last 16 bit filler word if Filler3 is zero. - unsigned int Filler1 = (totword)&0x000000ff; - unsigned int Filler2 = ((totword)&0x0000ff00) >> 8; - unsigned int Filler3 = ((totword)&0x00ff0000) >> 16; - unsigned int Filler4 = ((totword)&0xffff0000) >> 16; - unsigned int maskFiller4 = ((totword)&0xff000000) >> 16; + unsigned int Filler1 = (totword) & 0x000000ff; + unsigned int Filler2 = ((totword) & 0x0000ff00) >> 8; + unsigned int Filler3 = ((totword) & 0x00ff0000) >> 16; + unsigned int Filler4 = ((totword) & 0xffff0000) >> 16; + unsigned int maskFiller4 = ((totword) & 0xff000000) >> 16; unsigned int Filler14 = (Filler1 & maskFiller4); unsigned int Filler24 = (Filler2 & maskFiller4); unsigned int CalibFiller1 = 0; diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc index adc3d07fd2c65..040e34526340b 100644 --- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc +++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainsCalibTreeWorker.cc @@ -557,8 +557,8 @@ void SiStripGainsCalibTreeWorker::checkBookAPVColls(const TrackerGeometry* bareT Index++; histograms.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 @@ -605,10 +605,10 @@ void SiStripGainsCalibTreeWorker::checkBookAPVColls(const TrackerGeometry* bareT histograms.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_) ... } //********************************************************************************// diff --git a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc index b029e7a4f485a..0d3aec7540b32 100644 --- a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc +++ b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLHarvester.cc @@ -749,8 +749,8 @@ void SiStripGainsPCLHarvester::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 @@ -799,10 +799,10 @@ void SiStripGainsPCLHarvester::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/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLWorker.cc b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLWorker.cc index c30c0de70151a..63b033ca5775f 100644 --- a/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLWorker.cc +++ b/CalibTracker/SiStripChannelGain/src/SiStripGainsPCLWorker.cc @@ -452,8 +452,8 @@ void SiStripGainsPCLWorker::checkBookAPVColls(const TrackerGeometry* bareTkGeomP Index++; histograms.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 @@ -501,10 +501,10 @@ void SiStripGainsPCLWorker::checkBookAPVColls(const TrackerGeometry* bareTkGeomP histograms.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_) ... } //********************************************************************************// diff --git a/CalibTracker/SiStripCommon/interface/SiStripDCSStatus.h b/CalibTracker/SiStripCommon/interface/SiStripDCSStatus.h index 7cc980709cb7a..15c901ff99c0a 100644 --- a/CalibTracker/SiStripCommon/interface/SiStripDCSStatus.h +++ b/CalibTracker/SiStripCommon/interface/SiStripDCSStatus.h @@ -18,7 +18,7 @@ class SiStripFedCablingRcd; class SiStripDCSStatus { public: - SiStripDCSStatus(edm::ConsumesCollector&& iC) : SiStripDCSStatus(iC){}; + SiStripDCSStatus(edm::ConsumesCollector&& iC) : SiStripDCSStatus(iC) {} SiStripDCSStatus(edm::ConsumesCollector& iC); bool getStatus(edm::Event const& e, edm::EventSetup const& eSetup); diff --git a/CalibTracker/SiStripCommon/interface/poly.h b/CalibTracker/SiStripCommon/interface/poly.h index bdc1a5ecb81a0..9cf4b3bbed5c1 100644 --- a/CalibTracker/SiStripCommon/interface/poly.h +++ b/CalibTracker/SiStripCommon/interface/poly.h @@ -59,8 +59,8 @@ class poly columns.back().insert(R.begin(), R.end()); return *this; } - friend poly operator+<>(const poly&, const char*); - friend poly operator+<>(const char*, const poly&); + friend poly operator+ <>(const poly&, const char*); + friend poly operator+ <>(const char*, const poly&); const_iterator begin() const { return const_iterator(*this); } const_iterator end() const { return const_iterator::end_of(*this); } diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc index d8494b7bb3d4d..93f29c6cd04b2 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc +++ b/CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc @@ -263,7 +263,7 @@ void ShallowTrackClustersProducer::produce(edm::Event& iEvent, const edm::EventS ontrk_cluster_idx++; } //for(unsigned h=0; h<2; h++) { //loop over possible Hit options (1D, 2D) - } //for(auto const& measurement : traj->measurements() ) + } //for(auto const& measurement : traj->measurements() ) onTrkClustersBegin->at(trk_idx) = trk_strt_idx; onTrkClustersEnd->at(trk_idx) = ontrk_cluster_idx; diff --git a/CalibTracker/SiStripCommon/plugins/ShallowTree.h b/CalibTracker/SiStripCommon/plugins/ShallowTree.h index 26f2b11dc740f..5f6a77ccf7b7e 100644 --- a/CalibTracker/SiStripCommon/plugins/ShallowTree.h +++ b/CalibTracker/SiStripCommon/plugins/ShallowTree.h @@ -41,7 +41,7 @@ class ShallowTree : public edm::one::EDAnalyzer { class BranchConnector { public: - virtual ~BranchConnector(){}; + virtual ~BranchConnector() {} virtual void connect(const edm::Event&) = 0; }; diff --git a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc index e85d85cf9a99c..cd9ea67120d4f 100644 --- a/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc +++ b/CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.cc @@ -39,8 +39,8 @@ class SiStripDetInfoFileWriter : public edm::one::EDAnalyzer { public: explicit SiStripApvGainBuilderFromTag(const edm::ParameterSet& iConfig); - ~SiStripApvGainBuilderFromTag() override{}; + ~SiStripApvGainBuilderFromTag() override {} void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h b/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h index b9e16ca61b6c1..4858943be91c9 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripNoiseNormalizedWithApvGainBuilder.h @@ -32,7 +32,7 @@ class SiStripNoiseNormalizedWithApvGainBuilder : public edm::one::EDAnalyzer<> { public: explicit SiStripNoiseNormalizedWithApvGainBuilder(const edm::ParameterSet& iConfig); - ~SiStripNoiseNormalizedWithApvGainBuilder() override{}; + ~SiStripNoiseNormalizedWithApvGainBuilder() override {} void analyze(const edm::Event&, const edm::EventSetup&) override; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.h b/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.h index 56bfc2af9c20f..de898d0190fdc 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.h +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripQualityFakeESSource.h @@ -22,7 +22,7 @@ class SiStripQualityFakeESSource : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder { public: SiStripQualityFakeESSource(const edm::ParameterSet&); - ~SiStripQualityFakeESSource() override{}; + ~SiStripQualityFakeESSource() override {} SiStripQualityFakeESSource(const SiStripQualityFakeESSource&) = delete; const SiStripQualityFakeESSource& operator=(const SiStripQualityFakeESSource&) = delete; diff --git a/CalibTracker/SiStripESProducers/plugins/fake/SiStripTemplateEmptyFakeESSource.h b/CalibTracker/SiStripESProducers/plugins/fake/SiStripTemplateEmptyFakeESSource.h index d01290de1bdba..9a1e68ebc3b29 100644 --- a/CalibTracker/SiStripESProducers/plugins/fake/SiStripTemplateEmptyFakeESSource.h +++ b/CalibTracker/SiStripESProducers/plugins/fake/SiStripTemplateEmptyFakeESSource.h @@ -22,7 +22,7 @@ class SiStripTemplateEmptyFakeESSource : public edm::ESProducer, public edm::Eve SiStripTemplateEmptyFakeESSource(const edm::ParameterSet&); SiStripTemplateEmptyFakeESSource(const SiStripTemplateEmptyFakeESSource&) = delete; const SiStripTemplateEmptyFakeESSource& operator=(const SiStripTemplateEmptyFakeESSource&) = delete; - ~SiStripTemplateEmptyFakeESSource() override{}; + ~SiStripTemplateEmptyFakeESSource() override {} std::unique_ptr produce(const TRecord&); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc index 4800d1df277ed..2f3370356365c 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripDelayESProducer.cc @@ -34,7 +34,7 @@ class SiStripDelayESProducer : public edm::ESProducer { public: SiStripDelayESProducer(const edm::ParameterSet&); - ~SiStripDelayESProducer() override{}; + ~SiStripDelayESProducer() override {} std::unique_ptr produce(const SiStripDelayRcd&); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc index cf4e45d023535..121c977a50ae5 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainESProducer.cc @@ -23,7 +23,7 @@ class SiStripGainESProducer : public edm::ESProducer { public: SiStripGainESProducer(const edm::ParameterSet&); - ~SiStripGainESProducer() override{}; + ~SiStripGainESProducer() override {} std::unique_ptr produce(const SiStripGainRcd&); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc index 37f5e4f82ae37..a99f3545424e6 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripGainSimESProducer.cc @@ -20,7 +20,7 @@ class SiStripGainSimESProducer : public edm::ESProducer { public: SiStripGainSimESProducer(const edm::ParameterSet&); - ~SiStripGainSimESProducer() override{}; + ~SiStripGainSimESProducer() override {} std::unique_ptr produce(const SiStripGainSimRcd&); diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc index b3b7d31aaf246..b0b57c6d9390d 100644 --- a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc +++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc @@ -62,7 +62,7 @@ namespace { class SiStripQualityESProducer : public edm::ESProducer { public: SiStripQualityESProducer(const edm::ParameterSet&); - ~SiStripQualityESProducer() override{}; + ~SiStripQualityESProducer() override {} std::unique_ptr produce(const SiStripQualityRcd&); diff --git a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc index be8c1f37c7618..526aae56bab30 100644 --- a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc +++ b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEfficiencyHarvester.cc @@ -325,10 +325,10 @@ void SiStripHitEfficiencyHarvester::dqmEndJob(DQMStore::IBooker& booker, DQMStor t_threshold = 0; tree->Fill(); } // if storing tree - } // if not autoInefModTagging - } // if there are no bad APVs - } // if denom - } // loop on DetIds + } // if not autoInefModTagging + } // if there are no bad APVs + } // if denom + } // loop on DetIds if (autoIneffModTagging_) { for (unsigned int i = 1; i <= k_LayersAtTECEnd; i++) { @@ -442,10 +442,10 @@ void SiStripHitEfficiencyHarvester::dqmEndJob(DQMStore::IBooker& booker, DQMStor } } } // if denom - } // layer = i - } // loop on detids - } // loop on layers - } // if auto tagging + } // layer = i + } // loop on detids + } // loop on layers + } // if auto tagging tkMap.save(true, 0, 0, "SiStripHitEffTKMap_NEW.png"); tkMapBad.save(true, 0, 0, "SiStripHitEffTKMapBad_NEW.png"); diff --git a/CalibTracker/SiStripHitResolution/interface/SiStripOverlapHit.h b/CalibTracker/SiStripHitResolution/interface/SiStripOverlapHit.h index 9dc5e3b338d9f..895bc18b5f113 100644 --- a/CalibTracker/SiStripHitResolution/interface/SiStripOverlapHit.h +++ b/CalibTracker/SiStripHitResolution/interface/SiStripOverlapHit.h @@ -32,7 +32,7 @@ class SiStripOverlapHit { // constructes an overlap from 2 hits and a track. Hits are internally sorted inside-out explicit SiStripOverlapHit(TrajectoryMeasurement const& measA, TrajectoryMeasurement const& measB); // destructor - virtual ~SiStripOverlapHit(){}; + virtual ~SiStripOverlapHit() {} // access to indivitual hits and to the trajectory state inline ConstRecHitPointer const& hitA() const { return measA_.recHit(); } diff --git a/CalibTracker/SiStripHitResolution/src/HitResol.cc b/CalibTracker/SiStripHitResolution/src/HitResol.cc index 16437e3d2a8cf..02c4833313ffc 100644 --- a/CalibTracker/SiStripHitResolution/src/HitResol.cc +++ b/CalibTracker/SiStripHitResolution/src/HitResol.cc @@ -442,9 +442,9 @@ void HitResol::analyze(const edm::Event& e, const edm::EventSetup& es) { reso->Fill(); } } //itTraj2 != TMeas.end() - } //hit1->isValid().... - } // itm - } // it + } //hit1->isValid().... + } // itm + } // it } void HitResol::endJob() { diff --git a/CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.cc b/CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.cc index 9f2bafdb5dc26..a6b3cef172e23 100644 --- a/CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.cc +++ b/CalibTracker/SiStripLorentzAngle/plugins/EnsembleCalibrationLA.cc @@ -20,7 +20,7 @@ namespace sistrip { vMethods(conf.getParameter >("Methods")), tTopoToken_(esConsumes()) {} - EnsembleCalibrationLA::~EnsembleCalibrationLA(){}; + EnsembleCalibrationLA::~EnsembleCalibrationLA() {} void EnsembleCalibrationLA::endJob() { Book book("la_ensemble"); diff --git a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLHarvester.cc b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLHarvester.cc index 148db5be79083..d295875dab308 100644 --- a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLHarvester.cc +++ b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLorentzAnglePCLHarvester.cc @@ -435,7 +435,7 @@ void SiStripLorentzAnglePCLHarvester::dqmEndJob(DQMStore::IBooker& iBooker, DQMS throw cms::Exception("SiStripLorentzAnglePCLHarvester") << "Trying to fill an inexistent module location from " << loc.second << "!"; } // - } // ends loop on location types + } // ends loop on location types // book the TkDetMaps const auto tkDetMapFolderIn = (fmt::format("{}Harvesting/TkDetMaps_LAInput", dqmDir_)); diff --git a/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h b/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h index baa9cdd77394d..b926273102397 100644 --- a/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h +++ b/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h @@ -77,7 +77,7 @@ class SiStripBadAPVAlgorithmFromClusterOccupancy { const SiStripQuality*); struct pHisto { - pHisto() : _NEntries(0), _NBins(0){}; + pHisto() : _NEntries(0), _NBins(0) {} TH1F* _th1f; int _NEntries; int _NBins; diff --git a/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h b/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h index 1b2906c65f54f..230a54068d5c9 100644 --- a/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h +++ b/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h @@ -72,7 +72,7 @@ class SiStripHotStripAlgorithmFromClusterOccupancy { private: struct pHisto { - pHisto() : _NEntries(0), _NEmptyBins(0), _SubdetId(0){}; + pHisto() : _NEntries(0), _NEmptyBins(0), _SubdetId(0) {} TH1F* _th1f; int _NEntries; int _NEmptyBins; diff --git a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc index 86ba4d48d4c8e..ef4f72bb734c2 100644 --- a/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc +++ b/Calibration/EcalAlCaRecoProducers/plugins/SelectedElectronFEDListProducer.cc @@ -520,7 +520,7 @@ void SelectedElectronFEDListProducer::produce(edm::Event& iEvent, c fedList_.push_back(hitFED); } } // end endcap - } // end loop on SC hit + } // end loop on SC hit // check HCAL behind each hit if (dumpSelectedHCALFed_) { @@ -552,7 +552,7 @@ void SelectedElectronFEDListProducer::produce(edm::Event& iEvent, c } } } // End Hcal - } // End Ecal + } // End Ecal // get the electron track if (!dumpAllTrackerFed_) { @@ -635,10 +635,10 @@ void SelectedElectronFEDListProducer::produce(edm::Event& iEvent, c } } } // end tracker analysis - } // end loop on the electron candidate - } // end loop on the electron collection collection - } // end loop on the recoEcal candidate - } // end loop on the recoEcal candidate collection + } // end loop on the electron candidate + } // end loop on the electron collection collection + } // end loop on the recoEcal candidate + } // end loop on the recoEcal candidate collection // add a set of chosen FED for (unsigned int iFed = 0; iFed < addThisSelectedFEDs_.size(); iFed++) { if (addThisSelectedFEDs_.at(iFed) == -1) diff --git a/Calibration/EcalCalibAlgos/interface/Pi0FixedMassWindowCalibration.h b/Calibration/EcalCalibAlgos/interface/Pi0FixedMassWindowCalibration.h index 06a1b911b35ac..110c1efde282a 100644 --- a/Calibration/EcalCalibAlgos/interface/Pi0FixedMassWindowCalibration.h +++ b/Calibration/EcalCalibAlgos/interface/Pi0FixedMassWindowCalibration.h @@ -49,7 +49,7 @@ class Pi0FixedMassWindowCalibration : public edm::ESProducerLooper { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); /// Dummy implementation (job done in duringLoop) - virtual void produce(edm::Event&, const edm::EventSetup&){}; + virtual void produce(edm::Event&, const edm::EventSetup&) {} /// Called at beginning of job void beginOfJob() override; diff --git a/Calibration/EcalCalibAlgos/interface/VEcalCalibBlock.h b/Calibration/EcalCalibAlgos/interface/VEcalCalibBlock.h index 3a04d0ab3b1bb..4a1f1842ce5fa 100644 --- a/Calibration/EcalCalibAlgos/interface/VEcalCalibBlock.h +++ b/Calibration/EcalCalibAlgos/interface/VEcalCalibBlock.h @@ -13,9 +13,9 @@ class VEcalCalibBlock { public: //! ctor - VEcalCalibBlock(int numberOfElements) : m_numberOfElements(numberOfElements){}; + VEcalCalibBlock(int numberOfElements) : m_numberOfElements(numberOfElements) {} //! dtor - virtual ~VEcalCalibBlock(){}; + virtual ~VEcalCalibBlock() {} //! insert an entry virtual void Fill(std::map::const_iterator, diff --git a/Calibration/EcalCalibAlgos/interface/VFillMap.h b/Calibration/EcalCalibAlgos/interface/VFillMap.h index 4cabe6323eeeb..5a0867aa32204 100644 --- a/Calibration/EcalCalibAlgos/interface/VFillMap.h +++ b/Calibration/EcalCalibAlgos/interface/VFillMap.h @@ -22,7 +22,7 @@ class VFillMap { EcalIntercalibConstantMap *); //!dtor - virtual ~VFillMap(){}; + virtual ~VFillMap() {} //! The Map filler virtual void fillMap(const std::vector > &, const DetId, diff --git a/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h b/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h index 9e78f35854233..5ab4bd3fa39fa 100644 --- a/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h +++ b/Calibration/EcalCalibAlgos/interface/ZeeCalibration.h @@ -74,7 +74,7 @@ class ZeeCalibration : public edm::ESProducerLooper { ~ZeeCalibration() override; /// Dummy implementation (job done in duringLoop) - virtual void produce(edm::Event&, const edm::EventSetup&){}; + virtual void produce(edm::Event&, const edm::EventSetup&) {} /// Called at beginning of job void beginOfJob() override; diff --git a/Calibration/EcalCalibAlgos/plugins/EcalPhiSymRecHitProducers.cc b/Calibration/EcalCalibAlgos/plugins/EcalPhiSymRecHitProducers.cc index d0b302cf42b9f..94d85a3b0bf99 100644 --- a/Calibration/EcalCalibAlgos/plugins/EcalPhiSymRecHitProducers.cc +++ b/Calibration/EcalCalibAlgos/plugins/EcalPhiSymRecHitProducers.cc @@ -69,7 +69,7 @@ struct ConfigCache { class EcalPhiSymRecHitProducerBase { public: explicit EcalPhiSymRecHitProducerBase(const edm::ParameterSet& pSet, edm::ConsumesCollector&& cc); - ~EcalPhiSymRecHitProducerBase(){}; + ~EcalPhiSymRecHitProducerBase() {} //---methods // job @@ -372,7 +372,7 @@ class EcalPhiSymRecHitProducerLumi : public edm::global::EDProducer globalBeginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) const override; - void globalEndLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) const override{}; + void globalEndLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) const override {} std::shared_ptr globalBeginLuminosityBlockSummary(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) const override; void globalEndLuminosityBlockSummary(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup, - PhiSymCache* cache) const override{}; + PhiSymCache* cache) const override {} void globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumi, edm::EventSetup const& setup, PhiSymCache const* cache) const override; @@ -504,7 +504,7 @@ class EcalPhiSymRecHitProducerRun : public edm::global::EDProducer globalBeginRun(edm::Run const& run, edm::EventSetup const& setup) const override; std::shared_ptr globalBeginRunSummary(edm::Run const& run, edm::EventSetup const& setup) const override; - void globalEndRun(edm::Run const& run, edm::EventSetup const& setup) const override{}; - void globalEndRunSummary(edm::Run const& run, edm::EventSetup const& setup, PhiSymCache* cache) const override{}; + void globalEndRun(edm::Run const& run, edm::EventSetup const& setup) const override {} + void globalEndRunSummary(edm::Run const& run, edm::EventSetup const& setup, PhiSymCache* cache) const override {} void globalEndRunProduce(edm::Run& run, edm::EventSetup const& setup, PhiSymCache const* cache) const override; // stream std::unique_ptr beginStream(edm::StreamID stream) const override; diff --git a/Calibration/EcalCalibAlgos/src/EcalGeomPhiSymHelper.cc b/Calibration/EcalCalibAlgos/src/EcalGeomPhiSymHelper.cc index f3bb31fdb3755..96edf2beb5d7c 100644 --- a/Calibration/EcalCalibAlgos/src/EcalGeomPhiSymHelper.cc +++ b/Calibration/EcalCalibAlgos/src/EcalGeomPhiSymHelper.cc @@ -127,8 +127,8 @@ void EcalGeomPhiSymHelper::setup(const CaloGeometry* geometry, const EcalChannel } //sign } //if - } //ix - } //iy + } //ix + } //iy meanCellArea_[ring] /= nRing_[ring]; @@ -148,9 +148,9 @@ void EcalGeomPhiSymHelper::setup(const CaloGeometry* geometry, const EcalChannel if (cellPhi_[ix][iy] < phimin && cellPhi_[ix][iy] > philast) { phimin = cellPhi_[ix][iy]; } //if edges - } //if ring - } //iy - } //ix + } //if ring + } //iy + } //ix phi_endc_[ip][ring] = phimin; philast = phimin; } //ip diff --git a/Calibration/EcalCalibAlgos/src/IMACalibBlock.cc b/Calibration/EcalCalibAlgos/src/IMACalibBlock.cc index 543a5554440cb..29c32ebc50a8a 100644 --- a/Calibration/EcalCalibAlgos/src/IMACalibBlock.cc +++ b/Calibration/EcalCalibAlgos/src/IMACalibBlock.cc @@ -62,7 +62,7 @@ void IMACalibBlock::complete() { aft = (j * m_numberOfElements + i); m_kaliMatrix.at(aft) = m_kaliMatrix.at(bef); } //LP second loop over xtals - } //LP first loop over xtals + } //LP first loop over xtals return; } diff --git a/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc b/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc index fbbf6fee60c54..35e3e43ddc647 100644 --- a/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc +++ b/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc @@ -609,7 +609,7 @@ edm::EDLooper::Status Pi0FixedMassWindowCalibration::duringLoop(const edm::Event } } // End of the "j" loop over BCEB - } // End of the "i" loop over BCEB + } // End of the "i" loop over BCEB } else { cout << " Not enough ECAL Barrel Basic Clusters: " << nIslandBCEB << endl; diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc index b98c55fc120b8..377fa1e7497c5 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc +++ b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHOCalibProducer.cc @@ -924,7 +924,7 @@ void AlCaHOCalibProducer::fillHOStore(const reco::TrackRef& ncosm, Noccu++; hostore->push_back(tmpHOCalib); } // if (ipath) - } // Cut on calo energy + } // Cut on calo energy } void AlCaHOCalibProducer::findHOEtaPhi(int iphisect, int& ietaho, int& iphiho) { diff --git a/Calibration/HcalCalibAlgos/interface/TCell.h b/Calibration/HcalCalibAlgos/interface/TCell.h index e5420dc221156..ce0a79ff1f6c4 100644 --- a/Calibration/HcalCalibAlgos/interface/TCell.h +++ b/Calibration/HcalCalibAlgos/interface/TCell.h @@ -22,7 +22,7 @@ class TCell : public TObject { _id = 0; _e = 0.0; } - ~TCell() override{}; + ~TCell() override {} TCell(UInt_t i, Float_t e) { _id = i; _e = e; diff --git a/Calibration/HcalCalibAlgos/plugins/Analyzer_minbias.cc b/Calibration/HcalCalibAlgos/plugins/Analyzer_minbias.cc index 8d5f00804114d..d812734332fee 100644 --- a/Calibration/HcalCalibAlgos/plugins/Analyzer_minbias.cc +++ b/Calibration/HcalCalibAlgos/plugins/Analyzer_minbias.cc @@ -282,8 +282,8 @@ namespace cms { hCalo2mom2[i][j] = fs->make(str11, "h11", 320, 0., 120.); } } // HE/HF boundary - } // j - } // i + } // j + } // i hbheNoiseE = fs->make("hbheNoiseE", "hbheNoiseE", 320, -10., 10.); hfNoiseE = fs->make("hfNoiseE", "hfNoiseE", 320, -10., 10.); @@ -392,10 +392,10 @@ namespace cms { ii++; } // Min>0 - } // ieta - } // iphi - } // depth - } //subd + } // ieta + } // iphi + } // depth + } //subd edm::LogVerbatim("AnalyzerMB") << " Number of cells " << ii; diff --git a/Calibration/HcalCalibAlgos/plugins/SimAnalyzerMinbias.cc b/Calibration/HcalCalibAlgos/plugins/SimAnalyzerMinbias.cc index e5f5757a2cc26..a2b81b36a6113 100644 --- a/Calibration/HcalCalibAlgos/plugins/SimAnalyzerMinbias.cc +++ b/Calibration/HcalCalibAlgos/plugins/SimAnalyzerMinbias.cc @@ -43,8 +43,8 @@ class SimAnalyzerMinbias : public edm::one::EDAnalyzer>::const_iterator ith = hfreco->begin(); @@ -823,12 +823,12 @@ void DiJetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& evS tpfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } } // Test if ieta,iphi match - } // Loop over rechits - } // Loop over hits - } // Test if element is HO - } // Test for right element index - } // Loop over elements - } // Loop over elements in blocks + } // Loop over rechits + } // Loop over hits + } // Test if element is HO + } // Test for right element index + } // Loop over elements + } // Loop over elements in blocks switch (candidateType) { case reco::PFCandidate::h_HF: @@ -1085,10 +1085,10 @@ void DiJetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& evS } ppfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } - } // Test if ieta,iphi matches - } // Loop over rechits - } // Loop over hits - } // Test if element is from HCAL + } // Test if ieta,iphi matches + } // Loop over rechits + } // Loop over hits + } // Test if element is from HCAL else if (elements[iEle].type() == reco::PFBlockElement::HFHAD) { // Element is HF for (edm::SortedCollection>::const_iterator ith = hfreco->begin(); @@ -1238,12 +1238,12 @@ void DiJetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& evS ppfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } } // Test if ieta,iphi match - } // Loop over rechits - } // Loop over hits - } // Test if element is from HO - } // Test for right element index - } // Loop over elements - } // Loop over elements in blocks + } // Loop over rechits + } // Loop over hits + } // Test if element is from HO + } // Test for right element index + } // Loop over elements + } // Loop over elements in blocks switch (candidateType) { case reco::PFCandidate::h_HF: ppfjet_had_emf_.push_back(HFEM_E / (HFEM_E + HFHAD_E)); diff --git a/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc b/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc index fe8676a990161..22b1eaf140001 100644 --- a/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc +++ b/Calibration/HcalCalibAlgos/test/GammaJetAnalysis.cc @@ -1459,10 +1459,10 @@ void GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& } ppfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } - } // Test if ieta,iphi matches - } // Loop over rechits - } // Loop over hits - } // Test if element is from HCAL + } // Test if ieta,iphi matches + } // Loop over rechits + } // Loop over hits + } // Test if element is from HCAL else if (elements[iEle].type() == reco::PFBlockElement::HFHAD) { // Element is HF //// h_etaHFHAD_->Fill((*it)->eta()); @@ -1623,12 +1623,12 @@ void GammaJetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& ppfjet_rechits[(*ith).id()].second.insert(hitsAndFracs[iHit].second); } } // Test if ieta,iphi match - } // Loop over rechits - } // Loop over hits - } // Test if element is from HO - } // Test for right element index - } // Loop over elements - } // Loop over elements in blocks + } // Loop over rechits + } // Loop over hits + } // Test if element is from HO + } // Test for right element index + } // Loop over elements + } // Loop over elements in blocks switch (candidateType) { case reco::PFCandidate::h_HF: ppfjet_had_emf_.push_back(HFEM_E / (HFEM_E + HFHAD_E)); diff --git a/Calibration/IsolatedParticles/interface/CaloSimInfo.icc b/Calibration/IsolatedParticles/interface/CaloSimInfo.icc index 78c3f95d33b85..f7307b9bb1fe6 100644 --- a/Calibration/IsolatedParticles/interface/CaloSimInfo.icc +++ b/Calibration/IsolatedParticles/interface/CaloSimInfo.icc @@ -680,8 +680,8 @@ namespace spr { if (debug) edm::LogVerbatim("IsoTrack") << "Hit " << ihit << ": " << *hit[ihit]; } // else condition, i.e. (hit[ihit]->geantTrackId() != (int)matchSimTrk ) - } // loop over hits - } // if (trkInfo != SimTk->end()) + } // loop over hits + } // if (trkInfo != SimTk->end()) double energyTot = energySum + energyGamma + energyNeutral + energyCharged + energyRest; multiplicityVector.push_back(uniqueIds_matched.size()); diff --git a/Calibration/IsolatedParticles/interface/eECALMatrix.icc b/Calibration/IsolatedParticles/interface/eECALMatrix.icc index 8a57d5931d8f9..35c4fac9ee137 100644 --- a/Calibration/IsolatedParticles/interface/eECALMatrix.icc +++ b/Calibration/IsolatedParticles/interface/eECALMatrix.icc @@ -126,7 +126,7 @@ namespace spr { } } // iphi - } // ieta + } // ieta } template diff --git a/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc b/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc index 14fc021645e4c..8cc59cdf97272 100644 --- a/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc +++ b/Calibration/IsolatedParticles/plugins/IsoTrackCalibration.cc @@ -419,8 +419,8 @@ void IsoTrackCalibration::analyze(const edm::Event &iEvent, const edm::EventSetu } tree->Fill(); } // end of conditions on t_eMipDR and t_hmaxNearP - } // end of loose check of track quality - } // end of loop over tracks + } // end of loose check of track quality + } // end of loop over tracks h_nTrk->Fill(nTracks); } // end of triggerOK diff --git a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc index 9363fde7f1ca7..742a9cec9ae52 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc @@ -462,7 +462,7 @@ void IsolatedGenParticles::analyze(const edm::Event &iEvent, const edm::EventSet h_L1AlgoNames->GetXaxis()->SetBinLabel(itrig + 1, algoBitToName_[itrig].c_str()); } // end of for loop - } // end of initL1 + } // end of initL1 // save L1 decision for each event for (unsigned int iBit = 0; iBit < numberTriggerBits; ++iBit) { diff --git a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc index 0aafb0b9c9440..5fa811c36c7d9 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc @@ -657,7 +657,7 @@ void IsolatedTracksNxN::analyze(const edm::Event &iEvent, const edm::EventSetup << (*recVtxs)[ind].tracksSize() << " sumPt " << vtxTrkSumPt; } } // if vtx is not Fake - } // loop over PVs + } // loop over PVs //=================================================================================== // Get the beamspot @@ -1650,8 +1650,8 @@ void IsolatedTracksNxN::analyze(const edm::Event &iEvent, const edm::EventSetup } } // if loosely isolated track - } // check p1/eta - } // loop over track collection + } // check p1/eta + } // loop over track collection if (haveIsoTrack) tree_->Fill(); diff --git a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc index 77adc0f8981e6..f6b99eee911b3 100644 --- a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc +++ b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersAnalyzer.cc @@ -66,7 +66,7 @@ class NearbyPixelClustersAnalyzer : public edm::one::EDAnalyzer bookModuleHistograms(const TrackerTopology* tTopo); std::tuple setTopoInfo(uint32_t detId, const TrackerTopology* tTopo); void endJob() override; diff --git a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc index 0411b72144457..42250ba02de6d 100644 --- a/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc +++ b/Calibration/TkAlCaRecoProducers/plugins/NearbyPixelClustersProducer.cc @@ -238,7 +238,7 @@ const trajCrossings_t NearbyPixelClustersProducer::findAllTrajectoriesCrossings( treatedIds.push_back(rawId); } } // loop on measurements in trajectory - } // loop on trajectories + } // loop on trajectories return crossings; } @@ -374,7 +374,7 @@ const std::vector::const_iterator> NearbyPixelClu outputClusters.push_back(closest); } } // loop on all clusters - } // loop on the trajectory crossings + } // loop on the trajectory crossings return outputClusters; } diff --git a/Calibration/Tools/interface/CalibElectron.h b/Calibration/Tools/interface/CalibElectron.h index 28f6137cca740..cc8c3cf0f379a 100644 --- a/Calibration/Tools/interface/CalibElectron.h +++ b/Calibration/Tools/interface/CalibElectron.h @@ -16,9 +16,9 @@ namespace calib { CalibElectron(const reco::GsfElectron* ele, const EcalRecHitCollection* theHits, const EcalRecHitCollection* theEEHits) - : theElectron_(ele), theHits_(theHits), theEEHits_(theEEHits){}; + : theElectron_(ele), theHits_(theHits), theEEHits_(theEEHits) {} - ~CalibElectron(){}; + ~CalibElectron() {} std::vector > getCalibModulesWeights(TString calibtype); const reco::GsfElectron* getRecoElectron() { return theElectron_; } diff --git a/Calibration/Tools/interface/DetIdAssociator.h b/Calibration/Tools/interface/DetIdAssociator.h index cfda758ba9e1b..bc6d6b553b659 100644 --- a/Calibration/Tools/interface/DetIdAssociator.h +++ b/Calibration/Tools/interface/DetIdAssociator.h @@ -31,11 +31,11 @@ class HDetIdAssociator { public: - HDetIdAssociator() : theMap_(nullptr), nPhi_(0), nEta_(0), etaBinSize_(0), ivProp_(nullptr){}; + HDetIdAssociator() : theMap_(nullptr), nPhi_(0), nEta_(0), etaBinSize_(0), ivProp_(nullptr) {} HDetIdAssociator(const int nPhi, const int nEta, const double etaBinSize) - : theMap_(nullptr), nPhi_(nPhi), nEta_(nEta), etaBinSize_(etaBinSize), ivProp_(nullptr){}; + : theMap_(nullptr), nPhi_(nPhi), nEta_(nEta), etaBinSize_(etaBinSize), ivProp_(nullptr) {} - virtual ~HDetIdAssociator(){}; + virtual ~HDetIdAssociator() {} virtual std::vector getTrajectory(const FreeTrajectoryState&, const std::vector&); // find DetIds arround given direction // idR is a number of the adjacent bins to retrieve diff --git a/Calibration/Tools/interface/EcalIndexingTools.h b/Calibration/Tools/interface/EcalIndexingTools.h index 0e8b87983955f..9c98165b1caa7 100644 --- a/Calibration/Tools/interface/EcalIndexingTools.h +++ b/Calibration/Tools/interface/EcalIndexingTools.h @@ -9,7 +9,7 @@ class EcalIndexingTools { private: EcalIndexingTools() - : totNumberOfBins_(-1), nBinsEt_(-1), nBinsEta_(-1), maxEta_(-1.), maxEt_(-1.), minEta_(-1.), minEt_(-1.){}; + : totNumberOfBins_(-1), nBinsEt_(-1), nBinsEta_(-1), maxEta_(-1.), maxEt_(-1.), minEta_(-1.), minEt_(-1.) {} static EcalIndexingTools* instance_; @@ -18,7 +18,7 @@ class EcalIndexingTools { double maxEta_, maxEt_, minEta_, minEt_; public: - ~EcalIndexingTools(){}; + ~EcalIndexingTools() {} static EcalIndexingTools* getInstance() { if (instance_ == nullptr) { diff --git a/Calibration/Tools/interface/EcalRingCalibrationTools.h b/Calibration/Tools/interface/EcalRingCalibrationTools.h index f311c2bfecca4..b5b59e231c183 100644 --- a/Calibration/Tools/interface/EcalRingCalibrationTools.h +++ b/Calibration/Tools/interface/EcalRingCalibrationTools.h @@ -22,8 +22,8 @@ class CaloGeometry; class EcalRingCalibrationTools { public: - EcalRingCalibrationTools(){}; - ~EcalRingCalibrationTools(){}; + EcalRingCalibrationTools() {} + ~EcalRingCalibrationTools() {} /// Retrieve the phi-ring index corresponding to a DetId static short getRingIndex(DetId aDetId); diff --git a/Calibration/Tools/src/EcalRingCalibrationTools.cc b/Calibration/Tools/src/EcalRingCalibrationTools.cc index d1e7b4dd50d00..42d6c8c511b64 100644 --- a/Calibration/Tools/src/EcalRingCalibrationTools.cc +++ b/Calibration/Tools/src/EcalRingCalibrationTools.cc @@ -172,8 +172,8 @@ std::vector EcalRingCalibrationTools::getDetIdsInModule(short moduleIndex // std::cout<<"Putting Xtal with ieta: "< *output, const std::string &dati) { if (buffer != -1) output->push_back(buffer); } // loop over the line - } // loop over the file + } // loop over the file return output->size(); } diff --git a/CondFormats/PPSObjects/interface/TotemDAQMapping.h b/CondFormats/PPSObjects/interface/TotemDAQMapping.h index be2bdddf63bda..b3c442da47b35 100644 --- a/CondFormats/PPSObjects/interface/TotemDAQMapping.h +++ b/CondFormats/PPSObjects/interface/TotemDAQMapping.h @@ -51,7 +51,7 @@ class TotemDAQMapping { int plane; int channel; - TotemTimingPlaneChannelPair(const int& plane = -1, const int& channel = -1) : plane(plane), channel(channel){}; + TotemTimingPlaneChannelPair(const int& plane = -1, const int& channel = -1) : plane(plane), channel(channel) {} COND_SERIALIZABLE; }; std::map totemTimingChannelMap; diff --git a/IORawData/CaloPatterns/src/HtrXmlPatternTool.cc b/IORawData/CaloPatterns/src/HtrXmlPatternTool.cc index e0d4e7da98ee7..81b2147b5f6fb 100644 --- a/IORawData/CaloPatterns/src/HtrXmlPatternTool.cc +++ b/IORawData/CaloPatterns/src/HtrXmlPatternTool.cc @@ -171,8 +171,8 @@ void HtrXmlPatternTool::writeXML() { } } //end fiber loop - } // end tb loop - } //end slot loop + } // end tb loop + } //end slot loop if (m_params->m_XML_file_mode == 2) { (*of) << "" << std::endl; diff --git a/IORawData/DTCommissioning/plugins/DTDDUFileReader.cc b/IORawData/DTCommissioning/plugins/DTDDUFileReader.cc index 37c3d9fea0f4a..458095288d6fc 100644 --- a/IORawData/DTCommissioning/plugins/DTDDUFileReader.cc +++ b/IORawData/DTCommissioning/plugins/DTDDUFileReader.cc @@ -117,7 +117,7 @@ int DTDDUFileReader::fillRawData(Event& e, if (dataTag) { swap(word); } // WARNING also the ddu status words have been swapped! - // Control the correct interpretation in DDUUnpacker + // Control the correct interpretation in DDUUnpacker } eventData.push_back(word); diff --git a/IORawData/DTCommissioning/plugins/DTSpyHelper.h b/IORawData/DTCommissioning/plugins/DTSpyHelper.h index c5de82cb7b9cc..471021cb95dfc 100644 --- a/IORawData/DTCommissioning/plugins/DTSpyHelper.h +++ b/IORawData/DTCommissioning/plugins/DTSpyHelper.h @@ -12,7 +12,7 @@ class DTtcpExcp { int errornumber; public: - DTtcpExcp(int err) : errornumber(err){}; + DTtcpExcp(int err) : errornumber(err) {} }; class DTCtcp { diff --git a/MuonAnalysis/MomentumScaleCalibration/interface/Functions.h b/MuonAnalysis/MomentumScaleCalibration/interface/Functions.h index 6cc5f339673ac..afa12c1cdc828 100644 --- a/MuonAnalysis/MomentumScaleCalibration/interface/Functions.h +++ b/MuonAnalysis/MomentumScaleCalibration/interface/Functions.h @@ -846,7 +846,7 @@ class resolutionFunctionBase { TString* parname, const T& parResol, const std::vector& parResolOrder, - const int muonType){}; + const int muonType) {}; virtual void setParameters(double* Start, double* Step, double* Mini, diff --git a/MuonAnalysis/MomentumScaleCalibration/interface/SigmaPtDiff.h b/MuonAnalysis/MomentumScaleCalibration/interface/SigmaPtDiff.h index 9f416d06c90b4..513de433d05b9 100644 --- a/MuonAnalysis/MomentumScaleCalibration/interface/SigmaPtDiff.h +++ b/MuonAnalysis/MomentumScaleCalibration/interface/SigmaPtDiff.h @@ -10,7 +10,7 @@ class SigmaPt { setParErr(parameters_, errors_); } - SigmaPt(){}; + SigmaPt() {} void setParErr(const std::vector& parameters, const std::vector& errors) { b_0 = parameters[0]; diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsAnalyzer.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsAnalyzer.cc index 16514bf73bd1b..9f324323ccb23 100644 --- a/MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsAnalyzer.cc +++ b/MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsAnalyzer.cc @@ -55,7 +55,7 @@ class ErrorsAnalyzer : public edm::one::EDAnalyzer<> { const TProfile* histoMinusErr, const TString& type); void fillValueError(); - void endJob() override{}; + void endJob() override {} TString treeFileName_; int resolFitType_; diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsPropagationAnalyzer.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsPropagationAnalyzer.cc index 1b0ff970536c0..d867357bb5bab 100644 --- a/MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsPropagationAnalyzer.cc +++ b/MuonAnalysis/MomentumScaleCalibration/plugins/ErrorsPropagationAnalyzer.cc @@ -57,7 +57,7 @@ class ErrorsPropagationAnalyzer : public edm::one::EDAnalyzer<> { const TString& type, const TString& yLabel); void fillValueError(); - void endJob() override{}; + void endJob() override {} /// Modified method to take into account the error double massResolution(const lorentzVector& mu1, const lorentzVector& mu2, diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/Histograms.h b/MuonAnalysis/MomentumScaleCalibration/plugins/Histograms.h index a87fc548bac61..5094847254fff 100644 --- a/MuonAnalysis/MomentumScaleCalibration/plugins/Histograms.h +++ b/MuonAnalysis/MomentumScaleCalibration/plugins/Histograms.h @@ -39,7 +39,7 @@ class Histograms { public: // Constructor // ----------- - Histograms() : theWeight_(1), histoDir_(nullptr){}; + Histograms() : theWeight_(1), histoDir_(nullptr) {} Histograms(const TString& name) : theWeight_(1), name_(name), histoDir_(nullptr) {} Histograms(TFile* outputFile, const TString& name) : theWeight_(1), name_(name), outputFile_(outputFile), histoDir_(outputFile->GetDirectory(name)) { @@ -51,39 +51,39 @@ class Histograms { // Destructor // ---------- - virtual ~Histograms(){}; + virtual ~Histograms() {} // Operations // ---------- - // virtual void Fill( const reco::Particle::LorentzVector & p4 ) {}; - // virtual void Fill( const CLHEP::HepLorentzVector & momentum ) {}; - virtual void Fill(const reco::Particle::LorentzVector& p1, const reco::Particle::LorentzVector& p2){}; + // virtual void Fill( const reco::Particle::LorentzVector & p4 ) {} + // virtual void Fill( const CLHEP::HepLorentzVector & momentum ) {} + virtual void Fill(const reco::Particle::LorentzVector& p1, const reco::Particle::LorentzVector& p2) {} virtual void Fill(const reco::Particle::LorentzVector& p1, const reco::Particle::LorentzVector& p2, const int charge, - const double& weight = 1.){}; - virtual void Fill(const CLHEP::HepLorentzVector& momentum1, const CLHEP::HepLorentzVector& momentum2){}; + const double& weight = 1.) {}; + virtual void Fill(const CLHEP::HepLorentzVector& momentum1, const CLHEP::HepLorentzVector& momentum2) {} virtual void Fill(const CLHEP::HepLorentzVector& momentum1, const CLHEP::HepLorentzVector& momentum2, const int charge, - const double& weight = 1.){}; - virtual void Fill(const CLHEP::HepLorentzVector& p1, const reco::Particle::LorentzVector& p2){}; - virtual void Fill(const reco::Particle::LorentzVector& p4, const double& weight = 1.){}; + const double& weight = 1.) {}; + virtual void Fill(const CLHEP::HepLorentzVector& p1, const reco::Particle::LorentzVector& p2) {} + virtual void Fill(const reco::Particle::LorentzVector& p4, const double& weight = 1.) {} //virtual void Fill( const CLHEP::HepLorentzVector & momentum, const double & weight ) {}; //------ - virtual void Fill(const reco::Particle::LorentzVector& p4, const int charge, const double& weight = 1.){}; + virtual void Fill(const reco::Particle::LorentzVector& p4, const int charge, const double& weight = 1.) {} - virtual void Fill(const CLHEP::HepLorentzVector& momentum, const int charge, const double& weight = 1.){}; + virtual void Fill(const CLHEP::HepLorentzVector& momentum, const int charge, const double& weight = 1.) {} //------ // virtual void Fill( const reco::Particle::LorentzVector & p4, const double & likeValue ) {}; - virtual void Fill(const reco::Particle::LorentzVector& p4, const double& resValue, const int charge){}; + virtual void Fill(const reco::Particle::LorentzVector& p4, const double& resValue, const int charge) {} virtual void Fill(const reco::Particle::LorentzVector& p4, const double& genValue, const double recValue, - const int charge){}; - virtual void Fill(const CLHEP::HepLorentzVector& p, const double& likeValue){}; - virtual void Fill(const unsigned int number){}; + const int charge) {}; + virtual void Fill(const CLHEP::HepLorentzVector& p, const double& likeValue) {} + virtual void Fill(const unsigned int number) {} virtual void Fill(const reco::Particle::LorentzVector& recoP1, const int charge1, const reco::Particle::LorentzVector& genP1, @@ -91,7 +91,7 @@ class Histograms { const int charge2, const reco::Particle::LorentzVector& genP2, const double& recoMass, - const double& genMass){}; + const double& genMass) {}; virtual void Fill(const reco::Particle::LorentzVector& recoP1, const int charge1, // const reco::Particle::LorentzVector & genP1, @@ -99,21 +99,21 @@ class Histograms { const int charge2, // const reco::Particle::LorentzVector & genP2, const double& recoMass, - const double& genMass){}; + const double& genMass) {}; virtual void Fill(const reco::Particle::LorentzVector& recoP1, const reco::Particle::LorentzVector& genP1, const reco::Particle::LorentzVector& recoP2, - const reco::Particle::LorentzVector& genP2){}; - virtual void Fill(const double& x, const double& y){}; - virtual void Fill(const double& x, const double& y, const double& a, const double& b){}; + const reco::Particle::LorentzVector& genP2) {}; + virtual void Fill(const double& x, const double& y) {} + virtual void Fill(const double& x, const double& y, const double& a, const double& b) {} virtual void Fill(const reco::Particle::LorentzVector& p41, const reco::Particle::LorentzVector& p42, const reco::Particle::LorentzVector& p4Res, - const double& weight = 1.){}; + const double& weight = 1.) {}; virtual void Fill(const CLHEP::HepLorentzVector& momentum1, const CLHEP::HepLorentzVector& momentum2, const CLHEP::HepLorentzVector& momentumRes, - const double& weight = 1.){}; + const double& weight = 1.) {}; virtual double Get(const reco::Particle::LorentzVector& recoP1, const TString& covarianceName) { return 0.; }; diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitMuonSelector.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitMuonSelector.cc index bc3ac21654464..65a65100a0c77 100644 --- a/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitMuonSelector.cc +++ b/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitMuonSelector.cc @@ -24,7 +24,7 @@ const reco::Candidate* MuScleFitMuonSelector::getStatus1Muon(const reco::Candida } else continue; } //for loop - } //while loop + } //while loop return tempMuon; } @@ -46,7 +46,7 @@ const reco::Candidate* MuScleFitMuonSelector::getStatus3Muon(const reco::Candida } else continue; } //for loop - } //while loop + } //while loop return tempMuon; } diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitUtils.h b/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitUtils.h index d344e121755e0..4f8656868b1c9 100644 --- a/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitUtils.h +++ b/MuonAnalysis/MomentumScaleCalibration/plugins/MuScleFitUtils.h @@ -52,11 +52,11 @@ class MuScleFitUtils { public: // Constructor // ---------- - MuScleFitUtils(){}; + MuScleFitUtils() {} // Destructor // ---------- - virtual ~MuScleFitUtils(){}; + virtual ~MuScleFitUtils() {} // Operations // ---------- diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/ResolutionAnalyzer.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/ResolutionAnalyzer.cc index af87d09702c55..34b37b4e3c7a0 100644 --- a/MuonAnalysis/MomentumScaleCalibration/plugins/ResolutionAnalyzer.cc +++ b/MuonAnalysis/MomentumScaleCalibration/plugins/ResolutionAnalyzer.cc @@ -61,7 +61,7 @@ class ResolutionAnalyzer : public edm::one::EDAnalyzer<> { private: void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override{}; + void endJob() override {} template std::vector fillMuonCollection(const std::vector& tracks) { diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/TestCorrection.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/TestCorrection.cc index ab4ea1896d316..2232e320ca3f1 100644 --- a/MuonAnalysis/MomentumScaleCalibration/plugins/TestCorrection.cc +++ b/MuonAnalysis/MomentumScaleCalibration/plugins/TestCorrection.cc @@ -65,7 +65,7 @@ class TestCorrection : public edm::one::EDAnalyzer<>, MuScleFitBase { private: virtual void initialize(const edm::EventSetup&); void analyze(const edm::Event&, const edm::EventSetup&) override; - void endJob() override{}; + void endJob() override {} template std::vector fillMuonCollection(const std::vector& tracks) { std::vector muons; diff --git a/MuonAnalysis/MomentumScaleCalibration/plugins/TreeSplitter.cc b/MuonAnalysis/MomentumScaleCalibration/plugins/TreeSplitter.cc index 4fbb8fe792a65..9617ed77ab67b 100644 --- a/MuonAnalysis/MomentumScaleCalibration/plugins/TreeSplitter.cc +++ b/MuonAnalysis/MomentumScaleCalibration/plugins/TreeSplitter.cc @@ -28,7 +28,7 @@ class TreeSplitter : public edm::one::EDAnalyzer<> { ~TreeSplitter() override; private: - void analyze(const edm::Event&, const edm::EventSetup&) override{}; + void analyze(const edm::Event&, const edm::EventSetup&) override {} void endJob() override; TString treeFileName_;