SkyMapMod 0.1.23__py3-none-any.whl → 0.1.25__py3-none-any.whl

SkyMapMod/total_background.py

@@ -1,6 +1,6 @@
 from astropy.coordinates import Galactic, ICRS, GeocentricMeanEcliptic, get_sun, get_body
 from astropy.time import Time
-import astropy.units as u
+
 
 from .zodiac import *
 from .airglow import *
@@ -15,6 +15,7 @@ from .albedo_of_planets import *
 from .planets import *
 
 def galactic_to_equatorial(l, b):
+    import astropy.units as u
 # Входные данные: галактические координаты и эпоха
     galactic_l = l * u.deg  # Галактическая долгота
     galactic_b = b * u.deg # Галактическая широта
@@ -52,6 +53,16 @@ def Sun_ecl_lon(date, time):
     print(f"Эклиптическая широта Солнца: {ecliptic_latitude}")
     return(ecliptic_longitude.value)
 
+def sum_of_spectrums(wl_1, sp_1, wl_2, sp_2):
+    result_wl = np.union1d(wl_1, wl_2) #создали массив совокупности длин волн
+    result_spec = np.zeros(result_wl.shape[0]) #создали массив для спектра
+    for i in range(result_wl.shape[0]):
+        if result_wl[i] in wl_1:      
+            result_spec[i] += sp_1[np.where(wl_1 == result_wl[i])]
+        if result_wl[i] in wl_2:
+            result_spec[i] += sp_2[np.where(wl_2 == result_wl[i])]
+    return result_wl, result_spec
+
 
 #собираем за атмосферой все 4 компоненты
 #принимает на вход галактические координаты
@@ -113,4 +124,15 @@ def total_background(l, b, date, time, Sun_sp_wl = wavelenght_newguey2003, Sun_s
         saturn_wl = zodiac_wl
         saturn_sp = np.zeros(saturn_wl.shape[0])
         
-    #теперь бы объединить эти спектры
+    #теперь бы объединить эти спектры
+    #делаю на основе функции sum_of_spectrums
+    zod_air_wl, zod_air_sp = sum_of_spectrums(zodiac_wl, zodiac_spec, airglow_wl, airglow_spec)
+    
+    z_a_s_wl, z_a_s_sp = sum_of_spectrums(zod_air_wl, zod_air_sp, star_cat_wl, star_cat_spec)
+    
+    zas_v_wl, zas_v_sp = sum_of_spectrums(z_a_s_wl, z_a_s_sp, venus_wl, venus_sp)
+    zas_vm_wl, zas_vm_sp = sum_of_spectrums(zas_v_wl, zas_v_sp, mars_wl, mars_sp)
+    zas_vmj_wl, zas_vmj_sp = sum_of_spectrums(zas_vm_wl, zas_vm_sp, jupiter_wl, jupiter_sp)
+    zas_vmjs_wl, zas_vmjs_sp = sum_of_spectrums(zas_vmj_wl, zas_vmj_sp, saturn_wl, saturn_sp)
+    
+    return zas_vmjs_wl, zas_vmjs_sp

{skymapmod-0.1.23.dist-info → skymapmod-0.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SkyMapMod
-Version: 0.1.23
+Version: 0.1.25
 Summary: for modeling
 Project-URL: Homepage, https://istina.msu.ru/profile/aminevann/
 Author-email: Anna Amineva <amineva.2219@physics.msu.ru>

{skymapmod-0.1.23.dist-info → skymapmod-0.1.25.dist-info}/RECORD

@@ -8,14 +8,14 @@ SkyMapMod/planets.py,sha256=92aacW0FtwG66a5AHi4gT2tyV9r6jCHAxrIlqySdJFc,6702
 SkyMapMod/solar_radio_flux.py,sha256=I02O6Mltv3lfqxif3BHUNAzeElQ5AZax_2L09A3cXb8,842
 SkyMapMod/solar_spectrum.py,sha256=LjBPSTI6Yq86pwF7haUja7RjRYH4C8HZL8SjyI7zp6g,24433
 SkyMapMod/star_catalogues.py,sha256=SFbsODxilzsT_XZVhx3Aje1rRFLQpPYMfYrvXydFetA,1351
-SkyMapMod/total_background.py,sha256=2giD_e0YOqCQCuSolQVyKK3lM0A2i3jPWYtrlwc6nGE,6510
+SkyMapMod/total_background.py,sha256=rqnVc62fYCEegl1KTbsorw-4G0GFbuPiANate39OTFo,7708
 SkyMapMod/transparency.py,sha256=HiSbbVX80neh3n284f64sWnrbxpRzPGKvFyid9sVo7I,376
 SkyMapMod/zodiac.py,sha256=08kNMa7ivJAvVpVMOUYz4sl07erOMf9O3jeh9vVBFwU,9095
 SkyMapMod/data/__init__.py,sha256=_292qgM72hPa2vxDNSaI9QvPunvi-aSXUsZki99q63o,83
 SkyMapMod/data/load_data.py,sha256=p-Nq5St713HTTDunSWu9ANrF9V0Slaak17IhD0n_bSY,931
 SkyMapMod/data/star_brightness.npy,sha256=aTsrvGU-vl9pqcOLMz3kqsSA15piynS1aP19aqjT6fQ,51840128
 SkyMapMod/data/star_temperatures.npy,sha256=Yjp252bzqmKQz00K0ADTkstjzGFulRMgyW1b8kaDOPE,51840128
-skymapmod-0.1.23.dist-info/METADATA,sha256=X1k-DC7xqNUMTdHfUC2WCuwIrw2NCP5NVVsmxEfhglY,469
-skymapmod-0.1.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-skymapmod-0.1.23.dist-info/licenses/LICENSE,sha256=eShhW1a77wkzEW9UASG0IaNNaJ3vnxmpcxp8tXh5WCA,1045
-skymapmod-0.1.23.dist-info/RECORD,,
+skymapmod-0.1.25.dist-info/METADATA,sha256=dREwkDFZXmE0aNxIJz50e2daNdaf_s-_482bRQbJv8M,469
+skymapmod-0.1.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+skymapmod-0.1.25.dist-info/licenses/LICENSE,sha256=eShhW1a77wkzEW9UASG0IaNNaJ3vnxmpcxp8tXh5WCA,1045
+skymapmod-0.1.25.dist-info/RECORD,,