Skip to content

Commit

Permalink
Merge pull request #9 from henrypinkard/main
Browse files Browse the repository at this point in the history
Fix import
  • Loading branch information
henrypinkard authored Jul 16, 2024
2 parents 5b5c041 + a4b3847 commit 8afafc2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/mmpycorex/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version_info = (0, 3, 5)
version_info = (0, 3, 6)
__version__ = ".".join(map(str, version_info))
7 changes: 5 additions & 2 deletions src/mmpycorex/launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def terminate_core_instances(debug=False):
atexit.register(terminate_core_instances)

def create_core_instance(
mm_app_path: str = get_default_install_location(), config_file: str='MMConfig_demo.cfg', java_loc: str=None,
mm_app_path: str = 'auto', config_file: str='MMConfig_demo.cfg', java_loc: str=None,
python_backend=False, core_log_path: str='',
buffer_size_mb: int=1024, max_memory_mb: int=2000,
port: int=DEFAULT_BRIDGE_PORT, debug=False):
Expand All @@ -139,7 +139,8 @@ def create_core_instance(
Parameters
----------
mm_app_path : str
Path to top level folder of Micro-Manager installation (made with graphical installer)
Path to top level folder of Micro-Manager installation (made with graphical installer). If 'auto', it will
use the default install location for the current OS
config_file : str
Path to micro-manager config file, with which core will be initialized. If None then initialization
is left to the user.
Expand All @@ -158,6 +159,8 @@ def create_core_instance(
debug : bool
Print debug messages
"""
if mm_app_path == 'auto':
mm_app_path = get_default_install_location()

if python_backend:
mmc = _create_pymmcore_instance()
Expand Down

0 comments on commit 8afafc2

Please sign in to comment.