Skip to content

MMCore: (more) proper support for multi-channel cameras #936

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

Draft
marktsuchida wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

MMCore: (more) proper support for multi-channel cameras #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e9ac340
Explicit object to represent sequence acquisitions
marktsuchida Apr 26, 2026
0437c6d
Let MMCore support multi-channel camera seq acq
marktsuchida Apr 30, 2026
2173d66
Fix indentation
marktsuchida May 1, 2026
b882e21
MMDevice: document seq acq contract better
marktsuchida May 1, 2026
35f7f35
MMCore: DRY start/stopSequenceAcquisition()
marktsuchida May 1, 2026
9fb8fea
Deduplicate mock AsyncCamera
marktsuchida May 2, 2026
49caa1c
Thread-safe autoshutter closing for seq acq
marktsuchida May 2, 2026
d481fb7
Roll back autoshutter on failed seq acq start
marktsuchida May 2, 2026
e48e9e8
Prevent concurrent seq acq with same cameras
marktsuchida May 2, 2026
dade037
Enfoce equal w/h/bpp/ncomp for composite cameras
marktsuchida May 2, 2026
e38731d
Prohibit sequence buffer init/resize during acq
marktsuchida May 3, 2026
acd28e6
Prevent deadlock from background PrepareForAcq()
marktsuchida May 4, 2026
9eee993
Fix exception paths for autoshutter opening
marktsuchida May 4, 2026
6a5b3d8
Fix deferred shutter closing on camera self-finish
marktsuchida May 6, 2026
6492ff4
Make isSequenceRunning() return per-acq status
marktsuchida May 7, 2026
f8d4cb9
Factor out common stopSequenceAcquisitionImpl impl
marktsuchida May 7, 2026
62293a9
stopSequenceAcquisition() requires primary camera
marktsuchida May 7, 2026
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
27 changes: 13 additions & 14 deletions DeviceAdapters/ArduinoCounter/ArduinoCounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,18 @@ int ArduinoCounterCamera::Logical2Physical(int logical)
return -1;
}

MM::Camera* ArduinoCounterCamera::GetChannelCameraPtr(unsigned n)
{
if (n >= nrCamerasInUse_)
return nullptr;
int ch = Logical2Physical(static_cast<int>(n));
if (ch < 0 || static_cast<unsigned>(ch) >= usedCameras_.size())
return nullptr;
if (usedCameras_[ch] == g_Undefined)
return nullptr;
return (MM::Camera*)GetDevice(usedCameras_[ch].c_str());
}


