Skip to content

this arange does not get max k endpoint, change to linsapce #23

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

Open
dhidas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

this arange does not get max k endpoint, change to linsapce #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 15 additions & 30 deletions env/work/srw_python/srwl_uti_brightness.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,20 +115,17 @@ def srwl_und_flux_en(Ib,kxmax,kzmax,kmin,numkpts,E_elec,lam_u,phix,phiz,n,nPer,e
#compute kvals and Evals
#lam_u: undulator wavelength in cm
kmax = math.sqrt(kxmax**2+kzmax**2)
dk = (kmax - kmin)/numkpts
kvals=np.arange(kmin, kmax,dk)
kvals=np.linspace(kmin, kmax, numkpts)
#compute Evals
Evals = KtoE(kvals,E_elec,lam_u,n)
#compute kxvals and kzvals
if kxmax > kmin:
dkx = (kxmax-kmin)/numkpts
kxvals = np.arange(kmin,kxmax,dkx)
kxvals=np.linspace(kmin,kxmax,numkpts)
else:
kxvals = np.zeros(numkpts)

if kzmax > kmin:
dkz = (kzmax-kmin)/numkpts
kzvals = np.arange(kmin,kzmax,dkz)
kzvals=np.linspace(kmin,kzmax,numkpts)
else:
kzvals = np.zeros(numkpts)

Expand Down Expand Up @@ -159,20 +156,17 @@ def srwl_und_size_en(kxmax,kzmax,kmin,numkpts,E_elec,lam_u,phix,phiz,n,nPer,enDe
#compute kvals and Evals
#lam_u: undulator wavelength in cm
kmax = math.sqrt(kxmax**2+kzmax**2)
dk = (kmax - kmin)/numkpts
kvals=np.arange(kmin, kmax,dk)
kvals=np.linspace(kmin, kmax, numkpts)
#compute Evals
Evals = KtoE(kvals,E_elec,lam_u,n)
#compute kxvals and kzvals
if kxmax > kmin:
dkx = (kxmax-kmin)/numkpts
kxvals = np.arange(kmin,kxmax,dkx)
kxvals=np.linspace(kmin,kxmax,numkpts)
else:
kxvals = np.zeros(numkpts)

if kzmax > kmin:
dkz = (kzmax-kmin)/numkpts
kzvals = np.arange(kmin,kzmax,dkz)
kzvals=np.linspace(kmin,kzmax,numkpts)
else:
kzvals = np.zeros(numkpts)

Expand Down Expand Up @@ -202,20 +196,17 @@ def srwl_und_div_en(kxmax,kzmax,kmin,numkpts,E_elec,lam_u,phix,phiz,n,nPer,enDet
#compute kvals and Evals
#lam_u: undulator wavelength in cm
kmax = math.sqrt(kxmax**2+kzmax**2)
dk = (kmax - kmin)/numkpts
kvals=np.arange(kmin, kmax,dk)
kvals=np.linspace(kmin, kmax, numkpts)
#compute Evals
Evals = KtoE(kvals,E_elec,lam_u,n)
#compute kxvals and kzvals
if kxmax > kmin:
dkx = (kxmax-kmin)/numkpts
kxvals = np.arange(kmin,kxmax,dkx)
kxvals=np.linspace(kmin,kxmax,numkpts)
else:
kxvals = np.zeros(numkpts)

if kzmax > kmin:
dkz = (kzmax-kmin)/numkpts
kzvals = np.arange(kmin,kzmax,dkz)
kzvals=np.linspace(kmin,kzmax,numkpts)
else:
kzvals = np.zeros(numkpts)

Expand Down Expand Up @@ -251,20 +242,17 @@ def srwl_und_ang_flux_en(Ib,kxmax,kzmax,kmin,numkpts,E_elec,lam_u,phix,phiz,n,nP
#compute kvals and Evals
#lam_u: undulator wavelength in cm
kmax = math.sqrt(kxmax**2+kzmax**2)
dk = (kmax - kmin)/numkpts
kvals=np.arange(kmin, kmax,dk)
kvals=np.linspace(kmin, kmax, numkpts)
#compute Evals
Evals = KtoE(kvals,E_elec,lam_u,n)
#compute kxvals and kzvals
if kxmax > kmin:
dkx = (kxmax-kmin)/numkpts
kxvals = np.arange(kmin,kxmax,dkx)
kxvals=np.linspace(kmin,kxmax,numkpts)
else:
kxvals = np.zeros(numkpts)

if kzmax > kmin:
dkz = (kzmax-kmin)/numkpts
kzvals = np.arange(kmin,kzmax,dkz)
kzvals=np.linspace(kmin,kzmax,numkpts)
else:
kzvals = np.zeros(numkpts)

Expand Down Expand Up @@ -303,20 +291,17 @@ def srwl_und_bright_en(Ib,kx,kz,phix,phiz,n,E_elec,lam_u,nPer,epeak,enDetPar,rel
#compute kvals and Evals
#lam_u: undulator wavelength in cm
kmax = math.sqrt(kxmax**2+kzmax**2)
dk = (kmax - kmin)/numkpts
kvals=np.arange(kmin, kmax,dk)
kvals=np.linspace(kmin, kmax, numkpts)
#compute Evals
Evals = KtoE(kvals,E_elec,lam_u,n)
#compute kxvals and kzvals
if kxmax > kmin:
dkx = (kxmax-kmin)/numkpts
kxvals = np.arange(kmin,kxmax,dkx)
kxvals=np.linspace(kmin, kxmax, numkpts)
else:
kxvals = np.zeros(numkpts)

if kzmax > kmin:
dkz = (kzmax-kmin)/numkpts
kzvals = np.arange(kmin,kzmax,dkz)
kzvals=np.linspace(kmin, kzmax, numkpts)
else:
kzvals = np.zeros(numkpts)

Expand Down