SkyMapMod 0.1.24__tar.gz → 0.1.25__tar.gz

{skymapmod-0.1.24 → skymapmod-0.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SkyMapMod
-Version: 0.1.24
+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.24 → skymapmod-0.1.25}/SkyMapMod/total_background.py

@@ -53,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 компоненты
 #принимает на вход галактические координаты
@@ -114,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.24 → skymapmod-0.1.25}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "SkyMapMod"
-version = "0.1.24"
+version = "0.1.25"
 authors = [
  { name="Anna Amineva", email="amineva.2219@physics.msu.ru" },
 ]