fill kftrack before propagation to ATOF

Author: ftouchte

reconstruction/alert/src/main/java/org/jlab/rec/ahdc/KalmanFilter/KalmanFilter.java

@@ -167,6 +167,27 @@ public void propagation(ArrayList<Track> tracks, DataEvent event, final double m
 						hit.setResidual(PostFitPropagator.residual(hit));
 					}
 			    }
+
+				// Fill track and hit bank
+				// TO DO : s and p_drift have to be checked to be sure they represent what we want
+			    double s = PostFitPropagator.stepper.sTot;
+			    double p_drift = PostFitPropagator.stepper.p();
+			    int sum_adc = 0;
+			    double sum_residuals = 0;
+			    double chi2 = 0;
+			    for (Hit hit : AHDC_hits) {
+                    sum_adc += hit.getADC();
+                    sum_residuals += hit.getResidual();
+                    chi2 += Math.pow(hit.getResidual(),2)/hit.MeasurementNoiseMatrix().getEntry(0,0);
+			    }
+			    track.set_sum_adc(sum_adc);
+			    track.set_sum_residuals(sum_residuals);
+			    track.set_chi2(chi2/(AHDC_hits.size()-3));
+			    track.set_p_drift(p_drift);
+			    track.set_dEdx(sum_adc/s);
+			    track.set_path(s);
+			    track.set_n_hits(AHDC_hits.size());
+
 				// Projection towards the ATOF surfaces
 				// R1 : lower surface of an ATOF bar
 				// R2 : upper surface of an ATOF bar = lower surface of an ATOF wedge
@@ -177,9 +198,6 @@ public void propagation(ArrayList<Track> tracks, DataEvent event, final double m
 				double R1 = Math.hypot(pR1.x(), pR1.y());
 				double R2 = Math.hypot(pR2.x(), pR2.y());
 				double R3 = Math.hypot(pR3.x(), pR3.y());
-				
-				System.out.println("ATOF surface R2 : " + R2);
-				System.out.println("ATOF surface R3 : " + R3);
 				{	
 					// From last AHDC hit to surface R1
 					RadialSurfaceKFHit hitR1 = new RadialSurfaceKFHit(R1);
@@ -189,8 +207,8 @@ public void propagation(ArrayList<Track> tracks, DataEvent event, final double m
 					posR1.translateXYZ(0, 0, atof_alignement);
 					int[] idR1 = predict_bar(ATOFdet, posR1);
 					System.out.println("ATOF surface R1 : " + R1);
-					System.out.printf ("   final position : x (.2f) y (.2f) z (.2f)\n", posR1.x(), posR1.y(), posR1.z());
-					System.out.printf ("   ---> sector (2d) layer (2d) component (2d)\n", idR1[0], idR1[1], idR1[2]);
+					System.out.printf ("   final position : x (%.2f) y (%.2f) z (%.2f) --> R (%.2f)\n", posR1.x(), posR1.y(), posR1.z(), Math.hypot(posR1.x(), posR1.y()));
+					System.out.printf ("   ---> sector (%2d) layer (%2d) component (%2d)\n", idR1[0], idR1[1], idR1[2]);
 					// From surface R1 to surface R2
 					RadialSurfaceKFHit hitR2 = new RadialSurfaceKFHit(R2);
 					PostFitPropagator.predict(hitR2, true);
@@ -199,8 +217,8 @@ public void propagation(ArrayList<Track> tracks, DataEvent event, final double m
 					posR2.translateXYZ(0, 0, atof_alignement);
 					int[] idR2 = predict_wedge(ATOFdet, posR2);
 					System.out.println("ATOF surface R2 : " + R2);
-					System.out.printf ("   final position : x (.2f) y (.2f) z (.2f)\n", posR2.x(), posR2.y(), posR2.z());
-					System.out.printf ("   ---> sector (2d) layer (2d) component (2d)\n", idR2[0], idR2[1], idR2[2]);
+					System.out.printf ("   final position : x (%.2f) y (%.2f) z (%.2f)\n", posR2.x(), posR2.y(), posR2.z());
+					System.out.printf ("   ---> sector (%2d) layer (%2d) component (%2d)\n", idR2[0], idR2[1], idR2[2]);
 					// From surface R2 to surface R3
 					RadialSurfaceKFHit hitR3 = new RadialSurfaceKFHit(R3);
 					PostFitPropagator.predict(hitR3, true);
@@ -209,29 +227,11 @@ public void propagation(ArrayList<Track> tracks, DataEvent event, final double m
 					posR3.translateXYZ(0, 0, atof_alignement);
 					int[] idR3 = predict_wedge(ATOFdet, posR3);
 					System.out.println("ATOF surface R3 : " + R3);
-					System.out.printf ("   final position : x (.2f) y (.2f) z (.2f)\n", posR3.x(), posR3.y(), posR3.z());
-					System.out.printf ("   ---> sector (2d) layer (2d) component (2d)\n", idR3[0], idR3[1], idR3[2]);
+					System.out.printf ("   final position : x (%.2f) y (%.2f) z (%.2f)\n", posR3.x(), posR3.y(), posR3.z());
+					System.out.printf ("   ---> sector (%2d) layer (%2d) component (%2d)\n", idR3[0], idR3[1], idR3[2]);
 				}
 
-                // Fill track and hit bank
-				// TO DO : s and p_drift have to be checked to be sure they represent what we want
-			    double s = PostFitPropagator.stepper.sTot;
-			    double p_drift = PostFitPropagator.stepper.p();
-			    int sum_adc = 0;
-			    double sum_residuals = 0;
-			    double chi2 = 0;
-			    for (Hit hit : AHDC_hits) {
-                    sum_adc += hit.getADC();
-                    sum_residuals += hit.getResidual();
-                    chi2 += Math.pow(hit.getResidual(),2)/hit.MeasurementNoiseMatrix().getEntry(0,0);
-			    }
-			    track.set_sum_adc(sum_adc);
-			    track.set_sum_residuals(sum_residuals);
-			    track.set_chi2(chi2/(AHDC_hits.size()-3));
-			    track.set_p_drift(p_drift);
-			    track.set_dEdx(sum_adc/s);
-			    track.set_path(s);
-			    track.set_n_hits(AHDC_hits.size());
+