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

diff -u -r1.2 -r1.3
--- TrackerHitDriver_sATLAS.java	28 Apr 2009 21:32:30 -0000	1.2
+++ TrackerHitDriver_sATLAS.java	28 Apr 2009 21:47:24 -0000	1.3
@@ -1,10 +1,6 @@

 /*

- * TrackerHitDriver.java

+ * TrackerHitDriver Class

  *

- * Created on February 15, 2008, 7:09 PM
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.

  */
 package org.lcsim.contrib.sATLAS;
 

@@ -47,14 +43,13 @@

     Set<SiSensor> _process_sensors = new HashSet<SiSensor>();
     Set<SiTrackerModule> _process_modules = new HashSet<SiTrackerModule>();
     SiDigitizer _digitizer;

-    Clusterer _strip_clusterer;
-    Clusterer _pixel_clusterer;

+    StripHitMaker _strip_clusterer;
+    PixelHitMaker _pixel_clusterer;

     int _nev = 0;
 
     /**
      * Creates a new instance of TrackerHitDriver
      */

-    // Default constructor

     public TrackerHitDriver_sATLAS() {
         
         //  Instantiate the sensor simulation classes and set the thresholds

@@ -72,11 +67,18 @@

         //  Instantiate the digitizer that produces the raw hits
         _digitizer = new RawTrackerHitMaker(strip_simulation, strip_readout);
 

-        //  Instantiate the clusterers

+        //  Instantiate the clusterers and set clustering parameters

         _strip_clusterer = new StripHitMaker(strip_simulation, strip_readout);

-//        _strip_clusterer.setSeedThreshold(4.);
-//        _strip_clusterer.set

+        _strip_clusterer.setSeedThreshold(4.);
+        _strip_clusterer.setNeigborThreshold(2.);
+        _strip_clusterer.setClusterThreshold(3.);
+        _strip_clusterer.setMaxClusterSize(10);
+        _strip_clusterer.setCentralStripAveragingThreshold(4);

         _pixel_clusterer = new PixelHitMaker(pixel_simulation, pixel_readout);

+        _pixel_clusterer.setSeedThreshold(4.);
+        _pixel_clusterer.setNeigborThreshold(2.);
+        _pixel_clusterer.setClusterThreshold(3.);
+        _pixel_clusterer.setMaxClusterSize(10);

 
         //  Specify the readouts to process
         _readouts.add("VtxBarrHits");

@@ -94,12 +96,13 @@

         _process_paths.add("SCTShortEndcap");
         _process_paths.add("SCTLongEndcap");
 

-

     }
 

-
-    // Actions begins here
-    //====================

+    /**
+     * Initialize whenever we have a new detector
+     * 
+     * @param detector
+     */

     public void detectorChanged(Detector detector) {
         System.out.println(detector.getName());
         super.detectorChanged(detector);

@@ -122,6 +125,9 @@

 
     }
 

+    /**
+     * Setup readouts
+     */

     public void startOfData() {
         // If readouts not already set, set them up
         if (_readouts.size() != 0) {

@@ -134,6 +140,12 @@

         _nev = 0;
     }
 

+    /**
+     * Main digitization driver.  Creates raw hits, forms clusters, and makes
+     * tracker hits using the sisim package.
+     *
+     * @param event
+     */

     public void process(EventHeader event) {
         super.process(event);
 

@@ -169,18 +181,31 @@

 
     }
 

-    // Collection names
-    //-----------------

+    /**
+     * Return the name of the raw hits collection
+     *
+     * @return name of raw hits collection
+     */

     public String getRawHitsName() {
         return _digitizer.getName() + "_RawTrackerHits";
     }
 

+    /**
+     * Return the name of the strip hits collection
+     *
+     * @return name of strip hits collection
+     */

     public String getStripHits1DName() {
         return _strip_clusterer.getName() + "_SiTrackerHitStrip1D";
     }
 

+    /**
+     * Return the name of the pixel hits collection
+     *
+     * @return name of pixel hits collection
+     */

     public String getPixelHitsName() {
         return _pixel_clusterer.getName() + "_SiTrackerHitPixel";
     }
 

-}

+}

\ No newline at end of file