--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java	2014-08-01 18:01:33 UTC (rev 3211)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java	2014-08-02 15:59:58 UTC (rev 3212)
@@ -127,14 +127,31 @@

 		
 	}
 	

+	
+	private void buildLCDD() {
+		
+		if(_debug) System.out.printf("%s: buildLCDD\n", getClass().getSimpleName());
+		
+		LCDD lcdd  = builder.getLCDD();

+		LCDDBaseGeom lcddObj = builder.getBaseLCDD();
+		
+		addToLCDD(lcddObj,lcdd);
+		
+		
+		if(_debug) System.out.printf("%s: buildLCDD DONE\n", getClass().getSimpleName());
+		
+	}
+	
+	
+

 	private void addToLCDD(LCDDBaseGeom lcddObj, LCDD lcdd) {
 		
 		if(_debug) System.out.printf("%s: adding %s to LCDD\n", getClass().getSimpleName(),lcddObj.getName());
 
 		if(lcddObj.getClass().isInstance(GhostBaseGeom.class)) {
 			System.out.printf("%s: trying to add a ghost volume: %s ??\n", getClass().getSimpleName(),lcddObj.getName());

-			throw new RuntimeException("adding a ghose volume (" + lcddObj.getName() + ") to LCDD is not allowed.");

+			throw new RuntimeException("adding a ghost volume (" + lcddObj.getName() + ") to LCDD is not allowed.");

 		}
 		// add box, pos, rotation and create phys volume
 		lcdd.add(lcddObj.getBox());

@@ -156,25 +173,10 @@

 		if(_debug) System.out.printf("%s: DONE adding %s\n", getClass().getSimpleName(),lcddObj.getName());
 	}
 	

-	private void buildLCDD() {
-		
-		if(_debug) System.out.printf("%s: buildLCDD\n", getClass().getSimpleName());
-		
-		LCDD lcdd  = builder.getLCDD();
-
-		LCDDBaseGeom lcddObj = builder.getBaseLCDD();
-		
-		addToLCDD(lcddObj,lcdd);
-		
-		
-		if(_debug) System.out.printf("%s: buildLCDD DONE\n", getClass().getSimpleName());
-		
-	}

+	/*

-	
-	

 	private void makeBase(Volume motherVolume, LCDD lcdd, SensitiveDetector sens) throws JDOMException {
 		
 		

@@ -184,7 +186,7 @@

-		HPSTestRunTracker2014GeomDef.BaseGeom base = builder.getBase();

+		HPSTestRunTracker2014GeomDef.BaseGeom base = builder.getItem(HPSTestRunTracker2014GeomDef.Base.class);

 		
 		Hep3Vector ball_pos_base = base.getBallPos();
 		Hep3Vector vee_pos_base = base.getVeePos(); 

@@ -273,16 +275,17 @@

 	}
 
 	

+	*/

+	/*

-	

 		private void makeBasePlate(Volume motherVolume, LCDD lcdd, SensitiveDetector sens) throws JDOMException {
 
 		if(_debug) {
 			print("--- makeBasePlate----");
 		}
 

-		HPSTestRunTracker2014GeomDef.BasePlate basePlate = builder.getBasePlate();

+		HPSTestRunTracker2014GeomDef.BasePlate basePlate = builder.getItem(HPSTestRunTracker2014GeomDef.BasePlate.class);

 		
 		HPSTestRunTracker2014GeomDef.Coord base_plate_coord = basePlate.getCoord();
 		

@@ -339,7 +342,9 @@

 		
 	}
 

+	*/

