Commit in projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd on MAIN | |||
HPSTestRunTracker2014GeomDef.java | +18 | -14 | 3201 -> 3202 |
Added material member string.
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014GeomDef.java 2014-07-24 23:01:22 UTC (rev 3201) +++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014GeomDef.java 2014-07-24 23:02:45 UTC (rev 3202) @@ -20,11 +20,8 @@
* @author Per Hansson Adrian <[log in to unmask]> * */
-/** - * @author phansson - * - */ -public final class HPSTestRunTracker2014GeomDef {
+ +public class HPSTestRunTracker2014GeomDef {
//General private static final double inch = 25.4; //mm
@@ -44,6 +41,7 @@
*/ protected static abstract class BaseGeom { private String name;
+ private String material = "Vacuum";
private BaseGeom mother; // The reference geometry is used when the survey points are w.r.t. to // a different/intermediate coord system. So that transformation has to be used when
@@ -72,9 +70,6 @@
protected abstract void setCenter(); protected abstract void setBoxDim();
- /** - * Initialize the survey constants, volume positions and dimensions - */
protected void init() { setPos(); setCoord();
@@ -154,6 +149,12 @@
System.out.printf("veePos %s\n", veePos.toString()); System.out.printf("flatPos %s\n", flatPos.toString()); }
+ public String getMaterial() { + return material; + } + public void setMaterial(String material) { + this.material = material; + }
}
@@ -230,9 +231,10 @@
protected static final double base_plate_length = 1216.00; //height from vacuum chamber surface protected static final double base_plate_offset_height = 2.0; //from Marco's 3D model
- public BasePlate(String name, BaseGeom mother) {
+ public BasePlate(String name, BaseGeom mother, String material) {
super(name,mother); init();
+ setMaterial(material);
} protected void setPos() { setBallPos(0,0,0);
@@ -473,8 +475,9 @@
protected static final double pedestal_height_L3 = 8.00; protected static final double pedestal_height_L4 = 10.00; protected static final double pedestal_height_L5 = 7.00;
- public SupportPlate(BaseGeom mother, String name) {
+ public SupportPlate(BaseGeom mother, String name, String material) {
super(name,mother);
+ setMaterial(material);
} }
@@ -491,9 +494,10 @@
protected static final double support_plate_bottom_length = 736.1; protected static final double support_plate_bottom_width = 120.0;
- public SupportPlateBottom(String name, BaseGeom mother) { - super(mother,name);
+ public SupportPlateBottom(String name, BaseGeom mother, String material) { + super(mother,name, material);
init();
+
} protected void setPos() { ballPos = new BasicHep3Vector(1.0, (17.0-5.0), 6.66+1.34);
@@ -521,8 +525,8 @@
protected static final double support_plate_top_width = SupportPlateBottom.support_plate_bottom_width; protected static final double support_plate_top_height = SupportPlateBottom.support_plate_bottom_height;
- public SupportPlateTop(String name, BaseGeom mother) { - super(mother,name);
+ public SupportPlateTop(String name, BaseGeom mother, String material) { + super(mother,name,material);
init(); } protected void setPos() {
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