diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 28ba7f785c..a80f7b677f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,20 +10,7 @@ repos: rev: v5.0.0 hooks: - id: trailing-whitespace - # Exclude files from trailing-whitespace checks until we get around fixing them. - # This way we can check that other files are trailing-whitespace clean in CI. - exclude: | - (?x)^( - mxcubecore/configuration/.*| - mxcubecore/HardwareObjects/(PlateManipulatorMaintenance|TangoMotor)\.py| - mxcubecore/HardwareObjects/DESY/P11(BackLight|Collect|DetectorCover|Shutter)\.py| - mxcubecore/HardwareObjects/LNLS/LNLS(Diffractometer|Energy|PilatusDet)\.py| - mxcubecore/HardwareObjects/LNLS/EPICS(Actuator|Motor|NState)\.py| - mxcubecore/HardwareObjects/LNLS/set_transmission_mnc.py| - mxcubecore/HardwareObjects/EMBL/EMBL(Energy|OnlineProcessing)\.py| - mxcubecore/HardwareObjects/mockup/MotorMockup\.py| - mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Resolution\.py| - )$ + exclude: \.(hkli|nml|XDS)$ - id: end-of-file-fixer exclude: \.(hkli|nml)$ - id: check-case-conflict diff --git a/mxcubecore/HardwareObjects/DESY/P11BackLight.py b/mxcubecore/HardwareObjects/DESY/P11BackLight.py index 4bc7f5c0ea..56eabd25fa 100644 --- a/mxcubecore/HardwareObjects/DESY/P11BackLight.py +++ b/mxcubecore/HardwareObjects/DESY/P11BackLight.py @@ -114,7 +114,7 @@ def _set_value(self, value): self.cmd_started = time.time() def update_light_state(self, value=None): - """Updates light state + """Updates light state :return: light state as str """ diff --git a/mxcubecore/HardwareObjects/DESY/P11Collect.py b/mxcubecore/HardwareObjects/DESY/P11Collect.py index baecd5622c..30ef18e6f3 100644 --- a/mxcubecore/HardwareObjects/DESY/P11Collect.py +++ b/mxcubecore/HardwareObjects/DESY/P11Collect.py @@ -863,7 +863,7 @@ def get_filter_transmission(self): def xdsapp_maxwell(self): """Starts XDSAPP auto-processing on the Maxwell cluster.""" - + if HWR.beamline.session.get_beamtime_metadata() != None: self.log.debug("==== XDSAPP AUTOPROCESSING IS STARTED ==========") @@ -933,7 +933,7 @@ def xdsapp_maxwell(self): def autoproc_maxwell(self): """Starts AutoProc auto-processing on the Maxwell cluster.""" - + if HWR.beamline.session.get_beamtime_metadata() != None: self.log.debug("==== AUTOPROC AUTOPROCESSING IS STARTED ==========") diff --git a/mxcubecore/HardwareObjects/DESY/P11DetectorCover.py b/mxcubecore/HardwareObjects/DESY/P11DetectorCover.py index 04a3e4900a..518126f13d 100644 --- a/mxcubecore/HardwareObjects/DESY/P11DetectorCover.py +++ b/mxcubecore/HardwareObjects/DESY/P11DetectorCover.py @@ -167,7 +167,7 @@ def state_closed_changed(self, value): self.update_cover_state() def update_cover_state(self): - """Updates cover state + """Updates cover state :return: cover state as str """ diff --git a/mxcubecore/HardwareObjects/DESY/P11Shutter.py b/mxcubecore/HardwareObjects/DESY/P11Shutter.py index 40e88ac917..be76aefc22 100644 --- a/mxcubecore/HardwareObjects/DESY/P11Shutter.py +++ b/mxcubecore/HardwareObjects/DESY/P11Shutter.py @@ -159,7 +159,7 @@ def do_finish_exc(self, exc=None): self.log.debug("### simulated finished with exception") def update_shutter_state(self, state=None): - """Updates shutter state + """Updates shutter state :return: shutter state as str """ diff --git a/mxcubecore/HardwareObjects/EMBL/EMBLEnergy.py b/mxcubecore/HardwareObjects/EMBL/EMBLEnergy.py index e9190d10a7..062f794ba4 100644 --- a/mxcubecore/HardwareObjects/EMBL/EMBLEnergy.py +++ b/mxcubecore/HardwareObjects/EMBL/EMBLEnergy.py @@ -288,7 +288,7 @@ def energy_position_changed(self, pos): pos = pos[0] value = pos / 1000 - if self._nominal_value is None or abs(value - self._nominal_value) > 1e-3: + if self._nominal_value is None or abs(value - self._nominal_value) > 1e-3: self.update_value(value) def energy_limits_changed(self, limits): diff --git a/mxcubecore/HardwareObjects/EMBL/EMBLOnlineProcessing.py b/mxcubecore/HardwareObjects/EMBL/EMBLOnlineProcessing.py index 9906c0572f..429e25b91e 100644 --- a/mxcubecore/HardwareObjects/EMBL/EMBLOnlineProcessing.py +++ b/mxcubecore/HardwareObjects/EMBL/EMBLOnlineProcessing.py @@ -492,7 +492,7 @@ def finish_processing(self): self.all_frames_dozor_is = False self.all_frames_batch_processed = False self.is_count = 0 - self.batch_count = 0 + self.batch_count = 0 def dozor_average_i_changed(self, average_i_value): if self.started: @@ -730,7 +730,7 @@ def start_crystfel_autoproc_launchjob(self, proc_params, all_file_filename): acq_params = self.data_collection.acquisitions[0].acquisition_parameters sample_basename = self.params_dict["template"].split("/")[-1].split("_%d_%0")[0] - # stream_filename = sample_basename + "_crystfel_xgandalf.stream" + # stream_filename = sample_basename + "_crystfel_xgandalf.stream" stream_filename = sample_basename + cell_name_tag + "_crystfel.stream" geom_filename = "crystfel_detector.geom" cell_filename = "crystfel_cell" + cell_name_tag + ".cell" diff --git a/mxcubecore/HardwareObjects/LNLS/EPICSActuator.py b/mxcubecore/HardwareObjects/LNLS/EPICSActuator.py index 78528b90da..979f9a5f60 100644 --- a/mxcubecore/HardwareObjects/LNLS/EPICSActuator.py +++ b/mxcubecore/HardwareObjects/LNLS/EPICSActuator.py @@ -73,7 +73,7 @@ def abort(self): if self.__wait_actuator_task is not None: self.__wait_actuator_task.kill() self.update_state(self.STATES.READY) - + def _set_value(self, value): """ Override AbstractActuator method.""" self.set_channel_value(self.ACTUATOR_VAL, value) diff --git a/mxcubecore/HardwareObjects/LNLS/EPICSMotor.py b/mxcubecore/HardwareObjects/LNLS/EPICSMotor.py index 1a70c6712b..3f531bb61c 100644 --- a/mxcubecore/HardwareObjects/LNLS/EPICSMotor.py +++ b/mxcubecore/HardwareObjects/LNLS/EPICSMotor.py @@ -50,7 +50,7 @@ def init(self): self.get_velocity() self.__watch_task = gevent.spawn(self._watch) self.update_state(self.STATES.READY) - + def _watch(self): """ Watch motor current value and update it on the UI.""" while True: @@ -85,7 +85,7 @@ def get_limits(self): if self._nominal_limits in [(0, 0), (float('-inf'), float('inf'))]: # Treat infinite limits self._nominal_limits = (None, None) - + logging.getLogger("HWR").info('Motor %s limits: %s' % (self.motor_name, self._nominal_limits)) return self._nominal_limits @@ -97,7 +97,7 @@ def get_velocity(self): def set_velocity(self, value): """Override AbstractMotor method.""" self.__velocity = self.set_channel_value(self.MOTOR_VELO, value) - + def done_movement(self): """ Return whether motor finished movement or not.""" dmov = self.get_channel_value(self.MOTOR_DMOV) diff --git a/mxcubecore/HardwareObjects/LNLS/EPICSNState.py b/mxcubecore/HardwareObjects/LNLS/EPICSNState.py index 4851b5eb4c..3d31839f81 100644 --- a/mxcubecore/HardwareObjects/LNLS/EPICSNState.py +++ b/mxcubecore/HardwareObjects/LNLS/EPICSNState.py @@ -69,7 +69,7 @@ def valueChanged(self, value): self.set_value(enum_val) self.actuatorState = self.states.get(value, "unknown") self.emit("actuatorStateChanged", (self.actuatorState,)) - + def actuatorIn(self, wait=True, timeout=None): try: self.state_attr = self.moves["in"] diff --git a/mxcubecore/HardwareObjects/LNLS/LNLSDiffractometer.py b/mxcubecore/HardwareObjects/LNLS/LNLSDiffractometer.py index 184836301c..d7afead56a 100644 --- a/mxcubecore/HardwareObjects/LNLS/LNLSDiffractometer.py +++ b/mxcubecore/HardwareObjects/LNLS/LNLSDiffractometer.py @@ -358,7 +358,7 @@ def calculate_move_to_beam_pos(self, x, y): if y <= (- x + 1152): dir_goniox = 1 else: - dir_goniox = -1 + dir_goniox = -1 move_goniox = dir_goniox * drx_goniox # mm to move move_goniox = move_goniox / self.pixels_per_mm_x diff --git a/mxcubecore/HardwareObjects/LNLS/LNLSEnergy.py b/mxcubecore/HardwareObjects/LNLS/LNLSEnergy.py index 604e1490e4..279d96ef52 100644 --- a/mxcubecore/HardwareObjects/LNLS/LNLSEnergy.py +++ b/mxcubecore/HardwareObjects/LNLS/LNLSEnergy.py @@ -48,13 +48,13 @@ def get_value(self): #if abs(self._nominal_value - value) < 0.001: # logging.getLogger("HWR").info("Pilatus threshold is still okay.") # return value - + threshold_ok = self.check_threshold_energy(value) if threshold_ok: self._nominal_value = value else: value = None # Invalid energy because threshold is invalid - + return value def check_threshold_energy(self, energy): diff --git a/mxcubecore/HardwareObjects/LNLS/LNLSPilatusDet.py b/mxcubecore/HardwareObjects/LNLS/LNLSPilatusDet.py index 6b0f6ad14e..ee02396289 100644 --- a/mxcubecore/HardwareObjects/LNLS/LNLSPilatusDet.py +++ b/mxcubecore/HardwareObjects/LNLS/LNLSPilatusDet.py @@ -192,13 +192,13 @@ def set_wavelength(self, wavelength): # "Pilatus wavelength still okay." # ) # return True - + # As the set of Pilatus wavelength, det dist and beam xy is fast, # there is no need to compare the target value with the current one. logging.getLogger("HWR").info("Setting Pilatus wavelength...") self.set_channel_value(self.DET_WAVELENGTH, wavelength) time.sleep(0.6) - + print('WAVELENGHT WAS SET: ' + str(wavelength)) self.wavelength = self.get_wavelength() print('WAVELENGHT GOT: ' + str(self.wavelength)) @@ -277,7 +277,7 @@ def set_beam_x(self, from_user=False, beam_x=None): """ Set detector beam_x and returns whether it was successful or not. - Beam X value can come from different sources. The priority (from + Beam X value can come from different sources. The priority (from high to low) is: * from_user * beam_x argument @@ -339,7 +339,7 @@ def set_beam_y(self, from_user=False, beam_y=None): """ Set detector beam_y and returns whether it was successful or not. - Beam Y value can come from different sources. The priority (from + Beam Y value can come from different sources. The priority (from high to low) is: * from_user * beam_y argument @@ -380,7 +380,7 @@ def set_beam_y(self, from_user=False, beam_y=None): "Error while setting Pilatus beam Y. Please, check the detector." ) return False - + def get_transmission(self): """ Returns: @@ -417,7 +417,7 @@ def set_transmission(self, transmission): "Error while setting Pilatus transmission. Please, check the detector." ) return False - + def get_start_angle(self): """ Returns: @@ -454,7 +454,7 @@ def set_start_angle(self, start_angle): "Error while setting Pilatus start angle. Please, check the detector." ) return False - + def get_angle_incr(self): """ Returns: diff --git a/mxcubecore/HardwareObjects/LNLS/set_transmission_mnc.py b/mxcubecore/HardwareObjects/LNLS/set_transmission_mnc.py index 21eb4a0a87..0a53c6f91b 100755 --- a/mxcubecore/HardwareObjects/LNLS/set_transmission_mnc.py +++ b/mxcubecore/HardwareObjects/LNLS/set_transmission_mnc.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- - + """Transmission control for MANACA. Attenuator: ABS-300-12-C-DN-DN40 Flanges. Foils: #1, 8 um Al; @@ -37,7 +37,7 @@ def read_input(): def get_transmission(energy, transmission): transmission = transmission/100 - # Expressions (interpolation) for calculations of MU (linear attenuation coeficient [cm^-1]) for each material in function of the beam energy. + # Expressions (interpolation) for calculations of MU (linear attenuation coeficient [cm^-1]) for each material in function of the beam energy. # The data used to obtain the expressions (curve fitting) are from "https://physics.nist.gov/PhysRefData/FFast/html/form.html" # This attenuation coeficients can be verified and optimised after experimental validation at the beamline. MU_Al = (78657.01011 * math.exp(-energy/0.65969)) + (6406.36151 * math.exp(-energy/1.63268)) + (492.29999 * math.exp(-energy/4.42554)) + (3.2588) @@ -47,7 +47,7 @@ def get_transmission(energy, transmission): MU_Zr = (11143.28458 * math.exp(-energy/5.87029)) + (102.27474) MU_EMPTY = 0.0 # Foils in ABS-attenuator. The dictionary gives the foil position and material in the key (e.g. 'F1_Al', position 1 occuped by an aluminium foil), - # and the thickness [um] in the value. The list gives the positions and materials, similar to the dictionary, and it is used in the combination. + # and the thickness [um] in the value. The list gives the positions and materials, similar to the dictionary, and it is used in the combination. foils_dict = {'F0_EMPTY':0, 'F1_Al':8, 'F2_Al':10, 'F3_Al':20, 'F4_Al':80, 'F5_Al':160, 'F6_Al':320, 'F7_Al':800, 'F8_Al':1500, 'F9_Ti':8, 'F10_Cu':10, 'F11_Au':5, 'F12_Zr':25} @@ -64,10 +64,10 @@ def get_transmission(energy, transmission): attenuator_position = attenuator_position[0:12] elif energy >= 18.5: attenuator_position = attenuator_position[0:13] - + foils_comb = [] atten_coef_sum = [] - + # calculate the all possible unique combinations for i in range(1, len(attenuator_position)+1): product = itertools.combinations(attenuator_position, i) @@ -75,7 +75,7 @@ def get_transmission(energy, transmission): foils_comb.append(list(item)) # calculate the product of MU (cm^-1) * thickness (cm) for each material (MU * d) # and sum the products to obtain the total (final) attenuation for each possible combination. - # and put the results (total attenuation) in a list. + # and put the results (total attenuation) in a list. comb_sum = [] for item in foils_comb: comb_tmp = [] @@ -114,11 +114,11 @@ def get_transmission(energy, transmission): def set_foils(filter_combination): - + # declare a list with available foils and a dictionary with epics PV class (FOIL ACT, FOIL IN, FOIL OUT) for each foil attenuator_position = ['F1_Al', 'F2_Al', 'F3_Al', 'F4_Al', 'F5_Al', 'F6_Al', 'F7_Al', 'F8_Al', 'F9_Ti', 'F10_Cu', 'F11_Au', 'F12_Zr'] - + foils_pv = {'F1_Al':(PV('MNC:B:RIO01:9474C:bo0'), PV('MNC:B:RIO01:9425A:bi11'), PV('MNC:B:RIO01:9425A:bi12')), 'F2_Al':(PV('MNC:B:RIO01:9474C:bo1'), PV('MNC:B:RIO01:9425A:bi10'), PV('MNC:B:RIO01:9425A:bi13')), 'F3_Al':(PV('MNC:B:RIO01:9474C:bo2'), PV('MNC:B:RIO01:9425A:bi9'), PV('MNC:B:RIO01:9425A:bi14')), @@ -133,9 +133,9 @@ def set_foils(filter_combination): 'F12_Zr':(PV('MNC:B:RIO01:9474D:bo3'), PV('MNC:B:RIO01:9425A:bi0'), PV('MNC:B:RIO01:9425A:bi23'))} # setup the foils: check foil status, put the foils in the 'filter_combination' and remove the others - + wt = 0.1 - + # the commented lines bellow works for the attenuator expected logic (0 for foil out and 1 for foil in). # as the current logic is inverted (1 is foil out and 0 is foil in) use the uncommented lines. @@ -166,7 +166,7 @@ def set_foils(filter_combination): elif foils_pv[foil][1].get() == foils_pv[foil][2].get(): status = 1 break - + return status @@ -176,7 +176,7 @@ def main(): transmission_setup = get_transmission(energy, transmission) # transmission required by the user user_transmission = transmission_setup[0] * 100 - # real transmission got with calculated foil combination + # real transmission got with calculated foil combination actual_transmission = round(transmission_setup[1] * 100, 2) # calculated foil combination to get the required transmission filter_combination = transmission_setup[2] diff --git a/mxcubecore/HardwareObjects/PlateManipulatorMaintenance.py b/mxcubecore/HardwareObjects/PlateManipulatorMaintenance.py index 9eb71080b0..bab3e05269 100644 --- a/mxcubecore/HardwareObjects/PlateManipulatorMaintenance.py +++ b/mxcubecore/HardwareObjects/PlateManipulatorMaintenance.py @@ -15,7 +15,7 @@ class PlateManipulatorMaintenance(HardwareObject): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - + def init(self): self._sc = self.get_object_by_role("sample_changer") self._scan_limits = '' @@ -28,7 +28,7 @@ def _do_abort(self): :rtype: None """ return self._sc._do_abort() - + def _move_to_crystal_position(self, args): """ command to move MD head to x, y crystal position @@ -38,7 +38,7 @@ def _move_to_crystal_position(self, args): :rtype: None """ return self._sc.move_to_crystal_position(args) - + def _do_change_mode(self, args): self._sc._do_change_mode(args) @@ -66,7 +66,7 @@ def _get_scan_limits(self, args): def _update_global_state(self): state_dict, cmd_state, message = self.get_global_state() self.emit("globalStateChanged", (state_dict, cmd_state, message)) - + def get_global_state(self): """ """ @@ -90,7 +90,7 @@ def get_global_state(self): return state_dict, cmd_state, message - + def get_cmd_info(self): """ return information about existing commands for this object @@ -121,5 +121,5 @@ def send_command(self, cmdname, args=None): if cmdname == "setPlateBarcode": self.set_plate_barcode(args) # if cmdname == "change_mode": - # self._do_change_mode(args) + # self._do_change_mode(args) return True diff --git a/mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Resolution.py b/mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Resolution.py index 252a17280c..973b38c882 100644 --- a/mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Resolution.py +++ b/mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Resolution.py @@ -12,7 +12,7 @@ def __init__(self, name): super(PX2Resolution, self).__init__(name) self.resolution_motor = resolution() self.beam_center = beam_center() - + def connect_notify(self, signal): if signal == "stateChanged": self.update_state(self.get_state()) @@ -20,7 +20,7 @@ def connect_notify(self, signal): def get_value(self): self._nominal_value = self.resolution_motor.get_resolution() return self._nominal_value - + def _set_value(self, value): self.resolution_motor.set_resolution(value) diff --git a/mxcubecore/HardwareObjects/TangoMotor.py b/mxcubecore/HardwareObjects/TangoMotor.py index 73ea920bfc..f68a2a1bfe 100644 --- a/mxcubecore/HardwareObjects/TangoMotor.py +++ b/mxcubecore/HardwareObjects/TangoMotor.py @@ -224,12 +224,12 @@ def _update_state(self): motor_state = self.chan_state.get_value() self.log.debug(" reading motor state for %s is %s" % (self.name(), str(motor_state))) self.motor_state_changed(motor_state) - + def update_value(self, value=None): """Updates motor position""" if value is None: value = self.get_value() - self.latest_value = value + self.latest_value = value super(TangoMotor, self).update_value(value) def get_motor_mnemonic(self): diff --git a/mxcubecore/HardwareObjects/mockup/MotorMockup.py b/mxcubecore/HardwareObjects/mockup/MotorMockup.py index c75cf6bd1c..e80f21c338 100644 --- a/mxcubecore/HardwareObjects/mockup/MotorMockup.py +++ b/mxcubecore/HardwareObjects/mockup/MotorMockup.py @@ -121,6 +121,6 @@ def _move(self, value): self.update_specific_state(None) return value - + def is_moving(self): return ( (self.get_state() == self.STATES.BUSY ) or (self.get_state() == self.SPECIFIC_STATES.MOVING)) diff --git a/mxcubecore/configuration/alba_xaloc13/auto-processing.xml b/mxcubecore/configuration/alba_xaloc13/auto-processing.xml index 507cfb602b..518f20067d 100755 --- a/mxcubecore/configuration/alba_xaloc13/auto-processing.xml +++ b/mxcubecore/configuration/alba_xaloc13/auto-processing.xml @@ -2,5 +2,5 @@ /beamlines/bl13/commissioning/templates bl13/ct/variables - + diff --git a/mxcubecore/configuration/alba_xaloc13/beam-info.xml b/mxcubecore/configuration/alba_xaloc13/beam-info.xml index b0705604e1..dc8b859142 100755 --- a/mxcubecore/configuration/alba_xaloc13/beam-info.xml +++ b/mxcubecore/configuration/alba_xaloc13/beam-info.xml @@ -1,11 +1,11 @@ bl13/ct/variables - + ImageCenterX ImageCenterY BeamWidth BeamHeight - + 230.0 150.0 diff --git a/mxcubecore/configuration/alba_xaloc13/beamline-setup.xml b/mxcubecore/configuration/alba_xaloc13/beamline-setup.xml index 4ea03efd3c..3ca3f14849 100755 --- a/mxcubecore/configuration/alba_xaloc13/beamline-setup.xml +++ b/mxcubecore/configuration/alba_xaloc13/beamline-setup.xml @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/mxcubecore/configuration/alba_xaloc13/cats.xml b/mxcubecore/configuration/alba_xaloc13/cats.xml index c9d54f5c5a..d4899ba256 100755 --- a/mxcubecore/configuration/alba_xaloc13/cats.xml +++ b/mxcubecore/configuration/alba_xaloc13/cats.xml @@ -1,7 +1,7 @@ Cats - bl13/eh/cats + bl13/eh/cats 3 @@ -11,7 +11,7 @@ False 5 - + True MountingPosition diff --git a/mxcubecore/configuration/alba_xaloc13/catsmaint.xml b/mxcubecore/configuration/alba_xaloc13/catsmaint.xml index 0446153bfb..3b3520f915 100755 --- a/mxcubecore/configuration/alba_xaloc13/catsmaint.xml +++ b/mxcubecore/configuration/alba_xaloc13/catsmaint.xml @@ -1,7 +1,7 @@ CatsMaint - bl13/eh/cats - + bl13/eh/cats + MountingPosition diff --git a/mxcubecore/configuration/alba_xaloc13/data-analysis.xml b/mxcubecore/configuration/alba_xaloc13/data-analysis.xml index 2e74740fc7..467bd5c8cf 100755 --- a/mxcubecore/configuration/alba_xaloc13/data-analysis.xml +++ b/mxcubecore/configuration/alba_xaloc13/data-analysis.xml @@ -10,5 +10,5 @@ /beamlines/bl13/commissioning/templates bl13/ct/variables - + diff --git a/mxcubecore/configuration/alba_xaloc13/gphl_beamline_config/filenametemplates.xml b/mxcubecore/configuration/alba_xaloc13/gphl_beamline_config/filenametemplates.xml index 6825c1825d..e782c734c7 100644 --- a/mxcubecore/configuration/alba_xaloc13/gphl_beamline_config/filenametemplates.xml +++ b/mxcubecore/configuration/alba_xaloc13/gphl_beamline_config/filenametemplates.xml @@ -10,33 +10,33 @@ Refer to the TemplateElementTypes class diagram. The following restrictions must be adhered to: (1) The root element MUST be - + - + It MUST be called "xml-fragment" and it MUST assign the prefix "xsi" to the standard XML Schema instance namespace. It also must also declare namespaces for all the types that are used: those take the form of the relative path in the data model only. The prefix "tag:globalphasing.com,YYYY-MM-DD:schemata:" will be added when this file is read. - + (2) XML elements within the top-level elements MUST follow the order of their declaration in the UML data model (elements corresponding to inherited properties come before locally-defined ones). XML elements whose values are absent (allowed where the property's lower bound is 0) should be omitted, not given null or empty values. - + (3) Each contained within a element MUST contain a "xsi:type" attribute. The localname of the value of this attribute MUST be the unqualified name of one of the non-abstract subtypes of Types::TemplateElementTypes::NameTemplateElement. - + (4) Elements that are direct children of the document root: - + (i) MUST contain the appropriate xsi:type attribute (ii) may be called anything, but the recommended name is the same as the value of the xsi:type attribute with the first letter of the local part lower cased. - + In the future, a proper XSD type for the root element of this file may be defined: when this happens the xsi:type attribute will become unnecessary, and the element name will be used for @@ -53,23 +53,23 @@ The following restrictions must be adhered to: GDA - + 43 prefix string - + _ - + 2 run unsignedInt - + _ @@ -152,7 +152,7 @@ The following restrictions must be adhered to: beam_setting_index unsignedInt - + _ @@ -162,7 +162,7 @@ The following restrictions must be adhered to: run_number unsignedInt - + _ @@ -211,7 +211,7 @@ The following restrictions must be adhered to: beam_setting_index unsignedInt - + 1 inverse_beam_component_sign @@ -227,7 +227,7 @@ The following restrictions must be adhered to: run_number unsignedInt - + _ @@ -281,7 +281,7 @@ The following restrictions must be adhered to: run_number unsignedInt - + _ @@ -299,79 +299,79 @@ The following restrictions must be adhered to: - + prefix 0 6 - + run 7 8 - + interleaved GDA - + - + prefix 0 7 - + run 8 9 - + ib_interleaved GDA - + - + prefix 0 1 - + run 2 3 - + generic GDA - + - + prefix 0 4 - + run 5 6 - + multiorientation GDA - + diff --git a/mxcubecore/configuration/alba_xaloc13/gphl_beamline_config/transcal_2stage.json b/mxcubecore/configuration/alba_xaloc13/gphl_beamline_config/transcal_2stage.json index 82ad6dd1ed..135d92a5ae 100644 --- a/mxcubecore/configuration/alba_xaloc13/gphl_beamline_config/transcal_2stage.json +++ b/mxcubecore/configuration/alba_xaloc13/gphl_beamline_config/transcal_2stage.json @@ -1,5 +1,5 @@ [ - { + { "#": "Settings for running TransCal on a mini-Kappa (short protocol, without SOC)", "settings": [ 0, 0, 0, @@ -13,10 +13,10 @@ "noRefineSOC": true, "useRecen": false }, - + { "#": "Settings for running TransCal on a mini-Kappa (medium-length protocol)", - + "settings": [ 0.00, 0.00, -90.00, 0.00, 0.00, -45.00, diff --git a/mxcubecore/configuration/alba_xaloc13/limavideo.xml b/mxcubecore/configuration/alba_xaloc13/limavideo.xml index 1753c55030..d2ff62765b 100755 --- a/mxcubecore/configuration/alba_xaloc13/limavideo.xml +++ b/mxcubecore/configuration/alba_xaloc13/limavideo.xml @@ -6,7 +6,7 @@
84.89.227.72
- bl13/eh/basler_oav + bl13/eh/basler_oav 0.24 1 diff --git a/mxcubecore/configuration/alba_xaloc13/mini-diff.xml b/mxcubecore/configuration/alba_xaloc13/mini-diff.xml index b470585d56..256b6b5cbe 100755 --- a/mxcubecore/configuration/alba_xaloc13/mini-diff.xml +++ b/mxcubecore/configuration/alba_xaloc13/mini-diff.xml @@ -1,5 +1,5 @@ - + bl13/eh/diff @@ -27,7 +27,7 @@ - + True diff --git a/mxcubecore/configuration/alba_xaloc13/queue-model.xml b/mxcubecore/configuration/alba_xaloc13/queue-model.xml index b59b28a9bd..a028f73517 100755 --- a/mxcubecore/configuration/alba_xaloc13/queue-model.xml +++ b/mxcubecore/configuration/alba_xaloc13/queue-model.xml @@ -1,7 +1,7 @@ - - - diff --git a/mxcubecore/configuration/alba_xaloc13/session.xml b/mxcubecore/configuration/alba_xaloc13/session.xml index cf60be3672..427d620049 100755 --- a/mxcubecore/configuration/alba_xaloc13/session.xml +++ b/mxcubecore/configuration/alba_xaloc13/session.xml @@ -1,4 +1,4 @@ - + diff --git a/mxcubecore/configuration/alba_xaloc13/xml-rpc-server.xml b/mxcubecore/configuration/alba_xaloc13/xml-rpc-server.xml index 3555534309..7db1bd06f5 100755 --- a/mxcubecore/configuration/alba_xaloc13/xml-rpc-server.xml +++ b/mxcubecore/configuration/alba_xaloc13/xml-rpc-server.xml @@ -3,7 +3,7 @@ - + True diff --git a/mxcubecore/configuration/desy_p11/Qt4_graphics-manager.xml b/mxcubecore/configuration/desy_p11/Qt4_graphics-manager.xml index 65284a3511..adff5af41e 100644 --- a/mxcubecore/configuration/desy_p11/Qt4_graphics-manager.xml +++ b/mxcubecore/configuration/desy_p11/Qt4_graphics-manager.xml @@ -3,7 +3,7 @@ - @@ -12,7 +12,7 @@ - (1, 1.5, 2, 2.5, 3, 4, 5) + (1, 1.5, 2, 2.5, 3, 4, 5) diff --git a/mxcubecore/configuration/desy_p11/_Qt4_video-mockup.xml b/mxcubecore/configuration/desy_p11/_Qt4_video-mockup.xml index 427b6153bd..d29cd95ea0 100644 --- a/mxcubecore/configuration/desy_p11/_Qt4_video-mockup.xml +++ b/mxcubecore/configuration/desy_p11/_Qt4_video-mockup.xml @@ -1,3 +1,3 @@ - - 1 + + 1 diff --git a/mxcubecore/configuration/desy_p11/auto-processing-mockup.xml b/mxcubecore/configuration/desy_p11/auto-processing-mockup.xml index 041246dee3..6975dcd014 100644 --- a/mxcubecore/configuration/desy_p11/auto-processing-mockup.xml +++ b/mxcubecore/configuration/desy_p11/auto-processing-mockup.xml @@ -3,7 +3,7 @@ Each autoprocessing program is executable script. Script is stored and executed when the event is called - remove Break to run actual script + remove Break to run actual script --> diff --git a/mxcubecore/configuration/desy_p11/beamline-setup.xml b/mxcubecore/configuration/desy_p11/beamline-setup.xml index 566779445d..29e89d967b 100644 --- a/mxcubecore/configuration/desy_p11/beamline-setup.xml +++ b/mxcubecore/configuration/desy_p11/beamline-setup.xml @@ -6,7 +6,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/mxcubecore/configuration/desy_p11/beamline-test.xml b/mxcubecore/configuration/desy_p11/beamline-test.xml index d607650441..5844fd1397 100644 --- a/mxcubecore/configuration/desy_p11/beamline-test.xml +++ b/mxcubecore/configuration/desy_p11/beamline-test.xml @@ -1,5 +1,5 @@ - + ["example_one", "example_two"] ["example_one"] diff --git a/mxcubecore/configuration/desy_p11/cats.xml b/mxcubecore/configuration/desy_p11/cats.xml index b75c1a68b7..3b4298fc51 100644 --- a/mxcubecore/configuration/desy_p11/cats.xml +++ b/mxcubecore/configuration/desy_p11/cats.xml @@ -1,11 +1,11 @@ Cats - bl141/cats/1 + bl141/cats/1 3 - + State - + abort di_Cassette1Presence diff --git a/mxcubecore/configuration/desy_p11/catsmaint.xml b/mxcubecore/configuration/desy_p11/catsmaint.xml index 37ccce5949..6c5d120454 100644 --- a/mxcubecore/configuration/desy_p11/catsmaint.xml +++ b/mxcubecore/configuration/desy_p11/catsmaint.xml @@ -1,7 +1,7 @@ CatsMaint - bl141/cats/1 - + bl141/cats/1 + reset back safe diff --git a/mxcubecore/configuration/desy_p11/centring-math.xml b/mxcubecore/configuration/desy_p11/centring-math.xml index a628253afe..45277ed5eb 100644 --- a/mxcubecore/configuration/desy_p11/centring-math.xml +++ b/mxcubecore/configuration/desy_p11/centring-math.xml @@ -1,13 +1,13 @@ + --> phiy [0, 1, 0] translation - /eh1/diff-phiy + /eh1/diff-phiy @@ -15,7 +15,7 @@ phiz [1, 0, 0] translation - /eh1/diff-phiz + /eh1/diff-phiz [0, -1, 0] rotation - /eh1/diff-omega + /eh1/diff-omega - + sampx [-0.281085, 0, 0.959683] translation - /eh1/diff-sampx + /eh1/diff-sampx sampy [0.959683, 0, 0.281085 ] translation - /eh1/diff-sampy + /eh1/diff-sampy diff --git a/mxcubecore/configuration/desy_p11/lims-client-mockup.xml b/mxcubecore/configuration/desy_p11/lims-client-mockup.xml index bc86b85f68..fb3c787460 100644 --- a/mxcubecore/configuration/desy_p11/lims-client-mockup.xml +++ b/mxcubecore/configuration/desy_p11/lims-client-mockup.xml @@ -1,4 +1,4 @@ user - + diff --git a/mxcubecore/configuration/desy_p11/mjpg-stream-video.xml b/mxcubecore/configuration/desy_p11/mjpg-stream-video.xml index cfb32e31b9..98242c29e9 100644 --- a/mxcubecore/configuration/desy_p11/mjpg-stream-video.xml +++ b/mxcubecore/configuration/desy_p11/mjpg-stream-video.xml @@ -1,4 +1,4 @@ - + 10 haspp11camsrv 8081 diff --git a/mxcubecore/configuration/desy_p11/queue-model.xml b/mxcubecore/configuration/desy_p11/queue-model.xml index b59b28a9bd..a028f73517 100644 --- a/mxcubecore/configuration/desy_p11/queue-model.xml +++ b/mxcubecore/configuration/desy_p11/queue-model.xml @@ -1,7 +1,7 @@ - - - diff --git a/mxcubecore/configuration/desy_p11/redis.xml b/mxcubecore/configuration/desy_p11/redis.xml index 37cbe7f7e2..bac4b2e69d 100644 --- a/mxcubecore/configuration/desy_p11/redis.xml +++ b/mxcubecore/configuration/desy_p11/redis.xml @@ -1,4 +1,4 @@ - + diff --git a/mxcubecore/configuration/desy_p11/sc-generic.xml b/mxcubecore/configuration/desy_p11/sc-generic.xml index 849a5c4458..cc747679c2 100644 --- a/mxcubecore/configuration/desy_p11/sc-generic.xml +++ b/mxcubecore/configuration/desy_p11/sc-generic.xml @@ -1,7 +1,7 @@ Sample Changer / Test - + State SelectedBasketLocation SelectedSampleLocation @@ -21,18 +21,18 @@ diff --git a/mxcubecore/configuration/desy_p11/slits-mockup.xml b/mxcubecore/configuration/desy_p11/slits-mockup.xml index 185f2b516c..76f89883b6 100644 --- a/mxcubecore/configuration/desy_p11/slits-mockup.xml +++ b/mxcubecore/configuration/desy_p11/slits-mockup.xml @@ -10,5 +10,5 @@ 0.005 0.300 0.0005 - + diff --git a/mxcubecore/configuration/desy_p11/video-mockup.xml b/mxcubecore/configuration/desy_p11/video-mockup.xml index 8fde93d733..1a0a15dc52 100644 --- a/mxcubecore/configuration/desy_p11/video-mockup.xml +++ b/mxcubecore/configuration/desy_p11/video-mockup.xml @@ -1,3 +1,3 @@ - - 2000 + + 2000 diff --git a/mxcubecore/configuration/desy_p11/xml-rpc-server.xml b/mxcubecore/configuration/desy_p11/xml-rpc-server.xml index 3555534309..7db1bd06f5 100644 --- a/mxcubecore/configuration/desy_p11/xml-rpc-server.xml +++ b/mxcubecore/configuration/desy_p11/xml-rpc-server.xml @@ -3,7 +3,7 @@ - + True diff --git a/mxcubecore/configuration/embl_hh_p13/beam-centering.xml b/mxcubecore/configuration/embl_hh_p13/beam-centering.xml index c1a1df4fcf..e5a98c8c5d 100644 --- a/mxcubecore/configuration/embl_hh_p13/beam-centering.xml +++ b/mxcubecore/configuration/embl_hh_p13/beam-centering.xml @@ -14,7 +14,7 @@ SEND SEND CurrentRange.set - + -0.020 -0.020 diff --git a/mxcubecore/configuration/embl_hh_p13/beam-info.xml b/mxcubecore/configuration/embl_hh_p13/beam-info.xml index dc9aedffaa..d8bd8d27a9 100644 --- a/mxcubecore/configuration/embl_hh_p13/beam-info.xml +++ b/mxcubecore/configuration/embl_hh_p13/beam-info.xml @@ -3,12 +3,12 @@ p13md201.embl-hamburg.de:9001 + BeamPositionVertical BeamPositionHorizontal - BeamPositionVertical + BeamPositionVertical BeamSizeMicrons - BeamShapeEllipse + BeamShapeEllipse (230.0, 150.0) diff --git a/mxcubecore/configuration/embl_hh_p13/beam.xml b/mxcubecore/configuration/embl_hh_p13/beam.xml index a893049170..1be5d3cc41 100644 --- a/mxcubecore/configuration/embl_hh_p13/beam.xml +++ b/mxcubecore/configuration/embl_hh_p13/beam.xml @@ -3,12 +3,12 @@ p13md201.embl-hamburg.de:9001 + BeamPositionVertical BeamPositionHorizontal - BeamPositionVertical + BeamPositionVertical BeamSizeMicrons - BeamShapeEllipse + BeamShapeEllipse (230.0, 150.0) diff --git a/mxcubecore/configuration/embl_hh_p13/beamline-test.xml b/mxcubecore/configuration/embl_hh_p13/beamline-test.xml index 0189746f12..6291e1fe02 100644 --- a/mxcubecore/configuration/embl_hh_p13/beamline-test.xml +++ b/mxcubecore/configuration/embl_hh_p13/beamline-test.xml @@ -7,8 +7,8 @@ CurrentRange.set PitchScanStat - - - + ["measure_intensity"] -0.020 -0.020 diff --git a/mxcubecore/configuration/embl_hh_p13/beamline-tools.xml b/mxcubecore/configuration/embl_hh_p13/beamline-tools.xml index 52b94cf028..2f547a8cef 100755 --- a/mxcubecore/configuration/embl_hh_p13/beamline-tools.xml +++ b/mxcubecore/configuration/embl_hh_p13/beamline-tools.xml @@ -7,7 +7,7 @@ Center beam center_beam_report QuickRealign - + flux Measure flux diff --git a/mxcubecore/configuration/embl_hh_p13/centring-math.xml b/mxcubecore/configuration/embl_hh_p13/centring-math.xml index 4461a14f7e..b15a828131 100644 --- a/mxcubecore/configuration/embl_hh_p13/centring-math.xml +++ b/mxcubecore/configuration/embl_hh_p13/centring-math.xml @@ -1,13 +1,13 @@ + --> phiy [1, 0, 0] translation - /eh1/diff-phiy + /eh1/diff-phiy @@ -15,23 +15,23 @@ phiz [0,-1, 0] translation - /eh1/diff-phiz + /eh1/diff-phiz phi [-1, 0, 0] rotation - /eh1/diff-omega + /eh1/diff-omega - + sampx [0, 0, 1] translation - /eh1/diff-sampx + /eh1/diff-sampx @@ -39,7 +39,7 @@ [0, -1, 0] translation - /eh1/diff-sampy + /eh1/diff-sampy diff --git a/mxcubecore/configuration/embl_hh_p13/diffractometer.xml b/mxcubecore/configuration/embl_hh_p13/diffractometer.xml index 7e6dd25867..588cfa1fe4 100644 --- a/mxcubecore/configuration/embl_hh_p13/diffractometer.xml +++ b/mxcubecore/configuration/embl_hh_p13/diffractometer.xml @@ -27,7 +27,7 @@ - True + True {"x": 605,"y": 652} diff --git a/mxcubecore/configuration/embl_hh_p13/eh1/detector-eiger16m.xml b/mxcubecore/configuration/embl_hh_p13/eh1/detector-eiger16m.xml index 266436971d..4ddbd933b2 100644 --- a/mxcubecore/configuration/embl_hh_p13/eh1/detector-eiger16m.xml +++ b/mxcubecore/configuration/embl_hh_p13/eh1/detector-eiger16m.xml @@ -5,12 +5,12 @@ status detector-mode frame-rate - beam-xy + beam-xy average-speed RECV GuillCmd - + initialize Eiger diff --git a/mxcubecore/configuration/embl_hh_p13/eh1/detector-pilatus6m.xml b/mxcubecore/configuration/embl_hh_p13/eh1/detector-pilatus6m.xml index e9c5ff8802..9938c24aa6 100644 --- a/mxcubecore/configuration/embl_hh_p13/eh1/detector-pilatus6m.xml +++ b/mxcubecore/configuration/embl_hh_p13/eh1/detector-pilatus6m.xml @@ -10,7 +10,7 @@ humidity status detector-mode - frame-rate + frame-rate beam-xy RECV diff --git a/mxcubecore/configuration/embl_hh_p13/eh1/diff-beamstop.xml b/mxcubecore/configuration/embl_hh_p13/eh1/diff-beamstop.xml index ee3c8efc81..b735803f97 100644 --- a/mxcubecore/configuration/embl_hh_p13/eh1/diff-beamstop.xml +++ b/mxcubecore/configuration/embl_hh_p13/eh1/diff-beamstop.xml @@ -1,5 +1,5 @@ - p13md201.embl-hamburg.de:9001 + p13md201.embl-hamburg.de:9001 1.5 15.0 diff --git a/mxcubecore/configuration/embl_hh_p13/eh1/diff-focus.xml b/mxcubecore/configuration/embl_hh_p13/eh1/diff-focus.xml index 4511acd67f..cf29c5edde 100644 --- a/mxcubecore/configuration/embl_hh_p13/eh1/diff-focus.xml +++ b/mxcubecore/configuration/embl_hh_p13/eh1/diff-focus.xml @@ -1,4 +1,4 @@ p13md201.embl-hamburg.de:9001 CentringTableFocus - + diff --git a/mxcubecore/configuration/embl_hh_p13/eh1/energy.xml b/mxcubecore/configuration/embl_hh_p13/eh1/energy.xml index 6e35dd35ce..9796874a02 100644 --- a/mxcubecore/configuration/embl_hh_p13/eh1/energy.xml +++ b/mxcubecore/configuration/embl_hh_p13/eh1/energy.xml @@ -2,7 +2,7 @@ TgtEnergy Energy + ELimitHigh --> Status Gap diff --git a/mxcubecore/configuration/embl_hh_p13/eh1/resolution.xml b/mxcubecore/configuration/embl_hh_p13/eh1/resolution.xml index 2b0f8fe2f4..7262beccdd 100644 --- a/mxcubecore/configuration/embl_hh_p13/eh1/resolution.xml +++ b/mxcubecore/configuration/embl_hh_p13/eh1/resolution.xml @@ -3,7 +3,7 @@ stop state2 position - limits + limits {'Door_Interlock':'DoorInterlockStateChanged'} {'Door_Interlock.doorIsInterlocked()':True} diff --git a/mxcubecore/configuration/embl_hh_p13/eh1/transmission.xml b/mxcubecore/configuration/embl_hh_p13/eh1/transmission.xml index ce25ac5428..47d2b38e99 100644 --- a/mxcubecore/configuration/embl_hh_p13/eh1/transmission.xml +++ b/mxcubecore/configuration/embl_hh_p13/eh1/transmission.xml @@ -2,7 +2,7 @@ limits transmission status - + Transmission Transmission diff --git a/mxcubecore/configuration/embl_hh_p13/energy.xml b/mxcubecore/configuration/embl_hh_p13/energy.xml index eb36fa7f4b..07228e9249 100644 --- a/mxcubecore/configuration/embl_hh_p13/energy.xml +++ b/mxcubecore/configuration/embl_hh_p13/energy.xml @@ -1,6 +1,6 @@ TgtEnergy - Energy + Energy Status @@ -9,7 +9,7 @@ EnergyCtrlByte ReleaseBreakBragg - SetBreakBragg + SetBreakBragg reset diff --git a/mxcubecore/configuration/embl_hh_p13/energyscan.xml b/mxcubecore/configuration/embl_hh_p13/energyscan.xml index c2d36ed9cc..625baa0fca 100644 --- a/mxcubecore/configuration/embl_hh_p13/energyscan.xml +++ b/mxcubecore/configuration/embl_hh_p13/energyscan.xml @@ -1,6 +1,6 @@ start - status + status error abort @@ -8,7 +8,7 @@ max-transmission /opt/embl-hh/bin/runchooch.py - + 5 60 @@ -93,7 +93,7 @@ Mo K - + Ag L diff --git a/mxcubecore/configuration/embl_hh_p13/fast-shutter.xml b/mxcubecore/configuration/embl_hh_p13/fast-shutter.xml index b97ace4495..ed49a11b7e 100644 --- a/mxcubecore/configuration/embl_hh_p13/fast-shutter.xml +++ b/mxcubecore/configuration/embl_hh_p13/fast-shutter.xml @@ -1,5 +1,5 @@ p13md201.embl-hamburg.de:9001 FastShutterIsOpen - CurrentPhase + CurrentPhase diff --git a/mxcubecore/configuration/embl_hh_p13/flux.xml b/mxcubecore/configuration/embl_hh_p13/flux.xml index e3c880dd89..3e3ce282ba 100644 --- a/mxcubecore/configuration/embl_hh_p13/flux.xml +++ b/mxcubecore/configuration/embl_hh_p13/flux.xml @@ -4,7 +4,7 @@ status error transmission - intensity - + intensity + -1.864e-5 diff --git a/mxcubecore/configuration/embl_hh_p13/machine-info.xml b/mxcubecore/configuration/embl_hh_p13/machine-info.xml index 7c67bf1cf7..14cc561b9c 100755 --- a/mxcubecore/configuration/embl_hh_p13/machine-info.xml +++ b/mxcubecore/configuration/embl_hh_p13/machine-info.xml @@ -1,13 +1,13 @@ 2.3e+12 - 60 + 60 {'current':75, 'temp': 25, 'hum': 60, 'intens': 5e-8} G47cS9:K:KL:P13EH1RaTIW_ai G47cS9:K:KL:P13EH1RaF_ai MachineStateText curDC - Energy + Energy NBunches RECV RECV diff --git a/mxcubecore/configuration/embl_hh_p13/mxcollect.xml b/mxcubecore/configuration/embl_hh_p13/mxcollect.xml index 8f329f63a6..9c5ec492ea 100644 --- a/mxcubecore/configuration/embl_hh_p13/mxcollect.xml +++ b/mxcubecore/configuration/embl_hh_p13/mxcollect.xml @@ -2,7 +2,7 @@ frame status Error - RECV + RECV compression description @@ -11,7 +11,7 @@ energy exposure-time helical-position - in-queue + in-queue num-images overlap processing diff --git a/mxcubecore/configuration/embl_hh_p13/offline-processing.xml b/mxcubecore/configuration/embl_hh_p13/offline-processing.xml index 83b479be85..bbd84d70f5 100755 --- a/mxcubecore/configuration/embl_hh_p13/offline-processing.xml +++ b/mxcubecore/configuration/embl_hh_p13/offline-processing.xml @@ -3,7 +3,7 @@ ssh bcrunch srun /mx-beta/edna-cluster-scripts/edna_proc.csh after - + ssh bcrunch srun /mx-beta/edna-cluster-scripts/edna_autoPROC.csh after diff --git a/mxcubecore/configuration/embl_hh_p13/oh1/motor-pitch-hfm.xml b/mxcubecore/configuration/embl_hh_p13/oh1/motor-pitch-hfm.xml index 35542c96ef..9c50c21477 100644 --- a/mxcubecore/configuration/embl_hh_p13/oh1/motor-pitch-hfm.xml +++ b/mxcubecore/configuration/embl_hh_p13/oh1/motor-pitch-hfm.xml @@ -1,8 +1,8 @@ RECV - SEND + SEND - diff --git a/mxcubecore/configuration/embl_hh_p13/oh1/motor-pitch-vfm.xml b/mxcubecore/configuration/embl_hh_p13/oh1/motor-pitch-vfm.xml index 680525eed3..4a2b0087ac 100644 --- a/mxcubecore/configuration/embl_hh_p13/oh1/motor-pitch-vfm.xml +++ b/mxcubecore/configuration/embl_hh_p13/oh1/motor-pitch-vfm.xml @@ -1,8 +1,8 @@ RECV - SEND + SEND - diff --git a/mxcubecore/configuration/embl_hh_p13/online-processing.xml b/mxcubecore/configuration/embl_hh_p13/online-processing.xml index ea4670be28..8bef72a8db 100644 --- a/mxcubecore/configuration/embl_hh_p13/online-processing.xml +++ b/mxcubecore/configuration/embl_hh_p13/online-processing.xml @@ -1,5 +1,5 @@ - status + status dozor-pass frame-count dozor-pass-IS diff --git a/mxcubecore/configuration/embl_hh_p13/queue-model.xml b/mxcubecore/configuration/embl_hh_p13/queue-model.xml index 41bba18737..de365c254d 100644 --- a/mxcubecore/configuration/embl_hh_p13/queue-model.xml +++ b/mxcubecore/configuration/embl_hh_p13/queue-model.xml @@ -1,3 +1,3 @@ - + diff --git a/mxcubecore/configuration/embl_hh_p13/resolution.xml b/mxcubecore/configuration/embl_hh_p13/resolution.xml index 2b0f8fe2f4..7262beccdd 100644 --- a/mxcubecore/configuration/embl_hh_p13/resolution.xml +++ b/mxcubecore/configuration/embl_hh_p13/resolution.xml @@ -3,7 +3,7 @@ stop state2 position - limits + limits {'Door_Interlock':'DoorInterlockStateChanged'} {'Door_Interlock.doorIsInterlocked()':True} diff --git a/mxcubecore/configuration/embl_hh_p13/safety-shutter.xml b/mxcubecore/configuration/embl_hh_p13/safety-shutter.xml index 40f9ac6aaf..03ca967a65 100644 --- a/mxcubecore/configuration/embl_hh_p13/safety-shutter.xml +++ b/mxcubecore/configuration/embl_hh_p13/safety-shutter.xml @@ -5,13 +5,13 @@ state-open-permission error - + close open close open - + True diff --git a/mxcubecore/configuration/embl_hh_p13/sample-changer.xml b/mxcubecore/configuration/embl_hh_p13/sample-changer.xml index 055ad95aab..cc038bf708 100644 --- a/mxcubecore/configuration/embl_hh_p13/sample-changer.xml +++ b/mxcubecore/configuration/embl_hh_p13/sample-changer.xml @@ -3,9 +3,9 @@ MarvinStatus PuckSwitches StsSmplMnted - RECV + RECV - Mount + Mount DismountSample False diff --git a/mxcubecore/configuration/embl_hh_p13/session.xml b/mxcubecore/configuration/embl_hh_p13/session.xml index ac3e8c7a25..e21098aed5 100644 --- a/mxcubecore/configuration/embl_hh_p13/session.xml +++ b/mxcubecore/configuration/embl_hh_p13/session.xml @@ -1,4 +1,4 @@ - + EMBL-HH p13eh1 P13 diff --git a/mxcubecore/configuration/embl_hh_p14/beam.xml b/mxcubecore/configuration/embl_hh_p14/beam.xml index 67f1f69d16..0e5829aade 100644 --- a/mxcubecore/configuration/embl_hh_p14/beam.xml +++ b/mxcubecore/configuration/embl_hh_p14/beam.xml @@ -7,8 +7,8 @@ BeamPositionVertical --> BeamPositionHorizontal - BeamPositionVertical + BeamPositionVertical BeamSizeMicrons - BeamShapeEllipse + BeamShapeEllipse (12.0, 5.0) diff --git a/mxcubecore/configuration/embl_hh_p14/centring-math.xml b/mxcubecore/configuration/embl_hh_p14/centring-math.xml index 1ccda825da..bb19aa626d 100644 --- a/mxcubecore/configuration/embl_hh_p14/centring-math.xml +++ b/mxcubecore/configuration/embl_hh_p14/centring-math.xml @@ -1,13 +1,13 @@ + --> phiy [0, 1, 0] translation - /eh1/diff-phiy + /eh1/diff-phiy @@ -15,7 +15,7 @@ phiz [1, 0, 0] translation - /eh1/diff-phiz + /eh1/diff-phiz [0, -1, 0] rotation - /eh1/diff-omega + /eh1/diff-omega - + sampx [-0.9999505209310272, 0, 0.00994764744888108] translation - /eh1/diff-sampx + /eh1/diff-sampx @@ -49,7 +49,7 @@ [0.00994764744888108, 0, 0.9999505209310272] translation - /eh1/diff-sampy + /eh1/diff-sampy diff --git a/mxcubecore/configuration/embl_hh_p14/characterisation.xml b/mxcubecore/configuration/embl_hh_p14/characterisation.xml index 32e8071190..2050c2fde9 100644 --- a/mxcubecore/configuration/embl_hh_p14/characterisation.xml +++ b/mxcubecore/configuration/embl_hh_p14/characterisation.xml @@ -1,5 +1,5 @@ - + ssh bcrunch srun /mx-beta/edna-cluster-scripts/edna_characterisation.csh edna-defaults.xml diff --git a/mxcubecore/configuration/embl_hh_p14/crl.xml b/mxcubecore/configuration/embl_hh_p14/crl.xml index 395967023b..42c7029767 100644 --- a/mxcubecore/configuration/embl_hh_p14/crl.xml +++ b/mxcubecore/configuration/embl_hh_p14/crl.xml @@ -1,6 +1,6 @@ SEND - SEND + SEND RECV diff --git a/mxcubecore/configuration/embl_hh_p14/diffractometer.xml b/mxcubecore/configuration/embl_hh_p14/diffractometer.xml index 3f1ff65499..4c663ecb62 100644 --- a/mxcubecore/configuration/embl_hh_p14/diffractometer.xml +++ b/mxcubecore/configuration/embl_hh_p14/diffractometer.xml @@ -1,17 +1,17 @@ p14md302.embl-hamburg.de:9001 - CoaxCamScaleX - CoaxCamScaleY - HeadType + CoaxCamScaleX + CoaxCamScaleY + HeadType CurrentPhase - FastShutterIsOpen + FastShutterIsOpen ScintillatorPosition CapillaryPosition State Status startSetPhase - startAutoFocus + startAutoFocus saveCentringPositions getOmegaMotorDynamicScanLimits @@ -24,7 +24,7 @@ - + diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/attocubeMotors/attoGroup.xml b/mxcubecore/configuration/embl_hh_p14/eh1/attocubeMotors/attoGroup.xml index 45367dca2e..afba1bcd39 100644 --- a/mxcubecore/configuration/embl_hh_p14/eh1/attocubeMotors/attoGroup.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/attocubeMotors/attoGroup.xml @@ -1,9 +1,9 @@ - attocubeMotors + attocubeMotors /P14/P14Atto /Sl4Out Position - status + status Out diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/beamAttocube.xml b/mxcubecore/configuration/embl_hh_p14/eh1/beamAttocube.xml index a56faccf27..d5399f6519 100755 --- a/mxcubecore/configuration/embl_hh_p14/eh1/beamAttocube.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/beamAttocube.xml @@ -1,7 +1,7 @@ - /eh1/beamFocusing + /eh1/beamFocusing rectangle - ['Unfocused', 'Horizontal', 'Vertical', 'Double'] + ['Unfocused', 'Horizontal', 'Vertical', 'Double'] ['Unfocused', 'Vertical'] 0.0050 @@ -17,7 +17,7 @@ In attocubeMotors - -749599 + -749599 @@ -35,10 +35,10 @@ But - attocubeMotors + attocubeMotors 16260 - - + + diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/beamFocusing.xml b/mxcubecore/configuration/embl_hh_p14/eh1/beamFocusing.xml index feaf74ce47..68c674447b 100755 --- a/mxcubecore/configuration/embl_hh_p14/eh1/beamFocusing.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/beamFocusing.xml @@ -16,7 +16,7 @@ (0.007, 0.003) (999, 500) 'Double microfocued mode. \nCrystal life time will be ~0.080 sec.\n Beam size will be 0.007x0.02 mm.' - 150 + 150 Imaging @@ -42,11 +42,10 @@ - - - + + + calibration {"address": "/P14/MD3/MD3_0", "property": "startSetPhase", "argument": "BeamLocation"} - diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger16m-cdte.xml b/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger16m-cdte.xml index b45405c284..f028649111 100644 --- a/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger16m-cdte.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger16m-cdte.xml @@ -6,7 +6,7 @@ status detector-mode frame-rate - beam-xy + beam-xy average-speed RECV @@ -25,7 +25,7 @@ True cbf Unbinned - 0 + 0 0 64000 diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger16m.xml b/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger16m.xml index 146c0cdfd6..f9cffd645e 100644 --- a/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger16m.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger16m.xml @@ -21,7 +21,7 @@ status detector-mode frame-rate - beam-xy + beam-xy average-speed RECV @@ -43,7 +43,7 @@ pilatus6m ("0", "C18", "C2") - + Eiger 16M eiger16m @@ -55,7 +55,7 @@ True cbf Unbinned - 0 + 0 0 64000 diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger4m-cdte.xml b/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger4m-cdte.xml index b020d99eb5..e90bba8146 100644 --- a/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger4m-cdte.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/detector-eiger4m-cdte.xml @@ -21,7 +21,7 @@ status detector-mode frame-rate - beam-xy + beam-xy average-speed RECV @@ -43,7 +43,7 @@ pilatus6m ("0", "C18", "C2") - + Eiger 4M eiger4m-cdte @@ -55,7 +55,7 @@ True cbf Unbinned - 0 + 0 0 64000 diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/diff-focus.xml b/mxcubecore/configuration/embl_hh_p14/eh1/diff-focus.xml index 2ba6e95ba7..52e5c32358 100644 --- a/mxcubecore/configuration/embl_hh_p14/eh1/diff-focus.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/diff-focus.xml @@ -1,4 +1,4 @@ p14md302.embl-hamburg.de:9001 CentringTableFocus - + diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/diff-front-light.xml b/mxcubecore/configuration/embl_hh_p14/eh1/diff-front-light.xml index 17f6df3808..a77b14c8de 100644 --- a/mxcubecore/configuration/embl_hh_p14/eh1/diff-front-light.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/diff-front-light.xml @@ -1,6 +1,6 @@ p14md302.embl-hamburg.de:9001 - FrontLightLevel + FrontLightLevel FrontLightIsOn diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/diff-frontLight.xml b/mxcubecore/configuration/embl_hh_p14/eh1/diff-frontLight.xml index f70641e176..7ff1713631 100644 --- a/mxcubecore/configuration/embl_hh_p14/eh1/diff-frontLight.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/diff-frontLight.xml @@ -1,6 +1,6 @@ p14md301.embl-hamburg.de:9001 - FrontLightLevel + FrontLightLevel FrontLightIsOn diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/energy.xml b/mxcubecore/configuration/embl_hh_p14/eh1/energy.xml index 44fe1d7c5f..c5de53451d 100644 --- a/mxcubecore/configuration/embl_hh_p14/eh1/energy.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/energy.xml @@ -3,7 +3,7 @@ Energy ELimitLow - ELimitHigh + ELimitHigh Status True diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/slits.xml b/mxcubecore/configuration/embl_hh_p14/eh1/slits.xml index 5261e676da..b91ab6ce28 100755 --- a/mxcubecore/configuration/embl_hh_p14/eh1/slits.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/slits.xml @@ -1,6 +1,6 @@ rectangle - ['Collimated', 'Horizontal', 'Vertical', 'Double'] + ['Collimated', 'Horizontal', 'Vertical', 'Double'] ['Collimated', 'Vertical'] 0.0050 @@ -16,7 +16,7 @@ In slitsMotors - 1230240 + 1230240 @@ -38,7 +38,7 @@ -372780 - - + + diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/slitsGroup.xml b/mxcubecore/configuration/embl_hh_p14/eh1/slitsGroup.xml index c8c986dcd4..aa11679094 100644 --- a/mxcubecore/configuration/embl_hh_p14/eh1/slitsGroup.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/slitsGroup.xml @@ -1,9 +1,9 @@ - slitsMotors + slitsMotors /P14/P14Atto /Sl4Out Position - status + status Out diff --git a/mxcubecore/configuration/embl_hh_p14/eh1/slitsMotors/slits.xml b/mxcubecore/configuration/embl_hh_p14/eh1/slitsMotors/slits.xml index 5d348624ec..1d550c33b8 100755 --- a/mxcubecore/configuration/embl_hh_p14/eh1/slitsMotors/slits.xml +++ b/mxcubecore/configuration/embl_hh_p14/eh1/slitsMotors/slits.xml @@ -1,6 +1,6 @@ rectangle - ['Collimated', 'Horizontal', 'Vertical', 'Double'] + ['Collimated', 'Horizontal', 'Vertical', 'Double'] ['Collimated', 'Vertical'] 0.0050 @@ -16,7 +16,7 @@ In slitsMotors - 309310 + 309310 @@ -34,11 +34,11 @@ But - slitsMotors + slitsMotors -245700 - - + + diff --git a/mxcubecore/configuration/embl_hh_p14/energy.xml b/mxcubecore/configuration/embl_hh_p14/energy.xml index e82f61e1af..26e945de45 100644 --- a/mxcubecore/configuration/embl_hh_p14/energy.xml +++ b/mxcubecore/configuration/embl_hh_p14/energy.xml @@ -7,7 +7,7 @@ EnergyCtrlByte ReleaseBreakBragg - SetBreakBragg + SetBreakBragg reset @@ -15,7 +15,7 @@ (5, 15) - + --> phiy [0, 1, 0] translation - /eh1/diff-phiy + /eh1/diff-phiy @@ -15,7 +15,7 @@ phiz [1, 0, 0] translation - /eh1/diff-phiz + /eh1/diff-phiz [0, -1, 0] rotation - /eh1/diff-omega + /eh1/diff-omega - + sampx [-0.9999505209310272, 0, 0.00994764744888108] translation - /eh1/diff-sampx + /eh1/diff-sampx @@ -49,7 +49,7 @@ [0.00994764744888108, 0, 0.9999505209310272] translation - /eh1/diff-sampy + /eh1/diff-sampy diff --git a/mxcubecore/configuration/embl_hh_p14/machine-info.xml b/mxcubecore/configuration/embl_hh_p14/machine-info.xml index cd606ef16d..5951c31c17 100755 --- a/mxcubecore/configuration/embl_hh_p14/machine-info.xml +++ b/mxcubecore/configuration/embl_hh_p14/machine-info.xml @@ -1,5 +1,5 @@ - 120 + 120 {'current':75, 'temp': 25, 'hum': 60, 'intens': 5e-8} G47cS9:K:KL:P14EH1RaTIW_ai G47cS9:K:KL:P14EH1RaF_ai diff --git a/mxcubecore/configuration/embl_hh_p14/mxcollect.xml b/mxcubecore/configuration/embl_hh_p14/mxcollect.xml index d02f23124c..556f465d64 100644 --- a/mxcubecore/configuration/embl_hh_p14/mxcollect.xml +++ b/mxcubecore/configuration/embl_hh_p14/mxcollect.xml @@ -2,7 +2,7 @@ frame status Error - RECV + RECV compression description @@ -11,7 +11,7 @@ energy exposure-time helical-position - in-queue + in-queue num-images overlap processing diff --git a/mxcubecore/configuration/embl_hh_p14/oav-camera.xml b/mxcubecore/configuration/embl_hh_p14/oav-camera.xml index 77375e9b5c..18e1d79379 100644 --- a/mxcubecore/configuration/embl_hh_p14/oav-camera.xml +++ b/mxcubecore/configuration/embl_hh_p14/oav-camera.xml @@ -1,5 +1,5 @@ - (True, False) + (True, False) 40 DEV_000F3101F813 diff --git a/mxcubecore/configuration/embl_hh_p14/offline-processing.xml b/mxcubecore/configuration/embl_hh_p14/offline-processing.xml index 0266702375..ae3ba44b57 100755 --- a/mxcubecore/configuration/embl_hh_p14/offline-processing.xml +++ b/mxcubecore/configuration/embl_hh_p14/offline-processing.xml @@ -3,7 +3,7 @@ ssh bcrunch srun /mx-beta/edna-cluster-scripts/edna_proc.csh after - + ssh bcrunch srun /mx-beta/edna-cluster-scripts/edna_autoPROC.csh after diff --git a/mxcubecore/configuration/embl_hh_p14/plate-manipulator.xml b/mxcubecore/configuration/embl_hh_p14/plate-manipulator.xml index 49d7f35239..b93f45c66c 100644 --- a/mxcubecore/configuration/embl_hh_p14/plate-manipulator.xml +++ b/mxcubecore/configuration/embl_hh_p14/plate-manipulator.xml @@ -3,7 +3,7 @@ startMovePlateToLocation PlateLocation State - CurrentPhase + CurrentPhase diff --git a/mxcubecore/configuration/embl_hh_p14/ppu-control.xml b/mxcubecore/configuration/embl_hh_p14/ppu-control.xml index 033ee8cba9..56ae7e91f1 100644 --- a/mxcubecore/configuration/embl_hh_p14/ppu-control.xml +++ b/mxcubecore/configuration/embl_hh_p14/ppu-control.xml @@ -1,9 +1,9 @@ all-status-running - all-restart-running + all-restart-running - all-status - all-restart-self + all-status + all-restart-self furka-restart-self Execution in progress ERROR diff --git a/mxcubecore/configuration/embl_hh_p14/redis.xml b/mxcubecore/configuration/embl_hh_p14/redis.xml index 37cbe7f7e2..bac4b2e69d 100644 --- a/mxcubecore/configuration/embl_hh_p14/redis.xml +++ b/mxcubecore/configuration/embl_hh_p14/redis.xml @@ -1,4 +1,4 @@ - + diff --git a/mxcubecore/configuration/embl_hh_p14/safety-shutter.xml b/mxcubecore/configuration/embl_hh_p14/safety-shutter.xml index ce28a4631d..94ac1e527c 100644 --- a/mxcubecore/configuration/embl_hh_p14/safety-shutter.xml +++ b/mxcubecore/configuration/embl_hh_p14/safety-shutter.xml @@ -6,7 +6,7 @@ error close open - + close open diff --git a/mxcubecore/configuration/embl_hh_p14/sample-changer.xml b/mxcubecore/configuration/embl_hh_p14/sample-changer.xml index 82c07d19ef..c146241624 100644 --- a/mxcubecore/configuration/embl_hh_p14/sample-changer.xml +++ b/mxcubecore/configuration/embl_hh_p14/sample-changer.xml @@ -11,14 +11,14 @@ Errors Marvin.MountStat - MountSample + MountSample DismountSample Dewar.OpenLid Dewar.CloseLid BaseToCenter CenterToBase DryGripper - close + close ResetError diff --git a/mxcubecore/configuration/embl_hh_p14/sample-view.xml b/mxcubecore/configuration/embl_hh_p14/sample-view.xml index fde377e2c2..11b7a1bc45 100644 --- a/mxcubecore/configuration/embl_hh_p14/sample-view.xml +++ b/mxcubecore/configuration/embl_hh_p14/sample-view.xml @@ -1,6 +1,6 @@ - + [0.5, 1, 1.5, 2] (0.2, 0.2) diff --git a/mxcubecore/configuration/embl_hh_p14/session.xml b/mxcubecore/configuration/embl_hh_p14/session.xml index 1629f1d2a0..187eabbd7e 100644 --- a/mxcubecore/configuration/embl_hh_p14/session.xml +++ b/mxcubecore/configuration/embl_hh_p14/session.xml @@ -1,5 +1,5 @@ - - EMBL-HH + + EMBL-HH p14eh1 P14 diff --git a/mxcubecore/configuration/embl_hh_p14/xray-imaging.xml b/mxcubecore/configuration/embl_hh_p14/xray-imaging.xml index 0f4b80fa06..b0f6248dda 100644 --- a/mxcubecore/configuration/embl_hh_p14/xray-imaging.xml +++ b/mxcubecore/configuration/embl_hh_p14/xray-imaging.xml @@ -1,5 +1,5 @@ - - + diff --git a/mxcubecore/configuration/embl_hh_pe2/attenuators.xml b/mxcubecore/configuration/embl_hh_pe2/attenuators.xml index cac34e8d8c..446076ca80 100644 --- a/mxcubecore/configuration/embl_hh_pe2/attenuators.xml +++ b/mxcubecore/configuration/embl_hh_pe2/attenuators.xml @@ -2,4 +2,4 @@ transmission status limits - + diff --git a/mxcubecore/configuration/embl_hh_pe2/beam-info.xml b/mxcubecore/configuration/embl_hh_pe2/beam-info.xml index 70ea4b3018..e4f6e73740 100644 --- a/mxcubecore/configuration/embl_hh_pe2/beam-info.xml +++ b/mxcubecore/configuration/embl_hh_pe2/beam-info.xml @@ -4,8 +4,8 @@ BeamPositionHorizontal - BeamPositionVertical + BeamPositionVertical BeamSizeMicrons - BeamShapeEllipse + BeamShapeEllipse (12.0, 5.0) diff --git a/mxcubecore/configuration/embl_hh_pe2/beamline-setup.xml b/mxcubecore/configuration/embl_hh_pe2/beamline-setup.xml index 4c24d4a8dc..5cffceba2d 100644 --- a/mxcubecore/configuration/embl_hh_pe2/beamline-setup.xml +++ b/mxcubecore/configuration/embl_hh_pe2/beamline-setup.xml @@ -24,7 +24,7 @@ - + diff --git a/mxcubecore/configuration/embl_hh_pe2/camera.xml b/mxcubecore/configuration/embl_hh_pe2/camera.xml index 3ffe7eb3c4..a06a435783 100644 --- a/mxcubecore/configuration/embl_hh_pe2/camera.xml +++ b/mxcubecore/configuration/embl_hh_pe2/camera.xml @@ -1,4 +1,4 @@ - + 40 0 diff --git a/mxcubecore/configuration/embl_hh_pe2/data-analysis.xml b/mxcubecore/configuration/embl_hh_pe2/data-analysis.xml index bd1319f9c4..901a0d4f76 100644 --- a/mxcubecore/configuration/embl_hh_pe2/data-analysis.xml +++ b/mxcubecore/configuration/embl_hh_pe2/data-analysis.xml @@ -1,6 +1,6 @@ - + /opt/embl-hh/bin/edna_characterisation.sh edna-defaults.xml diff --git a/mxcubecore/configuration/embl_hh_pe2/eh2/detector.xml b/mxcubecore/configuration/embl_hh_pe2/eh2/detector.xml index 3c3a14d71d..b63ebdd467 100644 --- a/mxcubecore/configuration/embl_hh_pe2/eh2/detector.xml +++ b/mxcubecore/configuration/embl_hh_pe2/eh2/detector.xml @@ -2,13 +2,13 @@ - diff --git a/mxcubecore/configuration/embl_hh_pe2/eh2/table_hor.xml b/mxcubecore/configuration/embl_hh_pe2/eh2/table_hor.xml index ac54257354..0edbdddfa3 100644 --- a/mxcubecore/configuration/embl_hh_pe2/eh2/table_hor.xml +++ b/mxcubecore/configuration/embl_hh_pe2/eh2/table_hor.xml @@ -1,3 +1,3 @@ - horizontal + horizontal diff --git a/mxcubecore/configuration/embl_hh_pe2/energy.xml b/mxcubecore/configuration/embl_hh_pe2/energy.xml index e6b728f49c..3723720aaa 100644 --- a/mxcubecore/configuration/embl_hh_pe2/energy.xml +++ b/mxcubecore/configuration/embl_hh_pe2/energy.xml @@ -7,13 +7,13 @@ EnergyCtrlByte ReleaseBreakBragg - SetBreakBragg + SetBreakBragg True (5, 15) - - + [0.5, 1, 1.5, 2] (0.2, 0.2) diff --git a/mxcubecore/configuration/embl_hh_pe2/mach-info.xml b/mxcubecore/configuration/embl_hh_pe2/mach-info.xml index 9811e67158..376a5cce7a 100755 --- a/mxcubecore/configuration/embl_hh_pe2/mach-info.xml +++ b/mxcubecore/configuration/embl_hh_pe2/mach-info.xml @@ -1,7 +1,7 @@ - + MachineStateText curDC Energy diff --git a/mxcubecore/configuration/embl_hh_pe2/mini-diff.xml b/mxcubecore/configuration/embl_hh_pe2/mini-diff.xml index 55012423b6..85a69e2ac7 100644 --- a/mxcubecore/configuration/embl_hh_pe2/mini-diff.xml +++ b/mxcubecore/configuration/embl_hh_pe2/mini-diff.xml @@ -1,18 +1,18 @@ pe2bsd01.embl-hamburg.de:9001 - CoaxCamScaleX - CoaxCamScaleY + CoaxCamScaleX + CoaxCamScaleY CurrentPhase ScintillatorPosition CapillaryPosition State Status BeamstopPosition - FastShutterIsOpen + FastShutterIsOpen startSetPhase - startAutoFocus - + startAutoFocus + @@ -21,9 +21,9 @@ - + - + ("Transfer", "Centring", "DataCollection", "BeamLocation") diff --git a/mxcubecore/configuration/embl_hh_pe2/mxcollect.xml b/mxcubecore/configuration/embl_hh_pe2/mxcollect.xml index 92feeefe4f..e59ba9c8dc 100644 --- a/mxcubecore/configuration/embl_hh_pe2/mxcollect.xml +++ b/mxcubecore/configuration/embl_hh_pe2/mxcollect.xml @@ -25,7 +25,7 @@ exposure-time helical-position nexp-frame - in-queue + in-queue num-images overlap processing diff --git a/mxcubecore/configuration/embl_hh_pe2/primary-crl.xml b/mxcubecore/configuration/embl_hh_pe2/primary-crl.xml index 8df47b0d9d..c403cceee8 100644 --- a/mxcubecore/configuration/embl_hh_pe2/primary-crl.xml +++ b/mxcubecore/configuration/embl_hh_pe2/primary-crl.xml @@ -1,6 +1,6 @@ SEND - SEND + SEND RECV 28.0 diff --git a/mxcubecore/configuration/embl_hh_pe2/queue-model.xml b/mxcubecore/configuration/embl_hh_pe2/queue-model.xml index 41bba18737..de365c254d 100644 --- a/mxcubecore/configuration/embl_hh_pe2/queue-model.xml +++ b/mxcubecore/configuration/embl_hh_pe2/queue-model.xml @@ -1,3 +1,3 @@ - + diff --git a/mxcubecore/configuration/embl_hh_pe2/safshut.xml b/mxcubecore/configuration/embl_hh_pe2/safshut.xml index 96b5a0edd1..3be09258a3 100644 --- a/mxcubecore/configuration/embl_hh_pe2/safshut.xml +++ b/mxcubecore/configuration/embl_hh_pe2/safshut.xml @@ -6,7 +6,7 @@ error close open - + close open True diff --git a/mxcubecore/configuration/embl_hh_pe2/session.xml b/mxcubecore/configuration/embl_hh_pe2/session.xml index fed29a6bf6..624aac2b78 100644 --- a/mxcubecore/configuration/embl_hh_pe2/session.xml +++ b/mxcubecore/configuration/embl_hh_pe2/session.xml @@ -1,5 +1,5 @@ - - EMBL-HH + + EMBL-HH p14eh2 PE2 diff --git a/mxcubecore/configuration/esrf_id13/graphics.xml b/mxcubecore/configuration/esrf_id13/graphics.xml index 07be65e7ff..2a9cc51da5 100644 --- a/mxcubecore/configuration/esrf_id13/graphics.xml +++ b/mxcubecore/configuration/esrf_id13/graphics.xml @@ -3,7 +3,7 @@ - @@ -12,7 +12,7 @@ - (1, 1.5, 2, 2.5, 3, 4, 5) + (1, 1.5, 2, 2.5, 3, 4, 5) diff --git a/mxcubecore/configuration/esrf_id231/attenuators.xml b/mxcubecore/configuration/esrf_id231/attenuators.xml index 5be1923318..807453530c 100755 --- a/mxcubecore/configuration/esrf_id231/attenuators.xml +++ b/mxcubecore/configuration/esrf_id231/attenuators.xml @@ -5,51 +5,51 @@ transmission MATT_STATE ATT_FACTOR - + 2048 - + 1024 - + 512 - + 256 - + 128 - + 64 - + 32 - + 16 - + 8 - + 4 - + 2 - + 1 diff --git a/mxcubecore/configuration/esrf_id231/beamline-setup.xml b/mxcubecore/configuration/esrf_id231/beamline-setup.xml index 28e93584c2..23c07844d6 100644 --- a/mxcubecore/configuration/esrf_id231/beamline-setup.xml +++ b/mxcubecore/configuration/esrf_id231/beamline-setup.xml @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/mxcubecore/configuration/esrf_id231/dnaconnection.xml b/mxcubecore/configuration/esrf_id231/dnaconnection.xml index bd58b57fc4..a1427d97bb 100755 --- a/mxcubecore/configuration/esrf_id231/dnaconnection.xml +++ b/mxcubecore/configuration/esrf_id231/dnaconnection.xml @@ -2,7 +2,7 @@ 2222 mx231 id23eh1 - 1112 + 1112 /mxcollect /sc diff --git a/mxcubecore/configuration/esrf_id231/ednaparams.xml b/mxcubecore/configuration/esrf_id231/ednaparams.xml index 369c9c339b..a06970c0d5 100755 --- a/mxcubecore/configuration/esrf_id231/ednaparams.xml +++ b/mxcubecore/configuration/esrf_id231/ednaparams.xml @@ -10,6 +10,6 @@ SetScalarValuesMap GetScalarValuesMap GetAvailableWorkflows - StateAttribute - RunningActorName + StateAttribute + RunningActorName diff --git a/mxcubecore/configuration/esrf_id231/exptable.xml b/mxcubecore/configuration/esrf_id231/exptable.xml index a2a8dd6609..226544fe36 100755 --- a/mxcubecore/configuration/esrf_id231/exptable.xml +++ b/mxcubecore/configuration/esrf_id231/exptable.xml @@ -4,17 +4,17 @@ - - - + + + - - - - - + + + + + diff --git a/mxcubecore/configuration/esrf_id231/filters.xml b/mxcubecore/configuration/esrf_id231/filters.xml index 242f6b632e..fe1839d223 100755 --- a/mxcubecore/configuration/esrf_id231/filters.xml +++ b/mxcubecore/configuration/esrf_id231/filters.xml @@ -1,21 +1,21 @@ OH1 Filters - + - + - + - + - + - + diff --git a/mxcubecore/configuration/esrf_id231/filters/wbv.xml b/mxcubecore/configuration/esrf_id231/filters/wbv.xml index 6ed1c38db6..cc3d478ece 100755 --- a/mxcubecore/configuration/esrf_id231/filters/wbv.xml +++ b/mxcubecore/configuration/esrf_id231/filters/wbv.xml @@ -5,25 +5,25 @@ PyroC 0.5 0 - + Diamond 1 - + Empty 2 - + Al 5 3 - + PyroC 5 4 - + PyroC 8 5 - + diff --git a/mxcubecore/configuration/esrf_id231/flux.xml b/mxcubecore/configuration/esrf_id231/flux.xml index 10863f74df..c1b018917b 100755 --- a/mxcubecore/configuration/esrf_id231/flux.xml +++ b/mxcubecore/configuration/esrf_id231/flux.xml @@ -8,4 +8,4 @@ FLUX_CALCULATION_FLAG - + diff --git a/mxcubecore/configuration/esrf_id231/minidiff-user.xml b/mxcubecore/configuration/esrf_id231/minidiff-user.xml index bd37d56d3f..795cb9eed8 100755 --- a/mxcubecore/configuration/esrf_id231/minidiff-user.xml +++ b/mxcubecore/configuration/esrf_id231/minidiff-user.xml @@ -5,7 +5,7 @@ - + @@ -14,14 +14,14 @@ - + - - + + diff --git a/mxcubecore/configuration/esrf_id231/minidiff.xml b/mxcubecore/configuration/esrf_id231/minidiff.xml index 5cd399d0e7..bd34b49bcc 100755 --- a/mxcubecore/configuration/esrf_id231/minidiff.xml +++ b/mxcubecore/configuration/esrf_id231/minidiff.xml @@ -10,15 +10,15 @@ /data/pyarch/id23eh1/C3D/archive_images /users/blissadm/applications/c3d/output /users/blissadm/log/Mxautocentring_stats.log - - + + minidiff_take_backgrounds 1.3 - 1.3 + 1.3 50 8 - 80 - 35 + 80 + 35 1 id23eh1 1 @@ -70,7 +70,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -88,8 +88,8 @@ - - + + /apzy diff --git a/mxcubecore/configuration/esrf_id231/minidiff_motors.xml b/mxcubecore/configuration/esrf_id231/minidiff_motors.xml index ebf7fab8fc..4e0248c5a4 100755 --- a/mxcubecore/configuration/esrf_id231/minidiff_motors.xml +++ b/mxcubecore/configuration/esrf_id231/minidiff_motors.xml @@ -4,7 +4,7 @@ - + @@ -13,14 +13,14 @@ - + - - + + diff --git a/mxcubecore/configuration/esrf_id231/mono.xml b/mxcubecore/configuration/esrf_id231/mono.xml index a2b96b4cbe..6b3022143a 100755 --- a/mxcubecore/configuration/esrf_id231/mono.xml +++ b/mxcubecore/configuration/esrf_id231/mono.xml @@ -8,7 +8,7 @@ - + basil:oh1 diff --git a/mxcubecore/configuration/esrf_id231/mxPowderCalibration.xml b/mxcubecore/configuration/esrf_id231/mxPowderCalibration.xml index 501eb6fe57..44e9c044aa 100755 --- a/mxcubecore/configuration/esrf_id231/mxPowderCalibration.xml +++ b/mxcubecore/configuration/esrf_id231/mxPowderCalibration.xml @@ -2,7 +2,7 @@ --> 13 - 13 + 13 83.10 0.000939 diff --git a/mxcubecore/configuration/esrf_id231/mxcollect.xml b/mxcubecore/configuration/esrf_id231/mxcollect.xml index ed2600e742..5ac2cd574e 100755 --- a/mxcubecore/configuration/esrf_id231/mxcollect.xml +++ b/mxcubecore/configuration/esrf_id231/mxcollect.xml @@ -1,7 +1,7 @@ - + - - + + @@ -47,7 +47,7 @@ HELICAL_PARS id23eh1 - + localhost:5698 @@ -58,6 +58,6 @@ /users/blissadm/bin/autoproc-launcher.py before - + diff --git a/mxcubecore/configuration/esrf_id231/mxlocal.xml b/mxcubecore/configuration/esrf_id231/mxlocal.xml index afc0a40093..16960b4a86 100755 --- a/mxcubecore/configuration/esrf_id231/mxlocal.xml +++ b/mxcubecore/configuration/esrf_id231/mxlocal.xml @@ -48,7 +48,7 @@ u35 //aries/id/id/23 - 0 + 0 u20 @@ -105,7 +105,7 @@ False - 4.25 + 4.25 7 45 diff --git a/mxcubecore/configuration/esrf_id231/sc.xml b/mxcubecore/configuration/esrf_id231/sc.xml index 5a1365af11..f3b26ddadf 100644 --- a/mxcubecore/configuration/esrf_id231/sc.xml +++ b/mxcubecore/configuration/esrf_id231/sc.xml @@ -1,8 +1,8 @@ Sample Changer - + - pcsc3-id231:9001 + pcsc3-id231:9001 State SelectedBasketLocation SelectedSampleLocation @@ -30,7 +30,7 @@ minidiff_prepare_centring SC_MD_FLAGS - + diff --git a/mxcubecore/configuration/esrf_id231/slitbox.xml b/mxcubecore/configuration/esrf_id231/slitbox.xml index e43a164485..f8c4fe0403 100755 --- a/mxcubecore/configuration/esrf_id231/slitbox.xml +++ b/mxcubecore/configuration/esrf_id231/slitbox.xml @@ -3,9 +3,9 @@ - - - + + + diff --git a/mxcubecore/configuration/esrf_id231/zoom_equipment.xml b/mxcubecore/configuration/esrf_id231/zoom_equipment.xml index 467aa1650d..863ac92fd2 100755 --- a/mxcubecore/configuration/esrf_id231/zoom_equipment.xml +++ b/mxcubecore/configuration/esrf_id231/zoom_equipment.xml @@ -33,7 +33,7 @@ zoom 3 40 0.33 - 1.22e-06 + 1.22e-06 1.34e-06 329 246 diff --git a/mxcubecore/configuration/esrf_id29/attenuators.xml b/mxcubecore/configuration/esrf_id29/attenuators.xml index 15830f111f..0075ffe49c 100644 --- a/mxcubecore/configuration/esrf_id29/attenuators.xml +++ b/mxcubecore/configuration/esrf_id29/attenuators.xml @@ -5,51 +5,51 @@ transmission MATT_STATE ATT_FACTOR - + 1 - + 2 - + 4 - + 8 - + 16 - + 32 - + 64 - + 128 - + 256 - + 512 - + 1024 - + 2048 diff --git a/mxcubecore/configuration/esrf_id29/beamline-setup.xml b/mxcubecore/configuration/esrf_id29/beamline-setup.xml index fe3994f9aa..ab24a8bbf7 100644 --- a/mxcubecore/configuration/esrf_id29/beamline-setup.xml +++ b/mxcubecore/configuration/esrf_id29/beamline-setup.xml @@ -1,9 +1,9 @@ - + - - + + diff --git a/mxcubecore/configuration/esrf_id29/exp/horizontal_motors.xml b/mxcubecore/configuration/esrf_id29/exp/horizontal_motors.xml index 46ff8d0ac2..8ae60c239c 100644 --- a/mxcubecore/configuration/esrf_id29/exp/horizontal_motors.xml +++ b/mxcubecore/configuration/esrf_id29/exp/horizontal_motors.xml @@ -1,5 +1,5 @@ - + diff --git a/mxcubecore/configuration/esrf_id29/filters.xml b/mxcubecore/configuration/esrf_id29/filters.xml index db4dd4009b..e7410efb51 100644 --- a/mxcubecore/configuration/esrf_id29/filters.xml +++ b/mxcubecore/configuration/esrf_id29/filters.xml @@ -1,15 +1,15 @@ OH Filters - + - + - + diff --git a/mxcubecore/configuration/esrf_id29/filters/mbv.xml b/mxcubecore/configuration/esrf_id29/filters/mbv.xml index 8a1f699fac..fa175bc206 100644 --- a/mxcubecore/configuration/esrf_id29/filters/mbv.xml +++ b/mxcubecore/configuration/esrf_id29/filters/mbv.xml @@ -5,9 +5,9 @@ YAG Screen 1.3 - + Out 0.3 - + diff --git a/mxcubecore/configuration/esrf_id29/filters/mbv1.xml b/mxcubecore/configuration/esrf_id29/filters/mbv1.xml index a7084c2dad..b363643d6b 100644 --- a/mxcubecore/configuration/esrf_id29/filters/mbv1.xml +++ b/mxcubecore/configuration/esrf_id29/filters/mbv1.xml @@ -14,7 +14,7 @@ Out 37.7 - diff --git a/mxcubecore/configuration/esrf_id29/flux.xml b/mxcubecore/configuration/esrf_id29/flux.xml index a08e10fae3..522a1dc63f 100644 --- a/mxcubecore/configuration/esrf_id29/flux.xml +++ b/mxcubecore/configuration/esrf_id29/flux.xml @@ -4,8 +4,8 @@ 1 DevCntReadAll CALIBRATED_DIODE - + FLUX_CALCULATION_FLAG - + diff --git a/mxcubecore/configuration/esrf_id29/mirror_align.xml b/mxcubecore/configuration/esrf_id29/mirror_align.xml index 00ab126a3f..7216067bbc 100644 --- a/mxcubecore/configuration/esrf_id29/mirror_align.xml +++ b/mxcubecore/configuration/esrf_id29/mirror_align.xml @@ -41,7 +41,7 @@ mirrbvi mirrbvx mirrbvy - + 2 0.1 - pcsc3-id29:9001 + pcsc3-id29:9001 State SelectedBasketLocation SelectedSampleLocation @@ -29,7 +29,7 @@ minidiff_prepare_centring SC_MD_FLAGS - + diff --git a/mxcubecore/configuration/esrf_id29/session.xml b/mxcubecore/configuration/esrf_id29/session.xml index b89f7e6a36..c857cec24f 100644 --- a/mxcubecore/configuration/esrf_id29/session.xml +++ b/mxcubecore/configuration/esrf_id29/session.xml @@ -1,6 +1,6 @@ - + id29 ID29 diff --git a/mxcubecore/configuration/esrf_id29/slitbox.xml b/mxcubecore/configuration/esrf_id29/slitbox.xml index acdb0a6bb0..0557ec8e4e 100644 --- a/mxcubecore/configuration/esrf_id29/slitbox.xml +++ b/mxcubecore/configuration/esrf_id29/slitbox.xml @@ -4,8 +4,8 @@ - - + + t1v t1h diff --git a/mxcubecore/configuration/esrf_id29/udiff_aperturemot.xml b/mxcubecore/configuration/esrf_id29/udiff_aperturemot.xml index b076577cf8..4c3759a900 100644 --- a/mxcubecore/configuration/esrf_id29/udiff_aperturemot.xml +++ b/mxcubecore/configuration/esrf_id29/udiff_aperturemot.xml @@ -3,17 +3,17 @@ 10 0.15 - + 20 0.28 - + 30 0.52 - + 75 1.21 - + diff --git a/mxcubecore/configuration/esrf_id29/udiff_sample_horizontal.xml b/mxcubecore/configuration/esrf_id29/udiff_sample_horizontal.xml index fc73490f1b..6952b01ef1 100644 --- a/mxcubecore/configuration/esrf_id29/udiff_sample_horizontal.xml +++ b/mxcubecore/configuration/esrf_id29/udiff_sample_horizontal.xml @@ -2,7 +2,7 @@ vert horizontal 1e-3 - - - + + + diff --git a/mxcubecore/configuration/esrf_id29/udiff_sample_vertical.xml b/mxcubecore/configuration/esrf_id29/udiff_sample_vertical.xml index 1bd6ce4285..5ea27bab69 100644 --- a/mxcubecore/configuration/esrf_id29/udiff_sample_vertical.xml +++ b/mxcubecore/configuration/esrf_id29/udiff_sample_vertical.xml @@ -2,7 +2,7 @@ vert vertical 1e-3 - - - + + + diff --git a/mxcubecore/configuration/esrf_id30a2/gphl_beamline_config/filenametemplates.xml b/mxcubecore/configuration/esrf_id30a2/gphl_beamline_config/filenametemplates.xml index 0f050d6055..49d0609b75 100644 --- a/mxcubecore/configuration/esrf_id30a2/gphl_beamline_config/filenametemplates.xml +++ b/mxcubecore/configuration/esrf_id30a2/gphl_beamline_config/filenametemplates.xml @@ -158,7 +158,7 @@ Element names are tied to the beamline or workflow and cannot be modified beam_setting_index unsignedInt - + _ @@ -167,7 +167,7 @@ Element names are tied to the beamline or workflow and cannot be modified run_number unsignedInt - + _ @@ -213,7 +213,7 @@ Element names are tied to the beamline or workflow and cannot be modified beam_setting_index unsignedInt - + inverse_beam_component_sign string @@ -227,7 +227,7 @@ Element names are tied to the beamline or workflow and cannot be modified run_number unsignedInt - + _ @@ -279,7 +279,7 @@ Element names are tied to the beamline or workflow and cannot be modified run_number unsignedInt - + _ @@ -381,6 +381,6 @@ Element names are tied to the beamline or workflow and cannot be modified Beamline - + diff --git a/mxcubecore/configuration/esrf_id30a2/gphl_beamline_config/transcal_2stage.json b/mxcubecore/configuration/esrf_id30a2/gphl_beamline_config/transcal_2stage.json index 37c92bde5f..86b2a2d2dc 100644 --- a/mxcubecore/configuration/esrf_id30a2/gphl_beamline_config/transcal_2stage.json +++ b/mxcubecore/configuration/esrf_id30a2/gphl_beamline_config/transcal_2stage.json @@ -1,5 +1,5 @@ [ - { + { "#": "Settings (omega, kappa, phi) for running TransCal on a mini-Kappa (short protocol, without SOC)", "settings": [ 0, 0, 0, @@ -15,10 +15,10 @@ "noRefineSOC": true, "useRecen": false }, - + { "#": "Settings(omega, kappa, phi) for running TransCal on a mini-Kappa (medium-length protocol)", - + "settings": [ 0.00, 0.00, -90.00, 0.00, 0.00, -45.00, diff --git a/mxcubecore/configuration/lnls_manaca/queue.xml b/mxcubecore/configuration/lnls_manaca/queue.xml index 69a869125c..723681eb4b 100644 --- a/mxcubecore/configuration/lnls_manaca/queue.xml +++ b/mxcubecore/configuration/lnls_manaca/queue.xml @@ -1,3 +1,3 @@ - + diff --git a/mxcubecore/configuration/lnls_manaca/queue_model.xml b/mxcubecore/configuration/lnls_manaca/queue_model.xml index 41bba18737..de365c254d 100644 --- a/mxcubecore/configuration/lnls_manaca/queue_model.xml +++ b/mxcubecore/configuration/lnls_manaca/queue_model.xml @@ -1,3 +1,3 @@ - + diff --git a/mxcubecore/configuration/lnls_manaca/xml_rpc_server.xml b/mxcubecore/configuration/lnls_manaca/xml_rpc_server.xml index 997c2e761c..cf6ac11f56 100644 --- a/mxcubecore/configuration/lnls_manaca/xml_rpc_server.xml +++ b/mxcubecore/configuration/lnls_manaca/xml_rpc_server.xml @@ -2,7 +2,7 @@ True - + 7171 diff --git a/mxcubecore/configuration/lnls_sol/queue.xml b/mxcubecore/configuration/lnls_sol/queue.xml index 69a869125c..723681eb4b 100644 --- a/mxcubecore/configuration/lnls_sol/queue.xml +++ b/mxcubecore/configuration/lnls_sol/queue.xml @@ -1,3 +1,3 @@ - + diff --git a/mxcubecore/configuration/lnls_sol/queue_model.xml b/mxcubecore/configuration/lnls_sol/queue_model.xml index 41bba18737..de365c254d 100644 --- a/mxcubecore/configuration/lnls_sol/queue_model.xml +++ b/mxcubecore/configuration/lnls_sol/queue_model.xml @@ -1,3 +1,3 @@ - + diff --git a/mxcubecore/configuration/lnls_sol/xml_rpc_server.xml b/mxcubecore/configuration/lnls_sol/xml_rpc_server.xml index 997c2e761c..cf6ac11f56 100644 --- a/mxcubecore/configuration/lnls_sol/xml_rpc_server.xml +++ b/mxcubecore/configuration/lnls_sol/xml_rpc_server.xml @@ -2,7 +2,7 @@ True - + 7171 diff --git a/mxcubecore/configuration/mockup/gphl/alba_session.xml b/mxcubecore/configuration/mockup/gphl/alba_session.xml index cf60be3672..427d620049 100755 --- a/mxcubecore/configuration/mockup/gphl/alba_session.xml +++ b/mxcubecore/configuration/mockup/gphl/alba_session.xml @@ -1,4 +1,4 @@ - + diff --git a/mxcubecore/configuration/mockup/offline-processing-mockup.xml b/mxcubecore/configuration/mockup/offline-processing-mockup.xml index cf2df490d0..886dd9dbe2 100644 --- a/mxcubecore/configuration/mockup/offline-processing-mockup.xml +++ b/mxcubecore/configuration/mockup/offline-processing-mockup.xml @@ -3,7 +3,7 @@ Each autoprocessing program is executable script. Script is stored and executed when the event is called - remove Break to run actual script + remove Break to run actual script --> diff --git a/mxcubecore/configuration/mockup/qt/camera-mockup.xml b/mxcubecore/configuration/mockup/qt/camera-mockup.xml index 1c80869fe3..92a2ab43b5 100644 --- a/mxcubecore/configuration/mockup/qt/camera-mockup.xml +++ b/mxcubecore/configuration/mockup/qt/camera-mockup.xml @@ -1,3 +1,3 @@ - - 1 + + 1 diff --git a/mxcubecore/configuration/mockup/qt/sample-view.xml b/mxcubecore/configuration/mockup/qt/sample-view.xml index 4a5c192516..e6d9face67 100644 --- a/mxcubecore/configuration/mockup/qt/sample-view.xml +++ b/mxcubecore/configuration/mockup/qt/sample-view.xml @@ -2,7 +2,7 @@ --> - @@ -11,7 +11,7 @@ - (1, 1.5, 2, 2.5, 3, 4, 5) + (1, 1.5, 2, 2.5, 3, 4, 5) diff --git a/mxcubecore/configuration/mockup/queue-model.xml b/mxcubecore/configuration/mockup/queue-model.xml index b59b28a9bd..a028f73517 100644 --- a/mxcubecore/configuration/mockup/queue-model.xml +++ b/mxcubecore/configuration/mockup/queue-model.xml @@ -1,7 +1,7 @@ - - - diff --git a/mxcubecore/configuration/mockup/slits-mockup.xml b/mxcubecore/configuration/mockup/slits-mockup.xml index 185f2b516c..76f89883b6 100644 --- a/mxcubecore/configuration/mockup/slits-mockup.xml +++ b/mxcubecore/configuration/mockup/slits-mockup.xml @@ -10,5 +10,5 @@ 0.005 0.300 0.0005 - + diff --git a/mxcubecore/configuration/mockup/xml-rpc-server.xml b/mxcubecore/configuration/mockup/xml-rpc-server.xml index 1a669d9463..f5d8c192c7 100644 --- a/mxcubecore/configuration/mockup/xml-rpc-server.xml +++ b/mxcubecore/configuration/mockup/xml-rpc-server.xml @@ -3,7 +3,7 @@ - + True diff --git a/mxcubecore/configuration/soleil/px2/mockups/gphl_beamline_config/filenametemplates.xml b/mxcubecore/configuration/soleil/px2/mockups/gphl_beamline_config/filenametemplates.xml index b3ae6d7b47..d1796a0727 100755 --- a/mxcubecore/configuration/soleil/px2/mockups/gphl_beamline_config/filenametemplates.xml +++ b/mxcubecore/configuration/soleil/px2/mockups/gphl_beamline_config/filenametemplates.xml @@ -158,7 +158,7 @@ Element names are tied to the beamline or workflow and cannot be modified beam_setting_index unsignedInt - + _ @@ -167,7 +167,7 @@ Element names are tied to the beamline or workflow and cannot be modified run_number unsignedInt - + _ @@ -213,7 +213,7 @@ Element names are tied to the beamline or workflow and cannot be modified beam_setting_index unsignedInt - + inverse_beam_component_sign string @@ -227,7 +227,7 @@ Element names are tied to the beamline or workflow and cannot be modified run_number unsignedInt - + _ @@ -279,7 +279,7 @@ Element names are tied to the beamline or workflow and cannot be modified run_number unsignedInt - + _ diff --git a/mxcubecore/configuration/soleil/px2/mockups/gphl_beamline_config/transcal_2stage.json b/mxcubecore/configuration/soleil/px2/mockups/gphl_beamline_config/transcal_2stage.json index 37c92bde5f..86b2a2d2dc 100755 --- a/mxcubecore/configuration/soleil/px2/mockups/gphl_beamline_config/transcal_2stage.json +++ b/mxcubecore/configuration/soleil/px2/mockups/gphl_beamline_config/transcal_2stage.json @@ -1,5 +1,5 @@ [ - { + { "#": "Settings (omega, kappa, phi) for running TransCal on a mini-Kappa (short protocol, without SOC)", "settings": [ 0, 0, 0, @@ -15,10 +15,10 @@ "noRefineSOC": true, "useRecen": false }, - + { "#": "Settings(omega, kappa, phi) for running TransCal on a mini-Kappa (medium-length protocol)", - + "settings": [ 0.00, 0.00, -90.00, 0.00, 0.00, -45.00, diff --git a/mxcubecore/configuration/soleil_px1/beamline-setup.xml b/mxcubecore/configuration/soleil_px1/beamline-setup.xml index f1b7843767..38a4365c53 100644 --- a/mxcubecore/configuration/soleil_px1/beamline-setup.xml +++ b/mxcubecore/configuration/soleil_px1/beamline-setup.xml @@ -13,7 +13,7 @@ - + @@ -32,9 +32,9 @@ - + - + barcode @@ -60,8 +60,8 @@ numSampleOnDiff - - + + di_PRI4_SOM di_AllLidsClosed diff --git a/mxcubecore/configuration/soleil_px1/energyscan.xml b/mxcubecore/configuration/soleil_px1/energyscan.xml index 150989e454..fde74a585a 100644 --- a/mxcubecore/configuration/soleil_px1/energyscan.xml +++ b/mxcubecore/configuration/soleil_px1/energyscan.xml @@ -12,7 +12,7 @@ - + i10-c-c03/dt/xbpm_diode.2 80 @@ -46,7 +46,7 @@ Cr K - + Mn K @@ -202,7 +202,7 @@ Dy L - + Ho L @@ -214,7 +214,7 @@ Tm L - + Yb L diff --git a/mxcubecore/configuration/soleil_px1/flux.xml b/mxcubecore/configuration/soleil_px1/flux.xml index 1abf1f0009..c29d4dfb30 100644 --- a/mxcubecore/configuration/soleil_px1/flux.xml +++ b/mxcubecore/configuration/soleil_px1/flux.xml @@ -1,6 +1,6 @@ flux - i10-c-cx1/ex/flux + i10-c-cx1/ex/flux flux State diff --git a/mxcubecore/configuration/soleil_px1/ge1350c.xml b/mxcubecore/configuration/soleil_px1/ge1350c.xml index ea05b8f0f2..0797f5330b 100644 --- a/mxcubecore/configuration/soleil_px1/ge1350c.xml +++ b/mxcubecore/configuration/soleil_px1/ge1350c.xml @@ -1,7 +1,7 @@ Prosilica Lima prosilica - i10-c-cx1/ex/imag.2 + i10-c-cx1/ex/imag.2 bayer_2_rgb 50 diff --git a/mxcubecore/configuration/soleil_px1/light.xml b/mxcubecore/configuration/soleil_px1/light.xml index 8b487e7b84..81c89c3fdc 100644 --- a/mxcubecore/configuration/soleil_px1/light.xml +++ b/mxcubecore/configuration/soleil_px1/light.xml @@ -7,5 +7,5 @@ move 1000 10. - + diff --git a/mxcubecore/configuration/soleil_px1/minidiff.xml b/mxcubecore/configuration/soleil_px1/minidiff.xml index 93d1be9ecc..cec4214739 100644 --- a/mxcubecore/configuration/soleil_px1/minidiff.xml +++ b/mxcubecore/configuration/soleil_px1/minidiff.xml @@ -10,7 +10,7 @@ - + diff --git a/mxcubecore/configuration/soleil_px1/mxcollect.xml b/mxcubecore/configuration/soleil_px1/mxcollect.xml index fbe7a7c17f..b4c91a236a 100644 --- a/mxcubecore/configuration/soleil_px1/mxcollect.xml +++ b/mxcubecore/configuration/soleil_px1/mxcollect.xml @@ -18,16 +18,16 @@ - - - + + + - - - + + + - + /nfs/ruche/share-dev/px1dev/MXCuBE/tools/adxv_makejpeg.sh /nfs/ruche/share-dev/px1dev/MXCuBE/tools/run_chooch.sh diff --git a/mxcubecore/configuration/soleil_px1/px1environment.xml b/mxcubecore/configuration/soleil_px1/px1environment.xml index 6a1f6676f9..3269cf47a1 100644 --- a/mxcubecore/configuration/soleil_px1/px1environment.xml +++ b/mxcubecore/configuration/soleil_px1/px1environment.xml @@ -1,6 +1,6 @@ PX1Environment - i10-c-cx1/ex/PX1Environment + i10-c-cx1/ex/PX1Environment State beamlineMvtAuthorized diff --git a/mxcubecore/configuration/soleil_px1/queue-model.xml b/mxcubecore/configuration/soleil_px1/queue-model.xml index 41bba18737..de365c254d 100644 --- a/mxcubecore/configuration/soleil_px1/queue-model.xml +++ b/mxcubecore/configuration/soleil_px1/queue-model.xml @@ -1,3 +1,3 @@ - + diff --git a/mxcubecore/configuration/soleil_px1/queue.xml b/mxcubecore/configuration/soleil_px1/queue.xml index 69a869125c..723681eb4b 100644 --- a/mxcubecore/configuration/soleil_px1/queue.xml +++ b/mxcubecore/configuration/soleil_px1/queue.xml @@ -1,3 +1,3 @@ - + diff --git a/mxcubecore/configuration/soleil_px1/session.xml b/mxcubecore/configuration/soleil_px1/session.xml index 448ff6ff98..50d995f779 100644 --- a/mxcubecore/configuration/soleil_px1/session.xml +++ b/mxcubecore/configuration/soleil_px1/session.xml @@ -1,8 +1,8 @@ - + - + SOLEIL px1 PROXIMA1 diff --git a/mxcubecore/configuration/soleil_px1/xml-rpc-server.xml b/mxcubecore/configuration/soleil_px1/xml-rpc-server.xml index 2823fdb2a8..aa71f3a7ed 100644 --- a/mxcubecore/configuration/soleil_px1/xml-rpc-server.xml +++ b/mxcubecore/configuration/soleil_px1/xml-rpc-server.xml @@ -2,7 +2,7 @@ True - + 7171 diff --git a/mxcubecore/configuration/soleil_px1/zoom.xml b/mxcubecore/configuration/soleil_px1/zoom.xml index f905f9b839..362fe44d70 100644 --- a/mxcubecore/configuration/soleil_px1/zoom.xml +++ b/mxcubecore/configuration/soleil_px1/zoom.xml @@ -3,7 +3,7 @@ Zoom - i10-c-cx1/ex/zoom.1-mt_tz + i10-c-cx1/ex/zoom.1-mt_tz PhiTableXAxisPosition State position diff --git a/mxcubecore/configuration/soleil_px2/beamline-setup.xml b/mxcubecore/configuration/soleil_px2/beamline-setup.xml index 7977b970d5..8566f798e0 100644 --- a/mxcubecore/configuration/soleil_px2/beamline-setup.xml +++ b/mxcubecore/configuration/soleil_px2/beamline-setup.xml @@ -4,7 +4,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/mxcubecore/configuration/soleil_px2/diffractometer/aperture_diameter.xml b/mxcubecore/configuration/soleil_px2/diffractometer/aperture_diameter.xml index 6a6aa5f1c4..ccb51ad134 100644 --- a/mxcubecore/configuration/soleil_px2/diffractometer/aperture_diameter.xml +++ b/mxcubecore/configuration/soleil_px2/diffractometer/aperture_diameter.xml @@ -1,6 +1,6 @@ Diameter - 172.19.10.119:9001 + 172.19.10.119:9001 CurrentApertureDiameterIndex State ApertureDiameters diff --git a/mxcubecore/configuration/soleil_px2/diffractometer/diffractometer.xml b/mxcubecore/configuration/soleil_px2/diffractometer/diffractometer.xml index e82f61a447..2f9c85d3cc 100644 --- a/mxcubecore/configuration/soleil_px2/diffractometer/diffractometer.xml +++ b/mxcubecore/configuration/soleil_px2/diffractometer/diffractometer.xml @@ -32,8 +32,8 @@ - - True + + True {"x": 680,"y": 512} {"actuator_name": "phiz", "position": -0.121, "camera_axis":"y","direction": -1} diff --git a/mxcubecore/configuration/soleil_px2/diffractometer/exporter/aperture_diameter.xml b/mxcubecore/configuration/soleil_px2/diffractometer/exporter/aperture_diameter.xml index 6a6aa5f1c4..ccb51ad134 100644 --- a/mxcubecore/configuration/soleil_px2/diffractometer/exporter/aperture_diameter.xml +++ b/mxcubecore/configuration/soleil_px2/diffractometer/exporter/aperture_diameter.xml @@ -1,6 +1,6 @@ Diameter - 172.19.10.119:9001 + 172.19.10.119:9001 CurrentApertureDiameterIndex State ApertureDiameters diff --git a/mxcubecore/configuration/soleil_px2/diffractometer/exporter/diffractometer.xml b/mxcubecore/configuration/soleil_px2/diffractometer/exporter/diffractometer.xml index 8ef7621569..843bd719ae 100644 --- a/mxcubecore/configuration/soleil_px2/diffractometer/exporter/diffractometer.xml +++ b/mxcubecore/configuration/soleil_px2/diffractometer/exporter/diffractometer.xml @@ -12,8 +12,8 @@ CapillaryPosition TransferMode SampleIsLoaded - - + + startSetPhase startAutoFocus saveCentringPositions @@ -34,8 +34,8 @@ - - True + + True {"x": 680,"y": 512} {"actuator_name": "phiz", "position": -0.121, "camera_axis":"y","direction": -1} diff --git a/mxcubecore/configuration/soleil_px2/diffractometer/tango_events/diffractometer.xml b/mxcubecore/configuration/soleil_px2/diffractometer/tango_events/diffractometer.xml index c9e5cd1171..2e3ac70992 100644 --- a/mxcubecore/configuration/soleil_px2/diffractometer/tango_events/diffractometer.xml +++ b/mxcubecore/configuration/soleil_px2/diffractometer/tango_events/diffractometer.xml @@ -29,8 +29,8 @@ - - True + + True {"x": 680,"y": 512} {"actuator_name": "phiz", "position": -0.121, "camera_axis":"y","direction": -1} diff --git a/mxcubecore/configuration/soleil_px2/diffractometer/tango_polling/diffractometer.xml b/mxcubecore/configuration/soleil_px2/diffractometer/tango_polling/diffractometer.xml index 5d8a6f6026..cb4ddf14c2 100644 --- a/mxcubecore/configuration/soleil_px2/diffractometer/tango_polling/diffractometer.xml +++ b/mxcubecore/configuration/soleil_px2/diffractometer/tango_polling/diffractometer.xml @@ -29,8 +29,8 @@ - - True + + True {"x": 680,"y": 512} {"actuator_name": "phiz", "position": -0.121, "camera_axis":"y","direction": -1}