Substitute KWIK file for event-only KWE file

Author: aacuevas

Source/Processors/RecordNode/HDF5FileFormat.cpp

@@ -696,33 +696,33 @@ void KWDFile::writeRowData(int16* data, int nSamples)
     curChan++;
 }
 
-//KWIK File
+//KWE File
 
-KWIKFile::KWIKFile(String basename) : HDF5FileBase()
+KWEFile::KWEFile(String basename) : HDF5FileBase()
 {
     initFile(basename);
 }
 
-KWIKFile::KWIKFile() : HDF5FileBase()
+KWEFile::KWEFile() : HDF5FileBase()
 {
 
 }
 
-KWIKFile::~KWIKFile() {}
+KWEFile::~KWEFile() {}
 
-String KWIKFile::getFileName()
+String KWEFile::getFileName()
 {
     return filename;
 }
 
-void KWIKFile::initFile(String basename)
+void KWEFile::initFile(String basename)
 {
     if (isOpen()) return;
-    filename = basename + ".kwik";
+    filename = basename + ".kwe";
     readyToOpen=true;
 }
 
-int KWIKFile::createFileStructure()
+int KWEFile::createFileStructure()
 {
     const uint16 ver = 2;
     if (createGroup("/recordings")) return -1;
@@ -751,7 +751,7 @@ int KWIKFile::createFileStructure()
     return 0;
 }
 
-void KWIKFile::startNewRecording(int recordingNumber, HDF5RecordingInfo* info)
+void KWEFile::startNewRecording(int recordingNumber, HDF5RecordingInfo* info)
 {
     this->recordingNumber = recordingNumber;
     kwdIndex=0;
@@ -762,8 +762,8 @@ void KWIKFile::startNewRecording(int recordingNumber, HDF5RecordingInfo* info)
     //	CHECK_ERROR(setAttribute(U32,&(info->start_sample),recordPath,String("start_sample")));
     CHECK_ERROR(setAttribute(F32,&(info->sample_rate),recordPath,String("sample_rate")));
     CHECK_ERROR(setAttribute(U32,&(info->bit_depth),recordPath,String("bit_depth")));
-    CHECK_ERROR(createGroup(recordPath + "/raw"));
-    CHECK_ERROR(createGroup(recordPath + "/raw/hdf5_paths"));
+   // CHECK_ERROR(createGroup(recordPath + "/raw"));
+  //  CHECK_ERROR(createGroup(recordPath + "/raw/hdf5_paths"));
 
     for (int i = 0; i < eventNames.size(); i++)
     {
@@ -792,7 +792,7 @@ void KWIKFile::startNewRecording(int recordingNumber, HDF5RecordingInfo* info)
     }
 }
 
-void KWIKFile::stopRecording()
+void KWEFile::stopRecording()
 {
     timeStamps.clear();
     recordings.clear();
@@ -801,7 +801,7 @@ void KWIKFile::stopRecording()
     eventData.clear();
 }
 
-void KWIKFile::writeEvent(int type, uint8 id, uint8 processor, void* data, uint64 timestamp)
+void KWEFile::writeEvent(int type, uint8 id, uint8 processor, void* data, uint64 timestamp)
 {
     if (type > eventNames.size() || type < 0)
     {
@@ -815,7 +815,7 @@ void KWIKFile::writeEvent(int type, uint8 id, uint8 processor, void* data, uint6
     CHECK_ERROR(eventData[type]->writeDataBlock(1,eventTypes[type],data));
 }
 
-void KWIKFile::addKwdFile(String filename)
+/*void KWEFile::addKwdFile(String filename)
 {
 	if (kwdIndex == 0)
 	{
@@ -825,9 +825,9 @@ void KWIKFile::addKwdFile(String filename)
     CHECK_ERROR(setAttributeStr(filename + "/recordings/" + String(recordingNumber),"/recordings/" + String(recordingNumber) +
                                 "/raw/hdf5_paths",String(kwdIndex)));
     kwdIndex++;
-}
+}*/
 
-void KWIKFile::addEventType(String name, DataTypes type, String dataName)
+void KWEFile::addEventType(String name, DataTypes type, String dataName)
 {
     eventNames.add(name);
     eventTypes.add(type);

Source/Processors/RecordNode/HDF5FileFormat.h

@@ -141,17 +141,17 @@ class KWDFile : public HDF5FileBase
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(KWDFile);
 };
 
-class KWIKFile : public HDF5FileBase
+class KWEFile : public HDF5FileBase
 {
 public:
-    KWIKFile(String basename);
-    KWIKFile();
-    virtual ~KWIKFile();
+    KWEFile(String basename);
+    KWEFile();
+    virtual ~KWEFile();
     void initFile(String basename);
     void startNewRecording(int recordingNumber, HDF5RecordingInfo* info);
     void stopRecording();
     void writeEvent(int type, uint8 id, uint8 processor, void* data, uint64 timestamp);
-    void addKwdFile(String filename);
+  //  void addKwdFile(String filename);
     void addEventType(String name, DataTypes type, String dataName);
     String getFileName();
 
@@ -171,7 +171,7 @@ class KWIKFile : public HDF5FileBase
     Array<String> eventDataNames;
     int kwdIndex;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(KWIKFile);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(KWEFile);
 };
 
 class KWXFile : public HDF5FileBase

Source/Processors/RecordNode/HDF5Recording.cpp

@@ -80,9 +80,9 @@ void HDF5Recording::addChannel(int index, Channel* chan)
 void HDF5Recording::openFiles(File rootFolder, int experimentNumber, int recordingNumber)
 {
     String basepath = rootFolder.getFullPathName() + rootFolder.separatorString + "experiment" + String(experimentNumber);
-    //KWIK file
-    mainFile->initFile(basepath);
-    mainFile->open();
+    //KWE file
+    eventFile->initFile(basepath);
+    eventFile->open();
 
     //KWX file
     spikesFile->initFile(basepath);
@@ -98,7 +98,7 @@ void HDF5Recording::openFiles(File rootFolder, int experimentNumber, int recordi
         infoArray[0]->start_time = 0;
 
     infoArray[0]->start_sample = 0;
-    mainFile->startNewRecording(recordingNumber,infoArray[0]);
+    eventFile->startNewRecording(recordingNumber,infoArray[0]);
 
     //KWD files
     for (int i = 0; i < processorMap.size(); i++)
@@ -127,8 +127,8 @@ void HDF5Recording::openFiles(File rootFolder, int experimentNumber, int recordi
     {
         if (fileArray[i]->isOpen())
         {
-            File f(fileArray[i]->getFileName());
-            mainFile->addKwdFile(f.getFileName());
+           // File f(fileArray[i]->getFileName());
+           // eventFile->addKwdFile(f.getFileName());
 
             infoArray[i]->name = String("Open Ephys Recording #") + String(recordingNumber);
             //           infoArray[i]->start_time = timestamp;
@@ -146,8 +146,8 @@ void HDF5Recording::openFiles(File rootFolder, int experimentNumber, int recordi
 
 void HDF5Recording::closeFiles()
 {
-    mainFile->stopRecording();
-    mainFile->close();
+    eventFile->stopRecording();
+    eventFile->close();
     spikesFile->stopRecording();
     spikesFile->close();
     for (int i = 0; i < fileArray.size(); i++)
@@ -185,9 +185,9 @@ void HDF5Recording::writeEvent(int eventType, MidiMessage& event, int samplePosi
 {
     const uint8* dataptr = event.getRawData();
     if (eventType == GenericProcessor::TTL)
-        mainFile->writeEvent(0,*(dataptr+2),*(dataptr+1),(void*)(dataptr+3),(*timestamps)[*(dataptr+1)]+samplePosition);
+        eventFile->writeEvent(0,*(dataptr+2),*(dataptr+1),(void*)(dataptr+3),(*timestamps)[*(dataptr+1)]+samplePosition);
     else if (eventType == GenericProcessor::MESSAGE)
-        mainFile->writeEvent(1,*(dataptr+2),*(dataptr+1),(void*)(dataptr+6),(*timestamps)[*(dataptr+1)]+samplePosition);
+        eventFile->writeEvent(1,*(dataptr+2),*(dataptr+1),(void*)(dataptr+6),(*timestamps)[*(dataptr+1)]+samplePosition);
 }
 
 void HDF5Recording::addSpikeElectrode(int index, SpikeRecordInfo* elec)
@@ -201,9 +201,9 @@ void HDF5Recording::writeSpike(const SpikeObject& spike, int electrodeIndex)
 
 void HDF5Recording::startAcquisition()
 {
-    mainFile = new KWIKFile();
-    mainFile->addEventType("TTL",HDF5FileBase::U8,"event_channels");
-    mainFile->addEventType("Messages",HDF5FileBase::STR,"Text");
+    eventFile = new KWEFile();
+    eventFile->addEventType("TTL",HDF5FileBase::U8,"event_channels");
+    eventFile->addEventType("Messages",HDF5FileBase::STR,"Text");
     spikesFile = new KWXFile();
 }
 

Source/Processors/RecordNode/HDF5Recording.h

@@ -55,7 +55,7 @@ class HDF5Recording : public RecordEngine
     OwnedArray<Array<float>> sampleRatesArray;
     OwnedArray<KWDFile> fileArray;
     OwnedArray<HDF5RecordingInfo> infoArray;
-    ScopedPointer<KWIKFile> mainFile;
+    ScopedPointer<KWEFile> eventFile;
     ScopedPointer<KWXFile> spikesFile;
     float* scaledBuffer;
     int16* intBuffer;