lcsim/src/org/lcsim/contrib/uiowa

diff -u -r1.8 -r1.9
--- SetUpDTreeForReclustering.java	22 Sep 2008 23:58:44 -0000	1.8
+++ SetUpDTreeForReclustering.java	28 Sep 2008 06:18:16 -0000	1.9
@@ -51,22 +51,55 @@

 	    }
 	}
 

-	// Merge barrel & endcap hits
-	{
-	    HitMapAddDriver combineEcal = new HitMapAddDriver();
-	    HitMapAddDriver combineHcal = new HitMapAddDriver();
-	    combineEcal.addInputHitMap("EcalBarrDigiHitMap");
-	    combineHcal.addInputHitMap("HcalBarrDigiHitMap");
-	    combineEcal.addInputHitMap("EcalEndcapDigiHitMap");
-	    combineHcal.addInputHitMap("HcalEndcapDigiHitMap");
-	    if (useForwardEcal) {
-		combineEcal.addInputHitMap("ForwardEcalEndcapDigiHitMap"); // Include forward endcap
-	    }
-	    combineEcal.setOutputHitMap("EcalDigiHitMap");
-	    combineHcal.setOutputHitMap("HcalDigiHitMap");
-	    add(combineEcal);
-	    add(combineHcal);
-	}

+        // Find muons
+        {
+            HitMapAddDriver combineCal = new HitMapAddDriver();
+            HitMapAddDriver combineMuDet = new HitMapAddDriver();
+            combineCal.addInputHitMap("EcalBarrDigiHitMap");
+            combineCal.addInputHitMap("HcalBarrDigiHitMap");
+            combineCal.addInputHitMap("EcalEndcapDigiHitMap");
+            combineCal.addInputHitMap("HcalEndcapDigiHitMap");
+            combineMuDet.addInputHitMap("MuonBarrDigiHitMap");
+            combineMuDet.addInputHitMap("MuonEndcapDigiHitMap");
+            combineCal.setOutputHitMap("CalDigiHitMap");
+            combineMuDet.setOutputHitMap("MuDetDigiHitMap");
+            add(combineCal);
+            add(combineMuDet);
+ 
+            org.lcsim.contrib.uiowa.MuonFinder.MuonFinder muonFinder =new org.lcsim.contrib.uiowa.MuonFinder.MuonFinder("FSReconTracks","CalDigiHitMap", "MuDetDigiHitMap", "MuonClustersDigiHitMap", "MuonClusters");
+            add(muonFinder);
+             
+            HitMapSubtractDriver separateEcal1 = new HitMapSubtractDriver("EcalBarrDigiHitMap", "MuonClustersDigiHitMap", "EcalBarrDigiHitMap");
+            HitMapSubtractDriver separateEcal2 = new HitMapSubtractDriver("EcalEndcapDigiHitMap", "MuonClustersDigiHitMap", "EcalEndcapDigiHitMap");
+            HitMapSubtractDriver separateEcal3 = new HitMapSubtractDriver("HcalBarrDigiHitMap", "MuonClustersDigiHitMap", "HcalBarrDigiHitMap");
+            HitMapSubtractDriver separateEcal4 = new HitMapSubtractDriver("HcalEndcapDigiHitMap", "MuonClustersDigiHitMap", "HcalEndcapDigiHitMap");
+            HitMapSubtractDriver separateEcal5 = new HitMapSubtractDriver("MuonBarrDigiHitMap", "MuonClustersDigiHitMap", "MuonBarrDigiHitMap");
+            HitMapSubtractDriver separateEcal6 = new HitMapSubtractDriver("MuonEndcapDigiHitMap", "MuonClustersDigiHitMap", "MuonEndcapDigiHitMap");
+
+            add(separateEcal1); 
+            add(separateEcal2); 
+            add(separateEcal3); 
+            add(separateEcal4); 
+            add(separateEcal5);  
+            add(separateEcal6);
+        }     
+
+        // Merge barrel & endcap hits
+        {
+            HitMapAddDriver combineEcal = new HitMapAddDriver();
+            HitMapAddDriver combineHcal = new HitMapAddDriver();
+            combineEcal.addInputHitMap("EcalBarrDigiHitMap");
+            combineHcal.addInputHitMap("HcalBarrDigiHitMap");
+            combineEcal.addInputHitMap("EcalEndcapDigiHitMap");
+            combineHcal.addInputHitMap("HcalEndcapDigiHitMap");
+            if (useForwardEcal) {
+                combineEcal.addInputHitMap("ForwardEcalEndcapDigiHitMap"); // Include forward endcap
+            }
+            combineEcal.setOutputHitMap("EcalDigiHitMap");
+            combineHcal.setOutputHitMap("HcalDigiHitMap");
+            add(combineEcal);
+            add(combineHcal);
+        }

 
 	// Find photons in ECAL
 	if (useOldRonPhotonFinder) {