Print

---

Author: [log in to unmask]
Date: Thu Sep  3 15:30:59 2015
New Revision: 3515

Log:
updating pulser trigger skim, keeping all EPICS and Sclaer events

Modified:
    java/trunk/recon/src/main/java/org/hps/recon/filtering/PulserTriggerFilterDriver.java
    java/trunk/steering-files/src/main/resources/org/hps/steering/production/PulserTriggerFilter.lcsim

Modified: java/trunk/recon/src/main/java/org/hps/recon/filtering/PulserTriggerFilterDriver.java
 =============================================================================
--- java/trunk/recon/src/main/java/org/hps/recon/filtering/PulserTriggerFilterDriver.java	(original)
+++ java/trunk/recon/src/main/java/org/hps/recon/filtering/PulserTriggerFilterDriver.java	Thu Sep  3 15:30:59 2015
@@ -4,6 +4,7 @@
 import org.lcsim.event.GenericObject;
 import org.lcsim.util.Driver;
 import org.hps.record.epics.EpicsData;
+import org.hps.record.scalers.ScalerData;
 import org.hps.record.triggerbank.AbstractIntData;
 import org.hps.record.triggerbank.TIData;
 
@@ -14,11 +15,14 @@
     // 1. keep all events with EPICS data (could also use event tag = 31):
     if (EpicsData.read(event) != null) return;
 
-    // 2. drop event if it doesn't have a TriggerBank
+    // 2. keep all events with Scaler data:
+    if (ScalerData.read(event) != null) return;
+
+    // 3. drop event if it doesn't have a TriggerBank
     if (!event.hasCollection(GenericObject.class,"TriggerBank"))
       throw new Driver.NextEventException();
   
-    // 3. keep event if it was from a Pulser trigger:
+    // 4. keep event if it was from a Pulser trigger:
     for (GenericObject gob : event.get(GenericObject.class,"TriggerBank"))
     {
       if (!(AbstractIntData.getTag(gob) == TIData.BANK_TAG)) continue;
@@ -26,7 +30,7 @@
       if (tid.isPulserTrigger()) return;
     }
     
-    // 4. Else, drop event:
+    // 5. Else, drop event:
     throw new Driver.NextEventException();
   }
 }

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/production/PulserTriggerFilter.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/production/PulserTriggerFilter.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/production/PulserTriggerFilter.lcsim	Thu Sep  3 15:30:59 2015
@@ -10,7 +10,7 @@
         <driver name="Skimmer" type="org.hps.recon.filtering.PulserTriggerFilterDriver">
         </driver>
         <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
-            <outputFilePath>pulserTriggerSkim.slcio</outputFilePath>
+            <outputFilePath>${outputFile}.slcio</outputFilePath>
         </driver>
     </drivers>   
-</lcsim>
+</lcsim>