SkyMapMod 0.1.8__tar.gz → 0.1.10__tar.gz

{skymapmod-0.1.8 → skymapmod-0.1.10}/PKG-INFO

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

{skymapmod-0.1.8 → skymapmod-0.1.10}/SkyMapMod/zodiac.py

@@ -216,18 +216,27 @@ 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_fx_norm_Vt = Sun_V_fx_norm * h * c / (Sun_V_wl * 10**(-9)) #Vt/(m^2 sec sr)
+    Sun = np.sum(Sun_V_fx_norm_Vt)
+    
     A0_sp_wl = Sun_sp_wl #нм
     A0_sp_fx = black_body_phot(A0_sp_wl, T_A0) #фот/ (м^2 ср сек м)
-    A0_V_wl, A0_V_fx = convolution(A0_sp_wl, A0_sp_fx, V_wl, V_tr) #нм, фот / (м^2 сек ср м), стерадианы уйдут при нормировке
-    
-    A0_V_fx = A0_V_fx / (integral(A0_V_wl * 10**(-9), A0_V_fx)) #беру спектр и нормирую его на общее количество фотонов под спектром
-    #на выходе: фот / (м^2 сек ср)
 
-    Sun_V_wl, Sun_V_fx = convolution(Sun_sp_wl, Sun_sp_fx, V_wl, V_tr) #нм, фот / (м^2  сек ср нм)
-    
-    Sun_V_fx = Sun_V_fx / (integral(Sun_V_fx, Sun_V_wl)) #на выходе: фот / (м^2 сек ср)
-    
-    mean_A0 = np.sum(A0_V_fx * h * c / A0_V_wl * 1e9) # Вт / (м^2 ср)
-    mean_Sun = np.sum(Sun_V_fx * h * c / Sun_V_wl * 1e9) # Вт / (м^2 ср)
-    N_S10_to_Sun = 100 * mean_A0 / mean_Sun
+    A0_V_wl, A0_V_fx = convolution(A0_sp_wl, A0_sp_fx, V_wl, V_tr)
+    norm_S10 = integral(A0_V_wl * 10**(-9), A0_V_fx)
+
+    A = 100/norm_S10
+
+    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)
+
+    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)

{skymapmod-0.1.8 → skymapmod-0.1.10}/pyproject.toml

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