Commit in hps-java/src/main/java/org/lcsim/hps/recon/ecal on MAIN | |||
HPSFADCTriggerDriver.java | +14 | -7 | 1.11 -> 1.12 |
HPSTriggerDriver.java | +6 | -6 | 1.20 -> 1.21 |
+20 | -13 |
Added and fixed some debug output.
diff -u -r1.11 -r1.12 --- HPSFADCTriggerDriver.java 1 Oct 2012 18:09:57 -0000 1.11 +++ HPSFADCTriggerDriver.java 2 Oct 2012 01:56:08 -0000 1.12 @@ -15,7 +15,7 @@
* * @author Omar Moreno <[log in to unmask]> * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSFADCTriggerDriver.java,v 1.11 2012/10/01 18:09:57 meeg Exp $
+ * @version $Id: HPSFADCTriggerDriver.java,v 1.12 2012/10/02 01:56:08 phansson Exp $
*/ public class HPSFADCTriggerDriver extends HPSTriggerDriver {
@@ -29,6 +29,7 @@
private double energySumThreshold = 2.2 * GeV; // GeV private double energyDifferenceThreshold = 1.5 * GeV; // GeV private double maxCoplanarityAngle = 35; // degrees
+ int allPairs;
int oppositeQuadrantCount; int clusterEnergyCount; int energySumCount;
@@ -45,6 +46,7 @@
public void startOfData() { super.startOfData();
+ allPairs = 0;
oppositeQuadrantCount = 0; clusterEnergyCount = 0; energySumCount = 0;
@@ -66,14 +68,17 @@
// one of the cluster pairs satisfies all of the trigger conditions, // a trigger signal is sent to all other detectors. for (HPSEcalCluster[] clusterPair : clusterPairs) {
-
+ +
if (outputStream != null) {
- outputStream.printf("Event %d: cluster pair (energy %f in quadrant %d, energy %f in quadrant %d)\n",
+ outputStream.printf("Event %d: cluster pair (energy %f in quadrant %d (%s), energy %f in quadrant %d (%s))\n",
ClockSingleton.getClock(),
- clusterPair[0].getEnergy(), HPSECalUtils.getQuadrant(clusterPair[0]), - clusterPair[1].getEnergy(), HPSECalUtils.getQuadrant(clusterPair[1]));
+ clusterPair[0].getEnergy(), HPSECalUtils.getQuadrant(clusterPair[0]),clusterPair[0].getSeedHit().getPositionVec().toString(), + clusterPair[1].getEnergy(), HPSECalUtils.getQuadrant(clusterPair[1]),clusterPair[1].getSeedHit().getPositionVec().toString());
}
-
+ + allPairs++; +
// Require that the event have at least two clusters in opposite // quadrants if (!oppositeQuadrantsCut(clusterPair)) {
@@ -152,6 +157,7 @@
@Override public void endOfData() { if (outputStream != null) {
+ outputStream.printf("Number of pairs: %d\n",allPairs);
outputStream.printf("Number of cluster pairs after successive trigger conditions:\n"); outputStream.printf("Opposite quadrants: %d\n", oppositeQuadrantCount); outputStream.printf("Cluster energy: %d\n", clusterEnergyCount);
@@ -163,6 +169,7 @@
outputStream.printf("Trigger count: %d\n", numTriggers); outputStream.close(); }
+ System.out.printf("Number of pairs: %d\n",allPairs);
System.out.printf("Number of cluster pairs after successive trigger conditions:\n"); System.out.printf("Opposite quadrants: %d\n", oppositeQuadrantCount); System.out.printf("Cluster energy: %d\n", clusterEnergyCount);
@@ -314,7 +321,7 @@
+ Math.pow(cluster1Position[1], 2)); double cluster2Dist = Math.sqrt(Math.pow(cluster2Position[0], 2) + Math.pow(cluster2Position[1], 2));
-
+
// Calculate the dot product between the distance vectors of // each cluster in the cluster pair double clusterDot = cluster1Position[0] * cluster2Position[0]
diff -u -r1.20 -r1.21 --- HPSTriggerDriver.java 27 Sep 2012 23:48:42 -0000 1.20 +++ HPSTriggerDriver.java 2 Oct 2012 01:56:08 -0000 1.21 @@ -24,10 +24,10 @@
* Applies SVT trigger latency and sends trigger signal to SVT * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSTriggerDriver.java,v 1.20 2012/09/27 23:48:42 meeg Exp $
+ * @version $Id: HPSTriggerDriver.java,v 1.21 2012/10/02 01:56:08 phansson Exp $
*/ public abstract class HPSTriggerDriver extends Driver {
-
+ private boolean _DEBUG = false;
protected String clusterCollectionName = "EcalClusters"; private String outputFileName = null; protected PrintWriter outputStream = null;
@@ -86,7 +86,7 @@
throw new RuntimeException("Invalid outputFilePath!"); } } else {
- outputStream = new PrintWriter(System.out, true);
+ if(_DEBUG) outputStream = new PrintWriter(System.out, true);
} if (lcioFile != null) {
@@ -113,7 +113,7 @@
triggerBit = true; lastTrigger = ClockSingleton.getClock(); numTriggers++;
- System.out.printf("Trigger on event %d\n", event.getEventNumber());
+ if(_DEBUG) System.out.printf(this.getClass().getSimpleName() + ": Trigger on event %d\n", event.getEventNumber());
if (outputStream != null) { outputStream.printf("Trigger on event %d\n", event.getEventNumber()); }
@@ -123,7 +123,7 @@
svtTriggerTimeStamp.add(ClockSingleton.getTime() + svtTriggerLatency); ecalTriggerTimestamps.add(ClockSingleton.getTime() + ecalTriggerLatency); triggerTriggerTimestamps.add(ClockSingleton.getTime() + triggerTriggerLatency);
- System.out.println(this.getClass().getSimpleName() + ": Trigger added on event " + event.getEventNumber());
+ if(_DEBUG) 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());
@@ -212,7 +212,7 @@
Logger.getLogger(HPSTriggerDriver.class.getName()).log(Level.SEVERE, null, ex); } }
- System.out.printf("Trigger count: %d\n", numTriggers);
+ System.out.printf(this.getClass().getSimpleName() + ": Trigger count: %d\n", numTriggers);
} public static boolean triggerBit() {
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