--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java	2014-09-18 06:33:32 UTC (rev 3332)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java	2014-09-18 21:02:54 UTC (rev 3333)
@@ -96,7 +96,7 @@

 
         if(_debug) System.out.printf("%s: DONE setup and build the JAVA geometry\n", getClass().getSimpleName());
 

-        setupDetectorElements();

+        setupPhysicalVolumes();

         
         if(_debug) {
         	System.out.printf("%s: Print all %d detector elements in store\n", getClass().getSimpleName(),DetectorElementStore.getInstance().size());

@@ -125,11 +125,11 @@

 	/**
 	 * Setup relations between detector elements.
 	 */

-	private void setupDetectorElements() {

+	private void setupPhysicalVolumes() {

 		
 		if(_debug) System.out.printf("%s: setup the detector elements\n", getClass().getSimpleName());
 

-		setupDetectorElement(builder.getBaseTrackerGeometry());

+		setupPhysicalVolumes(builder.getBaseTrackerGeometry());

 		
 	
 		if(_debug) System.out.printf("%s: DONE setup the detector elements\n", getClass().getSimpleName());

@@ -141,7 +141,7 @@

 	 * Setup the detector element for a geometry object.
 	 * @param geometryObject - volume to process.
 	 */

-	private void setupDetectorElement(JavaBaseGeometry geometryObject) {

+	private void setupPhysicalVolumes(JavaBaseGeometry geometryObject) {

 
 		if(_debug) System.out.printf("%s: setupDetectorElement for %s\n", getClass().getSimpleName(),geometryObject.getName());
 

@@ -355,7 +355,7 @@

 		// add daughters
 		if(_debug) System.out.printf("%s: add %d daughters to %s\n", this.getClass().getSimpleName(),geometryObject.getDaughters().size(), geometryObject.getName());
 		for(JavaBaseGeometry daughter : geometryObject.getDaughters()) {

-			setupDetectorElement(daughter);

+			setupPhysicalVolumes(daughter);

 		}