Merge pull request #2107 from kif/2106_gui

Display method in the proper order
silx-kit · Mar 20, 2024 · ecbf413 · ecbf413
2 parents 353398b + 8da0a58
commit ecbf413
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git 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-2018 European Synchrotron Radiation Facility, Grenoble, France
+#    Copyright (C) 2017-2024 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__ = "06/09/2023"
+__date__ = "19/03/2024"
 __status__ = "production"
 
 import os
@@ -185,9 +185,9 @@ def configure_parser_arguments(parser):
     parser.add_argument("--free-rot2", dest="fix_rot2",
                         help="free the rot2 parameter. Default: Activated", default=None, action="store_false")
     parser.add_argument("--fix-rot3", dest="fix_rot3",
-                        help="fix the rot3 parameter", default=None, action="store_true")
+                        help="fix the rot3 parameter. Default: Activated", default=True, action="store_true")
     parser.add_argument("--free-rot3", dest="fix_rot3",
-                        help="free the rot3 parameter. Default: Activated", default=None, action="store_false")
+                        help="free the rot3 parameter", default=True, action="store_false")
 
     parser.add_argument("--npt", dest="npt_1d",
                         help="Number of point in 1D integrated pattern, Default: 1024", type=int,

diff --git a/src/pyFAI/gui/helper/RingCalibration.py b/src/pyFAI/gui/helper/RingCalibration.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 # /*##########################################################################
 #
-# Copyright (C) 2016-2021 European Synchrotron Radiation Facility
+# Copyright (C) 2016-2024 European Synchrotron Radiation Facility
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
 
 __authors__ = ["V. Valls"]
 __license__ = "MIT"
-__date__ = "26/08/2021"
+__date__ = "19/03/2024"
 
 import logging
 import numpy
@@ -53,6 +53,7 @@ def __init__(self, *args, **kwargs):
         _logger.debug("GeometryRefinementContext.__init__")
         self.__geoRef = GeometryRefinement(*args, **kwargs)
         fixed = pyFAI.utils.FixedParameters()
+        fixed.add("rot3")
         fixed.add("wavelength")
         self.__fixed = fixed
 

diff --git a/src/pyFAI/gui/widgets/MethodLabel.py b/src/pyFAI/gui/widgets/MethodLabel.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 # /*##########################################################################
 #
-# Copyright (C) 2016-2018 European Synchrotron Radiation Facility
+# Copyright (C) 2016-2024 European Synchrotron Radiation Facility
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,7 @@
 
 __authors__ = ["V. Valls"]
 __license__ = "MIT"
-__date__ = "16/10/2020"
+__date__ = "19/03/2024"
 
 import logging
 _logger = logging.getLogger(__name__)
@@ -64,7 +64,7 @@ class MethodLabel(qt.QLabel):
     def __init__(self, parent=None):
         super(MethodLabel, self).__init__(parent)
         self.__method = None
-        self.__labelTemplate = "{split} / {impl} / {algo}"
+        self.__labelTemplate = "{split} / {algo} / {impl}"
         self.__availability = False
         self.__updateFeedback()