diff --git a/src/pyFAI/app/benchmark.py b/src/pyFAI/app/benchmark.py index 5eb192cc2..a837dab36 100755 --- a/src/pyFAI/app/benchmark.py +++ b/src/pyFAI/app/benchmark.py @@ -5,7 +5,7 @@ # https://github.com/silx-kit/pyFAI # # -# Copyright (C) 2012-2023 European Synchrotron Radiation Facility, Grenoble, France +# Copyright (C) 2012-2025 European Synchrotron Radiation Facility, Grenoble, France # # Authors: Jérôme Kieffer # @@ -32,7 +32,7 @@ __contact__ = "Jerome.Kieffer@ESRF.eu" __license__ = "MIT" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "08/11/2024" +__date__ = "29/01/2025" __status__ = "development" from argparse import ArgumentParser @@ -47,12 +47,6 @@ import hdf5plugin # noqa except ImportError: logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True) - -try: - from rfoo.utils import rconsole - rconsole.spawn_server() -except ImportError: - logger.debug("No socket opened for debugging. Please install rfoo") from .. import benchmark, version as pyFAI_version, date as pyFAI_date, logger as pyFAI_logger diff --git a/src/pyFAI/app/calib.py b/src/pyFAI/app/calib.py index 4fb997f8f..447e28911 100755 --- a/src/pyFAI/app/calib.py +++ b/src/pyFAI/app/calib.py @@ -4,7 +4,7 @@ # Project: Azimuthal integration # https://github.com/silx-kit/pyFAI # -# Copyright (C) 2012-2018 European Synchrotron Radiation Facility, Grenoble, France +# Copyright (C) 2012-2025 European Synchrotron Radiation Facility, Grenoble, France # # Principal author: Jérôme Kieffer (Jerome.Kieffer@ESRF.eu) # @@ -32,7 +32,7 @@ __contact__ = "Jerome.Kieffer@ESRF.eu" __license__ = "MIT" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "27/09/2024" +__date__ = "29/01/2025" __satus__ = "development" import logging @@ -43,13 +43,7 @@ import hdf5plugin # noqa except ImportError: logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True) - from ..gui.cli_calibration import Calibration -try: - from rfoo.utils import rconsole - rconsole.spawn_server() -except ImportError: - logger.debug("No socket opened for debugging. Please install rfoo") def main(args=None): diff --git a/src/pyFAI/app/calib2.py b/src/pyFAI/app/calib2.py index 128aec715..a864a85d1 100755 --- a/src/pyFAI/app/calib2.py +++ b/src/pyFAI/app/calib2.py @@ -4,7 +4,7 @@ # Project: Azimuthal integration # https://github.com/silx-kit/pyFAI # -# Copyright (C) 2017-2024 European Synchrotron Radiation Facility, Grenoble, France +# Copyright (C) 2017-2025 European Synchrotron Radiation Facility, Grenoble, France # # Principal author: Jérôme Kieffer (Jerome.Kieffer@ESRF.eu) # @@ -28,7 +28,7 @@ __contact__ = "valentin.valls@esrf.eu" __license__ = "MIT" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "19/03/2024" +__date__ = "29/01/2025" __status__ = "production" import os @@ -46,19 +46,12 @@ logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True) logger_uncaught = logging.getLogger("pyFAI-calib2.UNCAUGHT") - import pyFAI.resources import pyFAI.calibrant import pyFAI.detectors import pyFAI.io.image from pyFAI.io.ponifile import PoniFile -try: - from rfoo.utils import rconsole - rconsole.spawn_server() -except ImportError: - logger.debug("No socket opened for debugging. Please install rfoo") - def configure_parser_arguments(parser): # From AbstractCalibration diff --git a/src/pyFAI/app/integrate.py b/src/pyFAI/app/integrate.py index 57546bdff..d74782502 100755 --- a/src/pyFAI/app/integrate.py +++ b/src/pyFAI/app/integrate.py @@ -5,7 +5,7 @@ # https://github.com/silx-kit/pyFAI # # -# Copyright (C) 2013-2022 European Synchrotron Radiation Facility, Grenoble, France +# Copyright (C) 2013-2025 European Synchrotron Radiation Facility, Grenoble, France # # Principal author: Jérôme Kieffer (Jerome.Kieffer@ESRF.eu) # @@ -33,7 +33,7 @@ __contact__ = "Jerome.Kieffer@ESRF.eu" __license__ = "MIT" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "27/09/2024" +__date__ = "29/01/2025" __satus__ = "production" import sys @@ -51,22 +51,13 @@ import hdf5plugin # noqa except ImportError: logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True) - import fabio - from .. import utils, worker, io, version as pyFAI_version, date as pyFAI_date from ..io import DefaultAiWriter, HDF5Writer from ..utils.shell import ProgressBar from ..utils import logging_utils, header_utils from ..worker import Worker -try: - from rfoo.utils import rconsole - rconsole.spawn_server() - logger.debug("Socket opened for debugging using rfoo") -except ImportError: - logger.debug("No socket opened for debugging -> please install rfoo") - def integrate_gui(options, args): from silx.gui import qt diff --git a/src/pyFAI/app/mx_calibrate.py b/src/pyFAI/app/mx_calibrate.py index 1af717a6e..667785abb 100755 --- a/src/pyFAI/app/mx_calibrate.py +++ b/src/pyFAI/app/mx_calibrate.py @@ -4,7 +4,7 @@ # Project: Azimuthal integration # https://github.com/silx-kit/pyFAI # -# Copyright (C) 2013-2018 European Synchrotron Radiation Facility, Grenoble, France +# Copyright (C) 2013-2025 European Synchrotron Radiation Facility, Grenoble, France # # Principal author: Jérôme Kieffer (Jerome.Kieffer@ESRF.eu) # @@ -32,7 +32,7 @@ __contact__ = "Jerome.Kieffer@ESRF.eu" __license__ = "MIT" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "27/09/2024" +__date__ = "29/01/2025" __satus__ = "development" import logging @@ -46,12 +46,6 @@ from ..gui.cli_calibration import MultiCalib -try: - from rfoo.utils import rconsole - rconsole.spawn_server() -except ImportError: - logger.debug("No socket opened for debugging. Please install rfoo") - def main(args=None): c = MultiCalib() diff --git a/src/pyFAI/app/recalib.py b/src/pyFAI/app/recalib.py index 75c4bb14b..90b3df2a2 100755 --- a/src/pyFAI/app/recalib.py +++ b/src/pyFAI/app/recalib.py @@ -4,7 +4,7 @@ # Project: Azimuthal integration # https://github.com/silx-kit/pyFAI # -# Copyright (C) 2012-2018 European Synchrotron Radiation Facility, Grenoble, France +# Copyright (C) 2012-2025 European Synchrotron Radiation Facility, Grenoble, France # # Principal author: Jérôme Kieffer (Jerome.Kieffer@ESRF.eu) # @@ -32,7 +32,7 @@ __contact__ = "Jerome.Kieffer@ESRF.eu" __license__ = "MIT" __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France" -__date__ = "27/09/2024" +__date__ = "29/01/2024" __satus__ = "development" import logging @@ -45,11 +45,6 @@ logger.debug("Unable to load hdf5plugin, backtrace:", exc_info=True) from ..gui.cli_calibration import Recalibration -try: - from rfoo.utils import rconsole - rconsole.spawn_server() -except ImportError: - logger.debug("No socket opened for debugging -> install rfoo") def main(args=None):