diff -u -r1.1 -r1.2
--- MainLoop.py	1 Aug 2005 04:12:19 -0000	1.1
+++ MainLoop.py	27 Mar 2006 06:38:08 -0000	1.2
@@ -1,26 +1,33 @@

 #! /usr/bin/env jython

-from java.io import File

 from org.lcsim.util import Driver
 from org.lcsim.util.aida import AIDA
 from org.lcsim.util.loop import LCIODriver
 from org.lcsim.util.loop import LCSimLoop
 from org.lcsim.mc.fast import MCFast

-from ZvTubePlotter import ZvTubePlotter

+from java.net import URL
+from org.lcsim.util.cache import FileCache
+from java.io import File
+#from ZvTubePlotter import ZvTubePlotter

 from java.lang import System

+import VertexFitterDriver

 
 def main():
     loop = LCSimLoop()

-    input = File("psiMuMu.slcio")
-    loop.setLCIORecordSource(input)
-    print "adding JasSwimTest"

+    location = URL("ftp://ftp-lcd.slac.stanford.edu/lcd/ILC/ILC500/Zgamma/stdhep/pythia/pythiaZgamma.stdhep")
+#    location = URL("ftp://ftp-lcd.slac.stanford.edu/lcd/ILC/singleParticle/stdhep/psi_mumu_Theta4-176_5-100GeV.stdhep")
+    cache = FileCache()
+    trackFile = cache.getCachedFile(location)
+    loop.setStdhepRecordSource(trackFile, "sidaug05")
+#    loop.setLCIORecordSource(input)

     loop.add(MCFast())

-    loop.add(ZvTubePlotter())

+#    loop.add(ZvTubePlotter())
+    loop.add(VertexFitterDriver())

 #    output = File(System.getProperty("user.home"),"fastmc.slcio")
 #    loop.add(LCIODriver(output))
     loop.loop(-1)
     loop.dispose()
 

-#    AIDA.defaultInstance().saveAs("fastmc.aida")

+    AIDA.defaultInstance().saveAs("fastmc.aida")

 
 if __name__ == "__main__":
     main()

diff -u -r1.1 -r1.2
--- VertexFitterDriver.java	27 Mar 2006 00:00:22 -0000	1.1
+++ VertexFitterDriver.java	27 Mar 2006 06:38:08 -0000	1.2
@@ -3,11 +3,9 @@

  *
  * Created on March 25, 2006, 3:15 PM
  *

- *@version $Id: VertexFitterDriver.java,v 1.1 2006/03/27 00:00:22 jstrube Exp $

+ *@version $Id: VertexFitterDriver.java,v 1.2 2006/03/27 06:38:08 jstrube Exp $

  */
 

-package org.lcsim.contrib.JanStrube;
-

 import hep.aida.IAnalysisFactory;
 import hep.aida.ITuple;
 import hep.aida.ITupleFactory;

@@ -33,7 +31,7 @@

     private ITupleFactory tf = af.createTupleFactory(aida.tree());
     private ITuple tuple;
     private VertexFitter fitter;

-    private int primaryParticle = 13;

+    private int primaryParticle = 23; // 443;

     private SpacePoint primaryVertex;
     public VertexFitterDriver() {
         String[] names = new String[]{"chi2", "fittedX", "fittedY", "fittedZ", "xError", "yError", "zError", "primaryX", "primaryY", "primaryZ"};

@@ -43,6 +41,7 @@

     }
     
     public void process(EventHeader event) {

+    	System.out.println("Processing Event " + event.getEventNumber());

         List<MCParticle> particles = event.getMCParticles();
         List<Track> tracks = event.getTracks();
         if (tracks.size() != 2)

@@ -52,16 +51,17 @@

                 if (iPart.getPDGID() == primaryParticle)
                     primaryVertex = new SpacePoint(iPart.getEndPoint());
         }

-        Vertex vertex = fitter.fit(tracks, new CartesianPoint(0, 0, 0), true);
-        tuple.fill(0, vertex._chi2);
-        tuple.fill(1, vertex._xyzf[0]);
-        tuple.fill(2, vertex._xyzf[1]);
-        tuple.fill(3, vertex._xyzf[2]);
-        tuple.fill(4, vertex._vcov[0]);
-        tuple.fill(5, vertex._vcov[3]);
-        tuple.fill(6, vertex._vcov[5]);
-        tuple.fill(7, primaryVertex.x());
-        tuple.fill(8, primaryVertex.y());
-        tuple.fill(9, primaryVertex.z());

+        Vertex vertex = fitter.fit(tracks, new CartesianPoint(0, 0, 0), false);
+        tuple.fill(0, (float)vertex._chi2);
+        tuple.fill(1, (float)vertex._xyzf[0]);
+        tuple.fill(2, (float)vertex._xyzf[1]);
+        tuple.fill(3, (float)vertex._xyzf[2]);
+        tuple.fill(4, (float)vertex._vcov[0]);
+        tuple.fill(5, (float)vertex._vcov[3]);
+        tuple.fill(6, (float)vertex._vcov[5]);
+        tuple.fill(7, (float)primaryVertex.x());
+        tuple.fill(8, (float)primaryVertex.y());
+        tuple.fill(9, (float)primaryVertex.z());
+	tuple.addRow();

     }
 }

diff -u -r1.4 -r1.5
--- ZvTopDriver.java	8 Nov 2005 23:39:31 -0000	1.4
+++ ZvTopDriver.java	27 Mar 2006 06:38:08 -0000	1.5
@@ -21,6 +21,12 @@

 import org.lcsim.util.aida.AIDA;
 import org.lcsim.util.swim.HelixSwimmer;
 

+/*
+ * Puts Vertices and the associated Tracks into the event cache
+ * for WIRED4 to pick up
+ * @author jstrube
+ * @version $Id$
+ */

 public class ZvTopDriver extends Driver {
     private HelixSwimmer swimmer;
     private ZvFitter fitter;