Fill attributes of AHDC::Tracks, KFTrack, Hits

Author: ftouchte

reconstruction/alert/src/main/java/org/jlab/rec/ahdc/Banks/RecoBankWriter.java

@@ -141,13 +141,13 @@ public DataBank fillAHDCKFTrackBank(DataEvent event, ArrayList<Track> tracks) {
 			bank.setFloat("px", row, (float) px);
 			bank.setFloat("py", row, (float) py);
 			bank.setFloat("pz", row, (float) pz);
-			bank.setInt("n_hits", row, (int) track.get_n_hits_kf());
-			bank.setInt("sum_adc", row, (int) track.get_sum_adc_kf());
+			bank.setInt("n_hits", row, (int) track.get_n_hits());
+			bank.setInt("sum_adc", row, (int) track.get_sum_adc());
 			bank.setFloat("path", row, (float) track.get_path_kf());
 			bank.setFloat("dEdx", row, (float) track.get_dEdx_kf());
 			bank.setFloat("p_drift", row, (float) track.get_p_drift_kf());
-			bank.setFloat("chi2", row, (float) track.get_chi2_kf());
-			bank.setFloat("sum_residuals", row, (float) track.get_sum_residuals_kf());
+			bank.setFloat("chi2", row, (float) track.get_chi2());
+			bank.setFloat("sum_residuals", row, (float) track.get_sum_residuals());
 
 			row++;
 		}

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

@@ -76,8 +76,10 @@ private void propagation(ArrayList<Track> tracks, DataEvent event, boolean IsMC)
 
 			// Initialization material map
 			HashMap<String, Material> materialHashMap = materialGeneration();
-
+			int trackId = 0;
 			for (Track track : tracks) {
+			    trackId++;
+			    track.set_trackId(trackId);
 			    // Initialization State Vector
 			    final double x0  = 0.0;
 			    final double y0  = 0.0;
@@ -93,11 +95,15 @@ private void propagation(ArrayList<Track> tracks, DataEvent event, boolean IsMC)
 			    ArrayList<org.jlab.rec.ahdc.Hit.Hit> AHDC_hits = track.getHits();
 			    ArrayList<Hit>                       KF_hits   = new ArrayList<>();
 			    //System.out.println(" px " +  y[3] + " py " + y[4]  +" pz " +  y[5] +" vz " + y[2] + " number of hits: " + AHDC_hits.size() + " MC hits? " + sim_hits.size());
+			    track.set_n_hits(AHDC_hits.size());
 			    for (org.jlab.rec.ahdc.Hit.Hit AHDC_hit : AHDC_hits) {
 				Hit hit = new Hit(AHDC_hit.getSuperLayerId(), AHDC_hit.getLayerId(), AHDC_hit.getWireId(), AHDC_hit.getNbOfWires(), AHDC_hit.getRadius(), AHDC_hit.getDoca());
 				hit.setADC(AHDC_hit.getADC());
 				hit.setHitIdx(AHDC_hit.getId());
 				hit.setSign(0);
+				// set track id
+				AHDC_hit.setTrackId(trackId);
+				
 				//System.out.println( " r = " + hit.r() + " hit.phi " + hit.phi() +" hit.doca = " + hit.getDoca()  );
 				// Do delete hit with same radius
 				boolean phi_rollover = false;
@@ -194,6 +200,19 @@ private void propagation(ArrayList<Track> tracks, DataEvent event, boolean IsMC)
 				    }
 				}
 			    }
