--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014Dev1GeometryDefinition.java	2014-09-23 00:10:49 UTC (rev 3337)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/lcdd/HPSTestRunTracker2014Dev1GeometryDefinition.java	2014-09-23 00:12:43 UTC (rev 3338)
@@ -3,6 +3,9 @@

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

+import org.apache.commons.math3.geometry.euclidean.threed.Rotation;
+import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
+import org.lcsim.detector.Rotation3D;

 import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.BaseGeometry;
 import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.HalfModuleComponent;
 import org.lcsim.geometry.compact.converter.lcdd.HPSTestRunTracker2014GeometryDefinition.HalfModuleLamination;

@@ -22,7 +25,7 @@

-

+/*

 		public static class Base extends HPSTestRunTracker2014GeometryDefinition.BaseGeometry {
 			// height of the dummy box holding the entire SVT: 
 			// this means the bottom of the base plate to the the inner surface of of the PS vac box for now

@@ -36,43 +39,56 @@

 			}
 			protected void setPos() {
 				//Default position

-//				final double ball_pos_base_x = -1.0*target_pos_wrt_base_plate_x;
-//				final double ball_pos_base_y = -1.0*target_pos_wrt_base_plate_y;
-//				final double ball_pos_base_z = target_pos_wrt_base_plate_z;		

+				final double ball_pos_base_x = -1.0*target_pos_wrt_base_plate_x;
+				final double ball_pos_base_y = -1.0*target_pos_wrt_base_plate_y;
+				final double ball_pos_base_z = target_pos_wrt_base_plate_z;		
+				final double vee_pos_base_x = ball_pos_base_x + BasePlate.base_plate_width;
+				final double vee_pos_base_y = ball_pos_base_y;
+				final double vee_pos_base_z = ball_pos_base_z;
+				final double flat_pos_base_x = ball_pos_base_x;
+				final double flat_pos_base_y = ball_pos_base_y;
+				final double flat_pos_base_z = ball_pos_base_z - BasePlate.base_plate_length;
+				
+				//Unrotated compared to tracking coordinates position
+//				final double ball_pos_base_x = 100;
+//				final double ball_pos_base_y = 0;
+//				final double ball_pos_base_z = 0;		

 //				final double vee_pos_base_x = ball_pos_base_x + BasePlate.base_plate_width;
 //				final double vee_pos_base_y = ball_pos_base_y;
 //				final double vee_pos_base_z = ball_pos_base_z;
 //				final double flat_pos_base_x = ball_pos_base_x;

-//				final double flat_pos_base_y = ball_pos_base_y;
-//				final double flat_pos_base_z = ball_pos_base_z - BasePlate.base_plate_length;

+//				final double flat_pos_base_y = ball_pos_base_y + BasePlate.base_plate_length;
+//				final double flat_pos_base_z = ball_pos_base_z;

-				//Unrotated compared to tracking coordinates position
-				final double ball_pos_base_x = 0;
-				final double ball_pos_base_y = 0;
-				final double ball_pos_base_z = 0;		
-				final double vee_pos_base_x = ball_pos_base_x + BasePlate.base_plate_width;
-				final double vee_pos_base_y = ball_pos_base_y;
-				final double vee_pos_base_z = ball_pos_base_z;
-				final double flat_pos_base_x = ball_pos_base_x;
-				final double flat_pos_base_y = ball_pos_base_y + BasePlate.base_plate_length;
-				final double flat_pos_base_z = ball_pos_base_z;

+				

 				setBallPos(ball_pos_base_x,ball_pos_base_y,ball_pos_base_z);
 				setVeePos(vee_pos_base_x,vee_pos_base_y,vee_pos_base_z);
 				setFlatPos(flat_pos_base_x, flat_pos_base_y, flat_pos_base_z);

+				
+//				Rotation r = new Rotation(org.apache.commons.math3.geometry.euclidean.threed.RotationOrder.XYZ, Math.PI/4, 0, 0);
+//                Vector3D b = r.applyTo(new Vector3D(this.ballPos.v()));
+//                Vector3D v = r.applyTo(new Vector3D(this.veePos.v()));
+//                Vector3D f = r.applyTo(new Vector3D(this.flatPos.v()));
+//                setBallPos(b.getX(), b.getY(), b.getZ());
+//                setVeePos(v.getX(), v.getY(), v.getZ());
+//                setFlatPos(f.getX(), f.getY(), f.getZ());
+                
+                
+				

 			}
 			protected void setCoord() {
 				setCoord(null);
 			}
 			protected void setCenter() {

-				//setCenter(base_width/2.0, base_length/2.0, base_height/2.0 - BasePlate.base_plate_thickness);
-				setCenter(0,0,0);

+				setCenter(base_width/2.0, base_length/2.0, base_height/2.0 - BasePlate.base_plate_thickness);
+				//setCenter(0,0,0);

 			}
 			protected void setBoxDim() {
 				setBoxDim(base_width,base_length,base_height);
 			}
 		}
 

-		

+		*/

@@ -80,7 +96,7 @@

-		

+		/*

 		public static class TestRunHalfModuleAxial extends HPSTestRunTracker2014GeometryDefinition.TestRunHalfModuleAxial {
 
 			public TestRunHalfModuleAxial(String name, HPSTestRunTracker2014GeometryDefinition.BaseGeometry mother, int layer, String half) {

@@ -119,7 +135,9 @@

 			}
 			
 		}

+		*/

+		/*

 		public static class Sensor extends HPSTestRunTracker2014GeometryDefinition.Sensor {
 
 			public Sensor(String name, BaseGeometry m, int id) {

@@ -131,7 +149,15 @@

 				// using SiStrips convention
 				setBallPos(0,0,0);
 				setVeePos(ballPos.x(), ballPos.y(), ballPos.z() + getSensorWidth()/2.0);

-				setFlatPos(ballPos.x() + getSensorLength()/2.0,ballPos.y(), ballPos.z());					

+				setFlatPos(ballPos.x() + getSensorLength()/2.0,ballPos.y(), ballPos.z());		
+//				Rotation r = new Rotation(org.apache.commons.math3.geometry.euclidean.threed.RotationOrder.XYZ, Math.PI/4, 0, 0);
+//				Vector3D b = r.applyTo(new Vector3D(this.ballPos.v()));
+//				Vector3D v = r.applyTo(new Vector3D(this.veePos.v()));
+//				Vector3D f = r.applyTo(new Vector3D(this.flatPos.v()));
+//                setBallPos(b.getX(), b.getY(), b.getZ());
+//                setVeePos(v.getX(), v.getY(), v.getZ());
+//                setFlatPos(f.getX(), f.getY(), f.getZ());
+//                

 				// default convention
 				//setBallPos(0,0,0);
 				//setVeePos(ballPos.x() + getSensorLength()/2.0, ballPos.y(), ballPos.z());

@@ -148,6 +174,7 @@

 			}
 
 		}

+		*/

 	
 }