Merge pull request #12260 from ianna/hgcal-merger-fix

Fix Merger Issues
cms-sw · Nov 5, 2015 · 4a0c823 · 4a0c823
2 parents 94484af + 621e7d6
commit 4a0c823
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Geometry/HGCalGeometry/interface/HGCalGeometry.h b/Geometry/HGCalGeometry/interface/HGCalGeometry.h
@@ -52,7 +52,7 @@ class HGCalGeometry GCC11_FINAL: public CaloSubdetectorGeometry {
 		     const CCGFloat* pv  , 
 		     unsigned int    i   ,
 		     Pt3D&           ref   ) ;
-
+  
   virtual void newCell( const GlobalPoint& f1 ,
 			const GlobalPoint& f2 ,
 			const GlobalPoint& f3 ,
@@ -73,7 +73,7 @@ class HGCalGeometry GCC11_FINAL: public CaloSubdetectorGeometry {
   CornersVec getCorners( const DetId& id ) const; 
 
   // avoid sorting set in base class  
-  virtual const std::vector<DetId>& getValidDetIds( DetId::Detector det = DetId::Detector(0), int subdet = 0) const override {return m_validIds;}
+  virtual const std::vector<DetId>& getValidDetIds( DetId::Detector det = DetId::Detector(0), int subdet = 0) const override { return m_validIds; }
 
   // Get closest cell, etc...
   virtual DetId getClosestCell( const GlobalPoint& r ) const override;
@@ -87,7 +87,7 @@ class HGCalGeometry GCC11_FINAL: public CaloSubdetectorGeometry {
   virtual DetIdSet getCells( const GlobalPoint& r, double dR ) const override;
 
   virtual void fillNamedParams (DDFilteredView fv);
-  virtual void initializeParms() ;
+  virtual void initializeParms() override;
 
   static std::string producerTag() { return "HGCal" ; }
   std::string cellElement() const;
@@ -97,10 +97,10 @@ class HGCalGeometry GCC11_FINAL: public CaloSubdetectorGeometry {
 
 protected:
 
-  virtual unsigned int indexFor(const DetId& id) const ;
-  virtual unsigned int sizeForDenseIndex() const;
+  virtual unsigned int indexFor(const DetId& id) const override;
+  unsigned int sizeForDenseIndex() const;
 
-  virtual const CaloCellGeometry* cellGeomPtr( uint32_t index ) const ;
+  virtual const CaloCellGeometry* cellGeomPtr( uint32_t index ) const override;
 
   void addValidID(const DetId& id);
   unsigned int getClosestCellIndex ( const GlobalPoint& r ) const;

diff --git a/Geometry/HGCalGeometry/src/HGCalGeometry.cc b/Geometry/HGCalGeometry/src/HGCalGeometry.cc
@@ -45,7 +45,7 @@ void HGCalGeometry::localCorners(Pt3DVec&        lc,
 				 const CCGFloat* pv,
 				 unsigned int    i,
 				 Pt3D&           ref) {
-  TruncatedPyramid::localCorners( lc, pv, ref ) ;
+  FlatTrd::localCorners( lc, pv, ref ) ;
 }
 
 void HGCalGeometry::newCell( const GlobalPoint& f1 ,

diff --git a/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc b/Geometry/HGCalGeometry/src/HGCalGeometryLoader.cc
@@ -120,6 +120,6 @@ HGCalGeometry* HGCalGeometryLoader::build (const HGCalTopology& topology) {
     std::cerr << "inconsistent # of cells: expected " << numberOfCells << " , inited " << counter << std::endl;
     assert( counter == numberOfCells ) ;
   }
-  std::cout << "HGCalGeometryBuilder-> " << counter << " cells are produced\n";
+
   return geom;
 }