hps-java/src/main/java/org/lcsim/hps/recon/tracking/apv25
diff -u -r1.10 -r1.11
--- SvtReadout.java 19 Nov 2012 22:17:13 -0000 1.10
+++ SvtReadout.java 20 Dec 2012 08:25:46 -0000 1.11
@@ -1,3 +1,4 @@
+
package org.lcsim.hps.recon.tracking.apv25;
//--- java ---//
@@ -36,7 +37,7 @@
/**
*
* @author Omar Moreno <[log in to unmask]>
- * @version $Id: SvtReadout.java,v 1.10 2012/11/19 22:17:13 omoreno Exp $
+ * @version $Id: SvtReadout.java,v 1.11 2012/12/20 08:25:46 omoreno Exp $
*/
public class SvtReadout extends Driver {
@@ -131,6 +132,7 @@
for(Apv25Full apv : halfModule.getAllApv25s()){
apv.setLatency(triggerLatencyTime);
}
+ sensorToChannel.put(halfModule.getSensor(), new ArrayList<Integer>());
}
// Load the driver which transfers SimTrackerHits to their
@@ -259,6 +261,7 @@
System.out.println(this.getClass().getSimpleName()
+ ": Sensor: " + SvtUtils.getInstance().getDescription(halfModule.getSensor())
+ ": Injecting charge " + charge + " into channel " + physicalChannel);
+ sensorToChannel.get(halfModule.getSensor()).add(physicalChannel);
}
}
@@ -288,13 +291,27 @@
// Get all of the APVs associated with the sensor
Apv25Full[] apv25 = halfModule.getAllApv25s();
+ if(debug){
+ for(int physicalChannel = 0; physicalChannel < TOTAL_APV25_CHANNELS; physicalChannel++){
+ if(sensorToChannel.get(halfModule.getSensor()).contains(physicalChannel)){
+ int channel = physicalChannel - TOTAL_STRIPS_PER_SENSOR
+ + halfModule.getAPV25Number(physicalChannel)*TOTAL_APV25_CHANNELS + (TOTAL_APV25_CHANNELS - 1);
+ System.out.println("\nPhysical Channel: " + physicalChannel
+ + " Sensor: " + SvtUtils.getInstance().getDescription(halfModule.getSensor())
+ + apv25[halfModule.getAPV25Number(physicalChannel)].getChannel(channel).getPipeline().toString() + "\n");
+ }
+ }
+ }
+
// Readout all APV25's
for(int apvN = 0; apvN < apv25.length; apvN++){
Apv25AnalogData analogDatum = apv25[apvN].readOut();
analogDatum.setSensor(sensor);
analogDatum.setApv(apvN);
analogData.add(analogDatum);
+
}
+ sensorToChannel.get(halfModule.getSensor()).clear();
}
return analogData;