Skip to content

Commit 937a8c7

Browse files
committed
Save sample rates as a dataset instead of an array attribute
1 parent a3719d9 commit 937a8c7

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

Source/Plugins/KWIKFormat/RecordEngine/HDF5FileFormat.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,7 @@ void KWDFile::startNewRecording(int recordingNumber, int nChannels, HDF5Recordin
668668
uint8 mSample = info->multiSample ? 1 : 0;
669669

670670
ScopedPointer<HDF5RecordingData> bitVoltsSet;
671+
ScopedPointer<HDF5RecordingData> sampleRateSet;
671672

672673
String recordPath = String("/recordings/")+String(recordingNumber);
673674
CHECK_ERROR(createGroup(recordPath));
@@ -685,7 +686,13 @@ void KWDFile::startNewRecording(int recordingNumber, int nChannels, HDF5Recordin
685686
std::cerr << "Error creating bitvolts data set" << std::endl;
686687

687688
CHECK_ERROR(setAttribute(U8,&mSample,recordPath+"/application_data",String("is_multiSampleRate_data")));
688-
CHECK_ERROR(setAttributeArray(F32,info->channelSampleRates.getRawDataPointer(),info->channelSampleRates.size(),recordPath+"/application_data",String("channel_sample_rates")));
689+
//CHECK_ERROR(setAttributeArray(F32,info->channelSampleRates.getRawDataPointer(),info->channelSampleRates.size(),recordPath+"/application_data",String("channel_sample_rates")));
690+
sampleRateSet = createDataSet(F32, info->channelSampleRates.size(), 0, recordPath + "/application_data/channel_sample_rates");
691+
if (sampleRateSet.get())
692+
sampleRateSet->writeDataBlock(info->channelSampleRates.size(), F32, info->channelSampleRates.getRawDataPointer());
693+
else
694+
std::cerr << "Error creating sample rates data set" << std::endl;
695+
689696
recdata = createDataSet(I16,0,nChannels,CHUNK_XSIZE,recordPath+"/data");
690697
if (!recdata.get())
691698
std::cerr << "Error creating data set" << std::endl;

Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
#define REGISTER_59_MISO_B 58
4545
#define RHD2132_16CH_OFFSET 8
4646

47-
#define DEBUG_EMULATE_HEADSTAGES 8
48-
#define DEBUG_EMULATE_64CH
47+
//#define DEBUG_EMULATE_HEADSTAGES 8
48+
//#define DEBUG_EMULATE_64CH
4949

5050
#define INIT_STEP ( evalBoard->isUSB3() ? 256 : 60)
5151

0 commit comments

Comments
 (0)