fixed once and for all the convention for hit sign:

sign >0  if phi_expected state > phi_wire

Author: efuchey

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

@@ -192,7 +192,7 @@ public double distance(Point3D point3D) {
 	}
 
 	public double distance(Point3D point3D, int sign) {
-	    if(sign!=0)
+		//if(sign!=0)
 	    	//System.out.println(" r " + this.r +  " phi " + this.phi + " doca " + this.doca + " sign " + sign + " distance " + this.line3D.distance(point3D).length() + " (sign 0) " + this.line3D_plus.distance(point3D).length() + " (sign+) " + this.line3D_minus.distance(point3D).length() + " (sign-) ");
 		if(sign>0)return this.line3D_plus.distance(point3D).length();
 		if(sign<0)return this.line3D_minus.distance(point3D).length();

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

@@ -91,12 +91,13 @@ public void correct(Indicator indicator) {
 			h = h_beam(stateEstimation);//3x1
 			z = indicator.hit.get_Vector_beam();//0!
 		} else {
-		    boolean goodsign = true;
-		    if(indicator.hit.getSign()!=0){
-			double dphi = Math.atan2(stateEstimation.getEntry(1), stateEstimation.getEntry(0))-indicator.hit.phi(stateEstimation.getEntry(2));//
-			if(dphi*indicator.hit.getSign()<0)goodsign = false;
-			//System.out.println(" r " + indicator.hit.r() + " phi " +  indicator.hit.phi() + " phi wire (-zl/2) " + indicator.hit.phi(-150.0) + " phi wire (0) " + indicator.hit.phi(0.0) + " phi wire (+zl/2) " + indicator.hit.phi(150.) + " phi wire (z) " + indicator.hit.phi(stateEstimation.getEntry(2)) + " phi state " + Math.atan2(stateEstimation.getEntry(1), stateEstimation.getEntry(0)) + " sign " + indicator.hit.getSign() + " good? " + goodsign );
-		    }
+		    //System.out.println(" hit r " + indicator.hit.r() + " hit phi " +  indicator.hit.phi() + " phi wire (-zl/2) " + indicator.hit.phi(-150.0) + " phi wire (0) " + indicator.hit.phi(0.0) + " phi wire (+zl/2) " + indicator.hit.phi(150.) + " state x " + stateEstimation.getEntry(0) + " state y " + stateEstimation.getEntry(1) + " state z " + stateEstimation.getEntry(2) );
+			boolean goodsign = true;
+			if(indicator.hit.getSign()!=0){
+			    double dphi = Math.atan2(stateEstimation.getEntry(1), stateEstimation.getEntry(0))-indicator.hit.phi(stateEstimation.getEntry(2));
+			    if(dphi*indicator.hit.getSign()<0)goodsign = false;
+			    //System.out.println(" hit r " + indicator.hit.r() + " phi wire (z) " + indicator.hit.phi(stateEstimation.getEntry(2)) + " phi state " + Math.atan2(stateEstimation.getEntry(1), stateEstimation.getEntry(0)) + " sign " + indicator.hit.getSign() + " good? " + goodsign );
+			}
 		        measurementNoise = indicator.hit.get_MeasurementNoise(goodsign);//1x1
 		        //measurementNoise = indicator.hit.get_MeasurementNoise();//1x1
 		        measurementMatrix = H(stateEstimation, indicator);//6x1

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

@@ -90,44 +90,45 @@ private void propagation(ArrayList<Track> tracks, DataEvent event) {
 			// Initialization hit
 			ArrayList<org.jlab.rec.ahdc.Hit.Hit> AHDC_hits = tracks.get(0).getHits();
 			ArrayList<Hit>                       KF_hits   = new ArrayList<>();
-			//System.out.println(" px " +  px0 + " py " + py0  +" pz " +  pz0 +" vz " + z0 + " number of hits: " + AHDC_hits.size() + " MC hits? " + sim_hits.size());
+			//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());
 			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);
+				//System.out.println( " r = " + hit.r() + " hit.phi " + hit.phi() +" hit.doca = " + hit.getDoca()  );
 				// Do delete hit with same radius
 				boolean phi_rollover = false;
 				boolean aleardyHaveR = false;
 				for (Hit o: KF_hits){
 				     if (o.r() == hit.r()){
 					 aleardyHaveR = true;
-					    
+					 //sign+ means (phi track - phi wire) > 0
 					    if(o.phi()>hit.phi()){
 						if(Math.abs(o.phi()-hit.phi())< 2*Math.toRadians(360./o.getNumWires()) ){
-				 		    o.setSign(+1);
-				 		    hit.setSign(-1);
+				 		    o.setSign(-1);
+				 		    hit.setSign(+1);
 						}else{
 						    phi_rollover = true;
-				 		    hit.setSign(+1);
-				 		    o.setSign(-1);
+				 		    hit.setSign(-1);
+				 		    o.setSign(+1);
 						}
 				 	    }else{
 						if(Math.abs(o.phi()-hit.phi())< 2*Math.toRadians(360./o.getNumWires()) ){
-				 		    hit.setSign(+1);
-				 		    o.setSign(-1);
+				 		    hit.setSign(-1);
+				 		    o.setSign(+1);
 						}else{
 						    phi_rollover = true;
-						    o.setSign(+1);
-                                                    hit.setSign(-1);
+						    o.setSign(-1);
+                                                    hit.setSign(+1);
 						}
 				 	    }
 					    //System.out.println( " r = " + o.r() + " o.phi = " + o.phi() + " o.doca = " + o.getDoca()*o.getSign() + " hit.phi " + hit.phi() +" hit.doca = " + hit.getDoca()*hit.getSign() + " angle between wires: " + Math.toRadians(360./hit.getNumWires()) + " >= ? angle covered by docas: " +  Math.atan( (o.getDoca()+hit.getDoca())/o.r() )  );
 				     }
 				}
 				//if(!aleardyHaveR)KF_hits.add(hit);
 				if (phi_rollover){
-				    KF_hits.add(KF_hits.size()-1, hit);
+				     KF_hits.add(KF_hits.size()-1, hit);
 				}else{
 				    KF_hits.add(hit);
 				}