3 modified files
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-23 00:08:37 UTC (rev 3336)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Dev1JavaBuilder.java 2014-09-23 00:10:49 UTC (rev 3337)
@@ -54,7 +54,9 @@
JavaBaseGeometry trackingGeometry = new JavaBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014GeometryDefinition.TrackingBase.class), trackingVolume);
add(trackingGeometry);
//setBaseTrackerGeometry(trackingGeometry);
- setBaseTrackerGeometry(new GhostJavaBaseGeom(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.Base.class), trackingGeometry));
+ //setBaseTrackerGeometry(new GhostJavaBaseGeom(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.Base.class), trackingGeometry));
+ //add(getBaseTrackerGeometry());
+ setBaseTrackerGeometry(new JavaBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.Base.class), trackingGeometry,1));
add(getBaseTrackerGeometry());
@@ -63,6 +65,17 @@
if(isDebug()) System.out.printf("%s: build JAVA modules\n", getClass().getSimpleName());
+ JavaBaseGeometry mother = getBaseTrackerGeometry();
+
+ // Create the module
+ JavaBaseGeometry lcddM = new GhostJavaBaseGeom(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.TestRunModule.class), mother);
+ add(lcddM);
+
+
+ if(isDebug()) System.out.printf("%s: build JAVA half-modules\n", getClass().getSimpleName());
+
+ //mother = getBaseTrackerGeometry();
+ mother = lcddM;
int oldCompactModuleId = 0;
JavaBaseGeometry lcddHM = new JavaBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.TestRunHalfModuleAxial.class), getBaseTrackerGeometry(),oldCompactModuleId);
add(lcddHM);
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014Dev1Builder.java 2014-09-23 00:08:37 UTC (rev 3336)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014Dev1Builder.java 2014-09-23 00:10:49 UTC (rev 3337)
@@ -3,7 +3,9 @@
*/
package org.lcsim.geometry.compact.converter.lcdd;
+import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.BaseGeometry;
+
/**
*
* Class used to encapsulate the rules for building geometry based building blocks defined in {@link HPSTestRunTracker2014GeometryDefinition}
@@ -36,13 +38,32 @@
geometries.add(base);
+
+ if(isDebug()) System.out.printf("%s: build modules\n", getClass().getSimpleName());
+
+
+
+ int layer = 1;
+ String half = "bottom";
+ if(isDebug()) System.out.printf("%s: makeModule for layer %d %s \n", this.getClass().getSimpleName(), layer, half);
+
+ String moduleName = "module_L"+ layer + (half=="bottom"?"b":"t");
+ BaseGeometry ref = null;
+ BaseGeometry mother = base;
+
+ //Create the module
+ HPSTestRunTracker2014GeometryDefinition.TestRunModule module = new HPSTestRunTracker2014Dev1GeometryDefinition.TestRunModuleL13(moduleName, mother, ref, layer, half);
+
+ geometries.add(module);
+
+ if(isDebug()) System.out.printf("%s: build half-modules\n", getClass().getSimpleName());
+
+
+
// Build the half-module
- int layer = 1;
- String half = "bottom";
- String moduleName = "module_L"+ layer + (half=="bottom"?"b":"t");
String side = "axial";
String volName = moduleName + "_halfmodule_" + side;
- HPSTestRunTracker2014GeometryDefinition.BaseGeometry mother = base;
+ mother = module;
if(isDebug()) System.out.printf("%s: makeHalfModule with name %s\n", this.getClass().getSimpleName(), volName);
projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014Dev1LCDDBuilder.java 2014-09-23 00:08:37 UTC (rev 3336)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014Dev1LCDDBuilder.java 2014-09-23 00:10:49 UTC (rev 3337)
@@ -1,5 +1,7 @@
package org.lcsim.geometry.compact.converter.lcdd;
+import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.BaseGeometry;
+import org.lcsim.geometry.compact.converter.lcdd.HPSTrackerLCDDBuilder.LCDDBaseGeometry;
import org.lcsim.geometry.compact.converter.lcdd.util.Volume;
@@ -43,11 +45,31 @@
- // build modules
+ // build modules
+
- if(isDebug()) System.out.printf("%s: build modules\n", getClass().getSimpleName());
- LCDDBaseGeometry lcddHM = new LCDDBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.TestRunHalfModuleAxial.class),lcdd, baseTrackerGeometry);
+ if(isDebug()) System.out.printf("%s: build modules\n", getClass().getSimpleName());
+
+ int layer = 1;
+ String half = "bottom";
+ if(isDebug()) System.out.printf("%s: makeModule for layer %d %s \n", this.getClass().getSimpleName(), layer, half);
+
+ LCDDBaseGeometry mother = baseTrackerGeometry;
+
+ //Create the module
+ LCDDBaseGeometry lcddM = new LCDDBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.TestRunModule.class), lcdd, mother);
+ add(lcddM);
+
+
+
+
+ if(isDebug()) System.out.printf("%s: build half-modules\n", getClass().getSimpleName());
+
+
+
+
+ LCDDBaseGeometry lcddHM = new LCDDBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.TestRunHalfModuleAxial.class),lcdd, lcddM);
add(lcddHM);
// create the sensor
SVNspam 0.1