@@ -82,6 +82,8 @@ void BinaryRecording::openFiles(File rootFolder, int experimentNumber, int recor
8282 jsonChan->setProperty (" history" , channelInfo->getHistoricString ());
8383 jsonChan->setProperty (" bit_volts" , channelInfo->getBitVolts ());
8484 jsonChan->setProperty (" units" , channelInfo->getDataUnits ());
85+ jsonChan->setProperty (" source_processor_index" , channelInfo->getSourceIndex ());
86+ jsonChan->setProperty (" recorded_processor_index" , channelInfo->getCurrentNodeChannelIdx ());
8587 createChannelMetaData (channelInfo, jsonChan);
8688 for (int i = lastId; i < nInfoArrays; i++)
8789 {
@@ -98,14 +100,13 @@ void BinaryRecording::openFiles(File rootFolder, int experimentNumber, int recor
98100 }
99101 if (!found)
100102 {
101- String datPath (contPath + channelInfo->getCurrentNodeName () + " _(" + String (channelInfo->getCurrentNodeID ()) + " )" + File::separatorString);
102- String datFileName (channelInfo->getSourceName () + " _(" + String (sourceId) + " ." + String (sourceSubIdx) + " )" );
103- continuousFileNames.add (datPath + datFileName + " .dat" );
103+ String datFileName (channelInfo->getCurrentNodeName () + " _(" + String (channelInfo->getCurrentNodeID ()) + " )" + File::separatorString + channelInfo->getSourceName () + " _(" + String (sourceId) + " ." + String (sourceSubIdx) + " )" );
104+ continuousFileNames.add (contPath + datFileName + " .dat" );
104105
105106 Array<NpyType> tstypes;
106107 tstypes.add (NpyType (" Timestamp" , BaseType::INT64, 1 ));
107108
108- ScopedPointer<NpyFile> tFile = new NpyFile (datPath + datFileName + " _timestamps.npy" , tstypes);
109+ ScopedPointer<NpyFile> tFile = new NpyFile (contPath + datFileName + " _timestamps.npy" , tstypes);
109110 m_dataTimestampFiles.add (tFile.release ());
110111
111112 m_fileIndexes.set (recordedChan, nInfoArrays);
@@ -119,8 +120,11 @@ void BinaryRecording::openFiles(File rootFolder, int experimentNumber, int recor
119120 DynamicObject::Ptr jsonFile = new DynamicObject ();
120121 jsonFile->setProperty (" name" , datFileName);
121122 jsonFile->setProperty (" sample_rate" , channelInfo->getSampleRate ());
122- jsonFile->setProperty (" source_processor" , channelInfo->getSourceName ());
123+ jsonFile->setProperty (" source_processor_name" , channelInfo->getSourceName ());
124+ jsonFile->setProperty (" source_processor_id" , channelInfo->getSourceNodeID ());
125+ jsonFile->setProperty (" source_processor_sub_idx" , channelInfo->getSubProcessorIdx ());
123126 jsonFile->setProperty (" recorded_processor" , channelInfo->getCurrentNodeName ());
127+ jsonFile->setProperty (" recorded_processor_id" , channelInfo->getCurrentNodeID ());
124128 jsonContinuousfiles.add (var (jsonFile));
125129 }
126130 }
0 commit comments