Skip to content

Commit

Permalink
Code cleanup for super() in init (PR854)
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Gruzinov committed Feb 21, 2024
1 parent bb7335e commit 33759a9
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion mxcubecore/HardwareObjects/DESY/P11AlbulaView.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def start(self, path=None, filetype=None, interval=None, stream=False):
self.eigerThread.clearMonitorBuffer()
self.eigerThread.setMonitorDiscardNew(True)

super(LiveView, self).start()
super().start()

def stop(self, interval=0.0):

Expand Down
4 changes: 2 additions & 2 deletions mxcubecore/HardwareObjects/DESY/P11BackLight.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class P11BackLight(AbstractNState):

def __init__(self, name):

super(AbstractNState, self).__init__(name)
super().__init__(name)

self.cmd_open_close = None
self.cmd_started = 0
Expand All @@ -72,7 +72,7 @@ def init(self):
self.chan_value.connect_signal("update", self.update_light_state)

self.update_light_state(self.chan_value.get_value())
super(AbstractNState, self).init()
super().init()

def get_value(self):
return self.update_light_state()
Expand Down
2 changes: 1 addition & 1 deletion mxcubecore/HardwareObjects/DESY/P11Beam.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

class P11Beam(AbstractBeam):
def __init__(self, *args):
super(P11Beam, self).__init__(*args)
super().__init__(*args)

self._beam_size_dict = {"aperture": [9999, 9999], "slits": [9999, 9999]}

Expand Down
4 changes: 2 additions & 2 deletions mxcubecore/HardwareObjects/DESY/P11Collect.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@

class P11Collect(AbstractCollect):
def __init__(self, *args):
super(P11Collect, self).__init__(*args)
super().__init__(*args)

def init(self):

super(P11Collect, self).init()
super().init()

# os.system("/opt/xray/bin/adxv -socket -colors Gray -rings &")

Expand Down
4 changes: 2 additions & 2 deletions mxcubecore/HardwareObjects/DESY/P11DetectorCover.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class P11DetectorCover(AbstractShutter):

def __init__(self, name):

super(AbstractShutter, self).__init__(name)
super().__init__(name)

self.simulation = False
self.simulated_opened = False
Expand Down Expand Up @@ -90,7 +90,7 @@ def init(self):
else:
self.simulated_update()

super(AbstractShutter, self).init()
super().init()

def _initialise_values(self):
"""Add additional, known in advance states to VALUES"""
Expand Down
2 changes: 1 addition & 1 deletion mxcubecore/HardwareObjects/DESY/P11DetectorDistance.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def update_value(self, value=None):
if value is None:
value = self.chan_position.get_value()

super(P11DetectorDistance, self).update_value(value)
super().update_value(value)

def _set_value(self, value):
"""
Expand Down
2 changes: 1 addition & 1 deletion mxcubecore/HardwareObjects/DESY/P11Energy.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class P11Energy(AbstractEnergy):
_default_energy = 12.0

def __init__(self, name):
super(P11Energy, self).__init__(name)
super().__init__(name)

def init(self):
self.chan_energy = self.get_channel_object("chanEnergy")
Expand Down
4 changes: 2 additions & 2 deletions mxcubecore/HardwareObjects/DESY/P11FastShutter.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class P11FastShutter(AbstractNState):

def __init__(self, name):

super(AbstractNState, self).__init__(name)
super().__init__(name)
self.chan_value = None

def init(self):
Expand All @@ -55,7 +55,7 @@ def init(self):
self.chan_value.connect_signal("update", self.update_fast_shutter)

self.update_fast_shutter(self.chan_value.get_value())
super(AbstractNState, self).init()
super().init()

def _initialise_values(self):
"""Add additional, known in advance states to VALUES"""
Expand Down
4 changes: 2 additions & 2 deletions mxcubecore/HardwareObjects/DESY/P11Pinhole.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
class P11Pinhole(MotorsNPosition):
def __init__(self, name):

super(P11Pinhole, self).__init__(name)
super().__init__(name)

self._config_file = None

Expand All @@ -44,7 +44,7 @@ def init(self):

self._config_file = self.get_property("config_file")

super(P11Pinhole, self).init()
super().init()

def load_positions(self):

Expand Down
2 changes: 1 addition & 1 deletion mxcubecore/HardwareObjects/DESY/P11SampleChanger.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class P11SampleChanger(SampleChanger):
NO_OF_SAMPLES_IN_BASKET = 16

def __init__(self, *args, **kwargs):
super(P11SampleChanger, self).__init__(self.__TYPE__, False, *args, **kwargs)
super().__init__(self.__TYPE__, False, *args, **kwargs)

def init(self):
self._selected_sample = -1
Expand Down
4 changes: 2 additions & 2 deletions mxcubecore/HardwareObjects/DESY/P11Session.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ class P11Session(Session):
default_archive_folder = "raw"

def __init__(self, *args):
super(P11Session, self).__init__(*args)
super().__init__(*args)

def init(self):

super(P11Session, self).init()
super().init()

self.settings_file = self.get_property("p11_settings_file")
self.operation_mode = self.get_property("mode")
Expand Down
4 changes: 2 additions & 2 deletions mxcubecore/HardwareObjects/DESY/P11Shutter.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class BaseValueEnum(Enum):

def __init__(self, name):

super(AbstractShutter, self).__init__(name)
super().__init__(name)

self.simulation = False
self.simulated_opened = True
Expand Down Expand Up @@ -90,7 +90,7 @@ def init(self):

self.update_state(self.STATES.READY)

super(AbstractShutter, self).init()
super().init()

def _initialise_values(self):
"""Add additional, known in advance states to VALUES"""
Expand Down
2 changes: 1 addition & 1 deletion mxcubecore/HardwareObjects/DESY/P11Transmission.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

class P11Transmission(AbstractTransmission):
def __init__(self, name):
super(P11Transmission, self).__init__(name)
super().__init__(name)

self.chan_read_value = None
self.chan_set_value = None
Expand Down
2 changes: 1 addition & 1 deletion mxcubecore/HardwareObjects/DESY/ValueStateChannel.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

class ValueStateChannel(HardwareObject):
def __init__(self, name):
super(ValueStateChannel, self).__init__(name)
super().__init__(name)

def init(self):

Expand Down

0 comments on commit 33759a9

Please sign in to comment.