SkyMapMod 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

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.10.dist-info → skymapmod-0.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SkyMapMod
-Version: 0.1.10
+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.10.dist-info → skymapmod-0.1.12.dist-info}/RECORD

@@ -7,12 +7,12 @@ SkyMapMod/solar_radio_flux.py,sha256=I02O6Mltv3lfqxif3BHUNAzeElQ5AZax_2L09A3cXb8
 SkyMapMod/solar_spectrum.py,sha256=LjBPSTI6Yq86pwF7haUja7RjRYH4C8HZL8SjyI7zp6g,24433
 SkyMapMod/star_catalogues.py,sha256=6J1SzpCq93xG13mmw8rtABRgGHX3xwCk7TT75BQFs9M,740
 SkyMapMod/transparency.py,sha256=HiSbbVX80neh3n284f64sWnrbxpRzPGKvFyid9sVo7I,376
-SkyMapMod/zodiac.py,sha256=Gb7Yd_GEHbj-V2lmnEQxTUhaqD-46lh4BpYO15QrQ0k,10128
+SkyMapMod/zodiac.py,sha256=0ggnLAVwcftOyx52UsCn5ynnFcQtpHRmUu4NwT5Y184,10365
 SkyMapMod/data/__init__.py,sha256=_292qgM72hPa2vxDNSaI9QvPunvi-aSXUsZki99q63o,83
 SkyMapMod/data/load_data.py,sha256=p-Nq5St713HTTDunSWu9ANrF9V0Slaak17IhD0n_bSY,931
 SkyMapMod/data/star_brightness.npy,sha256=waKIZ0fIBM-92MgjGfgutQpXQrzTZkEMJXy8Kluvopg,51840128
 SkyMapMod/data/star_temperatures.npy,sha256=Yjp252bzqmKQz00K0ADTkstjzGFulRMgyW1b8kaDOPE,51840128
-skymapmod-0.1.10.dist-info/METADATA,sha256=8yCN7-mc4EGxi7hRr4RRNI_j2s-9sXW6wDB0uWghQ70,469
-skymapmod-0.1.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-skymapmod-0.1.10.dist-info/licenses/LICENSE,sha256=eShhW1a77wkzEW9UASG0IaNNaJ3vnxmpcxp8tXh5WCA,1045
-skymapmod-0.1.10.dist-info/RECORD,,
+skymapmod-0.1.12.dist-info/METADATA,sha256=7W_WBQGZz8p9BsCtMaVyZFzg6XaxPrn2hLWt9PFzlMo,469
+skymapmod-0.1.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+skymapmod-0.1.12.dist-info/licenses/LICENSE,sha256=eShhW1a77wkzEW9UASG0IaNNaJ3vnxmpcxp8tXh5WCA,1045
+skymapmod-0.1.12.dist-info/RECORD,,