Skip to content

Commit d8be2e6

Browse files
authored
Small bug fixes (#66)
* Fix autoconfig path bug * Add warning that cam client cannot be streamed * Fix NameError
1 parent efb2be0 commit d8be2e6

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

instamatic/TEMController/jeol_microscope.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import comtypes.client
77

88
from instamatic import config
9-
from instamatic.exceptions import JEOLValueError, TEMCommunicationError
9+
from instamatic.exceptions import JEOLValueError, TEMCommunicationError, TEMValueError
1010

1111
logger = logging.getLogger(__name__)
1212

instamatic/camera/camera_client.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,9 @@ def get_data_from_shared_memory(self, name: str, shape: tuple, dtype: str, **kwa
184184
data = buffer[:]
185185

186186
return data
187+
188+
def block(self):
189+
raise NotImplementedError('This camera cannot be streamed.')
190+
191+
def unblock(self):
192+
raise NotImplementedError('This camera cannot be streamed.')

instamatic/config/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,9 +272,9 @@ def load_all(microscope_name: str = None,
272272
'logs': logs_drc,
273273
'scripts': scripts_drc,
274274
'camera': alignments_drc,
275-
'microscope': calibration.location,
276-
'calibration': microscope.location,
277-
'alignments': camera.location,
275+
'microscope': calibration.location.parent,
276+
'calibration': microscope.location.parent,
277+
'alignments': camera.location.parent,
278278
'data': settings.data_directory,
279279
'work': settings.work_directory,
280280
'microscope_config': calibration.location,

0 commit comments

Comments
 (0)