Fixed old bug in "Calculate grids", introdudced temporary debugs (43fae5db) · Commits · Elphel / imagej-elphel

src/main/java/MatchSimulatedPattern.java

+68 −24

Original line number	Original line	Diff line number	Diff line
	@@ -965,7 +965,23 @@ public class MatchSimulatedPattern {
	double ringWidth, // ring (around r=0.5 dist to opposite corr) width		double ringWidth, // ring (around r=0.5 dist to opposite corr) width
	double x0, // center coordinates		double x0, // center coordinates
	double y0,		double y0,
	String title) { // title base for optional plots names		String title){
			return correlationContrast (
			pixels, // square pixel array
			wVectors, // wave vectors (same units as the pixels array)
			ringWidth, // ring (around r=0.5 dist to opposite corr) width
			x0, // center coordinates
			y0,
			title, // title base for optional plots names
			this.debugLevel);
			}
			public double correlationContrast ( double [] pixels, // square pixel array
			double [][] wVectors, // wave vectors (same units as the pixels array)
			double ringWidth, // ring (around r=0.5 dist to opposite corr) width
			double x0, // center coordinates
			double y0,
			String title, // title base for optional plots names
			int debugLevel){
	int size=(int) Math.sqrt(pixels.length);		int size=(int) Math.sqrt(pixels.length);
	double [] xy= new double [2];		double [] xy= new double [2];
	double [] uv;		double [] uv;
	@@ -977,7 +993,7 @@ public class MatchSimulatedPattern {
	double r2WingsOuter= 0.0625(1.0+ringWidth)(1.0+ringWidth);		double r2WingsOuter= 0.0625(1.0+ringWidth)(1.0+ringWidth);
	double r2WingsInner= 0.0625(1.0-ringWidth)(1.0-ringWidth);		double r2WingsInner= 0.0625(1.0-ringWidth)(1.0-ringWidth);
	double r2Center=0.0625(ringWidth)(ringWidth);		double r2Center=0.0625(ringWidth)(ringWidth);
	if (this.debugLevel>2) System.out.println("rWingsOuter="+Math.sqrt(r2WingsOuter)+" rWingsInner="+Math.sqrt(r2WingsInner)+" rCenter="+Math.sqrt(r2Center));		if (debugLevel>2) System.out.println("rWingsOuter="+Math.sqrt(r2WingsOuter)+" rWingsInner="+Math.sqrt(r2WingsInner)+" rCenter="+Math.sqrt(r2Center));

	double valCenter=0.0;		double valCenter=0.0;
	double valWings=0.0;		double valWings=0.0;
	@@ -1002,14 +1018,16 @@ public class MatchSimulatedPattern {
	}		}
	}		}
	if ((numWings==0.0) \|\| (numCenter==0.0)) {		if ((numWings==0.0) \|\| (numCenter==0.0)) {
	if (this.debugLevel>1) System.out.println("Not enough data for correlation contrast: numCenter="+numCenter+" numWings="+numWings+		if (debugLevel>1) System.out.println("Not enough data for correlation contrast: numCenter="+numCenter+" numWings="+numWings+
	" valCenter="+IJ.d2s(valCenter,2)+" valWings="+IJ.d2s(valWings,2));		" valCenter="+IJ.d2s(valCenter,2)+" valWings="+IJ.d2s(valWings,2));
	return -1.0;		return -1.0;
	}		}
	double contrast=Math.sqrt((valCenter/numCenter)/(valWings/numWings));		double contrast=Math.sqrt((valCenter/numCenter)/(valWings/numWings));
	if (this.debugLevel>2) {		if (debugLevel>2) {
	System.out.println("Correlation contrast is "+contrast);		System.out.println("Correlation contrast is "+contrast);
	float [] floatPixels=new float[size*size];		double [] maskedPixels=new double[size*size];
			double [] u_value=new double[size*size];
			double [] v_value=new double[size*size];
	int index;		int index;
	for (i=0;i<size;i++) {		for (i=0;i<size;i++) {
	xy[1]=i-size/2-y0;		xy[1]=i-size/2-y0;
	@@ -1018,22 +1036,27 @@ public class MatchSimulatedPattern {
	uv=matrix2x2_mul(wVectors,xy);		uv=matrix2x2_mul(wVectors,xy);
	r2=uv[0]uv[0]+uv[1]uv[1];		r2=uv[0]uv[0]+uv[1]uv[1];
	index=i*size+j;		index=i*size+j;
			u_value[index]=uv[0];
			v_value[index]=uv[1];
	/* r=Math.sqrt(r2);		/* r=Math.sqrt(r2);
	r-=Math.floor(r);		r-=Math.floor(r);
	floatPixels[index]=(float) r;*/		floatPixels[index]=(float) r;*/

	if (((r2<=r2WingsOuter) && (r2>r2WingsInner)) \|\| (r2<=r2Center)){		if (((r2<=r2WingsOuter) && (r2>r2WingsInner)) \|\| (r2<=r2Center)){
	floatPixels[index]=(float) pixels[index];		maskedPixels[index]= pixels[index];
	} else {		} else {
	floatPixels[index]=0.0F;		maskedPixels[index]=0.0;
	}		}
	}		}
	}		}
	ImageProcessor ip = new FloatProcessor(size,size);		double [][] dbgPixels={pixels,maskedPixels,u_value,v_value};
	ip.setPixels(floatPixels);		String [] titles={"all","masked","u","v"};
	ip.resetMinAndMax();		(new showDoubleFloatArrays()).showArrays(
	ImagePlus imp= new ImagePlus(title+"_CORR_MASK", ip);		dbgPixels,
	imp.show();		size,
			size,
			true,
			title+"_CORR_MASK",
			titles);
	}		}
	return contrast;		return contrast;
	}		}
	@@ -2977,6 +3000,7 @@ public class MatchSimulatedPattern {
	point[0]=(selection.x+nh*selection.width/(1<<tryHor)) & ~1;		point[0]=(selection.x+nh*selection.width/(1<<tryHor)) & ~1;
	point[1]=(selection.y+nv*selection.height/(1<<tryVert)) & ~1;		point[1]=(selection.y+nv*selection.height/(1<<tryVert)) & ~1;
	if (debugLevel>2) System.out.println("trying xc="+point[0]+", yc="+point[1]+"(nv="+nv+", nh="+nh+")");		if (debugLevel>2) System.out.println("trying xc="+point[0]+", yc="+point[1]+"(nv="+nv+", nh="+nh+")");
			// System.out.println("### trying xc="+point[0]+", yc="+point[1]+"(nv="+nv+", nh="+nh+")");
	if ((debugLevel>2) && (startScanIndex==3)) debugLevel=3; // show debug images for the first point only		if ((debugLevel>2) && (startScanIndex==3)) debugLevel=3; // show debug images for the first point only
	node=tryPattern (		node=tryPattern (
	point, // xy to try		point, // xy to try
	@@ -7332,7 +7356,15 @@ y=xy0[1] + dUdeltaUV[0](xy1[1]-xy0[1])+dVdeltaUV[1](xy2[1]-xy0[1])
	double [][] locsNeib, // locations and weights of neighbors to average		double [][] locsNeib, // locations and weights of neighbors to average
	int debug_level		int debug_level
	){		){
			double dbg_x=1005.0;
			double dbg_y=1284.0;
			double dbg_tolerance=5.0;
			boolean dbgThis=(Math.abs(beforeXY[0]-dbg_x)<dbg_tolerance) && (Math.abs(beforeXY[1]-dbg_y)<dbg_tolerance);
			if (dbgThis) {
			System.out.println("correctedPatternCrossLocationAverage4(), beforeXY[0]="+beforeXY[0]+", beforeXY[1]="+beforeXY[1]);
			debug_level+=3;
			}
			// System.out.println("correctedPatternCrossLocationAverage4(): beforeXY[0]="+beforeXY[0]+". beforeXY[1]="+beforeXY[1]);
	// Just for testing		// Just for testing
	beforeXY[0]+=distortionParameters.correlationDx; // offset, X (in pixels)		beforeXY[0]+=distortionParameters.correlationDx; // offset, X (in pixels)
	beforeXY[1]+=distortionParameters.correlationDy; // offset y (in pixels)		beforeXY[1]+=distortionParameters.correlationDy; // offset y (in pixels)
	@@ -7551,7 +7583,8 @@ y=xy0[1] + dUdeltaUV[0](xy1[1]-xy0[1])+dVdeltaUV[1](xy2[1]-xy0[1])
	//TODO: verify that displacement is correct here (sign, direction)		//TODO: verify that displacement is correct here (sign, direction)
	centerXY[0], // x0, // center coordinates		centerXY[0], // x0, // center coordinates
	centerXY[1], //y0,		centerXY[1], //y0,
	"test-contrast"); // title base for optional plots names		"test-contrast", // title base for optional plots names
			debug_level);

	result[2]=contrast;		result[2]=contrast;

	@@ -8042,20 +8075,31 @@ d()/dy=Cx+2B*y+E=0
	for (i=size1/2+1;i<size -(size1/2);i++) for (j=0;j<size;j++) corr1[i*size+j]=0.0;		for (i=size1/2+1;i<size -(size1/2);i++) for (j=0;j<size;j++) corr1[i*size+j]=0.0;
	for (i=size -(size1/2); i<size;i++) for (j=size1/2+1;j<size -(size1/2);j++) corr1[i*size+j]=0.0;		for (i=size -(size1/2); i<size;i++) for (j=size1/2+1;j<size -(size1/2);j++) corr1[i*size+j]=0.0;
	// apply window for now - just		// apply window for now - just
	double [] hamming=fht_instance.getHamming1d(size1);		/*
			if (showDebug) {
			System.out.println("Getting hamming1d ("+size1+")");
			}
			*/
			double [] hamming=fht_instance.getHamming1d(size1).clone();
			/*
			if (showDebug) {
			for (i=0;i<hamming.length;i++) System.out.println("hamming["+i+"]="+hamming[i]);
			}
			if (showDebug) SDFA_INSTANCE.showArrays(corr1.clone(), "NO_ALIAS");
	// Combine with low-pass Gaussian (if it is >0)		// Combine with low-pass Gaussian (if it is >0)
	if (lowpass>0){		if (lowpass>0){
	double [] gaussian1d=fht_instance.getGaussian1d(lowpass,size1); // no need to divide by /decimateFFT as we use size1, not size		double [] gaussian1d=fht_instance.getGaussian1d(lowpass,size1); // no need to divide by /decimateFFT as we use size1, not size
	for (i=0;i<hammingMod.length;i++) hamming[i]*=gaussian1d[i];		for (i=0;i<hammingMod.length;i++) hamming[i]*=gaussian1d[i];
	// if (showDebug) {		if (showDebug) {
	// System.out.println("lowpass="+lowpass);		System.out.println("lowpass="+lowpass);
	// for (i=0;i<gaussian1d.length;i++) System.out.println("gaussian1d["+i+"]="+gaussian1d[i]);		for (i=0;i<gaussian1d.length;i++) System.out.println("gaussian1d["+i+"]="+gaussian1d[i]);
	// }		}
	}		}

	// if (showDebug) {		if (showDebug) {
	// for (i=0;i<hamming.length;i++) System.out.println("hamming["+i+"]="+hamming[i]);		for (i=0;i<hamming.length;i++) System.out.println("hamming["+i+"]="+hamming[i]);
	// }		}
			*/
	int halfSize1=size1/2, shiftZero=size-halfSize1;		int halfSize1=size1/2, shiftZero=size-halfSize1;
	for (i=0;i<=size1;i++) for (j=0;j<=size1;j++){		for (i=0;i<=size1;i++) for (j=0;j<=size1;j++){
	int im=i%size1,jm=j%size1;		int im=i%size1,jm=j%size1;

Admin message