Take comments of Kevin

cms-sw · Aug 24, 2018 · ee5c937 · ee5c937
1 parent f7893d6
commit ee5c937
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Geometry/HGCalCommonData/interface/HGCalParameters.h b/Geometry/HGCalCommonData/interface/HGCalParameters.h
@@ -42,9 +42,9 @@ class HGCalParameters {
   void              addTrForm(const CLHEP::Hep3Vector& h3v);
   void              scaleTrForm(double);
   int               scintCells(const int layer) const
-  { return ((layer > layerFrontBH_[1]) ? nPhiBinBH_[1] : nPhiBinBH_[0]); }
+  { return nPhiBinBH_[scintType(layer)]; }
   double            scintCellSize(const int layer) const
-  { return ((layer > layerFrontBH_[1]) ? cellSize_[1] : cellSize_[0]); }
+  { return cellSize_[scintType(layer)]; }
   int               scintType(const int layer) const
   { return ((layer < layerFrontBH_[1]) ? 0 : 1); }
   std::array<int,4> getID(unsigned int k) const;

diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
@@ -183,11 +183,8 @@ std::array<int,3> HGCalDDDConstants::assignCellTrap(float x, float y,
   auto  ir     = std::lower_bound(hgpar_->radiusLayer_[type].begin(),
 				  hgpar_->radiusLayer_[type].end(), r);
   irad   = (int)(ir - hgpar_->radiusLayer_[type].begin());
-  if       (irad < hgpar_->iradMinBH_[indx.first]) {
-    irad = hgpar_->iradMinBH_[indx.first];
-  } else if (irad > hgpar_->iradMaxBH_[indx.first]) {
-    irad = hgpar_->iradMaxBH_[indx.first];
-  }
+  irad   = std::min(std::max(irad,hgpar_->iradMinBH_[indx.first]),
+		    hgpar_->iradMaxBH_[indx.first]);
   iphi         = 1 + (int)(phi/indx.second);
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom") << "assignCellTrap Input " << x << ":" << y