Commit f68fa78e authored by Andrey Filippov's avatar Andrey Filippov

Merge branch 'lwir-distort' of git.elphel.com:Elphel/imagej-elphel into lwir-distort

parents a08d4cff 9fe0872c
......@@ -1711,7 +1711,7 @@ if (MORE_BUTTONS) {
}
// SDFA_INSTANCE.showArrays(weights, kWidth, kHeight, true, "weights");
}
SDFA_INSTANCE.showArrays(weights, kWidth, kHeight, true, "weights");
SDFA_INSTANCE.showArrays(weights, kWidth, kHeight, true, "weights-all");
// double [][] weights=new double[nFiles+1][kLength];
for (int i=0;i<kLength;i++) weights[0][i]=0.0;
PSF_KERNEL_MAP=new double [kHeight][kWidth][nChn][];
......@@ -1598,7 +1598,7 @@ public class EyesisAberrations {
weights[0][index]+=weights[nFile+1][index];
}
}
if (thisDebugLevel>1) sdfa_instance.showArrays(weights, kWidth, kHeight, true, "weights0");
if (thisDebugLevel>1) sdfa_instance.showArrays(weights, kWidth, kHeight, true, "weights_"+String.format("%02d",sensor_channel));
// remove any border ones if non-border is present in the same cell
double [][] weightsMasked=new double[weights.length][];
......@@ -1821,7 +1821,7 @@ public class EyesisAberrations {
}
}
if (multiFilePSF.showWeights) sdfa_instance.showArrays(weights, kWidth, kHeight, true, "weights-"+sensor_channel);
if (multiFilePSF.showWeights) sdfa_instance.showArrays(weights, kWidth, kHeight, true, "weights-"+String.format("%02d",sensor_channel));
// double [][] weights=new double[nFiles+1][kLength];
for (int i=0;i<kLength;i++) weights[0][i]=0.0;
psfKernelMap=new double [kHeight][kWidth][nChn][];
......
......@@ -8399,7 +8399,7 @@ public class MatchSimulatedPattern {
}
if (global_debug_level > 0) {
System.out.println(
(((iGridMatchCoeff[0][2] + iGridMatchCoeff[1][2]) & 1) == 0) ? "EVEN shift" : "ODD shift");
(((iGridMatchCoeff[0][2] + iGridMatchCoeff[1][2]) & 1) == 0) ? "EVEN shift" : "ODD shift"); // here
}
} else {
if (global_debug_level > 0)
......
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