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

diff -u -r1.9 -r1.10
--- ECalGainDriver.java	31 Aug 2012 01:26:33 -0000	1.9
+++ ECalGainDriver.java	6 Sep 2012 18:03:10 -0000	1.10
@@ -22,7 +22,7 @@

 import org.lcsim.hps.monitoring.Resettable;
 import org.lcsim.hps.recon.ecal.HPSEcalCluster;
 import org.lcsim.hps.recon.tracking.EcalTrackMatch;

-import org.lcsim.hps.users.omoreno.ExtendTrack;

+import org.lcsim.hps.recon.tracking.SvtTrackExtrapolator;

 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 

@@ -270,11 +270,11 @@

 
         for (Track track : tracks) {
             BaseTrack trk = (BaseTrack) track;

-//            trk.setTrackParameters(trk.getTrackStates().get(0).getParameters(), -0.491);

+            trk.setTrackParameters(trk.getTrackStates().get(0).getParameters(), -0.491);

             if (debug) {

-                ExtendTrack extender = new ExtendTrack();

+                SvtTrackExtrapolator extender = new SvtTrackExtrapolator();

                 extender.setTrack(trk);

-                if (extender.positionAtEcal().z() > 0) {

+                if (extender.getTrackPositionAtEcal().y() > 0) {

                     trTop++;
                 } else {
                     trBot++;

@@ -297,9 +297,9 @@

 
             System.out.println(tracks.size() + " tracks in this event");
             for (Track track : tracks) {

-                ExtendTrack extender = new ExtendTrack();

+                SvtTrackExtrapolator extender = new SvtTrackExtrapolator();

                 extender.setTrack(track);

-                System.out.println(extender.positionAtEcal());

+                System.out.println(extender.getTrackPositionAtEcal());

             }
         }
 

@@ -333,9 +333,9 @@

                 if (debug) {
                     int[] pos = getCrystalPair(bestCl);
                     System.out.format("Matched cluster: [%f\t%f\t%f], ix = %d, iy = %d\n", bestCl.getPosition()[2], bestCl.getPosition()[0], bestCl.getPosition()[1], pos[0], pos[1]);

-                    ExtendTrack extender = new ExtendTrack();

+                    SvtTrackExtrapolator extender = new SvtTrackExtrapolator();

                     extender.setTrack(bestTrk);

-                    System.out.println("Matched track: " + extender.positionAtEcal());

+                    System.out.println("Matched track: " + extender.getTrackPositionAtEcal());

                     System.out.println("Distance: " + minDist);
                 }
                 processMatchedPair(event, bestCl, bestTrk);