Merge remote-tracking branch 'origin/dct'

src/main/java/DttRad2.java

@@ -31,7 +31,9 @@ public class DttRad2 {
 	int N = 0;
 	double [][][] CII=    null;
 	double [][][] CIIe=   null; // alternative matrix with all coefficients the same (non-orthogonal, but matching DFT)
-	double [][][] CIIIe=  null; // alternative matrix with k0=1/2, k(n-1) = 1/2 (non-orthogonal, but matching DFT)
+	double [][][] CIIIe=  null; // alternative matrix with k0=1/2, k(n-1) = 1/2 (non-orthogonal, but matching DFT) 
+	double [][][] SIIe=   null; // alternative matrix with all coefficients the same (non-orthogonal, but matching DFT)
+	double [][][] SIIIe=  null; // alternative matrix with k0=1/2, k(n-1) = 1/2 (non-orthogonal, but matching DFT)
 	
 	double [][][] CIV=  null;
 	double [][][] SIV=  null;
@@ -378,22 +380,28 @@ public class DttRad2 {
 	}
 
 	public double [] dttt_iie(double [] x){
-		return dttt_iie(x, 1 << (ilog2(x.length)/2)); 
+		return dttt_iie(x,0, 1 << (ilog2(x.length)/2)); 
+	}
+	public double [] dttt_iie(double [] x, int mode){
+		return dttt_iie(x, mode, 1 << (ilog2(x.length)/2)); 
 	}
 
-	public double [] dttt_iie(double [] x, int n){
+	public double [] dttt_iie(double [] x, int mode, int n){
+		
 		double [] y = new double [n*n];
 		double [] line = new double[n];
 		// first (horizontal) pass
 		for (int i = 0; i<n; i++){
 			System.arraycopy(x, n*i, line, 0, n);
-			line = dctiie_direct(line);
+//			line = dctiie_direct(line);
+			line = ((mode & 1)!=0)? dstiie_direct(line):dctiie_direct(line);
 			for (int j=0; j < n;j++) y[j*n+i] =line[j]; // transpose 
 		}
 		// second (vertical) pass
 		for (int i = 0; i<n; i++){
 			System.arraycopy(y, n*i, line, 0, n);
-			line = dctiie_direct(line);
+//			line = dctiie_direct(line);
+			line = ((mode & 2)!=0)? dstiie_direct(line):dctiie_direct(line);
 			System.arraycopy(line, 0, y, n*i, n);
 		}
 		return y;
@@ -425,22 +433,27 @@ public class DttRad2 {
 	}
 
 	public double [] dttt_iiie(double [] x){
-		return dttt_iiie(x, 1 << (ilog2(x.length)/2)); 
+		return dttt_iiie(x,0, 1 << (ilog2(x.length)/2)); 
+	}
+	public double [] dttt_iiie(double [] x, int mode){
+		return dttt_iiie(x, mode, 1 << (ilog2(x.length)/2)); 
 	}
 
-	public double [] dttt_iiie(double [] x, int n){
+	public double [] dttt_iiie(double [] x, int mode, int n){
 		double [] y = new double [n*n];
 		double [] line = new double[n];
 		// first (horizontal) pass
 		for (int i = 0; i<n; i++){
 			System.arraycopy(x, n*i, line, 0, n);
-			line = dctiiie_direct(line);
+//			line = dctiiie_direct(line);
+			line = ((mode & 1)!=0)? dstiiie_direct(line):dctiiie_direct(line);
 			for (int j=0; j < n;j++) y[j*n+i] =line[j]; // transpose 
 		}
 		// second (vertical) pass
 		for (int i = 0; i<n; i++){
 			System.arraycopy(y, n*i, line, 0, n);
-			line = dctiiie_direct(line);
+//			line = dctiiie_direct(line);
+			line = ((mode & 2)!=0)? dstiiie_direct(line):dctiiie_direct(line);
 			System.arraycopy(line, 0, y, n*i, n);
 		}
 		return y;
@@ -608,6 +621,38 @@ public class DttRad2 {
 		return y;
 	}
 
+	public double [] dstiie_direct(double[] x){
+		int n = x.length;
+		int t = ilog2(n)-1;
+		if (SIIe==null){
+			setup_SIIe(N); // just full size
+		}
+		double [] y = new double[n];
+		for (int i = 0; i<n; i++) {
+			y[i] = 0.0;
+			for (int j = 0; j< n; j++){
+				y[i]+= SIIe[t][i][j]*x[j]; 
+			}
+		}
+		return y;
+	}
+
+	public double [] dstiiie_direct(double[] x){
+		int n = x.length;
+		int t = ilog2(n)-1;
+		if (SIIIe==null){
+			setup_SIIIe(N); // just full size
+		}
+		double [] y = new double[n];
+		for (int i = 0; i<n; i++) {
+			y[i] = 0.0;
+			for (int j = 0; j< n; j++){
+				y[i]+= SIIIe[t][i][j]*x[j]; 
+			}
+		}
+		return y;
+	}
+	
 	public double [] dstiv_direct(double[] x){
 		int n = x.length;
 		int t = ilog2(n)-1;
@@ -672,11 +717,8 @@ public class DttRad2 {
 			int n = 2 << t; // for N==3: 2, 4, 8
 			CIIe[t] = new double[n][n];
 			double scale = Math.sqrt(2.0/n);
-//			double ej;
 			double pi_2n=Math.PI/(2*n);
 			for (int j=0;j<n; j++){
-//				if (j==0) ej= Math.sqrt(0.5);
-//				else ej = 1.0;
 				for (int k = 0; k<n; k++){
 					CIIe[t][j][k] = scale * Math.cos(j*(2*k+1)*pi_2n);  
 				}
@@ -697,10 +739,9 @@ public class DttRad2 {
 			double pi_2n=Math.PI/(2*n);
 			for (int j=0;j < n; j++){
 				if ((j==0) || (j == (n-1))) ej= 0.5; // Math.sqrt(0.5);
-//				if (j==0) ej= 0.5; // Math.sqrt(0.5);
+//				if (j==0) ej= 0.5; // Math.sqrt(0.5); Should it be this? https://en.wikipedia.org/wiki/Discrete_cosine_transform#DCT-III
 				else ej = 1.0;
 				for (int k = 0; k<n; k++){
-//					CIIIe[t][j][k] = scale * ej * Math.cos(j*(2*k+1)*pi_2n);  
 					CIIIe[t][k][j] = scale * ej * Math.cos(j*(2*k+1)*pi_2n);  
 				}
 			}
@@ -729,6 +770,46 @@ public class DttRad2 {
 		}
 	}	
 
+	private void setup_SIIe(int maxN){
+		if (maxN > N) setup_arrays(maxN);		
+		int l = ilog2(N);
+		if (!(SIIe==null) && (SIIe.length >= l)) return;
+		SIIe = new double[l][][]; // only needed for direct? Assign only when needed?
+		for (int t = 0; t<SIIe.length; t++) {
+			int n = 2 << t; // for N==3: 2, 4, 8
+			SIIe[t] = new double[n][n];
+			double scale = Math.sqrt(2.0/n);
+			double pi_2n=Math.PI/(2*n);
+			for (int j=0;j<n; j++){
+				for (int k = 0; k<n; k++){
+					SIIe[t][j][k] = scale * Math.sin((j+1)*(2*k+1)*pi_2n);  
+				}
+			}
+		}
+	}
+
+	private void setup_SIIIe(int maxN){
+		if (maxN > N) setup_arrays(maxN);		
+		int l = ilog2(N);
+		if (!(SIIIe==null) && (SIIIe.length >= l)) return;
+		SIIIe = new double[l][][]; // only needed for direct? Assign only when needed?
+		for (int t = 0; t<SIIIe.length; t++) {
+			int n = 2 << t; // for N==3: 2, 4, 8
+			SIIIe[t] = new double[n][n];
+			double scale = Math.sqrt(2.0/n);
+			double ej;
+			double pi_2n=Math.PI/(2*n);
+			for (int j=0;j < n; j++){
+//				if ((j==0) || (j == (n-1))) ej= 0.5; // Math.sqrt(0.5);
+				if (j == (n-1)) ej= 0.5; // Math.sqrt(0.5);
+				else ej = 1.0;
+				for (int k = 0; k<n; k++){
+					SIIIe[t][k][j] = scale * ej * Math.sin((j+1)*(2*k+1)*pi_2n);  
+				}
+			}
+		}
+	}
+	
 	private void setup_SIV(int maxN){
 		if (maxN > N) setup_arrays(maxN);		
 		int l = ilog2(N);

src/main/java/EyesisCorrectionParameters.java

@@ -1773,14 +1773,18 @@ public class EyesisCorrectionParameters {
   		}
   	}
     public static class CLTParameters {
-  		public int transform_size =    8; //
-  		public int clt_window =        1; // currently only 3 types of windows - 0 (none), 1 and 2
-  		public double     shift_x =  0.0;
-  		public double     shift_y =  0.0;
-  		public int        iclt_mask = 15; // which transforms to combine
-  		public int        tileX =    258; // number of kernel tile (0..163) 
-  		public int        tileY =    133; // number of kernel tile (0..122)
-  		public int        dbg_mode =   0;  // 0 - normal, +1 - no DCT/IDCT
+  		public int transform_size =     8; //
+  		public int clt_window =         1; // currently only 3 types of windows - 0 (none), 1 and 2
+  		public double     shift_x =   0.0;
+  		public double     shift_y =   0.0;
+  		public int        iclt_mask =  15; // which transforms to combine
+  		public int        tileX =     258; // number of kernel tile (0..163) 
+  		public int        tileY =     133; // number of kernel tile (0..122)
+  		public int        dbg_mode =    0; // 0 - normal, +1 - no DCT/IDCT
+  		public int        ishift_x =    0; // debug feature - shift source image by this pixels left
+  		public int        ishift_y =    0; // debug feature - shift source image by this pixels down
+  		public double     fat_zero =  0.0; // modify phase correlation to prevent division by very small numbers
+  		public double     corr_sigma =0.8; // LPF correlarion sigma 
   		
   		public CLTParameters(){}
   		public void setProperties(String prefix,Properties properties){
@@ -1792,6 +1796,10 @@ public class EyesisCorrectionParameters {
   			properties.setProperty(prefix+"tileX",         this.tileX+"");
   			properties.setProperty(prefix+"tileY",         this.tileY+"");
   			properties.setProperty(prefix+"dbg_mode",      this.dbg_mode+"");
+  			properties.setProperty(prefix+"ishift_x",      this.ishift_x+"");
+  			properties.setProperty(prefix+"ishift_y",      this.ishift_y+"");
+  			properties.setProperty(prefix+"fat_zero",      this.fat_zero+"");
+  			properties.setProperty(prefix+"corr_sigma",    this.corr_sigma+"");
   		}
   		public void getProperties(String prefix,Properties properties){
   			if (properties.getProperty(prefix+"transform_size")!=null) this.transform_size=Integer.parseInt(properties.getProperty(prefix+"transform_size"));
@@ -1802,6 +1810,10 @@ public class EyesisCorrectionParameters {
   			if (properties.getProperty(prefix+"tileX")!=null)          this.tileX=Integer.parseInt(properties.getProperty(prefix+"tileX"));
   			if (properties.getProperty(prefix+"tileY")!=null)          this.tileY=Integer.parseInt(properties.getProperty(prefix+"tileY"));
   			if (properties.getProperty(prefix+"dbg_mode")!=null)       this.dbg_mode=Integer.parseInt(properties.getProperty(prefix+"dbg_mode"));
+  			if (properties.getProperty(prefix+"ishift_x")!=null)       this.ishift_x=Integer.parseInt(properties.getProperty(prefix+"ishift_x"));
+  			if (properties.getProperty(prefix+"ishift_y")!=null)       this.ishift_y=Integer.parseInt(properties.getProperty(prefix+"ishift_y"));
+  			if (properties.getProperty(prefix+"fat_zero")!=null)       this.fat_zero=Double.parseDouble(properties.getProperty(prefix+"fat_zero"));
+  			if (properties.getProperty(prefix+"corr_sigma")!=null)     this.corr_sigma=Double.parseDouble(properties.getProperty(prefix+"corr_sigma"));
   		}
   		public boolean showDialog() {
   			GenericDialog gd = new GenericDialog("Set DCT parameters");
@@ -1813,7 +1825,10 @@ public class EyesisCorrectionParameters {
   			gd.addNumericField("Tile X to extract (0..163)",                                     this.tileX,                     0);
   			gd.addNumericField("Tile Y to extract (0..122)",                                     this.tileY,                     0);
   			gd.addNumericField("dbg_mode: 0 - normal, +1 - no DCT/IDCT, just fold",              this.dbg_mode,                  0);
-
+  			gd.addNumericField("ishift_x: shift source image by this pixels left",               this.ishift_x,                  0);
+  			gd.addNumericField("ishift_x: shift source image by this pixels down",               this.ishift_y,                  0);
+   			gd.addNumericField("Modify phase correlation to prevent division by very small numbers", this.fat_zero,              4);
+   			gd.addNumericField("LPF correlarion sigma ",                                         this.corr_sigma,                3);
   			WindowTools.addScrollBars(gd);
   			gd.showDialog();
   			
@@ -1825,7 +1840,11 @@ public class EyesisCorrectionParameters {
   			this.iclt_mask=             (int) gd.getNextNumber();
   			this.tileX=                 (int) gd.getNextNumber();
   			this.tileY=                 (int) gd.getNextNumber();
-  			this.dbg_mode=                 (int) gd.getNextNumber();
+  			this.dbg_mode=              (int) gd.getNextNumber();
+  			this.ishift_x=              (int) gd.getNextNumber();
+  			this.ishift_y=              (int) gd.getNextNumber();
+  			this.fat_zero =                   gd.getNextNumber();
+  			this.corr_sigma =                 gd.getNextNumber();
   			return true;
   		}
     }

src/main/java/EyesisDCT.java

@@ -790,7 +790,7 @@ public class EyesisDCT {
 							  }
 
 							  //								kernels[chn].st_kernels[nc][tileY][tileX]= dtt.dttt_iii(kernels[chn].st_kernels[nc][tileY][tileX]);
-							  kernels[chn].st_kernels[nc][tileY][tileX]= dtt.dttt_iiie(kernels[chn].st_kernels[nc][tileY][tileX]);
+							  kernels[chn].st_kernels[nc][tileY][tileX]= dtt.dttt_iiie(kernels[chn].st_kernels[nc][tileY][tileX]); //, 0, dct_size)
 						  }
 						  //							System.out.println("tileY="+tileY);
 					  }