Final merging with main

Author: jorge

.gitignore

@@ -195,3 +195,4 @@ cython_debug/
 nss_to_conex.root
 nssenv
 *.png
+*.root

setup.cfg

@@ -38,8 +38,8 @@ install_requires =
     pydantic
     rich
     scipy
-    uproot
     tomli-w
+    uproot
     configparser;python_version<"3.8"
     importlib-metadata;python_version<"3.8"
     importlib-resources;python_version<"3.9"

src/nuspacesim/compute.py

@@ -228,7 +228,6 @@ def add_meta(self, name: str, value: Any, comment: str):
     if config.detector.optical.enable:
         logv("Computing [green] EAS Optical Cherenkov light.[/]")
         conex = config.simulation.conex_output
-
         numPEs, costhetaChEff, profilesOut = eas(
             beta_tr,
             altDec,

src/nuspacesim/conex_out.py

@@ -1,11 +1,13 @@
+import datetime
+
 import awkward as ak
 import numpy as np
 import uproot
-import datetime
-
 from scipy.optimize import curve_fit
 
-from .simulation.eas_optical.shower_properties import path_length_tau_atm
+from .simulation.eas_optical.shower_properties import (
+    path_length_tau_atm,
+)
 from .simulation.eas_optical.shower_properties import (
     slant_depth_trig_approx as slant_depth,
 )
@@ -50,22 +52,22 @@ def GH(X, X0, Xmax, Nmax, p3, p2, p1):
             mask2[i] = False
     nmasked = np.sum(~mask2) + np.sum(~mask)"""
 
-    #beta = beta[mask2]
-    #Zfirst = Zfirst[mask2]
+    # beta = beta[mask2]
+    # Zfirst = Zfirst[mask2]
     n = np.size(Zfirst)
-    #TauEnergy = TauEnergy[mask2]
-    #Xfirst = Xfirst[mask2]
+    # TauEnergy = TauEnergy[mask2]
+    # Xfirst = Xfirst[mask2]
     azim = 360 * np.random.rand(n)  # Random azimuth
     zenith = 90 + np.degrees(beta)
     dEdXratio = 0.0025935  # 0.0025935 when comparing with Conex. This paper says 0.00219, but for general cosmic ray, not electrons only. https://doi.org/10.1016/S0927-6505(00)00101-8 in GeV /
     rootfile = output_file.replace(".fits", ".root")
     print("Generating conex-like output in " + rootfile)
-    #print("Number of masked events ", nmasked)
+    # print("Number of masked events ", nmasked)
     print("Number of valid events ", n)
 
-    #X = X[mask2]
-    #Z = Z[mask2]
-    #RN = RN[mask2]
+    # X = X[mask2]
+    # Z = Z[mask2]
+    # RN = RN[mask2]
 
     # Useful variables to fill the conex File
     PID = np.array([100], dtype="i4")  # Proton type for Conex
@@ -129,7 +131,7 @@ def GH(X, X0, Xmax, Nmax, p3, p2, p1):
         g3 = popt[3]
         g2 = popt[4]
         g1 = popt[5]
-        if chi2[i]>0.1:
+        if chi2[i] > 0.1:
             print(
                 f"Warning: chi2 for event {i} is too high ({chi2[i]:.3f}). "
                 "This may indicate a poor fit."

src/nuspacesim/config.py

@@ -355,7 +355,6 @@ def validate_cherenkov_light_engine(cls, value: str) -> str:
     )
     conex_output: bool = False
 
-
     target: Optional[TargetOfOpportunity] = TargetOfOpportunity()
 
     @field_validator(
@@ -464,8 +463,7 @@ def s(key: str):
                 "table_version": s("tau_shower table_version"),
             },
             "thrown_events": s("thrown_events"),
-            "conex_output": s("conex_output")
-
+            "conex_output": s("conex_output"),
         },
         "title": h["Config title"],
     }

src/nuspacesim/simulation/eas_optical/cphotang.py

@@ -525,7 +525,7 @@ def photon_sum(
         return photsum
 
     def valid_arrays(
-        self, zsave, delgram, gramsum, gramz, ZonZ, ThetPrpA, Eshow, Conex
+        self, zsave, delgram, gramsum, gramz, ZonZ, ThetPrpA, Eshow, conex
     ):
         """
         Return data arrays with invalid values removed
@@ -624,7 +624,7 @@ def cherenkov_area(self, AveCangI, DistStep, izRNmax):
         CherArea = self.pi * np.power(CherArea, 2, dtype=self.dtype)
         return CherArea
 
-    def run(self, betaE, alt, Eshow100PeV, lat, long, Conex, profilesIn, cloudf=None):
+    def run(self, betaE, alt, Eshow100PeV, lat, long, conex, profilesIn, cloudf=None):
         """Main body of simulation code."""
 
         # Should we just skip these with a mask in valid_arrays?
@@ -641,9 +641,9 @@ def run(self, betaE, alt, Eshow100PeV, lat, long, Conex, profilesIn, cloudf=None
         #
 
         zs, delgram, ZonZ, ThetPrpA, AirN, s, RN, e2hill, gramsum = self.valid_arrays(
-            *self.slant_depth(alt, sinThetView), Eshow, Conex
+            *self.slant_depth(alt, sinThetView), Eshow, conex
         )
-        if Conex == "1":
+        if conex:
             profilesIn = ak.concatenate([profilesIn, [gramsum], [zs], [RN]], axis=0)
 
         # Cloud top height
@@ -707,7 +707,7 @@ def run(self, betaE, alt, Eshow100PeV, lat, long, Conex, profilesIn, cloudf=None
         return photonDen, Cang, profilesIn
 
     def __call__(
-        self, betaE, alt, Eshow100PeV, init_lat, init_long, Conex, cloudf=None
+        self, betaE, alt, Eshow100PeV, init_lat, init_long, conex, cloudf=None
     ):
         """
         Iterate over the list of events and return the result as pair of
@@ -731,6 +731,6 @@ def __call__(
         )
         with ProgressBar():
             Dphots, Cang, profilesOut = zip(
-                *b.map(lambda x: self.run(*x, Conex, profilesIn, cloudf)).compute()
+                *b.map(lambda x: self.run(*x, conex, profilesIn, cloudf)).compute()
             )
         return np.asarray(Dphots), np.array(Cang), profilesOut