LISTSERV 16.5 - LCDET-SVN Archives

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

HPSTestRunTracker2014GeometryDefinition.java 3345 -> 3346

--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014GeometryDefinition.java	2014-09-25 22:39:09 UTC (rev 3345)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014GeometryDefinition.java	2014-09-26 23:50:42 UTC (rev 3346)
@@ -6,6 +6,9 @@

 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.lcsim.detector.Rotation3D;
 import org.lcsim.detector.Transform3D;
 import org.lcsim.detector.Translation3D;

@@ -89,7 +92,13 @@

 				setCoord();
 				setCenter();
 				setBoxDim();

+				applyCorrections();

+
+			protected void applyCorrections() {
+			    //do nothing here unless overridden
+			}
+

 			public  void setBallPos(double x, double y, double z) {
 				ballPos = new BasicHep3Vector(x,y,z);
 			}

@@ -1018,8 +1027,11 @@

 
 			public TestRunHalfModuleStereo(String name, BaseGeometry mother, int layer, String half) {
 				super(name, mother, 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.");

 				init();

-				setExplicitRotation();

+				//setExplicitRotation();

 			}
 			
 			protected void setPos() {

@@ -1042,7 +1054,8 @@

 				ballPos = new BasicHep3Vector(ball_pos_halfmod_local_x, ball_pos_halfmod_local_y, ball_pos_halfmod_local_z);
 				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();

@@ -1083,6 +1096,29 @@

 				explicit_rot_angles = new BasicHep3Vector(res);
 			}

+			
+			
+			protected void applyCorrections() {
+			    // Apply whatever corrections we want to the final volume as created
+			    // Maybe alignment corrections too but should be done in the top level
+			    
+                // Rotate these into the right place for the stereo
+                // My rotations here are active rotations in the mother coordinate system frame
+                // flip around u
+                Rotation r1 = new Rotation(new Vector3D(1,0,0),Math.PI);
+                //Rotation r2 = new Rotation(new Vector3D(0,1,0),stereo_angle);
+                //Rotation r = r2.applyTo(r1);
+                Rotation r = r1;
+                System.out.printf("%s: Coord before corrections\n%s\n", getClass().getSimpleName(),getCoord().toString());
+                System.out.printf("%s: box center before corrections\n%s\n", getClass().getSimpleName(),getBoxDim().toString());
+                getCoord().rotateApache(r);
+                System.out.printf("%s: Coord after corrections\n%s\n", getClass().getSimpleName(),getCoord().toString());
+                System.out.printf("%s: box center after corrections\n%s\n", getClass().getSimpleName(),getBoxDim().toString());
+                
+                
+			}
+			
+

 		}
 		
 		public static abstract class TestRunColdBlock extends BaseGeometry {

@@ -1449,21 +1485,42 @@

 				w = unit_z;
 			}

+			public Coord(Hep3Vector ball, Hep3Vector vee, Hep3Vector flat) {
+                origin = ball;
+                Hep3Vector ball_to_vee = VecOp.sub(vee, ball);
+                u = VecOp.unit(ball_to_vee);
+                Hep3Vector ball_to_flat = VecOp.sub(flat, ball);
+                w = VecOp.unit(VecOp.cross(ball_to_vee,ball_to_flat));
+                v = VecOp.cross(w, u);
+                check();
+            }
+

 			private void check() {

-				if(u.magnitude()-1>0.00001 || v.magnitude()-1>0.00001 || v.magnitude()-1>0.00001) {
-					throw new RuntimeException("Error: this coordinate system is ill-defined " + toString());
-				}

+			    checkUnitLength();
+			    checkAngles();

+
+			private void checkUnitLength() {
+			    if(u.magnitude()-1>0.00001 || v.magnitude()-1>0.00001 || v.magnitude()-1>0.00001) {
+			        throw new RuntimeException("Error: the unit vectors of the  coordinate system is ill-defined " + toString());
+			    }
+			}
+
+			private void checkAngles() {
+			    if( (VecOp.dot(u, v)-1)>0.00001 ||  (VecOp.dot(u, w)-1)>0.00001 ||  (VecOp.dot(v, w)-1)>0.00001 ) {
+			        throw new RuntimeException("Error: the angles in coordinate system is ill-defined " + toString());
+			    }
+			}

-			public Coord(Hep3Vector ball, Hep3Vector vee, Hep3Vector flat) {
-				origin = ball;
-				Hep3Vector ball_to_vee = VecOp.sub(vee, ball);
-				u = VecOp.unit(ball_to_vee);
-				Hep3Vector ball_to_flat = VecOp.sub(flat, ball);
-				w = VecOp.unit(VecOp.cross(ball_to_vee,ball_to_flat));
-				v = VecOp.cross(w, u);
-				check();

+			public void rotateApache(Rotation r) {
+			    System.out.printf("%s: apply apache rotation to this coord system\n%s\n", getClass().getSimpleName(),toString());
+			    this.u = new BasicHep3Vector(r.applyTo(new Vector3D(u.v())).toArray());
+			    this.v = new BasicHep3Vector(r.applyTo(new Vector3D(v.v())).toArray());
+			    this.w = new BasicHep3Vector(r.applyTo(new Vector3D(w.v())).toArray());
+			    System.out.printf("%s: new coord system after apache rotation to this coord system\n%s\n", getClass().getSimpleName(),toString());

+
+

 	/*
 			public void rotate(Hep3Vector euler_angles) {
 				RotationGeant rotation = new RotationGeant(euler_angles.x(), euler_angles.y(), euler_angles.z());

@@ -1488,7 +1545,8 @@

 			public Hep3Vector w() {
 				return w;
 			}

-			public String toString() {

+			
+            public String toString() {

 				return "Coordinate system: \norigin " + origin.toString() + "\nu " + u.toString() + "\nv " + v.toString() + "\nw " + w.toString();
 			}

Commit in `projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd` on MAIN
`HPSTestRunTracker2014Builder.java`	+17	-19	3345 -> 3346
`HPSTestRunTracker2014GeometryDefinition.java`	+72	-14	3345 -> 3346
`HPSTestRunTracker2014LCDDBuilder.java`	+2	-2	3345 -> 3346
`HPSTestRunTracker2014Test1Builder.java`		-121	3345 removed
`HPSTestRunTracker2014Test1LCDDBuilder.java`		-142	3345 removed
`HPSTrackerJavaBuilder.java`	+10	-3	3345 -> 3346
`HPSTrackerLCDDBuilder.java`	+8	-13	3345 -> 3346
	+109	-314