lcsim-contrib/src/main/java/org/lcsim/contrib/sATLAS
diff -u -r1.7 -r1.8
--- TrackerHitDriver_sATLAS.java 8 May 2009 00:01:29 -0000 1.7
+++ TrackerHitDriver_sATLAS.java 30 Jun 2009 16:34:31 -0000 1.8
@@ -51,7 +51,7 @@
* Creates a new instance of TrackerHitDriver
*/
public TrackerHitDriver_sATLAS() {
-
+
// Instantiate the sensor simulation classes and set the thresholds
SiSensorSim strip_simulation = new CDFSiSensorSim();
SiSensorSim pixel_simulation = new CDFSiSensorSim();
@@ -60,32 +60,45 @@
GenericReadoutChip strip_readout = new GenericReadoutChip();
strip_readout.setNoiseIntercept(300.);
strip_readout.setNoiseSlope(30.);
- strip_readout.setNoiseThreshold(4000.);
- strip_readout.setNeighborThreshold(4000.);
+ strip_readout.setNoiseThreshold(9000.);
+ strip_readout.setNeighborThreshold(9000.);
GenericReadoutChip pixel_readout = new GenericReadoutChip();
pixel_readout.setNoiseIntercept(300.);
pixel_readout.setNoiseSlope(30.);
- pixel_readout.setNoiseThreshold(4000.);
- pixel_readout.setNeighborThreshold(4000.);
+ pixel_readout.setNoiseThreshold(7000.);
+ pixel_readout.setNeighborThreshold(7000.);
// Instantiate the digitizer that produces the raw hits
_digitizer = new RawTrackerHitMaker(strip_simulation, strip_readout);
// Instantiate a nearest neighbor clustering algorithm for the pixels
NearestNeighbor strip_clustering = new NearestNeighbor();
- strip_clustering.setSeedThreshold(4000.);
- strip_clustering.setNeighborThreshold(4000.);
+ strip_clustering.setSeedThreshold(9000.);
+ strip_clustering.setNeighborThreshold(9000.);
// Instantiate a nearest neighbor clustering algorithm for the pixels
NearestNeighbor pixel_clustering = new NearestNeighbor();
- pixel_clustering.setSeedThreshold(4000.);
- pixel_clustering.setNeighborThreshold(4000.);
+ pixel_clustering.setSeedThreshold(7000.);
+ pixel_clustering.setNeighborThreshold(7000.);
// 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);
+ _strip_clusterer.SetOneClusterErr(1 / Math.sqrt(12.));
+ _strip_clusterer.SetTwoClusterErr(1 / 5.0);
+ _strip_clusterer.SetThreeClusterErr(1 / 3.0);
+ _strip_clusterer.SetFourClusterErr(1 / 2.0);
+ _strip_clusterer.SetFiveClusterErr(1 / 1.0);
+
_pixel_clusterer = new PixelHitMaker(pixel_simulation, pixel_readout, pixel_clustering);
+ _pixel_clusterer.SetOneClusterErr(1 / Math.sqrt(12.));
+ _pixel_clusterer.SetTwoClusterErr(1 / 5.0);
+ _pixel_clusterer.SetThreeClusterErr(1 / 3.0);
+ _pixel_clusterer.SetFourClusterErr(1 / 2.0);
+ _pixel_clusterer.SetFiveClusterErr(1 / 1.0);
+
+
// Specify the readouts to process
_readouts.add("VtxBarrHits");
@@ -157,7 +170,7 @@
super.process(event);
// Print out the event number
- System.out.println("TrackerHitDriver processing event "+_nev);
+ System.out.println("TrackerHitDriver processing event " + _nev);
_nev++;
// Lists of hits
@@ -212,5 +225,4 @@
public String getPixelHitsName() {
return _pixel_clusterer.getName() + "_SiTrackerHitPixel";
}
-
}
\ No newline at end of file