Commit 40645fb8 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

Adding garbage collection before each goniometer scan step

parent cf2efd71

src/main/java/Goniometer.java

+30 −28
Original line number Original line Diff line number Diff line
@@ -251,7 +251,7 @@ horizontal axis: 
		}

		}

		startAxial=startStep-this.lastScanStep;

		startAxial=startStep-this.lastScanStep;

		this.lastScanStep=startStep-1;

		this.lastScanStep=startStep-1;

		

		 Runtime runtime = Runtime.getRuntime();

		for (int nTilt=startTilt;nTilt<numTiltSteps;nTilt++){

		for (int nTilt=startTilt;nTilt<numTiltSteps;nTilt++){

			double tilt=tilts[nTilt];

			double tilt=tilts[nTilt];

			tilt=0.1*Math.round(10*tilt); // is that needed?

			tilt=0.1*Math.round(10*tilt); // is that needed?
@@ -285,7 +285,9 @@ horizontal axis: 
				status=(this.lastScanStep+1)+"( last="+(numStops-1)+") "+IJ.d2s(1E-9*(System.nanoTime()-startTime),3)+" sec.  tilt:"+(nTilt+1)+"/"+numTiltSteps+" , "+

				status=(this.lastScanStep+1)+"( last="+(numStops-1)+") "+IJ.d2s(1E-9*(System.nanoTime()-startTime),3)+" sec.  tilt:"+(nTilt+1)+"/"+numTiltSteps+" , "+

						IJ.d2s(tilt,2)+" deg., axial:"+

						IJ.d2s(tilt,2)+" deg., axial:"+

						(nAxial+1)+"/"+rots[nTilt].length+" , "+IJ.d2s(axial,2)+" deg.";

						(nAxial+1)+"/"+rots[nTilt].length+" , "+IJ.d2s(axial,2)+" deg.";

				if (this.debugLevel>0) System.out.println(status+", axial motor steps: "+axialMotorPosition);

				runtime.gc();

				String memoryStatus="Free memory="+runtime.freeMemory()+" (of "+runtime.totalMemory()+")";

				if (this.debugLevel>0) System.out.println(status+", axial motor steps: "+axialMotorPosition+" "+memoryStatus);

				if (updateStatus) IJ.showStatus(status);

				if (updateStatus) IJ.showStatus(status);





				OK= this.goniometerParameters.goniometerMotors.moveMotorSetETA(axialMotor, axialMotorPosition);

				OK= this.goniometerParameters.goniometerMotors.moveMotorSetETA(axialMotor, axialMotorPosition);