Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solve circular dependency between zernike.py and interferometer_zenike.py #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Solve circular dependency between zernike.py and interferometer_zenike.py #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab5c28b
Solved circular dependency between modules interferometer_zenike.py a…
fHachenberg Jan 24, 2017
650ebdc
Fixed typo-bug just added
fHachenberg Jan 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions interferometer_zenike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from __future__ import division as __division__
from __future__ import absolute_import
import numpy as __np__
import matplotlib.pyplot as __plt__
from matplotlib import cm as __cm__

from . import zernike as __zernike__
from .zernike_coeffs import __zernikecartesian__
from . import tools as __tools__
from .phaseunwrap import unwrap2D as __unwrap2D__


def twyman_green(coefficients, lambda_1 = 632, PR = 1):
"""
Genertate Twyman_Green Interferogram based on zernike polynomials
Expand All @@ -32,7 +32,7 @@ def twyman_green(coefficients, lambda_1 = 632, PR = 1):
r = __np__.linspace(-PR, PR, 400)
x, y = __np__.meshgrid(r,r)
rr = __np__.sqrt(x**2 + y**2)
OPD = __zernike__.__zernikecartesian__(coefficients,x,y)*2/PR
OPD = __zernikecartesian__(coefficients,x,y)*2/PR

ph = 2 * __np__.pi * OPD
I1 = 1
Expand Down Expand Up @@ -86,7 +86,7 @@ def phase_shift(coefficients, lambda_1 = 632, PR = 1, type = '4-step', noise = 0
r = __np__.linspace(-PR, PR, sample)
x, y = __np__.meshgrid(r,r)
rr = __np__.sqrt(x**2 + y**2)
OPD = __zernike__.__zernikecartesian__(coefficients,x,y)*2/PR
OPD = __zernikecartesian__(coefficients,x,y)*2/PR
Ia = 1
Ib = 1
ph = 2 * __np__.pi * OPD
Expand Down
127 changes: 4 additions & 123 deletions zernike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
from numpy.fft import fft2 as __fft2__
from numpy.fft import ifft2 as __ifft2__

from . import interferometer_zenike as __interferometer__
from .zernike_coeffs import __zernikepolar__, __zernikecartesian__
from .interferometer_zenike import twyman_green
from . import seidel2 as __seidel2__
from . import tools as __tools__
from . import hartmann as __hartmann__
Expand Down Expand Up @@ -320,7 +321,7 @@ def ptf(self):


def twyman_green(self,lambda_1=632,PR=1):
__interferometer__.twyman_green(self,lambda_1=lambda_1,PR=PR)
twyman_green(self,lambda_1=lambda_1,PR=PR)


def hartmann(self,r=1,R=1):
Expand Down Expand Up @@ -503,7 +504,7 @@ def fitting(Z,n,remain3D=False,remain2D=False,barchart=False,interferogram=False

if interferogram == True:
zernike_coefficient = Coefficient(fitlist)
__interferometer__.twyman_green(zernike_coefficient)
twyman_green(zernike_coefficient)
else:
pass
if removepiston == True:
Expand All @@ -513,123 +514,3 @@ def fitting(Z,n,remain3D=False,remain2D=False,barchart=False,interferogram=False
C = Coefficient(fitlist) #output zernike Coefficient class
__tools__.zernikeprint(fitlist)
return fitlist,C

def __zernikepolar__(coefficient,r,u):
"""
------------------------------------------------
__zernikepolar__(coefficient,r,u):

Return combined aberration

Zernike Polynomials Caculation in polar coordinates

coefficient: Zernike Polynomials Coefficient from input
r: rho in polar coordinates
u: theta in polar coordinates

