Print

---

Author: [log in to unmask]
Date: Fri Jan  9 16:15:11 2015
New Revision: 1910

Log:
Remove HPSRawCalorimeterHit class. HPSJAVA-387

Removed:
    java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/HPSRawCalorimeterHit.java
Modified:
    java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalFADCPlotsDriver.java
    java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java

Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalFADCPlotsDriver.java
 =============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalFADCPlotsDriver.java	(original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalFADCPlotsDriver.java	Fri Jan  9 16:15:11 2015
@@ -5,10 +5,10 @@
 
 import java.util.List;
 
-import org.hps.recon.ecal.HPSRawCalorimeterHit;
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.Cluster;
 import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.util.Driver;
 import org.lcsim.util.aida.AIDA;
 
@@ -78,13 +78,13 @@
 			throw new RuntimeException("Missing hit collection!");
 
 		if (rawCollectionName != null) {
-			List<HPSRawCalorimeterHit> rawHits = event.get(HPSRawCalorimeterHit.class, rawCollectionName);
+			List<RawCalorimeterHit> rawHits = event.get(RawCalorimeterHit.class, rawCollectionName);
 			if (rawHits == null)
 				throw new RuntimeException("Missing hit collection!");
 
-			for (HPSRawCalorimeterHit hit : rawHits) {
+			for (RawCalorimeterHit hit : rawHits) {
 				rawE.fill(hit.getAmplitude());
-				window_E.fill(hit.getAmplitude(),hit.getWindowSize());
+				//window_E.fill(hit.getAmplitude(),hit.getWindowSize());
 			}
 		}
 

Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java
 =============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java	(original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalConverterDriver.java	Fri Jan  9 16:15:11 2015
@@ -64,13 +64,13 @@
 
     @Override
     public void process(EventHeader event) {
-        if (event.hasCollection(HPSRawCalorimeterHit.class, rawCollectionName)) {
+        if (event.hasCollection(RawCalorimeterHit.class, rawCollectionName)) {
             // Get the list of ECal hits.
-            List<HPSRawCalorimeterHit> hits = event.get(HPSRawCalorimeterHit.class, rawCollectionName);
+            List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, rawCollectionName);
 
             ArrayList<CalorimeterHit> newHits = new ArrayList<CalorimeterHit>();
 
-            for (HPSRawCalorimeterHit hit : hits) {
+            for (RawCalorimeterHit hit : hits) {
                 newHits.add(HitDtoA(hit));
             }