lcsim-contrib/src/main/java/org/lcsim/contrib/sATLAS

diff -u -r1.8 -r1.9
--- TrackerHitDriver_sATLAS.java	30 Jun 2009 16:34:31 -0000	1.8
+++ TrackerHitDriver_sATLAS.java	1 Jul 2009 18:58:18 -0000	1.9
@@ -42,9 +42,11 @@

     List<IDetectorElement> _process_de = new ArrayList<IDetectorElement>();
     Set<SiSensor> _process_sensors = new HashSet<SiSensor>();
     Set<SiTrackerModule> _process_modules = new HashSet<SiTrackerModule>();

-    SiDigitizer _digitizer;

+    SiDigitizer _strip_digitizer;
+    SiDigitizer _pixel_digitizer;

     StripHitMaker _strip_clusterer;
     PixelHitMaker _pixel_clusterer;

+    String _digitizer_name;

     int _nev = 0;
 
     /**

@@ -69,7 +71,9 @@

         pixel_readout.setNeighborThreshold(7000.);
 
         //  Instantiate the digitizer that produces the raw hits

-        _digitizer = new RawTrackerHitMaker(strip_simulation, strip_readout);

+        _strip_digitizer = new RawTrackerHitMaker(strip_simulation, strip_readout);
+        _pixel_digitizer = new RawTrackerHitMaker(pixel_simulation, pixel_readout);
+        _digitizer_name = _strip_digitizer.getName();

 
         //  Instantiate a nearest neighbor clustering algorithm for the pixels
         NearestNeighbor strip_clustering = new NearestNeighbor();

@@ -179,14 +183,16 @@

         List<SiTrackerHit> hits_pixel = new ArrayList<SiTrackerHit>();
 
         for (SiSensor sensor : _process_sensors) {

-            raw_hits.addAll(_digitizer.makeHits(sensor));

 
             if (sensor.hasStrips()) {

+                raw_hits.addAll(_strip_digitizer.makeHits(sensor));

                 hits_strip1D.addAll(_strip_clusterer.makeHits(sensor));

+

             }
 
 
             if (sensor.hasPixels()) {

+                raw_hits.addAll(_pixel_digitizer.makeHits(sensor));

                 hits_pixel.addAll(_pixel_clusterer.makeHits(sensor));
             }
 

@@ -205,7 +211,7 @@

      * @return name of raw hits collection
      */
     public String getRawHitsName() {

-        return _digitizer.getName() + "_RawTrackerHits";

+        return _digitizer_name + "_RawTrackerHits";

     }
 
     /**