Iss677 - Layer 0/1 changes and 2019 trigger drivers

detector-model/src/main/java/org/lcsim/detector/tracker/silicon/HpsThinSiSensor.java

@@ -56,24 +56,36 @@ public double getSenseTransferEfficiency() {
     @Override
     public void initialize() {
 
+        // Get the transformation that will be used to place the electrodes on 
+        // the face of the sensor. 
         Transform3D electrodesTransform = this.getElectrodesTransform();
 
-        // Set the number of readout and sense electrodes.
-        final SiStrips readoutElectrodes = new ThinSiStrips(ChargeCarrier.HOLE, getReadoutStripPitch(), this,
-                electrodesTransform);
-        final SiStrips senseElectrodes = new ThinSiStrips(ChargeCarrier.HOLE, getSenseStripPitch(),
-                this.getNumberOfSenseStrips(), this, electrodesTransform);
+        // Column pitch is the length of the sensor divided by 2.
+        double stripLength = this.getStripLength()/2; 
 
-        final double readoutCapacitance = this.getStripLength() > this.longSensorLengthThreshold ? this.readoutLongStripCapacitanceSlope
-                : this.readoutStripCapacitanceSlope;
-        final double senseCapacitance = this.getStripLength() > this.longSensorLengthThreshold ? this.senseLongStripCapacitanceSlope
-                : this.senseStripCapacitanceSlope;
+        // Set the number of readout and sense electrodes.
+        final SiStriplets readoutElectrodes = new SiStriplets(ChargeCarrier.HOLE, 
+                           getReadoutStripPitch(), // Strip pitch = 55 um
+                           stripLength,            // Column pitch 
+                           this, 
+                           electrodesTransform     // Parent to local transform
+                           );   
+
+        // TODO: Investigate whether this needs to be defined or if it can be 
+        //       set to null.  
+        final SiStriplets senseElectrodes = new SiStriplets(ChargeCarrier.HOLE, 
+                           getReadoutStripPitch(), // Strip pitch = 55 um
+                           stripLength,            // Column pitch 
+                           this, 
+                           electrodesTransform     // Parent to local transform
+                           );   
 
         // Set the strip capacitance.
-        readoutElectrodes.setCapacitanceIntercept(this.readoutStripCapacitanceIntercept);
-        readoutElectrodes.setCapacitanceSlope(readoutCapacitance);
-        senseElectrodes.setCapacitanceIntercept(this.senseStripCapacitanceIntercept);
-        senseElectrodes.setCapacitanceSlope(senseCapacitance);
+        double readoutCapacitance = this.readoutStripCapacitanceIntercept + readoutStripCapacitanceSlope*stripLength; 
+        double senseCapacitance = this.senseStripCapacitanceIntercept + senseStripCapacitanceSlope*stripLength; 
+        readoutElectrodes.setCapacitance(readoutCapacitance);
+
+        senseElectrodes.setCapacitance(senseCapacitance);
 
         // Set sense and readout electrodes.
         this.setSenseElectrodes(senseElectrodes);

detector-model/src/main/java/org/lcsim/detector/tracker/silicon/SiStriplets.java

@@ -0,0 +1,77 @@
+package org.lcsim.detector.tracker.silicon; 
+
+import hep.physics.vec.BasicHep3Vector;
+import hep.physics.vec.Hep3Vector;
+
+import org.lcsim.detector.IDetectorElement;
+import org.lcsim.detector.ITransform3D;
+
+/**
+ * Class describing striplet electrodes of a silicon sensor. This class extends
+ * {@link SiPixels} but overrides the calculation of the strip ID and provides 
+ * methods needed to create 1D strip hits. 
+ *
+ * @author Omar Moreno, SLAC National Accelerator Laboratory
+ */
+public class SiStriplets extends SiPixels { 
+
+    /**
+     * Constructor.
+     *
+     * @param carrier 
+     * @param rowPitch
+     * @param colPitch
+     * @param detector
+     * @param parentToLocal 
+     */
+    public SiStriplets(ChargeCarrier carrier, double rowPitch, double colPitch, 
+            IDetectorElement detector, ITransform3D parentToLocal) { 
+        super(carrier, rowPitch, colPitch, detector, parentToLocal); 
+    }
+
+    @Override
+    public int getCellID(int row, int column) { 
+
+        if (row < 0 || row >= getNCells(0)) return -1; 
+
+        if (column < 0 || column >= getNCells(1)) return -1; 
+
+        int id = (column == 0) ? row : ((column + 1)*getNCells(0) - row); 
+
+        return id;
+    }
+
+
+    @Override 
+    public int getRowNumber(int cellID) {
+
+        int row = (getColumnNumber(cellID) == 0) ? cellID : (getColumnNumber(cellID) + 1)*getNCells(0) - cellID;
+
+        return row;      
+    }
+
+    @Override
+    public int getColumnNumber(int cellID) {
+        return (int) Math.floor(cellID/getNCells(0));  
+    }
+
+    public Hep3Vector getStripCenter(int cellID) { 
+
+        //System.out.println("SiStriplets::getStripCenter : Row Offset: " + _row_offset); 
+        //System.out.println("SiStriplets::getStripCenter : Cell ID: " + cellID); 
+        //System.out.println("SiStriplets::getStripCenter : Row: " + getRowNumber(cellID));  
+        double u = getRowNumber(cellID)*_row_pitch - _row_offset;   
+        //System.out.println("SiStriplets::getStripCenter : u: " + u);
+
+        double v = getColumnNumber(cellID)*_col_pitch - _col_offset; 
+        //System.out.println("SiStriplets::getStripCenter : v: " + v);
+
+        return new BasicHep3Vector(u, v, 0.0); 
+    }
+
+    public double getStripLength(int cellID) {
+        return _col_pitch; 
+    }
+
+}
+