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

diff -u -r1.6 -r1.7
--- TrackerHitDriver_sATLAS.java	29 Apr 2009 21:48:23 -0000	1.6
+++ TrackerHitDriver_sATLAS.java	8 May 2009 00:01:29 -0000	1.7
@@ -16,7 +16,9 @@

 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.geometry.Detector;
 import org.lcsim.recon.tracking.digitization.sisim.CDFSiSensorSim;

+import org.lcsim.recon.tracking.digitization.sisim.ClusteringAlgorithm;

 import org.lcsim.recon.tracking.digitization.sisim.GenericReadoutChip;

+import org.lcsim.recon.tracking.digitization.sisim.NearestNeighbor;

 import org.lcsim.recon.tracking.digitization.sisim.PixelHitMaker;
 import org.lcsim.recon.tracking.digitization.sisim.RawTrackerHitMaker;
 import org.lcsim.recon.tracking.digitization.sisim.SiDigitizer;

@@ -58,25 +60,32 @@

         GenericReadoutChip strip_readout = new GenericReadoutChip();
         strip_readout.setNoiseIntercept(300.);
         strip_readout.setNoiseSlope(30.);

+        strip_readout.setNoiseThreshold(4000.);
+        strip_readout.setNeighborThreshold(4000.);

         GenericReadoutChip pixel_readout = new GenericReadoutChip();
         pixel_readout.setNoiseIntercept(300.);
         pixel_readout.setNoiseSlope(30.);

+        pixel_readout.setNoiseThreshold(4000.);
+        pixel_readout.setNeighborThreshold(4000.);

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

-        //  Instantiate the clusterers and set clustering parameters
-        _strip_clusterer = new StripHitMaker(strip_simulation, strip_readout);
-        _strip_clusterer.setSeedThreshold(4.);
-        _strip_clusterer.setNeigborThreshold(2.);
-        _strip_clusterer.setClusterThreshold(3.);

+        //  Instantiate a nearest neighbor clustering algorithm for the pixels
+        NearestNeighbor strip_clustering = new NearestNeighbor();
+        strip_clustering.setSeedThreshold(4000.);
+        strip_clustering.setNeighborThreshold(4000.);
+
+        //  Instantiate a nearest neighbor clustering algorithm for the pixels
+        NearestNeighbor pixel_clustering = new NearestNeighbor();
+        pixel_clustering.setSeedThreshold(4000.);
+        pixel_clustering.setNeighborThreshold(4000.);
+
+        //  Instantiate the clusterers and set hit-making parameters
+        _strip_clusterer = new StripHitMaker(strip_simulation, strip_readout, strip_clustering);

         _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);

+        _pixel_clusterer = new PixelHitMaker(pixel_simulation, pixel_readout, pixel_clustering);

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