Author: [log in to unmask] Date: Sun Aug 9 16:26:59 2015 New Revision: 3357 Log: dog Modified: java/branches/HPSJAVA-ECALGAINCALIB/recon/src/main/java/org/hps/recon/filtering/FEEFilterDriver.java 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 16:26:59 2015 @@ -12,11 +12,11 @@ { public void process(EventHeader event) { - if (!event.hasCollection(GenericObject.class,"TriggerBank") || - !event.hasCollection(Cluster.class, "EcalClusters")) +/* + if (!event.hasCollection(GenericObject.class,"TriggerBank")) throw new Driver.NextEventException(); - boolean isSingles=false; + boolean isSingles=false; for (GenericObject gob : event.get(GenericObject.class,"TriggerBank")) { if (!(AbstractIntData.getTag(gob) == TIData.BANK_TAG)) continue; @@ -27,16 +27,24 @@ break; } } - - if (!isSingles) throw new Driver.NextEventException(); + if (!isSingles) throw new Driver.NextEventException(); +*/ + + if (!event.hasCollection(Cluster.class, "EcalClusters")) + throw new Driver.NextEventException(); for (Cluster cc : event.get(Cluster.class,"EcalClusters")) { - if (cc.getEnergy() > 0.6 && - ClusterUtilities.findSeedHit(cc).getRawEnergy() > 0.45) + //if (cc.getEnergy() < 0.6 || + // ClusterUtilities.findSeedHit(cc).getRawEnergy() < 0.4) + // cc.Delete(); + + if (cc.getEnergy() > 0.6 && + ClusterUtilities.findSeedHit(cc).getRawEnergy() > 0.4) return; - } + + } throw new Driver.NextEventException(); } -} +}