Merge pull request #121 from henrypinkard/main

Fix multi cam

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.acqengj</groupId>
     <artifactId>AcqEngJ</artifactId>
-    <version>0.37.1</version>
+    <version>0.37.2</version>
     <packaging>jar</packaging>
      <name>AcqEngJ</name>
     <description>Java-based Acquisition engine for Micro-Manager</description>

src/main/java/org/micromanager/acqj/internal/Engine.java

@@ -536,7 +536,13 @@ private void acquireImages(final AcquisitionEvent event,
                         // TODO: probably there should be a timeout here too, but I'm
                         //  not sure the snapImage system supports it (as opposed to sequences)
                         ti = core_.getTaggedImage(camIndex);
-                        cameraName = core_.getCameraDevice();
+                        if (ti.tags.has("Camera")) {
+                           // This is present for multi cam adapter
+                           cameraName = ti.tags.getString("Camera");
+                        } else {
+                           // but not regular cameras
+                           cameraName = core_.getCameraDevice();
+                        }
                      } catch (Exception e) {
                         //continue waiting
                      }
@@ -606,6 +612,11 @@ private void acquireImages(final AcquisitionEvent event,
             // add standard metadata
             AcqEngMetadata.addImageMetadata(ti.tags, correspondingEvent,
                     currentTime - correspondingEvent.acquisition_.getStartTime_ms(), exposure);
+            // special behavior for multi camera adapter
+            if (core_.getNumberOfCameraChannels() > 1) {
+               AcqEngMetadata.setAxisPosition(ti.tags, "camera", cameraName);
+            }
+
             // add user metadata specified in the event
             try {
                correspondingEvent.acquisition_.addTagsToTaggedImage(ti.tags, correspondingEvent.getTags());
@@ -620,9 +631,11 @@ private void acquireImages(final AcquisitionEvent event,
       // this is not the most pleasant place to put this call, but I can not find anything better.
       stopHardwareSequences(hardwareSequencesInProgress);
 
-      event.acquisition_.postNotification(
-              new AcqNotification(AcqNotification.Camera.class,
-                      axesAsJSONString, AcqNotification.Camera.POST_SEQUENCE_STOPPED));
+      if (event.getSequence() != null) {
+         event.acquisition_.postNotification(
+                 new AcqNotification(AcqNotification.Camera.class,
+                         axesAsJSONString, AcqNotification.Camera.POST_SEQUENCE_STOPPED));
+      }
 
       if (timeout) {
          throw new TimeoutException("Timeout waiting for images to arrive in circular buffer");