diff -u -r1.1 -r1.2
--- MSTClusterDriver.java	29 Sep 2005 21:03:47 -0000	1.1
+++ MSTClusterDriver.java	1 Oct 2005 01:33:55 -0000	1.2
@@ -15,19 +15,18 @@

 
     private double threshold = 3.0;
     private String calType = "EMCal";

-    private String userTag;

     private String clusterName = "MSTCluster "+calType;
     private Metrics metrics = new GeometricalDistance();
     private boolean useEndcap = false;

-    private DecisionMakerSingle inputDecision = new ClusterNotEmptyDecisionMaker();
-    private DecisionMakerSingle seedDecision = new ClusterNotEmptyDecisionMaker();
-    private DecisionMakerPair pairDecision = new ClusterNotEmptyDecisionMaker();
-    private DecisionMakerSingle outputDecision = new ClusterNotEmptyDecisionMaker();

+    private DecisionMakerSingle<Cluster> inputDecision = new ClusterNotEmptyDecisionMaker();
+    private DecisionMakerSingle<Cluster> seedDecision = new ClusterNotEmptyDecisionMaker();
+    private DecisionMakerPair<Cluster,Cluster> pairDecision = new ClusterNotEmptyDecisionMaker();
+    private DecisionMakerSingle<Cluster> outputDecision = new ClusterNotEmptyDecisionMaker();

     private List<String> listToGet;
 
     public MSTClusterDriver(String inString){
         calType = inString;

-        listToGet = new ArrayList();

+        listToGet = new ArrayList<String>();

         if ( calType == "EMCal" || calType == "all") {
             listToGet.add("EcalBarrHits");
 	    if (useEndcap) listToGet.add("EcalEndcapHits");

@@ -81,16 +80,16 @@

         metrics = inMetrics;
     }
 

-    public void setInputDecision(DecisionMakerSingle decision){

+    public void setInputDecision(DecisionMakerSingle<Cluster> decision){

         inputDecision = decision;}
 

-    public void setSeedDecision(DecisionMakerSingle decision){

+    public void setSeedDecision(DecisionMakerSingle<Cluster> decision){

         seedDecision = decision;}
 

-    public void setPairDecision(DecisionMakerPair decision){

+    public void setPairDecision(DecisionMakerPair<Cluster,Cluster> decision){

         pairDecision = decision;}
 

-    public void setOutputDecision(DecisionMakerSingle decision){

+    public void setOutputDecision(DecisionMakerSingle<Cluster> decision){

         outputDecision = decision;}
 
     public void addUserInputList(String tag){