Commit in hps-java/src/main on MAIN | |||
java/org/lcsim/hps/recon/ecal/HPSTriggerDriver.java | +14 | -3 | 1.4 -> 1.5 |
resources/org/lcsim/hps/steering/ecal_fadc_ap.lcsim | +3 | -3 | 1.3 -> 1.4 |
/ecal_fadc_bkgd.lcsim | +2 | -2 | 1.6 -> 1.7 |
/ecal_1bit_bkgd.lcsim | +7 | -7 | 1.7 -> 1.8 |
/ecal_1bit_ap.lcsim | +7 | -6 | 1.6 -> 1.7 |
java/org/lcsim/hps/util/ClockSingleton.java | +3 | -13 | 1.3 -> 1.4 |
+36 | -34 |
update all ECal steering files
diff -u -r1.4 -r1.5 --- HPSTriggerDriver.java 9 Jan 2012 22:39:08 -0000 1.4 +++ HPSTriggerDriver.java 12 Jan 2012 00:26:16 -0000 1.5 @@ -16,7 +16,7 @@
* Prints triggers to file if file path specified. * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSTriggerDriver.java,v 1.4 2012/01/09 22:39:08 meeg Exp $
+ * @version $Id: HPSTriggerDriver.java,v 1.5 2012/01/12 00:26:16 meeg Exp $
*/ public abstract class HPSTriggerDriver extends Driver {
@@ -27,10 +27,20 @@
String outputFileName; PrintWriter outputStream = null; int numTriggers;
+ private int lastTrigger; + private int deadTime = 0;
public HPSTriggerDriver() { }
+ /** + * Set dead time; 0 for no dead time + * @param deadTime Minimum number of clock ticks between triggers + */ + public void setDeadTime(int deadTime) { + this.deadTime = deadTime; + } +
public void setClusterCollectionName(String clusterCollectionName) { this.clusterCollectionName = clusterCollectionName; }
@@ -84,8 +94,9 @@
} if (testTrigger(clusters)) {
- ClockSingleton.setTrigger(); - if (ClockSingleton.triggered()) {
+ if (ClockSingleton.getClock() - lastTrigger > deadTime) { + ClockSingleton.setTrigger(); + lastTrigger = ClockSingleton.getClock();
numTriggers++; if (outputStream != null) { outputStream.printf("Trigger on event %d\n", event.getEventNumber());
diff -u -r1.3 -r1.4 --- ecal_fadc_ap.lcsim 11 Jan 2012 23:30:10 -0000 1.3 +++ ecal_fadc_ap.lcsim 12 Jan 2012 00:26:16 -0000 1.4 @@ -1,8 +1,7 @@
<!-- Example LCSim steering file to run simple HPS ECal clustering and analysis. @author Sho Uemura <[log in to unmask]>
- @version $Id: ecal_fadc_ap.lcsim,v 1.3 2012/01/11 23:30:10 meeg Exp $ -
+ @version $Id: ecal_fadc_ap.lcsim,v 1.4 2012/01/12 00:26:16 meeg Exp $
--> <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -52,6 +51,7 @@
<clusterCollectionName>EcalClusters</clusterCollectionName> <outputFileName>${outputFile}.triggers</outputFileName> <ecalName>Ecal</ecalName>
+ <deadTime>0</deadTime>
</driver> <driver name="EcalPlots" type="org.lcsim.hps.analysis.ecal.HPSEcalPlotsDriver">
@@ -70,7 +70,7 @@
</driver> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>100</eventInterval>
+ <eventInterval>1000</eventInterval>
</driver> <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
diff -u -r1.6 -r1.7 --- ecal_fadc_bkgd.lcsim 11 Jan 2012 18:45:13 -0000 1.6 +++ ecal_fadc_bkgd.lcsim 12 Jan 2012 00:26:16 -0000 1.7 @@ -1,8 +1,7 @@
<!-- Example LCSim steering file to run simple HPS ECal clustering and analysis. @author Sho Uemura <[log in to unmask]>
- @version $Id: ecal_fadc_bkgd.lcsim,v 1.6 2012/01/11 18:45:13 meeg Exp $ -
+ @version $Id: ecal_fadc_bkgd.lcsim,v 1.7 2012/01/12 00:26:16 meeg Exp $
--> <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -64,6 +63,7 @@
<clusterCollectionName>EcalClusters</clusterCollectionName> <outputFileName>${outputFile}.triggers</outputFileName> <ecalName>Ecal</ecalName>
+ <deadTime>10</deadTime>
</driver> <driver name="EcalPlots" type="org.lcsim.hps.analysis.ecal.HPSEcalPlotsDriver">
diff -u -r1.7 -r1.8 --- ecal_1bit_bkgd.lcsim 9 Dec 2011 23:40:21 -0000 1.7 +++ ecal_1bit_bkgd.lcsim 12 Jan 2012 00:26:16 -0000 1.8 @@ -1,13 +1,12 @@
<!-- Example LCSim steering file to run simple HPS ECal clustering and analysis. @author Sho Uemura <[log in to unmask]>
- @version $Id: ecal_1bit_bkgd.lcsim,v 1.7 2011/12/09 23:40:21 meeg Exp $ -
+ @version $Id: ecal_1bit_bkgd.lcsim,v 1.8 2012/01/12 00:26:16 meeg Exp $
--> <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <inputFiles>
- <file>${inputFile}.slcio</file>
+ <file>${inputFile}</file>
</inputFiles> <control> <numberOfEvents>-1</numberOfEvents>
@@ -29,7 +28,7 @@
<drivers> <driver name="Writer" type="org.lcsim.util.loop.LCIODriver">
- <outputFilePath>${inputFile}_ecalClusters</outputFilePath>
+ <outputFilePath>${outputFile}_ecalClusters</outputFilePath>
</driver> <driver name="EcalReadout" type="org.lcsim.hps.recon.ecal.HPSEcalDiscriminatorReadoutDriver">
@@ -51,8 +50,9 @@
<driver name="EcalTrigger" type="org.lcsim.hps.recon.ecal.HPS1BitTriggerDriver"> <clusterCollectionName>EcalClusters</clusterCollectionName>
- <outputFileName>${inputFile}_triggers</outputFileName>
+ <outputFileName>${outputFile}.triggers</outputFileName>
<ecalName>Ecal</ecalName>
+ <deadTime>10</deadTime>
</driver> <driver name="EcalPlots" type="org.lcsim.hps.analysis.ecal.HPSEcalPlotsDriver">
@@ -60,11 +60,11 @@
</driver> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>100</eventInterval>
+ <eventInterval>1000</eventInterval>
</driver> <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>${inputFile}_ecalPlots</outputFileName>
+ <outputFileName>${outputFile}_ecalPlots</outputFileName>
</driver> <driver name="ClockDriver" type="org.lcsim.hps.util.ClockDriver">
diff -u -r1.6 -r1.7 --- ecal_1bit_ap.lcsim 9 Dec 2011 23:40:21 -0000 1.6 +++ ecal_1bit_ap.lcsim 12 Jan 2012 00:26:16 -0000 1.7 @@ -1,12 +1,12 @@
<!-- Example LCSim steering file to run simple HPS ECal clustering and analysis. @author Sho Uemura <[log in to unmask]>
- @version $Id: ecal_1bit_ap.lcsim,v 1.6 2011/12/09 23:40:21 meeg Exp $
+ @version $Id: ecal_1bit_ap.lcsim,v 1.7 2012/01/12 00:26:16 meeg Exp $
--> <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <inputFiles>
- <file>${inputFile}.slcio</file>
+ <file>${inputFile}</file>
</inputFiles> <control> <numberOfEvents>-1</numberOfEvents>
@@ -28,7 +28,7 @@
<drivers> <driver name="Writer" type="org.lcsim.util.loop.LCIODriver">
- <outputFilePath>${inputFile}_ecalClusters</outputFilePath>
+ <outputFilePath>${outputFile}_ecalClusters</outputFilePath>
</driver> <driver name="EcalReadout" type="org.lcsim.hps.recon.ecal.HPSEcalSimpleReadoutDriver">
@@ -49,8 +49,9 @@
<driver name="EcalTrigger" type="org.lcsim.hps.recon.ecal.HPS1BitTriggerDriver"> <clusterCollectionName>EcalClusters</clusterCollectionName>
- <outputFileName>${inputFile}_triggers</outputFileName>
+ <outputFileName>${outputFile}.triggers</outputFileName>
<ecalName>Ecal</ecalName>
+ <deadTime>0</deadTime>
</driver> <driver name="EcalPlots" type="org.lcsim.hps.analysis.ecal.HPSEcalPlotsDriver">
@@ -58,11 +59,11 @@
</driver> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>100</eventInterval>
+ <eventInterval>1000</eventInterval>
</driver> <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>${inputFile}_ecalPlots</outputFileName>
+ <outputFileName>${outputFile}_ecalPlots</outputFileName>
</driver> <driver name="ClockDriver" type="org.lcsim.hps.util.ClockDriver">
diff -u -r1.3 -r1.4 --- ClockSingleton.java 9 Jan 2012 22:39:08 -0000 1.3 +++ ClockSingleton.java 12 Jan 2012 00:26:16 -0000 1.4 @@ -10,18 +10,15 @@
* A better solution might be to store absolute time and triggers in the event. * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: ClockSingleton.java,v 1.3 2012/01/09 22:39:08 meeg Exp $
+ * @version $Id: ClockSingleton.java,v 1.4 2012/01/12 00:26:16 meeg Exp $
*/ public class ClockSingleton {
- public static final ClockSingleton _instance = new ClockSingleton();
+ public static final ClockSingleton _instance = new ClockSingleton();
private int clock; //time between events (bunch spacing) private double dt = 2.0;
-
private boolean trigger = false;
- private int lastTrigger; - private int deadTime = 10;
private ClockSingleton() { }
@@ -46,10 +43,6 @@
_instance.dt = dt; }
- public static void setDeadTime(int deadTime) { - _instance.deadTime = deadTime; - } -
public static boolean triggered() { return _instance.trigger; }
@@ -58,10 +51,7 @@
// _instance.trigger = trigger; // } public static void setTrigger() {
- if (getClock() - _instance.lastTrigger >= _instance.deadTime) { - _instance.trigger = true; - _instance.lastTrigger = getClock(); - }
+ _instance.trigger = true;
} public static void step() {
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