search

drphilmarshall / OM10

Tools for working with the Oguri & Marshall (2010) mock catalog of strong gravitational lenses
MIT License
8 stars 19 forks source link

Issue/02/weight #56

Closed jennykim1016 closed 7 years ago

drphilmarshall commented 7 years ago

Looks like you need to git pull base master into this branch and fix the conflict in om10/db.py before checking in again!

jennykim1016 commented 7 years ago

Oops, sorry; I did not intend to merge to your directory; I wanted to merge first with my master directory from the branch. I will merge into your directory after checking everything once again!

drphilmarshall commented 7 years ago

Also, the notebooks folder seems to have a lot of additional stuff in it (untitled notebooks, data files, pickles etc) that need cleaning out. We should try to keep the checked in notebooks to a minimum - with the code painting both the lenses and quasars at the same time, I was hoping we'd just need one "painting demo" notebook. Is it possible?

drphilmarshall commented 7 years ago

Ah, OK! See my comment about notebook consolidation though, in case you haven't done this already. Thanks, Jenny!