Merge branch 'foliage-gpu' of git.elphel.com:Elphel/imagej-elphel into foliage-gpu

src/main/java/com/elphel/imagej/cuas/CuasRanging.java

@@ -241,6 +241,7 @@ public class CuasRanging {
 				targets = disparity_targets;
 				System.out.println("processMovingTargetsMulti(): re-using target disparities from "+disparity_path+", generating radar mode images");
 			}
+			cuasMotion.setTargets(targets);
         } else {
     		cuasMotion.processMovingTargetsMulti( // will remove rendering 
     				batch_mode,     // final boolean         batch_mode,
@@ -326,8 +327,8 @@ public class CuasRanging {
         						cuasMotion.getTilesX());   //  int           tilesX) {
         				center_CLT.saveImagePlusInModelDirectory(imp_with_range);  // ImagePlus   imp)
         			}
-        		} else if (recalc_target_id){// if (disparity_targets == null) {
-    				cuasMotion.recalcOmegas(
+        		} else if (recalc_target_id){// if (disparity_targets == null) { // at com.elphel.imagej.cuas.CuasMotion$46.run(CuasMotion.java:7269)
+    				cuasMotion.recalcOmegas( // does not work - 
     						false, // boolean       recalc,
     						targets,     // final double [][][] target_single_in,
     						batch_mode,  // boolean       batch_mode,
@@ -2761,18 +2762,21 @@ public class CuasRanging {
 		sb.append("\n"); // there will be 1 extra blank column
 		String [] slice_titles = 	cuasMotion.getSliceTitles(); // timestamps
 		UasLogReader  uasLogReader = cuasMotion.getUasLogReader();
+		ErsCorrection ersCorrection = center_CLT.getErsCorrection();
 		for (int nseq = 0; nseq < num_seq; nseq++) {
 			String timestamp = slice_titles[nseq];
 			sb.append(nseq+"\t"+timestamp+"\t");
 			// get azimuth, elevation, target disparity from the log plus infinity, log range
 			double [] uas_pXpYDRange = uasLogReader.getUasPxPyDRange(timestamp); // px, py, d-  cuas_infinity (true disparity), range
 			double [][] az_el_oaz_oel= 	CuasMotion.getPixToAzElev(
-					clt_parameters,     // CLTParameters  clt_parameters,
-					gc,                 // GeometryCorrection gc,
+					ersCorrection,   // ErsCorrection ersCorrection,
+					uasLogReader,    // UasLogReader  uasLogReader,			
+					Double.NaN,      // double        fps, // if NaN, will use default 60Hz. Used only for omegas
 					uas_pXpYDRange[0],  // double         target_x,
 					uas_pXpYDRange[1],  // double         target_y,
 					0,                  // double         target_vx,
 					0);                 // double         target_vy);
+			
 			sb.append(uas_pXpYDRange[0]+"\t"+uas_pXpYDRange[1]+"\t"+az_el_oaz_oel[0][0]+"\t"+az_el_oaz_oel[0][1]+"\t"+(uas_pXpYDRange[2]+cuas_infinity)+"\t"+uas_pXpYDRange[3]+"\t");
 
 			for (int ntarg = 0; ntarg < num_targets; ntarg++) { 
@@ -2793,15 +2797,16 @@ public class CuasRanging {
 					    double yc = tileSize * tileY + tileSize/2 + target[CuasMotionLMA.RSLT_Y];
 						double vx = target[CuasMotionLMA.RSLT_VX];
 						double vy = target[CuasMotionLMA.RSLT_VY];
-						
 						// calculate and output target azimuth, elevation, disparity (full) and range
 						az_el_oaz_oel= 	CuasMotion.getPixToAzElev(
-								clt_parameters, // CLTParameters  clt_parameters,
-								gc,             // GeometryCorrection gc,
-								xc,             // double         target_x, // null
-								yc,             // double         target_y,
-								vx,             // double         target_vx,
-								vy);            // double         target_vy);
+								ersCorrection, // ErsCorrection ersCorrection,
+								uasLogReader,  // UasLogReader  uasLogReader,			
+								Double.NaN,    // double        fps, // if NaN, will use default 60Hz. Used only for omegas
+								xc,             // double         px, // null
+								yc,             // double         py,
+								vx,             // double         vx,
+								vy);            // double         vy);
+						
 						sb.append(xc+"\t"+yc+"\t"+az_el_oaz_oel[0][0]+"\t"+az_el_oaz_oel[0][1]+"\t"+
 								target[CuasMotionLMA.RSLT_DISPARITY]+"\t"+target[CuasMotionLMA.RSLT_RANGE]+"\t");
 						if (target[CuasMotionLMA.RSLT_GLENGTH] > 0) {

src/main/java/com/elphel/imagej/tileprocessor/QuadCLTCPU.java

@@ -6089,6 +6089,27 @@ public class QuadCLTCPU {
 		return file_path;
 	}
 	
+	public static String saveImagePlusInDirectory(
+			ImagePlus imp,
+			String    dir) {
+		String file_name = imp.getTitle();
+		if (!file_name.endsWith(".tiff")) {
+			file_name +=".tiff";
+		}
+		if (!dir.endsWith(Prefs.getFileSeparator())) {
+			dir += Prefs.getFileSeparator();
+		}
+		String file_path = dir + file_name; // + ".tiff";
+		FileSaver fs=new FileSaver(imp);
+		fs.saveAsTiff(file_path); // image processor null?
+		System.out.println("saveImagePlusInDirectory(): saved "+file_path);
+		return file_path;
+	}
+
+	/*
+		File list_to_concat = new File (video_dir,concat_list_name);
+
+	 */
 	public String saveConfInModelDirectory()
 	{
 		String x3d_path = getX3dDirectory();