hps-java/src/main/java/org/lcsim/hps/recon/tracking
diff -u -r1.8 -r1.9
--- HPSDataProcessingModule.java 30 Mar 2012 23:57:15 -0000 1.8
+++ HPSDataProcessingModule.java 31 Mar 2012 01:59:00 -0000 1.9
@@ -23,7 +23,7 @@
/**
*
* @author Omar Moreno <[log in to unmask]>
- * @version $Id: HPSDataProcessingModule.java,v 1.8 2012/03/30 23:57:15 omoreno Exp $
+ * @version $Id: HPSDataProcessingModule.java,v 1.9 2012/03/31 01:59:00 omoreno Exp $
*/
public class HPSDataProcessingModule extends Driver {
@@ -256,13 +256,22 @@
// Check if a block has the appropriate number of blocks above
// threshold
- if(!(samplesAboveThreshold(adc) >= nSamplesAboveThresh) && thresholdCut) continue;
+ if(!(samplesAboveThreshold(adc) >= nSamplesAboveThresh) && thresholdCut) {
+ block.getValue().clear();
+ continue;
+ }
// Apply the tail cut
- if(!tailCut(adc) && tailCut) continue;
+ if(!tailCut(adc) && tailCut){
+ block.getValue().clear();
+ continue;
+ }
// Apply noise suppression cut
- if(!noiseSuppresionCut(adc) && noiseSuppression) continue;
+ if(!noiseSuppresionCut(adc) && noiseSuppression){
+ block.getValue().clear();
+ continue;
+ }
// If all cuts are satisfied, create a RawTrackerHit
rawHits.add(makeRawTrackerHit(block.getKey(), sensorMap.get(sensor.getKey()), adc));