[med-svn] [python-mne] 245/353: Decreased verbosity when reading events from Raw objects.

[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 691bec2f31bc9e95a679c8978dfac6496751c92d
Author: Louis Thibault <louist at ltpc.(none)>
Date:   Mon Jul 9 15:54:39 2012 +0200

    Decreased verbosity when reading events from Raw objects.
---
 mne/event.py    |  9 +++++----
 mne/fiff/raw.py | 25 ++++++++++++++-----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/mne/event.py b/mne/event.py
index 1b5d0a5..0a87117 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'):
+def find_events(raw, stim_channel='STI 014', verbose=False):
     """Find events from raw file
 
     Parameters
@@ -155,7 +155,7 @@ def find_events(raw, stim_channel='STI 014'):
     if len(pick) == 0:
         raise ValueError('No stim channel found to extract event triggers.')
     data, times = raw[pick, :]
-    if np.any(data < 0):
+    if np.any(data < 0) and verbose:
         warnings.warn('Trigger channel contains negative values. '
                       'Taking absolute value.')
         data = np.abs(data)  # make sure trig channel is positive
@@ -164,8 +164,9 @@ def find_events(raw, stim_channel='STI 014'):
     events_id = data[0, idx + 1].astype(np.int)
     idx += raw.first_samp + 1
     events = np.c_[idx, np.zeros_like(idx), events_id]
-    print "%s events found" % len(events)
-    print "Events id: %s" % np.unique(events[:, 2])
+    if verbose:
+        print "%s events found" % len(events)
+        print "Events id: %s" % np.unique(events[:, 2])
     return events
 
 
diff --git a/mne/fiff/raw.py b/mne/fiff/raw.py
index 4b73eb3..389c4f9 100644
--- a/mne/fiff/raw.py
+++ b/mne/fiff/raw.py
@@ -50,9 +50,10 @@ class Raw(object):
         List of channels' names
     """
 
-    def __init__(self, fname, allow_maxshield=False, preload=False):
+    def __init__(self, fname, allow_maxshield=False, preload=False, verbose=False):
         #   Open the file
-        print 'Opening raw data file %s...' % fname
+        if verbose:
+            print 'Opening raw data file %s...' % fname
         fid, tree, _ = fiff_open(fname)
 
         #   Read the measurement info
@@ -157,11 +158,12 @@ class Raw(object):
         self.rawdir = rawdir
         self.proj = None
         self.comp = None
-        print '    Range : %d ... %d =  %9.3f ... %9.3f secs' % (
-                   self.first_samp, self.last_samp,
-                   float(self.first_samp) / info['sfreq'],
-                   float(self.last_samp) / info['sfreq'])
-        print 'Ready.'
+        if verbose:
+            print '    Range : %d ... %d =  %9.3f ... %9.3f secs' % (
+                       self.first_samp, self.last_samp,
+                       float(self.first_samp) / info['sfreq'],
+                       float(self.last_samp) / info['sfreq'])
+            print 'Ready.'
 
         self.fid = fid
         self.info = info
@@ -644,7 +646,7 @@ class Raw(object):
         return self.info['ch_names']
 
 
-def read_raw_segment(raw, start=0, stop=None, sel=None, data_buffer=None):
+def read_raw_segment(raw, start=0, stop=None, sel=None, data_buffer=None, verbose=False):
     """Read a chunck of raw data
 
     Parameters
@@ -689,9 +691,10 @@ def read_raw_segment(raw, start=0, stop=None, sel=None, data_buffer=None):
     if start >= stop:
         raise ValueError('No data in this range')
 
-    print 'Reading %d ... %d  =  %9.3f ... %9.3f secs...' % (
-                       start, stop - 1, start / float(raw.info['sfreq']),
-                       (stop - 1) / float(raw.info['sfreq'])),
+    if verbose:
+        print 'Reading %d ... %d  =  %9.3f ... %9.3f secs...' % (
+                           start, stop - 1, start / float(raw.info['sfreq']),
+                           (stop - 1) / float(raw.info['sfreq'])),
 
     #  Initialize the data and calibration vector
     nchan = raw.info['nchan']

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