Skip to content

Commit

Permalink
update namespace definitions
Browse files Browse the repository at this point in the history
stephprince committed Apr 3, 2024
1 parent f59b94c commit 9152fdb
Showing 10 changed files with 20 additions and 50 deletions.
7 changes: 2 additions & 5 deletions src/hdf5/HDF5IO.hpp
Original file line number Diff line number Diff line change
@@ -14,9 +14,7 @@ class DataType;
class Exception;
} // namespace H5

namespace AQNWB
{
namespace HDF5
namespace AQNWB::HDF5
{
class HDF5RecordingData; // declare here because gets used in HDF5IO class

@@ -277,5 +275,4 @@ class HDF5RecordingData : public BaseRecordingData
*/
Status checkStatus(int status);
};
} // namespace HDF5
} // namespace AQNWB
} // namespace AQNWB::HDF5
7 changes: 2 additions & 5 deletions src/nwb/NWBFile.hpp
Original file line number Diff line number Diff line change
@@ -4,9 +4,7 @@

#include "BaseIO.hpp"

namespace AQNWB
{
namespace NWB
namespace AQNWB::NWB
{
/**
* @brief The NWBFile class provides an interface for setting up and managing
@@ -170,5 +168,4 @@ class NWBRecordingEngine
*/
std::vector<int64_t> smpBuffer;
};
} // namespace NWB
} // namespace AQNWB
} // namespace AQNWB::NWB
7 changes: 2 additions & 5 deletions src/nwb/device/Device.hpp
Original file line number Diff line number Diff line change
@@ -5,9 +5,7 @@
#include "BaseIO.hpp"
#include "nwb/hdmf/base/Container.hpp"

namespace AQNWB
{
namespace NWB
namespace AQNWB::NWB
{
/**
* @brief Metadata about a data acquisition device, e.g., recording system,
@@ -62,5 +60,4 @@ class Device : public Container
*/
std::string manufacturer;
};
} // namespace NWB
} // namespace AQNWB
} // namespace AQNWB::NWB
7 changes: 2 additions & 5 deletions src/nwb/file/ElectrodeGroup.hpp
Original file line number Diff line number Diff line change
@@ -6,9 +6,7 @@
#include "nwb/device/Device.hpp"
#include "nwb/hdmf/base/Container.hpp"

namespace AQNWB
{
namespace NWB
namespace AQNWB::NWB
{
/**
* @brief The ElectrodeGroup class represents a physical grouping of electrodes,
@@ -80,5 +78,4 @@ class ElectrodeGroup : public Container
*/
Device device;
};
} // namespace NWB
} // namespace AQNWB
} // namespace AQNWB::NWB
7 changes: 2 additions & 5 deletions src/nwb/file/ElectrodeTable.hpp
Original file line number Diff line number Diff line change
@@ -7,9 +7,7 @@
#include "nwb/hdmf/table/ElementIdentifiers.hpp"
#include "nwb/hdmf/table/VectorData.hpp"

namespace AQNWB
{
namespace NWB
namespace AQNWB::NWB
{
/**
* @brief Represents a table containing electrode metadata.
@@ -117,5 +115,4 @@ class ElectrodeTable : public DynamicTable
*/
std::string groupPath = "/general/extracellular_ephys/array1";
};
} // namespace NWB
} // namespace AQNWB
} // namespace AQNWB::NWB
7 changes: 2 additions & 5 deletions src/nwb/hdmf/base/Container.hpp
Original file line number Diff line number Diff line change
@@ -5,9 +5,7 @@

#include "BaseIO.hpp"

namespace AQNWB
{
namespace NWB
namespace AQNWB::NWB
{
/**
* @brief Abstract data type for a group storing collections of data and
@@ -50,5 +48,4 @@ class Container
*/
std::shared_ptr<BaseIO> io;
};
} // namespace NWB
} // namespace AQNWB
} // namespace AQNWB::NWB
7 changes: 2 additions & 5 deletions src/nwb/hdmf/base/Data.hpp
Original file line number Diff line number Diff line change
@@ -4,9 +4,7 @@

#include "BaseIO.hpp"

namespace AQNWB
{
namespace NWB
namespace AQNWB::NWB
{
/**
* @brief An abstract data type for a dataset.
@@ -29,5 +27,4 @@ class Data
*/
std::unique_ptr<BaseRecordingData> dataset;
};
} // namespace NWB
} // namespace AQNWB
} // namespace AQNWB::NWB
7 changes: 2 additions & 5 deletions src/nwb/hdmf/table/DynamicTable.hpp
Original file line number Diff line number Diff line change
@@ -7,9 +7,7 @@
#include "nwb/hdmf/table/ElementIdentifiers.hpp"
#include "nwb/hdmf/table/VectorData.hpp"

namespace AQNWB
{
namespace NWB
namespace AQNWB::NWB
{
/**
* @brief Represents a group containing multiple datasets that are aligned on
@@ -96,5 +94,4 @@ class DynamicTable : public Container
*/
std::vector<std::string> colNames;
};
} // namespace NWB
} // namespace AQNWB
} // namespace AQNWB::NWB
7 changes: 2 additions & 5 deletions src/nwb/hdmf/table/ElementIdentifiers.hpp
Original file line number Diff line number Diff line change
@@ -2,9 +2,7 @@

#include "nwb/hdmf/base/Data.hpp"

namespace AQNWB
{
namespace NWB
namespace AQNWB::NWB
{
/**
* @brief A list of unique identifiers for values within a dataset, e.g. rows of
@@ -13,5 +11,4 @@ namespace NWB
class ElementIdentifiers : public Data
{
};
} // namespace NWB
} // namespace AQNWB
} // namespace AQNWB::NWB
7 changes: 2 additions & 5 deletions src/nwb/hdmf/table/VectorData.hpp
Original file line number Diff line number Diff line change
@@ -4,9 +4,7 @@

#include "nwb/hdmf/base/Data.hpp"

namespace AQNWB
{
namespace NWB
namespace AQNWB::NWB
{
/**
* @brief An n-dimensional dataset representing a column of a DynamicTable.
@@ -26,5 +24,4 @@ class VectorData : public Data
*/
std::string description;
};
} // namespace NWB
} // namespace AQNWB
} // namespace AQNWB::NWB

0 comments on commit 9152fdb

Please sign in to comment.