clang format

cms-sw · Jul 17, 2020 · f0b288d · f0b288d
1 parent 1c330cc
commit f0b288d
Show file tree

Hide file tree

Showing 82 changed files with 365 additions and 441 deletions.
diff --git a/DataFormats/TauReco/src/PFTau.cc b/DataFormats/TauReco/src/PFTau.cc
@@ -1,9 +1,7 @@
 #include <memory>
 
-
-
 #include "DataFormats/Common/interface/RefToPtr.h"
-        #include "DataFormats/TauReco/interface/PFTau.h"
+#include "DataFormats/TauReco/interface/PFTau.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //using namespace std;

diff --git a/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc b/EventFilter/HcalRawToDigi/plugins/HcalDigiToRawuHTR.cc
@@ -30,7 +30,7 @@
 #include <iostream>
 #include <memory>
 
-        #include <sstream>
+#include <sstream>
 #include <string>
 
 /* QUESTION: what about dual FED readout? */
@@ -251,8 +251,8 @@ void HcalDigiToRawuHTR::produce(edm::StreamID id, edm::Event& iEvent, const edm:
     int fedId = FEDNumbering::MINHCALuTCAFEDID + crateId;
     if (fedMap.find(fedId) == fedMap.end()) {
       /* QUESTION: where should the orbit number come from? */
-      fedMap[fedId] = std::make_unique<HCalFED>(
-          fedId, iEvent.id().event(), iEvent.orbitNumber(), iEvent.bunchCrossing());
+      fedMap[fedId] =
+          std::make_unique<HCalFED>(fedId, iEvent.id().event(), iEvent.orbitNumber(), iEvent.bunchCrossing());
     }
     fedMap[fedId]->addUHTR(uhtr->second, crateId, slotId);
   }  // end loop over uhtr containers

diff --git a/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc b/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc
@@ -8,10 +8,8 @@
 
 #include "SiPixelRawToDigi.h"
 
+#include <memory>
 
-        #include <memory>
-
-
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"

diff --git a/RecoBTag/CTagging/src/CharmTagger.cc b/RecoBTag/CTagging/src/CharmTagger.cc
@@ -12,7 +12,7 @@
 #include <algorithm>
 #include <iostream>
 #include <map>
-        #include <vector>
+#include <vector>
 
 CharmTagger::Tokens::Tokens(const edm::ParameterSet &configuration, edm::ESConsumesCollector &&cc) {
   if (configuration.getParameter<bool>("useCondDB")) {

diff --git a/RecoBTag/Combined/plugins/BTagProbabilityToDiscriminator.cc b/RecoBTag/Combined/plugins/BTagProbabilityToDiscriminator.cc
@@ -79,20 +79,20 @@ class BTagProbabilityToDiscriminator : public edm::stream::EDProducer<> {
 };
 
 BTagProbabilityToDiscriminator::BTagProbabilityToDiscriminator(const edm::ParameterSet &iConfig) {
-  for (const auto& discriminator : iConfig.getParameter<vPSet>("discriminators")) {
+  for (const auto &discriminator : iConfig.getParameter<vPSet>("discriminators")) {
     Discriminator current;
     current.name = discriminator.getParameter<std::string>("name");
     produces<JetTagCollection>(current.name);
 
-    for (const auto& intag : discriminator.getParameter<vInputTag>("numerator")) {
+    for (const auto &intag : discriminator.getParameter<vInputTag>("numerator")) {
       if (jet_tags_.find(intag.encode()) == jet_tags_.end()) {  // new
                                                                 // probability
         jet_tags_[intag.encode()] = consumes<JetTagCollection>(intag);
       }
       current.numerator.push_back(intag.encode());
     }
 
-    for (const auto& intag : discriminator.getParameter<vInputTag>("denominator")) {
+    for (const auto &intag : discriminator.getParameter<vInputTag>("denominator")) {
       if (jet_tags_.find(intag.encode()) == jet_tags_.end()) {  // new
                                                                 // probability
         jet_tags_[intag.encode()] = consumes<JetTagCollection>(intag);

diff --git a/RecoBTag/Combined/src/CandidateChargeBTagComputer.cc b/RecoBTag/Combined/src/CandidateChargeBTagComputer.cc
@@ -1,8 +1,6 @@
 #include <memory>
 
-
-
-        #include "RecoBTag/Combined/interface/CandidateChargeBTagComputer.h"
+#include "RecoBTag/Combined/interface/CandidateChargeBTagComputer.h"
 
 CandidateChargeBTagComputer::Tokens::Tokens(const edm::ParameterSet& parameters, edm::ESConsumesCollector&& cc) {
   if (parameters.getParameter<bool>("useCondDB")) {

diff --git a/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc b/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc
@@ -55,7 +55,7 @@ class HistogramProbabilityEstimator;
 #include "FWCore/Framework/interface/EventSetupRecord.h"
 #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 #include "FWCore/Framework/interface/EventSetupRecordKey.h"
-        #include <typeinfo>
+#include <typeinfo>
 
 class DeepFlavourTagInfoProducer : public edm::stream::EDProducer<> {
 public:
@@ -465,7 +465,8 @@ void DeepFlavourTagInfoProducer::checkEventSetup(const edm::EventSetup& iSetup)
     iSetup.get<BTagTrackProbability2DRcd>().get(calib2DHandle);
     ESHandle<TrackProbabilityCalibration> calib3DHandle;
     iSetup.get<BTagTrackProbability3DRcd>().get(calib3DHandle);
-    probabilityEstimator_ = std::make_unique<HistogramProbabilityEstimator>(calib3DHandle.product(), calib2DHandle.product());
+    probabilityEstimator_ =
+        std::make_unique<HistogramProbabilityEstimator>(calib3DHandle.product(), calib2DHandle.product());
   }
 
   calibrationCacheId3D_ = cacheId3D;

diff --git a/RecoBTag/SecondaryVertex/plugins/TemplatedSecondaryVertexProducer.cc b/RecoBTag/SecondaryVertex/plugins/TemplatedSecondaryVertexProducer.cc
@@ -690,10 +690,10 @@ void TemplatedSecondaryVertexProducer<IPTI, VTX>::produce(edm::Event &event, con
   if (useGhostTrack)
     vertexRecoGT = std::make_unique<GhostTrackVertexFinder>(
         vtxRecoPSet.getParameter<double>("maxFitChi2"),
-                                   vtxRecoPSet.getParameter<double>("mergeThreshold"),
-                                   vtxRecoPSet.getParameter<double>("primcut"),
-                                   vtxRecoPSet.getParameter<double>("seccut"),
-                                   getGhostTrackFitType(vtxRecoPSet.getParameter<std::string>("fitType")));
+        vtxRecoPSet.getParameter<double>("mergeThreshold"),
+        vtxRecoPSet.getParameter<double>("primcut"),
+        vtxRecoPSet.getParameter<double>("seccut"),
+        getGhostTrackFitType(vtxRecoPSet.getParameter<std::string>("fitType")));
   else
     vertexReco = std::make_unique<ConfigurableVertexReconstructor>(vtxRecoPSet);
 

diff --git a/RecoBTag/SecondaryVertex/src/CandidateBoostedDoubleSecondaryVertexComputer.cc b/RecoBTag/SecondaryVertex/src/CandidateBoostedDoubleSecondaryVertexComputer.cc
@@ -1,8 +1,6 @@
 #include <memory>
 
-
-
-        #include "RecoBTag/SecondaryVertex/interface/CandidateBoostedDoubleSecondaryVertexComputer.h"
+#include "RecoBTag/SecondaryVertex/interface/CandidateBoostedDoubleSecondaryVertexComputer.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/RecoBTag/SoftLepton/src/ElectronTagger.cc b/RecoBTag/SoftLepton/src/ElectronTagger.cc
@@ -1,7 +1,7 @@
 #include <limits>
 #include <memory>
 
-        #include <random>
+#include <random>
 
 #include "CondFormats/DataRecord/interface/BTauGenericMVAJetTagComputerRcd.h"
 #include "CondFormats/DataRecord/interface/GBRWrapperRcd.h"

diff --git a/RecoBTag/SoftLepton/src/MuonTagger.cc b/RecoBTag/SoftLepton/src/MuonTagger.cc
@@ -5,7 +5,7 @@
 #include <limits>
 #include <memory>
 
-        #include <random>
+#include <random>
 
 #include "RecoBTau/JetTagComputer/interface/JetTagComputerRecord.h"
 #include "DataFormats/BTauReco/interface/SoftLeptonTagInfo.h"

diff --git a/RecoBTau/JetTagComputer/src/GenericMVAComputerCache.cc b/RecoBTau/JetTagComputer/src/GenericMVAComputerCache.cc
@@ -1,7 +1,7 @@
 #include <memory>
 
 #include <memory>
-        #include <string>
+#include <string>
 #include <vector>
 
 #include "CondFormats/PhysicsToolsObjects/interface/MVAComputer.h"

diff --git a/RecoBTau/JetTagComputer/src/GenericMVAJetTagComputer.cc b/RecoBTau/JetTagComputer/src/GenericMVAJetTagComputer.cc
@@ -3,7 +3,7 @@
 #include <memory>
 
 #include <memory>
-        #include <string>
+#include <string>
 
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Framework/interface/EventSetup.h"

diff --git a/RecoEcal/EgammaClusterAlgos/src/EndcapPiZeroDiscriminatorAlgo.cc b/RecoEcal/EgammaClusterAlgos/src/EndcapPiZeroDiscriminatorAlgo.cc
@@ -104,7 +104,7 @@ vector<float> EndcapPiZeroDiscriminatorAlgo::findPreshVector(ESDetId strip,
   // to avoid problem in case number of strips is less than 11
   vector<float> vout_ElevenStrips_Energy;
   vout_ElevenStrips_Energy.reserve(11);
- for (int i = 0; i < 11; i++) {
+  for (int i = 0; i < 11; i++) {
     vout_ElevenStrips_Energy.push_back(0.);
   }
 

diff --git a/RecoEcal/EgammaClusterAlgos/src/HybridClusterAlgo.cc b/RecoEcal/EgammaClusterAlgos/src/HybridClusterAlgo.cc
@@ -321,7 +321,7 @@ void HybridClusterAlgo::mainSearch(const EcalRecHitCollection* hits, const CaloS
     std::vector<int> OwnerShip;
     std::vector<double> LumpEnergy;
     OwnerShip.reserve(int(dominoEnergy.size()));
- for (int i = 0; i < int(dominoEnergy.size()); ++i)
+    for (int i = 0; i < int(dominoEnergy.size()); ++i)
       OwnerShip.push_back(-1);
 
     //Loop over peaks.

diff --git a/RecoEcal/EgammaClusterAlgos/src/PFECALSuperClusterAlgo.cc b/RecoEcal/EgammaClusterAlgos/src/PFECALSuperClusterAlgo.cc
@@ -20,7 +20,7 @@
 #include <cmath>
 #include <functional>
 #include <sstream>
-        #include <stdexcept>
+#include <stdexcept>
 #include <string>
 
 using namespace std;

diff --git a/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc b/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc
@@ -30,7 +30,7 @@
 #include <memory>
 
 #include <algorithm>
-        #include <sstream>
+#include <sstream>
 
 using namespace edm;
 using namespace reco;

diff --git a/RecoEgamma/EgammaTools/plugins/CalibratedElectronProducers.cc b/RecoEgamma/EgammaTools/plugins/CalibratedElectronProducers.cc
@@ -33,7 +33,7 @@
 
 #include <memory>
 
-        #include <vector>
+#include <vector>
 
 template <typename T>
 class CalibratedElectronProducerT : public edm::stream::EDProducer<> {
@@ -119,7 +119,7 @@ void CalibratedElectronProducerT<T>::fillDescriptions(edm::ConfigurationDescript
   desc.add<bool>("semiDeterministic", true);
   std::vector<std::string> valMapsProduced;
   valMapsProduced.reserve(valMapsToStore_.size());
- for (auto varToStore : valMapsToStore_)
+  for (auto varToStore : valMapsToStore_)
     valMapsProduced.push_back(EGEnergySysIndex::name(varToStore));
   desc.add<std::vector<std::string>>("valueMapsStored", valMapsProduced)
       ->setComment(

diff --git a/RecoEgamma/EgammaTools/plugins/CalibratedPhotonProducers.cc b/RecoEgamma/EgammaTools/plugins/CalibratedPhotonProducers.cc
@@ -28,7 +28,7 @@
 #include <memory>
 
 #include <random>
-        #include <vector>
+#include <vector>
 
 template <typename T>
 class CalibratedPhotonProducerT : public edm::stream::EDProducer<> {
@@ -109,7 +109,7 @@ void CalibratedPhotonProducerT<T>::fillDescriptions(edm::ConfigurationDescriptio
   desc.add<bool>("semiDeterministic", true);
   std::vector<std::string> valMapsProduced;
   valMapsProduced.reserve(valMapsToStore_.size());
- for (auto varToStore : valMapsToStore_)
+  for (auto varToStore : valMapsToStore_)
     valMapsProduced.push_back(EGEnergySysIndex::name(varToStore));
   desc.add<std::vector<std::string>>("valueMapsStored", valMapsProduced)
       ->setComment(

diff --git a/RecoEgamma/EgammaTools/src/EgammaPCAHelper.cc b/RecoEgamma/EgammaTools/src/EgammaPCAHelper.cc
@@ -12,7 +12,6 @@
 #include <iostream>
 #include <memory>
 
-
 using namespace hgcal;
 
 EGammaPCAHelper::EGammaPCAHelper()

diff --git a/RecoEgamma/ElectronIdentification/src/ElectronMVAEstimatorRun2.cc b/RecoEgamma/ElectronIdentification/src/ElectronMVAEstimatorRun2.cc
@@ -98,7 +98,7 @@ float ElectronMVAEstimatorRun2::mvaValue(const reco::Candidate* candidate,
   std::vector<float> vars;
 
   vars.reserve(nVariables_[iCategory]);
- for (int i = 0; i < nVariables_[iCategory]; ++i) {
+  for (int i = 0; i < nVariables_[iCategory]; ++i) {
     vars.push_back(mvaVarMngr_.getValue(variables_[iCategory][i], *electron, auxVariables));
   }
 

diff --git a/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimator.cc b/RecoEgamma/PhotonIdentification/plugins/PhotonMVAEstimator.cc
@@ -116,7 +116,7 @@ float PhotonMVAEstimator::mvaValue(const reco::Candidate* candPtr,
   std::vector<float> vars;
 
   vars.reserve(nVariables_[iCategory]);
- for (int i = 0; i < nVariables_[iCategory]; ++i) {
+  for (int i = 0; i < nVariables_[iCategory]; ++i) {
     vars.push_back(mvaVarMngr_.getValue(variables_[iCategory][i], *phoPtr, auxVars));
   }
 

diff --git a/RecoHI/HiJetAlgos/src/HiGenCleaner.cc b/RecoHI/HiJetAlgos/src/HiGenCleaner.cc
@@ -95,7 +95,7 @@ void HiGenCleaner<T2>::produce(edm::StreamID, edm::Event& iEvent, const edm::Eve
 
   vector<int> selection;
   selection.reserve(jetsize);
- for (int ijet = 0; ijet < jetsize; ++ijet) {
+  for (int ijet = 0; ijet < jetsize; ++ijet) {
     selection.push_back(-1);
   }
 

diff --git a/RecoJets/FFTJetAlgorithms/src/LinInterpolatedTable1D.cc b/RecoJets/FFTJetAlgorithms/src/LinInterpolatedTable1D.cc
@@ -1,7 +1,5 @@
 #include <memory>
 
-
-
 #include "RecoJets/FFTJetAlgorithms/interface/LinInterpolatedTable1D.h"
 
 namespace fftjetcms {
@@ -58,8 +56,7 @@ namespace fftjetcms {
       points.push_back(std::pair<double, double>(data_[0], xmin_));
     }
 
-    return std::make_unique<LinInterpolatedTable1D>(
-        points, npoints, leftExtrapolationLinear, rightExtrapolationLinear);
+    return std::make_unique<LinInterpolatedTable1D>(points, npoints, leftExtrapolationLinear, rightExtrapolationLinear);
   }
 
   double LinInterpolatedTable1D::operator()(const double& x) const {

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetEFlowSmoother.cc b/RecoJets/FFTJetProducers/plugins/FFTJetEFlowSmoother.cc
@@ -19,7 +19,6 @@
 #include <cmath>
 #include <memory>
 
-
 // FFTJet headers
 #include "fftjet/FrequencyKernelConvolver.hh"
 #include "fftjet/DiscreteGauss2d.hh"

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetPatRecoProducer.cc b/RecoJets/FFTJetProducers/plugins/FFTJetPatRecoProducer.cc
@@ -19,7 +19,6 @@
 #include <fstream>
 #include <memory>
 
-
 // FFTJet headers
 #include "fftjet/ProximityClusteringTree.hh"
 #include "fftjet/ClusteringSequencer.hh"

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetPileupProcessor.cc b/RecoJets/FFTJetProducers/plugins/FFTJetPileupProcessor.cc
@@ -20,7 +20,6 @@
 #include <fstream>
 #include <memory>
 
-
 // FFTJet headers
 #include "fftjet/FrequencyKernelConvolver.hh"
 #include "fftjet/DiscreteGauss2d.hh"
@@ -163,8 +162,7 @@ FFTJetPileupProcessor::FFTJetPileupProcessor(const edm::ParameterSet& ps)
   if (minScale <= 0.0 || maxScale < minScale || nScales == 0U)
     throw cms::Exception("FFTJetBadConfig") << "invalid filter scales" << std::endl;
 
-  filterScales =
-      std::make_unique<fftjet::EquidistantInLogSpace>(minScale, maxScale, nScales);
+  filterScales = std::make_unique<fftjet::EquidistantInLogSpace>(minScale, maxScale, nScales);
 
   percentileData.resize(nScales * nPercentiles);
 

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetProducer.cc b/RecoJets/FFTJetProducers/plugins/FFTJetProducer.cc
@@ -22,7 +22,6 @@
 #include <iostream>
 #include <memory>
 
-
 #include "fftjet/peakEtLifetime.hh"
 
 // Header for this class

diff --git a/RecoJets/FFTJetProducers/plugins/FFTJetTreeDump.cc b/RecoJets/FFTJetProducers/plugins/FFTJetTreeDump.cc
@@ -21,7 +21,7 @@
 
 #include <fstream>
 #include <functional>
-        #include <sstream>
+#include <sstream>
 
 // FFTJet headers
 #include "fftjet/ProximityClusteringTree.hh"