debugging, will try to use earlier version (4e1e17b4) · Commits · Elphel / imagej-elphel

src/main/java/com/elphel/imagej/calibration/PixelMapping.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import java.util.concurrent.atomic.AtomicInteger;

		import javax.swing.SwingUtilities;

		import com.elphel.imagej.cameras.EyesisCorrectionParameters;
		import com.elphel.imagej.common.DoubleFHT;
		import com.elphel.imagej.common.DoubleGaussianBlur;
		import com.elphel.imagej.common.ShowDoubleFloatArrays;
		@@ -122,6 +123,19 @@ public class PixelMapping {
		for (int i=0;i<calibFiles.length;i++){
		SensorData sensorData=new SensorData (calibFiles[i],this.debugLevel);
		int channel=sensorData.getChannel(); // from Properties
		// Temporary to use old sensor files
		// public static int getChannelFromTiff(String path, String [] suffixes){

		int channel_file = EyesisCorrectionParameters.CorrectionParameters.getChannelFromTiff(calibFiles[i], new String []{".calib-tiff"});
		// if ((i>=16) && (channel < 16)) {
		if (channel_file != channel) {
		System.out.println ("**Temporary fix to use old sensor files, COMMENT OUT when done debugging**");
		System.out.println ("i="+i+", channel_file="+channel_file+", channel ="+channel+" -> "+channel_file);
		channel = channel_file; // i;
		}



		if ((channel < first_channel) \|\| ((num_channels > 0) && (channel >= (first_channel + num_channels)))) {
		continue; // wrong channels
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1134,7 +1134,7 @@ public class EyesisCorrectionParameters {

		}

		public int getChannelFromTiff(String path, String [] suffixes){
		public static int getChannelFromTiff(String path, String [] suffixes){
		String suffix = null;
		for (String s:suffixes) {
		if (path.endsWith(s)) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -771,6 +771,9 @@ private Panel panel1,

		panelLWIR16 = new Panel();
		panelLWIR16.setLayout(new GridLayout(1, 0, 5, 5)); // rows, columns, vgap, hgap
		addButton("SHOW extrinsics", panelLWIR16, color_report);
		addButton("Reset Geometry", panelLWIR16, color_stop);
		addButton("Reset AUX Geometry", panelLWIR16, color_stop);
		addButton("Generate Sym Vectors", panelLWIR16, color_configure);
		plugInFrame.add(panelLWIR16);

+1 −8

Original line number	Diff line number	Diff line
		@@ -951,14 +951,7 @@ public class QuadCLTCPU {

		// if (numSensors == 4){
		geometryCorrection.adustSquare();
		System.out.println("Adjusted camera to orient X Y along the sides of a square (now univerasal), numSensors = "+numSensors);
		/*
		} else {
		System.out.println("============= Cannot adustSquare() as it requires exactly 4 sensors, "+numSensors+" provided ==========");
		System.out.println("Keeping as it was");
		// return false; // not used in lwir
		}
		*/
		System.out.println("Adjusted camera to orient X Y along the sides of a square (now universal), numSensors = "+numSensors);
		// Print parameters
		if (debugLevel > 0){
		geometryCorrection.listGeometryCorrection(debugLevel > 1);