Author: [log in to unmask]
Date: Sun Aug 9 14:30:09 2015
New Revision: 3356
Log:
more cuts
Modified:
java/branches/HPSJAVA-ECALGAINCALIB/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java
java/branches/HPSJAVA-ECALGAINCALIB/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngRun2015EcalOnly_GainFile_FilterFEE.lcsim
Modified: java/branches/HPSJAVA-ECALGAINCALIB/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java
=============================================================================
--- java/branches/HPSJAVA-ECALGAINCALIB/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java (original)
+++ java/branches/HPSJAVA-ECALGAINCALIB/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java Sun Aug 9 14:30:09 2015
@@ -1,23 +1,42 @@
package org.hps.recon.filtering;
+import org.hps.recon.ecal.triggerbank.AbstractIntData;
+import org.hps.recon.ecal.triggerbank.TIData;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
+import org.lcsim.event.GenericObject;
import org.lcsim.util.Driver;
+import org.hps.recon.ecal.cluster.ClusterUtilities;
public class FEEFilterDriver extends Driver
{
public void process(EventHeader event) {
+
+ if (!event.hasCollection(GenericObject.class,"TriggerBank") ||
+ !event.hasCollection(Cluster.class, "EcalClusters"))
+ throw new Driver.NextEventException();
- if (!event.hasCollection(Cluster.class, "EcalClusters"))
- throw new Driver.NextEventException();
+ boolean isSingles=false;
+ for (GenericObject gob : event.get(GenericObject.class,"TriggerBank"))
+ {
+ if (!(AbstractIntData.getTag(gob) == TIData.BANK_TAG)) continue;
+ TIData tid = new TIData(gob);
+ if (tid.isSingle0Trigger() || tid.isSingle1Trigger())
+ {
+ isSingles=true;
+ break;
+ }
+ }
+
+ if (!isSingles) throw new Driver.NextEventException();
for (Cluster cc : event.get(Cluster.class,"EcalClusters"))
{
- if (cc.getEnergy() > 0.6)
- {
+ if (cc.getEnergy() > 0.6 &&
+ ClusterUtilities.findSeedHit(cc).getRawEnergy() > 0.45)
return;
- }
}
+
throw new Driver.NextEventException();
}
}
Modified: java/branches/HPSJAVA-ECALGAINCALIB/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngRun2015EcalOnly_GainFile_FilterFEE.lcsim
=============================================================================
--- java/branches/HPSJAVA-ECALGAINCALIB/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngRun2015EcalOnly_GainFile_FilterFEE.lcsim (original)
+++ java/branches/HPSJAVA-ECALGAINCALIB/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngRun2015EcalOnly_GainFile_FilterFEE.lcsim Sun Aug 9 14:30:09 2015
@@ -24,7 +24,7 @@
<driver name="CleanupDriver"/>
</execute>
<drivers>
- <driver name="FEEFilterDriver" type="org.lcsim.recon.filtering.FEEFilterDriver">
+ <driver name="FEEFilterDriver" type="org.hps.recon.filtering.FEEFilterDriver">
</driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
@@ -113,7 +113,9 @@
<driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<outputFilePath>${outputFile}.slcio</outputFilePath>
- </driver>
+ <!-- <writeOnlyCollections>EcalCalHits EcalClusters </writeOnlyCollections> -->
+ <!--<ignoreCollections>SVTRawTrackerHits EcalReadoutHits</ignoreCollections>-->
+ </driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
<outputFileName>${outputFile}.root</outputFileName>
