Author: phansson
Date: Tue Dec 2 12:20:41 2014
New Revision: 1611
Log:
remove static function
Modified:
java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java Tue Dec 2 12:20:41 2014
@@ -978,7 +978,23 @@
l = Integer.parseInt(str_l);
}
else if(name.contains("module") && name.contains("_halfmodule")) {
- l = HPSTrackerBuilder.getOldGeomDefLayerFromVolumeName(name);
+ int ll = HPSTrackerBuilder.getLayerFromVolumeName(name);
+ boolean isAxial = HPSTrackerBuilder.isAxialFromName(name);
+ boolean isTopLayer = HPSTrackerBuilder.getHalfFromName(name).equals("top") ? true : false;
+ if(isAxial) {
+ if(isTopLayer) {
+ l = 2*ll-1;
+ }
+ else {
+ l = 2*ll;
+ }
+ } else {
+ if(isTopLayer) {
+ l = 2*ll;
+ } else {
+ l = 2*ll-1;
+ }
+ }
} else {
throw new RuntimeException("Cannot get layer from name " + name);
}
|