Skip to content

Commit

Permalink
remove DynamicTableRegion references
Browse files Browse the repository at this point in the history
  • Loading branch information
stephprince committed May 23, 2024
1 parent 680ea8c commit 1b5522c
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 116 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
3 changes: 2 additions & 1 deletion src/Channel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<float> position = {0.f, 0.f, 0.f})
: name(name)
, groupName(groupName)
Expand Down
1 change: 0 additions & 1 deletion src/nwb/NWBFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
7 changes: 0 additions & 7 deletions src/nwb/ecephys/ElectricalSeries.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#include "nwb/ecephys/ElectricalSeries.hpp"

#include "nwb/hdmf/table/DynamicTableRegion.hpp"

using namespace AQNWB::NWB;

// ElectricalSeries
Expand All @@ -23,9 +21,4 @@ ElectricalSeries::~ElectricalSeries() {}
void ElectricalSeries::initialize()
{
TimeSeries::initialize();

// std::unique_ptr<DynamicTableRegion> electrodes =
// std::make_unique<DynamicTableRegion>(getPath() + "/electrodes", io,
// electrodesTablePath, "Electrode index for each channel");
// electrodes->initialize();
}
9 changes: 1 addition & 8 deletions src/nwb/ecephys/ElectricalSeries.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#include "BaseIO.hpp"
#include "nwb/base/TimeSeries.hpp"
#include "nwb/hdmf/table/DynamicTableRegion.hpp"

namespace AQNWB::NWB
{
Expand Down Expand Up @@ -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<DynamicTableRegion> electrodes;

/**
* @brief Pointer to channel-specific conversion factor dataset.
*/
std::unique_ptr<BaseRecordingData> channelConversion;

/**
* @brief Pointer to channel-specific conversion factor dataset.
* @brief Pointer to electrodes dataset.
*/
std::unique_ptr<BaseRecordingData> electrodesDataset;

Expand Down
28 changes: 0 additions & 28 deletions src/nwb/hdmf/table/DynamicTableRegion.cpp

This file was deleted.

70 changes: 0 additions & 70 deletions src/nwb/hdmf/table/DynamicTableRegion.hpp

This file was deleted.

0 comments on commit 1b5522c

Please sign in to comment.