java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking

--- java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/NoiselessReadoutChip.java	2014-10-06 20:22:02 UTC (rev 1141)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/NoiselessReadoutChip.java	2014-10-06 20:25:09 UTC (rev 1142)
@@ -1,6 +1,3 @@

-/*
- * Class BasicReadoutChip
- */

 package org.hps.recon.tracking;
 
 import java.util.ArrayList;

@@ -8,8 +5,9 @@

 import java.util.SortedMap;
 import java.util.TreeMap;
 

-import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
-import org.lcsim.detector.tracker.silicon.SiSensor;

+//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+//===> import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;

 import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.recon.tracking.digitization.sisim.ReadoutChip;

@@ -166,7 +164,9 @@

 
         // Loop over the channels contained in the SiElectrodeDataCollection
         for (Integer channel : data.keySet()) {

-            if (dropBadChannels && HPSSVTCalibrationConstants.isBadChannel((SiSensor) electrodes.getDetectorElement(), channel)) {

+        	
+        	if(dropBadChannels && ((HpsSiSensor) electrodes.getDetectorElement()).isBadChannel(channel)){
+            //===> if (dropBadChannels && HPSSVTCalibrationConstants.isBadChannel((SiSensor) electrodes.getDetectorElement(), channel)) {

                 // System.out.format("%d bad\n", channel);
                 continue;
             }