[med-svn] [python-mne] 246/353: verbose flag defaults to True np.abs now properly called in mne/fiff/raw.py

[Yaroslav Halchenko]

This is an automated email from the git hooks/post-receive script.

yoh pushed a commit to tag 0.4
in repository python-mne.

commit 6d40f6d47efc3f6eca44703a55c78ff991222c9f
Author: = <louist87 at gmail.com>
Date:   Mon Jul 9 16:57:42 2012 +0200

    verbose flag defaults to True
    np.abs now properly called in mne/fiff/raw.py
---
 mne/event.py    | 9 +++++----
 mne/fiff/raw.py | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mne/event.py b/mne/event.py
index 0a87117..cf58c36 100644
--- a/mne/event.py
+++ b/mne/event.py
@@ -130,7 +130,7 @@ def write_events(filename, event_list):
     end_file(fid)
 
 
-def find_events(raw, stim_channel='STI 014', verbose=False):
+def find_events(raw, stim_channel='STI 014', verbose=True):
     """Find events from raw file
 
     Parameters
@@ -155,9 +155,10 @@ def find_events(raw, stim_channel='STI 014', verbose=False):
     if len(pick) == 0:
         raise ValueError('No stim channel found to extract event triggers.')
     data, times = raw[pick, :]
-    if np.any(data < 0) and verbose:
-        warnings.warn('Trigger channel contains negative values. '
-                      'Taking absolute value.')
+    if np.any(data < 0):
+        if verbose:
+            warnings.warn('Trigger channel contains negative values. '
+                          'Taking absolute value.')
         data = np.abs(data)  # make sure trig channel is positive
     data = data.astype(np.int)
     idx = np.where(np.all(np.diff(data, axis=1) > 0, axis=0))[0]
diff --git a/mne/fiff/raw.py b/mne/fiff/raw.py
index 389c4f9..fc88a11 100644
--- a/mne/fiff/raw.py
+++ b/mne/fiff/raw.py
@@ -50,7 +50,7 @@ class Raw(object):
         List of channels' names
     """
 
-    def __init__(self, fname, allow_maxshield=False, preload=False, verbose=False):
+    def __init__(self, fname, allow_maxshield=False, preload=False, verbose=True):
         #   Open the file
         if verbose:
             print 'Opening raw data file %s...' % fname
@@ -646,7 +646,8 @@ class Raw(object):
         return self.info['ch_names']
 
 
-def read_raw_segment(raw, start=0, stop=None, sel=None, data_buffer=None, verbose=False):
+def read_raw_segment(raw, start=0, stop=None, sel=None, data_buffer=None,
+    verbose=False):
     """Read a chunck of raw data
 
     Parameters

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-mne.git