Author: [log in to unmask]
Date: Tue Oct 6 03:51:16 2015
New Revision: 3763
Log:
fixing keeping epics events in fee skim
Modified:
java/trunk/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java
Modified: java/trunk/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java
=============================================================================
--- java/trunk/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java (original)
+++ java/trunk/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java Tue Oct 6 03:51:16 2015
@@ -12,6 +12,11 @@
public class FEEFilterDriver extends Driver
{
public void process(EventHeader event) {
+
+ // don't drop any events with EPICS data:
+ // (could also do this via event tag=31)
+ final EpicsData data = EpicsData.read(event);
+ if (data != null) return;
// only keep singles triggers:
if (!event.hasCollection(GenericObject.class,"TriggerBank"))
@@ -28,11 +33,6 @@
}
}
if (!isSingles) throw new Driver.NextEventException();
-
- // don't drop any events with EPICS data:
- // (could also do this via event tag=31)
- final EpicsData data = EpicsData.read(event);
- if (data != null) return;
if (!event.hasCollection(Cluster.class, "EcalClusters"))
throw new Driver.NextEventException();
|