Commit in hps-java/src/main/java/org/lcsim/hps/recon/ecal on MAIN | |||
TestRunTriggerDriver.java | +3 | -1 | 1.6 -> 1.7 |
HPSTriggerDriver.java | +6 | -4 | 1.15 -> 1.16 |
+9 | -5 |
Added trigger delay
diff -u -r1.6 -r1.7 --- TestRunTriggerDriver.java 8 Aug 2012 00:46:01 -0000 1.6 +++ TestRunTriggerDriver.java 15 Sep 2012 00:43:47 -0000 1.7 @@ -12,7 +12,7 @@
* * @author Omar Moreno <[log in to unmask]> * @author Sho Uemura <[log in to unmask]>
- * @version $Id: TestRunTriggerDriver.java,v 1.6 2012/08/08 00:46:01 meeg Exp $
+ * @version $Id: TestRunTriggerDriver.java,v 1.7 2012/09/15 00:43:47 omoreno Exp $
*/ public class TestRunTriggerDriver extends HPSTriggerDriver {
@@ -73,8 +73,10 @@
if (cluster.getEnergy() > clusterEnergyLow) { if (cluster.getPosition()[1] > 0) { topBits |= 1;
+ triggerDelay = 0;
} else { botBits |= 1;
+ triggerDelay = 20;
} trigger = true; }
diff -u -r1.15 -r1.16 --- HPSTriggerDriver.java 23 Aug 2012 18:48:18 -0000 1.15 +++ HPSTriggerDriver.java 15 Sep 2012 00:43:47 -0000 1.16 @@ -8,6 +8,7 @@
import org.lcsim.event.EventHeader;
+import org.lcsim.hps.recon.tracking.apv25.Apv25Full;
import org.lcsim.hps.recon.tracking.apv25.HPSAPV25; import org.lcsim.hps.util.ClockSingleton; import org.lcsim.util.Driver;
@@ -18,7 +19,7 @@
* Applies SVT trigger latency and sends trigger signal to SVT * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSTriggerDriver.java,v 1.15 2012/08/23 18:48:18 meeg Exp $
+ * @version $Id: HPSTriggerDriver.java,v 1.16 2012/09/15 00:43:47 omoreno Exp $
*/ public abstract class HPSTriggerDriver extends Driver {
@@ -28,6 +29,7 @@
protected int numTriggers; private int lastTrigger; private int deadTime = 0;
+ protected int triggerDelay = 0;
// FIFO queue to store the svt trigger time stamp public Queue<Double> svtTriggerTimeStamp = new LinkedList<Double>(); // SVT trigger latency
@@ -98,11 +100,10 @@
// If an ECal trigger signal has been sent store the trigger // time offset by the trigger latencies
- svtTriggerTimeStamp.offer( - ClockSingleton.getTime() + svtTriggerLatency);
+ svtTriggerTimeStamp.offer(ClockSingleton.getTime() + svtTriggerLatency + triggerDelay);
ecalTriggerTimestamps.add(ClockSingleton.getTime() + ecalTriggerLatency); triggerTriggerTimestamps.add(ClockSingleton.getTime() + triggerTriggerLatency);
- System.out.println("Trigger added");
+ System.out.println(this.getClass().getSimpleName() + ": Trigger added on event " + event.getEventNumber());
if (outputStream != null) { outputStream.printf("trigger sent to ET event builder on event %d\n", event.getEventNumber());
@@ -124,6 +125,7 @@
// Send a trigger signal to the SVT HPSAPV25.readoutBit = true;
+ Apv25Full.readoutBit = true;
svtTriggerTimeStamp.remove(); }
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1