threeML 2.4.2.dev2__tar.gz → 2.4.3.dev1__tar.gz

{threeml-2.4.2.dev2/threeML.egg-info → threeml-2.4.3.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threeML
-Version: 2.4.2.dev2
+Version: 2.4.3.dev1
 Summary: The Multi-Mission Maximum Likelihood framework
 Home-page: https://github.com/threeml/threeML
 Author: Giacomo Vianello

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/_version.py

@@ -9,11 +9,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-05-16T11:29:54-0700",
+ "date": "2024-09-11T16:28:56-0400",
  "dirty": false,
  "error": null,
- "full-revisionid": "5d82ece955c4d85922bd89a38525920eceb160a5",
- "version": "2.4.2.dev2"
+ "full-revisionid": "df578f0d4c5b2d572f6ca9388ce9060b608941e0",
+ "version": "2.4.3.dev1"
 }
 '''  # END VERSION_JSON
 

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/analysis_results.py

@@ -234,9 +234,8 @@ class ANALYSIS_RESULTS_HDF(object):
 
         hdf_obj.create_dataset(
             "UNIT",
-            data=np.array(data_frame["unit"].values, dtype=np.unicode_).astype(
-                h5py.string_dtype()
-            ),
+            data=np.array(data_frame["unit"].values, dtype=np.str_).astype(
+                h5py.string_dtype()),
             compression="gzip",
             compression_opts=9,
             shuffle=True,
@@ -395,7 +394,7 @@ class ANALYSIS_RESULTS(FITSExtension):
             ("NEGATIVE_ERROR", data_frame["negative_error"].values),
             ("POSITIVE_ERROR", data_frame["positive_error"].values),
             ("ERROR", data_frame["error"].values),
-            ("UNIT", np.array(data_frame["unit"].values, np.unicode_)),
+            ("UNIT", np.array(data_frame["unit"].values, np.str_)),
             ("COVARIANCE", covariance_matrix),
             ("LOG_PROB", dummy),
             ("SAMPLES", samples),

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/classicMLE/joint_likelihood.py

@@ -383,7 +383,8 @@ class JointLikelihood(object):
         statistical_measures["BIC"] = bic(
             -total, len(self._free_parameters), total_number_of_data_points
         )
-
+        log.debug('likelihood: %.f , Free Parameters: %d, Total number of datapoints: %d' %
+                  (-total, len(self._free_parameters), total_number_of_data_points))
         #Workaround for the case of a "fit" with no free parameters
         #This happens e.g. if you calculate the TS of the only source
         #in a one-source model.

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/io/fits_file.py

@@ -199,7 +199,7 @@ class FITSExtension(object):
 
                     # see if it is a string array
 
-                    if test_value.dtype.type == np.string_:
+                    if test_value.dtype.type == np.bytes_:
 
                         max_string_length = max(column_data, key=len).dtype.itemsize
 

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/random_variates.py

@@ -34,7 +34,7 @@ class RandomVariates(np.ndarray):
 
         # This gets called at the end of any operation, where out_arr is the result of the operation
         # We need to update _orig_value so that the final results will have it
-
+        out_arr = RandomVariates(out_arr)
         out_arr._orig_value = out_arr.median
 
         # then just call the parent

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/test/test_fits_file.py

@@ -48,7 +48,7 @@ def test_fits_file():
 
         assert dummy_fits["TEST"].header["TFORM1"] == dtype_keys[i]
 
-        assert np.alltrue(dummy_fits["TEST"].data["TEST_VALUE"] == test_values)
+        assert np.all(dummy_fits["TEST"].data["TEST_VALUE"] == test_values)
 
         file_name = "test_fits%d.fits" % i
 
@@ -66,4 +66,4 @@ def test_fits_file():
 
         assert read_dummy_fits["TEST"].header["TFORM1"] == dtype_keys[i]
 
-        assert np.alltrue(read_dummy_fits["TEST"].data["TEST_VALUE"] == test_values)
+        assert np.all(read_dummy_fits["TEST"].data["TEST_VALUE"] == test_values)

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/test/test_response.py

@@ -11,6 +11,10 @@ from threeML.utils.OGIP.response import (
 )
 from threeML.utils.time_interval import TimeInterval
 
+if np.lib.NumpyVersion(np.__version__) >= '2.0.0b1':
+    from numpy.exceptions import VisibleDeprecationWarning
+else:
+    from numpy import VisibleDeprecationWarning
 
 def get_matrix_elements():
 
@@ -287,7 +291,7 @@ def test_response_set_constructor():
 
     with warnings.catch_warnings():
 
-        warnings.simplefilter("error", np.VisibleDeprecationWarning)
+        warnings.simplefilter("error", VisibleDeprecationWarning)
 
         rsp_set = InstrumentResponseSet.from_rsp2_file(
             rsp2_file, exposure_getter, counts_getter

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/utils/data_builders/fermi/gbm_data.py

@@ -48,7 +48,7 @@ class GBMTTEFile(object):
         # sorting in time
         sort_idx = self._events.argsort()
 
-        if not np.alltrue(self._events[sort_idx] == self._events):
+        if not np.all(self._events[sort_idx] == self._events):
 
             # now sort both time and energy
             log.warning(

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/utils/fitted_objects/fitted_source_handler.py

@@ -187,7 +187,7 @@ class GenericFittedSourceHandler(object):
             variates = []
 
             # scroll through the independent variables
-            n_iterations = np.product(self._out_shape)
+            n_iterations = np.prod(self._out_shape)
 
             with use_astromodels_memoization(False):
 

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/threeML/utils/spectrum/spectrum_likelihood.py

@@ -406,7 +406,7 @@ class NotAvailableStatistic(object):
         raise RuntimeError()
 
 try:
-    from ixpe.likelihood import GaussianObservedGaussianBackgroundStatistic
+    from ixpepy.likelihood import GaussianObservedGaussianBackgroundStatistic
     log.info('IXPE plugin found. Enabling Gaussian source with Gaussian background.')
 except:
     GaussianObservedGaussianBackgroundStatistic = NotAvailableStatistic

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1/threeML.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: threeML
-Version: 2.4.2.dev2
+Version: 2.4.3.dev1
 Summary: The Multi-Mission Maximum Likelihood framework
 Home-page: https://github.com/threeml/threeML
 Author: Giacomo Vianello

{threeml-2.4.2.dev2 → threeml-2.4.3.dev1}/versioneer.py

@@ -341,9 +341,9 @@ def get_config_from_root(root):
     # configparser.NoOptionError (if it lacks "VCS="). See the docstring at
     # the top of versioneer.py for instructions on writing your setup.cfg .
     setup_cfg = os.path.join(root, "setup.cfg")
-    parser = configparser.SafeConfigParser()
+    parser = configparser.ConfigParser()
     with open(setup_cfg, "r") as f:
-        parser.readfp(f)
+        parser.read_file(f)
     VCS = parser.get("versioneer", "VCS")  # mandatory
 
     def get(parser, name):