Commit c9a6846e authored by Monica Rainer's avatar Monica Rainer
Browse files

Problem with merge

parents 2881c959 f7a69027
......@@ -8,26 +8,39 @@ Python packages:
- SciPy v0.19
- watchdog v0.8.2
- docopt v0.6.1
<<<<<<< HEAD
Other requirements:
=======
Other requirement:
>>>>>>> f7a69027e002f158479eff0d2663a8c9ecb5dbbe
- fortran77 compiler
- libcfitsio library
Installation:
- preserve the directory tree:
gofio/
<<<<<<< HEAD
__init__.py
__version__.py
gofioDRS.py
drslib/
__init__.py
clean_db.py
=======
gofioDRS.py
drslib/
__init__.py
>>>>>>> f7a69027e002f158479eff0d2663a8c9ecb5dbbe
config.py
darkframes.py
db.py
flatframes.py
<<<<<<< HEAD
gofio.py
gofio2ascii.py
logger.py
=======
>>>>>>> f7a69027e002f158479eff0d2663a8c9ecb5dbbe
nodding.py
rawfiles.py
stare.py
......@@ -37,6 +50,12 @@ Installation:
__init__.py
astroTimeLegacy.py
baryvel.py
<<<<<<< HEAD
=======
logger/
__init__.py
logger.py
>>>>>>> f7a69027e002f158479eff0d2663a8c9ecb5dbbe
resources/
GIANOB_MASKC.fits
UNe_lines_GIANO_selected.txt
......@@ -64,9 +83,13 @@ Output:
- final output (optional): *_s1d.fits. The spectra are flat-fielded, extracted,
calibrated, and the cosmic rays are removed. The echelle orders are merged.
The barycentric correction is applied. These are monodimensional spectra with
<<<<<<< HEAD
constant step in wavelength.
The program gofio2ascii.py may be used to convert the outputs from FITS format
to ASCII files. It requires as input a text list with the filepaths of the
files to convert.
=======
constant step in wavelength.
>>>>>>> f7a69027e002f158479eff0d2663a8c9ecb5dbbe
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment