updated for minor changes to G24 averages

karllark · May 7, 2024 · c1d3e73 · c1d3e73
1 parent 74c12f9
commit c1d3e73
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 67 deletions.
diff --git a/dust_extinction/averages.py b/dust_extinction/averages.py
@@ -1565,7 +1565,7 @@ class G24_SMCAvg(BaseExtModel):
 
     x_range = [0.3, 10.0]
 
-    Rv = 3.06
+    Rv = 3.02
 
     def __init__(self, **kwargs):
 
@@ -1612,12 +1612,12 @@ def evaluate(self, in_x):
         C1 = -5.07
         C2 = 2.30
         C3 = 0.12
-        C4 = 0.08
+        C4 = 0.07
         xo = 4.59
         gamma = 0.95
 
         optnir_axav_x = 1.0 / np.array([2.198, 1.65, 1.25, 0.55, 0.44, 0.37])
-        optnir_axav_y = [0.075, 0.137, 0.333, 1.021, 1.345, 1.507]
+        optnir_axav_y = [0.062, 0.125, 0.324, 1.021, 1.349, 1.514]
 
         # return A(x)/A(V)
         return _curve_F99_method(
@@ -1688,7 +1688,7 @@ class G24_SMCBumps(BaseExtModel):
 
     x_range = [0.3, 10.0]
 
-    Rv = 2.59
+    Rv = 2.55
 
     def __init__(self, **kwargs):
 
@@ -1732,15 +1732,15 @@ def evaluate(self, in_x):
         ValueError
            Input x values outside of defined range
         """
-        C1 = -2.87
+        C1 = -2.85
         C2 = 1.51
         C3 = 2.64
         C4 = 0.25
         xo = 4.73
-        gamma = 1.16
+        gamma = 1.15
 
         optnir_axav_x = 1.0 / np.array([2.198, 1.65, 1.25, 0.55, 0.44, 0.37])
-        optnir_axav_y = [0.068, 0.174, 0.302, 1.017, 1.394, 1.675]
+        optnir_axav_y = [0.055, 0.162, 0.293, 1.017, 1.400, 1.684]
 
         # return A(x)/A(V)
         return _curve_F99_method(

diff --git a/dust_extinction/data/G24_SMCAvg.dat b/dust_extinction/data/G24_SMCAvg.dat
@@ -1,32 +1,32 @@
 # wave A(l)/A(V) unc type
-0.112305922546031 6.847556692139969 0.19983541525860996 spec
-0.11701444543424377 5.831747894518376 0.035430074824899155 spec
-0.12192037721493712 5.316808770696611 0.17716955259746545 spec
-0.12703199442658303 5.44887838580242 0.030571416996447737 spec
-0.13235792060868376 5.115222987458385 0.0352393910549822 spec
-0.13790714085008998 4.860161520000865 0.022340167328706497 spec
-0.14368901694726988 4.603244229724355 0.02039330322656729 spec
-0.14971330319810144 4.380661719107991 0.020349135239799865 spec
-0.1559901628578337 4.122941435989293 0.02385957759743568 spec
-0.16253018528497776 3.931776192091593 0.018496750438423533 spec
-0.16934440380605456 3.7650468775522037 0.022537499097438456 spec
-0.17644431432933738 3.5787440290815615 0.0181091093438295 spec
-0.18384189473899187 3.401297236472459 0.015784209031576256 spec
-0.1915496251023318 3.2406020496958474 0.016101138308272284 spec
-0.1995805087242818 3.1326209665059834 0.015209513508729776 spec
-0.20794809408456638 2.9984478868820883 0.013831935817581402 spec
-0.216666497694635 2.8678603256493833 0.013568088596585422 spec
-0.2257504279128828 2.711103246385515 0.011910691317821886 spec
-0.23521520975834567 2.5492520177588283 0.014692610807648825 spec
-0.24507681076473067 2.389525680616388 0.009620888083712758 spec
-0.25535186791839903 2.309726452669956 0.01056190399165983 spec
-0.26605771572574743 2.158008535425206 0.00917623415282359 spec
-0.27721241545733843 2.0760105449165183 0.00972090087034518 spec
-0.28883478561811626 1.9544940452804287 0.008694020114040702 spec
-0.30094443369511337 1.8757091989282824 0.010157429495629118 spec
-0.3654647767543793 1.5068186876011898 0.03640110255487302 JohnU
-0.43901899456977844 1.3446745290035917 0.012104158099805855 JohnB
-0.5447309613227844 1.0211056069508497 0.011820762587529243 JohnV
-1.2307178974151611 0.3334668386999866 0.06797754856997613 JohnJ
-1.621522068977356 0.1366387371471568 0.08028764949929663 JohnH
-2.17476487159729 0.07450314415244152 0.10211210104143857 JohnK
+0.112305922546031 6.929417856352466 0.20263295286366584 spec
+0.11701444543424377 5.899388539774233 0.03592606782265849 spec
+0.12192037721493712 5.377240675893348 0.1796497860697002 spec
+0.12703199442658303 5.511159161051872 0.03099939263118059 spec
+0.13235792060868376 5.172832851284108 0.03573271463092595 spec
+0.13790714085008998 4.914200725212899 0.02265291198472464 spec
+0.14368901694726988 4.6536867962724795 0.020678793326476753 spec
+0.14971330319810144 4.427988306724796 0.020634007022862128 spec
+0.1559901628578337 4.166660143678123 0.024193592794307543 spec
+0.16253018528497776 3.972818737710295 0.018755690300789062 spec
+0.16934440380605456 3.8037553447660066 0.022853006241992407 spec
+0.17644431432933738 3.614844403911684 0.018362622537763974 spec
+0.18384189473899187 3.434913496689673 0.016005175461749573 spec
+0.1915496251023318 3.2719687045196566 0.016326541497408233 spec
+0.1995805087242818 3.1624759716531456 0.015422434656566427 spec
+0.20794809408456638 3.026424575138582 0.014025571968362419 spec
+0.216666497694635 2.8940088914340505 0.013758031095158843 spec
+0.2257504279128828 2.7350573371641786 0.01207743156664464 spec
+0.23521520975834567 2.5709403194734177 0.014898295726899278 spec
+0.24507681076473067 2.4089779400654185 0.009755572900082216 spec
+0.25535186791839903 2.3280615861043326 0.01070976228574359 spec
+0.26605771572574743 2.1742197381323702 0.009304694166190597 spec
+0.27721241545733843 2.091073840673905 0.009856985786547937 spec
+0.28883478561811626 1.9678562062468334 0.008815729512630866 spec
+0.30094443369511337 1.8879684344192733 0.010299625466988612 spec
+0.3654647767543793 1.5139137479821265 0.036910689172094835 JohnU
+0.43901899456977844 1.3494996995327728 0.012273606730409833 JohnB
+0.5447309613227844 1.0214010687389723 0.011986243905323966 JohnV
+1.2307178974151611 0.32413590213230925 0.06892918043251621 JohnJ
+1.621522068977356 0.12455236298543126 0.08141161302901012 JohnH
+2.17476487159729 0.06154692088118652 0.10354158961444755 JohnK
diff --git a/dust_extinction/data/G24_SMCBumps.dat b/dust_extinction/data/G24_SMCBumps.dat
@@ -1,30 +1,30 @@
 # wave A(l)/A(V) unc type
-0.11701444543424377 5.4176459980372185 0.1032219276339054 spec
-0.12703199442658303 4.752853473898855 0.08375995156522892 spec
-0.13235792060868376 4.671941852629287 0.08390085400631052 spec
-0.13790714085008998 4.395775332012629 0.0583456651927308 spec
-0.14368901694726988 4.223283401884845 0.05200361253988084 spec
-0.14971330319810144 4.005375779331094 0.05564808449432365 spec
-0.1559901628578337 3.7112137122201223 0.07047899506742132 spec
-0.16253018528497776 3.6516151965644466 0.047553668856758394 spec
-0.16934440380605456 3.619164194092023 0.04245833891780579 spec
-0.17644431432933738 3.5273545647901408 0.041188712204053776 spec
-0.18384189473899187 3.41718627984076 0.029416325133850823 spec
-0.1915496251023318 3.2705098239622634 0.010657716071328573 spec
-0.1995805087242818 3.3322401341437735 0.01734756553480046 spec
-0.20794809408456638 3.3502336329604927 0.012130192714050338 spec
-0.216666497694635 3.385981914764564 0.0397076097575254 spec
-0.2257504279128828 3.139181257277802 0.027729626813050585 spec
-0.23521520975834567 2.8057305783371564 0.022880213706975107 spec
-0.24507681076473067 2.636005637080303 0.014538738385996147 spec
-0.25535186791839903 2.514649982179777 0.007126586158241167 spec
-0.26605771572574743 2.299400811815393 0.011083699616338564 spec
-0.27721241545733843 2.1865630620178007 0.02234139631596784 spec
-0.28883478561811626 2.1714747651498394 0.007120837703763066 spec
-0.30094443369511337 2.013597970861842 0.0120703720266099 spec
-0.3628658354282379 1.6746842300512743 0.00040831423990903573 JohnU
-0.43783867359161377 1.3942325108128082 0.006685972865933271 JohnB
-0.5442439317703247 1.01686775136653 0.0002159286715026245 JohnV
-1.2309569120407104 0.3024797256658269 0.04839927738226376 JohnJ
-1.6215280294418335 0.1738600487817531 0.04846869511215765 JohnH
-2.1742196083068848 0.06818160198036438 0.0798256207489614 JohnK
+0.11701444543424377 5.480490776489487 0.10469034750649163 spec
+0.12703199442658303 4.806241012247511 0.08495150824533146 spec
+0.13235792060868376 4.724178354223264 0.08509441514369577 spec
+0.13790714085008998 4.444083129538468 0.05917568199451088 spec
+0.14368901694726988 4.269137354729941 0.05274340823882061 spec
+0.14971330319810144 4.048129810573478 0.056439725912149505 spec
+0.1559901628578337 3.749783037412075 0.07148161882507835 spec
+0.16253018528497776 3.6893366820892712 0.048230160315155764 spec
+0.16934440380605456 3.656424036456251 0.043062344966259276 spec
+0.17644431432933738 3.5633083369495977 0.04177465673069717 spec
+0.18384189473899187 3.451572814276056 0.02983479742355854 spec
+0.1915496251023318 3.3028097608345264 0.010809331163530937 spec
+0.1995805087242818 3.365418237276726 0.0175943494358204 spec
+0.20794809408456638 3.383667708945779 0.012302755041144114 spec
+0.216666497694635 3.419924540518443 0.04027248433986847 spec
+0.2257504279128828 3.169612933388246 0.02812410438196501 spec
+0.23521520975834567 2.831418634417364 0.02320570424243093 spec
+0.24507681076473067 2.659279211254118 0.014745564327515538 spec
+0.25535186791839903 2.5361971687594878 0.007227967918670739 spec
+0.26605771572574743 2.3178858955399644 0.011241374687435201 spec
+0.27721241545733843 2.2034429326061833 0.022659221714928093 spec
+0.28883478561811626 2.1881399918590354 0.007222137687529619 spec
+0.30094443369511337 2.028017265650692 0.012242083353453606 spec
+0.3628658354282379 1.6842821880998935 0.00041412285788281427 JohnU
+0.43783867359161377 1.399840804191617 0.006781086526847736 JohnB
+0.5442439317703247 1.0171077095021726 0.0002190004408404357 JohnV
+1.2309569120407104 0.2925569054294447 0.049087798342451534 JohnJ
+1.6215280294418335 0.162107504049118 0.04915820359870172 JohnH
+2.1742196083068848 0.05492569129686686 0.08096120822088926 JohnK