fix issues in ClusterCleanerUtilities::OverlappingClusterResolver()

Author: tongtongcao

reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/ClusterCleanerUtilities.java

@@ -706,7 +706,7 @@ public FittedCluster SecondariesRemover(DataEvent event, FittedCluster clus, Clu
     public FittedCluster OverlappingClusterResolver(FittedCluster thisclus, List<FittedCluster> clusters) {
         // Get list for overlapped clusters
         List<FittedCluster> overlapingClusters = new ArrayList<>();
-
+        
         for (FittedCluster cls : clusters) {
 
             List<FittedHit> hitOvrl = new ArrayList<>();
@@ -722,7 +722,7 @@ public FittedCluster OverlappingClusterResolver(FittedCluster thisclus, List<Fit
             //test
             boolean passCls = true;
             for (FittedCluster ovr : overlapingClusters) {
-                if (ovr.get_Id() == cls.get_Id()) {
+                if (ovr.equals(cls)) {
                     passCls = false;
                     continue;
                 }
@@ -755,7 +755,7 @@ public FittedCluster OverlappingClusterResolver(FittedCluster thisclus, List<Fit
         }
 
         Collections.sort(overlapingClusters); // Order overlapping clusters; 1st priortiy: cluster size; 2nd priority if same cluster size : fitting quality
-
+         
         // return the largest cluster.
         return overlapingClusters.get(0);
 

reconstruction/dc/src/main/java/org/jlab/rec/dc/cluster/FittedCluster.java

@@ -191,15 +191,16 @@ public void set_Chisq(double _Chisq) {
      */
     @Override
     public int compareTo(FittedCluster o) {
-        if (this.size() > o.size()) {
+        if (this.size() < o.size()) {
             return 1;
         } 
         else if(this.size() == o.size()){
-            if(this.get_fitProb() > o.get_fitProb()) return 1;
-            else return 0;
+            if(this.get_fitProb() < o.get_fitProb()) return 1;
+            else if(this.get_fitProb() == o.get_fitProb()) return 0;
+            else return -1;
         }
         else {
-            return 0;
+            return -1;
         }
     }