Author: [log in to unmask]
Date: Mon Jan 25 10:56:47 2016
New Revision: 4133
Log:
add abstract stereo angle method to specifically make that settable.
Modified:
java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java
Modified: java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java
=============================================================================
--- java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java (original)
+++ java/branches/layer0-branch/detector-model/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java Mon Jan 25 10:56:47 2016
@@ -982,6 +982,7 @@
}
}
+ protected abstract void setStereoAngle();
protected double getStereoAngle() {
return stereo_angle;
}
@@ -1083,6 +1084,11 @@
}
}
+
+ @Override
+ protected void setStereoAngle() {
+ // do nothing here
+ }
@@ -1095,7 +1101,8 @@
super(name, mother, alignmentCorrection, layer, half);
if(layer<=3) stereo_angle = -0.1;
else if(layer>=4&&layer<=5) stereo_angle = -0.05;
- else throw new RuntimeException("Layer " + layer + " is not defined.");
+ if(layer>3 || layer <1)
+ throw new RuntimeException("Layer " + layer + " is not defined.");
init();
//setExplicitRotation();
}
@@ -1230,6 +1237,14 @@
if(debug) System.out.printf("%s: box center after corrections\n%s\n", getClass().getSimpleName(),getBoxDim().toString());
+ }
+
+ @Override
+ protected void setStereoAngle() {
+ if(this.layer<=3) stereo_angle = -0.1;
+ else if(layer>=4&&layer<=5) stereo_angle = -0.05;
+ if(layer>3 || layer <1)
+ throw new RuntimeException("Layer " + layer + " is not defined.");
}
|