diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9e9249c..af9a4df 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,17 @@ Changes ======= +Version 0.9.1 +------------- + +**2018-08-07** + +* Fixed issues loading pyFR data (#180) +* Fixed loading of YC events (#182) +* Fixed loading of jacksheets with tabs instead of spaces (#185) +* Breaking change: removed ``to_xyz`` methods (#187) + + Version 0.9.0 ------------- diff --git a/cmlreaders/__init__.py b/cmlreaders/__init__.py index dc40234..c8d492e 100644 --- a/cmlreaders/__init__.py +++ b/cmlreaders/__init__.py @@ -8,5 +8,5 @@ from .readers import * # noqa from .cmlreader import CMLReader # noqa -__version__ = "0.9.0" +__version__ = "0.9.1" version_info = namedtuple("VersionInfo", "major,minor,patch")(*__version__.split('.')) diff --git a/docs/getting_started.ipynb b/docs/getting_started.ipynb index 96a005b..ed66d47 100644 --- a/docs/getting_started.ipynb +++ b/docs/getting_started.ipynb @@ -125,7 +125,7 @@ { "data": { "text/plain": [ - "['localization']" + "('localization',)" ] }, "execution_count": 4, @@ -145,7 +145,7 @@ { "data": { "text/plain": [ - "['pairs',\n", + "('pairs',\n", " 'contacts',\n", " 'voxel_coordinates',\n", " 'prior_stim_results',\n", @@ -157,7 +157,7 @@ " 'classifier_excluded_leads',\n", " 'electrode_categories',\n", " 'target_selection_file',\n", - " 'baseline_classifier']" + " 'baseline_classifier')" ] }, "execution_count": 5, @@ -177,7 +177,7 @@ { "data": { "text/plain": [ - "['session_summary',\n", + "('session_summary',\n", " 'classifier_summary',\n", " 'math_summary',\n", " 'used_classifier',\n", @@ -192,7 +192,7 @@ " 'all_events',\n", " 'task_events',\n", " 'math_events',\n", - " 'ps4_events']" + " 'ps4_events')" ] }, "execution_count": 6, @@ -518,7 +518,7 @@ " 'R1394E', 'R1395M', 'R1396T', 'R1397D', 'R1398J', 'R1401J',\n", " 'R1402E', 'R1404E', 'R1405E', 'R1406M', 'R1409D', 'R1412M',\n", " 'R1414E', 'R1415T', 'R1416T', 'R1420T', 'R1421M', 'R1422T',\n", - " 'R1423E', 'R1425D', 'R1427T', 'R1431J'], dtype=object)" + " 'R1423E', 'R1425D', 'R1427T', 'R1431J', 'R1438M'], dtype=object)" ] }, "execution_count": 10, @@ -971,517 +971,6 @@ "event_recarray[0]" ] }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### Loading from a Custom Location\n", - "\n", - "Since locations are automatically determined based on the data type, if loading from a custom location, be sure to specify the file_type parameter when loading the data. One common use case for this functionality is that you need to load some data from your scratch or home directory that is in a format supported by CMLReaders. Another use case is that you may discover that data is residing in a location that is not known by CMLReaders. Instead of waiting until the next release of the package, you can use a custom file path to load the data, submit an issue on Github, and continue with you analysis. \n" - ] - }, - { - "cell_type": "code", - "execution_count": 19, - "metadata": {}, - "outputs": [ - { - "data": { - "text/html": [ - "
\n", - " | eegoffset | \n", - "category | \n", - "category_num | \n", - "eegfile | \n", - "exp_version | \n", - "experiment | \n", - "intrusion | \n", - "is_stim | \n", - "item_name | \n", - "item_num | \n", - "... | \n", - "recog_rt | \n", - "recognized | \n", - "rectime | \n", - "rejected | \n", - "serialpos | \n", - "session | \n", - "stim_list | \n", - "stim_params | \n", - "subject | \n", - "type | \n", - "
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
0 | \n", - "-1 | \n", - "X | \n", - "-999 | \n", - "\n", - " | \n", - " | catFR5 | \n", - "-999 | \n", - "False | \n", - "X | \n", - "-999 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "1 | \n", - "False | \n", - "[] | \n", - "R1389J | \n", - "STIM_ARTIFACT_DETECTION_START | \n", - "
1 | \n", - "5831 | \n", - "X | \n", - "-999 | \n", - "R1389J_catFR5_1_28Feb18_1552.h5 | \n", - "\n", - " | catFR5 | \n", - "-999 | \n", - "False | \n", - "\n", - " | -1 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "1 | \n", - "False | \n", - "[{'amplitude': 500.0, 'anode_label': 'STG6', '... | \n", - "R1389J | \n", - "STIM_ON | \n", - "
10 | \n", - "23781 | \n", - "X | \n", - "-999 | \n", - "R1389J_catFR5_1_28Feb18_1552.h5 | \n", - "\n", - " | catFR5 | \n", - "-999 | \n", - "False | \n", - "\n", - " | -1 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "1 | \n", - "False | \n", - "[{'amplitude': 500.0, 'anode_label': 'STG6', '... | \n", - "R1389J | \n", - "STIM_ON | \n", - "
100 | \n", - "315125 | \n", - "X | \n", - "-999 | \n", - "R1389J_catFR5_1_28Feb18_1552.h5 | \n", - "\n", - " | catFR5 | \n", - "-999 | \n", - "False | \n", - "X | \n", - "-999 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "1 | \n", - "False | \n", - "[] | \n", - "R1389J | \n", - "REC_END | \n", - "
1000 | \n", - "2515863 | \n", - "Flowers | \n", - "9 | \n", - "R1389J_catFR5_1_28Feb18_1552.h5 | \n", - "\n", - " | catFR5 | \n", - "-999 | \n", - "False | \n", - "LILY | \n", - "112 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "4 | \n", - "1 | \n", - "True | \n", - "[] | \n", - "R1389J | \n", - "WORD | \n", - "
5 rows × 28 columns
\n", - "\n", - " | eegoffset | \n", - "category | \n", - "category_num | \n", - "eegfile | \n", - "exp_version | \n", - "experiment | \n", - "intrusion | \n", - "is_stim | \n", - "item_name | \n", - "item_num | \n", - "... | \n", - "recog_rt | \n", - "recognized | \n", - "rectime | \n", - "rejected | \n", - "serialpos | \n", - "session | \n", - "stim_list | \n", - "stim_params | \n", - "subject | \n", - "type | \n", - "
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
0 | \n", - "-1 | \n", - "X | \n", - "-999 | \n", - "NaN | \n", - "NaN | \n", - "catFR5 | \n", - "-999 | \n", - "False | \n", - "X | \n", - "-999 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "1 | \n", - "False | \n", - "[] | \n", - "R1389J | \n", - "STIM_ARTIFACT_DETECTION_START | \n", - "
1 | \n", - "5831 | \n", - "X | \n", - "-999 | \n", - "R1389J_catFR5_1_28Feb18_1552.h5 | \n", - "NaN | \n", - "catFR5 | \n", - "-999 | \n", - "False | \n", - "NaN | \n", - "-1 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "1 | \n", - "False | \n", - "[{'amplitude': 500.0, 'anode_label': 'STG6', '... | \n", - "R1389J | \n", - "STIM_ON | \n", - "
2 | \n", - "7790 | \n", - "X | \n", - "-999 | \n", - "R1389J_catFR5_1_28Feb18_1552.h5 | \n", - "NaN | \n", - "catFR5 | \n", - "-999 | \n", - "False | \n", - "NaN | \n", - "-1 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "1 | \n", - "False | \n", - "[{'amplitude': 500.0, 'anode_label': 'STG6', '... | \n", - "R1389J | \n", - "STIM_ON | \n", - "
3 | \n", - "9786 | \n", - "X | \n", - "-999 | \n", - "R1389J_catFR5_1_28Feb18_1552.h5 | \n", - "NaN | \n", - "catFR5 | \n", - "-999 | \n", - "False | \n", - "NaN | \n", - "-1 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "1 | \n", - "False | \n", - "[{'amplitude': 500.0, 'anode_label': 'STG6', '... | \n", - "R1389J | \n", - "STIM_ON | \n", - "
4 | \n", - "11782 | \n", - "X | \n", - "-999 | \n", - "R1389J_catFR5_1_28Feb18_1552.h5 | \n", - "NaN | \n", - "catFR5 | \n", - "-999 | \n", - "False | \n", - "NaN | \n", - "-1 | \n", - "... | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "-999 | \n", - "1 | \n", - "False | \n", - "[{'amplitude': 500.0, 'anode_label': 'STG6', '... | \n", - "R1389J | \n", - "STIM_ON | \n", - "
5 rows × 28 columns
\n", - "
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'../../../',
- VERSION:'0.9.0',
+ VERSION:'0.9.1',
LANGUAGE:'None',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
diff --git a/docs/html/_modules/cmlreaders/cmlreader.html b/docs/html/_modules/cmlreaders/cmlreader.html
index fe982c4..bc1d89c 100644
--- a/docs/html/_modules/cmlreaders/cmlreader.html
+++ b/docs/html/_modules/cmlreaders/cmlreader.html
@@ -8,7 +8,7 @@
- cmlreaders.cmlreader — CML Data Readers 0.9.0 documentation
+ cmlreaders.cmlreader — CML Data Readers 0.9.1 documentation
@@ -347,7 +347,11 @@ Source code for cmlreaders.cmlreader
# coerce to "all_events" unless we're looking at experiments that don't
# include these.
if data_type == "events":
- if self.experiment.startswith("PS") or self.experiment.startswith("TH"):
+ if (
+ self.experiment.startswith("PS") or
+ self.experiment.startswith("TH") or
+ self.experiment.startswith("YC")
+ ):
data_type = "task_events"
else:
data_type = "all_events"
@@ -503,7 +507,7 @@ Source code for cmlreaders.cmlreader