Fix build error due to error during merge with base branch

NeurodataWithoutBorders · Oct 22, 2024 · a93cadd · a93cadd
1 parent 415926c
commit a93cadd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/io/BaseIO.cpp b/src/io/BaseIO.cpp
@@ -60,8 +60,14 @@ Status BaseIO::createDataAttributes(const std::string& path,
                                     const float& resolution,
                                     const std::string& unit)
 {
-  createAttribute(BaseDataType::F32, &conversion, path + "/data", "conversion");
-  createAttribute(BaseDataType::F32, &resolution, path + "/data", "resolution");
+  createAttribute(BaseDataType::F32,
+                  &conversion,
+                  AQNWB::mergePaths(path, "data"),
+                  "conversion");
+  createAttribute(BaseDataType::F32,
+                  &resolution,
+                  AQNWB::mergePaths(path, "data"),
+                  "resolution");
   createAttribute(unit, path + "/data", "unit");
 
   return Status::Success;

diff --git a/src/nwb/ecephys/ElectricalSeries.cpp b/src/nwb/ecephys/ElectricalSeries.cpp
@@ -65,7 +65,6 @@ void ElectricalSeries::initialize(const IO::BaseDataType& dataType,
   m_io->createAttribute(IO::BaseDataType::I32,
                         &axis_value,
                         AQNWB::mergePaths(getPath(), "channel_conversion"),
-                        this->getPath() + "/channel_conversion",
                         "axis",
                         1);