... btw. it's awful --- Probably just removing conflicts won't do it, we'll
have to figure out what needs to be done in the base constructor and what
can be done later to get things working. The quick fix would be to just
override the base constructor ;-)


On Sat, Jul 6, 2013 at 10:57 AM, mainakjas <notifications@github.com> wrote:

> In mne/realtime/epochs.py:
>
> > +
> > +    Parameters
> > +    ----------
> > +    client : instance of mne.realtime.RtClient
> > +        The realtime client.
> > +    event_id : int | list of int
> > +        The id of the event to consider. If int, only events with the
> > +        ID specified by event_id are considered. Multiple event ID's
> > +        can be specified using a list.
> > +    tmin : float
> > +        Start time before event.
> > +    tmax : float
> > +        End time after event.
> > +    n_epochs : int
> > +        Number of epochs to return before iteration over epochs stops.
> > +    consume_epochs : bool
>
> ok great! thanks for pitching in, I'll take a look soon.
> … <#13fb33325fa78907_>
> On Sat, Jul 6, 2013 at 11:53 AM, Denis A. Engemann <
> notifications@github.com > wrote: In mne/realtime/epochs.py: > + > +
> Parameters > + ---------- > + client : instance of mne.realtime.RtClient >
> + The realtime client. > + event_id : int | list of int > + The id of the
> event to consider. If int, only events with the > + ID specified by
> event_id are considered. Multiple event ID's > + can be specified using a
> list. > + tmin : float > + Start time before event. > + tmax : float > +
> End time after event. > + n_epochs : int > + Number of epochs to return
> before iteration over epochs stops. > + consume_epochs : bool Ok, I pulled
> and got the conflicts ;-) Looks familiar and where I expected them. I'll
> resolve and create a remote realtime branch in my fork, then you can take a
> look. — Reply to this email directly or view it on GitHub<
> https://github.com/mne-tools/mne-python/pull/615/files#r5052357> .
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/mne-tools/mne-python/pull/615/files#r5052361>
> .
>