Correct compile errors

cms-sw · May 16, 2017 · 0daa118 · 0daa118
1 parent 39f66d9
commit 0daa118
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 31 deletions.
diff --git a/Geometry/CaloTopology/interface/HGCalTopology.h b/Geometry/CaloTopology/interface/HGCalTopology.h
@@ -85,7 +85,7 @@ class HGCalTopology : public CaloSubdetectorTopology {
   }
 
   ///Geometry mode
-  HGCalGeometryMode geomMode() const {return mode_;}
+  HGCalGeometryMode::GeometryMode geomMode() const {return mode_;}
 
   ///Dense indexing
   virtual uint32_t detId2denseId(const DetId& id) const;
@@ -130,14 +130,15 @@ class HGCalTopology : public CaloSubdetectorTopology {
   /// move the nagivator along z
   DetId changeZ(const DetId& id, int nrStepsZ) const ;
 
-  const HGCalDDDConstants&    hdcons_;
-  HGCalGeometryMode           mode_;
+  const HGCalDDDConstants&        hdcons_;
+  HGCalGeometryMode::GeometryMode mode_;
 
-  ForwardSubdetector          subdet_;
-  bool                        half_;
-  int                         sectors_, layers_, cells_, kHGhalf_, kHGeomHalf_;
-  std::vector<int>            maxcells_;
-  unsigned int                kSizeForDenseIndexing;
+  ForwardSubdetector              subdet_;
+  bool                            half_;
+  int                             sectors_, layers_, cells_;
+  int                             kHGhalf_, kHGeomHalf_;
+  std::vector<int>                maxcells_;
+  unsigned int                    kSizeForDenseIndexing;
 };
 
 #endif
diff --git a/Geometry/CaloTopology/src/HGCalTopology.cc b/Geometry/CaloTopology/src/HGCalTopology.cc
@@ -10,7 +10,7 @@ HGCalTopology::HGCalTopology(const HGCalDDDConstants& hdcons,
   sectors_  = hdcons_.sectors();
   layers_   = hdcons_.layers(true);
   cells_    = hdcons_.maxCells(true);
-  mode_ = HGCalGeometryMode( hdcons_.geomMode());
+  mode_ = HGCalGeometryMode::GeometryMode(hdcons_.geomMode());
   if (mode_ == HGCalGeometryMode::Square) {
     kHGhalf_    = sectors_*layers_*subSectors_*cells_ ;
     kHGeomHalf_ = (half_ ? (sectors_*layers_*subSectors_) : (sectors_*layers_));

diff --git a/SimG4CMS/Calo/interface/HGCSD.h b/SimG4CMS/Calo/interface/HGCSD.h
@@ -30,35 +30,36 @@ class HGCSD : public CaloSD, public Observer<const BeginOfJob *> {
   HGCSD(G4String , const DDCompactView &, const SensitiveDetectorCatalog &,
 	edm::ParameterSet const &, const SimTrackManager*);
   virtual ~HGCSD();
-  virtual bool                  ProcessHits(G4Step * , G4TouchableHistory * );
-  virtual double                getEnergyDeposit(G4Step* );
-  virtual uint32_t              setDetUnitId(G4Step* step);
+  virtual bool                    ProcessHits(G4Step * , G4TouchableHistory * );
+  virtual double                  getEnergyDeposit(G4Step* );
+  virtual uint32_t                setDetUnitId(G4Step* step);
 
 protected:
 
-  virtual void                  update(const BeginOfJob *);
-  virtual void                  initRun();
-  virtual bool                  filterHit(CaloG4Hit*, double);
+  virtual void                    update(const BeginOfJob *);
+  virtual void                    initRun();
+  virtual bool                    filterHit(CaloG4Hit*, double);
 
 private:    
 
-  uint32_t                      setDetUnitId(ForwardSubdetector&, int, int, int, int, G4ThreeVector &);
-  bool                          isItinFidVolume (G4ThreeVector&) {return true;}
-  int                           setTrackID(G4Step * step);
+  uint32_t                        setDetUnitId(ForwardSubdetector&, int, int, 
+					       int, int, G4ThreeVector &);
+  bool                            isItinFidVolume (G4ThreeVector&) {return true;}
+  int                             setTrackID(G4Step * step);
 
-  std::string                   nameX;
+  std::string                     nameX;
 
-  HGCalGeometryMode             m_mode;
-  HGCNumberingScheme*           numberingScheme;
-  HGCMouseBite*                 mouseBite_;
-  G4int                         mumPDG, mupPDG; 
-  double                        eminHit;
-  ForwardSubdetector            myFwdSubdet_;
-  double                        slopeMin_;
-  int                           levelT_;
-  bool                          rejectMB_, waferRot_;
-  double                        mouseBiteCut_;
-  std::vector<double>           angles_;
+  HGCalGeometryMode::GeometryMode m_mode;
+  HGCNumberingScheme*             numberingScheme;
+  HGCMouseBite*                   mouseBite_;
+  G4int                           mumPDG, mupPDG; 
+  double                          eminHit;
+  ForwardSubdetector              myFwdSubdet_;
+  double                          slopeMin_;
+  int                             levelT_;
+  bool                            rejectMB_, waferRot_;
+  double                          mouseBiteCut_;
+  std::vector<double>             angles_;
 };
 
 #endif // HGCSD_h
diff --git a/Validation/HGCalValidation/plugins/SimG4HGCalValidation.cc b/Validation/HGCalValidation/plugins/SimG4HGCalValidation.cc
@@ -152,7 +152,7 @@ void SimG4HGCalValidation::update(const BeginOfJob * job) {
       edm::ESHandle<HGCalDDDConstants>    hdc;
       es->get<IdealGeometryRecord>().get(nameX,hdc);
       if (hdc.isValid()) {
-	HGCalGeometryMode m_mode = hdc->geomMode();
+	HGCalGeometryMode::GeometryMode m_mode = hdc->geomMode();
 	hgcNumbering_.push_back(new HGCNumberingScheme(*hdc,nameX));
 	if (m_mode == HGCalGeometryMode::Square) types_[type] = 0;
 	else                                     types_[type] = 1;