Using negative wing_offset to indicate to not use for #253

NCAR · May 6, 2024 · 503dee6 · 503dee6
1 parent 77ecb89
commit 503dee6
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 14 deletions.
diff --git a/resource/wave_regions/ucomp.1074.spec.cfg b/resource/wave_regions/ucomp.1074.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=1074.7
-wing_offset                      : type=float, optional, default=0.11
+wing_offset                      : type=float, default=0.11
 name                             : type=str, default=Fe XIII
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.1079.spec.cfg b/resource/wave_regions/ucomp.1079.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=1079.8
-wing_offset                      : type=float, optional, default=0.11
+wing_offset                      : type=float, default=0.11
 name                             : type=str, default=Fe XIII
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.1083.spec.cfg b/resource/wave_regions/ucomp.1083.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=1083.0
-wing_offset                      : type=float, optional
+wing_offset                      : type=float, default=-1.0
 name                             : type=str, default=He I
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.530.spec.cfg b/resource/wave_regions/ucomp.530.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=530.3
-wing_offset                      : type=float, optional
+wing_offset                      : type=float, default=-1.0
 name                             : type=str, default=Fe XIV
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=green line

diff --git a/resource/wave_regions/ucomp.637.spec.cfg b/resource/wave_regions/ucomp.637.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=637.4
-wing_offset                      : type=float, optional, default=0.06
+wing_offset                      : type=float, default=0.06
 name                             : type=str, default=Fe X
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.656.spec.cfg b/resource/wave_regions/ucomp.656.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=656.3
-wing_offset                      : type=float, optional
+wing_offset                      : type=float, default=-1.0
 name                             : type=str, default=H I
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=red line (H-alpha)

diff --git a/resource/wave_regions/ucomp.670.spec.cfg b/resource/wave_regions/ucomp.670.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=670.20
-wing_offset                      : type=float, optional
+wing_offset                      : type=float, default=-1.0
 name                             : type=str, default=Ni XV
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.691.spec.cfg b/resource/wave_regions/ucomp.691.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=691.8
-wing_offset                      : type=float, optional
+wing_offset                      : type=float, default=-1.0
 name                             : type=str, default=Ar XI
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.706.spec.cfg b/resource/wave_regions/ucomp.706.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=706.2
-wing_offset                      : type=float, optional, default=0.06
+wing_offset                      : type=float, default=0.06
 name                             : type=str, default=Fe XV
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.761.spec.cfg b/resource/wave_regions/ucomp.761.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=761.10
-wing_offset                      : type=float, optional
+wing_offset                      : type=float, default=-1.0
 name                             : type=str, default=S XII
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.789.spec.cfg b/resource/wave_regions/ucomp.789.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=789.4
-wing_offset                      : type=float, optional, default=0.07
+wing_offset                      : type=float, default=0.07
 name                             : type=str, default=Fe XI
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.802.spec.cfg b/resource/wave_regions/ucomp.802.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=802.40
-wing_offset                      : type=float, optional
+wing_offset                      : type=float, default=-1.0
 name                             : type=str, default=Ni XV
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/resource/wave_regions/ucomp.991.spec.cfg b/resource/wave_regions/ucomp.991.spec.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 center_wavelength                : type=float, default=991.30
-wing_offset                      : type=float, optional
+wing_offset                      : type=float, default=-1.0
 name                             : type=str, default=S VIII
 doi                              : type=str, default=https://doi.org/10.26024/g8p7-wy42
 nickname                         : type=str, default=

diff --git a/src/level2/ucomp_l2_file.pro b/src/level2/ucomp_l2_file.pro
@@ -94,7 +94,9 @@ pro ucomp_l2_file, filename, thumbnail=thumbnail, run=run
   center_wavelength = run->line(wave_region, 'center_wavelength')
   wing_offset = run->line(wave_region, 'wing_offset')
 
-  if (n_elements(wing_offset) gt 0L) then begin
+  if (wing_offset gt 0.0) then begin
+    mg_log, 'using %0.2f nm wing offset for analytical Guassian', $
+            wing_offset, name=run.logger_name, /debug
     ; NOTE: this is naive and assuming that there are not two equally distant
     ; wavelengths to the preferred spot, for example, if center wavelength is
     ; 1074.7 with 0.11 wing_offset, and the observed wavelengths were:
@@ -109,6 +111,9 @@ pro ucomp_l2_file, filename, thumbnail=thumbnail, run=run
     !null = min(abs(wavelengths - center_wavelength), center_index)
     !null = min(abs(wavelengths - (center_wavelength + wing_offset)), red_index)
   endif else begin
+    mg_log, 'using center 3 wavelengths for analytical Guassian', $
+            name=run.logger_name, /debug
+
     blue_index = n_wavelengths / 2L - 1L
     center_index = n_wavelengths / 2L
     red_index = n_wavelengths / 2L + 1L

diff --git a/src/ucomp_run__define.pro b/src/ucomp_run__define.pro
@@ -1216,6 +1216,8 @@ function ucomp_run::init, date, mode, config_filename, $
                                    subdir=['wave_regions'], $
                                    root=self.resource_root)
     wave_region_options = mgffepochparser(lines_filename, lines_spec_filename)
+    mg_log, 'checking wave region options file: %s', file_basename(lines_filename), $
+            name=logger_name, /debug
     lines_valid = wave_region_options->is_valid(error_msg=error_msg)
     if (~lines_valid) then begin
       mg_log, 'invalid wave region options file: %s', file_basename(lines_filename), $