search

ZhuangLab / storm-control

Microscope control software
Other
65 stars 67 forks source link

Andor Controller win10 update #101

Closed aaronhalpern closed 4 years ago

aaronhalpern commented 4 years ago

Update (from Hazen) to andorcontroller.py after Windows 10 upgrade.

HazenBabcock commented 4 years ago

Thanks for this, but please break the changes into smaller pieces. You seem to have used git add . at some point so this pull request includes 10s of XML files, png files, etc. that aren't relevant. I'd suggest only using git add XX.YY in the future to avoid dragging in all these extra files.

My suggested procedure is:

  1. Update your master to current Zhuanglab:master.
  2. Create a branch and update only the andor_controller.py file.
  3. Submit this as a new pull request.
  4. Create a branch and add only the MS2000 files.
  5. Submit this as a new pull request.

If you are worried about breaking your setup you could do all of this in a different repository on your computer, or even on a different computer.