LISTSERV 16.5 - LCDET-SVN Archives

projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact

HPSTestRunTracker2014Converter.java 3367 -> 3368

--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java	2014-10-16 23:48:30 UTC (rev 3367)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/converter/compact/HPSTestRunTracker2014Converter.java	2014-10-17 19:26:21 UTC (rev 3368)
@@ -28,6 +28,7 @@

 import org.lcsim.geometry.compact.Subdetector;
 import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014Builder;
 import org.lcsim.geometry.compact.converter.HPSTestRunTracker2014JavaBuilder;

+import org.lcsim.geometry.compact.converter.HPSTrackerBuilder;

 import org.lcsim.geometry.compact.converter.HPSTrackerJavaBuilder;
 import org.lcsim.geometry.compact.converter.HPSTrackerJavaBuilder.GhostJavaBaseGeom;
 import org.lcsim.geometry.compact.converter.HPSTrackerJavaBuilder.JavaBaseGeometry;

@@ -64,7 +65,6 @@

 		
 		if(_debug) System.out.printf("%s: convert %s \n", getClass().getSimpleName(), subdet.getName());

-		builder = new HPSTestRunTracker2014JavaBuilder(_debug);

 		
 		// check tracking material
 		trackingMaterial = MaterialStore.getInstance().get("Vacuum");

@@ -73,10 +73,19 @@

 			System.exit(1);
 		}

+		// Get XML node for this subdetector.
+        Element node = subdet.getNode();
+

 		 // Get the tracking volume for module placement.
         ILogicalVolume trackingVolume = detector.getTrackingVolume().getLogicalVolume();

-        // Set subdetector

+        
+        
+        // build the local geometry
+        builder = new HPSTestRunTracker2014JavaBuilder(_debug,node);
+        
+        
+        // Set subdetector for later reference

         builder.setSubdetector(subdet);
         
         // Get ID helper and dictionary for subdetector.

@@ -84,8 +93,6 @@

         builder.setIdentifierDictionary(subdet.getDetectorElement().getIdentifierHelper().getIdentifierDictionary());

-        // Get XML node for this subdetector.
-        Element node = subdet.getNode();

         
         // Build the detector here
         // setup and build the LCDD geometry

@@ -168,7 +175,7 @@

 			
 			// create detector element
 			// create detector element

