2 added + 2 removed + 2 modified, total 6 files
hps-java/src/main/java/org/lcsim/hps/monitoring/ecal
diff -N ECalCellIDPrintDriver.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ ECalCellIDPrintDriver.java 1 May 2012 15:06:38 -0000 1.1
@@ -0,0 +1,80 @@
+package org.lcsim.hps.monitoring.ecal;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawCalorimeterHit;
+import org.lcsim.event.RawTrackerHit;
+import org.lcsim.geometry.Detector;
+import org.lcsim.geometry.IDDecoder;
+import org.lcsim.geometry.Subdetector;
+import org.lcsim.util.Driver;
+
+/**
+ *
+ * @author Sho Uemura <[log in to unmask]>
+ * @version $Id: ECalCellIDPrintDriver.java,v 1.1 2012/05/01 15:06:38 meeg Exp $
+ */
+public class ECalCellIDPrintDriver extends Driver {
+
+ Subdetector ecal;
+ IDDecoder dec;
+ String ecalName = "Ecal";
+ String ecalCollectionName = "EcalReadoutHits";
+ String outputFileName;
+ PrintWriter outputStream = null;
+
+ public ECalCellIDPrintDriver() {
+ }
+
+ public void setEcalCollectionName(String ecalCollectionName) {
+ this.ecalCollectionName = ecalCollectionName;
+ }
+
+ public void setEcalName(String ecalName) {
+ this.ecalName = ecalName;
+ }
+
+ public void setOutputFileName(String outputFileName) {
+ this.outputFileName = outputFileName;
+ }
+
+ public void startOfData() {
+ if (outputFileName != null) {
+ try {
+ outputStream = new PrintWriter(outputFileName);
+ } catch (IOException ex) {
+ throw new RuntimeException("Invalid outputFilePath!");
+ }
+ } else {
+ outputStream = new PrintWriter(System.out, true);
+ }
+ }
+
+ public void detectorChanged(Detector detector) {
+ // Get the Subdetector.
+ ecal = (Subdetector) detector.getSubdetector(ecalName);
+ dec = ecal.getIDDecoder();
+ }
+
+ public void process(EventHeader event) {
+ // Get the list of ECal hits.
+ if (event.hasCollection(RawCalorimeterHit.class, ecalCollectionName)) {
+ List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, ecalCollectionName);
+ //outputStream.println("Reading RawCalorimeterHit from event " + event.getEventNumber());
+ for (RawCalorimeterHit hit : hits) {
+ dec.setID(hit.getCellID());
+ outputStream.printf("x=%d\ty=%d\n", dec.getValue("ix"), dec.getValue("iy"));
+ }
+ }
+ if (event.hasCollection(RawTrackerHit.class, ecalCollectionName)) {
+ List<RawTrackerHit> hits = event.get(RawTrackerHit.class, ecalCollectionName);
+ //outputStream.println("Reading RawCalorimeterHit from event " + event.getEventNumber());
+ for (RawTrackerHit hit : hits) {
+ dec.setID(hit.getCellID());
+ outputStream.printf("x=%d\ty=%d\n", dec.getValue("ix"), dec.getValue("iy"));
+ }
+ }
+ }
+}
\ No newline at end of file
hps-java/src/main/java/org/lcsim/hps/monitoring/svt
diff -N SVTCellIDPrintDriver.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ SVTCellIDPrintDriver.java 1 May 2012 15:06:39 -0000 1.1
@@ -0,0 +1,67 @@
+package org.lcsim.hps.monitoring.svt;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawTrackerHit;
+import org.lcsim.hps.recon.tracking.HPSSVTData;
+import org.lcsim.util.Driver;
+
+/**
+ *
+ * @author Sho Uemura <[log in to unmask]>
+ * @version $Id: HPSEcalDigitalPrintDriver.java,v 1.5 2012/04/27 22:13:52 meeg
+ * Exp $
+ */
+public class SVTCellIDPrintDriver extends Driver {
+
+ String rawTrackerHitCollectionName = "SVTData";
+ String outputFileName;
+ PrintWriter outputStream = null;
+
+ public SVTCellIDPrintDriver() {
+ }
+
+ public void setRawTrackerHitCollectionName(String rawTrackerHitCollectionName) {
+ this.rawTrackerHitCollectionName = rawTrackerHitCollectionName;
+ }
+
+ public void setOutputFileName(String outputFileName) {
+ this.outputFileName = outputFileName;
+ }
+
+ public void startOfData() {
+ if (rawTrackerHitCollectionName == null) {
+ throw new RuntimeException("The parameter ecalCollectionName was not set!");
+ }
+
+ if (outputFileName != null) {
+ try {
+ outputStream = new PrintWriter(outputFileName);
+ } catch (IOException ex) {
+ throw new RuntimeException("Invalid outputFilePath!");
+ }
+ } else {
+ outputStream = new PrintWriter(System.out, true);
+ }
+ }
+
+ public void process(EventHeader event) {
+ // Get the list of ECal hits.
+ if (event.hasCollection(HPSSVTData.class, rawTrackerHitCollectionName)) {
+ List<HPSSVTData> hits = event.get(HPSSVTData.class, rawTrackerHitCollectionName);
+ //outputStream.println("Reading RawCalorimeterHit from event " + event.getEventNumber());
+ for (HPSSVTData hit : hits) {
+ outputStream.printf("FPGA=%d\thybrid=%d\tchannel=%d\n", hit.getFPGAAddress(), hit.getHybridNumber(), hit.getChannelNumber());
+ }
+ }
+ if (event.hasCollection(RawTrackerHit.class, rawTrackerHitCollectionName)) {
+ List<RawTrackerHit> hits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName);
+ //outputStream.println("Reading RawCalorimeterHit from event " + event.getEventNumber());
+ for (RawTrackerHit hit : hits) {
+ outputStream.printf("name=%s\tside=%d\tstrip=%d\n", hit.getDetectorElement().getName(), hit.getIdentifierFieldValue("side"), hit.getIdentifierFieldValue("strip"));
+ }
+ }
+ }
+}
\ No newline at end of file
hps-java/src/main/java/org/lcsim/hps/users/meeg
diff -N ECalCellIDPrintDriver.java
--- ECalCellIDPrintDriver.java 27 Apr 2012 23:08:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,80 +0,0 @@
-package org.lcsim.hps.users.meeg;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.RawCalorimeterHit;
-import org.lcsim.event.RawTrackerHit;
-import org.lcsim.geometry.Detector;
-import org.lcsim.geometry.IDDecoder;
-import org.lcsim.geometry.Subdetector;
-import org.lcsim.util.Driver;
-
-/**
- *
- * @author Sho Uemura <[log in to unmask]>
- * @version $Id: ECalCellIDPrintDriver.java,v 1.1 2012/04/27 23:08:02 meeg Exp $
- */
-public class ECalCellIDPrintDriver extends Driver {
-
- Subdetector ecal;
- IDDecoder dec;
- String ecalName = "Ecal";
- String ecalCollectionName = "EcalReadoutHits";
- String outputFileName;
- PrintWriter outputStream = null;
-
- public ECalCellIDPrintDriver() {
- }
-
- public void setEcalCollectionName(String ecalCollectionName) {
- this.ecalCollectionName = ecalCollectionName;
- }
-
- public void setEcalName(String ecalName) {
- this.ecalName = ecalName;
- }
-
- public void setOutputFileName(String outputFileName) {
- this.outputFileName = outputFileName;
- }
-
- public void startOfData() {
- if (outputFileName != null) {
- try {
- outputStream = new PrintWriter(outputFileName);
- } catch (IOException ex) {
- throw new RuntimeException("Invalid outputFilePath!");
- }
- } else {
- outputStream = new PrintWriter(System.out, true);
- }
- }
-
- public void detectorChanged(Detector detector) {
- // Get the Subdetector.
- ecal = (Subdetector) detector.getSubdetector(ecalName);
- dec = ecal.getIDDecoder();
- }
-
- public void process(EventHeader event) {
- // Get the list of ECal hits.
- if (event.hasCollection(RawCalorimeterHit.class, ecalCollectionName)) {
- List<RawCalorimeterHit> hits = event.get(RawCalorimeterHit.class, ecalCollectionName);
- //outputStream.println("Reading RawCalorimeterHit from event " + event.getEventNumber());
- for (RawCalorimeterHit hit : hits) {
- dec.setID(hit.getCellID());
- outputStream.printf("x=%d\ty=%d\n", dec.getValue("ix"), dec.getValue("iy"));
- }
- }
- if (event.hasCollection(RawTrackerHit.class, ecalCollectionName)) {
- List<RawTrackerHit> hits = event.get(RawTrackerHit.class, ecalCollectionName);
- //outputStream.println("Reading RawCalorimeterHit from event " + event.getEventNumber());
- for (RawTrackerHit hit : hits) {
- dec.setID(hit.getCellID());
- outputStream.printf("x=%d\ty=%d\n", dec.getValue("ix"), dec.getValue("iy"));
- }
- }
- }
-}
\ No newline at end of file
hps-java/src/main/java/org/lcsim/hps/users/meeg
diff -N SVTCellIDPrintDriver.java
--- SVTCellIDPrintDriver.java 27 Apr 2012 23:08:02 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-package org.lcsim.hps.users.meeg;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.List;
-import org.lcsim.event.EventHeader;
-import org.lcsim.event.RawTrackerHit;
-import org.lcsim.hps.recon.tracking.HPSSVTData;
-import org.lcsim.util.Driver;
-
-/**
- *
- * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSEcalDigitalPrintDriver.java,v 1.5 2012/04/27 22:13:52 meeg
- * Exp $
- */
-public class SVTCellIDPrintDriver extends Driver {
-
- String rawTrackerHitCollectionName = "SVTData";
- String outputFileName;
- PrintWriter outputStream = null;
-
- public SVTCellIDPrintDriver() {
- }
-
- public void setRawTrackerHitCollectionName(String rawTrackerHitCollectionName) {
- this.rawTrackerHitCollectionName = rawTrackerHitCollectionName;
- }
-
- public void setOutputFileName(String outputFileName) {
- this.outputFileName = outputFileName;
- }
-
- public void startOfData() {
- if (rawTrackerHitCollectionName == null) {
- throw new RuntimeException("The parameter ecalCollectionName was not set!");
- }
-
- if (outputFileName != null) {
- try {
- outputStream = new PrintWriter(outputFileName);
- } catch (IOException ex) {
- throw new RuntimeException("Invalid outputFilePath!");
- }
- } else {
- outputStream = new PrintWriter(System.out, true);
- }
- }
-
- public void process(EventHeader event) {
- // Get the list of ECal hits.
- if (event.hasCollection(HPSSVTData.class, rawTrackerHitCollectionName)) {
- List<HPSSVTData> hits = event.get(HPSSVTData.class, rawTrackerHitCollectionName);
- //outputStream.println("Reading RawCalorimeterHit from event " + event.getEventNumber());
- for (HPSSVTData hit : hits) {
- outputStream.printf("FPGA=%d\thybrid=%d\tchannel=%d\n", hit.getFPGAAddress(), hit.getHybridNumber(), hit.getChannelNumber());
- }
- }
- if (event.hasCollection(RawTrackerHit.class, rawTrackerHitCollectionName)) {
- List<RawTrackerHit> hits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName);
- //outputStream.println("Reading RawCalorimeterHit from event " + event.getEventNumber());
- for (RawTrackerHit hit : hits) {
- outputStream.printf("name=%s\tside=%d\tstrip=%d\n", hit.getDetectorElement().getName(), hit.getIdentifierFieldValue("side"), hit.getIdentifierFieldValue("strip"));
- }
- }
- }
-}
\ No newline at end of file
hps-java/src/main/java/org/lcsim/hps/recon/ecal
diff -u -r1.5 -r1.6
--- HPSFADCTriggerDriver.java 29 Apr 2012 02:10:51 -0000 1.5
+++ HPSFADCTriggerDriver.java 1 May 2012 15:06:39 -0000 1.6
@@ -15,7 +15,7 @@
*
* @author Omar Moreno <[log in to unmask]>
* @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSFADCTriggerDriver.java,v 1.5 2012/04/29 02:10:51 meeg Exp $
+ * @version $Id: HPSFADCTriggerDriver.java,v 1.6 2012/05/01 15:06:39 meeg Exp $
*/
public class HPSFADCTriggerDriver extends HPSTriggerDriver {
@@ -144,7 +144,9 @@
}
trigger = true;
}
- deadtimelessTriggerCount++;
+ if (trigger) {
+ deadtimelessTriggerCount++;
+ }
return trigger;
}
@@ -295,6 +297,8 @@
* Require that the distance from the beam of the lowest energy cluster in a
* cluster pair satisfies the following E_low + d_b*.0032 GeV/mm < .8 GeV
*
+ *
+ *
*
* @param clusterPair : pair of clusters
hps-java/src/main/resources/org/lcsim/hps/steering
diff -u -r1.1 -r1.2
--- print_ids.lcsim 28 Apr 2012 21:05:15 -0000 1.1
+++ print_ids.lcsim 1 May 2012 15:06:39 -0000 1.2
@@ -11,9 +11,9 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalIDPrint" type="org.lcsim.hps.users.meeg.ECalCellIDPrintDriver"/>
- <driver name="SVTDataIDPrint" type="org.lcsim.hps.users.meeg.SVTCellIDPrintDriver"/>
- <driver name="SVTIDPrint" type="org.lcsim.hps.users.meeg.SVTCellIDPrintDriver">
+ <driver name="EcalIDPrint" type="org.lcsim.hps.monitoring.ecal.ECalCellIDPrintDriver"/>
+ <driver name="SVTDataIDPrint" type="org.lcsim.hps.monitoring.svt.SVTCellIDPrintDriver"/>
+ <driver name="SVTIDPrint" type="org.lcsim.hps.monitoring.svt.SVTCellIDPrintDriver">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
</driver>
</drivers>
CVSspam 0.2.12