diff -u -r1.12 -r1.13
--- Main.java	27 May 2010 16:57:31 -0000	1.12
+++ Main.java	27 May 2010 17:18:58 -0000	1.13
@@ -11,6 +11,7 @@

 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;

+import java.util.Set;

 import java.util.StringTokenizer;
 
 import javax.swing.filechooser.FileFilter;

@@ -45,7 +46,7 @@

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

- * @version $Id: Main.java,v 1.12 2010/05/27 16:57:31 jeremy Exp $

+ * @version $Id: Main.java,v 1.13 2010/05/27 17:18:58 jeremy Exp $

  */
 public class Main implements Converter
 {

@@ -111,8 +112,7 @@

      * 
      */
     static class SamplingLayers extends ArrayList<SamplingLayerRange>

-    {
-    }

+    {}

 
     /**
      * Represents CalorimeterConditions for a single subdetector.

@@ -155,8 +155,6 @@

         {
             this.name = calorimeter.getName();
             

-            //System.out.println("CalorimeterConditions: " + this.name);
-

             // Figure out which layering conditions to use based on the CalorimeterType.
             String layeringName = null;
             if (calorimeter.getCalorimeterType() == CalorimeterType.EM_BARREL || calorimeter.getCalorimeterType() == CalorimeterType.EM_ENDCAP)

@@ -190,7 +188,7 @@

             {
                 throw new RuntimeException("Sampling fractions not found for " + calorimeter.getName() + ".");
             }

-

+            

             String emSampling = conditions.getString(emName);
             String hadSampling = conditions.getString(hadName);
             List<Double> emSamplingFractions = new ArrayList<Double>();

@@ -227,8 +225,6 @@

                 samplingIndex = (new StringTokenizer(conditions.getString("ECalLayering"), ",").countTokens());
             }
             

-            //System.out.println("samplingIndex: " + samplingIndex);
-

             // Create the SamplingLayerRange list.
             samplingLayers = new SamplingLayers();
             for (int i = 0; i < layers.size(); i++)

@@ -249,12 +245,7 @@

                                                                                upperLayer,
                                                                                emSamplingFraction,
                                                                                hadSamplingFraction);

-                
-                //System.out.println("lowerLayer: " + lowerLayer);
-                //System.out.println("upperLayer: " + upperLayer);
-                //System.out.println("emSamplingFraction: " + emSamplingFraction);
-                //System.out.println("hadSamplingFraction: " + hadSamplingFraction);
-                

+                                

                 samplingLayers.add(samplingLayerRange);
 
                 ++samplingIndex;

@@ -272,9 +263,7 @@

             {
                 mipCondition = "HCalMip_MPV";
             }                                                

-            mipEnergy = conditions.getDouble(mipCondition);
-            
-            //System.out.println();

+            mipEnergy = conditions.getDouble(mipCondition);           

         }
 
         public SamplingLayerRange getSamplingLayerRange(int layer)

@@ -384,8 +373,6 @@

 
                     CalorimeterConditions subdetectorCalorimeterConditions 
                         = new CalorimeterConditions((Calorimeter) subdetector, calorimeterCalibration);

-
-                    //System.out.println(subdetectorCalorimeterConditions.toString());

                     
                     calorimeter.setAttribute("mipEnergy", xfrac.format(subdetectorCalorimeterConditions.getMipEnergy()));
 

@@ -438,7 +425,6 @@

                 }
                 catch (IllegalArgumentException x)
                 {

-                    //System.out.println("No digital attribute for " + subdetector.getName());

                     calorimeter.setAttribute("digital", "false");
                 }
             }