Commit 269fb54f authored by Andrey Filippov's avatar Andrey Filippov

committing w/o breaking - 15

parent ced0865e
...@@ -2868,17 +2868,29 @@ public class EyesisAberrations { ...@@ -2868,17 +2868,29 @@ public class EyesisAberrations {
y0 * subpixel/2, y0 * subpixel/2,
tile_size * subpixel/2, tile_size * subpixel/2,
tile_size * subpixel/2); // getting here tile_size * subpixel/2); // getting here
simul_pixels=new double[6][]; if (is_mono) {
for (i=0;i<simul_pixels.length; i++) { simul_pixels=new double[1][];
if (colorComponents.colorsToCorrect[i]) simul_pixels[i]=simulationPattern.extractBayerSim ( simul_pixels[0]=simulationPattern.extractBayerSim (
simArray, // [0] - regular pixels, [1] - shifted by 1/2 diagonally, for checker greens simArray, // [0] - regular pixels, [1] - shifted by 1/2 diagonally, for checker greens
imgWidth*subpixel/2, imgWidth*subpixel/2,
PSFCellSim, PSFCellSim,
subpixel, // 4 subpixel, // 4
i); -1); //New : -1 - extract mono TODO: see if 1/2pix shift is needed
else simul_pixels[i]=null; } else {
simul_pixels=new double[6][];
for (i=0;i<simul_pixels.length; i++) {
if (colorComponents.colorsToCorrect[i]) simul_pixels[i]=simulationPattern.extractBayerSim (
simArray, // [0] - regular pixels, [1] - shifted by 1/2 diagonally, for checker greens
imgWidth*subpixel/2,
PSFCellSim,
subpixel, // 4
i);
else simul_pixels[i]=null;
}
} }
int index=matchSimulatedPattern.getUVIndex((PSFCell.y+PSFCell.height/2)*imgWidth+(PSFCell.x+PSFCell.width/2)); //System.out.println("PSFCell.y="+PSFCell.y+" PSFCell.height="+PSFCell.height+" imgWidth="+imgWidth+" PSFCell.x="+PSFCell.x+" PSFCell.width="+PSFCell.width+" matchSimulatedPattern.UV_INDEX.length="+matchSimulatedPattern.UV_INDEX.length);
int index=matchSimulatedPattern.getUVIndex(
(PSFCell.y+PSFCell.height/2)*imgWidth+(PSFCell.x+PSFCell.width/2));
if (index<0) { if (index<0) {
System.out.println ("Error, No UV pattern @ x="+(PSFCell.x+PSFCell.width/2)+", y="+(PSFCell.y+PSFCell.height/2)); System.out.println ("Error, No UV pattern @ x="+(PSFCell.x+PSFCell.width/2)+", y="+(PSFCell.y+PSFCell.height/2));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment