Update cel_test.py

equib · Jan 28, 2018 · 7196fd9 · 7196fd9
1 parent 8beba9c
commit 7196fd9
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/pyequibtests/cel_test.py b/pyequibtests/cel_test.py
@@ -7,21 +7,18 @@
 densi=5000.0
 levels5007='3,4/'
 iobs5007=1200.0
-Abb5007=pyequib.cel.calc_abundance(ion, levels5007, tempi, densi, iobs5007)
+Abb5007=pyequib.cel.calc_abundance(temperature=tempi, density=densi, line_flux=iobs5007, ion=ion, atomic_levels=levels5007)
 
 ion='s_ii'
 levu='1,2,1,3/'
 levl='1,5/'
-diagtype='T'
 dens = 2550.0
 niiTratio=10.753
-temp=pyequib.cel.calc_temp_dens(ion, levu, levl, niiTratio, diagtype, dens)
+temp=pyequib.cel.calc_temperature(line_flux_ratio=niiTratio, density=dens, ion=ion, upper_levels=levu, lower_levels=levl)
 
 ion='s_ii'
 levu='1,2/'
 levl='1,3/'
-diagtype='D'
 temp = 7000.0
 siiNratio=1.506
-dens=pyequib.cel.calc_temp_dens(ion, levu, levl, siiNratio, diagtype, temp)
-
+dens=pyequib.cel.calc_density(line_flux_ratio=siiNratio, temperature=temp, ion=ion, upper_levels=levu, lower_levels=levl)