Commit in GeomConverter on MAIN
src/org/lcsim/detector/converter/compact/MultiLayerTrackerConverter.java+2-51.1 -> 1.2
test/org/lcsim/detector/converter/compact/DetectorConverterTest.java-11.6 -> 1.7
+2-6
2 modified files
JM: Fix broken build.  Tracking volume is now accessed with Detector.getTrackingVolume and has no associated DE.

GeomConverter/src/org/lcsim/detector/converter/compact
MultiLayerTrackerConverter.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- MultiLayerTrackerConverter.java	20 Mar 2007 23:57:45 -0000	1.1
+++ MultiLayerTrackerConverter.java	24 Mar 2007 01:23:45 -0000	1.2
@@ -1,7 +1,6 @@
 package org.lcsim.detector.converter.compact;
 
 import org.lcsim.detector.DetectorElement;
-import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.ILogicalVolume;
 import org.lcsim.detector.LogicalVolume;
 import org.lcsim.detector.PhysicalVolume;
@@ -25,11 +24,9 @@
     public void convert( Subdetector subdet, Detector detector)
     {
         MultiLayerTracker tracker = (MultiLayerTracker)subdet;
-        
-        IDetectorElement deTrackingRegion = detector.getChildren().get("tracking_region");
-        
+                
         ILogicalVolume trackingVolume = 
-            deTrackingRegion.getGeometry().getLogicalVolume();
+            detector.getTrackingVolume().getLogicalVolume();
         
         tracker.setParent(detector);
         

GeomConverter/test/org/lcsim/detector/converter/compact
DetectorConverterTest.java 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- DetectorConverterTest.java	24 Mar 2007 01:02:50 -0000	1.6
+++ DetectorConverterTest.java	24 Mar 2007 01:23:45 -0000	1.7
@@ -69,7 +69,6 @@
                 "ecal_barrel",
                 "ecal_endcap_positive",
                 "ecal_endcap_negative",
-                "tracking_region",
                 "tracker"};
 
         // Check for top-level DEs that should have been built.
CVSspam 0.2.8