+			    // At this stage, all relevants AHDC hits are filled
+			    // Compute sum_adc, sum_residuals and chi2
+			    int sum_adc = 0;
+			    double sum_residuals = 0;
+			    double chi2 = 0;
+			    for (org.jlab.rec.ahdc.Hit.Hit AHDC_hit : AHDC_hits) {
+				sum_adc += AHDC_hit.getADC();
+				sum_residuals += AHDC_hit.getResidual();
+				chi2 += Math.pow(AHDC_hit.getResidual(),2.0);
+			    }
+			    track.set_sum_adc(sum_adc);
+			    track.set_sum_residuals(sum_residuals);
+			    track.set_chi2(chi2);
 			}//end of loop on track candidates
 		} catch (Exception e) {
 			// e.printStackTrace();

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

@@ -17,6 +17,10 @@ public class Track {
 	private final ArrayList<Hit> hits      = new ArrayList<>();
 
 	private int    trackId = -1; ///< id of the track
+	private int    n_hits  = 0;  ///< number of hits
+	private int    sum_adc = 0;  ///< sum of adc (adc)
+	private double sum_residuals = 0; ///< sum of residuals (mm)
+	private double chi2    = 0;  ///< sum of residuals^2 (mm^2)
 	// AHDC::Track
 	private double x0  = 0;
 	private double y0  = 0;
@@ -26,11 +30,7 @@ public class Track {
 	private double pz0 = 0;
 	private double dEdx    = 0;  ///< deposited energy per path length (adc/mm)
 	private double p_drift = 0;  ///< momentum in the drift region (MeV)
-	private int    n_hits  = 0;  ///< number of hits
 	private double path    = 0;  ///< length of the track (mm)
-	private int    sum_adc = 0;  ///< sum of adc (adc)
-	private double chi2    = 0;  ///< sum of residuals^2 (mm^2)
-	private double sum_residuals = 0; ///< sum of residuals (mm)
 	// AHDC::KFTrack
 	private double x0_kf  = 0;
 	private double y0_kf  = 0;
@@ -40,11 +40,7 @@ public class Track {
 	private double pz0_kf = 0;
 	private double dEdx_kf    = 0;  ///< deposited energy per path length (adc/mm)
 	private double p_drift_kf = 0;  ///< momentum in the drift region (MeV)
-	private int    n_hits_kf  = 0;  ///< number of hits
 	private double path_kf    = 0;  ///< length of the track (mm)
-	private int    sum_adc_kf = 0;  ///< sum of adc (adc)
-	private double chi2_kf    = 0;  ///< sum of residuals^2 (mm^2)
-	private double sum_residuals_kf = 0; ///< sum of residuals (mm)
 
 	public Track(List<Cluster> clusters) {
 		this._Clusters = clusters;
@@ -177,42 +173,32 @@ public double getPy0_kf() {
 	public double getPz0_kf() {
 		return pz0_kf;
 	}
-	
+
+	// Same for Track and KFTrack	
 	public void set_trackId(int _trackId) { trackId = _trackId;}
-	public int  get_trackId() {return trackId;}
-	// AHDC::Track
-	public void set_dEdx(double _dEdx) { dEdx = _dEdx;}
-	public void set_p_drift(double _p_drift) { p_drift = _p_drift;}
 	public void set_n_hits(int _n_hits) { n_hits = _n_hits;}
-	public void set_path(double _path) { path = _path;}
 	public void set_sum_adc(int _sum_adc) { sum_adc = _sum_adc;}
 	public void set_chi2(double _chi2) { chi2 = _chi2;}
 	public void set_sum_residuals(double _sum_residuals) { sum_residuals = _sum_residuals;}
-
-	public double get_dEdx() {return dEdx;}
-	public double get_p_drift() {return p_drift;}
+	public int    get_trackId() {return trackId;}
 	public int    get_n_hits() {return n_hits;}
-	public double get_path() {return path;}
 	public int    get_sum_adc() {return sum_adc;}
 	public double get_chi2() {return chi2;}
 	public double get_sum_residuals() {return sum_residuals;}
+	// AHDC::Track
+	public void set_dEdx(double _dEdx) { dEdx = _dEdx;}
+	public void set_p_drift(double _p_drift) { p_drift = _p_drift;}
+	public void set_path(double _path) { path = _path;}
+	public double get_dEdx() {return dEdx;}
+	public double get_p_drift() {return p_drift;}
+	public double get_path() {return path;}
 
 	// AHDC::KFTrack
-	
 	public void set_dEdx_kf(double _dEdx_kf) { dEdx_kf = _dEdx_kf;}
 	public void set_p_drift_kf(double _p_drift_kf) { p_drift_kf = _p_drift_kf;}
-	public void set_n_hits_kf(int _n_hits_kf) { n_hits_kf = _n_hits_kf;}
 	public void set_path_kf(double _path_kf) { path_kf = _path_kf;}
-	public void set_sum_adc_kf(int _sum_adc_kf) { sum_adc_kf = _sum_adc_kf;}
-	public void set_chi2_kf(double _chi2_kf) { chi2_kf = _chi2_kf;}
-	public void set_sum_residuals_kf(double _sum_residuals_kf) { sum_residuals_kf = _sum_residuals_kf;}
-
 	public double get_dEdx_kf() {return dEdx_kf;}
 	public double get_p_drift_kf() {return p_drift_kf;}
-	public int    get_n_hits_kf() {return n_hits_kf;}
 	public double get_path_kf() {return path_kf;}
-	public int    get_sum_adc_kf() {return sum_adc_kf;}
-	public double get_chi2_kf() {return chi2_kf;}
-	public double get_sum_residuals_kf() {return sum_residuals_kf;}
 
 }