committing w/o breaking - 14

src/main/java/com/elphel/imagej/calibration/EyesisAberrations.java

@@ -2862,9 +2862,12 @@ public class EyesisAberrations {
 			}
 			simul_pixels= normalizeAndWindow (simul_pixels, fullHamming);
 
-			} else {
-			Rectangle PSFCellSim=new Rectangle (x0*subpixel/2,y0*subpixel/2,tile_size*subpixel/2,tile_size*subpixel/2); // getting here
-
+		} else { //if ((simArray==null) || (psfParameters.approximateGrid)){ // just for testing(never here?)
+			Rectangle PSFCellSim = new Rectangle (
+					x0 * subpixel/2,
+					y0 * subpixel/2,
+					tile_size * subpixel/2,
+					tile_size * subpixel/2); // getting here
 			simul_pixels=new double[6][];
 			for (i=0;i<simul_pixels.length; i++) {
 				if (colorComponents.colorsToCorrect[i]) simul_pixels[i]=simulationPattern.extractBayerSim (
@@ -2957,8 +2960,10 @@ public class EyesisAberrations {
 						otfFilterParameters,
 						fht_instance,
 						psfParameters.mask1_sigma*tile_size*wvAverage,      // normalize to wave vectors!
+//						psfParameters.mask1_sigma*(fft_size/2)*wvAverage,      // normalize to wave vectors!
 						psfParameters.mask1_threshold,
 						psfParameters.gaps_sigma*tile_size*wvAverage,
+//						psfParameters.gaps_sigma*(fft_size/2)*wvAverage,
 						psfParameters.mask_denoise,
 						debug,
 						globalDebugLevel,