Author: [log in to unmask]
Date: Fri Jun 5 09:25:49 2015
New Revision: 3092
Log:
add list of MP parameters for debug
Modified:
java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/AlignmentCorrection.java
java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java
Modified: java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/AlignmentCorrection.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/AlignmentCorrection.java (original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/AlignmentCorrection.java Fri Jun 5 09:25:49 2015
@@ -1,4 +1,6 @@
package org.lcsim.geometry.compact.converter;
+
+import java.util.List;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
@@ -15,6 +17,7 @@
public class AlignmentCorrection {
private Rotation rotation = null;
private Hep3Vector translation = null;
+ private List<MilleParameter> milleParameters = null;
public AlignmentCorrection(double x, double y, double z, double rot_x, double rot_y, double rot_z) {
setTranslation(x, y, z);
setRotation(rot_x, rot_y, rot_z);
@@ -44,5 +47,12 @@
public void setTranslation(double x, double y, double z) {
setTranslation(new BasicHep3Vector(x,y,z));
}
+ public void setMilleParameters(List<MilleParameter> params) {
+ milleParameters = params;
+ }
+ public List<MilleParameter> getMilleParameters(){
+ return milleParameters;
+ }
+
}
Modified: java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java
=============================================================================
--- java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java (original)
+++ java/trunk/detector-model/src/main/java/org/lcsim/geometry/compact/converter/SurveyVolume.java Fri Jun 5 09:25:49 2015
@@ -305,6 +305,18 @@
if( getBoxDim()!=null) s += "Box dimensions: " + getBoxDim().toString() + "\n";
if(this.coord==null) s += " No coord system \n";
else s += "Coordinate system:" + getCoord().toString() + "\n";
+ s += "AlignmentCorrections: \n";
+ if(this.alignmentCorrections!=null) {
+ s += "Milleparameters: ";
+ if(this.alignmentCorrections.getMilleParameters()!=null) {
+ for(MilleParameter mp : this.alignmentCorrections.getMilleParameters()) s += mp.getId() + " ";
+ } else {
+ s += "no MP params associated.";
+ }
+ s += "(" + this.getName() + ")" + " \n";
+ } else {
+ s+= " no alignment corrections associated.\n";
+ }
SurveyVolume m = getMother();
while(m!=null) {
Hep3Vector origin_m = HPSTrackerBuilder.transformToParent(new BasicHep3Vector(0, 0, 0), this, m.getName());
@@ -313,6 +325,7 @@
s += String.format("%s origin in %s : (%.4f %.4f %.4f) (inch)\n",getName(), m.getName(), origin_m.x(),origin_m.y(),origin_m.z());
m = m.getMother();
}
+
return s;
}
|