Skip to content

Accounting for asDict, asCrossSection in MieQ() #10

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
wlwatkins wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Accounting for asDict, asCrossSection in MieQ() #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee2692
Accounting for asDict, asCrossSection in MieQ()
Jan 6, 2019
e765657
Update CoreShell.py
Jan 6, 2019
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
6 changes: 3 additions & 3 deletions PyMieScatt/CoreShell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ def MieQCoreShell(mCore,mShell,wavelength,dCore,dShell, asDict=False, asCrossSec
xCore = np.pi*dCore/wavelength
xShell = np.pi*dShell/wavelength
if xCore==xShell:
return MieQ(mCore,wavelength,dShell)
return MieQ(mCore,wavelength,dShell, asDict=asDict, asCrossSection=asCrossSection)
elif xCore==0:
return MieQ(mShell,wavelength,dShell)
return MieQ(mShell,wavelength,dShell, asDict=asDict, asCrossSection=asCrossSection)
elif mCore==mShell:
return MieQ(mCore,wavelength,dShell)
return MieQ(mCore,wavelength,dShell, asDict=asDict, asCrossSection=asCrossSection)
elif xCore>0:
nmax = np.round(2+xShell+4*(xShell**(1/3)))
n = np.arange(1,nmax+1)
Expand Down