+	/*

 	
 	private void makeSupport(String half, Volume motherVolume, LCDD lcdd, SensitiveDetector sens) throws JDOMException {
 		

@@ -377,8 +382,8 @@

 		String volName;
 		HPSTestRunTracker2014GeomDef.Coord csup_coord;
 		HPSTestRunTracker2014GeomDef.BaseGeom mother;

-		HPSTestRunTracker2014GeomDef.SupportBottom supportBottom  = builder.getSupportBottom();
-		HPSTestRunTracker2014GeomDef.SupportTop supportTop = builder.getSupportTop();

+		HPSTestRunTracker2014GeomDef.SupportBottom supportBottom  = builder.getItem(HPSTestRunTracker2014GeomDef.SupportBottom.class);
+		HPSTestRunTracker2014GeomDef.SupportTop supportTop = builder.getItem(HPSTestRunTracker2014GeomDef.SupportTop.class);

 		if(half == "bottom") {
 			csup_coord = supportBottom.getCoord();
 			volName = supportBottom.getName();

@@ -452,25 +457,25 @@

 		// vee: corner of the hinge end at the surface on the side where sensors are
 		// flat: middle of plate at upstream end at the surface
 

-		/*
-		Hep3Vector ball_pos_support_plate;
-		Hep3Vector vee_pos_support_plate;
-		Hep3Vector flat_pos_support_plate;
-		if(half == "bottom") {
-			ball_pos_support_plate = new BasicHep3Vector(1.0, (17.0-5.0), 6.66+1.34); 
-			vee_pos_support_plate = new BasicHep3Vector(ball_pos_support_plate.x() + support_plate_width, ball_pos_support_plate.y(),ball_pos_support_plate.z());
-			flat_pos_support_plate = new BasicHep3Vector(ball_pos_support_plate.x(), ball_pos_support_plate.y() + support_plate_length,ball_pos_support_plate.z());
-			//ball_pos_support_plate = new BasicHep3Vector(0.0, 0.0, support_plate_height); // TODO figure out what height this should be from the C-support drawings
-			//vee_pos_support_plate = new BasicHep3Vector(ball_pos_support_plate.x() + support_plate_width, ball_pos_support_plate.y(),ball_pos_support_plate.z());
-			//flat_pos_support_plate = new BasicHep3Vector(ball_pos_support_plate.x(), ball_pos_support_plate.y() + support_plate_length,ball_pos_support_plate.z());
-		} else {
-			ball_pos_support_plate = new BasicHep3Vector(1.0, (17.0-5.0), -1.0 * (6.66+1.34)); // TODO figure out what height this should be from the C-support drawings
-			vee_pos_support_plate = new BasicHep3Vector(ball_pos_support_plate.x() + support_plate_width, ball_pos_support_plate.y(),ball_pos_support_plate.z());
-			flat_pos_support_plate = new BasicHep3Vector(ball_pos_support_plate.x(), ball_pos_support_plate.y() + support_plate_length,ball_pos_support_plate.z());
-		}
-		*/

--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014Builder.java	2014-08-01 18:01:33 UTC (rev 3211)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014Builder.java	2014-08-02 15:59:58 UTC (rev 3212)
@@ -3,9 +3,25 @@

  */
 package org.lcsim.geometry.compact.converter.lcdd;
 

+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+import hep.physics.vec.VecOp;
+

 import java.util.ArrayList;
 import java.util.List;
 

