LISTSERV 16.5 - LCD-CVS Archives

+package org.lcsim.detector.driver; + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.lcsim.event.EventHeader; +import org.lcsim.event.SimTrackerHit; +import org.lcsim.event.RawTrackerHit; +import org.lcsim.event.base.BaseRawTrackerHit; +import org.lcsim.util.Driver; +import org.lcsim.util.cache.FileCache; +import org.lcsim.util.loop.LCSimLoop; +import org.lcsim.detector.IDetectorElement; +import org.lcsim.detector.IReadout; + +import org.lcsim.detector.tracker.silicon.SiSensor; +import org.lcsim.detector.tracker.silicon.ChargeCarrier; + +import org.lcsim.contrib.SiStripSim.SiSensorSim; +import org.lcsim.contrib.SiStripSim.CDFSiSensorSim; +import org.lcsim.contrib.SiStripSim.ReadoutChip; +import org.lcsim.contrib.SiStripSim.Kpix; +import org.lcsim.contrib.SiStripSim.SiElectrodeDataCollection; + +/** + * Reads single muon events generated in sid01_polyhedra, which uses + * SiTrackerBarrel. For DetectorElements where there is a + * Readout containing one hit, check that the hit from the event + * and the DE's have matching cell id. + */ +public class TrackerBarrelDigitizationDriverTest extends TestCase +{ + public TrackerBarrelDigitizationDriverTest(String testName) + { + super(testName); + } + + public static Test suite() + { + return new TestSuite(TrackerBarrelDigitizationDriverTest.class); + } + + public void setUp() + { + java.lang.Runtime.getRuntime().gc(); + } + + public void testReadout() throws Exception + { +// URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r3p7_geant4-v9r0p1_LCPhys_SiTrackerBarrelTest00.slcio"); + URL url = new URL("http://www.lcsim.org/test/lcio/mu-_10GeV_SLIC-v2r3p10_geant4-v9r0p1_LCPhys_SiTrackerBarrelTest01.slcio"); + FileCache cache = new FileCache(); + File file = cache.getCachedFile(url); + + LCSimLoop loop = new LCSimLoop(); + loop.setLCIORecordSource(file); + loop.add( new SimTrackerHitIdentifierReadoutDriver(new String[] {"SiTrackerBarrel_RO"} ) ); + loop.add( new TestDriver() ); + loop.loop(10, null); + loop.dispose(); + } + + class TestDriver + extends Driver + { + protected void process(EventHeader header) + { + + boolean found_hits = false; + + // Setup simulation and readout + SiSensorSim si_simulation = new CDFSiSensorSim(); + ReadoutChip kpix = new Kpix(); + + IDetectorElement tkr = header.getDetector().getSubdetector("SiTrackerBarrel").getDetectorElement(); + for ( IDetectorElement layer : tkr.getChildren() ) + { + for ( IDetectorElement module : layer.getChildren() ) + { + for ( IDetectorElement sensorDE : module.getChildren() ) + { + SiSensor sensor = (SiSensor)sensorDE; + + IReadout ro = sensor.getReadout(); + List<SimTrackerHit> hits = ro.getHits(SimTrackerHit.class); + + if (!hits.isEmpty()) + { + +// System.out.println("\n"+"Simulating sensor: "+sensor.getName()); + + List<RawTrackerHit> raw_hits = new ArrayList<RawTrackerHit>(); + + si_simulation.setSensor(sensor); + Map<ChargeCarrier,SiElectrodeDataCollection> electrode_data = si_simulation.computeElectrodeData(); + + for (ChargeCarrier carrier : ChargeCarrier.values()) + { + if (sensor.hasElectrodesOnSide(carrier)) + { + +// System.out.println("Readout data: "+si_simulation.getReadoutData(carrier).getChargeMap()); + + SortedMap<Integer,List<Integer>> digitized_hits = kpix.readout(electrode_data.get(carrier),sensor.getReadoutElectrodes(carrier)); + +// System.out.println("# digitized hits: "+digitized_hits.size()); + + // Create RawTrackerHits + + for (Integer readout_cell : digitized_hits.keySet()) + { + int time = 0; + long cell_id = sensor.makeStripId(readout_cell,carrier.charge()).getValue(); + short[] adc_values = {digitized_hits.get(readout_cell).get(0).shortValue(),digitized_hits.get(readout_cell).get(1).shortValue()}; + + Set<SimTrackerHit> simulated_hits = electrode_data.get(carrier).get(readout_cell).getSimulatedHits(); + IDetectorElement detector_element = sensor; + + RawTrackerHit raw_hit = new BaseRawTrackerHit(time,cell_id,adc_values,new ArrayList<SimTrackerHit>(simulated_hits),detector_element); + raw_hits.add(raw_hit); + found_hits = true; + +// System.out.println("ADC data for cell "+readout_cell+": "+ +// raw_hit.getADCValues()[0]+", "+raw_hit.getADCValues()[1]); + + double signal = kpix.decodeCharge(raw_hit); +// System.out.println("Readout data for cell "+readout_cell+": "+signal); + + } + + } + } + + // Clear simulation and add RawTrackerHits to event + si_simulation.clearReadout(); + header.put("RawBarrelTrackerHits",raw_hits,RawTrackerHit.class,0,"Kpix"); + + } + + } + } + } + + assertTrue(found_hits); + + } + + + + } +} +

for (ChargeCarrier carrier : ChargeCarrier.values()) { if (sensor.hasElectrodesOnSide(carrier)) {

long cell_id = sensor.makeStripId(readout_cell,carrier.charge()).getValue(); short[] adc_values = {digitized_hits.get(readout_cell).get(0).shortValue(),digitized_hits.get(readout_cell).get(1).shortValue()};

IDetectorElement detector_element = sensor; RawTrackerHit raw_hit = new BaseRawTrackerHit(time,cell_id,adc_values,new ArrayList<SimTrackerHit>(simulated_hits),detector_element); raw_hits.add(raw_hit); found_hits = true;

+// URL url = new URL("http://www.lcsim.org/test/lcio/mu_10.0GeV_Theta90_SLIC-v2r3p7_geant4-v9r0p1_LCPhys_SiTrackerBarrelTest00.slcio"); + URL url = new URL("http://www.lcsim.org/test/lcio/mu-_10GeV_SLIC-v2r3p10_geant4-v9r0p1_LCPhys_SiTrackerBarrelTest01.slcio");

lcsim/src/org/lcsim/contrib/RobKutschke/TKNHits

TKNRawHitsDriverV1.java 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- TKNRawHitsDriverV1.java	6 Nov 2007 19:58:03 -0000	1.2
+++ TKNRawHitsDriverV1.java	11 Dec 2007 18:51:07 -0000	1.3
@@ -5,6 +5,7 @@

 import java.util.SortedMap;
 import java.util.Set;
 import java.util.HashSet;

+import java.util.Map;

 import org.lcsim.event.EventHeader;
 import org.lcsim.util.Driver;

@@ -21,6 +22,7 @@

 import org.lcsim.contrib.SiStripSim.CDFSiSensorSim;
 import org.lcsim.contrib.SiStripSim.ReadoutChip;
 import org.lcsim.contrib.SiStripSim.Kpix;

+import org.lcsim.contrib.SiStripSim.SiElectrodeDataCollection;

 
 /**
  *

@@ -34,20 +36,20 @@

  * The driver SimTrackerHitIdentifierReadoutDriver must be called before this code is run.
  *
  *@author $Author: tknelson $

- *@version $Id: TKNRawHitsDriverV1.java,v 1.2 2007/11/06 19:58:03 tknelson Exp $

+ *@version $Id: TKNRawHitsDriverV1.java,v 1.3 2007/12/11 18:51:07 tknelson Exp $

- * Date $Date: 2007/11/06 19:58:03 $

+ * Date $Date: 2007/12/11 18:51:07 $

  *
  */
 
 
 public class TKNRawHitsDriverV1 extends Driver
 {

     // Names of input and output collections.
     private String[] input  = null;
     private String[] output = null;

     /**
      * Constructor:
      * The arguments are two arrays of strings.  The arrays must be of the same length

@@ -55,86 +57,95 @@

      * and the name of an output collection.
      *
      */

-    public TKNRawHitsDriverV1( String[] in, String[] out){
-	input  = in;
-	output = out;
-	
-	// If lengths of arrays are not equal, abort.
-	if ( in.length != out.length ){
-	    System.out.println ("Fatal error from TKNRawHitsDriverV1.  Different length lists for input and outputs!");
-	    System.out.println ("Number of inputs/outputs: " + input.length + "/" + output.length );
-	    System.out.println ("Inputs:  " + input );
-	    System.out.println ("Outputs: " + output );
-	    System.exit(-1);
-	}

+    public TKNRawHitsDriverV1( String[] in, String[] out)
+    {
+        input  = in;
+        output = out;
+        
+        // If lengths of arrays are not equal, abort.
+        if ( in.length != out.length )
+        {
+            System.out.println("Fatal error from TKNRawHitsDriverV1.  Different length lists for input and outputs!");
+            System.out.println("Number of inputs/outputs: " + input.length + "/" + output.length );
+            System.out.println("Inputs:  " + input );
+            System.out.println("Outputs: " + output );
+            System.exit(-1);
+        }

     /**
      *  The main work of the class.
      */
     protected void process(EventHeader header)
     {

-
-	// Loop over all of the collections to process.
-	for ( int i=0; i<input.length; ++i ){
-
-	    List<SimTrackerHit> eventHits = header.get(SimTrackerHit.class, input[i]);
-	
-	    // Set of sensors with hits.
-	    Set<SiSensor> hit_sensors = new HashSet<SiSensor>();
-	    for (SimTrackerHit hit : eventHits){
-		SiSensor sensor = (SiSensor)hit.getDetectorElement();
-		hit_sensors.add(sensor);
-	    }
-	
-	    // Instantiate simulation.
-	    SiSensorSim si_simulation = new CDFSiSensorSim();
-	    ReadoutChip kpix = new Kpix();
-
-	    // Output container.
-	    List<RawTrackerHit> raw_hits = new ArrayList<RawTrackerHit>();
-	
-	    // Loop over sensors with hits.
-	    for (SiSensor sensor : hit_sensors){
-		
-		// Deposit charge with CDF/Padova model
-		si_simulation.simulate(sensor);
-	    
-		for (ChargeCarrier carrier : ChargeCarrier.values()){
-		    if (sensor.hasElectrodesOnSide(carrier)){
-			
-			// Create digitized hit strips/pixels.
-			SortedMap<Integer,List<Integer>> digitized_hits = 
-			    kpix.readout(si_simulation.getReadoutData(carrier),sensor.getReadoutElectrodes(carrier));
-			
-			// Create RawTrackerHits.
-			for (Integer readout_cell : digitized_hits.keySet()){
-
-			    // Need to fix this.
-			    int time = 0;
-
-			    long cell_id = sensor.makeStripId(readout_cell,carrier.charge()).getValue();

+        
+        // Loop over all of the collections to process.
+        for ( int i=0; i<input.length; ++i )
+        {
+            
+            List<SimTrackerHit> eventHits = header.get(SimTrackerHit.class, input[i]);
+            
+            // Set of sensors with hits.
+            Set<SiSensor> hit_sensors = new HashSet<SiSensor>();
+            for (SimTrackerHit hit : eventHits)
+            {
+                SiSensor sensor = (SiSensor)hit.getDetectorElement();
+                hit_sensors.add(sensor);
+            }
+            
+            // Instantiate simulation.
+            SiSensorSim si_simulation = new CDFSiSensorSim();
+            ReadoutChip kpix = new Kpix();
+            
+            // Output container.
+            List<RawTrackerHit> raw_hits = new ArrayList<RawTrackerHit>();
+            
+            // Loop over sensors with hits.
+            for (SiSensor sensor : hit_sensors)
+            {
+                
+                // Deposit charge with CDF/Padova model
+                si_simulation.setSensor(sensor);
+                Map<ChargeCarrier,SiElectrodeDataCollection> electrode_data = si_simulation.computeElectrodeData();
+                
+                for (ChargeCarrier carrier : ChargeCarrier.values())
+                {
+                    if (sensor.hasElectrodesOnSide(carrier))
+                    {
+                        
+                        // Create digitized hit strips/pixels.
+                        SortedMap<Integer,List<Integer>> digitized_hits =
+                                kpix.readout(electrode_data.get(carrier),sensor.getReadoutElectrodes(carrier));
+                        
+                        // Create RawTrackerHits.
+                        for (Integer readout_cell : digitized_hits.keySet())
+                        {
+                            
+                            // Need to fix this.
+                            int time = 0;
+                            
+                            long cell_id = sensor.makeStripId(readout_cell,carrier.charge()).getValue();

                             short[] adc_values = {digitized_hits.get(readout_cell).get(0).shortValue(),digitized_hits.get(readout_cell).get(1).shortValue()};

-			    Set<SimTrackerHit> simulated_hits = 
-				si_simulation.getReadoutData(carrier).get(readout_cell).getSimulatedHits();
-			    IDetectorElement detector_element = sensor;
-			    
-			    // Create the hit and add it to the output list.
-			    RawTrackerHit raw_hit = new BaseRawTrackerHit(time,cell_id,adc_values,new ArrayList<SimTrackerHit>(simulated_hits),detector_element);
-			    raw_hits.add(raw_hit);
-
-			}                        
-		    }
-		} // Charge carriers.
-		
-		// Clear simulation.
-		si_simulation.clearReadout();
-		
-	    } // Loop over hit sensors.
-	    
-	    // Add to event.
-	    header.put(output[i], raw_hits, RawTrackerHit.class, 0, "Kpix");
-	} 
-

+                            Set<SimTrackerHit> simulated_hits =
+                                    electrode_data.get(carrier).get(readout_cell).getSimulatedHits();
+                            IDetectorElement detector_element = sensor;
+                            
+                            // Create the hit and add it to the output list.
+                            RawTrackerHit raw_hit = new BaseRawTrackerHit(time,cell_id,adc_values,new ArrayList<SimTrackerHit>(simulated_hits),detector_element);
+                            raw_hits.add(raw_hit);
+                            
+                        }
+                    }
+                } // Charge carriers.
+                
+                // Clear simulation.
+                si_simulation.clearReadout();
+                
+            } // Loop over hit sensors.
+            
+            // Add to event.
+            header.put(output[i], raw_hits, RawTrackerHit.class, 0, "Kpix");
+        }
+

     } // process()
 }

{ // System.out.println("# Sense strips: " + sensor.getSenseElectrodes(ChargeCarrier.HOLE).getNCells(0)); // System.out.println("# Readout strips: " + sensor.getReadoutElectrodes(ChargeCarrier.HOLE).getNCells(0));

+ public void lorentzCorrect(Hep3Vector position, ChargeCarrier carrier) + { + Line3D drift_line = new Line3D(new Point3D(position), driftDirection(carrier,new BasicHep3Vector(0,0,0))); // use drift direction at origin for now + + List<Point3D> intersection_points = new ArrayList<Point3D>(); + + for (ChargeCarrier bias_carrier : ChargeCarrier.values()) + { + intersection_points.add(GeomOp3D.intersection(drift_line,_sensor.getBiasSurface(bias_carrier).getPlane())); + } + + Hep3Vector corrected_position = VecOp.mult(0.5,VecOp.add(intersection_points.get(0),intersection_points.get(1))); + + ITransform3D transform = new Transform3D(new Translation3D(VecOp.sub(corrected_position,position))); + + transform.transform(position); + } +

// Project-to-plane would definitely be convenient here!!! double cos_theta_lorentz = VecOp.dot(_drift_direction.get(carrier),_sensor.getBiasSurface(carrier).getNormal());

Commit in `lcsim` on MAIN
`test/org/lcsim/detector/driver/TrackerBarrelDigitizationDriverTest.java`	+161		added 1.1
`/TrackerEndcapDigitizationDriverTest.java`	+14	-15	1.2 -> 1.3
`/TrackerHitDriverTest.java`	+9	-11	1.5 -> 1.6
`src/org/lcsim/contrib/RobKutschke/TKNHits/TKNRawHitsDriverV1.java`	+89	-78	1.2 -> 1.3
`src/org/lcsim/contrib/SiStripSim/CDFSiSensorSim.java`	+40	-5	1.7 -> 1.8
`/StripClusterMaker.java`	+8	-1	1.7 -> 1.8
`/SiSensorSim.java`	+10	-4	1.2 -> 1.3
	+331	-114