diff -u -r1.18 -r1.19
--- Calorimeter.java	30 Nov 2010 00:16:28 -0000	1.18
+++ Calorimeter.java	7 Dec 2010 20:18:03 -0000	1.19
@@ -1,14 +1,13 @@

 package org.lcsim.geometry;
 
 /**

- * 

  * The interface for a generic Calorimeter detector, providing access to basic envelope
  * parameters, calculations of layer parameters such as interaction and radiation lengths,
  * as well as some methods that eliminate the need for complicated method chaining to access

- * parameters. 

+ * important information.

  * 
  * @author Jeremy McCormick

- * @version $Id: Calorimeter.java,v 1.18 2010/11/30 00:16:28 jeremy Exp $      

+ * @version $Id: Calorimeter.java,v 1.19 2010/12/07 20:18:03 jeremy Exp $      

  * 
  */
 public interface Calorimeter extends Subdetector

@@ -136,14 +135,14 @@

     public double getSectionPhi();
 
     /**

-     * Get the number of sides of this calorimeter or 0 if NA.
-     * 

+     * Get the number of sides of this calorimeter or 0 if NA.     

      * @return The inner number of sides.
      */
     public int getNumberOfSides();
 
     /**

-     * Get the number of layers in the Calorimeter. @ return The number of layers.

+     * Get the number of layers in the Calorimeter. 
+     * @return The number of layers.

      */
     public int getNumberOfLayers();
 

@@ -156,62 +155,62 @@

     public double getDistanceToLayer( int layerNumber );
 
     /**

-     * Get the distance to the sensor from the IP in mm.
-     * 

+     * Get the distance to the sensor from the IP in mm.     

      * @param The layer number.
      * @return The distance to the sensor in mm.
      */
     public double getDistanceToSensor( int layerNumber );
 
     /**

-     * Get the total layer thickness in mm.
-     * 
-     * @return The total layer thickness.

+     * Get the total layer thickness in mm.     
+     * @return The total layer thickness for the given layer.

      */
     public double getLayerThickness( int layern );
 
     /**

-     * Get the sensor thickness in mm. @ return The sensor thicknes.

+     * Get the sensor thickness in mm. 
+     * @return The sensor thicknes for the given layer.

      */
     public double getSensorThickness( int layern );
 
     /**

-     * Get the number of interaction lengths in the layer.
-     * 

+     * Get the number of interaction lengths in the layer.     

      * @param layern The layer number.

-     * @return The number of interaction lengths.

+     * @return The number of interaction lengths for the given layer.

      */
     public double getNumberOfInteractionLengths( int layern );
 
     /**

-     * Get the number of radiation lengths in the layer.
-     * 

+     * Get the number of radiation lengths in the layer.    

      * @param layern The layer number.

-     * @return The number of radiation lengths.

+     * @return The number of radiation lengths for the given layer.

      */
     public double getNumberOfRadiationLengths( int layern );
 
     /**

-     * Get MIP energy loss in GeV in this layer.
-     * 

+     * Get MIP energy loss in GeV in this layer.     

      * @param layern The layer number.

-     * @return MIP energy loss.

+     * @return MIP energy loss for the given layer.

      */
     public double getDe( int layern );
 
     /**
      * Get the cell U dimension.

-     * 

      * @return The cell U dimension.
      */
     public double getCellSizeU();
 
     /**
      * Get the cell V dimension.

-     * 

      * @return The cell V dimension.
      */
     public double getCellSizeV();

+    
+    //
+    // public boolean isUnsegmented();
+    
+    //
+    // public boolean isOptical();

 
     // This would be useful but requires access to the conditions system.
     // May require using a set method to decouple from conditions package.