Skip to content

Commit

Permalink
Add _mount_from_harvester abstract method
Browse files Browse the repository at this point in the history
Not use if I should i it here. but that will prevent key error in other  SC Class
  • Loading branch information
FLorial Jean Baptiste committed Dec 6, 2023
1 parent a496d6a commit 3332d3d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion mxcubecore/HardwareObjects/EMBLFlexHCD.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def init(self):
self._update_selection()
self.state = self._read_state()

def mount_from_harvester(self):
def _mount_from_harvester(self):
return self._harvester and self._harvester_hwo


Expand Down
20 changes: 10 additions & 10 deletions mxcubecore/HardwareObjects/Harvester.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
[Description]
Harvester is use as a replacement of the Dewar sample storage
This hardware object is use in couple with a Sample changer .
and it is compatible with the Crystal Direct Harvester 3.
It has some functionalities, like Harvest Sample, .
This hardware object is use in couple with a Sample changer.
Sample changer load the sample from Harvester instead of dewar.
It is compatible with the Crystal Direct Harvester 3.
It has some functionalities, like Harvest Sample, etc....
[Commands]
Expand All @@ -15,7 +16,7 @@
<username>harvester</username>
<exporter_address>wid30harvest:9001</exporter_address>
</equipment>
-------------------------------------------------------------------
-----------------------------------------------------------------
"""
import gevent
import logging
Expand All @@ -35,11 +36,11 @@ class HarvesterState:
Running = 4
Harvesting = 5
ContinueHarvesting = 6
# Disabled = 6
# Running = 5
# StandBy = 6
# Alarm = 7
# Fault = 8
# Disabled = 7
# Running = 8
# StandBy = 9
# Alarm = 10
# Fault = 11


STATE_DESC = {
Expand Down Expand Up @@ -76,7 +77,6 @@ def __init__(self, name):

def init(self):
""" Init """
# self.centring_calibration_hobj = self.getObjectByRole("centring_calibration")
self.exporter_addr = self.get_property("exporter_address")
self.crims_upload_url = self.get_property("crims_upload_url")

Expand Down
4 changes: 4 additions & 0 deletions mxcubecore/HardwareObjects/abstract/AbstractSampleChanger.py
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,10 @@ def _do_unload(self, sample_slot=None):
@abc.abstractmethod
def _do_reset(self):
return

@abc.abstractmethod
def _mount_from_harvester(self):
return

# ######################## PROTECTED #########################

Expand Down

0 comments on commit 3332d3d

Please sign in to comment.