-            if(HPSTestRunTracker2014Builder.isBase(geometryObject.getName())) {

+            if(HPSTrackerBuilder.isBase(geometryObject.getName())) {

                 
                 if(_debug) System.out.printf("%s: create the base detector element\n", getClass().getSimpleName());

@@ -195,7 +202,7 @@

-            } else if(HPSTestRunTracker2014Builder.isHalfModule(geometryObject.getName())) {

+            } else if(HPSTrackerBuilder.isHalfModule(geometryObject.getName())) {

 
 				if(_debug) System.out.printf("%s: create the layer detector element\n", getClass().getSimpleName());

@@ -210,7 +217,7 @@

 				layerPosId.setValue(builder.getDetectorIdentifierHelper().getFieldIndex("barrel"), builder.getDetectorIdentifierHelper().getBarrelValue());
 				//use the old definition of layer number to be consistent
 				//int layer = HPSTestRunTracker2014Builder.getLayerFromVolumeName(geometryObject.getName());

-				int layer = HPSTestRunTracker2014Builder.getOldGeomDefLayerFromVolumeName(geometryObject.getName());

+				int layer = HPSTrackerBuilder.getOldGeomDefLayerFromVolumeName(geometryObject.getName());

 				layerPosId.setValue(builder.getDetectorIdentifierHelper().getFieldIndex("layer"), layer);
 				if(_debug) System.out.printf("%s: layerPosId layer = %d (compare with new layer %d)\n", getClass().getSimpleName(),layer, HPSTestRunTracker2014Builder.getLayerFromVolumeName(geometryObject.getName()));

@@ -241,7 +248,7 @@

 
 				// create the "module" detector element 
 				// it's under the base element

-				String half = HPSTestRunTracker2014Builder.getHalfFromName(geometryObject.getName());

+				String half = HPSTrackerBuilder.getHalfFromName(geometryObject.getName());

                 if(half.equals("")) throw new RuntimeException("No half found for " + geometryObject.getName());
                 int moduleNumber = half.equals("top") ? 0 : 1;
               //String modulePlacementName = builder.getSubdetector().getName() + "_" + moduleName + "_layer" + layer + "_module" + moduleNumber;

@@ -282,7 +289,7 @@

-			} else if(HPSTestRunTracker2014Builder.isSensor(geometryObject.getName())) {

+			} else if(HPSTrackerBuilder.isSensor(geometryObject.getName())) {

 				
 				if(_debug) System.out.printf("%s: this is where I would create a detector element for the sensor %s if needed\n", getClass().getSimpleName(),geometryObject.getName());

@@ -290,7 +297,7 @@

 				// TODO this should go into the geometry definition?!
 				physVol.setSensitive(true);

-			} else if(HPSTestRunTracker2014Builder.isActiveSensor(geometryObject.getName())) {

+			} else if(HPSTrackerBuilder.isActiveSensor(geometryObject.getName())) {

 
 				// Setup the active sensor element
 				// to be consistent with old converter I also add the sensor

@@ -322,9 +329,9 @@

                 layerExpId.setValue(iddict.getFieldIndex("barrel"), builder.getDetectorIdentifierHelper().getBarrelValue());                            
                 //use the old definition of layer number to be consistent
 				//int layer = HPSTestRunTracker2014Builder.getLayerFromVolumeName(geometryObject.getName());

-				int layer = HPSTestRunTracker2014Builder.getOldGeomDefLayerFromVolumeName(geometryObject.getName());

+				int layer = HPSTrackerBuilder.getOldGeomDefLayerFromVolumeName(geometryObject.getName());

 				layerExpId.setValue(iddict.getFieldIndex("layer"), layer);

-				String half = HPSTestRunTracker2014Builder.getHalfFromName(geometryObject.getName());

+				String half = HPSTrackerBuilder.getHalfFromName(geometryObject.getName());

 				if(half.equals("")) throw new RuntimeException("No half found for " + geometryObject.getName());
 				int moduleNumber = half.equals("top") ? 0 : 1;

projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter

HPSTestRunTracker2014GeometryDefinition.java 3367 -> 3368

--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java	2014-10-16 23:48:30 UTC (rev 3367)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/HPSTestRunTracker2014GeometryDefinition.java	2014-10-17 19:26:21 UTC (rev 3368)
@@ -3,21 +3,22 @@

  */
 package org.lcsim.geometry.compact.converter;

+import hep.physics.vec.BasicHep3Matrix;
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+import hep.physics.vec.VecOp;
+

 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
 import org.apache.commons.math3.geometry.euclidean.threed.RotationOrder;
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;

+import org.jdom.Element;

 import org.lcsim.detector.Rotation3D;
 import org.lcsim.detector.Transform3D;
 import org.lcsim.detector.Translation3D;

-import hep.physics.vec.BasicHep3Matrix;
-import hep.physics.vec.BasicHep3Vector;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.VecOp;
-

 /**
  * 
  * Class containing geometry information for HPS Test run tracker 2014

@@ -26,8 +27,19 @@

  *
  */

-public class HPSTestRunTracker2014GeometryDefinition {
-

+public class HPSTestRunTracker2014GeometryDefinition extends HPSTrackerBuilder {
+    
+   
+
+    //steering
+    public final boolean doAxial = true;
+    public final boolean doStereo = true;
+    public final boolean doColdBlock = false;
+    public final boolean doBottom = true;
+    public final boolean doTop = true;
+    public final int layerBitMask = 0x1F;   
+    
+

 		//General
 		static final double inch = 25.4; //mm
 		protected static final boolean useSiStripsConvention = true;

@@ -39,8 +51,316 @@

 		protected static final double target_pos_wrt_base_plate_y = 80.55; //from Tim's sketchup //68.75; //from Marco's 3D model
 		protected static final double target_pos_wrt_base_plate_z = 926.59; //from Marco's 3D model
 		protected static final double PS_vac_box_inner_height = 7.0*inch;

+
+

+		public HPSTestRunTracker2014GeometryDefinition(boolean debug, Element node) {
+		    super(debug, node);
+		}
+
+
+		public void build() {
+
+            if(isDebug()) System.out.printf("%s: constructing the geometry objects\n", this.getClass().getSimpleName());
+
+            // Build the geometry from the basic building blocks in the geometry definition class
+            // Keep the order correct.
+            // Each item has knowledge of its mother but not its daughters
+            HPSTestRunTracker2014GeometryDefinition.TrackingBase tracking = new HPSTestRunTracker2014GeometryDefinition.TrackingBase("trackingVolume",null);
+            geometries.add(tracking);
+            HPSTestRunTracker2014GeometryDefinition.Base base = new HPSTestRunTracker2014GeometryDefinition.Base("base",tracking);
+            geometries.add(base);
+            HPSTestRunTracker2014GeometryDefinition.BasePlate basePlate = new HPSTestRunTracker2014GeometryDefinition.BasePlate("baseplate",base, "Aluminum");
+            geometries.add(basePlate);
+            HPSTestRunTracker2014GeometryDefinition.CSupport cSupport = new HPSTestRunTracker2014GeometryDefinition.CSupport("c_support", base);
+            geometries.add(cSupport);
+            HPSTestRunTracker2014GeometryDefinition.SupportBottom supportBottom = new HPSTestRunTracker2014GeometryDefinition.SupportBottom("support_bottom", base, cSupport);
+            geometries.add(supportBottom);
+            // The support survey positions are now with respect to its mother and not the reference coord. system.
+            // So to get the reference for the support plate I don't need to apply that extra transformation
+            HPSTestRunTracker2014GeometryDefinition.SupportPlateBottom supportPlateBottom = new HPSTestRunTracker2014GeometryDefinition.SupportPlateBottom("support_plate_bottom", base, supportBottom, "Aluminum");
+            geometries.add(supportPlateBottom);
+            HPSTestRunTracker2014GeometryDefinition.SupportTop supportTop = new HPSTestRunTracker2014GeometryDefinition.SupportTop("support_top", base, cSupport);
+            geometries.add(supportTop);
+            HPSTestRunTracker2014GeometryDefinition.SupportPlateTop supportPlateTop = new HPSTestRunTracker2014GeometryDefinition.SupportPlateTop("support_plate_top", base, supportTop, "Aluminum");
+            geometries.add(supportPlateTop);
+            
+            // Modules are built using an encapsulating class that keeps tracks of all components
+            modules = new ArrayList<ModuleBundle>();
+            
+            for(int l=1; l<=5;++l) {
+                if(!doLayer(l)) continue;
+                if(doBottom) makeModuleBundle(l,"bottom");
+                if(doTop) makeModuleBundle(l,"top");
+                
+            }       
+            
+            if(isDebug()) {
+                System.out.printf("%s: DONE constructing the geometry objects\n", this.getClass().getSimpleName());
+                System.out.printf("%s: List of all the geometry objects built\n", this.getClass().getSimpleName());
+                for(BaseGeometry bg : geometries) {
+                    System.out.printf("-------\n%s\n", bg.toString());
+                }
+            }
+            
+        }

+        
+        /**
+         * Create the module. 
+         * @param layer - of the module
+         * @param half - top or bottom half of the tracker
+         */
+        private void makeModuleBundle(int layer, String half) 
+        {
+
+            if(isDebug()) System.out.printf("%s: makeModule for layer %d %s \n", this.getClass().getSimpleName(), layer, half);
+            
+            
+            // build the module name
+            String volName = "module_L"+ layer + (half=="bottom"?"b":"t");      
+            
+            boolean isL13 = ( layer >=1 && layer <=3 ) ? true : false;          
+            
+            // find the mother and reference geometry
+            // Note that the reference geometry is the support plate and since that is assumed to be 
+            // created through it's references we don't need more than one reference to reach the mother coordinate system
+            final HPSTestRunTracker2014GeometryDefinition.BaseGeometry mother;
+            final HPSTestRunTracker2014GeometryDefinition.BaseGeometry ref;
+            if(half == "bottom") {
+                mother = getBaseGeometry(HPSTestRunTracker2014GeometryDefinition.Base.class);
+                ref = getBaseGeometry(HPSTestRunTracker2014GeometryDefinition.SupportPlateBottom.class);
+            } else {
+                mother= getBaseGeometry(HPSTestRunTracker2014GeometryDefinition.Base.class);
+                ref = getBaseGeometry(HPSTestRunTracker2014GeometryDefinition.SupportPlateTop.class);
+            }
+            
+            //Create the module
+            HPSTestRunTracker2014GeometryDefinition.TestRunModule module;
+            if(isL13) {
+                module = new HPSTestRunTracker2014GeometryDefinition.TestRunModuleL13(volName, mother, ref, layer, half);
+            } else {
+                module = new HPSTestRunTracker2014GeometryDefinition.TestRunModuleL45(volName, mother, ref, layer, half);
+            }
+            
+            
+            // create the bundle for this module
+            ModuleBundle bundle = new ModuleBundle(module);
+            addModuleBundle(bundle);
+            
+            if(doAxial) makeHalfModule("axial", module);
+            if(doColdBlock) makeColdBlock(module);
+            if(doStereo) makeHalfModule("stereo", module);
+            
+            
+            if(isDebug()) {
+                System.out.printf("%s: created module bundle:\n", this.getClass().getSimpleName());
+                bundle.print();
+            }
+            
+        }
+        
+        
+
+        /**
+         * Create the cold block object.
+         * @param mother to the cold block
+         */
+        private void makeColdBlock(HPSTestRunTracker2014GeometryDefinition.TestRunModule mother) { 
+
+
+            String moduleName = mother.getName();
+
+            if(isDebug()) System.out.printf("%s: makeColdBlock for %s \n", this.getClass().getSimpleName(), moduleName);
+
+
+            String volName = moduleName + "_coldblock";
+
+            // find layer
+            int layer = getLayerFromVolumeName(moduleName);
+
+            // Build the half-module
+            HPSTestRunTracker2014GeometryDefinition.TestRunColdBlock coldBlock;
+
+            if(layer >= 1 && layer <=3) {
+                coldBlock = new HPSTestRunTracker2014GeometryDefinition.TestRunColdBlockL13(volName, mother, layer);
+            } else if(layer >= 4 && layer <=5) {
+                coldBlock = new HPSTestRunTracker2014GeometryDefinition.TestRunColdBlockL45(volName, mother, layer);
+            } else {
+                throw new RuntimeException("wrong layer for " + volName);
+            }
+
+            ModuleBundle bundle = getModuleBundle(mother);
+            bundle.coldBlock = coldBlock;
+        }
+
+
+        
+        /**
+         * Create the half-module.
+         * @param side - stereo or axial
+         * @param mother to the half-module
+         */
+        private void makeHalfModule(String side, HPSTestRunTracker2014GeometryDefinition.TestRunModule mother) {
+            
+            String moduleName = mother.getName();
+            
+            if(isDebug()) System.out.printf("%s: makeHalfModule for %s %s \n", this.getClass().getSimpleName(), moduleName, side);
+            
+            String volName = moduleName + "_halfmodule_" + side;
+            
+            // top or bottom?
+            String half = mother.getHalf();
+            
+            // find layer
+            int layer = mother.getLayer();
+            
+            ModuleBundle bundle  = getModuleBundle(mother);
+            HalfModuleBundle halfModuleBundle;
+            
+            // Build the half-module
+            HPSTestRunTracker2014GeometryDefinition.TestRunHalfModule halfModule;
+            if(side == "axial") {
+                halfModule = new HPSTestRunTracker2014GeometryDefinition.TestRunHalfModuleAxial(volName, mother, layer, half);
+                halfModuleBundle = new HalfModuleBundle(halfModule);
+                bundle.halfModuleAxial = halfModuleBundle;
+            } else if(side == "stereo") {
+                halfModule = new HPSTestRunTracker2014GeometryDefinition.TestRunHalfModuleStereo(volName, mother, layer, half);
+                halfModuleBundle = new HalfModuleBundle(halfModule);
+                bundle.halfModuleStereo = halfModuleBundle;
+            } else {
+                throw new IllegalArgumentException("not a valid half-module side " + side);
+            }
+            
+            
+            // create the half module components 
+            
+            makeHalfModuleComponentSensor(halfModule);
+            
+            makeHalfModuleComponentKapton(halfModule);
+            
+            makeHalfModuleComponentCF(halfModule);
+            
+            makeHalfModuleComponentHybrid(halfModule);
+                
+            
+            
+            
+        }
+        
+        
+        
+        private void makeHalfModuleComponentHybrid(HPSTestRunTracker2014GeometryDefinition.TestRunHalfModule mother) {
+            
+            if(isDebug()) System.out.printf("%s: makeHalfModuleComponentHybrid for %s \n", this.getClass().getSimpleName(), mother.getName());
+
+            String volName = mother.getName() + "_hybrid";
+
+            // Build the half-module
+            
+            //  id is hard coded
+            int component_number = 3;
+
+            HPSTestRunTracker2014GeometryDefinition.Hybrid hybrid = new HPSTestRunTracker2014GeometryDefinition.Hybrid(volName,mother,component_number);
+            hybrid.setMaterial("G10");
+            
+            HalfModuleBundle hm = getHalfModuleBundle((HPSTestRunTracker2014GeometryDefinition.TestRunModule) mother.getMother(), mother.getName());
+            hm.hybrid = hybrid;
+
+            if(isDebug()) System.out.printf("%s: added hybrid to half-module with name %s \n", this.getClass().getSimpleName(), hm.halfModule.getName());
+
+        
+        }
+
+
+
+        private void makeHalfModuleComponentCF(HPSTestRunTracker2014GeometryDefinition.TestRunHalfModule mother) {
+
+            if(isDebug()) System.out.printf("%s: makeHalfModuleComponentCF for %s \n", this.getClass().getSimpleName(), mother.getName());
+
+
+            String volName = mother.getName() + "_cf";
+
+            // Build the half-module
+            
+            //  id is hard coded
+            int component_number = 1;
+
+            HPSTestRunTracker2014GeometryDefinition.CarbonFiber cf = new HPSTestRunTracker2014GeometryDefinition.CarbonFiber(volName,mother,component_number);
+            cf.setMaterial("CarbonFiber");
+            
+            HalfModuleBundle hm = getHalfModuleBundle((HPSTestRunTracker2014GeometryDefinition.TestRunModule) mother.getMother(), mother.getName());
+            hm.carbonFiber = cf;
+
+        }
+
+
+
+
+        private void makeHalfModuleComponentKapton(HPSTestRunTracker2014GeometryDefinition.TestRunHalfModule mother) {
+
+            if(isDebug()) System.out.printf("%s: makeHalfModuleComponentKapton for %s \n", this.getClass().getSimpleName(), mother.getName());
+
+            String volName = mother.getName() + "_lamination";
+
+            // Build the half-module
+
+            //  id is hard coded
+            int component_number = 2;
+
+            HPSTestRunTracker2014GeometryDefinition.HalfModuleLamination lamination = new HPSTestRunTracker2014GeometryDefinition.HalfModuleLamination(volName,mother,component_number);
+            lamination.setMaterial("Kapton");
+
+            
+            HalfModuleBundle hm = getHalfModuleBundle((HPSTestRunTracker2014GeometryDefinition.TestRunModule) mother.getMother(), mother.getName());
+            hm.lamination = lamination;
+
+        }
+
+
+        private void makeHalfModuleComponentSensor(HPSTestRunTracker2014GeometryDefinition.TestRunHalfModule mother) {
+
+            if(isDebug()) System.out.printf("%s: makeHalfModuleComponentSensor for %s \n", this.getClass().getSimpleName(), mother.getName());
+
+            String volName = mother.getName() + "_sensor";
+
+            // sensor id is hard coded in old geometry to be zero by counting over the components of the module
+            int component_number = 0;
+
+            //  
+            HPSTestRunTracker2014GeometryDefinition.Sensor sensor = new HPSTestRunTracker2014GeometryDefinition.Sensor(volName, mother, component_number);
+            sensor.setMaterial("Silicon");
+            
+            HalfModuleBundle hm = getHalfModuleBundle((HPSTestRunTracker2014GeometryDefinition.TestRunModule) mother.getMother(), mother.getName());
+            hm.sensor = sensor;
+            
+
+            makeHalfModuleComponentActiveSensor(sensor);
+
+
+        }
+
+        
+        private void makeHalfModuleComponentActiveSensor(HPSTestRunTracker2014GeometryDefinition.Sensor mother) {
+            
+            if(isDebug()) System.out.printf("%s: makeHalfModuleComponentActiveSensor for %s \n", this.getClass().getSimpleName(), mother.getName());
+            
+            String volName = mother.getName() + "_active";
+
+            HPSTestRunTracker2014GeometryDefinition.ActiveSensor active_sensor = new HPSTestRunTracker2014GeometryDefinition.ActiveSensor(volName, mother);
+            active_sensor.setMaterial("Silicon");
+            
+            HalfModuleBundle hm = getHalfModuleBundle((HPSTestRunTracker2014GeometryDefinition.TestRunModule) mother.getMother().getMother(), mother.getMother().getName());
+            hm.activeSensor = active_sensor;
+            
+        }
+            
+        public boolean doLayer(int layer) {
+            int a = (1<<(layer-1)) & layerBitMask;
+            return a!=0?true:false;
+        }
+        
+

 		
 		/**
 		 *

@@ -62,9 +382,6 @@

 			protected  Hep3Vector flatPos;
 			private Hep3Vector center;
 			private Hep3Vector boxDim;

-			//store explicit rotations - if exist should be used instead of those extracted from coord
-			// TODO This is a workaround as I should really rotate the local coord system to make things consistent. Figure this out later. 
-			public Hep3Vector explicit_rot_angles = null;

 			
 			public BaseGeometry(String name, BaseGeometry m) {
 				setName(name);

@@ -1058,46 +1375,9 @@

 				veePos = new BasicHep3Vector(vee_pos_halfmod_local_x, vee_pos_halfmod_local_y,vee_pos_halfmod_local_z);
 				flatPos = new BasicHep3Vector(flat_pos_halfmod_local_x, flat_pos_halfmod_local_y,flat_pos_halfmod_local_z);

-				
-				// I should set the coordiantes from the the drawing without explicit roations
-				// TODO FIX THIS!
-				calcAndSetPos();

-			private void calcAndSetPos() {
-			/*
-				// find the rotation to place the flat point
-				Rotation rot1_csup = 
-						new Rotation(
-								new Vector3D(vee_pos_csup_pin_bottom_x-ball_pos_csup_pin_bottom_x,
-																								vee_pos_csup_pin_bottom_y-ball_pos_csup_pin_bottom_y,
-																								vee_pos_csup_pin_bottom_z-ball_pos_csup_pin_bottom_z),
-																								new Vector3D(1,0,0));
-								
-				Vector3D flat_pos_csup_pin_bottom_3D_rot = rot1_csup.applyTo(new Vector3D(0,10.0,0));
-				// translate
-				double flat_pos_csup_pin_bottom_x = ball_pos_csup_pin_bottom_x + flat_pos_csup_pin_bottom_3D_rot.getX();
-				double flat_pos_csup_pin_bottom_y = ball_pos_csup_pin_bottom_y + flat_pos_csup_pin_bottom_3D_rot.getY();
-				double flat_pos_csup_pin_bottom_z = ball_pos_csup_pin_bottom_z + flat_pos_csup_pin_bottom_3D_rot.getZ();
-				setFlatPos(flat_pos_csup_pin_bottom_x,flat_pos_csup_pin_bottom_y,flat_pos_csup_pin_bottom_z);
-			*/
-			}
-

-			/**
-			 * Set rotations explicitly. 
-			 * TODO Should be included in the coord system? Workaround!?
-			 */
-			protected void setExplicitRotation() {
-				if(getLayer()<4) {
-					stereo_angle = -0.1;
-				} else {
-					stereo_angle = -0.05;
-				}
-				Rotation rot_stereo = new Rotation(RotationOrder.XYZ, Math.PI, stereo_angle,0);
-				double res[] = rot_stereo.getAngles(RotationOrder.XYZ);
-				explicit_rot_angles = new BasicHep3Vector(res);
-			}

@@ -1582,6 +1862,11 @@

+
+
+
+
+

Commit in `projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim` on MAIN
`detector/converter/compact/HPSTestRunTracker2014Converter.java`	+19	-12	3367 -> 3368
`geometry/compact/converter/HPSTestRunTracker2014Builder.java`	+4	-2	3367 -> 3368
`/HPSTestRunTracker2014Dev1Builder.java`		-156	3367 removed
`/HPSTestRunTracker2014Dev1GeometryDefinition.java`		-209	3367 removed
`/HPSTestRunTracker2014Dev1JavaBuilder.java`		-113	3367 removed
`/HPSTestRunTracker2014Dev1LCDDBuilder.java`		-138	3367 removed
`/HPSTestRunTracker2014GeometryDefinition.java`	+332	-47	3367 -> 3368
`/HPSTestRunTracker2014JavaBuilder.java`	+7	-4	3367 -> 3368
`/HPSTestRunTracker2014LCDDBuilder.java`	+6	-3	3367 -> 3368
`/HPSTrackerBuilder.java`	+7	-4	3367 -> 3368
`/HPSTrackerJavaBuilder.java`	+5	-34	3367 -> 3368
`/HPSTrackerLCDDBuilder.java`	+13	-22	3367 -> 3368
`geometry/compact/converter/lcdd/HPSTestRunTracker2014.java`	+7	-6	3367 -> 3368
	+400	-750