Closed hdiamondlowe closed 5 years ago
OK, I'll take a look at the conflicts and changes on Thursday afternoon or Friday morning. I'm also totally find with a kludgy way of dealing with the gains for LDSS and IMACS. Especially since they're confined to the instrument classes, we can tidy them up (or not!) whenever we need to.
@hdiamondlowe , I merged these into the master branch -- it looks like it was mostly just comments I had added in the text that were different between the two. Otherwise, I think you separated things pretty cleanly!
This version of the IMACS branch should be able to be merged into master, though I'm sure there'll be some bumps.
@zkbt I updated the IMACS branch version of CCD so that the createStitched so that it is more general like yours. This introduced some problems that I had to fix in a slightly hack-y way in the instrument classes. The main issue is that the gain is not recorded in the headers of LDSS3C and IMACS files; they have to be looked up and added manually. Personally, I'm okay if the sloppiness is confined to the IMACS and LDSS3C classes for now. I will hopefully have some shiney new data at the beginning of November and I will use that opportunity to clean up those classes a little.