Skip to content
Snippets Groups Projects
Commit b3990e81 authored by Francois POLACK's avatar Francois POLACK
Browse files

fix: Bug in datx openfilefunction

     Improved convergence info of conic fit
parent 98eb23bf
No related branches found
No related tags found
No related merge requests found
...@@ -153,7 +153,6 @@ class HeightMap(object): ...@@ -153,7 +153,6 @@ class HeightMap(object):
datfile=ZygoXYZ.XYZfile() datfile=ZygoXYZ.XYZfile()
elif Path(filename).suffix==".datx": elif Path(filename).suffix==".datx":
datfile=ZygoDatx.DatxFile() datfile=ZygoDatx.DatxFile()
datfile.info()
else: else:
print("Unknown file type:", Path(filename).suffix) print("Unknown file type:", Path(filename).suffix)
return False return False
......
...@@ -363,7 +363,21 @@ def fit_conic_cylinder(xin,yin,z, guess=None,variability=(0,1,1,1,0,1)): ...@@ -363,7 +363,21 @@ def fit_conic_cylinder(xin,yin,z, guess=None,variability=(0,1,1,1,0,1)):
i+=1 i+=1
print('initial parameters',initparam) print('initial parameters',initparam)
result=scipy.optimize.least_squares(residuals, initparam,method='lm') result=scipy.optimize.least_squares(residuals, initparam,method='lm')
print('optimisation status', result.status) if result.status == -1:
endmsg="Badinput parameters"
elif result.status == 0:
endmsg="Convergence not reached"
elif result.status == 1:
endmsg="Gradient convergence stalling"
elif result.status == 2:
endmsg="Cost function minimized"
elif result.status == 3:
endmsg="Parameter convergence stalling"
elif result.status == 4:
endmsg="cost function and pameter convergence"
print('optimisation status', result.status, endmsg)
print('parameters', tuple(result.x)) print('parameters', tuple(result.x))
print('cost value', result.cost) print('cost value', result.cost)
ze=np.ma.array(np.zeros(z.shape), mask=z.mask) ze=np.ma.array(np.zeros(z.shape), mask=z.mask)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment