Commit in hps-java/src/main/java/org/lcsim/hps/recon/ecal on MAIN | |||
HPSFADCTriggerDriver.java | +7 | -6 | 1.9 -> 1.10 |
HPSTriggerDriver.java | +6 | -3 | 1.19 -> 1.20 |
HPSEcalEdepToTriggerConverterDriver.java | +1 | -1 | 1.4 -> 1.5 |
+14 | -10 |
make the pair trigger work
diff -u -r1.9 -r1.10 --- HPSFADCTriggerDriver.java 26 Sep 2012 23:31:10 -0000 1.9 +++ HPSFADCTriggerDriver.java 27 Sep 2012 23:48:42 -0000 1.10 @@ -15,18 +15,19 @@
* * @author Omar Moreno <[log in to unmask]> * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSFADCTriggerDriver.java,v 1.9 2012/09/26 23:31:10 meeg Exp $
+ * @version $Id: HPSFADCTriggerDriver.java,v 1.10 2012/09/27 23:48:42 meeg Exp $
*/ public class HPSFADCTriggerDriver extends HPSTriggerDriver {
+ private static final double GeV = 1000;
// A list to contain all cluster pairs in an event List<HPSEcalCluster[]> clusterPairs; int nTriggers; int totalEvents;
- private double clusterEnergyHigh = 1.85; // GeV - private double clusterEnergyLow = .1; // GeV - private double energySumThreshold = 2.2; // GeV - private double energyDifferenceThreshold = 1.5; // GeV
+ private double clusterEnergyHigh = 1.85 * GeV; // GeV + private double clusterEnergyLow = .1 * GeV; // GeV + private double energySumThreshold = 2.2 * GeV; // GeV + private double energyDifferenceThreshold = 1.5 * GeV; // GeV
private double maxCoplanarityAngle = 35; // degrees int oppositeQuadrantCount; int clusterEnergyCount;
@@ -290,7 +291,7 @@
double clusterDistvsE = lowEnergyCluster.getEnergy() + lowEClusterDistance * (0.0032);
- if (clusterDistvsE > .8 /*
+ if (clusterDistvsE > .8 * GeV /*
* GeV */) { return true;
diff -u -r1.19 -r1.20 --- HPSTriggerDriver.java 27 Sep 2012 00:15:27 -0000 1.19 +++ HPSTriggerDriver.java 27 Sep 2012 23:48:42 -0000 1.20 @@ -2,6 +2,7 @@
import java.io.File; import java.io.IOException;
+import java.io.PrintStream;
import java.io.PrintWriter; import java.util.LinkedList; import java.util.List;
@@ -23,12 +24,12 @@
* Applies SVT trigger latency and sends trigger signal to SVT * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSTriggerDriver.java,v 1.19 2012/09/27 00:15:27 meeg Exp $
+ * @version $Id: HPSTriggerDriver.java,v 1.20 2012/09/27 23:48:42 meeg Exp $
*/ public abstract class HPSTriggerDriver extends Driver { protected String clusterCollectionName = "EcalClusters";
- private String outputFileName;
+ private String outputFileName = null;
protected PrintWriter outputStream = null; protected int numTriggers; private int lastTrigger;
@@ -80,10 +81,12 @@
if (outputFileName != null) { try {
- outputStream = new PrintWriter(outputFileName);
+ outputStream = new PrintWriter(new PrintStream(outputFileName), true);
} catch (IOException ex) { throw new RuntimeException("Invalid outputFilePath!"); }
+ } else { + outputStream = new PrintWriter(System.out, true);
} if (lcioFile != null) {
diff -u -r1.4 -r1.5 --- HPSEcalEdepToTriggerConverterDriver.java 31 Aug 2012 01:26:33 -0000 1.4 +++ HPSEcalEdepToTriggerConverterDriver.java 27 Sep 2012 23:48:42 -0000 1.5 @@ -126,7 +126,7 @@
// System.out.format("%f %f %f\n", readoutIntegral, amplitude, triggerIntegral);
- int truncatedIntegral = (int) Math.floor(triggerIntegral / truncateScale) * truncateScale;
+ int truncatedIntegral = (int) Math.floor(triggerIntegral / truncateScale) /** truncateScale*/;
if (truncatedIntegral > 0) { return new HPSRawCalorimeterHit(truncatedIntegral, hit.getTime(), id, 0); }
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