hps-java/src/main/java/org/lcsim/hps/users/phansson

diff -u -r1.19 -r1.20
--- TwoTrackAnlysis.java	27 Jun 2013 00:28:04 -0000	1.19
+++ TwoTrackAnlysis.java	12 Jul 2013 23:13:15 -0000	1.20
@@ -58,6 +58,7 @@

     private String MCParticleCollectionName = "MCParticle";
     private String _stripClusterCollectionName = "StripClusterer_SiTrackerHitStrip1D";
     private String _fittedRawTrackerHitCollectionName = "SVTFittedRawTrackerHits";

+    private double targetPosition = SvtTrackExtrapolator.HARP_POSITION;

     private boolean _debug;
     private HitIdentifier _ID = new HitIdentifier();
     private TwoTrackVertexer vertexer = new TwoTrackVertexer();

@@ -131,6 +132,10 @@

         trackCollectionName = name;
     }
     

+    public void setTargetPosition(double pos) {
+        targetPosition = pos;
+    }
+    

 
     
     public TwoTrackAnlysis() {

@@ -204,7 +209,7 @@

                 }
                 tracks.add(new CmpTrack(trk));
             } else {

-               if(_debug) System.out.println(this.getClass().getSimpleName() + ": trk failed track selections " + event.getEventNumber() + "\n" + trk.toString());

+               if(_debug) System.out.println(this.getClass().getSimpleName() + ": trk failed track selections (event nr " + event.getEventNumber() + ")\n" + trk.toString());

             }
         }
         

@@ -270,7 +275,7 @@

             this._vtxposnonb_z.fill(vtxNonBend[0].z());
 
             this._vtxposnonb_xAtZ0.fill(slts[0].calculateXYAtZ(0.)[0]);

-            this._vtxposnonb_zAtTarget.fill(slts[0].getYZAtX(SvtTrackExtrapolator.HARP_POSITION)[1]);

+            this._vtxposnonb_zAtTarget.fill(slts[0].getYZAtX(this.targetPosition)[1]);

             this._vtxposnonb_angle1.fill(Math.atan(slts[0].dzdx()));
             this._vtxposnonb_angle2.fill(Math.atan(slts[1].dzdx()));
             

@@ -386,7 +391,7 @@

         }
             
         

-        System.out.println("printWriter out: " + printWriter.toString());

+        System.out.printf("%s: printWriter close \n",this.getClass().getSimpleName());

         printWriter.close();
         try {
             fileWriter.close();

@@ -659,10 +664,7 @@

         List<HelicalTrackHit> stereoHits = new ArrayList<HelicalTrackHit>();
         if(event.hasCollection(HelicalTrackHit.class, stereoHitCollectionName)) {
             stereoHits = event.get(HelicalTrackHit.class, stereoHitCollectionName);

-        } else {
-            System.out.printf("%s: no collection with stereo hits? \"%s\"\n",this.getClass().getSimpleName(),this.stereoHitCollectionName);
-
-        }

+        } 

 
        
         HashMap<Integer,List<HelicalTrackHit>> allstereohits = getAllStereoHitsMap(stereoHits,true);