diff -u -r1.27 -r1.28
--- DetectorGeometry.cpp	19 Sep 2011 20:34:53 -0000	1.27
+++ DetectorGeometry.cpp	13 Dec 2011 22:18:54 -0000	1.28
@@ -120,17 +120,7 @@

         // By default, all components should be mirrored in Z according to John Marshall.
         subdet->m_isMirroredInZ = true;	
 	

-        // very ugly hack to fix pandora for Christian to test
-        // this is needed because of different Geometry assumptions
-        // 31.01.2011 MS to be fixed 
-//#ifdef EXTREMELY_UGLY_HACK
-//		if  (innerZ<0.0)
-//		{
-//			subdet->m_innerZCoordinate=0;
-//		}
-//	#endif
-	
-            // Inner and outer symmetry are different.

+        // Inner and outer symmetry are different.

         if (innerSym != outerSym)
         {
             std::cerr << "Inner and outer symmetry are different.  Don't know how to handle this case!" << std::endl;

@@ -237,16 +227,10 @@

         extras.m_inputHitType = getHitType(subdetType);
         extras.m_inputDetectorRegion = getDetectorRegion(subdetType);
 

-        // Barrels are mirrored in Z so the innerZ should be set to zero.
-        // FIXME Repeats calType comparison because InputDetectorRegion does not have the "==" operator defined.
-        //if (extras.m_inputDetectorRegion == pandora::BARREL)
-        //std::cout << "subdetType: <" << subdetTypeStr << ">" << std::endl;
-        //std::cout << "is EM_BARREL : " << subdetTypeStr == "EM_BARREL" << std::endl;
-        

+        // Barrel inner Z is always 0.

         if (subdetTypeStr == "EM_BARREL" || subdetTypeStr == "HAD_BARREL" || subdetTypeStr == "MUON_BARREL")
         {

-            //std::cout << "setting innerZ to 0" << std::endl;
-            subdet->m_innerZCoordinate = 0; //FIXME once this is in GeomConverter

+            subdet->m_innerZCoordinate = 0;

         }
 
         extras.m_mipEnergy = mipEnergy;

@@ -261,7 +245,6 @@

             double phi = phi0;
             for (int i = 0; i < nSides; ++i)
             {

-                //cout << "    Module " << i << " x " << cos(phi) << " y " << sin(phi) << endl;

                 float x = cos(phi);
                 float y = sin(phi);               
                 if (std::fabs(x) < 1e-10) x=0;

@@ -282,7 +265,7 @@

         {
             extras.m_isDigital = false;
         }        

-

+        

         // Insert the extra subdetector information into the data map.
         subdetExtras[subdetTypeStr] = extras;
 

@@ -292,11 +275,6 @@

 #endif
     }   
 

-    // Assume ECal barrel is innermost detector.
-    // FIXME Pandora variables changed names?
-    //geom.m_inDetBarrelParameters = geom.m_eCalBarrelParameters;
-    //geom.m_inDetEndCapParameters = geom.m_eCalEndCapParameters;
-

     // Tracking parameters.
     TiXmlElement* tracking = root->FirstChildElement("tracking");
     float tinnerR, touterR, tz;