------------------------------------------------
"""
Z = [0]+coefficient
Z1 = Z[1] * 1*(__cos__(u)**2+__sin__(u)**2)
Z2 = Z[2] * 2*r*__cos__(u)
Z3 = Z[3] * 2*r*__sin__(u)
Z4 = Z[4] * __sqrt__(3)*(2*r**2-1)
Z5 = Z[5] * __sqrt__(6)*r**2*__sin__(2*u)
Z6 = Z[6] * __sqrt__(6)*r**2*__cos__(2*u)
Z7 = Z[7] * __sqrt__(8)*(3*r**2-2)*r*__sin__(u)
Z8 = Z[8] * __sqrt__(8)*(3*r**2-2)*r*__cos__(u)
Z9 = Z[9] * __sqrt__(8)*r**3*__sin__(3*u)
Z10 = Z[10] * __sqrt__(8)*r**3*__cos__(3*u)
Z11 = Z[11] * __sqrt__(5)*(1-6*r**2+6*r**4)
Z12 = Z[12] * __sqrt__(10)*(4*r**2-3)*r**2*__cos__(2*u)
Z13 = Z[13] * __sqrt__(10)*(4*r**2-3)*r**2*__sin__(2*u)
Z14 = Z[14] * __sqrt__(10)*r**4*__cos__(4*u)
Z15 = Z[15] * __sqrt__(10)*r**4*__sin__(4*u)
Z16 = Z[16] * __sqrt__(12)*(10*r**4-12*r**2+3)*r*__cos__(u)
Z17 = Z[17] * __sqrt__(12)*(10*r**4-12*r**2+3)*r*__sin__(u)
Z18 = Z[18] * __sqrt__(12)*(5*r**2-4)*r**3*__cos__(3*u)
Z19 = Z[19] * __sqrt__(12)*(5*r**2-4)*r**3*__sin__(3*u)
Z20 = Z[20] * __sqrt__(12)*r**5*__cos__(5*u)
Z21 = Z[21] * __sqrt__(12)*r**5*__sin__(5*u)
Z22 = Z[22] * __sqrt__(7)*(20*r**6-30*r**4+12*r**2-1)
Z23 = Z[23] * __sqrt__(14)*(15*r**4-20*r**2+6)*r**2*__sin__(2*u)
Z24 = Z[24] * __sqrt__(14)*(15*r**4-20*r**2+6)*r**2*__cos__(2*u)
Z25 = Z[25] * __sqrt__(14)*(6*r**2-5)*r**4*__sin__(4*u)
Z26 = Z[26] * __sqrt__(14)*(6*r**2-5)*r**4*__cos__(4*u)
Z27 = Z[27] * __sqrt__(14)*r**6*__sin__(6*u)
Z28 = Z[28] * __sqrt__(14)*r**6*__cos__(6*u)
Z29 = Z[29] * 4*(35*r**6-60*r**4+30*r**2-4)*r*__sin__(u)
Z30 = Z[30] * 4*(35*r**6-60*r**4+30*r**2-4)*r*__cos__(u)
Z31 = Z[31] * 4*(21*r**4-30*r**2+10)*r**3*__sin__(3*u)
Z32 = Z[32] * 4*(21*r**4-30*r**2+10)*r**3*__cos__(3*u)
Z33 = Z[33] * 4*(7*r**2-6)*r**5*__sin__(5*u)
Z34 = Z[34] * 4*(7*r**2-6)*r**5*__cos__(5*u)
Z35 = Z[35] * 4*r**7*__sin__(7*u)
Z36 = Z[36] * 4*r**7*__cos__(7*u)
Z37 = Z[37] * 3*(70*r**8-140*r**6+90*r**4-20*r**2+1)


Z = Z1 + Z2 + Z3+ Z4+ Z5+ Z6+ Z7+ Z8+ Z9+ \
Z10+ Z11+ Z12+ Z13+ Z14+ Z15+ Z16+ Z17+ Z18+ Z19+ \
Z20+ Z21+ Z22+ Z23+ Z24+ Z25+ Z26+ Z27+ Z28+ Z29+ \
Z30+ Z31+ Z32+ Z33+ Z34+ Z35+ Z36+ Z37
return Z

def __zernikecartesian__(coefficient,x,y):
"""
------------------------------------------------
__zernikecartesian__(coefficient,x,y):

Return combined aberration

Zernike Polynomials Caculation in Cartesian coordinates

coefficient: Zernike Polynomials Coefficient from input
x: x in Cartesian coordinates
y: y in Cartesian coordinates
------------------------------------------------
"""
Z = [0]+coefficient
r = __sqrt__(x**2 + y**2)
Z1 = Z[1] * 1
Z2 = Z[2] * 2*x
Z3 = Z[3] * 2*y
Z4 = Z[4] * __sqrt__(3)*(2*r**2-1)
Z5 = Z[5] * 2*__sqrt__(6)*x*y
Z6 = Z[6] * __sqrt__(6)*(x**2-y**2)
Z7 = Z[7] * __sqrt__(8)*y*(3*r**2-2)
Z8 = Z[8] * __sqrt__(8)*x*(3*r**2-2)
Z9 = Z[9] * __sqrt__(8)*y*(3*x**2-y**2)
Z10 = Z[10] * __sqrt__(8)*x*(x**2-3*y**2)
Z11 = Z[11] * __sqrt__(5)*(6*r**4-6*r**2+1)
Z12 = Z[12] * __sqrt__(10)*(x**2-y**2)*(4*r**2-3)
Z13 = Z[13] * 2*__sqrt__(10)*x*y*(4*r**2-3)
Z14 = Z[14] * __sqrt__(10)*(r**4-8*x**2*y**2)
Z15 = Z[15] * 4*__sqrt__(10)*x*y*(x**2-y**2)
Z16 = Z[16] * __sqrt__(12)*x*(10*r**4-12*r**2+3)
Z17 = Z[17] * __sqrt__(12)*y*(10*r**4-12*r**2+3)
Z18 = Z[18] * __sqrt__(12)*x*(x**2-3*y**2)*(5*r**2-4)
Z19 = Z[19] * __sqrt__(12)*y*(3*x**2-y**2)*(5*r**2-4)
Z20 = Z[20] * __sqrt__(12)*x*(16*x**4-20*x**2*r**2+5*r**4)
Z21 = Z[21] * __sqrt__(12)*y*(16*y**4-20*y**2*r**2+5*r**4)
Z22 = Z[22] * __sqrt__(7)*(20*r**6-30*r**4+12*r**2-1)
Z23 = Z[23] * 2*__sqrt__(14)*x*y*(15*r**4-20*r**2+6)
Z24 = Z[24] * __sqrt__(14)*(x**2-y**2)*(15*r**4-20*r**2+6)
Z25 = Z[25] * 4*__sqrt__(14)*x*y*(x**2-y**2)*(6*r**2-5)
Z26 = Z[26] * __sqrt__(14)*(8*x**4-8*x**2*r**2+r**4)*(6*r**2-5)
Z27 = Z[27] * __sqrt__(14)*x*y*(32*x**4-32*x**2*r**2+6*r**4)
Z28 = Z[28] * __sqrt__(14)*(32*x**6-48*x**4*r**2+18*x**2*r**4-r**6)
Z29 = Z[29] * 4*y*(35*r**6-60*r**4+30*r**2-4)
Z30 = Z[30] * 4*x*(35*r**6-60*r**4+30*r**2-4)
Z31 = Z[31] * 4*y*(3*x**2-y**2)*(21*r**4-30*r**2+10)
Z32 = Z[32] * 4*x*(x**2-3*y**2)*(21*r**4-30*r**2+10)
Z33 = Z[33] * 4*(7*r**2-6)*(4*x**2*y*(x**2-y**2)+y*(r**4-8*x**2*y**2))
Z34 = Z[34] * (4*(7*r**2-6)*(x*(r**4-8*x**2*y**2)-4*x*y**2*(x**2-y**2)))
Z35 = Z[35] * (8*x**2*y*(3*r**4-16*x**2*y**2)+4*y*(x**2-y**2)*(r**4-16*x**2*y**2))
Z36 = Z[36] * (4*x*(x**2-y**2)*(r**4-16*x**2*y**2)-8*x*y**2*(3*r**4-16*x**2*y**2))
Z37 = Z[37] * 3*(70*r**8-140*r**6+90*r**4-20*r**2+1)
ZW = Z1 + Z2 + Z3+ Z4+ Z5+ Z6+ Z7+ Z8+ Z9+ \
Z10+ Z11+ Z12+ Z13+ Z14+ Z15+ Z16+ Z17+ Z18+ Z19+ \
Z20+ Z21+ Z22+ Z23+ Z24+ Z25+ Z26+ Z27+ Z28+ Z29+ \
Z30+ Z31+ Z32+ Z33+ Z34+ Z35+ Z36+ Z37
return ZW
123 changes: 123 additions & 0 deletions zernike_coeffs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
from numpy import cos as __cos__
from numpy import sin as __sin__
from numpy import sqrt as __sqrt__

def __zernikepolar__(coefficient,r,u):
"""
------------------------------------------------
__zernikepolar__(coefficient,r,u):

Return combined aberration

Zernike Polynomials Caculation in polar coordinates

coefficient: Zernike Polynomials Coefficient from input
r: rho in polar coordinates
u: theta in polar coordinates

------------------------------------------------
"""
Z = [0]+coefficient
Z1 = Z[1] * 1*(__cos__(u)**2+__sin__(u)**2)
Z2 = Z[2] * 2*r*__cos__(u)
Z3 = Z[3] * 2*r*__sin__(u)
Z4 = Z[4] * __sqrt__(3)*(2*r**2-1)
Z5 = Z[5] * __sqrt__(6)*r**2*__sin__(2*u)
Z6 = Z[6] * __sqrt__(6)*r**2*__cos__(2*u)
Z7 = Z[7] * __sqrt__(8)*(3*r**2-2)*r*__sin__(u)
Z8 = Z[8] * __sqrt__(8)*(3*r**2-2)*r*__cos__(u)
Z9 = Z[9] * __sqrt__(8)*r**3*__sin__(3*u)
Z10 = Z[10] * __sqrt__(8)*r**3*__cos__(3*u)
Z11 = Z[11] * __sqrt__(5)*(1-6*r**2+6*r**4)
Z12 = Z[12] * __sqrt__(10)*(4*r**2-3)*r**2*__cos__(2*u)
Z13 = Z[13] * __sqrt__(10)*(4*r**2-3)*r**2*__sin__(2*u)
Z14 = Z[14] * __sqrt__(10)*r**4*__cos__(4*u)
Z15 = Z[15] * __sqrt__(10)*r**4*__sin__(4*u)
Z16 = Z[16] * __sqrt__(12)*(10*r**4-12*r**2+3)*r*__cos__(u)
Z17 = Z[17] * __sqrt__(12)*(10*r**4-12*r**2+3)*r*__sin__(u)
Z18 = Z[18] * __sqrt__(12)*(5*r**2-4)*r**3*__cos__(3*u)
Z19 = Z[19] * __sqrt__(12)*(5*r**2-4)*r**3*__sin__(3*u)
Z20 = Z[20] * __sqrt__(12)*r**5*__cos__(5*u)
Z21 = Z[21] * __sqrt__(12)*r**5*__sin__(5*u)
Z22 = Z[22] * __sqrt__(7)*(20*r**6-30*r**4+12*r**2-1)
Z23 = Z[23] * __sqrt__(14)*(15*r**4-20*r**2+6)*r**2*__sin__(2*u)
Z24 = Z[24] * __sqrt__(14)*(15*r**4-20*r**2+6)*r**2*__cos__(2*u)
Z25 = Z[25] * __sqrt__(14)*(6*r**2-5)*r**4*__sin__(4*u)
Z26 = Z[26] * __sqrt__(14)*(6*r**2-5)*r**4*__cos__(4*u)
Z27 = Z[27] * __sqrt__(14)*r**6*__sin__(6*u)
Z28 = Z[28] * __sqrt__(14)*r**6*__cos__(6*u)
Z29 = Z[29] * 4*(35*r**6-60*r**4+30*r**2-4)*r*__sin__(u)
Z30 = Z[30] * 4*(35*r**6-60*r**4+30*r**2-4)*r*__cos__(u)
Z31 = Z[31] * 4*(21*r**4-30*r**2+10)*r**3*__sin__(3*u)
Z32 = Z[32] * 4*(21*r**4-30*r**2+10)*r**3*__cos__(3*u)
Z33 = Z[33] * 4*(7*r**2-6)*r**5*__sin__(5*u)
Z34 = Z[34] * 4*(7*r**2-6)*r**5*__cos__(5*u)
Z35 = Z[35] * 4*r**7*__sin__(7*u)
Z36 = Z[36] * 4*r**7*__cos__(7*u)
Z37 = Z[37] * 3*(70*r**8-140*r**6+90*r**4-20*r**2+1)


Z = Z1 + Z2 + Z3+ Z4+ Z5+ Z6+ Z7+ Z8+ Z9+ \
Z10+ Z11+ Z12+ Z13+ Z14+ Z15+ Z16+ Z17+ Z18+ Z19+ \
Z20+ Z21+ Z22+ Z23+ Z24+ Z25+ Z26+ Z27+ Z28+ Z29+ \
Z30+ Z31+ Z32+ Z33+ Z34+ Z35+ Z36+ Z37
return Z

def __zernikecartesian__(coefficient,x,y):
"""
------------------------------------------------
__zernikecartesian__(coefficient,x,y):

Return combined aberration

Zernike Polynomials Caculation in Cartesian coordinates

coefficient: Zernike Polynomials Coefficient from input
x: x in Cartesian coordinates
y: y in Cartesian coordinates
------------------------------------------------
"""
Z = [0]+coefficient
r = __sqrt__(x**2 + y**2)
Z1 = Z[1] * 1
Z2 = Z[2] * 2*x
Z3 = Z[3] * 2*y
Z4 = Z[4] * __sqrt__(3)*(2*r**2-1)
Z5 = Z[5] * 2*__sqrt__(6)*x*y
Z6 = Z[6] * __sqrt__(6)*(x**2-y**2)
Z7 = Z[7] * __sqrt__(8)*y*(3*r**2-2)
Z8 = Z[8] * __sqrt__(8)*x*(3*r**2-2)
Z9 = Z[9] * __sqrt__(8)*y*(3*x**2-y**2)
Z10 = Z[10] * __sqrt__(8)*x*(x**2-3*y**2)
Z11 = Z[11] * __sqrt__(5)*(6*r**4-6*r**2+1)
Z12 = Z[12] * __sqrt__(10)*(x**2-y**2)*(4*r**2-3)
Z13 = Z[13] * 2*__sqrt__(10)*x*y*(4*r**2-3)
Z14 = Z[14] * __sqrt__(10)*(r**4-8*x**2*y**2)
Z15 = Z[15] * 4*__sqrt__(10)*x*y*(x**2-y**2)
Z16 = Z[16] * __sqrt__(12)*x*(10*r**4-12*r**2+3)
Z17 = Z[17] * __sqrt__(12)*y*(10*r**4-12*r**2+3)
Z18 = Z[18] * __sqrt__(12)*x*(x**2-3*y**2)*(5*r**2-4)
Z19 = Z[19] * __sqrt__(12)*y*(3*x**2-y**2)*(5*r**2-4)
Z20 = Z[20] * __sqrt__(12)*x*(16*x**4-20*x**2*r**2+5*r**4)
Z21 = Z[21] * __sqrt__(12)*y*(16*y**4-20*y**2*r**2+5*r**4)
Z22 = Z[22] * __sqrt__(7)*(20*r**6-30*r**4+12*r**2-1)
Z23 = Z[23] * 2*__sqrt__(14)*x*y*(15*r**4-20*r**2+6)
Z24 = Z[24] * __sqrt__(14)*(x**2-y**2)*(15*r**4-20*r**2+6)
Z25 = Z[25] * 4*__sqrt__(14)*x*y*(x**2-y**2)*(6*r**2-5)
Z26 = Z[26] * __sqrt__(14)*(8*x**4-8*x**2*r**2+r**4)*(6*r**2-5)
Z27 = Z[27] * __sqrt__(14)*x*y*(32*x**4-32*x**2*r**2+6*r**4)
Z28 = Z[28] * __sqrt__(14)*(32*x**6-48*x**4*r**2+18*x**2*r**4-r**6)
Z29 = Z[29] * 4*y*(35*r**6-60*r**4+30*r**2-4)
Z30 = Z[30] * 4*x*(35*r**6-60*r**4+30*r**2-4)
Z31 = Z[31] * 4*y*(3*x**2-y**2)*(21*r**4-30*r**2+10)
Z32 = Z[32] * 4*x*(x**2-3*y**2)*(21*r**4-30*r**2+10)
Z33 = Z[33] * 4*(7*r**2-6)*(4*x**2*y*(x**2-y**2)+y*(r**4-8*x**2*y**2))
Z34 = Z[34] * (4*(7*r**2-6)*(x*(r**4-8*x**2*y**2)-4*x*y**2*(x**2-y**2)))
Z35 = Z[35] * (8*x**2*y*(3*r**4-16*x**2*y**2)+4*y*(x**2-y**2)*(r**4-16*x**2*y**2))
Z36 = Z[36] * (4*x*(x**2-y**2)*(r**4-16*x**2*y**2)-8*x*y**2*(3*r**4-16*x**2*y**2))
Z37 = Z[37] * 3*(70*r**8-140*r**6+90*r**4-20*r**2+1)
ZW = Z1 + Z2 + Z3+ Z4+ Z5+ Z6+ Z7+ Z8+ Z9+ \
Z10+ Z11+ Z12+ Z13+ Z14+ Z15+ Z16+ Z17+ Z18+ Z19+ \
Z20+ Z21+ Z22+ Z23+ Z24+ Z25+ Z26+ Z27+ Z28+ Z29+ \
Z30+ Z31+ Z32+ Z33+ Z34+ Z35+ Z36+ Z37
return ZW
Loading