lcsim/src/org/lcsim/digisim

diff -u -r1.9 -r1.10
--- CellSelector.java	7 Dec 2005 18:29:59 -0000	1.9
+++ CellSelector.java	12 Dec 2005 04:48:19 -0000	1.10
@@ -4,7 +4,7 @@

 import java.util.List;
 import java.util.Random;
 

-import org.lcsim.event.SimCalorimeterHit;

+import org.lcsim.event.CalorimeterHit;

 import org.lcsim.event.EventHeader;
 import org.lcsim.recon.cluster.util.CalHitMapMgr;
 

@@ -24,7 +24,7 @@

  * any cell in a given subdetector.
  *
  * @author Guilherme Lima

- * @version $Id: CellSelector.java,v 1.9 2005/12/07 18:29:59 lima Exp $

+ * @version $Id: CellSelector.java,v 1.10 2005/12/12 04:48:19 lima Exp $

  */
 public class CellSelector
 {

@@ -219,13 +219,13 @@

     public void checkHitPositions() {
       if(_calsub==null) setupGeometry();
       // Loop over all temp hits to create raw hits

-      final Map<Long,SimCalorimeterHit> simHits

+      final Map<Long,CalorimeterHit> simHits

 	  = CalHitMapMgr.getInstance().getCollHitMap( _collName );
       if(simHits.size()==0) {
 	  System.out.println("size=0");
 	  return;
       }

-      for( SimCalorimeterHit ihit : simHits.values() ) {

+      for( CalorimeterHit ihit : simHits.values() ) {

 	  _segm.setID( ihit.getCellID() );
 	  double[] pos1 = _segm.getPosition();
 	  double[] pos2 = ihit.getPosition();

lcsim/src/org/lcsim/digisim

diff -u -r1.12 -r1.13
--- DigiSimMain.java	7 Dec 2005 18:29:59 -0000	1.12
+++ DigiSimMain.java	12 Dec 2005 04:48:19 -0000	1.13
@@ -11,6 +11,7 @@

 import org.lcsim.util.loop.LCSimLoop;
 
 import org.lcsim.event.EventHeader;

+import org.lcsim.event.CalorimeterHit;

 import org.lcsim.event.SimCalorimeterHit;
 import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.event.LCRelation;

@@ -21,7 +22,7 @@

  * The main driver for standalone digitization simulation
  *
  * @author Guilherme Lima

- * @version $Id: DigiSimMain.java,v 1.12 2005/12/07 18:29:59 lima Exp $

+ * @version $Id: DigiSimMain.java,v 1.13 2005/12/12 04:48:19 lima Exp $

  */
 public class DigiSimMain extends Driver {
 

@@ -75,7 +76,7 @@

 
     //.. test calhitmapmgr
     CalHitMapMgr hitmgr = CalHitMapMgr.getInstance();

-    Map<Long,SimCalorimeterHit> emhits, hadhits;

+    Map<Long,CalorimeterHit> emhits, hadhits;

     emhits = hitmgr.getCollHitMap("EcalBarrHits");
     hadhits = hitmgr.getCollHitMap("HcalBarrHits");
 //     System.out.println("# hits retrieved:"

lcsim/src/org/lcsim/digisim

diff -u -r1.11 -r1.12
--- Digitizer.java	7 Dec 2005 18:29:59 -0000	1.11
+++ Digitizer.java	12 Dec 2005 04:48:19 -0000	1.12
@@ -7,6 +7,7 @@

 import java.util.HashMap;
 
 import org.lcsim.event.EventHeader;

+import org.lcsim.event.CalorimeterHit;

 import org.lcsim.event.SimCalorimeterHit;
 import org.lcsim.event.RawCalorimeterHit;
 import org.lcsim.event.LCRelation;

@@ -25,7 +26,7 @@

  * simulation process for a specific subdetector.
  *
  * @author Guilherme Lima

- * @version $Id: Digitizer.java,v 1.11 2005/12/07 18:29:59 lima Exp $

+ * @version $Id: Digitizer.java,v 1.12 2005/12/12 04:48:19 lima Exp $

  */
 class Digitizer {
 

@@ -48,13 +49,13 @@

      * for each simulated hit given.
      * @param simHits input map of simulated hits to be digitized
      */

-    private Map<Long,TempCalHit> createTempHits(final Map<Long,SimCalorimeterHit> simHits) {

+    private Map<Long,TempCalHit> createTempHits(final Map<Long,CalorimeterHit> simHits) {

 
 	Map<Long,TempCalHit> tmpHits = new HashMap<Long,TempCalHit>();
 
 	// Create a tmphit for each simhit
 	for( Long key : simHits.keySet() ) {

-	    SimCalorimeterHit simhit = simHits.get(key);

+	    SimCalorimeterHit simhit = (SimCalorimeterHit)simHits.get(key);

 
 	    // For now, use same input cell id for output cell id
 	    TempCalHit tmphit = new TempCalHit( simhit.getCellID(),

@@ -86,7 +87,7 @@

 					 Vector<LCRelation> relVec) {
 
       // Loop over all temp hits to create raw hits

-      final Map<Long,SimCalorimeterHit> simHits

+      final Map<Long,CalorimeterHit> simHits

 	  = CalHitMapMgr.getInstance().getCollHitMap( _inputColl );
 
       for( Long chanID : tmpHits.keySet() ) {

@@ -118,7 +119,7 @@

 	for(int i=0; i<ids.size(); ++i) {
 	  // fetch each sim hit
 	  Long simid = ids.get(i);

-	  SimCalorimeterHit simhit = simHits.get(simid);

+	  SimCalorimeterHit simhit = (SimCalorimeterHit)simHits.get(simid);

 
 	  // calculate weight
 	  double weight = energies.get(i) / etot;

@@ -381,7 +382,7 @@

 //       }
 
 	// Create map storage for transient hits to be smeared

-	final Map<Long,SimCalorimeterHit> hits

+	final Map<Long,CalorimeterHit> hits

 	    = CalHitMapMgr.getInstance().getCollHitMap(_inputColl);
 
 	Map<Long,TempCalHit> tmpHits = createTempHits( hits );