Ruff: empty-comment (PLR2044)

Author: dominikatrojanowska

docs/conf.py

@@ -1,6 +1,3 @@
-#
-
-
 # Configuration file for the Sphinx documentation builder.
 #
 # For the full list of built-in configuration values, see the documentation:

mxcubecore/Command/Sardana.py

@@ -58,8 +58,6 @@
 except Exception:
     logging.getLogger("HWR").warning("Pytango is not available in this computer.")
 
-#
-
 try:
     import taurus
     from sardana.taurus.core.tango.sardana import registerExtensions

mxcubecore/HardwareObjects/CatsMaint.py

@@ -195,7 +195,6 @@ def init(self):
             {"type": "tango", "name": "_chnCurrentTool", "tangoname": self.tangoname},
             "Tool",
         )
-        #
         self._cmdPowerOn = self.add_command(
             {"type": "tango", "name": "_cmdPowerOn", "tangoname": self.tangoname},
             "powerOn",
@@ -791,7 +790,6 @@ def _execute_server_task(self, method, *args):
         return ret
 
     def send_command(self, cmd_name, args=None):
-        #
         lid = 1
         toolcal = 0
         tool = self.get_current_tool()

mxcubecore/HardwareObjects/Gphl/CollectEmulator.py

@@ -234,7 +234,6 @@ def _get_simcal_input(self, data_collect_parameters, crystal_data):
             result["sweep_list"] = sweep
         else:
             result["sweep_list"] = sweeps
-        #
         return result, compress_data
 
     @task
@@ -352,5 +351,4 @@ def set_ulimit():
         else:
             logging.getLogger("HWR").info("Simcal collection emulation successful")
         self.ready_event.set()
-        #
         return

mxcubecore/HardwareObjects/Gphl/GphlMessages.py

@@ -836,7 +836,6 @@ def get_motor_settings(self):
         translation = self.translation
         if translation is not None:
             result.update(translation.axisSettings)
-        #
         return result
 
 
@@ -1026,7 +1025,6 @@ def get_initial_settings(self):
         """Get dictionary of rotation and translation motor settings for start of sweep"""
         result = self.goniostatSweepSetting.get_motor_settings()
         result[self.goniostatSweepSetting.scanAxis] = self.start
-        #
         return result
 
 
@@ -1154,7 +1152,6 @@ def get_ordered_sweeps(self):
         for sweep in self._sweeps:
             dd0 = sweep.get_initial_settings()
             ll0.append((sweep.sweepGroup, tuple(dd0[x] for x in sorted(dd0)), sweep))
-        #
         return list(tt0[2] for tt0 in sorted(ll0))
 
 

mxcubecore/HardwareObjects/Gphl/GphlWorkflow.py

@@ -1,4 +1,4 @@
-# encoding: utf-8
+#  encoding: utf-8
 """Workflow runner, interfacing to external workflow engine
 using Abstract Beamline Interface messages
 
@@ -825,7 +825,6 @@ def query_pre_strategy_params(self, choose_lattice=None):
 
         # Convert energy field to a single tuple
         params["energies"] = (params.pop("energy"),)
-        #
         return params
 
     def pre_execute(self, queue_entry):
@@ -1494,7 +1493,6 @@ def query_collection_strategy(self, geometric_strategy):
 
         tag = "recentring_mode"
         result[tag] = RECENTRING_MODES.get(result.get(tag)) or default_recentring_mode
-        #
         return result
 
     def setup_data_collection(self, payload, correlation_id):
@@ -1867,7 +1865,6 @@ def setup_data_collection(self, payload, correlation_id):
                     + ", ".join("%s:%s" % item for item in sorted(settings.items()))
                 )
                 goniostatTranslations.append(translation)
-        #
         gphl_workflow_model.goniostat_translations = goniostatTranslations
 
         # Do it here so that any centring actions are enqueued dfirst
@@ -1967,7 +1964,6 @@ def calculate_recentring(self, okp, ref_okp, ref_xyz):
                         "%s position %s recentred to above maximum limit %s"
                         % (tag, val, limit)
                     )
-        #
         return result
 
     def collect_data(self, payload, correlation_id):
@@ -2049,7 +2045,6 @@ def collect_data(self, payload, correlation_id):
             acq_parameters.exp_time = scan.exposure.time
             acq_parameters.num_passes = 1
 
-            ##
             wavelength = sweep.beamSetting.wavelength
             acq_parameters.energy = HWR.beamline.energy.calculate_energy(wavelength)
             detdistance = sweep.detectorSetting.axisSettings["Distance"]
@@ -2455,7 +2450,7 @@ def parse_indexing_solution(self, choose_lattice):
 
         else:
             raise RuntimeError("Indexing format %s not supported" % indexing_format)
-        #
+
         return header, solutions_dict, select_row
 
     def process_centring_request(self, payload, correlation_id):
@@ -2471,7 +2466,6 @@ def process_centring_request(self, payload, correlation_id):
         # Rotate sample to RotationSetting
         goniostatRotation = request_centring.goniostatRotation
         goniostatTranslation = goniostatRotation.translation
-        #
 
         if self._data_collection_group is None:
             gphl_workflow_model = self._queue_entry.get_data_model()
@@ -2523,7 +2517,7 @@ def process_centring_request(self, payload, correlation_id):
             return_status = "DONE"
         else:
             return_status = "NEXT"
-        #
+
         return GphlMessages.CentringDone(
             return_status,
             timestamp=time.time(),
@@ -2651,7 +2645,7 @@ def obtain_prior_information(self, payload, correlation_id):
                 )
 
         priorInformation = GphlMessages.PriorInformation(workflow_model, image_root)
-        #
+
         return priorInformation
 
     def handle_collection_end(
@@ -2746,7 +2740,6 @@ def resolution2dose_budget(
         )
         decay_limit = decay_limit or self.config.settings.get("decay_limit", 25)
         result = 2 * resolution * resolution * math.log(100.0 / decay_limit)
-        #
         return min(result, max_budget) / relative_rad_sensitivity
 
     @staticmethod
@@ -2869,9 +2862,7 @@ def get_emulation_samples(self):
                             data[tag] = val
                         elif tag in dfp:
                             dfp[tag] = val
-                    #
                     result.append(data)
-        #
         return result
 
     def get_emulation_sample_dir(self, sample_name=None):
@@ -2900,7 +2891,6 @@ def get_emulation_sample_dir(self, sample_name=None):
             logging.getLogger("HWR").warning(
                 "No emulation sample dir found for sample %s", sample_name
             )
-        #
         return sample_dir
 
     def get_emulation_crystal_data(self, sample_name=None):
@@ -2927,7 +2917,6 @@ def get_emulation_crystal_data(self, sample_name=None):
             raise RuntimeError(
                 "No emulation data found for %s at %s " % (sample_name, sample_dir)
             )
-        #
         return crystal_data, hklfile
 
     #
@@ -3037,7 +3026,6 @@ def update_lattice(self, values):
             "point_groups": {"value": pgvalue, "enum": pglist},
             "space_group": {"value": sgvalue, "enum": sgoptions},
         }
-        #
         return result
 
     def update_point_groups(self, values):
@@ -3051,7 +3039,6 @@ def update_point_groups(self, values):
         result = {
             "space_group": {"value": value, "enum": sglist},
         }
-        #
         return result
 
     def update_space_group(self, values):
@@ -3075,7 +3062,6 @@ def update_space_group(self, values):
                     point_groups = crystal_class[:-1]
                 if point_groups != point_groups0:
                     result["point_groups"]["value"] = point_groups
-        #
         return result
 
     def update_indexing_solution(self, values):
@@ -3094,7 +3080,6 @@ def update_indexing_solution(self, values):
                 break
         else:
             result = {}
-        #
         return result
 
     def adjust_dose(self, values):
@@ -3217,7 +3202,6 @@ def adjust_transmission(self, values):
                     dd0 = result.setdefault("use_dose", {})
                     dd0["highlight"] = "OK"
                     result["dose_budget"] = {"highlight": "OK"}
-        #
         return result
 
 

mxcubecore/HardwareObjects/Gphl/GphlWorkflowConnection.py

@@ -181,15 +181,13 @@ def get_executable(self, name):
             result = os.path.join(
                 self.config.software_paths["GPHL_INSTALLATION"], "exe", name
             )
-        #
         return result
 
     def get_bdg_licence_dir(self, name):
         """Get directory containing specific licence file (if any)
         for program called 'name'"""
         tag = "co.gphl.wf.%s.bdg_licence_dir" % name
         result = self.config.software_paths.get(tag)
-        #
         return result
 
     def open_connection(self):
@@ -337,7 +335,7 @@ def start_workflow(self, workflow_queue, workflow_model_obj):
             command_list.extend(
                 conversion.command_option(keyword, value, quote_value=in_shell)
             )
-        #
+
         wdir = workflow_options.get("wdir")
         # NB this creates the appdir as well (wdir is within appdir)
         if not os.path.isdir(wdir):
@@ -660,7 +658,6 @@ def _decode_py4j_message(self, py4j_message):
                         "Processing of GΦL message %s not implemented", message_type
                     )
                     payload = None
-        #
         return GphlMessages.ParsedMessage(
             message_type, payload, enactment_id, correlation_id
         )
@@ -755,7 +752,6 @@ def __WorkflowDone_to_python(self, py4jWorkflowDone, cls):
             message = py4jIssue.getMessage()
             code = py4jIssue.getCode()
             issues.append(Issue(component=component, message=message, code=code))
-        #
         return cls(issues=issues)
 
     def _WorkflowCompleted_to_python(self, py4jWorkflowCompleted):
@@ -815,22 +811,19 @@ def _BeamstopSetting_to_python(self, py4jBeamstopSetting):
             return None
         uuidString = py4jBeamstopSetting.getId().toString()
         axisSettings = py4jBeamstopSetting.getAxisSettings()
-        #
         return GphlMessages.BeamstopSetting(id_=uuid.UUID(uuidString), **axisSettings)
 
     def _DetectorSetting_to_python(self, py4jDetectorSetting):
         if py4jDetectorSetting is None:
             return None
         uuidString = py4jDetectorSetting.getId().toString()
         axisSettings = py4jDetectorSetting.getAxisSettings()
-        #
         return GphlMessages.DetectorSetting(id_=uuid.UUID(uuidString), **axisSettings)
 
     def _BeamSetting_to_python(self, py4jBeamSetting):
         if py4jBeamSetting is None:
             return None
         uuidString = py4jBeamSetting.getId().toString()
-        #
         return GphlMessages.BeamSetting(
             id_=uuid.UUID(uuidString), wavelength=py4jBeamSetting.getWavelength()
         )
@@ -997,7 +990,6 @@ def _PriorInformation_to_java(self, priorInformation):
         buildr = buildr.userProvidedInfo(
             self._UserProvidedInfo_to_java(priorInformation.userProvidedInfo)
         )
-        #
         return buildr.build()
 
     def _SampleCentred_to_java(self, sampleCentred):
@@ -1024,7 +1016,6 @@ def _SampleCentred_to_java(self, sampleCentred):
             result.setGoniostatTranslations(
                 list(self._GoniostatTranslation_to_java(x) for x in translationSettings)
             )
-        #
         return result
 
     def _CollectionDone_to_java(self, collectionDone):
@@ -1083,7 +1074,6 @@ def _SelectedLattice_to_java(self, selectedLattice):
                 )
             elif urltpl:
                 builder = builder.referenceFile(urltpl.scheme, urltpl.path)
-        #
         return builder.build()
 
     def _IndexingSolution_to_java(self, indexingSolution):
@@ -1097,7 +1087,6 @@ def _IndexingSolution_to_java(self, indexingSolution):
             indexingSolution.qualityOfFit,
             cell,
         )
-        #
         return result
 
     def _BeamlineAbort_to_java(self, beamlineAbort):

mxcubecore/HardwareObjects/Gphl/Transcal2MiniKappa.py

@@ -85,7 +85,6 @@ def get_recen_data(transcal_file, instrumentation_file, diffractcal_file=None, *
     result["omega_axis"] = ll0[:3]
     result["kappa_axis"] = ll0[3:6]
     result["phi_axis"] = ll0[6:]
-    #
     return result
 
 
@@ -144,7 +143,6 @@ def make_minikappa_data(
     # NB the signs of CSOC are set to get consistency with Gleb values
     kappa_position = (home - cross_sec_of_soc).tolist()
     phi_position = (home + cross_sec_of_soc).tolist()
-    #
     return {
         "kappa_axis": kappa_axis,
         "phi_axis": phi_axis,

mxcubecore/HardwareObjects/LNLS/LNLSDiffractometer.py

@@ -187,7 +187,6 @@ def _get_random_centring_position(self):
                 if abs(val) > var_limit:
                     val *= 1 - var_range / var_limit
                 result[tag] = val
-        #
         return result
 
     def is_ready(self):

mxcubecore/HardwareObjects/MiniKappaCorrection.py

@@ -50,8 +50,8 @@ def rotation_matrix(self, axis, angle):
 
     def alignVector(self, t1, t2, kappa, phi):
         x = np.array(t1) - np.array(t2)  # rotating vector
-        Rk = self.rotation_matrix(self.kappa, -kappa)  #
-        Rp = self.rotation_matrix(self.phi, -phi)  #
+        Rk = self.rotation_matrix(self.kappa, -kappa)
+        Rp = self.rotation_matrix(self.phi, -phi)
         x = np.dot(Rp, np.dot(Rk, x)) / np.linalg.norm(
             x
         )  # rotate backwards and normalize