Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/JetFinder on MAIN
Wrapper.java+21.3 -> 1.4
JetDriverExtended.java+4-21.4 -> 1.5
JetFinder.java+1-21.4 -> 1.5
+7-4
3 modified files
Update my directory to sync with other computers

lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/JetFinder
Wrapper.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Wrapper.java	6 Jul 2009 18:02:11 -0000	1.3
+++ Wrapper.java	7 Jul 2009 21:20:15 -0000	1.4
@@ -26,9 +26,11 @@
            System.out.println("Wrapper"+this.toString()+" launched by "+super.toString()+" and add a new jet finder");
            
            if(analyse){
+               System.out.println("anayse");
              add(JetFinder.defaultInstance());
            }
            else{
+               System.out.println("reconstruction");
             add(new TrackReconstructionDriver());
             add(new JetDriverExtended());
            }

lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/JetFinder
JetDriverExtended.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- JetDriverExtended.java	6 Jul 2009 18:02:11 -0000	1.4
+++ JetDriverExtended.java	7 Jul 2009 21:20:15 -0000	1.5
@@ -26,7 +26,7 @@
  * A simple driver which can be used to find jets from ReconstructedParticles.
  * The resuslting jets are stored in a new collection of ReconstructedParticles.
  * @author tonyj
- * @version $Id: JetDriverExtended.java,v 1.4 2009/07/06 18:02:11 mbussonn Exp $
+ * @version $Id: JetDriverExtended.java,v 1.5 2009/07/07 21:20:15 mbussonn Exp $
  */
 public class JetDriverExtended extends Driver
 {
@@ -36,7 +36,7 @@
    private String outputCollectionName = defaultOutputCollectionName;
    public boolean draw = false;
    private JetFinder finder = defaultJetFinder();
-   List<LCRelation> rc2mc = new ArrayList<LCRelation>();
+   List<LCRelation> rc2mc;
    List<ReconstructedParticle> collectionOfRCP;
 
    /** Creates a new instance of JetFinder with the default properties */
@@ -102,9 +102,11 @@
    {
         System.out.println("processing "+this.getName());
       double totalEnergy=0;
+      
       // Find the input reconstructed Particles
       List<ReconstructedParticle> input = null;
       collectionOfRCP = new ArrayList<ReconstructedParticle>();
+      rc2mc           = new ArrayList<LCRelation>();
 	  if (inputCollectionName ==null)
 	  {
          List<List<ReconstructedParticle>> listOfLists = event.get(ReconstructedParticle.class);

lcsim-contrib/src/main/java/org/lcsim/contrib/Mbussonn/JetFinder
JetFinder.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- JetFinder.java	6 Jul 2009 18:02:11 -0000	1.4
+++ JetFinder.java	7 Jul 2009 21:20:15 -0000	1.5
@@ -45,7 +45,6 @@
     IAnalysisFactory af = IAnalysisFactory.create();
     ITree tree = af.createTreeFactory().create();
     ITupleFactory tf = af.createTupleFactory(tree);
-    private static int xxx;
     private static int JetZDirection                  = 0;
     private static int JetTDirection                  = 1;
     private static int NumberOfParticlePerJet         = 2;
@@ -185,7 +184,7 @@
 					||mcp.getGeneratorStatus()!= MCParticleExtended.FINAL_STATE
 					||Math.abs(mcpx.getEta())>2.5)
                     {
-                    System.out.println("skip  mcp "+ptotal+" nhits"+findable.LayersHit(mcp));
+                    //System.out.println("skip  mcp "+ptotal+" nhits"+findable.LayersHit(mcp));
                     continue;}
                 nfindableMCP++;
                 double angle = getAngle(mmt,jetMomentum);
CVSspam 0.2.8