Commit in lcsim/src/org/lcsim/recon/muon on MAIN
MuonCandidate.java+2-21.2 -> 1.3
SegmentFinder.java+2-21.1 -> 1.2
+4-4
2 modified files
GL: Replacing SimCalHits with CalorimeterHits wherever possible

lcsim/src/org/lcsim/recon/muon
MuonCandidate.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- MuonCandidate.java	6 Dec 2005 16:21:15 -0000	1.2
+++ MuonCandidate.java	12 Dec 2005 05:44:51 -0000	1.3
@@ -31,9 +31,9 @@
         while(ee.hasMoreElements())
         {
 	    // CalorimeterHit class still not implemented.  Use
-	    // SimCalorimeterHit
+	    // CalorimeterHit
 //          CalorimeterHit hit = (CalorimeterHit) ee.nextElement();
-            SimCalorimeterHit hit = (SimCalorimeterHit) ee.nextElement();
+            CalorimeterHit hit = (CalorimeterHit) ee.nextElement();
 //             int id = hit.getCellID();
             myecalhits.add(hit);
             ijy++;

lcsim/src/org/lcsim/recon/muon
SegmentFinder.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- SegmentFinder.java	1 Jun 2005 18:12:32 -0000	1.1
+++ SegmentFinder.java	12 Dec 2005 05:44:51 -0000	1.2
@@ -3,7 +3,7 @@
 import org.lcsim.event.EventHeader;
 import java.util.Vector;
 import org.lcsim.util.step.TrackStepper;  //  C.M. Stepper
-import org.lcsim.event.SimCalorimeterHit;
+import org.lcsim.event.CalorimeterHit;
 
 // Muon Segment Finder for LCD Muon Reconstruction
 // Express the SegmentFinder as a function of
@@ -21,5 +21,5 @@
         hitList.removeAllElements();
     }
     
-    protected Vector<SimCalorimeterHit> hitList = new Vector<SimCalorimeterHit>();	// List of hits found    
+    protected Vector<CalorimeterHit> hitList = new Vector<CalorimeterHit>();	// List of hits found    
 }
CVSspam 0.2.8