lcsim/src/org/lcsim/contrib/niu

diff -u -r1.2 -r1.3
--- UserEnergyCorrections.java	20 Feb 2007 20:38:10 -0000	1.2
+++ UserEnergyCorrections.java	22 May 2007 22:42:40 -0000	1.3
@@ -1,18 +1,11 @@

 package org.lcsim.contrib.niu;
 
 import java.util.Collection;

-import java.util.Set;
-import java.util.HashSet;
-import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;

+

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.Cluster;

-import org.lcsim.geometry.util.BaseIDDecoder;
-import org.lcsim.geometry.IDDecoder;
-import org.lcsim.geometry.Subdetector;
-import org.lcsim.geometry.subdetector.CalorimeterType;

 import org.lcsim.geometry.subdetector.CylindricalCalorimeter;

-import org.lcsim.recon.cluster.directedtree.MyTools;

+import org.lcsim.geometry.util.BaseIDDecoder;

 
 
 /** This class implements user-defined energy calculations and

lcsim/src/org/lcsim/recon/cluster/directedtree

diff -u -r1.9 -r1.10
--- DirectedTreeClusterer.java	2 Aug 2006 19:07:56 -0000	1.9
+++ DirectedTreeClusterer.java	22 May 2007 22:42:40 -0000	1.10
@@ -1,13 +1,17 @@

 package org.lcsim.recon.cluster.directedtree;
 

-import java.util.*;
-import org.lcsim.recon.cluster.util.Clusterer;

+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.Cluster;
 import org.lcsim.geometry.IDDecoder;
 import org.lcsim.geometry.subdetector.CylindricalCalorimeter;

-import org.lcsim.geometry.subdetector.CalorimeterType;

 import org.lcsim.recon.cluster.util.CalorimeterHitESort;

+import org.lcsim.recon.cluster.util.Clusterer;

 
 public class DirectedTreeClusterer implements Clusterer {
 

@@ -102,17 +106,20 @@

 
 	    // Identify calorimeter type for component-specific config
 	    CylindricalCalorimeter cal = (CylindricalCalorimeter)ihit.getSubdetector();

-	    CalorimeterType type = cal.getCalorimeterType();
-	    if( type.isEcal() ) _calType = "EM";
-	    if( type.isHcal() ) _calType = "HD";
-	    if( !type.isEcal() && !type.isHcal() ) {

+        // CalorimeterType has been removed.
+        // None of the production compact models
+        // used this feature anyways.  --JM
+	    //CalorimeterType type = cal.getCalorimeterType();
+	    //if( type.isEcal() ) _calType = "EM";
+	    //if( type.isHcal() ) _calType = "HD";
+	    //if( !type.isEcal() && !type.isHcal() ) {

 		// isXcal() is not implemented... use system number for now
 		int sysno = cal.getSystemID();
 		if(sysno==2 || sysno==6) _calType = "EM";
 		else if(sysno==3 || sysno==7) _calType = "HD";
 		else {
 		    assert false : "*** DirectedTreeClusterer: Unexpected sysno="+sysno;

-		}

+		//}

 	    }
 // 	    System.out.println("calType="+_calType+", isEcal="+type.isEcal()+", isHcal="+type.isHcal());