Merge remote-tracking branch 'origin/dct'

3dd608b9 · Andrey Filippov · d531d201 · f96b0aec · 3dd608b9 · 3dd608b9
Commit 3dd608b9 authored Jan 06, 2017 by Andrey Filippov
7 changed files
--- a/src/main/java/CalibrationHardwareInterface.java
+++ b/src/main/java/CalibrationHardwareInterface.java
@@ -297,7 +297,7 @@ public class CalibrationHardwareInterface {
 			
 			this.triggerURL="http://"+this.cameraSubnet+(this.iBaseIP+this.masterSubCamera)+":"+
 				(this.imgsrvPort+ (this.masterPort & 3))+"/"+triggerURLcmd;
-			if (this.debugLevel>1) System.out.println("DEBUG393: initIPs(): this.triggerURL ="+this.triggerURL);
+			if (this.debugLevel>2) System.out.println("DEBUG393: initIPs(): this.triggerURL ="+this.triggerURL);
 		}
 /*
 //pre nc393		

--- a/src/main/java/DttRad2.java
+++ b/src/main/java/DttRad2.java
--- a/src/main/java/EyesisCorrectionParameters.java
+++ b/src/main/java/EyesisCorrectionParameters.java
--- a/src/main/java/EyesisDCT.java
+++ b/src/main/java/EyesisDCT.java
--- a/src/main/java/Eyesis_Correction.java
+++ b/src/main/java/Eyesis_Correction.java
--- a/src/main/java/FactorConvKernel.java
+++ b/src/main/java/FactorConvKernel.java
--- a/src/main/java/ImageDtt.java
+++ b/src/main/java/ImageDtt.java