Fix issues writing spikes to disk

Author: aacuevas

Source/Plugins/BinaryWriter/BinaryRecording.cpp

@@ -417,17 +417,22 @@ void BinaryRecording::writeSpike(int electrodeIndex, const SpikeEvent* spike)
 	*reinterpret_cast<uint16*>(spikeBuffer.getData() + 40) = channel->getSampleRate();
 
 	int ptrIdx = 0;
+	uint16* dataIntPtr = reinterpret_cast<uint16*>(spikeBuffer.getData() + 42);
+	const float* spikeDataPtr = spike->getDataPointer();
 	for (int i = 0; i < numChannels; i++)
 	{
-		float scaleFactor = 1 / (float(0x7fff) * channel->getChannelBitVolts(i));
-		FloatVectorOperations::copyWithMultiply(m_scaledBuffer + ptrIdx, spike->getDataPointer(i), scaleFactor, chanSamples);
-		ptrIdx += chanSamples;
+		const float bitVolts = channel->getChannelBitVolts(i);
+		for (int j = 0; j < chanSamples; j++)
+		{
+			*(dataIntPtr + ptrIdx) = uint16(*(spikeDataPtr + ptrIdx) / bitVolts + 32768);
+			ptrIdx++;
+		}
 	}
-	AudioDataConverters::convertFloatToInt16LE(m_scaledBuffer, (spikeBuffer.getData() + 42), totalSamples);
 	ptrIdx = totalSamples * 2 + 42;
 	for (int i = 0; i < numChannels; i++)
 	{
-		*reinterpret_cast<float*>(spikeBuffer.getData() + ptrIdx) = channel->getGain();
+		//To get the same value as the original version
+		*reinterpret_cast<float*>(spikeBuffer.getData() + ptrIdx) = (int)(1.0f / channel->getChannelBitVolts(i)) * 1000;
 		ptrIdx += sizeof(float);
 	}
 	for (int i = 0; i < numChannels; i++)

Source/Processors/Channel/InfoObjects.cpp

@@ -416,16 +416,6 @@ Array<sourceChannelInfo> SpikeChannel::getSourceChannelInfo() const
 	return m_sourceInfo;
 }
 
-void SpikeChannel::setGain(float gain)
-{
-	m_gain = gain;
-}
-
-float SpikeChannel::getGain() const
-{
-	return m_gain;
-}
-
 void SpikeChannel::setNumSamples(unsigned int preSamples, unsigned int postSamples)
 {
 	m_numPreSamples = preSamples;

Source/Processors/Channel/InfoObjects.h

@@ -358,12 +358,6 @@ class PLUGIN_API SpikeChannel :
 	/** Returns an array with info about the channels from which the spikes originate */
 	Array<sourceChannelInfo> getSourceChannelInfo() const;
 
-	/** Sets the electrode gain */
-	void setGain(float gain);
-
-	/** Gets the electrode gain */
-	float getGain() const;
-
 	/** Sets the number of samples, pre and post peak */
 	void setNumSamples(unsigned int preSamples, unsigned int postSamples);
 
@@ -399,7 +393,6 @@ class PLUGIN_API SpikeChannel :
 private:
 	const ElectrodeTypes m_type;
 	Array<sourceChannelInfo> m_sourceInfo;
-	float m_gain{ 1.0f };
 	unsigned int m_numPreSamples{ 8 };
 	unsigned int m_numPostSamples{ 32 };
 	Array<float> m_channelBitVolts;

Source/Processors/FileReader/FileReader.cpp

@@ -218,13 +218,13 @@ String FileReader::getFile() const
 
 void FileReader::updateSettings()
 {
-    // if (!input) return;
+     if (!input) return;
 
-    // for (int i=0; i < currentNumChannels; i++)
-    // {
-    //     channels[i]->bitVolts = channelInfo[i].bitVolts;
-    //     channels[i]->name = channelInfo[i].name;
-    // }
+     for (int i=0; i < currentNumChannels; i++)
+     {
+         dataChannelArray[i]->setBitVolts(channelInfo[i].bitVolts);
+         dataChannelArray[i]->setName(channelInfo[i].name);
+     }
 }
 
 

Source/Processors/RecordNode/OriginalRecording.cpp

@@ -676,17 +676,22 @@ void OriginalRecording::writeSpike(int electrodeIndex, const SpikeEvent* spike)
 	*reinterpret_cast<uint16*>(spikeBuffer.getData() + 40) = channel->getSampleRate();
 
 	int ptrIdx = 0;
+	uint16* dataIntPtr = reinterpret_cast<uint16*>(spikeBuffer.getData() + 42);
+	const float* spikeDataPtr = spike->getDataPointer();
 	for (int i = 0; i < numChannels; i++)
 	{
-		float scaleFactor = 1 / (float(0x7fff) * channel->getChannelBitVolts(i));
-		FloatVectorOperations::copyWithMultiply(continuousDataFloatBuffer + ptrIdx, spike->getDataPointer(i), scaleFactor, chanSamples);
-		ptrIdx += chanSamples;
+		const float bitVolts = channel->getChannelBitVolts(i);
+		for (int j = 0; j < chanSamples; j++)
+		{
+			*(dataIntPtr + ptrIdx) = uint16(*(spikeDataPtr + ptrIdx) / bitVolts + 32768);
+			ptrIdx++;
+		}
 	}
-	AudioDataConverters::convertFloatToInt16LE(continuousDataFloatBuffer, (spikeBuffer.getData() + 42), totalSamples);
 	ptrIdx = totalSamples * 2 + 42;
 	for (int i = 0; i < numChannels; i++)
 	{
-		*reinterpret_cast<float*>(spikeBuffer.getData() + ptrIdx) = channel->getGain();
+		//To get the same value as the original version
+		*reinterpret_cast<float*>(spikeBuffer.getData() + ptrIdx) = (int)(1.0f / channel->getChannelBitVolts(i)) * 1000;
 		ptrIdx += sizeof(float);
 	}
 	for (int i = 0; i < numChannels; i++)