SkyMapMod 0.0.17__tar.gz → 0.0.19__tar.gz

{skymapmod-0.0.17 → skymapmod-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: SkyMapMod
-Version: 0.0.17
+Version: 0.0.19
 Project-URL: Homepage, https://istina.msu.ru/profile/aminevann/
 Author-email: Anna Amineva <amineva.2219@physics.msu.ru>
 License-File: LICENSE

{skymapmod-0.0.17 → skymapmod-0.0.19}/pyproject.toml

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

{skymapmod-0.0.17 → skymapmod-0.0.19}/src/SkyMapMod/__init__.py

@@ -4,4 +4,5 @@ from .transparency import *
 from .airglow_spectrum import *
 from .modtran_default_kp_transparency import *
 from .solar_spectrum import *
-from .band_V_data import *
+from .band_V_data import *
+from .solar_radio_flux import *

{skymapmod-0.0.17 → skymapmod-0.0.19}/src/SkyMapMod/airglow.py

@@ -17,3 +17,7 @@ def airglow(wavelenght_airglow = wavelenght_kp, intensity_airglow = intensity_kp
     return(np.array(wavelenght), np.array(intensity))
 #функция написана для спектра взятого от китт пик, прозрачность атмосферы взята из модтрана, параметры -- см. доклад, там прямо скрин. Прозрачность взята для 45 градусов, пересчитана в 30 градусов
 
+from .solar_radio_flux import fluxdate
+
+def check(fluxdate):
+    print(fluxdate)

skymapmod-0.0.19/src/SkyMapMod/solar_radio_flux.py

@@ -0,0 +1,23 @@
+import requests
+
+url = "https://www.spaceweather.gc.ca/solar_flux_data/daily_flux_values/fluxtable.txt"
+response = requests.get(url)
+
+a = response.text
+a = a.split('\n')
+
+fluxdate = []
+fluxtime = []
+fluxjulian = []
+fluxcarrington = []
+fluxobsflux = []
+fluxadjflux = []
+fluxursi = []
+for i in range(2, len(a)-1):
+    fluxdate.append(a[i].split()[0])
+    fluxtime.append(a[i].split()[1])
+    fluxjulian.append(a[i].split()[2])
+    fluxcarrington.append(a[i].split()[3])
+    fluxobsflux.append(a[i].split()[4])
+    fluxadjflux.append(a[i].split()[5])
+    fluxursi.append(a[i].split()[6])

{skymapmod-0.0.17 → skymapmod-0.0.19}/src/SkyMapMod/zodiac.py

@@ -187,7 +187,7 @@ def zodiacal_spectrum(lmbd, beta, lmbd_sun, Sun_sp_wl = wavelenght_newguey2003,
     N_S10_to_Sun = N_S10(Sun_sp_wl, Sun_sp_fx, V_wl, V_tr, T_A0)
     N_phot = round(S10 * N_S10_to_Sun)
     probabilities = Sun_sp_fx / np.sum(Sun_sp_fx) #или все-таки нормируем на интеграл?
-    counts = np.zeros(Sun_sp_wl)
+    counts = np.zeros(Sun_sp_wl.shape[0])
     for i in range(N_phot):
         spectrum = random.choices(Sun_sp_wl, weights=probabilities)
         counts[np.where(Sun_sp_wl == spectrum)[0][0]] += 1