Commit efd35b70 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

more debug

parent e2086aa9

src/main/java/EyesisAberrations.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -1304,6 +1304,10 @@ public class EyesisAberrations { 
        	}

        	}

        	if (iRetry==MaxRetries) {

        	if (iRetry==MaxRetries) {

				System.out.println("File "+files[imgNum][1]+ " has problems - finished at "+ IJ.d2s(0.000000001*(System.nanoTime()-startTime),3));

				System.out.println("File "+files[imgNum][1]+ " has problems - finished at "+ IJ.d2s(0.000000001*(System.nanoTime()-startTime),3));

	    		if 	(stopRequested.get()>0) {				

					if (debugLevel>0) System.out.println("User requested stop");

					break;

	    		}

        		continue;

        		continue;

        	}

        	}

src/main/java/MatchSimulatedPattern.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -3469,7 +3469,8 @@ public class MatchSimulatedPattern { 
											   " current="+iUVdir[0]+"/"+iUVdir[1]+" len="+iUVdir.length);

											   " current="+iUVdir[0]+"/"+iUVdir[1]+" len="+iUVdir.length);

									   continue;

									   continue;

								   } else if ((refCell[0]!=null) && (refCell[0].length>3)){

								   } else if ((refCell[0]!=null) && (refCell[0].length>3)){

									   System.out.println("**** refCell was deleted ****");

									   System.out.println("**** refCell was deleted **** u="+iUVRef[0]+" v="+iUVRef[1]+

											   " current="+iUVdir[0]+"/"+iUVdir[1]+" len="+iUVdir.length);

								   }

								   }

								   //found reference cell, calculate x/y, make sure it is inside the selection w/o borders

								   //found reference cell, calculate x/y, make sure it is inside the selection w/o borders

								   double [][] wv=new double [2][];

								   double [][] wv=new double [2][];
@@ -5767,8 +5768,8 @@ public class MatchSimulatedPattern { 
			   // restore initial distortionParameters.correlationMinInitialContrast

			   // restore initial distortionParameters.correlationMinInitialContrast

			   distortionParameters.correlationMinInitialContrast=savedCorrelationMinInitialContrast;

			   distortionParameters.correlationMinInitialContrast=savedCorrelationMinInitialContrast;

			   if (!foundGoodCluster){

			   if (!foundGoodCluster){

				   System.out.println("calculateDistortions(): Pattern too small");

				   System.out.println("calculateDistortions(): Pattern too small, initial cluster had "+patternCells+" cells");

				   if (global_debug_level>2) IJ.showMessage("Error","Pattern too small");

				   if (global_debug_level>2) IJ.showMessage("Error","Pattern too small: "+patternCells);

				   return distortionParameters.errPatternNotFound;

				   return distortionParameters.errPatternNotFound;

			   }

			   }

			   if (!patternOK()) {

			   if (!patternOK()) {