Resolve conflict with develop

.github/workflows/unit_tests.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.12"]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/unit_tests_ml.yml

@@ -0,0 +1,34 @@
+name: unit_tests_ml
+
+on: [push, pull_request]
+
+jobs:
+  tests:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.12"]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Display Python version
+        run: python -c "import sys; print(sys.version)"
+      - name: Install
+        run: |
+          python -m pip install --upgrade pip
+          pip install ".[ml]"
+      - name: Tests
+        run: |
+          pip install pytest pytest-cov
+          pytest tests --junitxml=junit/test-results.xml --cov=cosipy --cov-report=xml --cov-report=html
+      - name: Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: true
+

cosipy/__init__.py

@@ -1,4 +1,9 @@
-from ._version import __version__
+try:
+    from importlib import metadata
+    __version__ = metadata.version("cosipy")
+except metadata.PackageNotFoundError:
+    # Handle cases where the package is not installed (e.g., running directly from source)
+    __version__ = "unknown"
 
 from .response import DetectorResponse
 

cosipy/background_estimation/free_norm_threeml_binned_bkg.py

@@ -103,14 +103,14 @@ def norms(self):
         if self._single_component:
             return {self._default_label: u.Quantity(self._norms[0], u.Hz)}
         else:
-            return {l:u.Quantity(n, u.Hz, copy = False) for l,n in zip(self.labels,self._norms)}
+            return {l:u.Quantity(n, u.Hz, copy = None) for l,n in zip(self.labels,self._norms)}
 
     @property
     def ncomponents(self):
         return len(self._distributions)
 
     @property
-    def meausured_axes(self):
+    def axes(self):
         return self._axes
 
     @property
@@ -137,7 +137,7 @@ def set_norm(self, norm: Union[u.Quantity, Dict[str, u.Quantity]]):
 
         self._norm = sum(n for n in self._norms)
 
-    def set_parameters(self, **parameters:Dict[str, u.Quantity]) -> None:
+    def set_parameters(self, **parameters:u.Quantity) -> None:
         """
         Same keys as background components
         """
@@ -157,12 +157,11 @@ def __init__(self, *args, **kwargs):
         self._expectation = None
         self._last_norm_values = None
 
-    def expectation(self, axes:Axes, copy:bool = True)->Histogram:
+    def expectation(self, copy:bool = True)->Histogram:
         """
 
         Parameters
         ----------
-        axes
         copy:
             If True, it will return an array that the user if free to modify.
             Otherwise, it will result a reference, possible to the cache, that
@@ -173,13 +172,10 @@ def expectation(self, axes:Axes, copy:bool = True)->Histogram:
 
         """
 
-        if axes != self.meausured_axes:
-            raise ValueError("Requested axes do not match the background component axes")
-
         # Check if we can use the cache
         if self._expectation is None:
             # First call. Initialize
-            self._expectation = Histogram(self.meausured_axes)
+            self._expectation = Histogram(self.axes)
 
         elif self.norms == self._last_norm_values:
             # No changes. Use cache

cosipy/data_io/EmCDSUnbinnedData.py

@@ -120,7 +120,7 @@ def __init__(self,
         self._energy, self._scatt_angle, self._scatt_lon, self._scatt_lat = np.broadcast_arrays(energy_keV, scatt_angle_rad, scattered_lon_rad_sc, scattered_lat_rad_sc)
 
         if event_id is None:
-            self._id = np.arange(self._jd1.size)
+            self._id = np.arange(self._energy.size)
         else:
             self._id = np.asarray(event_id)
 

cosipy/data_io/UnBinnedData.py

@@ -123,6 +123,7 @@ def read_tra(self, input_name=None, output_name=None,
         if self.data_file.endswith(".tra.gz"):
             # Need to get number of lines for progress bar.  First try
             # fast method for unix-based systems
+
             try:
                 proc=subprocess.Popen(f'gunzip -c {self.data_file} | wc -l',
                                       shell=True, stdout=subprocess.PIPE)
@@ -149,6 +150,7 @@ def read_tra(self, input_name=None, output_name=None,
 
             # If fast method fails, use long method, which should work
             # in all cases
+
             except:
                 logger.info("Initial attempt failed.")
                 logger.info("Using long method...")
@@ -188,7 +190,6 @@ def read_tra(self, input_name=None, output_name=None,
 
             this_line = line.lstrip()
             match this_line[:2]: # will be "" for empty line
-
                 case "SE": # New event marker
 
                     # Previous event was read but is not valid.
@@ -483,7 +484,6 @@ def instrument_pointing(self, ori_file):
         self.zl_interp = interpolate.interp1d(time_tags, z_pointings.l.rad, kind='linear')
         self.zb_interp = interpolate.interp1d(time_tags, z_pointings.b.rad, kind='linear')
 
-
     def construct_scy(self, scx_l, scx_b, scz_l, scz_b):
 
         """Construct y-coordinate of instrument pointing given x and z directions.
@@ -558,6 +558,7 @@ def cart2polar(self, vector):
             Right ascension in radians.
         dec : float
             Declination in radians.
+
         """
 
         x, y, z = vector
@@ -598,7 +599,6 @@ def write_unbinned_output(self, output_name):
                 for each in self.cosi_dataset.keys():
                     hf.create_dataset(each, data=self.cosi_dataset[each], compression='gzip')
 
-
     def get_dict_from_fits(self, input_fits):
 
         """Constructs dictionary from input fits file.