Commit 719f8750 authored by bepinat's avatar bepinat

Correction wavelengths

parent eb08ea70
......@@ -115,7 +115,7 @@ def readconfig(filename, config):
# XXX or give an error message but in that case, must test that the keywords have correct values
## XXX more keywords? add default values?
needed_keys = ['FITSFILE', 'OUTPUT', 'SKYFILE', 'HALPHA', 'NII6548', 'NII6584', 'SII6716', 'SII6731', 'OIII4959', 'OIII5007', 'HBETA', 'OII3729', 'OII3726', 'COMMW', 'REDSHIFT', 'REDMIN', 'REDMAX', 'INITW', 'WMIN', 'WMAX', 'DFIT', 'DGCTNUM', 'MFIT', 'SCLIP', 'XYCLIP', 'NCLIP', 'SPSF', 'WSMOOTH', 'SSMOOTH', 'THRES', 'MEDIAN', 'FITSPSF', 'XMIN', 'YMIN', 'ZMIN', 'XMAX', 'YMAX', 'ZMAX']
needed_keys = ['FITSFILE', 'OUTPUT', 'SKYFILE', 'HALPHA', 'NII6548', 'NII6583', 'SII6716', 'SII6731', 'OIII4959', 'OIII5007', 'HBETA', 'OII3729', 'OII3726', 'COMMW', 'REDSHIFT', 'REDMIN', 'REDMAX', 'INITW', 'WMIN', 'WMAX', 'DFIT', 'DGCTNUM', 'MFIT', 'SCLIP', 'XYCLIP', 'NCLIP', 'SPSF', 'WSMOOTH', 'SSMOOTH', 'THRES', 'MEDIAN', 'FITSPSF', 'XMIN', 'YMIN', 'ZMIN', 'XMAX', 'YMAX', 'ZMAX']
keys = conf.keys()
for key in needed_keys:
#if keys.isdisjoint([key]): # c'est du python3
......@@ -356,10 +356,10 @@ class lines:
self.lines = {}
self.append(line('HALPHA', 6562.801, ref='HBETA', low=2.75, th=2.85))
self.append(line('HBETA', 4861.363))
self.append(line('HGAMMA', 4340., ref='HBETA', low=0.44, up=0.5, th=0.468))
self.append(line('HDELTA', 4101., ref='HBETA', low=0.23, up=0.29, th=0.259))
self.append(line('HGAMMA', 4340.47, ref='HBETA', low=0.44, up=0.5, th=0.468))
self.append(line('HDELTA', 4101.75, ref='HBETA', low=0.23, up=0.29, th=0.259))
self.append(line('HEPS', 3968., ref='HBETA', low=0.13, up=0.19, th=0.159))
self.append(line('NII6584', 6583.45, ref='NII6548', low=2.7, up=3.3, th=3.))
self.append(line('NII6583', 6583.45, ref='NII6548', low=2.7, up=3.3, th=3.))
#self.append(line('NII6583', 6583., ref='NII6548', low=2.7, up=3.3, th=3.))
self.append(line('NII6548', 6548.05))
self.append(line('SII6731', 6730.82))
......@@ -961,19 +961,19 @@ def main(argv):
parser.add_argument('--FITSFILE', action="store", dest="FITSFILE", default=None, help="name of the input cube")
parser.add_argument('--OUTPUT', action="store", dest="OUTPUT", default=None, help="generic output name")
parser.add_argument('--SKYFILE', action="store", dest="SKYFILE", default=None, help="name of the variance cube (can be a sky cube)")
parser.add_argument('--HALPHA', action="store_true", dest="HALPHA", default=None, help="keyword to fit Halpha line")
parser.add_argument('--HBETA', action="store_true", dest="HBETA", default=None, help="keyword to fit Hbeta line")
parser.add_argument('--HGAMMA', action="store_true", dest="HGAMMA", default=None, help="keyword to fit Hgamma line")
parser.add_argument('--HDELTA', action="store_true", dest="HDELTA", default=None, help="keyword to fit Hdelta line")
parser.add_argument('--HEPS', action="store_true", dest="HEPS", default=None, help="keyword to fit Hepsilon line")
parser.add_argument('--NII6548', action="store_true", dest="NII6548", default=None, help="keyword to fit NII@6548 line")
parser.add_argument('--NII6584', action="store_true", dest="NII6584", default=None, help="keyword to fit NII@6584 line")
parser.add_argument('--SII6716', action="store_true", dest="SII6716", default=None, help="keyword to fit SII@6716 line")
parser.add_argument('--SII6731', action="store_true", dest="SII6731", default=None, help="keyword to fit SII@6731 line")
parser.add_argument('--HALPHA', action="store_true", dest="HALPHA", default=None, help="keyword to fit Halpha@6562.801 line")
parser.add_argument('--HBETA', action="store_true", dest="HBETA", default=None, help="keyword to fit Hbeta@4861.363 line")
parser.add_argument('--HGAMMA', action="store_true", dest="HGAMMA", default=None, help="keyword to fit Hgamma@4340.47 line")
parser.add_argument('--HDELTA', action="store_true", dest="HDELTA", default=None, help="keyword to fit Hdelta@4101.75 line")
parser.add_argument('--HEPS', action="store_true", dest="HEPS", default=None, help="keyword to fit Hepsilon@3968 line")
parser.add_argument('--NII6548', action="store_true", dest="NII6548", default=None, help="keyword to fit NII@6548.05 line")
parser.add_argument('--NII6583', action="store_true", dest="NII6583", default=None, help="keyword to fit NII@6583.45 line")
parser.add_argument('--SII6716', action="store_true", dest="SII6716", default=None, help="keyword to fit SII@6716.44 line")
parser.add_argument('--SII6731', action="store_true", dest="SII6731", default=None, help="keyword to fit SII@6730.82 line")
parser.add_argument('--OIII4363', action="store_true", dest="OIII4363", default=None, help="keyword to fit OIII@4363 line")
parser.add_argument('--OIII4959', action="store_true", dest="OIII4959", default=None, help="keyword to fit OIII@4959 line")
parser.add_argument('--OIII5007', action="store_true", dest="OIII5007", default=None, help="keyword to fit OIII@5007 line")
parser.add_argument('--OII', action="store_true", dest="OII3729", default=None, help="keyword to fit OII doublet") # ['OII3729','OII3726']
parser.add_argument('--OIII4959', action="store_true", dest="OIII4959", default=None, help="keyword to fit OIII@4958.911 line")
parser.add_argument('--OIII5007', action="store_true", dest="OIII5007", default=None, help="keyword to fit OIII@5006.843 line")
parser.add_argument('--OII', action="store_true", dest="OII3729", default=None, help="keyword to fit OII doublet @3726.04,3728.80") # ['OII3729','OII3726']
parser.add_argument('--OI6300', action="store_true", dest="OI6300", default=None, help="keyword to fit OI@6300 line")
parser.add_argument('--HEI4471', action="store_true", dest="HeI4471", default=None, help="keyword to fit HeI@4471 line")
parser.add_argument('--HEI5876', action="store_true", dest="HeI5876", default=None, help="keyword to fit HeI@5876 line")
......
......@@ -3,7 +3,7 @@ OUTPUT = / where to write the output (default: ./out.fits
SKYFILE = / path of the file containing the sky spectrum or cube
HALPHA = / do we fit Halpha (default: TRUE)
NII6548 = / do we fit NII6548 (default: FALSE)
NII6584 = / do we fit NII6584 (default: FALSE)
NII6583 = / do we fit NII6584 (default: FALSE)
SII6716 = / do we fit SII6716 (default: FALSE)
SII6731 = / do we fit SII6731 (default: FALSE)
OIII4959= / do we fit OIII4959 (default: FALSE)
......
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