lcsim/src/org/lcsim/digisim

diff -u -r1.8 -r1.9
--- CellSelector.java	18 Jul 2005 18:08:15 -0000	1.8
+++ CellSelector.java	7 Dec 2005 18:29:59 -0000	1.9
@@ -1,12 +1,14 @@

 package org.lcsim.digisim;
 

-import org.lcsim.event.SimCalorimeterHit;
-import org.lcsim.event.EventHeader;
-import org.lcsim.geometry.Detector;

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

+import org.lcsim.event.SimCalorimeterHit;
+import org.lcsim.event.EventHeader;
+import org.lcsim.recon.cluster.util.CalHitMapMgr;
+
+import org.lcsim.geometry.Detector;

 import org.lcsim.geometry.IDDecoder;
 import org.lcsim.geometry.subdetector.CylindricalCalorimeter;
 import org.lcsim.geometry.compact.Subdetector;

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

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

- * @version $Id: CellSelector.java,v 1.8 2005/07/18 18:08:15 jeremy Exp $

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

  */
 public class CellSelector
 {

@@ -35,7 +37,10 @@

     public void setupGeometry() {
       // refresh detector information
       CalHitMapMgr aux = CalHitMapMgr.getInstance();

-      _evt = aux.getEvent();

+      EventHeader event = aux.getEvent();
+      if(_evt==event) return;
+
+      _evt = event;

       _calsub = aux.getSubdetector( _collName );
       _segm = (SegmentationBase)_calsub.getReadout().getSegmentation();
 

@@ -69,7 +74,7 @@

 
 	else if( _segm instanceof NonprojectiveCylinder ) {
 	  // Here for nonprojective cylinder

-	  System.out.println("_segm is a NonprojectiveCylinder");

+	  if(_debug) System.out.println("_segm is a NonprojectiveCylinder");

 	  useNonprojectiveCylinder(cal);
 	}
 

lcsim/src/org/lcsim/digisim

diff -u -r1.11 -r1.12
--- DigiSimMain.java	25 Aug 2005 23:59:41 -0000	1.11
+++ DigiSimMain.java	7 Dec 2005 18:29:59 -0000	1.12
@@ -14,14 +14,14 @@

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

-import org.lcsim.digisim.CalHitMapDriver;
-import org.lcsim.digisim.DigiSimDriver;

+import org.lcsim.recon.cluster.util.CalHitMapDriver;
+import org.lcsim.recon.cluster.util.CalHitMapMgr;

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

- * @version $Id: DigiSimMain.java,v 1.11 2005/08/25 23:59:41 lima Exp $

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

  */
 public class DigiSimMain extends Driver {
 

@@ -47,10 +47,10 @@

 
     _nevt = 0;
 

-    // initialize data provider and digitizers
-    _hitmgr.init();
-    _digi.init();
-    _calhit.init();

+    // add subdrivers
+    this.add( _hitmgr );
+    this.add( _digi );
+    this.add( _calhit );

   }
 
     /** Debugging printout control */

@@ -61,14 +61,17 @@

     }
 
   //

+  protected void startOfData() {
+    super.startOfData();
+  }
+

   protected void process(final EventHeader event) {

+

     // event counter
     ++ _nevt;
 
     // subdrivers processing

-    _hitmgr.process(event);
-    _digi.process(event);
-    _calhit.process(event);

+    super.process(event);

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

@@ -134,7 +137,7 @@

       loop.dispose();
 
       org.lcsim.util.aida.AIDA.defaultInstance().saveAs("myhistos.aida");

-      System.out.println("Analyzed "+digimain._nevt+" events");

+      System.out.println("Processed "+digimain._nevt+" events");

     }
 
     private void log(String text) {

lcsim/src/org/lcsim/digisim

diff -u -r1.10 -r1.11
--- Digitizer.java	12 Aug 2005 21:21:34 -0000	1.10
+++ Digitizer.java	7 Dec 2005 18:29:59 -0000	1.11
@@ -10,6 +10,7 @@

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

+import org.lcsim.recon.cluster.util.CalHitMapMgr;

 
 import org.lcsim.util.lcio.LCIOConstants;
 import org.lcsim.digisim.MyRawCalorimeterHit;

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

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

- * @version $Id: Digitizer.java,v 1.10 2005/08/12 21:21:34 lima Exp $

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

  */
 class Digitizer {