lcsim/src/org/lcsim/digisim

diff -u -r1.16 -r1.17
--- DigiSimMain.java	11 Sep 2007 00:21:03 -0000	1.16
+++ DigiSimMain.java	7 May 2010 19:00:36 -0000	1.17
@@ -1,9 +1,7 @@

 package org.lcsim.digisim;
 
 import java.util.List;

-import java.util.Vector;

 import java.util.Map;

-import java.util.HashMap;

 import java.io.File;
 
 import org.lcsim.util.Driver;

@@ -17,12 +15,15 @@

 import org.lcsim.event.LCRelation;
 import org.lcsim.recon.cluster.util.CalHitMapDriver;
 import org.lcsim.recon.cluster.util.CalHitMapMgr;

+import org.lcsim.recon.util.CalorimeterInformation;
+import org.lcsim.geometry.Calorimeter.CalorimeterType;
+import org.lcsim.recon.util.CalInfoDriver;

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

- * @version $Id: DigiSimMain.java,v 1.16 2007/09/11 00:21:03 tonyj Exp $

+ * @version $Id: DigiSimMain.java,v 1.17 2010/05/07 19:00:36 cassell Exp $

  */
 public class DigiSimMain extends Driver {
 

@@ -43,6 +44,7 @@

       configuration.
   */
   public DigiSimMain(String[] args) {

+      this.add(new CalInfoDriver());

 
     // instantiate all needed drivers
     _hitmgr = new CalHitMapDriver();

@@ -76,18 +78,18 @@

   }
 
   protected void process(final EventHeader event) {

-

     // event counter
     ++ _nevt;
 
     // subdrivers processing
     super.process(event);

+    if(ci == null)ci = CalorimeterInformation.instance();

 
     //.. test calhitmapmgr
     CalHitMapMgr hitmgr = CalHitMapMgr.getInstance();
     Map<Long,CalorimeterHit> emhits, hadhits;

-    emhits = hitmgr.getCollHitMap("EcalBarrHits");
-    hadhits = hitmgr.getCollHitMap("HcalBarrHits");

+    emhits = hitmgr.getCollHitMap(ci.getCollectionName(CalorimeterType.EM_BARREL));
+    hadhits = hitmgr.getCollHitMap(ci.getCollectionName(CalorimeterType.HAD_BARREL));

 //     System.out.println("# hits retrieved:"
 // 		       +" EM="+emhits.size()+", HAD="+hadhits.size());
 

@@ -113,6 +115,7 @@

     //***** FIELDS *****
     // event counter
     private int _nevt;

+    private CalorimeterInformation ci;

 
     // subdrivers
     private CalHitMapDriver _hitmgr;