Skip to content

Commit

Permalink
change edf import to use markers
Browse files Browse the repository at this point in the history
update fieldtrip (add complete fileio folder, without changes)
change basis function for respiration amplitude for fear conditioning
change path for imports using fieldtrip

git-svn-id: https://svn.code.sf.net/p/pspm/svn/trunk@395 23ec9670-3a1e-4a12-9187-a0ba8bce340d
  • Loading branch information
Tobias Moser committed Dec 19, 2016
1 parent 29ac9de commit 6329c66
Show file tree
Hide file tree
Showing 466 changed files with 64,882 additions and 6,073 deletions.
341 changes: 341 additions & 0 deletions Import/fieldtrip/fileio/COPYING

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions Import/fieldtrip/fileio/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
This is the FieldTrip FILEIO module. It contains functions for
reading EEG and MEG data from a large variety of files. Furthermore,
additional information such as sensor positions can be read from
file.

For more information please visit http://www.ru.nl/neuroimaging/fieldtrip

The source code for zlib is available at http://www.zlib.net

The FieldTrip software is free but copyrighted software, distributed
under the terms of the GNU General Public Licence as published by
the Free Software Foundation (either version 2, or at your option
any later version). See the file COPYING for more details.

Copyright (C) 2008-2009, Donders Institute for Brain, Cognition and Behaviour, The Netherlands (DCCN, DCC, DCN)
Copyright (C) 2003-2008, F.C. Donders Centre for Cognitive Neuroimaging, Nijmegen, The Netherlands (FCDC)
Copyright (C) 2003-2005, Center for Sensory-Motor Interaction, Aalborg University, Denmark (SMI)
Copyright (C) 1999-2003, Department of Medical Physics, Radboud University Nijmegen, The Netherlands (MBFYS)

Loading

0 comments on commit 6329c66

Please sign in to comment.