Merge pull request cms-sw#10132 from ssekmen/fastsim-calomngr-indenta…

…tion fixed FastSimulation/Calorimetry indentation
davidsheffield · Jul 13, 2015 · 777d097 · 777d097
2 parents 2240aec + 57196bd
commit 777d097
Show file tree

Hide file tree

Showing 10 changed files with 1,343 additions and 1,343 deletions.
diff --git a/FastSimulation/Calorimetry/interface/CalorimetryManager.h b/FastSimulation/Calorimetry/interface/CalorimetryManager.h
@@ -55,29 +55,29 @@ class CalorimetryManager{
   // Does the real job
   void reconstruct(RandomEngineAndDistribution const*);
 
-    // Return the address of the Calorimeter 
+  // Return the address of the Calorimeter 
   CaloGeometryHelper * getCalorimeter() const {return myCalorimeter_;}
 
   // Return the address of the FastHFShowerLibrary 
   FastHFShowerLibrary * getHFShowerLibrary() const {return theHFShowerLibrary;}
-
+  
   // load container from edm::Event
   void loadFromEcalBarrel(edm::PCaloHitContainer & c) const;
-
+  
   void loadFromEcalEndcap(edm::PCaloHitContainer & c) const;
-
+  
   void loadFromHcal(edm::PCaloHitContainer & c) const;
-
+  
   void loadFromPreshower(edm::PCaloHitContainer & c) const;
-
+  
   void loadMuonSimTracks(edm::SimTrackContainer & m) const;
-
+  
  private:
   // Simulation of electromagnetic showers in PS, ECAL, HCAL
   void EMShowerSimulation(const FSimTrack& myTrack, RandomEngineAndDistribution const*);
 
   void reconstructHCAL(const FSimTrack& myTrack, RandomEngineAndDistribution const*);
-
+  
   void MuonMipSimulation(const FSimTrack & myTrack, RandomEngineAndDistribution const*);
 
   /// Hadronic Shower Simulation

diff --git a/FastSimulation/Calorimetry/interface/HCALResponse.h b/FastSimulation/Calorimetry/interface/HCALResponse.h
@@ -28,7 +28,7 @@ namespace edm {
 
 class HCALResponse
 {
-public:
+ public:
   HCALResponse(const edm::ParameterSet& pset);
   ~HCALResponse(){ } 
 
@@ -38,7 +38,7 @@ class HCALResponse
   double responseHCAL(int _mip, double energy, double eta, int partype, RandomEngineAndDistribution const*);
 
   //Get the energy and eta dependent mip fraction
-   double getMIPfraction(double energy, double eta);
+  double getMIPfraction(double energy, double eta);
 
   // legacy methods using simple formulae
   double getHCALEnergyResponse(double e, int hit, RandomEngineAndDistribution const*);
@@ -47,7 +47,7 @@ class HCALResponse
   void correctHF(double e, int type);
   vec1 & getCorrHF() {return corrHF;}   
 
-private:
+ private:
 
   // calculates interpolated-extrapolated response smearing factors
   // for hadrons, muons, and e/gamma (the last in HF specifically)

diff --git a/FastSimulation/Calorimetry/python/Calorimetry_cff.py b/FastSimulation/Calorimetry/python/Calorimetry_cff.py
diff --git a/FastSimulation/Calorimetry/python/HSParameters_cfi.py b/FastSimulation/Calorimetry/python/HSParameters_cfi.py
@@ -12,6 +12,6 @@
         nDepthSteps = cms.int32(10),
         maxTRfactor = cms.double(4.0),
         criticalHDEnergy = cms.double(3.0)
+        )
     )
-)
 
diff --git a/FastSimulation/Calorimetry/python/HcalResponse_cfi.py b/FastSimulation/Calorimetry/python/HcalResponse_cfi.py