Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #84 from christianmbrodbeck/cmb-verbose

Minor suggestion: Epochs inherits raw.verbose
  • Loading branch information...
commit a454a20218e7d0ec414451f9e66b96b55dc77306 2 parents 3b5a12c + 9fb5059
Alexandre Gramfort authored August 25, 2012

Showing 1 changed file with 8 additions and 3 deletions. Show diff stats Hide diff stats

  1. 11  mne/epochs.py
11  mne/epochs.py
@@ -75,6 +75,10 @@ class Epochs(object):
75 75
 
76 76
     proj : bool, optional
77 77
         Apply SSP projection vectors
  78
+        
  79
+    verbose : None | bool
  80
+        Use verbose output. None defaults to raw.verbose.
  81
+        
78 82
 
79 83
     Attributes
80 84
     ----------
@@ -110,8 +114,9 @@ class Epochs(object):
110 114
 
111 115
     def __init__(self, raw, events, event_id, tmin, tmax, baseline=(None, 0),
112 116
                 picks=None, name='Unknown', keep_comp=False, dest_comp=0,
113  
-                preload=False, reject=None, flat=None, proj=True):
  117
+                preload=False, reject=None, flat=None, proj=True, verbose=None):
114 118
         self.raw = raw
  119
+        self.verbose = raw.verbose if verbose is None else verbose
115 120
         self.event_id = event_id
116 121
         self.tmin = tmin
117 122
         self.tmax = tmax
@@ -275,8 +280,8 @@ def _get_epoch_from_disk(self, idx):
275 280
             epoch = np.dot(self.proj, epoch)
276 281
 
277 282
         # Run baseline correction
278  
-        epoch = rescale(epoch, self.times, self.baseline, 'mean', verbose=True,
279  
-                        copy=False)
  283
+        epoch = rescale(epoch, self.times, self.baseline, 'mean',
  284
+                        verbose=self.verbose, copy=False)
280 285
         return epoch
281 286
 
282 287
     def _get_data_from_disk(self):

0 notes on commit a454a20

Please sign in to comment.
Something went wrong with that request. Please try again.