Commit 96af0b22 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

minor console output mods

parent 9031d283

src/main/java/EyesisCorrections.java

+3 −0
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ public class EyesisCorrections { 
		if ((this.debugLevel>101) && (correctionsParameters.sourcePaths!=null) && (correctionsParameters.sourcePaths.length>0)) {

			testFF(correctionsParameters.sourcePaths[0]);

		}

		if (debugLevel > -2) {

			System.out.println();

		}

	}



	public void initSensorFilesAux(int debugLevel){

src/main/java/JP46_Reader_camera.java

+7 −4
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ public class JP46_Reader_camera extends PlugInFrame implements ActionListener { 
		pack();

		GUI.center(this);

		setVisible(showGUI);

		if (!showGUI) {

			this.ABSOLUTELY_SILENT = true;

		}

	}



	void addButton(String label, Panel panel) {
@@ -648,14 +651,14 @@ public class JP46_Reader_camera extends PlugInFrame implements ActionListener { 
		min_gain=2.0*gains[0];

		for (i=0;i<4;i++) {

			if (min_gain > gains[i]*(1.0-blacks[i])) min_gain = gains[i]*(1.0-blacks[i]);

			System.out.println("gains["+i+"]="+gains[i]+" min_gain="+min_gain);

			if (!this.ABSOLUTELY_SILENT) System.out.println("gains["+i+"]="+gains[i]+" min_gain="+min_gain);

		}

		imp.setProperty("GAIN",String.format("%f",min_gain)); // common gain



		for (i=0;i<4;i++) gains[i]/=min_gain;

		for (i=0;i<4;i++) blacks256[i]=256.0*blacks[i];

		for (i=0;i<4;i++) {

			System.out.println("scaled gains["+i+"]="+gains[i]);

			if (!this.ABSOLUTELY_SILENT) System.out.println("scaled gains["+i+"]="+gains[i]);

		}
@@ -665,7 +668,7 @@ public class JP46_Reader_camera extends PlugInFrame implements ActionListener { 
				else       satValue[i]=((rgammas[i][255])-blacks256[i]);

			}   else       satValue[i]=255.0;

			imp.setProperty("saturation_"+i,String.format("%f",satValue[i]));

			System.out.println("scaled gains["+i+"]="+gains[i]+" satValue["+i+"]="+satValue[i]);

			if (!this.ABSOLUTELY_SILENT) System.out.println("scaled gains["+i+"]="+gains[i]+" satValue["+i+"]="+satValue[i]);



		}

// swap satValue to match FLIPH,FLIPV again

src/main/java/PixelMapping.java

+14 −3
Original line number Diff line number Diff line
@@ -157,7 +157,12 @@ public class PixelMapping { 
    	if (subCamera < 0) {

    		return null;

    	}

		System.out.println("channelsForSubCamera("+subCamera+"),this.sensors.length="+this.sensors.length);

    	if (this.debugLevel>1) {

    		System.out.print("channelsForSubCamera("+subCamera+"),this.sensors.length="+this.sensors.length+": ");

//    	} else if (this.debugLevel > -2) {

//    		System.out.print(".");

    	}

    		

//    	ArrayList<ArrayList<ArrayList<Integer>>> camera_IPs = new ArrayList<ArrayList<ArrayList<Integer>>>();

    	ArrayList<Point> cam_port = new ArrayList<Point>();

    	for (int i=0;i<this.sensors.length;i++)  if (this.sensors[i]!=null) {
@@ -176,10 +181,16 @@ public class PixelMapping { 
		});

		// debugging:

		if (subCamera >= cam_port_arr.length) {

			if (this.debugLevel>1) {

				System.out.println("Error: Subcamera "+subCamera+" > that total number of sensor ports in the system = "+cam_port_arr.length);

			}

			return null;

		}

		if (this.debugLevel>1) {

			System.out.println("----- This filename subcamera "+subCamera+": physical camera "+cam_port_arr[subCamera].x+", sensor_port "+cam_port_arr[subCamera].y);

		} else if (this.debugLevel > -2) {

    		System.out.print(".");

		}

    	if (this.sensors == null) return null;

    	int numChannels=0;

    	for (int i=0;i<this.sensors.length;i++) if (this.sensors[i]!=null) {