Print

---

Author: [log in to unmask]
Date: Tue Apr 21 12:43:11 2015
New Revision: 2766

Log:
update user code to work with new fitter interface

Modified:
    java/trunk/users/src/main/java/org/hps/users/omoreno/SvtPerformance.java
    java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java

Modified: java/trunk/users/src/main/java/org/hps/users/omoreno/SvtPerformance.java
 =============================================================================
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtPerformance.java	(original)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtPerformance.java	Tue Apr 21 12:43:11 2015
@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import org.hps.recon.tracking.PulseShape;
 
 import org.lcsim.detector.tracker.silicon.HpsSiSensor;
 import org.lcsim.event.EventHeader;
@@ -377,7 +378,7 @@
                             }
                         }
 
-                        for (ShapeFitParameters fit : shaperFitter.fitShape(rawHit)) {
+                        for (ShapeFitParameters fit : shaperFitter.fitShape(rawHit, new PulseShape.CRRC())) {
                             if (fit.getAmp() > maxClusterAmplitude) {
                                 maxClusterChannel = channel;
                                 maxClusterAmplitude = fit.getAmp();

Modified: java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java
 =============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java	(original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java	Tue Apr 21 12:43:11 2015
@@ -8,15 +8,14 @@
 import hep.aida.IProfile;
 import hep.physics.matrix.SymmetricMatrix;
 import hep.physics.vec.Hep3Vector;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import org.hps.recon.tracking.BeamlineConstants;
 import org.hps.recon.tracking.DumbShaperFit;
 import org.hps.recon.tracking.HelixConverter;
+import org.hps.recon.tracking.PulseShape;
 import org.hps.recon.tracking.ShapeFitParameters;
 import org.hps.recon.tracking.ShaperFitAlgorithm;
 import org.hps.recon.tracking.StraightLineTrack;
@@ -832,7 +831,7 @@
                     for (HelicalTrackStrip hts : htcross.getStrips()) {
                         double clusterSum = 0;
                         for (RawTrackerHit rawHit : (List<RawTrackerHit>) hts.rawhits()) {
-                            for (ShapeFitParameters fit : _shaper.fitShape(rawHit)) {
+                            for (ShapeFitParameters fit : _shaper.fitShape(rawHit,new PulseShape.CRRC())) {
                                 double amp = fit.getAmp();
                                 clusterSum += amp;
                                 aida.histogram1D("Amp (HitOnTrack)").fill(amp);