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

--- java/branches/hps-java_HPSJAVA-88/recon/src/main/java/org/hps/recon/filtering/InTimeHitsFilter.java	2014-10-09 23:32:41 UTC (rev 1163)
+++ java/branches/hps-java_HPSJAVA-88/recon/src/main/java/org/hps/recon/filtering/InTimeHitsFilter.java	2014-10-09 23:53:40 UTC (rev 1164)
@@ -2,10 +2,13 @@

 
 import java.util.List;
 

-import org.hps.conditions.deprecated.SvtUtils;

+
+//===> import org.hps.conditions.deprecated.SvtUtils;

 import org.hps.recon.tracking.FittedRawTrackerHit;

+

 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.tracker.silicon.ChargeCarrier;

+import org.lcsim.detector.tracker.silicon.HpsSiSensor;

 import org.lcsim.detector.tracker.silicon.SiSensor;
 import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
 import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;

@@ -13,9 +16,8 @@

 import org.lcsim.event.RawTrackerHit;
 
 /**

-
- @author mgraham
- @version $Id:

+ *
+ * @author mgraham

  */
 public class InTimeHitsFilter extends EventReconFilter{
    

@@ -81,13 +83,14 @@

     }
 
     private boolean isHitOnTop(RawTrackerHit hit){

-        SiSensor sensor=(SiSensor) hit.getDetectorElement();

+        HpsSiSensor sensor=(HpsSiSensor) hit.getDetectorElement();

         IIdentifier id=hit.getIdentifier();
         SiTrackerIdentifierHelper _sid_helper=(SiTrackerIdentifierHelper) sensor.getIdentifierHelper();
 
         ChargeCarrier carrier=ChargeCarrier.getCarrier(_sid_helper.getSideValue(id));
         SiSensorElectrodes electrodes=((SiSensor) hit.getDetectorElement()).getReadoutElectrodes(carrier);

-        if(!SvtUtils.getInstance().isTopLayer(sensor))

+        //===> if(!SvtUtils.getInstance().isTopLayer(sensor))
+        if(!sensor.isTopLayer())

             return false;
         return true;
     }

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

--- java/branches/hps-java_HPSJAVA-88/recon/src/main/java/org/hps/recon/filtering/MinimumHitsFilter.java	2014-10-09 23:32:41 UTC (rev 1163)
+++ java/branches/hps-java_HPSJAVA-88/recon/src/main/java/org/hps/recon/filtering/MinimumHitsFilter.java	2014-10-09 23:53:40 UTC (rev 1164)
@@ -2,9 +2,11 @@

 
 import java.util.List;
 

-import org.hps.conditions.deprecated.SvtUtils;

+
+//===> import org.hps.conditions.deprecated.SvtUtils;

 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.tracker.silicon.ChargeCarrier;

+import org.lcsim.detector.tracker.silicon.HpsSiSensor;

 import org.lcsim.detector.tracker.silicon.SiSensor;
 import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
 import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;

@@ -12,9 +14,8 @@

 import org.lcsim.event.RawTrackerHit;
 
 /**

-
- @author mgraham
- @version $Id:

+ *
+ * @author mgraham

  */
 public class MinimumHitsFilter extends EventReconFilter{
   

@@ -60,13 +61,14 @@

 
 
     private boolean isHitOnTop(RawTrackerHit hit){

-        SiSensor sensor=(SiSensor) hit.getDetectorElement();

+    	HpsSiSensor sensor=(HpsSiSensor) hit.getDetectorElement();

         IIdentifier id=hit.getIdentifier();
         SiTrackerIdentifierHelper _sid_helper=(SiTrackerIdentifierHelper) sensor.getIdentifierHelper();
 
         ChargeCarrier carrier=ChargeCarrier.getCarrier(_sid_helper.getSideValue(id));
         SiSensorElectrodes electrodes=((SiSensor) hit.getDetectorElement()).getReadoutElectrodes(carrier);

-        if(!SvtUtils.getInstance().isTopLayer(sensor))

+        //===> if(!SvtUtils.getInstance().isTopLayer(sensor))
+        if(!sensor.isTopLayer())

             return false;
         return true;
     }