Updated ElectrodeTable to use mergePaths method

NeurodataWithoutBorders · Sep 21, 2024 · af28b29 · af28b29
1 parent 6a4876f
commit af28b29
Showing 1 changed file with 25 additions and 20 deletions.
diff --git a/src/nwb/file/ElectrodeTable.cpp b/src/nwb/file/ElectrodeTable.cpp
@@ -1,6 +1,7 @@
 #include "nwb/file/ElectrodeTable.hpp"
 
 #include "Channel.hpp"
+#include "Utils.hpp"
 
 using namespace AQNWB::NWB;
 
@@ -13,25 +14,26 @@ ElectrodeTable::ElectrodeTable(std::shared_ptr<IO::BaseIO> io)
     : DynamicTable(electrodeTablePath,  // use the electrodeTablePath
                    io,
                    {"group", "group_name", "location"})
-    , electrodeDataset(
-          std::make_unique<ElementIdentifiers>(electrodeTablePath + "/id", io))
-    , groupNamesDataset(
-          std::make_unique<VectorData>(electrodeTablePath + "/group_name", io))
-    , locationsDataset(
-          std::make_unique<VectorData>(electrodeTablePath + "/location", io))
+    , electrodeDataset(std::make_unique<ElementIdentifiers>(
+          AQNWB::mergePaths(electrodeTablePath, "id"), io))
+    , groupNamesDataset(std::make_unique<VectorData>(
+          AQNWB::mergePaths(electrodeTablePath, "group_name"), io))
+    , locationsDataset(std::make_unique<VectorData>(
+          AQNWB::mergePaths(electrodeTablePath, "location"), io))
 {
 }
 
 ElectrodeTable::ElectrodeTable(const std::string& path,
                                std::shared_ptr<IO::BaseIO> io)
-    : DynamicTable(electrodeTablePath,  // use the electrodeTablePath
-                   io)
-    , electrodeDataset(
-          std::make_unique<ElementIdentifiers>(electrodeTablePath + "/id", io))
-    , groupNamesDataset(
-          std::make_unique<VectorData>(electrodeTablePath + "/group_name", io))
-    , locationsDataset(
-          std::make_unique<VectorData>(electrodeTablePath + "/location", io))
+    : DynamicTable(
+          electrodeTablePath,  // use the electrodeTablePath
+          io)  // TODO May need to initialize the colNames in DynamicTable
+    , electrodeDataset(std::make_unique<ElementIdentifiers>(
+          AQNWB::mergePaths(electrodeTablePath, "id"), io))
+    , groupNamesDataset(std::make_unique<VectorData>(
+          AQNWB::mergePaths(electrodeTablePath, "group_name"), io))
+    , locationsDataset(std::make_unique<VectorData>(
+          AQNWB::mergePaths(electrodeTablePath, "location"), io))
 {
   std::cerr << "ElectrodeTable object is required to appear at "
             << this->electrodeTablePath << std::endl;
@@ -47,26 +49,29 @@ void ElectrodeTable::initialize(const std::string& description)
   // create group
   DynamicTable::initialize(description);
 
-  electrodeDataset->setDataset(
-      std::unique_ptr<IO::BaseRecordingData>(m_io->createArrayDataSet(
-          IO::BaseDataType::I32, SizeArray {1}, SizeArray {1}, m_path + "id")));
+  electrodeDataset->setDataset(std::unique_ptr<IO::BaseRecordingData>(
+      m_io->createArrayDataSet(IO::BaseDataType::I32,
+                               SizeArray {1},
+                               SizeArray {1},
+                               AQNWB::mergePaths(m_path, "id"))));
   groupNamesDataset->setDataset(std::unique_ptr<IO::BaseRecordingData>(
       m_io->createArrayDataSet(IO::BaseDataType::STR(250),
                                SizeArray {0},
                                SizeArray {1},
-                               m_path + "group_name")));
+                               AQNWB::mergePaths(m_path, "group_name"))));
   locationsDataset->setDataset(std::unique_ptr<IO::BaseRecordingData>(
       m_io->createArrayDataSet(IO::BaseDataType::STR(250),
                                SizeArray {0},
                                SizeArray {1},
-                               m_path + "location")));
+                               AQNWB::mergePaths(m_path, "location"))));
 }
 
 void ElectrodeTable::addElectrodes(std::vector<Channel> channels)
 {
   // create datasets
   for (const auto& ch : channels) {
-    groupReferences.push_back(groupPathBase + ch.getGroupName());
+    groupReferences.push_back(
+        AQNWB::mergePaths(groupPathBase, ch.getGroupName()));
     groupNames.push_back(ch.getGroupName());
     electrodeNumbers.push_back(ch.getGlobalIndex());
     locationNames.push_back("unknown");