Commit in projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim on MAIN | |||
detector/converter/compact/HPSTestRunTracker2014Converter.java | +2 | -2 | 3342 -> 3343 |
/HPSTestRunTracker2014JavaBuilder.java | +8 | -4 | 3342 -> 3343 |
geometry/compact/converter/lcdd/HPSTestRunTracker2014.java | +2 | -2 | 3342 -> 3343 |
/HPSTestRunTracker2014LCDDBuilder.java | +3 | -4 | 3342 -> 3343 |
+15 | -12 |
Switched back from dev1 builder.
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java 2014-09-23 21:37:19 UTC (rev 3342) +++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java 2014-09-23 23:02:02 UTC (rev 3343) @@ -63,9 +63,9 @@
if(_debug) System.out.printf("%s: convert %s \n", getClass().getSimpleName(), subdet.getName());
- //builder = new HPSTestRunTracker2014JavaBuilder(_debug);
+ builder = new HPSTestRunTracker2014JavaBuilder(_debug);
//builder = new HPSTestRunTracker2014Test1JavaBuilder(_debug);
- builder = new HPSTestRunTracker2014Dev1JavaBuilder(_debug);
+ //builder = new HPSTestRunTracker2014Dev1JavaBuilder(_debug);
// check tracking material trackingMaterial = MaterialStore.getInstance().get("Vacuum");
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014JavaBuilder.java 2014-09-23 21:37:19 UTC (rev 3342) +++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014JavaBuilder.java 2014-09-23 23:02:02 UTC (rev 3343) @@ -7,6 +7,7 @@
import org.lcsim.detector.ILogicalVolume; import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014Builder;
+import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014Dev1GeometryDefinition;
import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.Base; import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.BasePlate; import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.SupportBottom;
@@ -17,6 +18,8 @@
import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014Dev1Builder; import org.lcsim.geometry.compact.converter.lcdd.HPSTrackerBuilder.HalfModuleBundle; import org.lcsim.geometry.compact.converter.lcdd.HPSTrackerBuilder.ModuleBundle;
+import org.lcsim.geometry.compact.converter.lcdd.HPSTrackerJavaBuilder.JavaBaseGeometry; +import org.lcsim.geometry.compact.converter.lcdd.HPSTrackerLCDDBuilder.LCDDBaseGeometry;
import org.lcsim.geometry.compact.converter.lcdd.HPSTrackerJavaBuilder;
@@ -65,8 +68,9 @@
// 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); add(trackingGeometry);
- setBaseTrackerGeometry(new GhostJavaBaseGeom(_builder.getBaseGeometry(Base.class), trackingGeometry)); - add(getBaseTrackerGeometry());
+ //setBaseTrackerGeometry(new GhostJavaBaseGeom(_builder.getBaseGeometry(Base.class), trackingGeometry)); + setBaseTrackerGeometry(new JavaBaseGeometry(_builder.getBaseGeometry(HPSTestRunTracker2014Dev1GeometryDefinition.Base.class), trackingGeometry,1)); + add(getBaseTrackerGeometry());
JavaBaseGeometry basePlateGeometry = new GhostJavaBaseGeom(_builder.getBaseGeometry(BasePlate.class), getBaseTrackerGeometry()); add(basePlateGeometry); // skip the c-support, this is purely a reference volume in the builder so should have no use here!?
@@ -151,9 +155,9 @@
add(lcddM); // add half modules
- addHalfModule(bundle.halfModuleAxial,lcddM);
+ if(bundle.halfModuleAxial!=null) addHalfModule(bundle.halfModuleAxial,lcddM); + if(bundle.halfModuleStereo!=null) addHalfModule(bundle.halfModuleStereo,lcddM);
- addHalfModule(bundle.halfModuleStereo,lcddM);
if(isDebug()) { System.out.printf("%s: DONE addModule %s \n",this.getClass().getSimpleName(), bundle.module.getName());
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java 2014-09-23 21:37:19 UTC (rev 3342) +++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014.java 2014-09-23 23:02:02 UTC (rev 3343) @@ -96,9 +96,9 @@
// setup and build the LCDD geometry if(_debug) System.out.printf("%s: setup and build the LCDD geometry\n", getClass().getSimpleName());
- //builder = new HPSTestRunTracker2014LCDDBuilder(_debug);
+ builder = new HPSTestRunTracker2014LCDDBuilder(_debug);
//builder = new HPSTestRunTracker2014Test1LCDDBuilder(_debug);
- builder = new HPSTestRunTracker2014Dev1LCDDBuilder(_debug);
+ //builder = new HPSTestRunTracker2014Dev1LCDDBuilder(_debug);
builder.setLCDD(lcdd); builder.setSensitiveDetector(sens);
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014LCDDBuilder.java 2014-09-23 21:37:19 UTC (rev 3342) +++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014LCDDBuilder.java 2014-09-23 23:02:02 UTC (rev 3343) @@ -124,10 +124,9 @@
// create the module LCDDBaseGeometry lcddM = new LCDDBaseGeometry(bundle.module, lcdd, mother); add(lcddM);
- addHalfModule(bundle.halfModuleAxial,lcddM); - LCDDBaseGeometry lcddCB = new LCDDBaseGeometry(bundle.coldBlock, lcdd, lcddM); - add(lcddCB); - addHalfModule(bundle.halfModuleStereo,lcddM);
+ if(bundle.halfModuleAxial!=null) addHalfModule(bundle.halfModuleAxial,lcddM); + if(bundle.coldBlock!=null) add(new LCDDBaseGeometry(bundle.coldBlock, lcdd, lcddM)); + if(bundle.halfModuleStereo!=null) addHalfModule(bundle.halfModuleStereo,lcddM);
} /**
Use REPLY-ALL to reply to list
To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1