From 33a159408999a4d2e8fc2ac5cd591539ecb11e16 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 17 Jul 2020 17:35:11 +0200 Subject: [PATCH 1/2] clang checks --- .../plugins/CTPPSFastTrackingProducer.cc | 62 ++++++++++--------- .../plugins/CTPPSRecHitProducer.cc | 3 +- .../Calorimetry/src/CalorimetryManager.cc | 8 ++- .../Muons/plugins/FastTSGFromPropagation.cc | 14 +++-- .../ParticleDecay/src/PythiaDecays.cc | 8 ++- .../src/FastHFShowerLibrary.cc | 8 ++- .../plugins/FastSimProducer.cc | 4 +- .../plugins/TrackerSimHitProducer.cc | 10 +-- .../src/Geometry.cc | 4 +- .../src/SimplifiedGeometryFactory.cc | 12 ++-- .../Tracking/plugins/RecoTrackAccumulator.cc | 14 +++-- .../plugins/TrajectorySeedProducer.cc | 2 +- 12 files changed, 89 insertions(+), 60 deletions(-) diff --git a/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc b/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc index b9182dee29fb5..bcdc9ecaf7f56 100644 --- a/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc +++ b/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc @@ -16,16 +16,14 @@ Description: [one line class summary] // // -#include "DataFormats/Common/interface/Handle.h" +#include + + + + #include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/Math/interface/Point3D.h" #include "DataFormats/Math/interface/Vector.h" #include "DataFormats/Math/interface/Vector3D.h" -#include "DataFormats/Math/interface/Point3D.h" -#include "FastSimDataFormats/CTPPSFastSim/interface/CTPPSFastRecHit.h" -#include "FastSimDataFormats/CTPPSFastSim/interface/CTPPSFastRecHitContainer.h" -#include "FastSimDataFormats/CTPPSFastSim/interface/CTPPSFastTrack.h" -#include "FastSimDataFormats/CTPPSFastSim/interface/CTPPSFastTrackContainer.h" -#include "FastSimulation/CTPPSFastGeometry/interface/CTPPSToFDetector.h" -#include "FastSimulation/CTPPSFastGeometry/interface/CTPPSTrkDetector.h" #include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -33,6 +31,12 @@ Description: [one line class summary] #include "FWCore/ParameterSet/interface/FileInPath.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/StreamID.h" +#include "FastSimDataFormats/CTPPSFastSim/interface/CTPPSFastRecHit.h" +#include "FastSimDataFormats/CTPPSFastSim/interface/CTPPSFastRecHitContainer.h" +#include "FastSimDataFormats/CTPPSFastSim/interface/CTPPSFastTrack.h" +#include "FastSimDataFormats/CTPPSFastSim/interface/CTPPSFastTrackContainer.h" +#include "FastSimulation/CTPPSFastGeometry/interface/CTPPSToFDetector.h" +#include "FastSimulation/CTPPSFastGeometry/interface/CTPPSTrkDetector.h" #include "Utilities/PPS/interface/PPSUnitConversion.h" #include "Utilities/PPS/interface/PPSUtilities.h" @@ -185,25 +189,26 @@ CTPPSFastTrackingProducer::CTPPSFastTrackingProducer(const edm::ParameterSet& iC // Take care: the z inside the station is in meters // //Tracker Detector Description - det1F = std::unique_ptr( - new CTPPSTrkDetector(fTrackerWidth, fTrackerHeight, fTrackerInsertion * fBeamXRMS_Trk1 + fTrk1XOffset)); - det2F = std::unique_ptr( - new CTPPSTrkDetector(fTrackerWidth, fTrackerHeight, fTrackerInsertion * fBeamXRMS_Trk2 + fTrk2XOffset)); - det1B = std::unique_ptr( - new CTPPSTrkDetector(fTrackerWidth, fTrackerHeight, fTrackerInsertion * fBeamXRMS_Trk1 + fTrk1XOffset)); - det2B = std::unique_ptr( - new CTPPSTrkDetector(fTrackerWidth, fTrackerHeight, fTrackerInsertion * fBeamXRMS_Trk2 + fTrk2XOffset)); + det1F = std::make_unique( + fTrackerWidth, fTrackerHeight, fTrackerInsertion * fBeamXRMS_Trk1 + fTrk1XOffset); + det2F = std::make_unique( + fTrackerWidth, fTrackerHeight, fTrackerInsertion * fBeamXRMS_Trk2 + fTrk2XOffset); + det1B = std::make_unique( + fTrackerWidth, fTrackerHeight, fTrackerInsertion * fBeamXRMS_Trk1 + fTrk1XOffset); + det2B = std::make_unique( + fTrackerWidth, fTrackerHeight, fTrackerInsertion * fBeamXRMS_Trk2 + fTrk2XOffset); //Timing Detector Description std::vector vToFCellWidth; - for (int i = 0; i < 8; i++) { + vToFCellWidth.reserve(8); + for (int i = 0; i < 8; i++) { vToFCellWidth.push_back(fToFCellWidth[i]); } double pos_tof = fToFInsertion * fBeamXRMS_ToF + fToFXOffset; - detToF_F = std::unique_ptr(new CTPPSToFDetector( - fToFNCellX, fToFNCellY, vToFCellWidth, fToFCellHeight, fToFPitchX, fToFPitchY, pos_tof, fTimeSigma)); - detToF_B = std::unique_ptr(new CTPPSToFDetector( - fToFNCellX, fToFNCellY, vToFCellWidth, fToFCellHeight, fToFPitchX, fToFPitchY, pos_tof, fTimeSigma)); + detToF_F = std::make_unique( + fToFNCellX, fToFNCellY, vToFCellWidth, fToFCellHeight, fToFPitchX, fToFPitchY, pos_tof, fTimeSigma); + detToF_B = std::make_unique( + fToFNCellX, fToFNCellY, vToFCellWidth, fToFCellHeight, fToFPitchX, fToFPitchY, pos_tof, fTimeSigma); // } @@ -285,8 +290,8 @@ void CTPPSFastTrackingProducer::ReadRecHits(edm::Handle(new std::pair(*det1F, *det2F)); - TrkStation_B = std::unique_ptr(new std::pair(*det1B, *det2B)); + TrkStation_F = std::make_unique(*det1F, *det2F); + TrkStation_B = std::make_unique(*det1B, *det2B); } // end function void CTPPSFastTrackingProducer::Reconstruction() { @@ -439,7 +444,8 @@ void CTPPSFastTrackingProducer::FastReco(int Direction, H_RecRPObject* station) double pos_tof = fToFInsertion * fBeamXRMS_ToF + fToFXOffset; int cellId = 0; std::vector vToFCellWidth; - for (int i = 0; i < 8; i++) { + vToFCellWidth.reserve(8); + for (int i = 0; i < 8; i++) { vToFCellWidth.push_back(fToFCellWidth[i]); } CTPPSToFDetector* ToF = new CTPPSToFDetector( @@ -512,14 +518,14 @@ bool CTPPSFastTrackingProducer::SetBeamLine() { edm::FileInPath b2(beam2filename.c_str()); if (lengthctpps <= 0) return false; - m_beamlineCTPPS1 = std::unique_ptr(new H_BeamLine(-1, lengthctpps + 0.1)); // (direction, length) + m_beamlineCTPPS1 = std::make_unique(-1, lengthctpps + 0.1); // (direction, length) m_beamlineCTPPS1->fill(b2.fullPath(), 1, "IP5"); - m_beamlineCTPPS2 = std::unique_ptr(new H_BeamLine(1, lengthctpps + 0.1)); // + m_beamlineCTPPS2 = std::make_unique(1, lengthctpps + 0.1); // m_beamlineCTPPS2->fill(b1.fullPath(), 1, "IP5"); m_beamlineCTPPS1->offsetElements(120, 0.097); m_beamlineCTPPS2->offsetElements(120, -0.097); - pps_stationF = std::unique_ptr(new H_RecRPObject(fz_tracker1, fz_tracker2, *m_beamlineCTPPS1)); - pps_stationB = std::unique_ptr(new H_RecRPObject(fz_tracker1, fz_tracker2, *m_beamlineCTPPS2)); + pps_stationF = std::make_unique(fz_tracker1, fz_tracker2, *m_beamlineCTPPS1); + pps_stationB = std::make_unique(fz_tracker1, fz_tracker2, *m_beamlineCTPPS2); return true; } //define this as a plug-in diff --git a/FastSimulation/CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc b/FastSimulation/CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc index 105d5a63cf476..c1e07963466e0 100644 --- a/FastSimulation/CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc +++ b/FastSimulation/CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc @@ -222,7 +222,8 @@ void CTPPSRecHitProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe double pos_tof = fToFInsertion * fBeamXRMS_ToF + fToFXOffset; std::vector vToFCellWidth; - for (int i = 0; i < 8; i++) { + vToFCellWidth.reserve(8); + for (int i = 0; i < 8; i++) { vToFCellWidth.push_back(fToFCellWidth[i]); } CTPPSToFDetector* ToFDet = new CTPPSToFDetector( diff --git a/FastSimulation/Calorimetry/src/CalorimetryManager.cc b/FastSimulation/Calorimetry/src/CalorimetryManager.cc index c1b869894ca56..8f9f679632fb3 100644 --- a/FastSimulation/Calorimetry/src/CalorimetryManager.cc +++ b/FastSimulation/Calorimetry/src/CalorimetryManager.cc @@ -44,8 +44,10 @@ #include "FastSimulation/ShowerDevelopment/interface/FastHFShowerLibrary.h" // STL headers -#include +#include + #include + #include //CMSSW headers #include "DataFormats/DetId/interface/DetId.h" @@ -111,8 +113,8 @@ CalorimetryManager::CalorimetryManager(FSimEvent* aSimEvent, theMuonHcalEffects = new MaterialEffects(fastMuHCAL); if (fastCalo.exists("ECALResponseScaling")) { - ecalCorrection = std::unique_ptr( - new KKCorrectionFactors(fastCalo.getParameter("ECALResponseScaling"))); + ecalCorrection = std::make_unique( + fastCalo.getParameter("ECALResponseScaling")); } } diff --git a/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc b/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc index 29fcf30d38c8f..a09b9bc686b58 100644 --- a/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc +++ b/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc @@ -1,5 +1,9 @@ #include "FastSimulation/Muons/plugins/FastTSGFromPropagation.h" + + #include + + /** \class FastTSGFromPropagation * * Emulate TSGFromPropagation in RecoMuon @@ -316,7 +320,7 @@ void FastTSGFromPropagation::init(const MuonServiceProxy* service) { theResetMethod = "discrete"; } - theEstimator.reset(new Chi2MeasurementEstimator(theMaxChi2)); + theEstimator = std::make_unique(theMaxChi2); theCacheId_MT = 0; @@ -332,21 +336,21 @@ void FastTSGFromPropagation::init(const MuonServiceProxy* service) { theSelectStateFlag = theConfig.getParameter("SelectState"); - theUpdator.reset(new KFUpdator()); + theUpdator = std::make_unique(); theSigmaZ = theConfig.getParameter("SigmaZ"); edm::ParameterSet errorMatrixPset = theConfig.getParameter("errorMatrixPset"); if (theResetMethod == "matrix" && !errorMatrixPset.empty()) { theAdjustAtIp = errorMatrixPset.getParameter("atIP"); - theErrorMatrixAdjuster.reset(new MuonErrorMatrix(errorMatrixPset)); + theErrorMatrixAdjuster = std::make_unique(errorMatrixPset); } else { theAdjustAtIp = false; theErrorMatrixAdjuster.reset(); } theService->eventSetup().get().get(theTracker); - theNavigation.reset(new DirectTrackerNavigation(theTracker)); + theNavigation = std::make_unique(theTracker); edm::ESHandle geometry; theService->eventSetup().get().get(geometry); @@ -386,7 +390,7 @@ void FastTSGFromPropagation::setEvent(const edm::Event& iEvent) { } if (trackerGeomChanged && theTracker.product()) { - theNavigation.reset(new DirectTrackerNavigation(theTracker)); + theNavigation = std::make_unique(theTracker); } } diff --git a/FastSimulation/ParticleDecay/src/PythiaDecays.cc b/FastSimulation/ParticleDecay/src/PythiaDecays.cc index 89341619c8409..684ea025901fc 100644 --- a/FastSimulation/ParticleDecay/src/PythiaDecays.cc +++ b/FastSimulation/ParticleDecay/src/PythiaDecays.cc @@ -4,12 +4,16 @@ #include "FWCore/ServiceRegistry/interface/RandomEngineSentry.h" #include + + +#include + #include "Pythia8Plugins/HepMC2.h" PythiaDecays::PythiaDecays() { // inspired by method Pythia8Hadronizer::residualDecay() in GeneratorInterface/Pythia8Interface/src/Py8GunBase.cc - decayer.reset(new Pythia8::Pythia); - p8RndmEngine.reset(new gen::P8RndmEngine); + decayer = std::make_unique(); + p8RndmEngine = std::make_unique(); decayer->setRndmEnginePtr(p8RndmEngine.get()); decayer->settings.flag("ProcessLevel:all", false); decayer->settings.flag("PartonLevel:FSRinResonances", false); diff --git a/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc b/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc index 714c2e248e856..a5f54c8cf5fa0 100644 --- a/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc +++ b/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc @@ -31,9 +31,11 @@ #include "G4ParticleTypes.hh" // STL headers -#include +#include + #include #include + #include //#define DebugLog @@ -56,8 +58,8 @@ void const FastHFShowerLibrary::initHFShowerLibrary(const edm::EventSetup& iSetu const HcalSimulationConstants* hsps = hdsc.product(); std::string name = "HcalHits"; - numberingFromDDD.reset(new HcalNumberingFromDDD(hcalConstants)); - hfshower.reset(new HFShowerLibrary(name, hcalConstants, hsps->hcalsimpar(), fast)); + numberingFromDDD = std::make_unique(hcalConstants); + hfshower = std::make_unique(name, hcalConstants, hsps->hcalsimpar(), fast); //only one thread can be allowed to setup the G4 physics table. std::call_once(initializeOnce, []() { diff --git a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc index 7095d2a60867c..6286f728f2d75 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc @@ -131,11 +131,11 @@ FastSimProducer::FastSimProducer(const edm::ParameterSet& iConfig) //--------------- if (simulateCalorimetry) { - myCalorimetry.reset(new CalorimetryManager(nullptr, + myCalorimetry = std::make_unique(nullptr, iConfig.getParameter("Calorimetry"), iConfig.getParameter("MaterialEffectsForMuonsInECAL"), iConfig.getParameter("MaterialEffectsForMuonsInHCAL"), - iConfig.getParameter("GFlash"))); + iConfig.getParameter("GFlash")); } //---------------- diff --git a/FastSimulation/SimplifiedGeometryPropagator/plugins/TrackerSimHitProducer.cc b/FastSimulation/SimplifiedGeometryPropagator/plugins/TrackerSimHitProducer.cc index 2487e792bf8e8..095fc8157fdf1 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/plugins/TrackerSimHitProducer.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/plugins/TrackerSimHitProducer.cc @@ -1,6 +1,8 @@ -#include #include +#include + #include + // framework #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/ProducesCollector.h" @@ -119,7 +121,7 @@ void fastsim::TrackerSimHitProducer::registerProducts(edm::ProducesCollector pro void fastsim::TrackerSimHitProducer::storeProducts(edm::Event& iEvent) { iEvent.put(std::move(simHitContainer_), "TrackerHits"); - simHitContainer_.reset(new edm::PSimHitContainer); + simHitContainer_ = std::make_unique(); } void fastsim::TrackerSimHitProducer::interact(Particle& particle, @@ -318,7 +320,7 @@ std::pair> fastsim::TrackerSimHitProducer::crea return std::pair>( (hitPos - refPos).mag(), - std::unique_ptr(new PSimHit(entry, + std::make_unique(entry, exit, localMomentum.mag(), tof, @@ -327,7 +329,7 @@ std::pair> fastsim::TrackerSimHitProducer::crea detector.geographicalId().rawId(), simTrackId, localMomentum.theta(), - localMomentum.phi()))); + localMomentum.phi())); } DEFINE_EDM_PLUGIN(fastsim::InteractionModelFactory, fastsim::TrackerSimHitProducer, "fastsim::TrackerSimHitProducer"); diff --git a/FastSimulation/SimplifiedGeometryPropagator/src/Geometry.cc b/FastSimulation/SimplifiedGeometryPropagator/src/Geometry.cc index ef0133452ae25..0e2f84cee4497 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/src/Geometry.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/src/Geometry.cc @@ -15,6 +15,8 @@ #include #include +#include + using namespace fastsim; @@ -70,7 +72,7 @@ void Geometry::update(const edm::EventSetup& iSetup, if (iSetup.get().cacheIdentifier() != cacheIdentifierIdealMagneticField_) { if (useFixedMagneticFieldZ_) // use constant magnetic field { - ownedMagneticField_.reset(new UniformMagneticField(fixedMagneticFieldZ_)); + ownedMagneticField_ = std::make_unique(fixedMagneticFieldZ_); magneticField_ = ownedMagneticField_.get(); } else // get magnetic field from EventSetup { diff --git a/FastSimulation/SimplifiedGeometryPropagator/src/SimplifiedGeometryFactory.cc b/FastSimulation/SimplifiedGeometryPropagator/src/SimplifiedGeometryFactory.cc index e51f1905b0902..4e00747d1193d 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/src/SimplifiedGeometryFactory.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/src/SimplifiedGeometryFactory.cc @@ -9,6 +9,8 @@ #include #include +#include + fastsim::SimplifiedGeometryFactory::SimplifiedGeometryFactory( const GeometricSearchTracker *geometricSearchTracker, @@ -115,9 +117,9 @@ std::unique_ptr fastsim::SimplifiedGeometryFactory: std::unique_ptr layer; if (isForward) { - layer.reset(new fastsim::ForwardSimplifiedGeometry(position)); + layer = std::make_unique(position); } else { - layer.reset(new fastsim::BarrelSimplifiedGeometry(position)); + layer = std::make_unique(position); } layer->detLayer_ = detLayer; @@ -147,7 +149,7 @@ std::unique_ptr fastsim::SimplifiedGeometryFactory: << "layer thickness and limits not configured properly! error in:" << cfgString; } // create the histogram - layer->thicknessHist_.reset(new TH1F("h", "h", limits.size() - 1, &limits[0])); + layer->thicknessHist_ = std::make_unique("h", "h", limits.size() - 1, &limits[0]); layer->thicknessHist_->SetDirectory(nullptr); for (unsigned i = 1; i < limits.size(); ++i) { layer->thicknessHist_->SetBinContent(i, thickness[i - 1]); @@ -164,8 +166,8 @@ std::unique_ptr fastsim::SimplifiedGeometryFactory: // magnetic field // ----------------------------- - layer->magneticFieldHist_.reset( - new TH1F("h", "h", 100, 0., isForward ? magneticFieldHistMaxR_ : magneticFieldHistMaxZ_)); + layer->magneticFieldHist_ = std::make_unique( + "h", "h", 100, 0., isForward ? magneticFieldHistMaxR_ : magneticFieldHistMaxZ_); layer->magneticFieldHist_->SetDirectory(nullptr); for (int i = 1; i <= 101; i++) { GlobalPoint point = isForward ? GlobalPoint(layer->magneticFieldHist_->GetXaxis()->GetBinCenter(i), 0., position) diff --git a/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc b/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc index 6e9f155353e52..e0a26607c1954 100644 --- a/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc +++ b/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc @@ -1,8 +1,12 @@ #include "FastSimulation/Tracking/plugins/RecoTrackAccumulator.h" -#include "FWCore/Framework/interface/ConsumesCollector.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" + + + #include + #include "DataFormats/Common/interface/ValueMap.h" #include "DataFormats/TrackReco/interface/Track.h" + #include "FWCore/Framework/interface/ConsumesCollector.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" RecoTrackAccumulator::RecoTrackAccumulator(const edm::ParameterSet& conf, edm::ProducesCollector producesCollector, @@ -22,9 +26,9 @@ RecoTrackAccumulator::RecoTrackAccumulator(const edm::ParameterSet& conf, RecoTrackAccumulator::~RecoTrackAccumulator() {} void RecoTrackAccumulator::initializeEvent(edm::Event const& e, edm::EventSetup const& iSetup) { - newTracks_ = std::unique_ptr(new reco::TrackCollection); - newHits_ = std::unique_ptr(new TrackingRecHitCollection); - newTrackExtras_ = std::unique_ptr(new reco::TrackExtraCollection); + newTracks_ = std::make_unique(); + newHits_ = std::make_unique(); + newTrackExtras_ = std::make_unique(); // this is needed to get the ProductId of the TrackExtra and TrackingRecHit and Track collections rNewTracks = const_cast(e).getRefBeforePut(outputLabel); diff --git a/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc b/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc index dc04e7197b82a..82ad2b52231f4 100644 --- a/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc +++ b/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc @@ -106,7 +106,7 @@ TrajectorySeedProducer::TrajectorySeedProducer(const edm::ParameterSet& conf) { std::string::size_type pos = 0; unsigned int nHitsPerSeed = 0; while (pos != std::string::npos) { - pos = line.find("+"); + pos = line.find('+'); std::string layer = line.substr(0, pos); TrackingLayer layerSpec = TrackingLayer::createFromString(layer); trackingLayerList.push_back(layerSpec); From d4a44c8346b229b63d037628a7974c78d14341e5 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 17 Jul 2020 17:42:12 +0200 Subject: [PATCH 2/2] clang format --- .../plugins/CTPPSFastTrackingProducer.cc | 8 +++--- .../plugins/CTPPSRecHitProducer.cc | 2 +- .../Calorimetry/src/CalorimetryManager.cc | 6 ++--- .../Muons/plugins/FastTSGFromPropagation.cc | 4 +-- .../ParticleDecay/src/PythiaDecays.cc | 1 - .../src/FastHFShowerLibrary.cc | 2 +- .../plugins/FastSimProducer.cc | 11 ++++---- .../plugins/TrackerSimHitProducer.cc | 25 +++++++++---------- .../src/Geometry.cc | 1 - .../src/SimplifiedGeometryFactory.cc | 5 ++-- .../Tracking/plugins/RecoTrackAccumulator.cc | 5 ++-- 11 files changed, 31 insertions(+), 39 deletions(-) diff --git a/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc b/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc index bcdc9ecaf7f56..ed41374805ebd 100644 --- a/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc +++ b/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc @@ -18,9 +18,7 @@ Description: [one line class summary] #include - - - #include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/Common/interface/Handle.h" #include "DataFormats/Math/interface/Point3D.h" #include "DataFormats/Math/interface/Vector.h" #include "DataFormats/Math/interface/Vector3D.h" @@ -201,7 +199,7 @@ CTPPSFastTrackingProducer::CTPPSFastTrackingProducer(const edm::ParameterSet& iC //Timing Detector Description std::vector vToFCellWidth; vToFCellWidth.reserve(8); - for (int i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) { vToFCellWidth.push_back(fToFCellWidth[i]); } double pos_tof = fToFInsertion * fBeamXRMS_ToF + fToFXOffset; @@ -445,7 +443,7 @@ void CTPPSFastTrackingProducer::FastReco(int Direction, H_RecRPObject* station) int cellId = 0; std::vector vToFCellWidth; vToFCellWidth.reserve(8); - for (int i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) { vToFCellWidth.push_back(fToFCellWidth[i]); } CTPPSToFDetector* ToF = new CTPPSToFDetector( diff --git a/FastSimulation/CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc b/FastSimulation/CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc index c1e07963466e0..50915a4d9eeb5 100644 --- a/FastSimulation/CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc +++ b/FastSimulation/CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc @@ -223,7 +223,7 @@ void CTPPSRecHitProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe std::vector vToFCellWidth; vToFCellWidth.reserve(8); - for (int i = 0; i < 8; i++) { + for (int i = 0; i < 8; i++) { vToFCellWidth.push_back(fToFCellWidth[i]); } CTPPSToFDetector* ToFDet = new CTPPSToFDetector( diff --git a/FastSimulation/Calorimetry/src/CalorimetryManager.cc b/FastSimulation/Calorimetry/src/CalorimetryManager.cc index 8f9f679632fb3..5f687ee8bbb42 100644 --- a/FastSimulation/Calorimetry/src/CalorimetryManager.cc +++ b/FastSimulation/Calorimetry/src/CalorimetryManager.cc @@ -47,7 +47,7 @@ #include #include - #include +#include //CMSSW headers #include "DataFormats/DetId/interface/DetId.h" @@ -113,8 +113,8 @@ CalorimetryManager::CalorimetryManager(FSimEvent* aSimEvent, theMuonHcalEffects = new MaterialEffects(fastMuHCAL); if (fastCalo.exists("ECALResponseScaling")) { - ecalCorrection = std::make_unique( - fastCalo.getParameter("ECALResponseScaling")); + ecalCorrection = + std::make_unique(fastCalo.getParameter("ECALResponseScaling")); } } diff --git a/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc b/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc index a09b9bc686b58..4b336ea86d502 100644 --- a/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc +++ b/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc @@ -1,9 +1,7 @@ #include "FastSimulation/Muons/plugins/FastTSGFromPropagation.h" +#include - #include - - /** \class FastTSGFromPropagation * * Emulate TSGFromPropagation in RecoMuon diff --git a/FastSimulation/ParticleDecay/src/PythiaDecays.cc b/FastSimulation/ParticleDecay/src/PythiaDecays.cc index 684ea025901fc..758ec9adadcb3 100644 --- a/FastSimulation/ParticleDecay/src/PythiaDecays.cc +++ b/FastSimulation/ParticleDecay/src/PythiaDecays.cc @@ -5,7 +5,6 @@ #include - #include #include "Pythia8Plugins/HepMC2.h" diff --git a/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc b/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc index a5f54c8cf5fa0..8162e2ab791f8 100644 --- a/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc +++ b/FastSimulation/ShowerDevelopment/src/FastHFShowerLibrary.cc @@ -35,7 +35,7 @@ #include #include - #include +#include //#define DebugLog diff --git a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc index 6286f728f2d75..1a5264566414e 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/plugins/FastSimProducer.cc @@ -131,11 +131,12 @@ FastSimProducer::FastSimProducer(const edm::ParameterSet& iConfig) //--------------- if (simulateCalorimetry) { - myCalorimetry = std::make_unique(nullptr, - iConfig.getParameter("Calorimetry"), - iConfig.getParameter("MaterialEffectsForMuonsInECAL"), - iConfig.getParameter("MaterialEffectsForMuonsInHCAL"), - iConfig.getParameter("GFlash")); + myCalorimetry = + std::make_unique(nullptr, + iConfig.getParameter("Calorimetry"), + iConfig.getParameter("MaterialEffectsForMuonsInECAL"), + iConfig.getParameter("MaterialEffectsForMuonsInHCAL"), + iConfig.getParameter("GFlash")); } //---------------- diff --git a/FastSimulation/SimplifiedGeometryPropagator/plugins/TrackerSimHitProducer.cc b/FastSimulation/SimplifiedGeometryPropagator/plugins/TrackerSimHitProducer.cc index 095fc8157fdf1..44d878bac6d1b 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/plugins/TrackerSimHitProducer.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/plugins/TrackerSimHitProducer.cc @@ -1,7 +1,7 @@ #include #include - #include +#include // framework #include "FWCore/Framework/interface/Event.h" @@ -318,18 +318,17 @@ std::pair> fastsim::TrackerSimHitProducer::crea // Position of the hit in global coordinates GlobalPoint hitPos(detector.surface().toGlobal(localPosition)); - return std::pair>( - (hitPos - refPos).mag(), - std::make_unique(entry, - exit, - localMomentum.mag(), - tof, - eLoss, - pdgId, - detector.geographicalId().rawId(), - simTrackId, - localMomentum.theta(), - localMomentum.phi())); + return std::pair>((hitPos - refPos).mag(), + std::make_unique(entry, + exit, + localMomentum.mag(), + tof, + eLoss, + pdgId, + detector.geographicalId().rawId(), + simTrackId, + localMomentum.theta(), + localMomentum.phi())); } DEFINE_EDM_PLUGIN(fastsim::InteractionModelFactory, fastsim::TrackerSimHitProducer, "fastsim::TrackerSimHitProducer"); diff --git a/FastSimulation/SimplifiedGeometryPropagator/src/Geometry.cc b/FastSimulation/SimplifiedGeometryPropagator/src/Geometry.cc index 0e2f84cee4497..2c2cd821c6ff1 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/src/Geometry.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/src/Geometry.cc @@ -17,7 +17,6 @@ #include #include - using namespace fastsim; Geometry::~Geometry() { ; } diff --git a/FastSimulation/SimplifiedGeometryPropagator/src/SimplifiedGeometryFactory.cc b/FastSimulation/SimplifiedGeometryPropagator/src/SimplifiedGeometryFactory.cc index 4e00747d1193d..7480ec90332ef 100644 --- a/FastSimulation/SimplifiedGeometryPropagator/src/SimplifiedGeometryFactory.cc +++ b/FastSimulation/SimplifiedGeometryPropagator/src/SimplifiedGeometryFactory.cc @@ -11,7 +11,6 @@ #include #include - fastsim::SimplifiedGeometryFactory::SimplifiedGeometryFactory( const GeometricSearchTracker *geometricSearchTracker, const MagneticField &magneticField, @@ -166,8 +165,8 @@ std::unique_ptr fastsim::SimplifiedGeometryFactory: // magnetic field // ----------------------------- - layer->magneticFieldHist_ = std::make_unique( - "h", "h", 100, 0., isForward ? magneticFieldHistMaxR_ : magneticFieldHistMaxZ_); + layer->magneticFieldHist_ = + std::make_unique("h", "h", 100, 0., isForward ? magneticFieldHistMaxR_ : magneticFieldHistMaxZ_); layer->magneticFieldHist_->SetDirectory(nullptr); for (int i = 1; i <= 101; i++) { GlobalPoint point = isForward ? GlobalPoint(layer->magneticFieldHist_->GetXaxis()->GetBinCenter(i), 0., position) diff --git a/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc b/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc index e0a26607c1954..a099e81da14ab 100644 --- a/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc +++ b/FastSimulation/Tracking/plugins/RecoTrackAccumulator.cc @@ -1,11 +1,10 @@ #include "FastSimulation/Tracking/plugins/RecoTrackAccumulator.h" - - #include +#include #include "DataFormats/Common/interface/ValueMap.h" #include "DataFormats/TrackReco/interface/Track.h" - #include "FWCore/Framework/interface/ConsumesCollector.h" +#include "FWCore/Framework/interface/ConsumesCollector.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" RecoTrackAccumulator::RecoTrackAccumulator(const edm::ParameterSet& conf,