Author: [log in to unmask]
Date: Tue May 26 16:44:20 2015
New Revision: 3029
Log:
Use DE name
Modified:
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLFileIO.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLFileIO.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLFileIO.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLFileIO.java Tue May 26 16:44:20 2015
@@ -170,9 +170,13 @@
void printStripTrackPos(Hep3Vector pos) {
addLine(String.format("Strip track pos %.10f %.10f %.10f",pos.x(),pos.y(),pos.z()));
}
-
- void printStrip(int id, int layer) {
- addLine(String.format("New Strip id layer %d %d", id,layer));
+
+ void printStripTrackPosMeasFrame(Hep3Vector pos) {
+ addLine(String.format("Strip track pos meas frame %.10f %.10f %.10f",pos.x(),pos.y(),pos.z()));
+ }
+
+ void printStrip(int id, int layer, String deName) {
+ addLine(String.format("New Strip id layer %d %d %s", id,layer,deName));
}
void printStripPathLen(double s) {
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/gbl/GBLOutput.java Tue May 26 16:44:20 2015
@@ -59,7 +59,7 @@
private TrackerHitUtils _trackerHitUtils = new TrackerHitUtils();
private MaterialSupervisor _materialmanager;
private MultipleScattering _scattering;
- private double _beamEnergy = 2.2; //GeV
+ private double _beamEnergy = 1.1; //GeV
private boolean AprimeEvent = false; // do extra checks
private boolean hasXPlanes = false;
@@ -270,7 +270,7 @@
if(_debug>0) System.out.printf("%s: layer %d millepede %d (DE=\"%s\", origin %s) \n",this.getClass().getSimpleName(),strip.layer(), millepedeId, sensor.getName(), strip.origin().toString());
if(textFile != null) {
- textFile.printStrip(istrip,millepedeId);
+ textFile.printStrip(istrip,millepedeId,de.getName());
}
//GBLDATA
@@ -404,10 +404,15 @@
if(textFile != null) {
textFile.printStripMeas(m_meas.x());
}
+
+ //if(textFile != null) {
+ // textFile.printStripTrackPosMeasFrame(trkpos_meas);
+ //}
+
//GBLDATA
stripData.setMeas(strip.umeas());
- stripData.setTrackPos(trkpos_meas);
+ //stripData.setTrackPos(trkpos_meas);
if(_debug>1) {
System.out.printf("%s: rotation matrix to meas frame\n%s\n", getClass().getSimpleName(), VecOp.toString(trkToStripRot));
|