diff -u -r1.43 -r1.44
--- ReclusterDTreeDriver.java	15 Aug 2008 22:16:19 -0000	1.43
+++ ReclusterDTreeDriver.java	18 Aug 2008 21:50:59 -0000	1.44
@@ -34,7 +34,7 @@

   * in this package, which uses the implementation in
   * org.lcsim.recon.cluster.directedtree developed by NIU).
   *

-  * @version $Id: ReclusterDTreeDriver.java,v 1.43 2008/08/15 22:16:19 mcharles Exp $

+  * @version $Id: ReclusterDTreeDriver.java,v 1.44 2008/08/18 21:50:59 mcharles Exp $

   * @author Mat Charles <[log in to unmask]>
   */
 

@@ -88,7 +88,8 @@

 
     protected boolean m_debugSeedSplitting = false;
 

-    protected boolean m_useMucal = true;

+    protected boolean m_useMucalBarrel = false;
+    protected boolean m_useMucalEndcap = true;

     protected boolean m_useFcal = false;
 
     public void writeExtraEventOutput(boolean writeExtra) {

@@ -151,7 +152,7 @@

 	add(new TransientFlagDriver("BlocksInsideTreesHCAL"));
 	add(new TransientFlagDriver("LeftoverHitsInsideTreesHCAL"));
 	// Write out mucal, fcal if needed:

-	if (m_useMucal) {

+	if (m_useMucalBarrel || m_useMucalEndcap) {

 	    add(clusDriverMCAL);
 	    add(new TransientFlagDriver("OldMipsInsideTreesMCAL"));
 	    add(new TransientFlagDriver("NewMipsInsideTreesMCAL"));

@@ -201,8 +202,10 @@

 	List<CalorimeterHit> allHitsMcalBarrel = null;
 	List<CalorimeterHit> allHitsMcalEndcap = null;
 	List<CalorimeterHit> allHitsFcalEndcap = null;

-	if (m_useMucal) {

+	if (m_useMucalBarrel) {

 	    allHitsMcalBarrel = m_event.get(CalorimeterHit.class, "MuonBarrHits");

+	}
+	if (m_useMucalEndcap) {

 	    allHitsMcalEndcap = m_event.get(CalorimeterHit.class, "MuonEndcapHits");
 	}
 	if (m_useFcal) {

@@ -214,8 +217,10 @@

 	allHits.addAll(allHitsEcalEndcap);
 	allHits.addAll(allHitsHcalBarrel);
 	allHits.addAll(allHitsHcalEndcap);

-	if (m_useMucal) {

+	if (m_useMucalBarrel) {

 	    allHits.addAll(allHitsMcalBarrel);

+	}
+	if (m_useMucalEndcap) {

 	    allHits.addAll(allHitsMcalEndcap);
 	}
 	if (m_useFcal) {

@@ -245,7 +250,7 @@

 	leftoverHitClusters.addAll(event.get(Cluster.class, "LeftoverHitsInsideTreesHCAL"));
 	treesWithNoStructure.addAll(event.get(Cluster.class, "BlocksInsideTreesECAL"));
 	treesWithNoStructure.addAll(event.get(Cluster.class, "BlocksInsideTreesHCAL"));

-	if (m_useMucal) {

+	if (m_useMucalBarrel || m_useMucalEndcap) {

 	    mipsOld.addAll(event.get(Cluster.class, "OldMipsInsideTreesMCAL"));
 	    mipsNew.addAll(event.get(Cluster.class, "NewMipsInsideTreesMCAL"));
 	    clumps.addAll(event.get(Cluster.class, "ClumpsInsideTreesMCAL"));

@@ -277,7 +282,7 @@

 	Map<Cluster, Cluster> treeOfSharedClusterMCAL = null;
 	Map<Cluster, List<Cluster>> targetsInTreeFCAL = null;
 	Map<Cluster, Cluster> treeOfSharedClusterFCAL = null;

-	if (m_useMucal) {

+	if (m_useMucalBarrel || m_useMucalEndcap) {

 	    targetsInTreeMCAL = ((Map<Cluster, List<Cluster>>)(event.get("MapTreeToTargetsMCAL")));
 	    treeOfSharedClusterMCAL = ((Map<Cluster, Cluster>)(event.get("MapSharedToTreeMCAL")));
 	}

@@ -292,7 +297,7 @@

 	targetsInTree.putAll(targetsInTreeHCAL);
 	treeOfSharedCluster.putAll(treeOfSharedClusterECAL);
 	treeOfSharedCluster.putAll(treeOfSharedClusterHCAL);

-	if (m_useMucal) {

+	if (m_useMucalBarrel || m_useMucalEndcap) {

 	    targetsInTree.putAll(targetsInTreeMCAL);
 	    treeOfSharedCluster.putAll(treeOfSharedClusterMCAL);
 	}

@@ -735,13 +740,13 @@

 			leftoverHitClustersToShare.add(tmpClus);
 			boolean hitECAL = (allHitsEcalBarrel.contains(hit) || allHitsEcalEndcap.contains(hit));
 			boolean hitHCAL = (allHitsHcalBarrel.contains(hit) || allHitsHcalEndcap.contains(hit));

-			boolean hitMCAL = m_useMucal && (allHitsMcalBarrel.contains(hit) || allHitsMcalEndcap.contains(hit));

+			boolean hitMCAL = (m_useMucalBarrel && allHitsMcalBarrel.contains(hit)) || (m_useMucalEndcap && allHitsMcalEndcap.contains(hit));

 			boolean hitFCAL = m_useFcal && (allHitsFcalEndcap.contains(hit));
 			if (hitECAL) {
 			    leftoverHitClustersToShareECAL.add(tmpClus);
 			} else if (hitHCAL) {
 			    leftoverHitClustersToShareHCAL.add(tmpClus);

-			} else if (hitMCAL && m_useMucal) {

+			} else if (hitMCAL && (m_useMucalBarrel || m_useMucalEndcap)) {

 			    leftoverHitClustersToShareMCAL.add(tmpClus);
 			} else if (hitFCAL && m_useFcal) {
 			    leftoverHitClustersToShareFCAL.add(tmpClus);

@@ -1007,7 +1012,7 @@

 	    throw new AssertionError("Unhandled case!");
 	}
 	// Muon hit sharing...

-	if (m_useMucal) {

+	if (m_useMucalBarrel || m_useMucalEndcap) {

 	    DTreeClusterSharingAlgorithm dTreeSharingAlgMCAL = new DTreeClusterSharingAlgorithm(treeOfSharedCluster, targetsInTree, 50.0, maxDistanceForDTreeClustersMCAL);
 	    SharedClusterGroup sharedLeftoverHitClustersMCAL = new SharedClusterGroup(leftoverHitClustersToShareMCAL, dTreeSharingAlgMCAL);
 	    sharedLeftoverHitClustersMCAL.createShares(linkableClusters);