Print

Print


Commit in lcsim/src/org/lcsim/recon/cluster/density on MAIN
PFlow.java+19-71.4 -> 1.5
GL: update

lcsim/src/org/lcsim/recon/cluster/density
PFlow.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- PFlow.java	29 Sep 2005 19:08:37 -0000	1.4
+++ PFlow.java	7 Dec 2005 19:08:38 -0000	1.5
@@ -11,6 +11,7 @@
 import org.lcsim.util.loop.LCIODriver;
 import org.lcsim.util.loop.LCSimLoop;
 import org.lcsim.recon.cluster.cheat.CheatClusterDriver;
+import org.lcsim.recon.cluster.util.CalHitMapDriver;
 
 public class PFlow extends Driver {
 
@@ -40,11 +41,9 @@
 // 	loop.add( new LCIODriver( new File("output.slcio") );
 
         System.out.println("Starting loop over events");
-        loop.loop(3); // -1 for all
+        loop.loop(56); // -1 for all
 
 	loop.dispose();
-        _tree.commit();
-
 	org.lcsim.util.aida.AIDA.defaultInstance().saveAs("myhistos.aida");
 	System.out.println("Analyzed "+ pflow._nevt +" events.");
     }
@@ -72,9 +71,17 @@
       _cheater = new CheatClusterDriver();
       add(_cheater);
 
-      prepareNtupleFactory();
-      _anal = new DirectedTree(_tf,_tree);
-      add(_anal);
+      _expert = new CalHitMapDriver();
+      add(_expert);
+
+      _dtree = new DirectedTreeClusterer();
+      add(_dtree);
+
+      _trkmatch = new TrackMatching();
+      add(_trkmatch);
+
+      _lyze = new DTreeAnalysis();
+      add(_lyze);
     }
 
     public void prepareNtupleFactory() throws IOException{
@@ -94,5 +101,10 @@
     private int _nevt = 0;
     private LoadMyCalorimeterHit _calhit;
     private CheatClusterDriver _cheater;
-    private DirectedTree _anal;
+//     private DirectedTree _dtree;
+    private DirectedTreeClusterer _dtree;
+    private TrackMatching _trkmatch;
+    private DTreeAnalysis _lyze;
+//     private Analyze _lyze;
+    private CalHitMapDriver _expert;
 }
CVSspam 0.2.8