projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry

--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/Calorimeter.java	2014-03-03 19:24:05 UTC (rev 3038)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/Calorimeter.java	2014-03-03 22:42:57 UTC (rev 3039)
@@ -226,11 +226,7 @@

      */
     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.
     // public boolean isDigital();

-}

\ No newline at end of file

+}

projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd

--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/LCDDDetector.java	2014-03-03 19:24:05 UTC (rev 3038)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/LCDDDetector.java	2014-03-03 22:42:57 UTC (rev 3039)
@@ -34,7 +34,6 @@

 import org.lcsim.geometry.compact.converter.lcdd.util.LCDDMaterialHelper;
 import org.lcsim.geometry.compact.converter.lcdd.util.Limit;
 import org.lcsim.geometry.compact.converter.lcdd.util.LimitSet;

-import org.lcsim.geometry.compact.converter.lcdd.util.OpticalCalorimeter;

 import org.lcsim.geometry.compact.converter.lcdd.util.Position;
 import org.lcsim.geometry.compact.converter.lcdd.util.Region;
 import org.lcsim.geometry.compact.converter.lcdd.util.Rotation;

@@ -156,19 +155,10 @@

                 if (sub.isTracker()) {
                     sensitiveDetector = new Tracker(sub.getName());
                 } else if (sub.isCalorimeter()) {

-                    boolean isOptical = false;
-                    // Check for flag that indicates optical calorimeter class.
-                    if (sub.getNode().getAttribute("optical") != null) {
-                        isOptical = sub.getNode().getAttribute("optical").getBooleanValue();
-                    }                    
-                    if (isOptical) {
-                        // Use optical calorimeter LCDD binding.
-                        sensitiveDetector = new OpticalCalorimeter(sub.getName());
-                    } else if (readout.getSegmentation() != null && readout.getSegmentation().useForHitPosition()) {

+                    if (readout.getSegmentation() != null && readout.getSegmentation().useForHitPosition()) {

                         // Standard segmented calorimeter.
                         sensitiveDetector = new Calorimeter(sub.getName());

-                    }
-                    else {

+                    } else {

                         // Unsegmented calorimeter for detailed readout studies.
                         // May still have Segmentation but it is not used for the hit positions.
                         sensitiveDetector = new UnsegmentedCalorimeter(sub.getName());

projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector

--- projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/OpticalCalorimeterTest.xml	2014-03-03 19:24:05 UTC (rev 3038)
+++ projects/lcsim/trunk/detector-framework/src/test/resources/org/lcsim/geometry/subdetector/OpticalCalorimeterTest.xml	2014-03-03 22:42:57 UTC (rev 3039)
@@ -80,8 +80,7 @@

                   type="PolyhedraEndcapCalorimeter3" 
                   readout="HcalEndcapHits" 
                   reflect="true" 

-                  calorimeterType="HAD_ENDCAP"
-                  optical="true">

+                  calorimeterType="HAD_ENDCAP">

             <comment>Hadron Calorimeter Endcaps</comment>
             <dimensions numsides="12" zmin="220.2*cm" rmin="39.0*cm" rmax="146.0*cm" angle="6.*deg" />
             <layer repeat="30">