projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java 2014-09-04 05:23:13 UTC (rev 3304)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java 2014-09-04 05:41:48 UTC (rev 3305)
@@ -10,10 +10,9 @@
import org.lcsim.detector.ILogicalVolume;
import org.lcsim.detector.IPhysicalVolume;
import org.lcsim.detector.DetectorIdentifierHelper.SystemMap;
-import org.lcsim.detector.PhysicalVolumeNavigator;
import org.lcsim.detector.PhysicalVolumeStore;
import org.lcsim.detector.converter.compact.HPSTestRunTracker2014JavaBuilder.GhostJavaBaseGeom;
-import org.lcsim.detector.converter.compact.HPSTestRunTracker2014JavaBuilder.JavaBaseGeom;
+import org.lcsim.detector.converter.compact.HPSTestRunTracker2014JavaBuilder.JavaBaseGeometry;
import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
@@ -117,7 +116,7 @@
* Setup the detector element for a geometry object.
* @param geometryObject - volume to process.
*/
- private void setupDetectorElement(JavaBaseGeom geometryObject) {
+ private void setupDetectorElement(JavaBaseGeometry geometryObject) {
if(_debug) System.out.printf("%s: setupDetectorElement for %s\n", getClass().getSimpleName(),geometryObject.getName());
@@ -318,7 +317,7 @@
// add daughters
if(_debug) System.out.printf("%s: add %d daughters to %s\n", this.getClass().getSimpleName(),geometryObject.getDaughters().size(), geometryObject.getName());
- for(JavaBaseGeom daughter : geometryObject.getDaughters()) {
+ for(JavaBaseGeometry daughter : geometryObject.getDaughters()) {
setupDetectorElement(daughter);
}