diff -u -r1.5 -r1.6
--- SetUpDTreeForReclustering.java	12 Aug 2008 23:46:55 -0000	1.5
+++ SetUpDTreeForReclustering.java	15 Aug 2008 22:13:59 -0000	1.6
@@ -51,7 +51,22 @@

 	    }
 	}
 

-

+	// 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) {

@@ -60,25 +75,20 @@

 	    org.lcsim.contrib.uiowa.RonPhotonFinder.RonPhotonFinderSid01 photonFinderEcalEndcap = new org.lcsim.contrib.uiowa.RonPhotonFinder.RonPhotonFinderSid01("EcalEndcapDigiHitMap", "EcalEndcapDigiHitMapWithoutPhotons", "EcalEndcapPhotonClusters");
 	    add(photonFinderEcalBarrel);
 	    add(photonFinderEcalEndcap);

+	    add(new TransientFlagDriver("EcalBarrPhotonClusters"));
+	    add(new TransientFlagDriver("EcalEndcapPhotonClusters"));

 	    // Merge to a single list of photons
 	    ListAddDriver<Cluster> mergePhotonClusters = new ListAddDriver<Cluster>(Cluster.class);
 	    mergePhotonClusters.addInputList("EcalBarrPhotonClusters");
 	    mergePhotonClusters.addInputList("EcalEndcapPhotonClusters");
 	    mergePhotonClusters.setOutputList("PhotonClustersForDTree");
 	    add(mergePhotonClusters);

+	    add(new TransientFlagDriver("PhotonClustersForDTree"));

 	} else {

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

 	    // Make photons in barrel & endcap together
 	    org.lcsim.contrib.Cassell.recon.DTPhotons.RonDTPhotonFinderSid01 photonFinder = new org.lcsim.contrib.Cassell.recon.DTPhotons.RonDTPhotonFinderSid01("EcalDigiHitMap", "EcalDigiHitMapWithoutPhotons", "PhotonClustersForDTree");
 	    add(photonFinder);

+	    add(new TransientFlagDriver("PhotonClustersForDTree"));

 	    // Split back into barrel & endcap
 	    // This is a little fiddly -- need to do one subtraction to 
 	    // identify the photon hits, then a second to remove the photon

@@ -121,6 +131,10 @@

 	    add(treeDriverEcalEndcap);
 	    add(treeDriverHcalBarr);
 	    add(treeDriverHcalEndcap);

+	    add(new TransientFlagDriver("EcalBarrDTrees"));
+	    add(new TransientFlagDriver("EcalEndcapDTrees"));
+	    add(new TransientFlagDriver("HcalBarrDTrees"));
+	    add(new TransientFlagDriver("HcalEndcapDTrees"));

 	}
 
 	// Run DTree on MUCAL -- this is currently rather tricky.

@@ -135,6 +149,8 @@

 	    mstMcalEndcap.registerMetrics(new org.lcsim.recon.cluster.mst.MinimumHitToHitDistance());
 	    add(mstMcalBarrel);
 	    add(mstMcalEndcap);

+	    add(new TransientFlagDriver("MuonBarrDTrees"));
+	    add(new TransientFlagDriver("MuonEndcapDTrees"));

 	}
 
 	// Run DTree on FCAL -- this is currently rather tricky.

@@ -144,6 +160,7 @@

 	    mstFcalEndcap.setThreshold(12.5); // 3.5x3.5cm segmentation transversely, 3.7mm longitudinally
 	    mstFcalEndcap.registerMetrics(new org.lcsim.recon.cluster.mst.MinimumHitToHitDistance());
 	    add(mstFcalEndcap);

+	    add(new TransientFlagDriver("ForwardEcalEndcapDTrees"));

 	}
 
 	// Merge & write out

@@ -153,24 +170,28 @@

 	    mergeDTreeClustersECAL.addInputList("EcalEndcapDTrees");
 	    mergeDTreeClustersECAL.setOutputList("DTreeClustersECAL");
 	    add(mergeDTreeClustersECAL);

+	    add(new TransientFlagDriver("DTreeClustersECAL"));

 
 	    ListAddDriver<Cluster> mergeDTreeClustersHCAL = new ListAddDriver<Cluster>(Cluster.class);
 	    mergeDTreeClustersHCAL.addInputList("HcalBarrDTrees");
 	    mergeDTreeClustersHCAL.addInputList("HcalEndcapDTrees");
 	    mergeDTreeClustersHCAL.setOutputList("DTreeClustersHCAL");
 	    add(mergeDTreeClustersHCAL);

+	    add(new TransientFlagDriver("DTreeClustersHCAL"));

 
 	    ListAddDriver<Cluster> mergeDTreeClustersMCAL = new ListAddDriver<Cluster>(Cluster.class);
 	    //mergeDTreeClustersMCAL.addInputList("MuonBarrDTrees");
 	    mergeDTreeClustersMCAL.addInputList("MuonEndcapDTrees");
 	    mergeDTreeClustersMCAL.setOutputList("DTreeClustersMCAL");
 	    add(mergeDTreeClustersMCAL);

+	    add(new TransientFlagDriver("DTreeClustersMCAL"));

 
 	    if (useForwardEcal) {
 		ListAddDriver<Cluster> mergeDTreeClustersFCAL = new ListAddDriver<Cluster>(Cluster.class);
 		mergeDTreeClustersFCAL.addInputList("ForwardEcalEndcapDTrees");
 		mergeDTreeClustersFCAL.setOutputList("DTreeClustersFCAL");
 		add(mergeDTreeClustersFCAL);

+		add(new TransientFlagDriver("DTreeClustersFCAL"));

 	    }
 
 	    ListAddDriver<Cluster> mergeDTreeClusters = new ListAddDriver<Cluster>(Cluster.class);

@@ -182,6 +203,7 @@

 	    }
 	    mergeDTreeClusters.setOutputList("DTreeClusters");
 	    add(mergeDTreeClusters);

+	    add(new TransientFlagDriver("DTreeClusters"));

 	}
     }
 }