start headless mode with no config

henrypinkard · Sep 21, 2023 · 8662193 · 8662193
1 parent 274de12
commit 8662193
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.pycro-manager</groupId>
     <artifactId>PycroManagerJava</artifactId>
-     <version>0.44.1</version>
+     <version>0.44.2</version>
     <packaging>jar</packaging>
     <name>Pycro-Manager Java</name>
     <description>The Java components of Pycro-Manager</description>
@@ -144,4 +144,4 @@
       </repository>
    </distributionManagement>
 
-</project>
+</project>
diff --git a/java/src/main/java/org/micromanager/remote/HeadlessLauncher.java b/java/src/main/java/org/micromanager/remote/HeadlessLauncher.java
@@ -30,7 +30,9 @@ public static void main(String[] args) throws Exception {
       int bufferSizeMB = Integer.parseInt(args[2]);
       String coreLogPath = args[3];
 
-      core.loadSystemConfiguration(configFilePath);
+      if (configFilePath != null && configFilePath.isEmpty()) {
+         core.loadSystemConfiguration(configFilePath);
+      }
       core.setCircularBufferMemoryFootprint(bufferSizeMB);
       core.enableStderrLog(true);
       core.enableDebugLog(true);

diff --git a/pycromanager/_version.py b/pycromanager/_version.py
@@ -1,2 +1,2 @@
-version_info = (0, 29, 1)
+version_info = (0, 29, 2)
 __version__ = ".".join(map(str, version_info))
diff --git a/pycromanager/headless.py b/pycromanager/headless.py
@@ -184,7 +184,7 @@ def start_headless(
                     # "-XX:MaxDirectMemorySize=1000",
                     "org.micromanager.remote.HeadlessLauncher",
                     str(port),
-                    config_file,
+                    '' if config_file is None else config_file,
                     str(buffer_size_mb),
                     core_log_path,
                 ], cwd=mm_app_path, stdout=subprocess.PIPE

diff --git a/pycromanager/test/test_startup.py b/pycromanager/test/test_startup.py
@@ -1,7 +1,6 @@
 import os
 from pycromanager import Core
 
-
 def test_connect_to_core(launch_mm_headless):
     mmc = Core()