diff -u -r1.18 -r1.19
--- Main.java	15 Jun 2010 22:05:01 -0000	1.18
+++ Main.java	30 Jun 2010 17:56:52 -0000	1.19
@@ -55,7 +55,7 @@

  * geometry input format.
  * 
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: Main.java,v 1.18 2010/06/15 22:05:01 ngraf Exp $

+ * @version $Id: Main.java,v 1.19 2010/06/30 17:56:52 jeremy Exp $

  */
 public class Main implements Converter
 {

@@ -149,6 +149,7 @@

         }
     }
 

+    /*

     private static class QCalCalibration
     {
 

@@ -247,6 +248,7 @@

             return calLayers.get(calorimeter.getCalorimeterType().toString()).getSamplingLayerRange(layern).getEMSampling();
         }
     }

+    */

 
     /**
      * Represents CalorimeterConditions for a single subdetector.

@@ -495,7 +497,7 @@

         boolean haveCalCalib = (calorimeterCalibration == null) ? false : true;
 
         // Setup QCalCalibration.

-        QCalCalibration qcalib = new QCalCalibration(detector);

+        //QCalCalibration qcalib = new QCalCalibration(detector);

 
         // Process the subdetectors.
         for (Subdetector subdetector : detector.getSubdetectors().values())