SkyMapMod 0.0.21__tar.gz → 0.0.23__tar.gz

{skymapmod-0.0.21 → skymapmod-0.0.23}/PKG-INFO

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

{skymapmod-0.0.21 → skymapmod-0.0.23}/pyproject.toml

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

{skymapmod-0.0.21 → skymapmod-0.0.23}/src/SkyMapMod/airglow.py

@@ -3,9 +3,26 @@ import numpy as np
 import math
 import matplotlib.pyplot as plt
 
+from .solar_radio_flux import fluxdate
+from .solar_radio_flux import fluxtime
+from .solar_radio_flux import fluxobsflux
+
 from .airglow_spectrum import wavelenght_kp, intensity_kp
 from .modtran_default_kp_transparency import wavelenght_modtran_kp, trancparency_modtran_kp
 
+def radioflux(date, time): #date -- в формате строки 'дд.мм.гггг', time -- в формате строки 'чч:мм:сс'
+    day, month, year = date.split('.')
+    date = year + month + day
+    hours, minutes, seconds = time.split(':')
+    time = hours + minutes + seconds
+    data_times = fluxtime[np.where(fluxdate==date)[0]]
+    box = []
+    for i in range(data_times.shape[0]):
+        box.append(abs(int(data_times[i]) - int(time)))
+    box = np.array(box)
+    return float(fluxobsflux[np.argmin(box)])
+
+
 def airglow_spectrum(wavelenght_airglow = wavelenght_kp, intensity_airglow = intensity_kp, wavelenght_atmosphere = wavelenght_modtran_kp, transparency_atmosphere = trancparency_modtran_kp):
     wavelenght = []
     intensity = []
@@ -19,5 +36,4 @@ def airglow_spectrum(wavelenght_airglow = wavelenght_kp, intensity_airglow = int
 
 from .solar_radio_flux import fluxdate
 
-def check(a = fluxdate):
-    return a
+

{skymapmod-0.0.21 → skymapmod-0.0.23}/src/SkyMapMod/solar_radio_flux.py

@@ -1,4 +1,5 @@
 import requests
+import numpy as np
 
 url = "https://www.spaceweather.gc.ca/solar_flux_data/daily_flux_values/fluxtable.txt"
 response = requests.get(url)
@@ -21,3 +22,11 @@ for i in range(2, len(a)-1):
     fluxobsflux.append(a[i].split()[4])
     fluxadjflux.append(a[i].split()[5])
     fluxursi.append(a[i].split()[6])
+
+fluxdate = np.array(fluxdate)
+fluxtime = np.array(fluxtime)
+fluxjulian = np.array(fluxjulian)
+fluxcarrington = np.array(fluxcarrington)
+fluxobsflux = np.array(fluxobsflux)
+fluxadjflux = np.array(fluxadjflux)
+fluxursi = np.array(fluxursi)