Updates of forward tracking since November of 2022

common-tools/clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/AMeasVecs.java

@@ -23,7 +23,7 @@ public abstract class AMeasVecs {
 
     public void setMeasVecs(List<Surface> measSurfaces) {
         measurements = new ArrayList<>();
-        if(measSurfaces.get(0).type != Type.LINEDOCA) // Measurements from DC has been sorted 
+        if(measSurfaces.get(0).type != Type.LINEDOCA && measSurfaces.get(0).type != Type.PLANEWITHPOINT) // Measurements from URWell and DC has been sorted 
         	Collections.sort(measSurfaces);
         for(int i = 0; i < measSurfaces.size(); i++) {
             MeasVec mvec = new MeasVec();
@@ -41,6 +41,11 @@ public void setMeasVecs(List<Surface> measSurfaces) {
             	mvec.superlayer = measSurfaces.get(i).getSuperLayer();
             	mvec.layer = measSurfaces.get(i).getLayer();
             }
+            else if(measSurfaces.get(i).type == Type.PLANEWITHPOINT){
+                mvec.region = measSurfaces.get(i).region;
+                mvec.layer = measSurfaces.get(i).getLayer();
+            	mvec.sector = measSurfaces.get(i).getSector();
+            }
         }
     }
 

common-tools/clas-tracking/src/main/java/org/jlab/clas/tracking/kalmanfilter/zReference/DAFilter.java

@@ -10,6 +10,7 @@
 public class DAFilter {
 
     private static double dafChi2Cut = 8;
+    private static double dafChi2CutURWell = 100;
 
     // For double hits
     private double[] docas_double;
@@ -27,7 +28,13 @@ public class DAFilter {
     // Effective doca
     private double effectiveDoca;
     private double effectiveVar;
-    private int indexReferenceWire = 0;   
+    private int indexReferenceWire = 0;  
+
+    // For uRWell
+    private double[] xyVars_uRWell;
+    private double weight_uRWell;
+    private double[] effectiveXYVars_uRWell;
+
 
     public DAFilter(double[] docas, double[] vars,  double[] weights, Line3D[] wireLines) {
         this.docas_double = docas;
@@ -44,10 +51,19 @@ public DAFilter(double doca, double var, double weight) {
         this.weight_single = weight;
     }
 
+    public DAFilter(double[] xyVars,  double weight) {
+        this.xyVars_uRWell = xyVars;
+        this.weight_uRWell = weight;              
+    } 
+
     public static void setDafChi2Cut(double chi2Cut){
         dafChi2Cut = chi2Cut;
     }
 
+    public static void setDafChi2CutURWell(double chi2Cut){
+        dafChi2CutURWell = chi2Cut;
+    }
+
     public void calc_effectiveDoca_doubleHits(){        
         if((wireLines_double[0] == wireLines_double[1]) || ((docas_double[0] == docas_double[1]) && !(docas_double[0] == 0 && docas_double[1] == 0))) {
             effectiveVar = vars_double[0]/weights_double[0];
@@ -118,6 +134,12 @@ public void calc_effectiveDoca_singleHit(){
         effectiveDoca = doca_single;
     }
 
+    public void calc_effectiveMeasVars_uRWell(){
+        effectiveXYVars_uRWell = new double[]{10., 10.};
+        for(int i = 0; i < 2; i++)
+            effectiveXYVars_uRWell[i] = xyVars_uRWell[i]/weight_uRWell;
+    }
+
     public double get_EffectiveDoca(){
         return effectiveDoca;
     }
@@ -126,6 +148,10 @@ public double get_EffectiveVar(){
         return effectiveVar;
     }
 
+    public double[] get_EffectiveXYVars_uRWell(){
+        return effectiveXYVars_uRWell;
+    }
+
     public int get_IndexReferenceWire(){
         return indexReferenceWire;
     }
@@ -166,5 +192,19 @@ public double[] calc_updatedWeights_doubleHits(double[] residuals, double anneal
         return updatedWeights;
     }
 
+    public double calc_updatedWeight_uRWell(double[] residuals, double annealingFactor){
+        double factor = 1/(2 * Math.PI) / Math.sqrt( annealingFactor * xyVars_uRWell[0] * xyVars_uRWell[1]);
+
+        double Chi2 = residuals[0] * residuals[0]/xyVars_uRWell[0] + residuals[1] * residuals[1]/xyVars_uRWell[1];
+        double Phi = factor * Math.exp(-0.5 / annealingFactor * Chi2);
+        double Lambda = factor * Math.exp(-0.5 / annealingFactor * dafChi2CutURWell);
+        double sum = Phi + Lambda;
+        double updatedWeight = Phi/sum;        
+
+        if(updatedWeight < 1.e-100) updatedWeight = 1.e-100;        
+        return updatedWeight;
+
+    }
+
 }