java/trunk/tracking/src/main/java/org/hps/recon/tracking

--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShapeFitParameters.java	2014-08-26 23:13:08 UTC (rev 912)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShapeFitParameters.java	2014-08-26 23:21:58 UTC (rev 913)
@@ -1,7 +1,3 @@

-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */

 package org.hps.recon.tracking;
 
 import org.lcsim.event.GenericObject;

@@ -16,8 +12,8 @@

     private double _t0Err = Double.NaN;
     private double _amp = Double.NaN;
     private double _ampErr = Double.NaN;

-    private double _tp = Double.NaN;
-    private double _tpErr = Double.NaN;

+//    private double _tp = Double.NaN;
+//    private double _tpErr = Double.NaN;

     private double _chiSq = Double.NaN;
 
     public ShapeFitParameters() {

@@ -36,9 +32,9 @@

         _amp = amp;
     }
 

-    public void setTp(double tp) {
-        _tp = tp;
-    }

+//    public void setTp(double tp) {
+//        _tp = tp;
+//    }

 
     public void setAmpErr(double _ampErr) {
         this._ampErr = _ampErr;

@@ -48,9 +44,9 @@

         this._t0Err = _t0Err;
     }
 

-    public void setTpErr(double _tpErr) {
-        this._tpErr = _tpErr;
-    }

+//    public void setTpErr(double _tpErr) {
+//        this._tpErr = _tpErr;
+//    }

 
     public void setChiSq(double _chiSq) {
         this._chiSq = _chiSq;

@@ -64,9 +60,9 @@

         return _amp;
     }
 

-    public double getTp() {
-        return _tp;
-    }

+//    public double getTp() {
+//        return _tp;
+//    }

 
     public double getT0Err() {
         return _t0Err;

@@ -76,9 +72,9 @@

         return _ampErr;
     }
 

-    public double getTpErr() {
-        return _tpErr;
-    }

+//    public double getTpErr() {
+//        return _tpErr;
+//    }

 
     public double getChiSq() {
         return _chiSq;

@@ -100,14 +96,14 @@

         return object.getDoubleVal(3);
     }
 

-    public static double getTp(GenericObject object) {
-        return object.getDoubleVal(4);
-    }

+//    public static double getTp(GenericObject object) {
+//        return object.getDoubleVal(4);
+//    }
+//
+//    public static double getTpErr(GenericObject object) {
+//        return object.getDoubleVal(5);
+//    }

-    public static double getTpErr(GenericObject object) {
-        return object.getDoubleVal(5);
-    }
-

     public static double getChisq(GenericObject object) {
         return object.getDoubleVal(6);
     }

@@ -124,7 +120,7 @@

 
     @Override
     public int getNDouble() {

-        return 7;

+        return 5;

     }
 
     @Override

@@ -148,11 +144,11 @@

                 return _amp;
             case 3:
                 return _ampErr;

+//            case 4:
+//                return _tp;
+//            case 5:
+//                return _tpErr;

             case 4:

-                return _tp;
-            case 5:
-                return _tpErr;
-            case 6:

                 return _chiSq;
             default:
                 throw new UnsupportedOperationException("Only 7 double values in " + this.getClass().getSimpleName());

java/trunk/tracking/src/main/java/org/hps/recon/tracking

--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperAnalyticFitAlgorithm.java	2014-08-26 23:13:08 UTC (rev 912)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperAnalyticFitAlgorithm.java	2014-08-26 23:21:58 UTC (rev 913)
@@ -91,7 +91,6 @@

         fit.setAmpErr(Math.sqrt(height_var));
         fit.setT0(t0);
         fit.setT0Err(Math.sqrt(time_var));

-        fit.setTp(constants.getTp());

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

java/trunk/tracking/src/main/java/org/hps/recon/tracking

--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperLinearFitAlgorithm.java	2014-08-26 23:13:08 UTC (rev 912)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperLinearFitAlgorithm.java	2014-08-26 23:21:58 UTC (rev 913)
@@ -83,7 +83,6 @@

         fit.setChiSq(min.fval());
         fit.setT0(times[0]);
         fit.setT0Err((t0err.lower() + t0err.upper()) / 2);

-        fit.setTp(constants.getTp());

 
         // System.out.format("%f\t%f\t%f\t%f\t%f\t%f\n", samples[0] - constants.getPedestal(),
         // samples[1] - constants.getPedestal(), samples[2] - constants.getPedestal(), samples[3] -