Skip to content

I
imagej-elphel
Commit a3d74cc6 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

reduced debug clutter

parent 32540c3c
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 10 deletions
src/main/java/com/elphel/imagej/cuas/CuasMotion.java
View file @ a3d74cc6
......@@ -1032,7 +1032,7 @@ public class CuasMotion {
param_select[CuasMotionLMA.INDX_C] = lma_fit_c;
param_select[CuasMotionLMA.INDX_RR0] = lma_fit_r;
param_select[CuasMotionLMA.INDX_K] = lma_fit_k;
final int dbg_tile = (33 + 34 * 80); //(38 + 45 * 80);
final int dbg_tile = -(33 + 34 * 80); //(38 + 45 * 80);
final int dbg_seq = -15;
// final boolean[] fpn_mask= no_border? (new boolean[0]) : null;
for (int ithread = 0; ithread < threads.length; ithread++) {
......@@ -1430,7 +1430,7 @@ public class CuasMotion {
// final double maxxy = GPUTileProcessor.DTT_SIZE - 1 -lma_minxy; // lma_minxy=1 - prevent bottom row/righth column
// final double minxy = -GPUTileProcessor.DTT_SIZE +lma_minxy; // lma_minxy=1 - prevent top row/left column
final double center_scale = 0.5*Math.PI/GPUTileProcessor.DTT_SIZE;
final int dbg_tile = (34 + 34*80);
final int dbg_tile = -(34 + 34*80);
final Thread[] threads = ImageDtt.newThreadArray();
final AtomicInteger ai = new AtomicInteger(0);
for (int ithread = 0; ithread < threads.length; ithread++) {
......@@ -3170,7 +3170,7 @@ public class CuasMotion {
ColorProcessor uaslog_cp = null;
if (uas_log_path != null) {
try {
uaslog_cp = new ColorProcessor(ImageIO.read(new File(diamond_path)));
uaslog_cp = new ColorProcessor(ImageIO.read(new File(uas_log_path)));
} catch (IOException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
......@@ -3188,7 +3188,7 @@ public class CuasMotion {
}
}
if (uaslog_pixels != null) {
System.out.println("uaslog_width="+uaslog_width+"uaslog_height="+uaslog_height);
System.out.println("uaslog_width="+uaslog_width+",uaslog_height="+uaslog_height);
}
......@@ -3319,9 +3319,9 @@ public class CuasMotion {
int yc = (int) Math.round(scale * uas_pXpYD[1]);
int xl = xc - uaslog_width/2;
int yt = yc - uaslog_height/2;
if (nscene < 10) {
if (nSeq < 3) {
System.out.println(String.format("uas_pXpYD=[%f,%f,%f]",uas_pXpYD[0],uas_pXpYD[1],uas_pXpYD[2]));
System.out.println(String.format("xc=%f, yc=%f, xl=%f, yt=%f",xc,yc,xl,yt));
System.out.println(String.format("xc=%d, yc=%d, xl=%d, yt=%d",xc,yc,xl,yt));
System.out.println(String.format("A=%f, T=%f, R=%f",uasLogReader.getCameraATR()[0],uasLogReader.getCameraATR()[1],uasLogReader.getCameraATR()[1]));
System.out.println(String.format("titles[nscene]=%s, startTimeStamp=%f",titles[nscene],uasLogReader.getStartTimestamp()));
}
......@@ -3355,6 +3355,8 @@ public class CuasMotion {
}
}
}
} else {
System.out.println("uaslog_rgba == null");
}
double [][] targets = targets60hz[nscene];
......@@ -4413,6 +4415,7 @@ public class CuasMotion {
// boolean remove_isolated= clt_parameters.imp.cuas_isolated;
boolean intermed_low = clt_parameters.imp.cuas_intermed_low; //true;
boolean debug_more = false;
for (int i = 0; i < target_frac.length; i++) {
if (clt_parameters.imp.cuas_target_frac[i].length >= 2) {
target_frac[i][0] = clt_parameters.imp.cuas_target_frac[i][0];
......@@ -4433,7 +4436,7 @@ public class CuasMotion {
// take into account before/after matching
double interseq_scale = 0.5* corr_inc/corr_offset; // multiply target velocity to get offset in the middle between the key frames
// interseq_scale = (half_step ? 0.25 : 0.5) // ???
if (intermed_low) {
if (intermed_low && debug_more) {
ImagePlus imp_failures = showTargetSequence(
targets_good, // double [][][] vector_fields_sequence,
slice_titles, // String [] titles, // all slices*frames titles or just slice titles or null
......@@ -4448,7 +4451,7 @@ public class CuasMotion {
interseq_scale, // , // final double interseq_scale,
cuasMotion.tilesX, // final int tilesX,
debugLevel); // final int debugLevel) {
if (intermed_low) {
if (intermed_low && debug_more) {
ImagePlus imp_failures = showTargetSequence(
targets_good, // double [][][] vector_fields_sequence,
slice_titles, // String [] titles, // all slices*frames titles or just slice titles or null
......@@ -4461,7 +4464,7 @@ public class CuasMotion {
calculateMismatchBeforeAfter(
targets_good, // final double [][][] targets,
cuasMotion.tilesX); // final int tilesX)
if (intermed_low) {
if (intermed_low && debug_more) {
ImagePlus imp_failures = showTargetSequence(
targets_good, // double [][][] vector_fields_sequence,
slice_titles, // String [] titles, // all slices*frames titles or just slice titles or null
......@@ -4503,7 +4506,7 @@ public class CuasMotion {
true, // final boolean remove_good_from_failed,
remain); // final int [] remain)
if (debugLevel > -4) printRemain(remain, "remaining good targets", true);
if (intermed_low) {
if (intermed_low && debug_more) {
ImagePlus imp_failures = showTargetSequence(
targets_good, // double [][][] vector_fields_sequence,
slice_titles, // String [] titles, // all slices*frames titles or just slice titles or null
......
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