Pairwise equalization

src/main/java/com/elphel/imagej/orthomosaic/ComboMatch.java

@@ -157,6 +157,7 @@ public class ComboMatch {
 //		boolean show_map_stats =      false;      
 		boolean show_combo =          false; // true;
 		boolean create_overlaps =     false;
+		boolean equalize_overlaps =   false;
 		boolean create_map =          false;
 //		boolean show_combo_mask =     false; // generate image mas (where it is defined)_
 //		boolean use_alt =             false;
@@ -232,6 +233,7 @@ public class ComboMatch {
 //		gd.addCheckbox    ("Show statistics for ortho images", show_map_stats, "Generate and show statistics for ortho maps.");
 		gd.addCheckbox    ("Show combo maps/stats",            show_combo, "Generate/save combo maps and stats.");
 		gd.addCheckbox    ("Create overlap pairs",             create_overlaps, "Create scene pairs overlaps.");
+		gd.addCheckbox    ("Equalize overlap pairs",           equalize_overlaps, "Equalize intensities in overlaps.");
 		gd.addCheckbox    ("Create map",                       create_map, "Create combined map from pairwise matches.");
 //		gd.addCheckbox    ("Show combo image mask",            show_combo_mask, "Display combo binary image.");
 //		gd.addCheckbox    ("Show altitude combo image", use_alt, "Load and process altitude maps.");
@@ -288,6 +290,7 @@ public class ComboMatch {
 		
 		show_combo =                gd.getNextBoolean();
 		create_overlaps =           gd.getNextBoolean();
+		equalize_overlaps =         gd.getNextBoolean();
 		create_map =                gd.getNextBoolean();
 		frac_remove =               gd.getNextNumber();
 		metric_error=               gd.getNextNumber();
@@ -783,8 +786,15 @@ public class ComboMatch {
 			boolean ok =maps_collection.getIntersectedPairs(
 					clt_parameters, // CLTParameters    clt_parameters,
 					orthoMapsCollection_path); // String orthoMapsCollection_path);
-			if (!ok) return false;
+			return ok; // Just exit, do not try other commands.  if (!ok) return false;
 		}
+		if (equalize_overlaps) {
+			boolean ok =maps_collection.equalizeIntersectedPairs(
+					clt_parameters, // CLTParameters    clt_parameters,
+					orthoMapsCollection_path); // String orthoMapsCollection_path);
+			return ok; // Just exit, do not try other commands.  if (!ok) return false;
+		}
+		
         if (process_correlation || render_match || pattern_match || test_multi_lma) {
 //        	int [] gpu_pair;
         	if (gpu_spair == null) {

src/main/java/com/elphel/imagej/orthomosaic/PairwiseOrthoMatch.java

@@ -33,6 +33,17 @@ public class PairwiseOrthoMatch implements Serializable {
 		this.overlap = overlap;
 	}
 	
+	public double [] getEqualize2to1() {
+		return equalize1to0;
+	}
+	public boolean isSetEqualize2to1() {
+		if (equalize1to0 == null) {
+			return false;
+		}
+		return (equalize1to0[0] != 1.0) || (equalize1to0[1] != 0.0);
+	}
+	
+	
 	public void setEqualize2to1 (double [] equalize2to1) {
 		this.equalize1to0 = equalize2to1;
 	}