Author: [log in to unmask]
Date: Fri Dec  5 16:43:24 2014
New Revision: 3440

Log:
edit printouts

Modified:
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyCoordinateSystem.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java

Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java
 =============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java	(original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/JavaSurveyVolume.java	Fri Dec  5 16:43:24 2014
@@ -194,9 +194,19 @@
                 Hep3Vector box_center_envelope_xcheck2_inch = VecOp.mult(0.0393701, box_center_envelope_xcheck2);
                 System.out.printf("%s: box_center_base_xcheck2_in  %s (for %s)\n", this.getClass().getSimpleName(), box_center_envelope_xcheck2_inch==null ? " <null> " : box_center_envelope_xcheck2_inch.toString(),base.getName());
             }
+            Hep3Vector origin = base.getCoord().origin();
+            if(origin!=null) {
+                Hep3Vector origin_in = VecOp.mult(0.0393701, origin);
+                System.out.printf("%s: origin_in               %s (%s)\n", this.getClass().getSimpleName(), origin_in==null ? " <null> " : origin_in.toString(), base.getName());
+            }
+            Hep3Vector origin_base = HPSTrackerBuilder.transformToParent(base.getCoord().origin(), base, "base");
+            if(origin_base!=null) {   
+                Hep3Vector origin_base_in = VecOp.mult(0.0393701, origin_base);
+                System.out.printf("%s: origin_base_in          %s\n", this.getClass().getSimpleName(), origin_base_in==null ? " <null> " : origin_base_in.toString());
+            }
             System.out.printf("%s: euler                       %s\n", this.getClass().getSimpleName(), lcdd_rot_angles.toString());
 			System.out.printf("%s: rot                         %s\n", this.getClass().getSimpleName(), getRot().toString());
-
+			
 			//}
 		
 	}

Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyCoordinateSystem.java
 =============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyCoordinateSystem.java	(original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyCoordinateSystem.java	Fri Dec  5 16:43:24 2014
@@ -126,8 +126,9 @@
         }
 		
         public String toString() {
-			return "Coordinate system: \norigin " + origin.toString() + "\nu " + u.toString() + "\nv " + v.toString() + "\nw " + w.toString();
-		}
+			String str = "origin " + origin.toString() + "\nu " + u.toString() + "\nv " + v.toString() + "\nw " + w.toString();
+			return str;
+        }
 	
 		
 		/**

Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java
 =============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java	(original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java	Fri Dec  5 16:43:24 2014
@@ -53,13 +53,15 @@
 	protected abstract void setBoxDim();
 
 	protected void init() {
-		setPos();
+	    if(debug) System.out.printf("%s: init %s\n",this.getClass().getSimpleName(),getName());
+        setPos();
 		setCoord();
 		applyReferenceTransformation();
 		setCenter();
 		setBoxDim();
 		applyGenericCoordinateSystemCorrections();
 		applyLocalAlignmentCorrections();
+        if(debug) System.out.printf("%s: init %s DONE\n",this.getClass().getSimpleName(),getName());
 	}
 
 	protected void applyGenericCoordinateSystemCorrections() {
@@ -292,7 +294,7 @@
 	}
 	public String toString() {
 		String s = "==\n" + getName() + ":\n";
-		if(getCenter()!=null) s += "Center of box in local coordinates: " + getCenter().toString() + "\n";
+		if(getCenter()!=null) s += "Center of box: " + getCenter().toString() + "\n";
         if( getBoxDim()!=null) s += "Box dimensions: " + getBoxDim().toString() + "\n";
 		s += "Coordinate system:\n" + getCoord().toString() + "\n";
 		return s;

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1