SkyMapMod 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

SkyMapMod/total_background.py

@@ -226,65 +226,66 @@ def total_background(l, b, date, time, Sun_sp_wl = wavelenght_newguey2003, Sun_s
     lmbd, beta = galactic_to_equatorial(l, b)
     #получаем спектр зодиакального света (нм, фот / (м^2 сек нм ср))
     zodiac_wl, zodiac_spec = zodiacal_spectrum(lmbd, beta, lmbd_Sun, Sun_sp_wl, Sun_sp_fx, V_wl, V_tr)
-    print('ФОТОНОВ ЗОДИКА:', integral(zodiac_wl, zodiac_spec))
-#     return(zodiac_wl, zodiac_spec)
+    #учитываем cos(b)
+    zodiac_spec = zodiac_spec * cos(b)
+
 
     #собственное свечение достаем
     airglow_wl, airglow_spec = airglow_spectrum(wavelenght_airglow, intensity_airglow, wavelenght_atmosphere_kp, transparency_atmosphere_kp)
-    print('ФОТОНОВ СОБСТВЕННОГО:', integral(airglow_wl, airglow_spec))
+    #учитываем cos(b)
+    airglow_spec = airglow_spec * cos(b)
+
 
 #     return(airglow_wl, airglow_spec)
     #зод. свет и собств. свечение -- окей. Нужно допилить звездные каталоги и планеты.
     
-    #звездные каталоги
+    #звездные каталоги -- тут cos(b) учитывался еще на этапе аппроксимации
     star_cat_wl = zodiac_wl
     star_cat_spec = star_spectrum(l, b, star_cat_wl)
-    print('ФОТОНОВ ЗВЕЗД:', integral(star_cat_wl, star_cat_spec))
+
 #     return star_cat_wl, star_cat_spec
 
-    #планеты
+    #планеты -- считаются точечными, cos(b) не учитываем
     #Венера
     venus_l, venus_b = coordinates_of_planet('venus', date, time)
-    print('Техническая проверка координат Венеры:', round(venus_l, 1), round(venus_b, 1))
     if round(venus_l, 1) == l and round(venus_b, 1) == b:
         venus_wl, venus_sp = venus_spectrum(date, time, Sun_sp_wl, Sun_sp_fx, venus_albedo_wl, venus_albedo_rf, V_wl, V_tr)
     else:
         venus_wl = zodiac_wl
         venus_sp = np.zeros(venus_wl.shape[0])
-    print('ФОТОНОВ ВЕНЕРЫ:', integral(venus_wl, venus_sp))
+
     
     #Марс
     mars_l, mars_b = coordinates_of_planet('mars', date, time)
-    print('Техническая проверка координат Марса:', round(mars_l, 1), round(mars_b, 1))
+
     if round(mars_l, 1) == l and round(mars_b, 1) == b:
         mars_wl, mars_sp = mars_spectrum(date, time, Sun_sp_wl, Sun_sp_fx, mars_albedo_wl, mars_albedo_rf, V_wl, V_tr)
     else:
         mars_wl = zodiac_wl
         mars_sp = np.zeros(mars_wl.shape[0])
-    print('ФОТОНОВ МАРСА:', integral(mars_wl, mars_sp))
+
         
     #Юпитер
     jupiter_l, jupiter_b = coordinates_of_planet('jupiter', date, time)
-    print('Техническая проверка координат Юпитера:', round(jupiter_l, 1), round(jupiter_b, 1))
+
     if round(jupiter_l, 1) == l and round(jupiter_b, 1) == b:
         jupiter_wl, jupiter_sp = jupiter_spectrum(date, time, Sun_sp_wl, Sun_sp_fx, jupiter_albedo_wl, jupiter_albedo_rf, V_wl, V_tr)
     else:
         jupiter_wl = zodiac_wl
         jupiter_sp = np.zeros(jupiter_wl.shape[0])
-    print('ФОТОНОВ ЮПИТЕРА:', integral(jupiter_wl, jupiter_sp))
+
         
     #Сатурн
     saturn_l, saturn_b = coordinates_of_planet('saturn', date, time)
-    print('Техническая проверка координат Сатурна:', round(saturn_l, 1), round(saturn_b, 1))
+
     if round(saturn_l, 1) == l and round(saturn_b, 1) == b:
         saturn_wl, saturn_sp = saturn_spectrum(date, time, Sun_sp_wl, Sun_sp_fx, saturn_albedo_wl, saturn_albedo_rf, V_wl, V_tr)
     else:
         saturn_wl = zodiac_wl
         saturn_sp = np.zeros(saturn_wl.shape[0])
-    print('ФОТОНОВ САТУРНА:', integral(saturn_wl, saturn_sp))
+
         
-    #теперь бы объединить эти спектры
-    #делаю на основе функции 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)

{skymapmod-0.2.4.dist-info → skymapmod-0.2.5.dist-info}/METADATA

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

{skymapmod-0.2.4.dist-info → skymapmod-0.2.5.dist-info}/RECORD

@@ -7,7 +7,7 @@ SkyMapMod/planets.py,sha256=AN_H2MulL6p8dS144hW93YSdFB-u5HGGAGjr9Sp69Fc,28458
 SkyMapMod/solar_radio_flux.py,sha256=I02O6Mltv3lfqxif3BHUNAzeElQ5AZax_2L09A3cXb8,842
 SkyMapMod/solar_spectrum.py,sha256=LjBPSTI6Yq86pwF7haUja7RjRYH4C8HZL8SjyI7zp6g,24433
 SkyMapMod/star_catalogues.py,sha256=-JGHE3m6NCg4Ea57ZR6RuxfftkPJyjJHOaU5Wf7qvRc,4102
-SkyMapMod/total_background.py,sha256=oWvrj_L5utBONTG-XIQ9s3lRjIQexvXKTa11_xo5wto,35828
+SkyMapMod/total_background.py,sha256=KkK-cJx5xKLz6zEzULooiFTQ1aSKpfQJGX3haoXwuJ4,34979
 SkyMapMod/transparency.py,sha256=HiSbbVX80neh3n284f64sWnrbxpRzPGKvFyid9sVo7I,376
 SkyMapMod/zodiac.py,sha256=o--fsj0eOyP8evy3zLtsMEFSeWVUneEF8YTypIcs5xw,40616
 SkyMapMod/data/__init__.py,sha256=_292qgM72hPa2vxDNSaI9QvPunvi-aSXUsZki99q63o,83
@@ -16,7 +16,7 @@ SkyMapMod/data/load_data.py,sha256=5kivqnVGu6XmMjm8f7JGteoSH_gsZjQVC5SPWPSiq5M,1
 SkyMapMod/data/star_brightness.npy,sha256=1ZSWvCMNPe8cAxulk3H7z83IuvQTeTssWyzxuCTuL40,51840128
 SkyMapMod/data/star_temperatures.npy,sha256=wDDRGmRbGN0ZO9mWs_Es925T9vrVcVXf_ki-vAluE2w,51840128
 SkyMapMod/data/wavelenght_kp.npy,sha256=baZkBKErnNgFOyR06rSVx6bQJqZx_4ntZcDaHbeY_h4,55496
-skymapmod-0.2.4.dist-info/METADATA,sha256=d4L1X1GQF-_tpJn8LlAX3isaBDlsP-_QSWrJWCl8xEg,468
-skymapmod-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-skymapmod-0.2.4.dist-info/licenses/LICENSE,sha256=eShhW1a77wkzEW9UASG0IaNNaJ3vnxmpcxp8tXh5WCA,1045
-skymapmod-0.2.4.dist-info/RECORD,,
+skymapmod-0.2.5.dist-info/METADATA,sha256=pqreQQjtgUZfgGGc4f4NATMRfBWJqOw2xd2foUju5T8,468
+skymapmod-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+skymapmod-0.2.5.dist-info/licenses/LICENSE,sha256=eShhW1a77wkzEW9UASG0IaNNaJ3vnxmpcxp8tXh5WCA,1045
+skymapmod-0.2.5.dist-info/RECORD,,