hps-java/src/main/java/org/lcsim/hps/recon/tracking

diff -u -r1.10 -r1.11
--- HPSShaperAnalyticFitAlgorithm.java	21 Jun 2012 18:47:07 -0000	1.10
+++ HPSShaperAnalyticFitAlgorithm.java	13 Aug 2012 23:06:02 -0000	1.11
@@ -3,6 +3,7 @@

 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants.ChannelConstants;
 //import org.lcsim.math.chisq.ChisqProb;

+import static org.lcsim.hps.recon.tracking.apv25.Apv25Constants.SAMPLING_INTERVAL;

 
 /**
  * Fast fitter; currently only fits single hits. Uses Tp from ChannelConstants;

@@ -44,7 +45,7 @@

 
         for (int i = 0; i < length; i++) {
             y[i] = samples[start + i] - constants.getPedestal();

-            t[i] = HPSSVTConstants.SAMPLE_INTERVAL * i;

+            t[i] = SAMPLING_INTERVAL * i;

         }
 
         double[] p = new double[length];

@@ -79,7 +80,7 @@

             time_var += dt_dp * dt_dp;
             height_var += dh_dp * dh_dp;
         }

-        t0 += HPSSVTConstants.SAMPLE_INTERVAL * start;

+        t0 += SAMPLING_INTERVAL * start;

         fit.setAmp(A);
         fit.setAmpErr(Math.sqrt(height_var));
         fit.setT0(t0);

@@ -88,7 +89,7 @@

 
         double chisq = 0;
         for (int i = 0; i < samples.length; i++) {

-            double ti = HPSSVTConstants.SAMPLE_INTERVAL * i;

+            double ti = SAMPLING_INTERVAL * i;

             double fit_y = A * (Math.max(0, (ti - t0)) / constants.getTp()) * Math.exp(1 - (ti - t0) / constants.getTp()) + constants.getPedestal();
             chisq += Math.pow((fit_y - samples[i]) / constants.getNoise(), 2);
         }