Imported recent work on Imfit, minor conflicts fixed

The recent work by Raul to import Imfit is now merged into the master
branch. Only a few minor conflicts came up due to the update with CFITSIO
(that Raul also done in parallel on this branch).

1 files changed, 24 insertions, 0 deletions

diff --git a/reproduce/software/bibtex/imfit.tex b/reproduce/software/bibtex/imfit.tex
new file mode 100644
index 0000000..bdd840b
--- /dev/null
+++ b/reproduce/software/bibtex/imfit.tex
@@ -0,0 +1,24 @@
+%% Copyright (C) 2019 Raul Infante-Sainz <infantesainz@gmail.com>
+%%
+%% Copying and distribution of this file, with or without modification,
+%% are permitted in any medium without royalty provided the copyright
+%% notice and this notice are preserved.  This file is offered as-is,
+%% without any warranty.
+
+@ARTICLE{imfit2015,
+   author = {{Erwin}, P.},
+    title = "{IMFIT: A Fast, Flexible New Program for Astronomical Image Fitting}",
+  journal = {ApJ},
+archivePrefix = "arXiv",
+   eprint = {1408.1097},
+ primaryClass = "astro-ph.IM",
+ keywords = {galaxies: bulges, galaxies: photometry, galaxies: structure, methods: data analysis, techniques: image processing, techniques: photometric },
+     year = 2015,
+    month = feb,
+   volume = 799,
+      eid = {226},
+    pages = {226},
+      doi = {10.1088/0004-637X/799/2/226},
+   adsurl = {https://ui.adsabs.harvard.edu/abs/2015ApJ...799..226E},
+  adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+}