Skip to content

Conversation

@nsteinme
Copy link
Contributor

We had some trouble with gamma calibration and these commits fix a bug and label plots more usefully - we'd have succeeded much faster with these changes.

@nsteinme nsteinme requested a review from jkbhagatio May 29, 2019 23:10
@jkbhagatio
Copy link
Member

Great! I will do this merge in the command line, because I will also add an accompanying test for the changes. By the way, we added a CONTRIBUTING file now, as we're trying to take a more thorough approach to adding/editing code, especially (hopefully?) with more contributors in the future. Generally, the workflow for adding code will be to create a pull-request to 'dev', and make sure the code is accompanied with an appropriate test, if a test does not already exist for the file. Since we're very early on in the stages of adding tests, it's ok for now if you don't want to create a test function each time you add/edit a few lines of code (that will be our responsibility).

@nsteinme
Copy link
Contributor Author

ok, makes sense, I will figure out the test functions in the future. Btw small note, but looks like there is no content at the readthedocs page?? I just followed the link from the main readme.

@jkbhagatio
Copy link
Member

check back in a couple weeks : )

@k1o0
Copy link
Contributor

k1o0 commented Jun 10, 2019

@jaib1 It would be nice to add a fix for issue #128 too.

@jkbhagatio
Copy link
Member

jkbhagatio commented Jun 25, 2019

also worth looking into #4 - will do this today

@jkbhagatio jkbhagatio changed the base branch from master to dev June 26, 2019 12:22
jkbhagatio pushed a commit that referenced this pull request Jun 26, 2019
@jkbhagatio
Copy link
Member

I've done this and #4 in a separate branch. Waiting on some clarification/help from Miles so I can add a solution for #128 in that same branch. Will then merge that branch and close this pr and those two issues

+srv/expServer.m Outdated
clockOut = 'port1/line0 (PFI4)';
log(['Please connect photodiode to %s, clockIn to %s and clockOut to %s.\r'...
'Press any key to contiue\n'],lightIn,clockIn,clockOut);
lightIn = 'ai1'; % defaults from hw.psy.Window
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nsteinme why did you switch the lightin and clockIn channels here? I just ran gamma calibration with the old channels and it worked fine (though it also works with your suggested channels)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

following up on this

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As this doesn't affect things I'm happy to go ahead with this merge. I will fix the typo on line 362 first though...

jkbhagatio pushed a commit that referenced this pull request Jul 8, 2019
@jkbhagatio jkbhagatio mentioned this pull request Jul 8, 2019
@k1o0 k1o0 merged commit c5d0561 into cortex-lab:dev Oct 1, 2019
k1o0 pushed a commit that referenced this pull request Jan 3, 2021
* use the correct channels for gamma cal as specified
* label output plots correctly
k1o0 pushed a commit that referenced this pull request Jan 4, 2021
* use the correct channels for gamma cal as specified
* label output plots correctly
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants