diff --git a/CMakeLists.txt b/CMakeLists.txt index 39f29179..15aef5f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,6 @@ add_library( src/nwb/hdmf/base/Data.hpp src/nwb/hdmf/base/Container.cpp src/nwb/hdmf/table/DynamicTable.cpp - src/nwb/hdmf/table/DynamicTableRegion.cpp src/nwb/hdmf/table/ElementIdentifiers.hpp src/nwb/hdmf/table/VectorData.hpp ) diff --git a/src/Channel.hpp b/src/Channel.hpp index 7eeb7ef8..a4d5a3bd 100644 --- a/src/Channel.hpp +++ b/src/Channel.hpp @@ -18,9 +18,10 @@ class Channel int localIndex, int globalIndex, float conversion = 1e6f, // uV to V - float samplingRate = 30000.f, + float samplingRate = 30000.f, // placeholder float bitVolts = 0.000002f, // least significant bit needed to // convert 16-bit int to volts + // currently a placeholder std::vector position = {0.f, 0.f, 0.f}) : name(name) , groupName(groupName) diff --git a/src/nwb/NWBFile.cpp b/src/nwb/NWBFile.cpp index d1afffaa..fe0e77eb 100644 --- a/src/nwb/NWBFile.cpp +++ b/src/nwb/NWBFile.cpp @@ -14,7 +14,6 @@ #include "nwb/ecephys/ElectricalSeries.hpp" #include "nwb/file/ElectrodeGroup.hpp" #include "nwb/file/ElectrodeTable.hpp" -#include "nwb/hdmf/table/DynamicTableRegion.hpp" using namespace AQNWB::NWB; diff --git a/src/nwb/ecephys/ElectricalSeries.cpp b/src/nwb/ecephys/ElectricalSeries.cpp index f799953d..0bc12b7c 100644 --- a/src/nwb/ecephys/ElectricalSeries.cpp +++ b/src/nwb/ecephys/ElectricalSeries.cpp @@ -1,7 +1,5 @@ #include "nwb/ecephys/ElectricalSeries.hpp" -#include "nwb/hdmf/table/DynamicTableRegion.hpp" - using namespace AQNWB::NWB; // ElectricalSeries @@ -23,9 +21,4 @@ ElectricalSeries::~ElectricalSeries() {} void ElectricalSeries::initialize() { TimeSeries::initialize(); - - // std::unique_ptr electrodes = - // std::make_unique(getPath() + "/electrodes", io, - // electrodesTablePath, "Electrode index for each channel"); - // electrodes->initialize(); } diff --git a/src/nwb/ecephys/ElectricalSeries.hpp b/src/nwb/ecephys/ElectricalSeries.hpp index 8d06063e..1c1e1ffd 100644 --- a/src/nwb/ecephys/ElectricalSeries.hpp +++ b/src/nwb/ecephys/ElectricalSeries.hpp @@ -4,7 +4,6 @@ #include "BaseIO.hpp" #include "nwb/base/TimeSeries.hpp" -#include "nwb/hdmf/table/DynamicTableRegion.hpp" namespace AQNWB::NWB { @@ -42,19 +41,13 @@ class ElectricalSeries : public TimeSeries */ std::string electrodesTablePath; - /** - * @brief Pointer to DynamicTableRegion object this time series was generated - * from. - */ - std::unique_ptr electrodes; - /** * @brief Pointer to channel-specific conversion factor dataset. */ std::unique_ptr channelConversion; /** - * @brief Pointer to channel-specific conversion factor dataset. + * @brief Pointer to electrodes dataset. */ std::unique_ptr electrodesDataset; diff --git a/src/nwb/hdmf/table/DynamicTableRegion.cpp b/src/nwb/hdmf/table/DynamicTableRegion.cpp deleted file mode 100644 index 3e5727bd..00000000 --- a/src/nwb/hdmf/table/DynamicTableRegion.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "nwb/hdmf/table/DynamicTableRegion.hpp" - -using namespace AQNWB::NWB; - -// DynamicTable - -/** Constructor */ -DynamicTableRegion::DynamicTableRegion(const std::string& path, - std::shared_ptr io, - const std::string& tablePath, - const std::string& description) - : path(path) - , io(io) - , tablePath(tablePath) - , description(description) -{ -} - -/** Destructor */ -DynamicTableRegion::~DynamicTableRegion() {} - -/** Initialization function*/ -void DynamicTableRegion::initialize() -{ - io->createCommonNWBAttributes( - path, "hdmf-common", neurodataType, description); - io->createReferenceAttribute(tablePath, path, "table"); -} diff --git a/src/nwb/hdmf/table/DynamicTableRegion.hpp b/src/nwb/hdmf/table/DynamicTableRegion.hpp deleted file mode 100644 index 4f8b8db6..00000000 --- a/src/nwb/hdmf/table/DynamicTableRegion.hpp +++ /dev/null @@ -1,70 +0,0 @@ -#pragma once - -#include - -#include "nwb/hdmf/table/DynamicTable.hpp" -#include "nwb/hdmf/table/VectorData.hpp" - -namespace AQNWB::NWB -{ -/** - * @brief An n-dimensional dataset representing a column of a DynamicTable. - */ -class DynamicTableRegion : public VectorData -{ -public: - /** - * @brief Constructor. - * @param path The location of the DynamicTableRegion in the file. - * @param io A shared pointer to the IO object. - * @param tablePath The location of the DynamicTable object this region - * applies to. - * @param description The description of what this table region points to. - */ - DynamicTableRegion(const std::string& path, - std::shared_ptr io, - const std::string& tablePath, - const std::string& description); - - /** - * @brief Destructor. - */ - ~DynamicTableRegion(); - - /** - * @brief Initialize the container. - */ - void initialize(); - -protected: - /** - * @brief The path of the DynamicTableRegion. - */ - std::string path; - - /** - * @brief A shared pointer to the IO object. - */ - std::shared_ptr io; - - /** - * @brief Description of what this table region points to. - */ - std::string description; - - /** - * @brief The location of the DynamicTable object this region applies to. - */ - std::string tablePath; - - /** - * @brief Pointer to int(s) indicating the row(s) of the target array. - */ - std::unique_ptr dataset; - - /** - * @brief The neurodataType of the TimeSeries. - */ - std::string neurodataType = "DynamicTableRegion"; -}; -} // namespace AQNWB::NWB