Commit in hps-java/src/main/java/org/lcsim/hps/evio on MAIN
EventConstants.java+21.11 -> 1.12
ECalEvioReader.java+10-11.16 -> 1.17
+12-1
2 modified files
don't choke on the new trigger bank (todo: actually do something with it)

hps-java/src/main/java/org/lcsim/hps/evio
EventConstants.java 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- EventConstants.java	12 May 2012 23:09:05 -0000	1.11
+++ EventConstants.java	17 May 2012 14:55:36 -0000	1.12
@@ -38,6 +38,8 @@
     public static final int ECAL_PULSE_BANK_TAG = 0xe102;
     // The tag for ECal pulse integral data.
     public static final int ECAL_PULSE_INTEGRAL_BANK_TAG = 0xe103;
+    // The tag for trigger data.
+    public static final int TRIGGER_BANK_TAG = 0xe106;
     public static final int SVT_TOTAL_NUMBER_FPGAS = 8;
 
     /**

hps-java/src/main/java/org/lcsim/hps/evio
ECalEvioReader.java 1.16 -> 1.17
diff -u -r1.16 -r1.17
--- ECalEvioReader.java	12 May 2012 23:09:05 -0000	1.16
+++ ECalEvioReader.java	17 May 2012 14:55:36 -0000	1.17
@@ -16,7 +16,7 @@
 /**
  *
  * @author Sho Uemura <[log in to unmask]>
- * @version $Id: ECalEvioReader.java,v 1.16 2012/05/12 23:09:05 meeg Exp $
+ * @version $Id: ECalEvioReader.java,v 1.17 2012/05/17 14:55:36 meeg Exp $
  */
 public class ECalEvioReader extends EvioReader {
     // Names of subdetectors.
@@ -54,6 +54,15 @@
                     }
                     try {
                         for (BaseStructure slotBank : bank.getChildren()) {
+                            if (slotBank.getHeader().getTag() == EventConstants.TRIGGER_BANK_TAG) {
+                                if (debug) {
+                                    int[] data = slotBank.getIntData();
+                                    for (int i = 0; i < data.length; i++) {
+                                        System.out.format("0x%x\n", data[i]);
+                                    }
+                                }
+                                continue;
+                            }
 //                            for (CompositeData cdata : slotBank.getCompositeData()) {
                             CompositeData cdata = slotBank.getCompositeData();
                             if (slotBank.getHeader().getTag() != bankTag) {
CVSspam 0.2.12


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