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/HPSTestRunTracker2014Dev1JavaBuilder.java	2014-09-17 17:45:26 UTC (rev 3326)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Dev1JavaBuilder.java	2014-09-17 17:46:13 UTC (rev 3327)
@@ -5,11 +5,8 @@

 
 import org.lcsim.detector.ILogicalVolume;
 import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014Dev1Builder;

-import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.ActiveSensor;
-import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.BaseGeometry;
-import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.Sensor;
-import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.TestRunHalfModuleAxial;
-import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.TrackingBase;

+import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014Dev1GeometryDefinition;
+import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition;

 import org.lcsim.geometry.compact.converter.lcdd.HPSTrackerJavaBuilder;
 
 

@@ -54,9 +51,12 @@

 		
 		
 		// Go through the list of volumes to build that is created in the generic builder class

-		JavaBaseGeometry trackingGeometry = new JavaBaseGeometry(_builder.getBaseGeometry(TrackingBase.class), trackingVolume);

+		JavaBaseGeometry trackingGeometry = new JavaBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014GeometryDefinition.TrackingBase.class), trackingVolume);

 		add(trackingGeometry);

-		setBaseTrackerGeometry(trackingGeometry);

+		//setBaseTrackerGeometry(trackingGeometry);
+		setBaseTrackerGeometry(new GhostJavaBaseGeom(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.Base.class), trackingGeometry));
+		add(getBaseTrackerGeometry());
+		

 
 		// build modules	
 		

@@ -64,12 +64,12 @@

 
 		
 		int oldCompactModuleId = 0;

-		JavaBaseGeometry lcddHM = new JavaBaseGeometry(_builder.getBaseGeometry(TestRunHalfModuleAxial.class), getBaseTrackerGeometry(),oldCompactModuleId);

+		JavaBaseGeometry lcddHM = new JavaBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.TestRunHalfModuleAxial.class), getBaseTrackerGeometry(),oldCompactModuleId);

 		add(lcddHM);
 		
 		// ComponentNumber is taken from old geometry where it is simply a counter when adding the xml daughters to the TestRunModule.
 		// It is simply 0 for sensor and 1 for carbon fiber in the old geometry 

-		Sensor sensor = _builder.getBaseGeometry(Sensor.class);

+		HPSTestRunTracker2014GeometryDefinition.Sensor sensor = _builder.getBaseGeometry(HPSTestRunTracker2014GeometryDefinition.Sensor.class);

 		int componentNumber = sensor.getId();
 
 		// create the sensor

@@ -77,7 +77,7 @@

 		add(lcddS);
 
 		// create the active sensor

-		JavaBaseGeometry lcddAS = new JavaBaseGeometry(_builder.getBaseGeometry(ActiveSensor.class), lcddS, componentNumber);

+		JavaBaseGeometry lcddAS = new JavaBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014GeometryDefinition.ActiveSensor.class), lcddS, componentNumber);

 		add(lcddAS);