+import org.jdom.JDOMException;
+import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeomDef.BaseGeom;
+import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeomDef.TestRunColdBlock;
+import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeomDef.TestRunModuleL13;
+import org.lcsim.geometry.compact.converter.lcdd.util.Box;
+import org.lcsim.geometry.compact.converter.lcdd.util.LCDD;
+import org.lcsim.geometry.compact.converter.lcdd.util.PhysVol;
+import org.lcsim.geometry.compact.converter.lcdd.util.Position;
+import org.lcsim.geometry.compact.converter.lcdd.util.Rotation;
+import org.lcsim.geometry.compact.converter.lcdd.util.SensitiveDetector;
+import org.lcsim.geometry.compact.converter.lcdd.util.Volume;
+

 /**
  * 
  * Class used to encapsulates building the basic geometry building blocks. 

@@ -20,16 +36,7 @@

 	
 	//Geometry members
 	protected List<HPSTestRunTracker2014GeomDef.BaseGeom> trackerItems = new ArrayList<HPSTestRunTracker2014GeomDef.BaseGeom>();

-	//TODO  I should delete these as they are part of the list..need to fix getters at the same time...
-	private  HPSTestRunTracker2014GeomDef.TrackingBase tracking; 
-	private  HPSTestRunTracker2014GeomDef.Base base; 
-	private  HPSTestRunTracker2014GeomDef.BasePlate basePlate; 
-	private  HPSTestRunTracker2014GeomDef.CSupport cSupport; 
-	private  HPSTestRunTracker2014GeomDef.SupportBottom supportBottom; 
-	private  HPSTestRunTracker2014GeomDef.SupportPlateBottom supportPlateBottom; 
-	private  HPSTestRunTracker2014GeomDef.SupportTop supportTop; 
-	private  HPSTestRunTracker2014GeomDef.SupportPlateTop supportPlateTop; 
-	private  List<HPSTestRunTracker2014GeomDef.TestRunModule> modules;

+	public  List<ModuleBundle> modules;

@@ -43,71 +50,333 @@

 
 		// keep the order correct.
 		// each item has knowledge of its mother but not its daughters

-		tracking = new HPSTestRunTracker2014GeomDef.TrackingBase("trackingVolume",null);

+		HPSTestRunTracker2014GeomDef.TrackingBase tracking = new HPSTestRunTracker2014GeomDef.TrackingBase("trackingVolume",null);

 		trackerItems.add(tracking);

-		base = new HPSTestRunTracker2014GeomDef.Base("base",tracking);

+		HPSTestRunTracker2014GeomDef.Base base = new HPSTestRunTracker2014GeomDef.Base("base",tracking);

 		trackerItems.add(base);

-		basePlate = new HPSTestRunTracker2014GeomDef.BasePlate("baseplate",base, "Aluminum");

+		HPSTestRunTracker2014GeomDef.BasePlate basePlate = new HPSTestRunTracker2014GeomDef.BasePlate("baseplate",base, "Aluminum");

 		trackerItems.add(basePlate);

-		cSupport = new HPSTestRunTracker2014GeomDef.CSupport("c_support", base);

+		HPSTestRunTracker2014GeomDef.CSupport cSupport = new HPSTestRunTracker2014GeomDef.CSupport("c_support", base);

 		trackerItems.add(cSupport);

-		supportBottom = new HPSTestRunTracker2014GeomDef.SupportBottom("support_bottom", base, cSupport);

+		HPSTestRunTracker2014GeomDef.SupportBottom supportBottom = new HPSTestRunTracker2014GeomDef.SupportBottom("support_bottom", base, cSupport);

 		trackerItems.add(supportBottom);

-		supportPlateBottom = new HPSTestRunTracker2014GeomDef.SupportPlateBottom("support_plate_bottom", supportBottom, "Aluminum");

+		HPSTestRunTracker2014GeomDef.SupportPlateBottom supportPlateBottom = new HPSTestRunTracker2014GeomDef.SupportPlateBottom("support_plate_bottom", supportBottom, "Aluminum");

 		trackerItems.add(supportPlateBottom);

-		supportTop = new HPSTestRunTracker2014GeomDef.SupportTop("support_top", base, cSupport);

+		HPSTestRunTracker2014GeomDef.SupportTop supportTop = new HPSTestRunTracker2014GeomDef.SupportTop("support_top", base, cSupport);

 		trackerItems.add(supportTop);

-		supportPlateTop= new HPSTestRunTracker2014GeomDef.SupportPlateTop("support_plate_top", supportTop, "Aluminum");

+		HPSTestRunTracker2014GeomDef.SupportPlateTop supportPlateTop = new HPSTestRunTracker2014GeomDef.SupportPlateTop("support_plate_top", supportTop, "Aluminum");

 		trackerItems.add(supportPlateTop);

-		modules = new ArrayList<HPSTestRunTracker2014GeomDef.TestRunModule>();

+		modules = new ArrayList<ModuleBundle>();

+		for(int l=1; l<=5;++l) {
+			makeModuleBundle(l,"bottom");
+			makeModuleBundle(l,"top");
+		}

+		

 		if(isDebug()) System.out.printf("%s: DONE constructing the geometry objects\n", this.getClass().getSimpleName());
 
 	}
 	

+

-	protected <T> T getItem(Class<T> c) {
-		if(isDebug()) System.out.printf("%s: get Item %s\n", this.getClass().getSimpleName(),c.getName());

+	private void makeModuleBundle(int layer, String half) 
+    {
+
+		if(isDebug()) System.out.printf("%s: makeModule for layer %d %s \n", this.getClass().getSimpleName(), layer, half);

-		for(HPSTestRunTracker2014GeomDef.BaseGeom item : trackerItems) {
-			if(isDebug()) System.out.printf("%s: item %s\n", getClass().getSimpleName(),item.getClass().getName());
-			if(c.isInstance(item)) {
-				return (T)item;
-			}

+		
+		// build the module name
+		String volName = "module_L"+ layer + (half=="bottom"?"b":"t");		
+		
+		boolean isL13 = ( layer >=1 && layer <=3 ) ? true : false;			
+		
+		// find the mother and reference geom
+		final HPSTestRunTracker2014GeomDef.BaseGeom mother;
+		// reference is a intermediate geom object that are referenced but not it's direct mother
+		final HPSTestRunTracker2014GeomDef.BaseGeom ref;
+		if(half == "bottom") {
+			mother = getItem(HPSTestRunTracker2014GeomDef.SupportBottom.class);
+			ref = getItem(HPSTestRunTracker2014GeomDef.SupportPlateBottom.class);
+		} else {
+			mother= getItem(HPSTestRunTracker2014GeomDef.SupportTop.class);
+			ref = getItem(HPSTestRunTracker2014GeomDef.SupportPlateTop.class);

 		}

-		throw new RuntimeException("Coulnd't find instance of " + c.getSimpleName() + " among the " + trackerItems.size() + " tracker items!");

+		
+		//Create the module
+		HPSTestRunTracker2014GeomDef.TestRunModule module;
+		if(isL13) {
+			module = new HPSTestRunTracker2014GeomDef.TestRunModuleL13(volName, mother, ref, layer, half);
+		} else {
+			module = new HPSTestRunTracker2014GeomDef.TestRunModuleL45(volName, mother, ref, layer, half);
+		}
+		
+		// create the bundle for this module
+		ModuleBundle bundle = new ModuleBundle(module);
+		addModuleBundle(bundle);
+		
+		makeHalfModule("axial", module);
+
+		/*
+
+		makeColdBlock(module);
+		
+		makeHalfModule("stereo", module);
+		 */
+		
+    }
+	
+	
+	
+private void makeColdBlock(HPSTestRunTracker2014GeomDef.TestRunModule mother) { 
+	
+
+		String moduleName = mother.getName();
+		
+		if(isDebug()) System.out.printf("%s: makeColdBlock for %s \n", this.getClass().getSimpleName(), moduleName);
+		
+		
+		String volName = moduleName + "_coldblock";
+
+		// find layer
+		int layer = getLayerFromVolumeName(moduleName);
+		
+		// Build the half-module
+		HPSTestRunTracker2014GeomDef.TestRunColdBlock coldBlock;
+		
+		if(layer >= 1 && layer <=3) {
+			coldBlock = new HPSTestRunTracker2014GeomDef.TestRunColdBlockL13(volName, mother, layer);
+		} else if(layer >= 4 && layer <=5) {
+			coldBlock = new HPSTestRunTracker2014GeomDef.TestRunColdBlockL45(volName, mother, layer);
+		} else {
+			throw new RuntimeException("wrong layer for " + volName);
+		}
+		
+		ModuleBundle bundle = getModuleBundle(mother);
+		bundle.coldBlock = coldBlock;

 	}
 	

