Commit 411af03f authored by Andrey Filippov's avatar Andrey Filippov

Improved filtering

parent 330ac1f3
...@@ -1148,6 +1148,9 @@ public class CLTPass3d{ ...@@ -1148,6 +1148,9 @@ public class CLTPass3d{
} }
} }
public void setSecondMax(double [] second_max) { // setting "fake" for the non-measurement scan
this.second_max = second_max;
}
public void setSecondMax() { public void setSecondMax() {
this.second_max = getSecondMaxDiff(false); this.second_max = getSecondMaxDiff(false);
} }
......
...@@ -3910,13 +3910,14 @@ ImageDtt.startAndJoin(threads); ...@@ -3910,13 +3910,14 @@ ImageDtt.startAndJoin(threads);
CLTPass3d scan, CLTPass3d scan,
boolean use_final) boolean use_final)
{ {
double [] disparity = scan.getDisparity(use_final?0:1); double [] disparity = scan.getDisparity(use_final?0:1);
double [] disparityLMA = scan.getDisparityLMA(); double [] disparityLMA = scan.getDisparityLMA();
double [] second_max_bg = scan.getSecondMax();
if (!use_final) { if (!use_final) {
scan.setStrength(null); scan.setStrength(null);
} }
double [] strength = scan.getStrength(); double [] strength = scan.getStrength();
return new double [][] {disparity, strength, disparityLMA}; return new double [][] {disparity, strength, disparityLMA,second_max_bg}; // second maximal difference between channels in BG
} }
// TODO: update for variable length // TODO: update for variable length
......
...@@ -80,6 +80,8 @@ public class TwoQuadCLT { ...@@ -80,6 +80,8 @@ public class TwoQuadCLT {
public static int DSI_STRENGTH_MAIN = 6; public static int DSI_STRENGTH_MAIN = 6;
public static int DSI_STRENGTH_AUX = 7; public static int DSI_STRENGTH_AUX = 7;
public static int DSI_STRENGTH_RIG = 8; public static int DSI_STRENGTH_RIG = 8;
public static int DSI_SPREAD_MAIN = 9;
public static int DSI_SPREAD_AUX = 10;
public static String DSI_COMBO_SUFFIX = "-DSI_COMBO"; public static String DSI_COMBO_SUFFIX = "-DSI_COMBO";
public static String DSI_MAIN_SUFFIX = "-DSI_MAIN"; public static String DSI_MAIN_SUFFIX = "-DSI_MAIN";
...@@ -93,7 +95,9 @@ public class TwoQuadCLT { ...@@ -93,7 +95,9 @@ public class TwoQuadCLT {
"disparity_x3d", "disparity_x3d",
"strength_main", "strength_main",
"strength_aux", "strength_aux",
"strength_rig"}; "strength_rig",
"spread_main",
"spread_aux"};
public long startTime; // start of batch processing public long startTime; // start of batch processing
public long startSetTime; // start of set processing public long startSetTime; // start of set processing
......
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