Commit 2e8f134b authored by bourgesl's avatar bourgesl
Browse files

fixed wavelength values (in meters) + README

parent 20273c21
Pipeline #45562 skipped with stage
......@@ -157,8 +157,10 @@ Publish release:
git flow release start $TAG
git flow release finish $TAG
git push # master
git push
git push --tags
git checkout master
git push
git checkout develop
......
......@@ -236,8 +236,8 @@ class Exposure(Base):
self.observation.instrument_submode or '',
# spectral axis:
self.observation.instrument_mode.wavelength_min if self.observation.instrument_mode else float_nan,
self.observation.instrument_mode.wavelength_max if self.observation.instrument_mode else float_nan,
(self.observation.instrument_mode.wavelength_min * 1e-6) if self.observation.instrument_mode else float_nan,
(self.observation.instrument_mode.wavelength_max * 1e-6) if self.observation.instrument_mode else float_nan,
self.observation.instrument_mode.spectral_resolution if self.observation.instrument_mode else float_nan,
# TARGET
......@@ -276,9 +276,7 @@ class Exposure(Base):
self.observation.instrument_submode or '',
# spectral axis:
# self.observation.instrument_mode.wavelength_min if self.observation.instrument_mode else float_nan,
# self.observation.instrument_mode.wavelength_max if self.observation.instrument_mode else float_nan,
# self.observation.instrument_mode.spectral_resolution if self.observation.instrument_mode else float_nan,
# wavelength_min, wavelength_max, spectral_resolution
# TARGET
# self.observation.target_id,
......@@ -404,15 +402,15 @@ class Exposure(Base):
# EXPOSURE
self.id,
self.header_id,
'%.15g' % self.mjd_start if self.mjd_start else str_nan,
'%.15g' % self.mjd_end if self.mjd_end else str_nan,
('%.15g' % self.mjd_start) if self.mjd_start else str_nan,
('%.15g' % self.mjd_end) if self.mjd_end else str_nan,
self.projected_baselines or '',
self.validation_level or 0,
escape(str(self.header.validation_log)) if self.header.validation_log else '',
'%.15g' % self.tau0 if self.tau0 else str_nan,
'%.15g' % self.temperature if self.temperature else str_nan,
'%.15g' % self.seeing if self.seeing else str_nan,
('%.15g' % self.tau0) if self.tau0 else str_nan,
('%.15g' % self.temperature) if self.temperature else str_nan,
('%.15g' % self.seeing) if self.seeing else str_nan,
str(self.date_updated),
str(self.date_release),
......@@ -436,15 +434,15 @@ class Exposure(Base):
self.observation.instrument_submode or '',
# spectral axis:
'%.15g' % self.observation.instrument_mode.wavelength_min if self.observation.instrument_mode else str_nan,
'%.15g' % self.observation.instrument_mode.wavelength_max if self.observation.instrument_mode else str_nan,
'%.15g' % self.observation.instrument_mode.spectral_resolution if self.observation.instrument_mode else str_nan,
('%.15g' % (self.observation.instrument_mode.wavelength_min * 1e-6)) if self.observation.instrument_mode else str_nan,
('%.15g' % (self.observation.instrument_mode.wavelength_max * 1e-6)) if self.observation.instrument_mode else str_nan,
('%.15g' % self.observation.instrument_mode.spectral_resolution) if self.observation.instrument_mode else str_nan,
# TARGET
self.observation.target_id,
self.observation.target.name or '',
'%.15g' % self.observation.target.ra if self.observation.target.ra else str_nan,
'%.15g' % self.observation.target.dec if self.observation.target.dec else str_nan
('%.15g' % self.observation.target.ra) if self.observation.target.ra else str_nan,
('%.15g' % self.observation.target.dec) if self.observation.target.dec else str_nan
)).encode())
else:
fd.write(("""
......@@ -471,14 +469,14 @@ class Exposure(Base):
# EXPOSURE
self.id,
# self.header_id,
'%.15g' % self.mjd_start if self.mjd_start else str_nan,
'%.15g' % self.mjd_end if self.mjd_end else str_nan,
('%.15g' % self.mjd_start) if self.mjd_start else str_nan,
('%.15g' % self.mjd_end) if self.mjd_end else str_nan,
self.projected_baselines or '',
# self.validation_level
# self.header.validation_log
'%.15g' % self.tau0 if self.tau0 else str_nan,
'%.15g' % self.temperature if self.temperature else str_nan,
'%.15g' % self.seeing if self.seeing else str_nan,
('%.15g' % self.tau0) if self.tau0 else str_nan,
('%.15g' % self.temperature) if self.temperature else str_nan,
('%.15g' % self.seeing) if self.seeing else str_nan,
str(self.date_updated),
# OBSERVATION
......@@ -499,15 +497,13 @@ class Exposure(Base):
self.observation.instrument_submode or '',
# spectral axis:
# '%.15g' % self.observation.instrument_mode.wavelength_min if self.observation.instrument_mode else str_nan,
# '%.15g' % self.observation.instrument_mode.wavelength_max if self.observation.instrument_mode else str_nan,
# '%.15g' % self.observation.instrument_mode.spectral_resolution if self.observation.instrument_mode else str_nan,
# wavelength_min, wavelength_max, spectral_resolution
# TARGET
# self.observation.target_id
self.observation.target.name or '',
'%.15g' % self.observation.target.ra if self.observation.target.ra else str_nan,
'%.15g' % self.observation.target.dec if self.observation.target.dec else str_nan
('%.15g' % self.observation.target.ra) if self.observation.target.ra else str_nan,
('%.15g' % self.observation.target.dec) if self.observation.target.dec else str_nan
)).encode())
# SEARCH ###########################################################################################################
......
Supports Markdown
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