-	//protected  HPSTestRunTracker2014GeomDef.BaseGeom getTracking() {
-	//	HPSTestRunTracker2014GeomDef.BaseGeom t =  getItem(HPSTestRunTracker2014GeomDef.TrackingBase.class);
-	//	return t;
-	//}

-	//TODO replace all calls to the below with the  generic getItem() function above
-	protected  HPSTestRunTracker2014GeomDef.Base getBase() {
-		return base;

+	
+	private void makeHalfModule(String side, HPSTestRunTracker2014GeomDef.TestRunModule mother) {
+		
+		String moduleName = mother.getName();
+		
+		if(isDebug()) System.out.printf("%s: makeHalfModule for %s %s \n", this.getClass().getSimpleName(), moduleName, side);
+		
+		String volName = moduleName + "_halfmodule_" + side;
+		
+		// top or bottom?
+		String half = mother.getHalf();
+		
+		// find layer
+		int layer = mother.getLayer();
+		
+		ModuleBundle bundle  = getModuleBundle(mother);
+		
+		// Build the half-module
+		HPSTestRunTracker2014GeomDef.TestRunHalfModule halfModule;
+		if(side == "axial") {
+			halfModule = new HPSTestRunTracker2014GeomDef.TestRunHalfModuleAxial(volName, mother, layer, half);
+			bundle.halfModuleAxial = halfModule;
+		} else if(side == "stereo") {
+			halfModule = new HPSTestRunTracker2014GeomDef.TestRunHalfModuleStereo(volName, mother, layer, half);
+			bundle.halfModuleStereo = halfModule;
+		} else {
+			throw new IllegalArgumentException("not a valid half-module side " + side);
+		}
+		
+		
+		
+		// create the half module components 
+		
+		makeHalfModuleComponentSensor(halfModule);
+		
+		makeHalfModuleComponentKapton(halfModule);
+		
+		makeHalfModuleComponentCF(halfModule);
+		
+		makeHalfModuleComponentHybrid(halfModule);
+			
+		
+		
+		

 	}

-	protected  HPSTestRunTracker2014GeomDef.BasePlate getBasePlate() {
-		return basePlate;

+	
+	
+	
+	private void makeHalfModuleComponentHybrid(HPSTestRunTracker2014GeomDef.TestRunHalfModule mother) {
+		
+		if(isDebug()) System.out.printf("%s: makeHalfModuleComponentHybrid for %s \n", this.getClass().getSimpleName(), mother.getName());
+
+		String volName = mother.getName() + "_hybrid";
+
+		// Build the half-module
+		HPSTestRunTracker2014GeomDef.Hybrid hybrid = new HPSTestRunTracker2014GeomDef.Hybrid(volName,mother);
+		hybrid.setMaterial("G10");
+
+		getModuleBundle((HPSTestRunTracker2014GeomDef.TestRunModule) mother.getMother()).hybrid = hybrid;
+		

 	}

-	protected  HPSTestRunTracker2014GeomDef.CSupport getcSupport() {
-		return cSupport;

+
+	
+	
+private void makeHalfModuleComponentCF(HPSTestRunTracker2014GeomDef.TestRunHalfModule mother) {
+	
+	if(isDebug()) System.out.printf("%s: makeHalfModuleComponentCF for %s \n", this.getClass().getSimpleName(), mother.getName());
+	
+	
+		String volName = mother.getName() + "_cf";
+
+		// Build the half-module
+		HPSTestRunTracker2014GeomDef.CarbonFiber cf = new HPSTestRunTracker2014GeomDef.CarbonFiber(volName,mother);
+		cf.setMaterial("CarbonFiber");
+		
+		getModuleBundle((HPSTestRunTracker2014GeomDef.TestRunModule) mother.getMother()).carbonFiber = cf;
+
+}
+
+
+	
+	
+private void makeHalfModuleComponentKapton(HPSTestRunTracker2014GeomDef.TestRunHalfModule mother) {
+	
+	if(isDebug()) System.out.printf("%s: makeHalfModuleComponentKapton for %s \n", this.getClass().getSimpleName(), mother.getName());
+		
+	String volName = mother.getName() + "_lamination";
+
+	// Build the half-module
+	HPSTestRunTracker2014GeomDef.HalfModuleLamination kapton = new HPSTestRunTracker2014GeomDef.HalfModuleLamination(volName,mother);
+	kapton.setMaterial("Kapton");
+			
+	getModuleBundle((HPSTestRunTracker2014GeomDef.TestRunModule) mother.getMother()).lamination = kapton;
+		
+}
+
+
+private void makeHalfModuleComponentSensor(HPSTestRunTracker2014GeomDef.TestRunHalfModule mother) {
+
+	if(isDebug()) System.out.printf("%s: makeHalfModuleComponentSensor for %s \n", this.getClass().getSimpleName(), mother.getName());
+
+	String volName = mother.getName() + "_sensor";
+
+	// sensor if
+	int sensor_number = 0;
+
+	//	
+	HPSTestRunTracker2014GeomDef.Sensor sensor = new HPSTestRunTracker2014GeomDef.Sensor(volName, mother, sensor_number);
+	sensor.setMaterial("Silicon");
+	getModuleBundle((HPSTestRunTracker2014GeomDef.TestRunModule) mother.getMother()).sensor = sensor;
+
+	makeHalfModuleComponentActiveSensor(sensor);
+
+
+}
+
+	
+	private void makeHalfModuleComponentActiveSensor(HPSTestRunTracker2014GeomDef.Sensor mother) {
+		
+		if(isDebug()) System.out.printf("%s: makeHalfModuleComponentActiveSensor for %s \n", this.getClass().getSimpleName(), mother.getName());
+		
+		String volName = mother.getName() + "_active";
+
+		// Build the half-module
+		HPSTestRunTracker2014GeomDef.ActiveSensor active_sensor = new HPSTestRunTracker2014GeomDef.ActiveSensor(volName, mother);
+		active_sensor.setMaterial("Silicon");
+		
+//		PhysVol physVolume = new PhysVol(volume, motherVolume, pos, rot);
+//
+//		volume.setSensitiveDetector(sens);
+//		physVolume.addPhysVolID("sensor", sensor_number);
+//		physVolume.addPhysVolID("system", 0);
+//		physVolume.addPhysVolID("barrel", 0);
+//		physVolume.addPhysVolID("layer", layer);
+//		physVolume.addPhysVolID("module", layer);    
+//			
+			
+		getModuleBundle((HPSTestRunTracker2014GeomDef.TestRunModule) mother.getMother().getMother()).activeSensor = active_sensor;
+		

 	}

-	protected  HPSTestRunTracker2014GeomDef.SupportBottom getSupportBottom() {
-		return supportBottom;

+
+	
+	
+	
+	private static String getHalfFromName(String name) {
+		String half = "";
+		if(name.contains("bottom")) {
+			half = "bottom";
+		}
+		if(name.contains("top")) {
+			// check that both sides are not found
+			if(half.equals("bottom")) {
+				throw new RuntimeException("found both halfs from name  " + name);
+			} else {
+				half = "top";
+			}
+		}
+		// check for other signatures
+		if( half.isEmpty()) {
+			// 6 layers is arbitrary here
+			for(int layer=1;layer<=6;++layer) {
+				if(name.contains(String.format("L%db", layer))) {
+					half = "bottom";
+					break;
+				} 
+				if(name.contains(String.format("L%dt", layer))) {
+					if(half.equals("bottom")) {
+						throw new RuntimeException("found both halfs from name  " + name);
+					}
+					half = "top";
+					break;
+				}
+			}
+		}		
+		if( half.isEmpty()) {
+			System.out.println("found no half from " + name);
+			throw new RuntimeException("found no half from " + name);
+		} else {
+			return half;
+	
+		}

 	}

-	protected  HPSTestRunTracker2014GeomDef.SupportPlateBottom getSupportPlateBottom() {
-		return supportPlateBottom;

+
+	
+	private static int getLayerFromVolumeName(String name) {
+		int layer = -1;
+		for(int i=1; i<= 5; ++i) {
+			if(name.contains(String.format("_L%d", i))) {
+				layer = i;
+			}
+		}
+		if( layer == -1) {
+			System.out.println("cannot find layer from " + name);
+			System.exit(1);
+		}
+		return layer;

 	}

-	protected  HPSTestRunTracker2014GeomDef.SupportTop getSupportTop() {
-		return supportTop;

+
+	
+	
+	
+	/**
+	 * Find geometry object by type.
+	 * @param c - class type to be found
+	 * @return the found type.
+	 */
+	protected <T> T getItem(Class<T> c) {
+		///if(isDebug()) System.out.printf("%s: get Item %s\n", this.getClass().getSimpleName(),c.getName());
+		
+		for(HPSTestRunTracker2014GeomDef.BaseGeom item : trackerItems) {
+			//if(isDebug()) System.out.printf("%s: item %s\n", getClass().getSimpleName(),item.getClass().getName());
+			if(c.isInstance(item)) {
+				return (T)item;
+			}
+		}
+		throw new RuntimeException("Coulnd't find instance of " + c.getSimpleName() + " among the " + trackerItems.size() + " tracker items!");

 	}

-	protected  HPSTestRunTracker2014GeomDef.SupportPlateTop getSupportPlateTop() {
-		return supportPlateTop;
-	}
-	protected  List<HPSTestRunTracker2014GeomDef.TestRunModule> getModules() {

+	
+	protected  List<ModuleBundle> getModules() {

 		return modules;
 	}
 	protected boolean isDebug() {

@@ -116,4 +385,82 @@

 	protected void setDebug(boolean debug) {
 		this.debug = debug;
 	}

--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014GeomDef.java	2014-08-01 18:01:33 UTC (rev 3211)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014GeomDef.java	2014-08-02 15:59:58 UTC (rev 3212)
@@ -53,6 +53,9 @@

 			protected  Hep3Vector flatPos;
 			private Hep3Vector center;
 			private Hep3Vector boxDim;

--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014LCDDBuilder.java	2014-08-01 18:01:33 UTC (rev 3211)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014LCDDBuilder.java	2014-08-02 15:59:58 UTC (rev 3212)
@@ -29,15 +29,8 @@

 	
 	
 	protected LCDD lcdd;

-	protected LCDDBaseGeom trackingLCDD;

 	protected LCDDBaseGeom baseLCDD;

-	protected LCDDBaseGeom basePlateLCDD;
-	protected LCDDBaseGeom cSupportLCDD;
-	protected LCDDBaseGeom supportBottomLCDD;
-	protected LCDDBaseGeom supportPlateBottomLCDD;
-	protected LCDDBaseGeom supportTopLCDD;
-	protected LCDDBaseGeom supportPlateTopLCDD;
-	protected List<LCDDBaseGeom> modulesLCDD;

+	protected List<LCDDBaseGeom> lcdd_objects;

 	
 	/**
 	 *  Default constructor

@@ -46,65 +39,136 @@

 		super(debugFlag);
 	}
 	

+	private void add(LCDDBaseGeom geom) {
+		lcdd_objects.add(geom);
+	}

+	
+	

 	protected void build(Volume worldVolume) {
 		// go through the list of volumes to build