Author: [log in to unmask]
Date: Tue Jan 13 18:16:12 2015
New Revision: 1923

Log:
Removed references to EcalClusterIC from event display.

Modified:
    java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PEventViewer.java
    java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/POccupancyViewer.java
    java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PassiveViewer.java

Modified: java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PEventViewer.java
 =============================================================================
--- java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PEventViewer.java	(original)
+++ java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PEventViewer.java	Tue Jan 13 18:16:12 2015
@@ -6,7 +6,6 @@
 import org.hps.monitoring.ecal.eventdisplay.event.Association;
 import org.hps.monitoring.ecal.eventdisplay.event.Cluster;
 import org.hps.monitoring.ecal.eventdisplay.event.EcalHit;
-import org.hps.recon.ecal.HPSEcalCluster;
 import org.lcsim.event.CalorimeterHit;
 
 /**

Modified: java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/POccupancyViewer.java
 =============================================================================
--- java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/POccupancyViewer.java	(original)
+++ java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/POccupancyViewer.java	Tue Jan 13 18:16:12 2015
@@ -6,7 +6,6 @@
 
 import org.hps.monitoring.ecal.eventdisplay.event.Cluster;
 import org.hps.monitoring.ecal.eventdisplay.event.EcalHit;
-import org.hps.recon.ecal.HPSEcalCluster;
 import org.lcsim.event.CalorimeterHit;
 
 /**

Modified: java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PassiveViewer.java
 =============================================================================
--- java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PassiveViewer.java	(original)
+++ java/trunk/ecal-event-display/src/main/java/org/hps/monitoring/ecal/eventdisplay/ui/PassiveViewer.java	Tue Jan 13 18:16:12 2015
@@ -2,9 +2,6 @@
 
 import org.hps.monitoring.ecal.eventdisplay.event.Cluster;
 import org.hps.monitoring.ecal.eventdisplay.event.EcalHit;
-import org.hps.recon.ecal.HPSEcalClusterIC;
-//import org.hps.recon.ecal.HPSEcalCluster;
-//import org.hps.recon.ecal.HPSEcalClusterIC;
 import org.lcsim.event.CalorimeterHit;
 
 /**
@@ -89,45 +86,14 @@
         // Generate a new cluster.
         Cluster panelCluster = new Cluster(ix, iy, energy);
         
-        // If this is an IC cluster, cast it so that shared hits can
-        // be properly displayed.
-        // FIXME: This should be changed to use the standard LCSim Cluster interface.  --JM
-        if(lcioCluster instanceof HPSEcalClusterIC) {
-        	// Cast the cluster object.
-        	HPSEcalClusterIC icCluster = (HPSEcalClusterIC) lcioCluster;
-        	
-	        // Add any component hits to the cluster.
-	        for(CalorimeterHit lcioHit : icCluster.getUniqueHits()) {
-	            // Get the position of the calorimeter hit.
-	            int hix = lcioHit.getIdentifierFieldValue("ix");
-	            int hiy = lcioHit.getIdentifierFieldValue("iy");
-	            
-	            // Add the hit to the cluster.
-	            panelCluster.addComponentHit(hix, hiy);
-	        }
-	        
-	        // Add any shared hits to the cluster.
-	        for(CalorimeterHit lcioHit : icCluster.getSharedHits()) {
-	            // Get the position of the calorimeter hit.
-	            int hix = lcioHit.getIdentifierFieldValue("ix");
-	            int hiy = lcioHit.getIdentifierFieldValue("iy");
-	            
-	            // Add the hit to the cluster.
-	            panelCluster.addSharedHit(hix, hiy);
-	        }
-        }
-        
-        // Otherwise, it just has component hits.
-        else {
-	        // Add any component hits to the cluster.
-	        for(CalorimeterHit lcioHit : lcioCluster.getCalorimeterHits()) {
-	            // Get the position of the calorimeter hit.
-	            int hix = lcioHit.getIdentifierFieldValue("ix");
-	            int hiy = lcioHit.getIdentifierFieldValue("iy");
-	            
-	            // Add the hit to the cluster.
-	            panelCluster.addComponentHit(hix, hiy);
-	        }
+        // Add any component hits to the cluster.
+        for(CalorimeterHit lcioHit : lcioCluster.getCalorimeterHits()) {
+            // Get the position of the calorimeter hit.
+            int hix = lcioHit.getIdentifierFieldValue("ix");
+            int hiy = lcioHit.getIdentifierFieldValue("iy");
+            
+            // Add the hit to the cluster.
+            panelCluster.addComponentHit(hix, hiy);
         }
         
         // Return the cluster.