diff -u -r1.3 -r1.4
--- JetFinding.java	8 Sep 2005 00:32:23 -0000	1.3
+++ JetFinding.java	6 Jan 2006 22:46:03 -0000	1.4
@@ -1,12 +1,8 @@

-import hep.physics.jet.JadeEJetFinder;
-import hep.physics.jet.JetFinder;
-import hep.physics.vec.HepLorentzVector;
-import java.util.HashMap;

 import java.util.List;

-import java.util.Map;

 import org.lcsim.event.EventHeader;

-import hep.physics.particle.Particle;
-import org.lcsim.event.MCParticle;

+import org.lcsim.event.ReconstructedParticle;
+import org.lcsim.event.util.JetDriver;
+import org.lcsim.mc.fast.MCFast;

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

@@ -15,26 +11,22 @@

 public class JetFinding extends Driver
 {
    private AIDA aida = AIDA.defaultInstance();

+   public JetFinding()
+   {
+      add(new MCFast());
+      add(new JetDriver());
+   }

    
    protected void process(EventHeader event)
    {

-      // The MCParticles themselves are not 4-vectors (may they should be?)
-      // We convert them to four vectors, choosing only the charged ones,
-      // and then feed them to the jet finder.

+      super.process(event);

-      Map<HepLorentzVector,MCParticle> map = new HashMap<HepLorentzVector,MCParticle>();
-      List<MCParticle> particles = event.getMCParticles();
-      
-      for (MCParticle particle : particles)

+      List<ReconstructedParticle> jets = event.get(ReconstructedParticle.class,"Jets");
+      aida.cloud1D("nJets").fill(jets.size());
+      for (ReconstructedParticle jet : jets)

       {

-         if (particle.getCharge() != 0 && particle.getGeneratorStatus() == Particle.FINAL_STATE)
-         {
-            map.put(particle.asFourVector(),particle);
-         }

+         List<ReconstructedParticle> particlesInJet = jet.getParticles();
+         aida.cloud1D("nParticles").fill(particlesInJet.size());         

       }

-      JetFinder jetFinder = new JadeEJetFinder(0.1);
-      jetFinder.setEvent(map.keySet());
-      
-      aida.cloud1D("nJets").fill(jetFinder.njets());

    }
 }