Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ESRF Specific files] - Cleanup, deletion and linting of ESRF specific files #1123

Merged
merged 3 commits into from
Feb 5, 2025
Merged

[ESRF Specific files] - Cleanup, deletion and linting of ESRF specific files #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
feb4a5a
[ESRF] - Cleaned up and removed files
marcus-oscarsson Jan 31, 2025
68ff5f0
[ESRF] - Fixes to ESRF specific HardwareObjects
marcus-oscarsson Nov 5, 2024
1b02c1b
Lint after review
marcus-oscarsson Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions mxcubecore/HardwareObjects/Bliss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
import gevent
import numpy
from bliss.config import static
from bliss.data.node import (
DataNode,
get_or_create_node,
)

from mxcubecore.BaseHardwareObjects import HardwareObject

Expand Down
46 changes: 0 additions & 46 deletions mxcubecore/HardwareObjects/ESRF/BM14EnergyScan.py
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion mxcubecore/HardwareObjects/ESRF/ESRFSession.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def __init__(self, name):

def init(self):
Session.Session.init(self)
self._use_acronym = self.get_property("use_acronym", True)

archive_base_directory = self["file_info"].get_property(
"archive_base_directory"
Expand Down Expand Up @@ -95,7 +96,7 @@ def get_default_subdir(self, sample_data: dict) -> str:
sample_name = sample_data.name
protein_acronym = sample_data.crystals[0].protein_acronym

if protein_acronym:
if self._use_acronym and protein_acronym:
subdir = "%s/%s-%s/" % (protein_acronym, protein_acronym, sample_name)
else:
subdir = "%s/" % sample_name
Expand Down
6 changes: 3 additions & 3 deletions mxcubecore/HardwareObjects/ESRF/ID231BeamCmds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(self, *args):
def init(self):
controller = self.get_object_by_role("controller")
detcover = self.get_object_by_role("detcover")
scintilator = self.get_object_by_role("scintilator")
scintillator = self.get_object_by_role("scintillator")
aperture = self.get_object_by_role("aperture")
hutchtrigger = self.get_object_by_role("hutchtrigger")
cryo = self.get_object_by_role("cryostream")
Expand All @@ -26,7 +26,7 @@ def init(self):
# self.anneal = ControllerCommand("Anneal", controller.anneal_procedure)

self.detcover = HWObjActuatorCommand("Detector cover", detcover)
self.scintilator = HWObjActuatorCommand("Scintillator", scintilator)
self.scintillator = HWObjActuatorCommand("Scintillator", scintillator)
self.aperture = HWObjActuatorCommand("Aperture", aperture)
self.hutchtrigger = HWObjActuatorCommand("Hutchtrigger", hutchtrigger)
self.cryo = HWObjActuatorCommand("Cryostream", cryo)
Expand All @@ -38,7 +38,7 @@ def get_commands(self):
self.quick_realign,
# self.anneal,
self.detcover,
self.scintilator,
self.scintillator,
self.aperture,
self.hutchtrigger,
self.cryo,
Expand Down
147 changes: 0 additions & 147 deletions mxcubecore/HardwareObjects/ESRF/ID232HutchTrigger.py
View file
Open in desktop

This file was deleted.

92 changes: 0 additions & 92 deletions mxcubecore/HardwareObjects/ESRF/ID23PhotonFlux.py
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions mxcubecore/HardwareObjects/ESRF/ID29BeamCmds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def __init__(self, *args):
def init(self):
controller = self.get_object_by_role("controller")
detcover = self.get_object_by_role("detcover")
scintilator = self.get_object_by_role("scintilator")
scintillator = self.get_object_by_role("scintillator")
aperture = self.get_object_by_role("aperture")
hutchtrigger = self.get_object_by_role("hutchtrigger")
cryo = self.get_object_by_role("cryo")
Expand All @@ -26,7 +26,7 @@ def init(self):
self.anneal = ControllerCommand("Anneal", controller.anneal_procedure)

self.detcover = HWObjActuatorCommand("Detector cover", detcover)
self.scintilator = HWObjActuatorCommand("Scintillator", scintilator)
self.scintillator = HWObjActuatorCommand("Scintillator", scintillator)
self.aperture = HWObjActuatorCommand("Aperture", aperture)
self.hutchtrigger = HWObjActuatorCommand("Hutchtrigger", hutchtrigger)
self.cryo = HWObjActuatorCommand("Cryo", cryo)
Expand All @@ -37,7 +37,7 @@ def get_commands(self):
self.quick_realign,
self.anneal,
self.detcover,
self.scintilator,
self.scintillator,
self.aperture,
self.hutchtrigger,
self.cryo,
Expand Down
Loading