Skip to content

Conversation

@PeterNSteinmetz
Copy link
Contributor

@PeterNSteinmetz PeterNSteinmetz commented Oct 29, 2020

This pull request factors the parsing of contiguous blocks of records into a separate class. Then uses the static methods of that class to parse the ncs files and provide the time segments. Also incorporates new parsing of file types from the file headers in order to handle older Cheetah created files with rounded sampling rate conventions.

This also includes the samples in partially filled records at the end of a block of contiguous records. It may thus obviate the need for PR #881 .

This is again a smaller chunk of the work which is aimed to permit other ncs file styles and multiple data collection cards with slightly different start times.

kleinjohann and others added 30 commits April 15, 2020 16:22
  * group across segments can controllable per object (AnalogSignal, SpikeTrain, Event, Epoch)
  * units_group_mode is removed
  * For better readability BaseRawIO.get_group_channel_indexes renamed to BaseRawIO.get_group_signal_channel_indexes
... to only cover realistic values (0 to len(index))
Allows full normal testing to run, using the 4.0.2 data only to test the parsing of ncs recording from the header information.
Peter N. Steinmetz and others added 25 commits November 6, 2020 14:42
# Conflicts:
#	neo/rawio/neuralynxrawio.py
Tests for v5.5.1 still failing.

# Conflicts:
#	neo/rawio/neuralynxrawio.py
# Conflicts:
#	neo/rawio/neuralynxrawio.py
# Conflicts:
#	neo/rawio/neuralynxrawio.py
…ssignement.

Using a tolerance over a longer experiment is not sensitive enough to detect blocks where perhaps a large amount of samples are dropped and there is a small gap afterwards.
# Conflicts:
#	neo/test/rawiotest/test_neuralynxrawio.py
…into addNcsBlocks

# Conflicts:
#	neo/rawio/neuralynxrawio.py
@PeterNSteinmetz
Copy link
Contributor Author

Rebased this branch onto NeuralEnsemble:master at e97ac97 with the hopes of simplifying the merge with that master.

Not sure this succeeded in that. Nonetheless, it has no conflicts with the master and passes tests and incorporates the primary changes of using the NcsBlocksFactory methods to parse the blocks of records in Ncs files. This lays the groundwork for subsequent treatment of other file types and more complex starts and stops of different ADC cards used in some of the neuralynx systems.

Would appreciate advice for this project on how to best deal with rebasing/merging branches for pull requests when the branch in the pull request started some time back on the master.

@PeterNSteinmetz
Copy link
Contributor Author

Closed and incorporated into new PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants