SkyMapMod 0.1.11__tar.gz → 0.1.12__tar.gz

{skymapmod-0.1.11 → skymapmod-0.1.12}/PKG-INFO

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

{skymapmod-0.1.11 → skymapmod-0.1.12}/SkyMapMod/zodiac.py

@@ -216,12 +216,14 @@ def zodiacal_spectrum(lmbd, beta, lmbd_sun, Sun_sp_wl = wavelenght_newguey2003,
 def N_S10_2(Sun_sp_wl = wavelenght_newguey2003, Sun_sp_fx = flux_newguey2003, V_wl = wavelenght_band_V, V_tr = trancparency_band_V, T_A0 = 9800):
     h = 6.63e-34
     c = 3e8 
-    Sun_V_wl, Sun_V_fx = convolution(Sun_sp_wl, Sun_sp_fx, V_wl, V_tr)
-
-    Sun_norm = integral(Sun_V_wl, Sun_V_fx)
-    Sun_V_fx_norm = Sun_V_fx / Sun_norm #photons/(m^2 sec sr)
+    Sun_V_wl, Sun_V_fx = convolution(Sun_sp_wl, Sun_sp_fx, V_wl, V_tr) #сворачиваю с полосой V
+    
+    Sun_norm = integral(Sun_V_wl, Sun_V_fx)#интегрирую спектр, photons/(m^2 sec sr)
+    Sun_V_fx_norm = Sun_V_fx / Sun_norm #спектр отнормирован на 1 фотон
+    
+    a = np.sum(Sun_V_fx_norm)
 
-    Sun_V_fx_norm_Vt = Sun_V_fx_norm * h * c / (Sun_V_wl * 10**(-9)) #Vt/(m^2 sec sr)
+    Sun_V_fx_norm_Vt = Sun_V_fx_norm * h * c / (Sun_V_wl * 10**(-9)) #перевела в мощности
     Sun = np.sum(Sun_V_fx_norm_Vt)
     
     A0_sp_wl = Sun_sp_wl #нм
@@ -235,8 +237,10 @@ def N_S10_2(Sun_sp_wl = wavelenght_newguey2003, Sun_sp_fx = flux_newguey2003, V_
     A0_V_fx = A * A0_V_fx
     A0_norm = integral(A0_V_wl, A0_V_fx)
     A0_V_fx_norm = A0_V_fx / A0_norm #photons/(m^2 sec sr)
+    b = np.sum(A0_V_fx_norm)
 
     A0_V_fx_norm_Vt = A0_V_fx_norm * h * c / (A0_V_wl * 10**(-9)) #Vt/(m^2 sec sr)
     A0 = np.sum(A0_V_fx_norm_Vt)
-    N_S10_to_Sun = 100 * A0 / Sun    
-    return (N_S10_to_Sun)
+    N_S10_to_Sun = 100 * A0 / Sun
+    c = 100*b/a
+    return (N_S10_to_Sun, c)

{skymapmod-0.1.11 → skymapmod-0.1.12}/pyproject.toml

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