Commit changes made to cosipy/response/ files between December 2024 and today

Author: avalluvan

cosipy/response/DetectorResponse.py

@@ -44,10 +44,10 @@ def __init__(self, coord, **kwargs):
 
     def _set_mapping(self):
         self.mapping = {}
-        target_names = ['Ei', 'Em', 'Phi', 'PsiChi', 'SigmaTau', 'Dist']
+        target_names = ['Ei', 'Em', 'Phi', 'PsiChi']
         numlabels = len(self.axes.labels)
 
-        for key, label in zip(target_names[:numlabels], self.axes.labels):
+        for key, label in zip(target_names, self.axes.labels):
             self.mapping[key] = label           # Format: key_target : label
                                                 # Example: {'Ei': 'Ei', 'Em': 'eps', 'Phi': 'Phi', 'PsiChi': 'PsiChi'}
 
@@ -203,7 +203,8 @@ def get_spectral_response(self, copy = True):
         # Cache the spectral response
         if self._spec is None:
             spec = self.project(['Ei','Em'])
-            self._spec = DetectorResponse(edges=spec.axes,
+            self._spec = DetectorResponse(coord = self.coord,
+                                          edges = spec.axes,
                                           contents = spec.contents,
                                           unit = spec.unit)
 

cosipy/response/FullDetectorResponse.py

@@ -1,6 +1,5 @@
 from .PointSourceResponse import PointSourceResponse
 from .DetectorResponse import DetectorResponse
-from .ListModePSR import ListModePSR
 from astromodels.core.model_parser import ModelParser
 import matplotlib.pyplot as plt
 from astropy.time import Time
@@ -508,7 +507,10 @@ def _open_rsp(cls, filename, Spectrumfile=None,norm="Linear" ,single_pixel = Fal
             pass
 
         # create a .h5 file with the good structure
-        filename = filename.replace(".rsp.gz","_nside{0}.area.h5".format(nside))
+        try:
+            filename = filename.replace(".rsp.gz","_nside{0}.area.h5".format(nside))
+        except:
+            filename = str(filename).replace(".rsp.gz", "_nside{0}.area.h5".format(nside))
         f = h5.File(filename, mode='w')
 
         drm = f.create_group('DRM')

cosipy/response/PointSourceResponse.py

@@ -7,6 +7,7 @@
 from scipy import integrate
 
 from threeML import DiracDelta, Constant, Line, Quadratic, Cubic, Quartic, StepFunction, StepFunctionUpper, Cosine_Prior, Uniform_prior, PhAbs, Gaussian
+from astromodels.functions.function import CompositeFunction
 
 
 class PointSourceResponse(Histogram):
@@ -80,6 +81,8 @@ def get_expectation(self, spectrum):
                 spectrum_unit = u.dimensionless_unscaled
             elif isinstance(spectrum, Gaussian):
                 spectrum_unit = spectrum.F.unit / spectrum.sigma.unit 
+            elif isinstance(spectrum, CompositeFunction):       # Ad-hoc fix to make a double Gaussian composite model to work
+                spectrum_unit = spectrum.F_1.unit / spectrum.sigma_1.unit
             else:
                 try:
                     spectrum_unit = spectrum.K.unit