diff -u -r1.9 -r1.10
--- HPSTrack.java	15 Oct 2013 00:33:53 -0000	1.9
+++ HPSTrack.java	28 Oct 2013 16:42:39 -0000	1.10
@@ -31,8 +31,6 @@

  */
 public class HPSTrack extends HelicalTrackFit {
 

-    public static final double ECAL_FACE = 1450;  // mm
-    public static final double DIPOLE_EDGE = 914; // mm

     private BeamSpot _beam;
     //all of the variables defined below are in the jlab (detector) frame
     //this position & momentum are measured at the DOCA to the Y-axis,

diff -u -r1.5 -r1.6
--- FieldMap.java	21 Sep 2012 23:22:18 -0000	1.5
+++ FieldMap.java	28 Oct 2013 16:42:39 -0000	1.6
@@ -4,7 +4,9 @@

 import java.io.IOException;
 import java.io.Reader;
 import java.util.*;

+

 import org.lcsim.conditions.ConditionsManager;

+import org.lcsim.hps.event.BeamlineConstants;

 import org.lcsim.hps.util.Pair;
 
 /**

@@ -16,8 +18,8 @@

 
     // TODO: Change all pairs such that FPGA is the fist value
     // TODO: Change all map keys to type SiSensor?

-    public static final double DIPOLE_EDGE = 914; // mm
-    public static Map<Pair<Integer/*

+
+	public static Map<Pair<Integer/*

             zbin
              */, Integer/*
             xbin

@@ -154,7 +156,7 @@

         Integer iz, ix;
         int nZ = 150;
         int nX = 25;

-        double zNew = Math.abs(zval - DIPOLE_EDGE / 2);

+        double zNew = Math.abs(zval - BeamlineConstants.DIPOLE_EDGE_TESTRUN / 2);

         double xNew = Math.abs(xval);
         for (iz = 0; iz < nZ; iz++) {
             Pair tmp = fieldBins.get(new Pair(iz, 0));

diff -u -r1.9 -r1.10
--- TrackExtrapolationAnalysis.java	25 Oct 2013 19:43:35 -0000	1.9
+++ TrackExtrapolationAnalysis.java	28 Oct 2013 16:42:39 -0000	1.10
@@ -140,8 +140,8 @@

 
             if (clust != null) {
  //               System.out.println("Cluster Position = ("+clust.getPosition()[0]+","+clust.getPosition()[1]+","+clust.getPosition()[2]+")");

-                double minFringe=HPSTrack.DIPOLE_EDGE-10;
-                double maxFringe=HPSTrack.DIPOLE_EDGE+50;

+                double minFringe=BeamlineConstants.DIPOLE_EDGE_TESTRUN-10;
+                double maxFringe=BeamlineConstants.DIPOLE_EDGE_TESTRUN+50;

 //                Hep3Vector posAtEcalHPS = hpstrk.getPositionAtZ(zCluster, minFringe,maxFringe, 0.1);
 //                Hep3Vector posAtEcalHPS = hpstrk.getPositionAtZMap(750,zCluster, 5.0);
                 double zCluster=clust.getPosition()[2];