Commit in hps-java/src/main/java/org/lcsim/hps/recon/tracking on MAIN | |||
HPSShaperAnalyticFitAlgorithm.java | +4 | -3 | 1.10 -> 1.11 |
HPSSVTConstants.java | +4 | -3 | 1.4 -> 1.5 |
+8 | -6 |
Moved some constants around; added some more ...
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); }
diff -u -r1.4 -r1.5 --- HPSSVTConstants.java 29 Apr 2012 16:58:33 -0000 1.4 +++ HPSSVTConstants.java 13 Aug 2012 23:06:02 -0000 1.5 @@ -3,7 +3,7 @@
/** * * @author Omar Moreno <[log in to unmask]>
- * @version $Id: HPSSVTConstants.java,v 1.4 2012/04/29 16:58:33 omoreno Exp $
+ * @version $Id: HPSSVTConstants.java,v 1.5 2012/08/13 23:06:02 omoreno Exp $
* */
@@ -14,14 +14,15 @@
public static final int TOTAL_APV25_CHANNELS = 128; public static final int TOTAL_HYBRIDS_PER_FPGA = 3;
+ // The Rear Transition Module gain + public static final double RTM_GAIN = 1.5; +
// Total number of strips per sensor public static final int TOTAL_STRIPS_PER_SENSOR = 639; // Total number of shaper signal samples obtained public static final int TOTAL_NUMBER_OF_SAMPLES = 6;
- public static final double SAMPLE_INTERVAL = 24.0; -
// MASKs used to encode and decode the SVT data public static final int TEMP_MASK = 0xFFFF; public static final int HYBRID_MASK = 0x3;
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1