@mainakjas / @mluessi, @agramfort

I merged and rebased the realtime branch, you can inspect and pull from my
fork. Epochs tests and related critical examples are happy.
As announced I droped proj as parameter from base epochs, now all happens
in the child classes.
This was the cleanest way to do it, at least in the moment.
As a consequence get_data is overridden by Epochs. If you don't like it we
need to move '_preprocess' and '_check_deleayed' into base epochs and add
back the proj parameter.




On Sat, Jul 6, 2013 at 12:08 PM, Denis-Alexander Engemann <
denis.engemann@gmail.com> wrote:

> Yay, test_epochs is happy ;-)
>
>
> On Sat, Jul 6, 2013 at 11:13 AM, Denis-Alexander Engemann <
> denis.engemann@gmail.com> wrote:
>
>> @mainkjas @mluessi @agramfort --- if we want to move on, the best thing
>> would be to remove the proj setup + handling from the base class and let
>> the children handle their projs as needed. Okay?
>>
>>
>> On Sat, Jul 6, 2013 at 11:04 AM, Denis-Alexander Engemann <
>> denis.engemann@gmail.com> wrote:
>>
>>> ... 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.
>>>> …<#13fb374687c9f6a4_13fb34205ca86116_13fb339974f1852e_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>
>>>> .
>>>>
>>>
>>>
>>
>