make electrodeTablePath a static const property

NeurodataWithoutBorders · Aug 6, 2024 · a2ce569 · a2ce569
1 parent 5254d8a
commit a2ce569
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/src/nwb/ecephys/ElectricalSeries.cpp b/src/nwb/ecephys/ElectricalSeries.cpp
@@ -1,5 +1,7 @@
 #include "nwb/ecephys/ElectricalSeries.hpp"
 
+#include "nwb/file/ElectrodeTable.hpp"
+
 using namespace AQNWB::NWB;
 
 // ElectricalSeries
@@ -66,7 +68,7 @@ void ElectricalSeries::initialize()
   io->createCommonNWBAttributes(
       getPath() + "/electrodes", "hdmf-common", "DynamicTableRegion", "");
   io->createReferenceAttribute(
-      electrodesTablePath, getPath() + "/electrodes", "table");
+      ElectrodeTable::electrodeTablePath, getPath() + "/electrodes", "table");
 }
 
 Status ElectricalSeries::writeChannel(SizeType channelInd,

diff --git a/src/nwb/ecephys/ElectricalSeries.hpp b/src/nwb/ecephys/ElectricalSeries.hpp
@@ -74,11 +74,6 @@ class ElectricalSeries : public TimeSeries
    */
   Types::ChannelVector channelVector;
 
-  /**
-   * @brief Path to the electrodes table this time series references
-   */
-  std::string electrodesTablePath = "/general/extracellular_ephys/electrodes/";
-
   /**
    * @brief Pointer to channel-specific conversion factor dataset.
    */

diff --git a/src/nwb/file/ElectrodeTable.cpp b/src/nwb/file/ElectrodeTable.cpp
@@ -9,11 +9,9 @@ using namespace AQNWB::NWB;
 /** Constructor */
 ElectrodeTable::ElectrodeTable(std::shared_ptr<BaseIO> io,
                                const std::string& description)
-    : DynamicTable(
-        "/general/extracellular_ephys/electrodes/",  // default value for
-                                                     // electrodes table
-        io,
-        description)
+    : DynamicTable(electrodeTablePath,  // use the electrodeTablePath
+                   io,
+                   description)
 {
 }
 

diff --git a/src/nwb/file/ElectrodeTable.hpp b/src/nwb/file/ElectrodeTable.hpp
@@ -83,6 +83,12 @@ class ElectrodeTable : public DynamicTable
   std::unique_ptr<VectorData> locationsDataset =
       std::make_unique<VectorData>(); /**< The locations dataset. */
 
+  /**
+   * @brief The path to the ElectrodeTable.
+   */
+  inline const static std::string electrodeTablePath =
+      "/general/extracellular_ephys/electrodes/";
+
 private:
   /**
    * @brief The channel information from the acquisition system.

diff --git a/tests/testFile.cpp b/tests/testFile.cpp
@@ -11,7 +11,6 @@ using namespace AQNWB;
 
 TEST_CASE("ElectrodeTable", "[ecephys]")
 {
-  std::string path = "/general/extracellular_ephys/electrodes/";
   SECTION("test initialization")
   {
     std::string filename = getTestFilePath("electrodeTable.h5");
@@ -35,7 +34,8 @@ TEST_CASE("ElectrodeTable", "[ecephys]")
 
     // Check if id datasets are created correctly
     SizeType numChannels = 3;
-    std::unique_ptr<BaseRecordingData> id_data = io->getDataSet(path + "id");
+    std::unique_ptr<BaseRecordingData> id_data =
+        io->getDataSet(NWB::ElectrodeTable::electrodeTablePath + "id");
     std::unique_ptr<HDF5::HDF5RecordingData> idDataset(
         dynamic_cast<HDF5::HDF5RecordingData*>(id_data.release()));
     int* buffer = new int[numChannels];