Merge pull request #866 from JeffersonLab/iss371

Enable steering files to configure the time minimizer used in RawTrackerHitFitterDriver

Author: cbravo135

steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2019_pass0_recon_evio.lcsim

@@ -111,6 +111,7 @@
         </driver>
         <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
             <fitAlgorithm>Pileup</fitAlgorithm>
+            <fitTimeMinimizer>Migrad</fitTimeMinimizer>
             <useTimestamps>false</useTimestamps>
             <correctTimeOffset>true</correctTimeOffset>
             <correctT0Shift>false</correctT0Shift>

tracking/src/main/java/org/hps/recon/tracking/DumbShaperFit.java

@@ -11,6 +11,7 @@
 public class DumbShaperFit implements ShaperFitAlgorithm {
 
     private boolean debug = false;
+    private String fitTimeMinimizer = "Simplex";
 
     public DumbShaperFit() {
     }
@@ -19,16 +20,21 @@ public void setDebug(boolean debug) {
         this.debug = debug;
     }
 
+    @Override
+    public void setFitTimeMinimizer(String fitTimeMinimizer) {
+        this.fitTimeMinimizer = fitTimeMinimizer;
+    }
+
     @Override
     public Collection<ShapeFitParameters> fitShape(RawTrackerHit rth, PulseShape shape) {
         short[] samples = rth.getADCValues();
         HpsSiSensor sensor =(HpsSiSensor) rth.getDetectorElement();
         int channel = rth.getIdentifierFieldValue("strip");
         return fitShape(channel, samples, sensor);
     }
-    
+
     public Collection<ShapeFitParameters> fitShape(int channel, short[] samples, HpsSiSensor sensor){
-        
+
         ShapeFitParameters fitresults = new ShapeFitParameters();
         double[] pedSub = {-99.0, -99.0, -99.0, -99.0, -99.0, -99.0};
         double maxADC = -99999;

tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java

@@ -25,6 +25,7 @@ public class RawTrackerHitFitterDriver extends Driver {
     private String rawHitCollectionName = "SVTRawTrackerHits";
     private String fitCollectionName = "SVTShapeFitParameters";
     private String fittedHitCollectionName = "SVTFittedRawTrackerHits";
+    private String fitTimeMinimizer = "Simplex";
     private SvtTimingConstants timingConstants;
     private SvtSyncStatusCollection syncStatusColl;
     private int genericObjectFlags = 1 << LCIOConstants.GOBIT_FIXED;
@@ -134,13 +135,18 @@ public void setFittedHitCollectionName(String fittedHitCollectionName) {
         this.fittedHitCollectionName = fittedHitCollectionName;
     }
 
+    public void setFitTimeMinimizer(String fitTimeMinimizer) {
+        this.fitTimeMinimizer = fitTimeMinimizer;
+    }
+
     public void setRawHitCollectionName(String rawHitCollectionName) {
         this.rawHitCollectionName = rawHitCollectionName;
     }
 
     @Override
     public void startOfData() {
         fitter.setDebug(debug);
+        fitter.setFitTimeMinimizer(fitTimeMinimizer);
         if (rawHitCollectionName == null)
             throw new RuntimeException("The parameter rawHitCollectionName1 was not set!");
     }

tracking/src/main/java/org/hps/recon/tracking/ShaperAnalyticFitAlgorithm.java

@@ -15,11 +15,17 @@
 public class ShaperAnalyticFitAlgorithm implements ShaperFitAlgorithm {
 
     private boolean debug = false;
+    public String fitTimeMinimizer;
 
     public void setDebug(boolean debug) {
         this.debug = debug;
     }
 
+    @Override
+    public void setFitTimeMinimizer(String fitTimeMinimizer) {
+        this.fitTimeMinimizer = fitTimeMinimizer;
+    }
+
     @Override
     public Collection<ShapeFitParameters> fitShape(RawTrackerHit rth, PulseShape shape) {
         short[] samples = rth.getADCValues();

tracking/src/main/java/org/hps/recon/tracking/ShaperFitAlgorithm.java

@@ -10,4 +10,6 @@ public interface ShaperFitAlgorithm {
     public Collection<ShapeFitParameters> fitShape(RawTrackerHit rawHit, PulseShape shape);
 
     public void setDebug(boolean debug);
+
+    public void setFitTimeMinimizer(String fitTimeMinimizer);
 }

tracking/src/main/java/org/hps/recon/tracking/ShaperLinearFitAlgorithm.java

@@ -18,6 +18,7 @@
 import org.hps.minuit.FCNBase;
 import org.hps.minuit.FunctionMinimum;
 import org.hps.minuit.MnSimplex;
+import org.hps.minuit.MnMigrad;
 import org.hps.minuit.MnUserParameters;
 
 import org.hps.readout.svt.HPSSVTConstants;
@@ -43,6 +44,7 @@ public class ShaperLinearFitAlgorithm implements ShaperFitAlgorithm, FCNBase {
     //===> private ChannelConstants channelConstants;
     private HpsSiSensor sensor;
     private int channel;
+    private String fitTimeMinimizer = "Simplex";
     private PulseShape shape;
     private final double[] sigma = new double[HPSSVTConstants.TOTAL_NUMBER_OF_SAMPLES];
     private final double[] y = new double[HPSSVTConstants.TOTAL_NUMBER_OF_SAMPLES];
@@ -82,6 +84,11 @@ public double getPedestal() {
         return pedestal;
     }
 
+    @Override
+    public void setFitTimeMinimizer(String fitTimeMinimizer) {
+        this.fitTimeMinimizer = fitTimeMinimizer;
+    }
+
     @Override
     //===> public Collection<ShapeFitParameters> fitShape(RawTrackerHit rth, ChannelConstants constants) {
     public Collection<ShapeFitParameters> fitShape(RawTrackerHit rth, PulseShape shape) {
@@ -357,8 +364,16 @@ private FunctionMinimum minuitFit(double[] guess_t) {
             }
         }
 
-        MnSimplex simplex = new MnSimplex(this, myParams, 2);
-        FunctionMinimum min = simplex.minimize(0, 0.001);
+        FunctionMinimum min = null;
+        if(fitTimeMinimizer.equals("Simplex")) {
+            MnSimplex simplex = new MnSimplex(this, myParams, 2);
+            min = simplex.minimize(0, 0.001);
+        } else if(fitTimeMinimizer.equals("Migrad")) {
+            MnMigrad migrad = new MnMigrad(this, myParams, 2);
+            min = migrad.minimize(0, 0.001);
+        } else {
+            throw new RuntimeException("FitTimeMinimizer must be Simplex or Migrad");
+        }
         return min;
     }
 

tracking/src/main/java/org/hps/recon/tracking/ShaperPileupFitAlgorithm.java

@@ -7,6 +7,7 @@ public class ShaperPileupFitAlgorithm implements ShaperFitAlgorithm {
 
     ShaperLinearFitAlgorithm onePulseFitter = new ShaperLinearFitAlgorithm(1);
     ShaperLinearFitAlgorithm twoPulseFitter = new ShaperLinearFitAlgorithm(2);
+    private String fitTimeMinimizer = "Simplex";
     private boolean debug = false;
     private double refitThreshold = 0.5;
     private int totalFits = 0;
@@ -20,6 +21,12 @@ public ShaperPileupFitAlgorithm(double threshold) {
         refitThreshold = threshold;
     }
 
+    @Override
+    public void setFitTimeMinimizer(String fitTimeMinimizer) {
+        this.onePulseFitter.setFitTimeMinimizer(fitTimeMinimizer);
+        this.twoPulseFitter.setFitTimeMinimizer(fitTimeMinimizer);
+    }
+
     //===> public Collection<ShapeFitParameters> fitShape(RawTrackerHit rth, HPSSVTCalibrationConstants.ChannelConstants constants) {
     public Collection<ShapeFitParameters> fitShape(RawTrackerHit rth, PulseShape shape) {
         //===> Collection<ShapeFitParameters> fittedPulses = onePulseFitter.fitShape(rth, constants);