Save both Neuropixels 2.0 probes when recording starts

- Standardize how stream names are created across the code base for 2.0 probes
- Standardized the stream name itself for 2.0 probes to include the device name, similar to other devices

Author: bparks13

Source/Devices/Neuropixels2e.cpp

@@ -53,10 +53,15 @@ Neuropixels2e::~Neuropixels2e()
 		deviceContext->setOption(ONIX_OPT_PASSTHROUGH, 0);
 }
 
+std::string Neuropixels2e::createStreamName(int n)
+{
+	return OnixDevice::createStreamName(ProbeString + std::to_string(n));
+}
+
 void Neuropixels2e::createDataStream(int n)
 {
 	StreamInfo apStream = StreamInfo(
-		createStreamName("Probe" + std::to_string(n)),
+		createStreamName(n),
 		"Neuropixels 2.0 data stream",
 		getStreamIdentifier(),
 		numberOfChannels,

Source/Devices/Neuropixels2e.h

@@ -62,6 +62,7 @@ namespace OnixSourcePlugin
 		void stopAcquisition() override;
 		void processFrames() override;
 		void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override;
+		std::string createStreamName(int);
 
 		int getNumProbes() const;
 

Source/NeuropixelsComponents.h

@@ -348,6 +348,8 @@ namespace OnixSourcePlugin
 		return bytes;
 	}
 
+	static const std::string ProbeString = "Probe";
+
 	template<int ch, int e>
 	class INeuropixel
 	{

Source/OnixDevice.h

@@ -56,8 +56,6 @@ namespace OnixSourcePlugin
 		UNKNOWN
 	};
 
-	static const std::string ProbeString = "Probe";
-
 	struct StreamInfo {
 	public:
 		StreamInfo() {}

Source/OnixSource.cpp

@@ -1251,7 +1251,7 @@ void OnixSource::startRecording()
 		if (device->getDeviceType() == OnixDeviceType::NEUROPIXELSV1E || device->getDeviceType() == OnixDeviceType::NEUROPIXELSV1F)
 		{
 			auto npx = std::static_pointer_cast<Neuropixels1>(device);
-			auto streamName = npx->createStreamName(); // NB: Create the automatic stream name, without any suffixes and including the port name
+			auto streamName = npx->createStreamName();
 
 			auto streamExists = dataStreamExists(streamName, sn->getDataStreams());
 
@@ -1264,15 +1264,19 @@ void OnixSource::startRecording()
 		else if (device->getDeviceType() == OnixDeviceType::NEUROPIXELSV2E)
 		{
 			auto npx = std::static_pointer_cast<Neuropixels2e>(device);
-			auto streamName = npx->createStreamName(); // NB: Create the automatic stream name, without any suffixes and including the port name
 
-			auto streamExists = dataStreamExists(streamName, sn->getDataStreams());
+			for (int i = 0; i < npx->getNumProbes(); i++)
+			{
+				auto streamName = npx->createStreamName(i);
 
-			if (!streamExists)
-				return;
+				auto streamExists = dataStreamExists(streamName, sn->getDataStreams());
 
-			if (!npx->saveProbeInterfaceFile(dir, streamName))
-				return;
+				if (!streamExists)
+					return;
+
+				if (!npx->saveProbeInterfaceFile(dir, streamName))
+					return;
+			}
 		}
 	}
 }

Source/OnixSourceCanvas.cpp

@@ -99,7 +99,7 @@ void OnixSourceCanvas::addHub(std::string hubName, int offset)
 
 		tab = addTopLevelTab(getTopLevelTabName(port, hubName), (int)port);
 
-		devices.emplace_back(std::make_shared<Neuropixels2e>(ProbeString, hubName, passthroughIndex, context));
+		devices.emplace_back(std::make_shared<Neuropixels2e>(OnixDevice::TypeString.at(OnixDeviceType::NEUROPIXELSV2E), hubName, passthroughIndex, context));
 		devices.emplace_back(std::make_shared<PolledBno055>(OnixDevice::TypeString.at(OnixDeviceType::POLLEDBNO), hubName, passthroughIndex, context));
 	}
 

Source/UI/NeuropixelsV2eInterface.cpp

@@ -32,11 +32,11 @@ NeuropixelsV2eInterface::NeuropixelsV2eInterface(std::shared_ptr<Neuropixels2e>
 	topLevelTabComponent = std::make_unique<CustomTabComponent>(true);
 	addAndMakeVisible(topLevelTabComponent.get());
 
-	probeInterfaces[0] = std::make_unique<NeuropixelsV2eProbeInterface>(d, 0, e, c);
-	topLevelTabComponent->addTab("Probe0", Colours::grey, CustomViewport::createCustomViewport(probeInterfaces[0].get()), true, 0);
-
-	probeInterfaces[1] = std::make_unique<NeuropixelsV2eProbeInterface>(d, 1, e, c);
-	topLevelTabComponent->addTab("Probe1", Colours::grey, CustomViewport::createCustomViewport(probeInterfaces[1].get()), true, 1);
+	for (int i = 0; i < numProbes; i++)
+	{
+		probeInterfaces[i] = std::make_unique<NeuropixelsV2eProbeInterface>(d, i, e, c);
+		topLevelTabComponent->addTab(ProbeString + std::to_string(i), Colours::grey, CustomViewport::createCustomViewport(probeInterfaces[i].get()), true, i);
+	}
 
 	deviceComponent = std::make_unique<Component>();
 	deviceComponent->setBounds(0, 0, 600, 40);