diff --git a/Calorimeter/CaloLocalHadCalib/CMakeLists.txt b/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c3dd5e52a93e45ccb6c65bad71838e5abeda36bb
--- /dev/null
+++ b/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
@@ -0,0 +1,53 @@
+################################################################################
+# Package: CaloLocalHadCalib
+################################################################################
+
+# Declare the package name:
+atlas_subdir( CaloLocalHadCalib )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Calorimeter/CaloConditions
+                          Calorimeter/CaloGeoHelpers
+                          Control/AthenaBaseComps
+                          Control/StoreGate
+                          Event/xAOD/xAODCaloEvent
+                          GaudiKernel
+                          PRIVATE
+                          Calorimeter/CaloDetDescr
+                          Calorimeter/CaloDmDetDescr
+                          Calorimeter/CaloEvent
+                          Calorimeter/CaloIdentifier
+                          Calorimeter/CaloSimEvent
+                          Calorimeter/CaloUtils
+                          Control/AthenaKernel
+                          Generators/GeneratorObjects
+                          TestBeam/TBEvent
+                          Tools/PathResolver )
+
+# External dependencies:
+find_package( Boost COMPONENTS filesystem thread system )
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Gpad Graf Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf3d Html Postscript Gui GX11TTF GX11 )
+
+# this line failed automatic conversion in cmt2cmake :
+# use AtlasReflex   AtlasReflex-*    External -no_CALOATHENAPOOL_ROOTauto_imports
+
+# Component(s) in the package:
+atlas_add_component( CaloLocalHadCalib
+                     src/*.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
+
+atlas_add_dictionary( CaloLocalHadCalibDict
+                      CaloLocalHadCalib/CaloLocalHadCalibDict.h
+                      CaloLocalHadCalib/selection.xml
+                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
+
+# Install files from the package:
+atlas_install_headers( CaloLocalHadCalib )
+atlas_install_joboptions( share/*.txt share/*.py )
+atlas_install_runtime( share/CaloHadDMCoeff_init_v1.txt share/CaloHadDMCoeff_init_v2.txt )
+
diff --git a/Calorimeter/CaloLocalHadCalib/src/GetLCOutOfCluster.cxx b/Calorimeter/CaloLocalHadCalib/src/GetLCOutOfCluster.cxx
index c2bbf9a2dd1e6d8b9d8013bda915ba1dfe355a20..f8819dddbcaf3b65c21d7a0f818bd74a3c27fe3b 100644
--- a/Calorimeter/CaloLocalHadCalib/src/GetLCOutOfCluster.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/GetLCOutOfCluster.cxx
@@ -170,7 +170,7 @@ StatusCode GetLCOutOfCluster::initialize() {
 	<< endreq;
     return StatusCode::FAILURE;
   }
-  int nside = (iside>=0?m_dimensions[iside].bins():1);
+  int nside = m_dimensions[iside].bins();
   int nphi = (iphi>=0?m_dimensions[iphi].bins():1);
   int nlogE = m_dimensions[ilogE].bins();
   m_ooc.resize(nside*nphi*nlogE,0);
@@ -181,9 +181,9 @@ StatusCode GetLCOutOfCluster::initialize() {
 	  oname += "_iside_";
 	  oname += jside;
 	  oname += "_[";
-	  oname += (iside>=0?m_dimensions[iside].lowEdge():-1);
+	  oname += m_dimensions[iside].lowEdge();
 	  oname += ",";
-	  oname += (iside>=0?m_dimensions[iside].highEdge():-1);
+	  oname += m_dimensions[iside].highEdge();
 	  oname += ",";
 	  oname += nside;
 	  oname += "]";