diff -u -r1.8 -r1.9
--- HPSFADCTriggerDriver.java	23 Aug 2012 18:48:18 -0000	1.8
+++ HPSFADCTriggerDriver.java	26 Sep 2012 23:31:10 -0000	1.9
@@ -1,9 +1,12 @@

 package org.lcsim.hps.recon.ecal;
 

+import java.util.ArrayList;

 import java.util.LinkedList;
 import java.util.List;
 
 import org.lcsim.event.Cluster;

+import org.lcsim.event.EventHeader;
+import org.lcsim.hps.evio.TriggerData;

 import org.lcsim.hps.util.ClockSingleton;
 
 /**

@@ -12,7 +15,7 @@

  *
  * @author Omar Moreno <[log in to unmask]>
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: HPSFADCTriggerDriver.java,v 1.8 2012/08/23 18:48:18 meeg Exp $

+ * @version $Id: HPSFADCTriggerDriver.java,v 1.9 2012/09/26 23:31:10 meeg Exp $

  */
 public class HPSFADCTriggerDriver extends HPSTriggerDriver {
 

@@ -25,9 +28,6 @@

     private double energySumThreshold = 2.2;  // GeV
     private double energyDifferenceThreshold = 1.5; // GeV
     private double maxCoplanarityAngle = 35; // degrees

-    double crystalX = (13.3 + 16.0) / 2;
-    double crystalY = (13.3 + 16.0) / 2;
-    double beamGap = 20.0;

     int oppositeQuadrantCount;
     int clusterEnergyCount;
     int energySumCount;

@@ -325,4 +325,15 @@

 
         return ((180 - phi) < maxCoplanarityAngle);
     }

+
+    /**
+     * Make a dummy TriggerData
+     */
+    @Override
+    protected void makeTriggerData(EventHeader event, String collectionName) {
+        TriggerData tData = new TriggerData(new int[8]);
+        List<TriggerData> triggerList = new ArrayList<TriggerData>();
+        triggerList.add(tData);
+        event.put(collectionName, triggerList, TriggerData.class, 0);
+    }

 }

\ No newline at end of file

diff -u -r1.17 -r1.18
--- HPSTriggerDriver.java	21 Sep 2012 23:16:02 -0000	1.17
+++ HPSTriggerDriver.java	26 Sep 2012 23:31:10 -0000	1.18
@@ -19,7 +19,7 @@

  * Applies SVT trigger latency and sends trigger signal to SVT
  *
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: HPSTriggerDriver.java,v 1.17 2012/09/21 23:16:02 meeg Exp $

+ * @version $Id: HPSTriggerDriver.java,v 1.18 2012/09/26 23:31:10 meeg Exp $

  */
 public abstract class HPSTriggerDriver extends Driver {
 

@@ -112,6 +112,7 @@

                     outputStream.printf("Event %d rejected by dead time\n", event.getEventNumber());
                 }
             }

+            makeTriggerData(event, "TriggerStatus");

         }
 
         // Check if there are any pending SVT triggers to process

@@ -141,6 +142,7 @@

             ecalTriggerTimestamps.remove();
         }
 

+

         // Check if there are any pending trigger bank triggers to process
         if (triggerTriggerTimestamps.peek() != null
                 && ClockSingleton.getTime() >= triggerTriggerTimestamps.peek()) {

@@ -150,7 +152,7 @@

             }
 
             // Make trigger bank

-            makeTriggerData(event);

+            makeTriggerData(event, "TriggerBank");

             triggerTriggerTimestamps.remove();
         }
     }

@@ -166,7 +168,7 @@

 
     public abstract boolean testTrigger(List<HPSEcalCluster> clusters);
 

-    protected void makeTriggerData(EventHeader event) {

+    protected void makeTriggerData(EventHeader event, String collectionName) {

     }
 
     @Override

diff -u -r1.8 -r1.9
--- TestRunTriggerDriver.java	21 Sep 2012 23:16:02 -0000	1.8
+++ TestRunTriggerDriver.java	26 Sep 2012 23:31:10 -0000	1.9
@@ -11,7 +11,7 @@

  *
  * @author Omar Moreno <[log in to unmask]>
  * @author Sho Uemura <[log in to unmask]>

- * @version $Id: TestRunTriggerDriver.java,v 1.8 2012/09/21 23:16:02 meeg Exp $

+ * @version $Id: TestRunTriggerDriver.java,v 1.9 2012/09/26 23:31:10 meeg Exp $

  */
 public class TestRunTriggerDriver extends HPSTriggerDriver {
 

@@ -25,7 +25,7 @@

     }
 
     @Override

-    protected void makeTriggerData(EventHeader event) {

+    protected void makeTriggerData(EventHeader event, String collectionName) {

         int[] trigArray = new int[8];
         trigArray[TriggerData.TOP_TRIG] = topBits;
         trigArray[TriggerData.BOT_TRIG] = botBits;

@@ -34,7 +34,7 @@

         TriggerData tData = new TriggerData(trigArray);
         List<TriggerData> triggerList = new ArrayList<TriggerData>();
         triggerList.add(tData);

-        event.put("TriggerBank", triggerList, TriggerData.class, 0);

+        event.put(collectionName, triggerList, TriggerData.class, 0);

     }
 
     @Override