int ArduinoCounterCamera::OnPhysicalCamera(MM::PropertyBase* pProp, MM::ActionType eAct, long i)
{
Expand All @@ -636,29 +648,16 @@ int ArduinoCounterCamera::OnPhysicalCamera(MM::PropertyBase* pProp, MM::ActionTy

else if (eAct == MM::AfterSet)
{
MM::Camera* camera = (MM::Camera*)GetDevice(usedCameras_[i].c_str());
if (camera != 0)
{
camera->RemoveTag(MM::g_Keyword_CameraChannelName);
camera->RemoveTag(MM::g_Keyword_CameraChannelIndex);
}

std::string cameraName;
pProp->Get(cameraName);

if (cameraName == g_Undefined) {
usedCameras_[i] = g_Undefined;
}
else {
camera = (MM::Camera*)GetDevice(cameraName.c_str());
MM::Camera* camera = (MM::Camera*)GetDevice(cameraName.c_str());
if (camera != 0) {
usedCameras_[i] = cameraName;
std::ostringstream os;
os << i;
char myName[MM::MaxStrLength];
GetLabel(myName);
camera->AddTag(MM::g_Keyword_CameraChannelName, myName, usedCameras_[i].c_str());
camera->AddTag(MM::g_Keyword_CameraChannelIndex, myName, os.str().c_str());
}
else
return ERR_INVALID_DEVICE_NAME;
Expand Down
1 change: 1 addition & 0 deletions DeviceAdapters/ArduinoCounter/ArduinoCounter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ class ArduinoCounterCamera : public CCameraBase<ArduinoCounterCamera>
unsigned GetNumberOfComponents() const;
unsigned GetNumberOfChannels() const;
int GetChannelName(unsigned channel, char* name);
MM::Camera* GetChannelCameraPtr(unsigned n);
bool IsCapturing();

// action interface
Expand Down
27 changes: 13 additions & 14 deletions DeviceAdapters/TeensyPulseGenerator/CameraPulser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,18 @@ int CameraPulser::Logical2Physical(int logical)
return -1;
}

MM::Camera* CameraPulser::GetChannelCameraPtr(unsigned n)
{
if (n >= nrCamerasInUse_)
return nullptr;
int ch = Logical2Physical(static_cast<int>(n));
if (ch < 0 || static_cast<unsigned>(ch) >= usedCameras_.size())
return nullptr;
if (usedCameras_[ch] == g_Undefined)
return nullptr;
return (MM::Camera*)GetDevice(usedCameras_[ch].c_str());
}


int CameraPulser::OnPhysicalCamera(MM::PropertyBase* pProp, MM::ActionType eAct, long i)
{
Expand All @@ -657,29 +669,16 @@ int CameraPulser::OnPhysicalCamera(MM::PropertyBase* pProp, MM::ActionType eAct,

else if (eAct == MM::AfterSet)
{
MM::Camera* camera = (MM::Camera*)GetDevice(usedCameras_[i].c_str());
if (camera != 0)
{
camera->RemoveTag(MM::g_Keyword_CameraChannelName);
camera->RemoveTag(MM::g_Keyword_CameraChannelIndex);
}

std::string cameraName;
pProp->Get(cameraName);

if (cameraName == g_Undefined) {
usedCameras_[i] = g_Undefined;
}
else {
camera = (MM::Camera*)GetDevice(cameraName.c_str());
MM::Camera* camera = (MM::Camera*)GetDevice(cameraName.c_str());
if (camera != 0) {
usedCameras_[i] = cameraName;
std::ostringstream os;
os << i;
char myName[MM::MaxStrLength];
GetLabel(myName);
camera->AddTag(MM::g_Keyword_CameraChannelName, myName, usedCameras_[i].c_str());
camera->AddTag(MM::g_Keyword_CameraChannelIndex, myName, os.str().c_str());
}
else
return ERR_INVALID_DEVICE_NAME;
Expand Down
1 change: 1 addition & 0 deletions DeviceAdapters/TeensyPulseGenerator/CameraPulser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class CameraPulser : public CCameraBase<CameraPulser>
unsigned GetNumberOfComponents() const;
unsigned GetNumberOfChannels() const;
int GetChannelName(unsigned channel, char* name);
MM::Camera* GetChannelCameraPtr(unsigned n);
bool IsCapturing();

// action interface
Expand Down
11 changes: 1 addition & 10 deletions DeviceAdapters/TwoPhoton/TwoPhoton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,10 +995,6 @@ int BitFlowCamera::LiveThread::svc()
break;
}

char label[MM::MaxStrLength];
cam_->GetLabel(label);
std::string labelStr = label;

MM::MMTime timestamp = cam_->GetCurrentMMTime();
MM::CameraImageMetadata md;
std::string prefix = "TwoPhoton-";
Expand All @@ -1010,17 +1006,12 @@ int BitFlowCamera::LiveThread::svc()
md.AddTag(prefix + MM::g_Keyword_Metadata_ImageNumber,
CDeviceUtils::ConvertToString(imageCounter_));

// insert all channels
// MMCore stamps CameraChannelName based on CameraChannelIndex.
for (unsigned i=0; i<cam_->GetNumberOfChannels(); i++)
{
char buf[MM::MaxStrLength];
snprintf(buf, MM::MaxStrLength, "%d", i);
md.AddTag(MM::g_Keyword_CameraChannelIndex, buf);
md.AddTag(labelStr + "-" + MM::g_Keyword_CameraChannelIndex, buf); // compat

cam_->GetChannelName(i, buf);
md.AddTag(MM::g_Keyword_CameraChannelName, buf);
md.AddTag(labelStr + "-" + MM::g_Keyword_CameraChannelName, buf); // compat

ret = cam_->GetCoreCallback()->InsertImage(cam_, cam_->GetImageBuffer(i),
cam_->GetImageWidth(),
Expand Down
27 changes: 13 additions & 14 deletions DeviceAdapters/Utilities/MultiCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,18 @@ int MultiCamera::Logical2Physical(int logical)
return -1;
}

MM::Camera* MultiCamera::GetChannelCameraPtr(unsigned n)
{
if (n >= nrCamerasInUse_)
return nullptr;
int ch = Logical2Physical(static_cast<int>(n));
if (ch < 0 || static_cast<unsigned>(ch) >= usedCameras_.size())
return nullptr;
if (usedCameras_[ch] == g_Undefined)
return nullptr;
return (MM::Camera*)GetDevice(usedCameras_[ch].c_str());
}


int MultiCamera::OnPhysicalCamera(MM::PropertyBase* pProp, MM::ActionType eAct, long i)
{
Expand All @@ -570,29 +582,16 @@ int MultiCamera::OnPhysicalCamera(MM::PropertyBase* pProp, MM::ActionType eAct,

else if (eAct == MM::AfterSet)
{
MM::Camera* camera = (MM::Camera*)GetDevice(usedCameras_[i].c_str());
if (camera != 0)
{
camera->RemoveTag(MM::g_Keyword_CameraChannelName);
camera->RemoveTag(MM::g_Keyword_CameraChannelIndex);
}

std::string cameraName;
pProp->Get(cameraName);

if (cameraName == g_Undefined) {
usedCameras_[i] = g_Undefined;
}
else {
camera = (MM::Camera*)GetDevice(cameraName.c_str());
MM::Camera* camera = (MM::Camera*)GetDevice(cameraName.c_str());
if (camera != 0) {
usedCameras_[i] = cameraName;
std::ostringstream os;
os << i;
char myName[MM::MaxStrLength];
GetLabel(myName);
camera->AddTag(MM::g_Keyword_CameraChannelName, myName, usedCameras_[i].c_str());
camera->AddTag(MM::g_Keyword_CameraChannelIndex, myName, os.str().c_str());
}
else
return ERR_INVALID_DEVICE_NAME;
Expand Down
1 change: 1 addition & 0 deletions DeviceAdapters/Utilities/Utilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ class MultiCamera : public CCameraBase<MultiCamera>
unsigned GetNumberOfComponents() const;
unsigned GetNumberOfChannels() const;
int GetChannelName(unsigned channel, char* name);
MM::Camera* GetChannelCameraPtr(unsigned n);
bool IsCapturing();

// action interface
Expand Down
Loading
Loading