SkyMapMod 0.1.48__tar.gz → 0.1.50__tar.gz

{skymapmod-0.1.48 → skymapmod-0.1.50}/PKG-INFO

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

{skymapmod-0.1.48 → skymapmod-0.1.50}/SkyMapMod/airglow.py

@@ -5,6 +5,7 @@ import matplotlib.pyplot as plt
 from .solar_radio_flux import fluxdate
 from .solar_radio_flux import fluxtime
 from .solar_radio_flux import fluxobsflux
+from .zodiac import cos
 
 from .data.load_data import load_wavelenght_kp, load_intensity_kp
 from .modtran_default_kp_transparency import wavelenght_modtran_kp, trancparency_modtran_kp
@@ -26,7 +27,7 @@ def radioflux(date, time): #date -- в формате строки 'дд.мм.г
 wavelenght_kp = load_wavelenght_kp()
 intensity_kp = load_intensity_kp() 
 
-def airglow_spectrum(wavelenght_airglow = wavelenght_kp, intensity_airglow = intensity_kp, wavelenght_atmosphere_kp = wavelenght_modtran_kp, transparency_atmosphere_kp = trancparency_modtran_kp):
+def airglow_spectrum(wavelenght_airglow = wavelenght_kp, intensity_airglow = intensity_kp, wavelenght_atmosphere_kp = wavelenght_modtran_kp, transparency_atmosphere_kp = trancparency_modtran_kp, zenith_angle = 0):
     """
     Возвращает длины волн и спектр собственного свечения за атмосферой.
 
@@ -60,7 +61,7 @@ def airglow_spectrum(wavelenght_airglow = wavelenght_kp, intensity_airglow = int
             if wavelenght_airglow[i] == wavelenght_atmosphere_kp[j]:
                 wavelenght.append(wavelenght_airglow[i])
                 intensity.append(intensity_airglow[i] / transparency_atmosphere_kp[j])
-    intensity = np.array(intensity)
+    intensity = np.array(intensity) / cos(zenith_angle)
     wavelenght = np.array(wavelenght)
     return(wavelenght, intensity)   #возвращает длину волны в нм и поток в фот / (сек м^2 ср нм) + от стерадиан к сетке
 

{skymapmod-0.1.48 → skymapmod-0.1.50}/SkyMapMod/total_background.py

@@ -151,7 +151,7 @@ def sum_of_spectrums(array_1, meaning_1, array_2, meaning_2):
 #собираем за атмосферой все 4 компоненты
 #принимает на вход галактические координаты
 #принимает на вход дату и время наблюдения по UTC
-def total_background(l, b, date, time, Sun_sp_wl = wavelenght_newguey2003, Sun_sp_fx = flux_newguey2003, V_wl = wavelenght_band_V, V_tr = trancparency_band_V, wavelenght_airglow = wavelenght_kp, intensity_airglow = intensity_kp, wavelenght_atmosphere_kp = wavelenght_modtran_kp, transparency_atmosphere_kp = trancparency_modtran_kp, venus_albedo_wl = venus_alb_wl, venus_albedo_rf = venus_alb_rf, mars_albedo_wl = mars_alb_wl, mars_albedo_rf = mars_alb_rf, jupiter_albedo_wl = jupiter_alb_wl, jupiter_albedo_rf = jupiter_alb_rf, saturn_albedo_wl = saturn_alb_wl, saturn_albedo_rf = saturn_alb_rf):
+def total_background(l, b, date, time, Sun_sp_wl = wavelenght_newguey2003, Sun_sp_fx = flux_newguey2003, V_wl = wavelenght_band_V, V_tr = trancparency_band_V, wavelenght_airglow = wavelenght_kp, intensity_airglow = intensity_kp, wavelenght_atmosphere_kp = wavelenght_modtran_kp, transparency_atmosphere_kp = trancparency_modtran_kp, venus_albedo_wl = venus_alb_wl, venus_albedo_rf = venus_alb_rf, mars_albedo_wl = mars_alb_wl, mars_albedo_rf = mars_alb_rf, jupiter_albedo_wl = jupiter_alb_wl, jupiter_albedo_rf = jupiter_alb_rf, saturn_albedo_wl = saturn_alb_wl, saturn_albedo_rf = saturn_alb_rf, zenith_angle = 0):
     """
     Вычисляет суммарный спектр фонового излучения для заданных галактических координат, даты и времени.
 
@@ -230,7 +230,7 @@ def total_background(l, b, date, time, Sun_sp_wl = wavelenght_newguey2003, Sun_s
 #     return(zodiac_wl, zodiac_spec)
 
     #собственное свечение достаем
-    airglow_wl, airglow_spec = airglow_spectrum(wavelenght_airglow, intensity_airglow, wavelenght_atmosphere_kp, transparency_atmosphere_kp)
+    airglow_wl, airglow_spec = airglow_spectrum(wavelenght_airglow, intensity_airglow, wavelenght_atmosphere_kp, transparency_atmosphere_kp, zenith_angle)
     print('ФОТОНОВ СОБСТВЕННОГО:', integral(airglow_wl, airglow_spec))
 
 #     return(airglow_wl, airglow_spec)

{skymapmod-0.1.48 → skymapmod-0.1.50}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "SkyMapMod"
-version = "0.1.48"
+version = "0.1.50"
 authors = [
  { name="Anna Amineva", email="amineva.2219@physics.msu.ru" },
 ]
@@ -24,6 +24,8 @@ Homepage = "https://istina.msu.ru/profile/aminevann/"
 include = [
     "SkyMapMod/data/star_temperatures.npy",
     "SkyMapMod/data/star_brightness.npy",
+    "SkyMapMod/data/wavelenght_kp.npy",
+    "SkyMapMod/data/intensity_kp.npy",
     "SkyMapMod/__init__.py",
     "SkyMapMod/*.py",
     "SkyMapMod/data/*.py",