Merge branch 'gbrammer:master' into update-poly

gbrammer · Feb 29, 2024 · 32a973c · 32a973c
2 parents 04d86b8 + 0d5c454
commit 32a973c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/grizli/aws/field_tiles.py b/grizli/aws/field_tiles.py
@@ -56,6 +56,7 @@ def make_all_fields():
     spitzer_idf 265.0347875 68.9741119 46 46
     sextansa 152.7749473 -4.7061916 46 46
     rxcj0600 90.04 -20.145 46 46
+    ulasj1342 205.555 9.462 46 46
     """
 
     # 46 46 for tile ref 9 9
@@ -398,9 +399,11 @@ def make_all_tile_images(root, force=False, ref_tile=(8,8), cleanup=True, zoom_l
     # JWST LW
     if (len(glob.glob(f'{root}*.lwrgb.png')) == 0) & make_combinations:
         filters = []
-        for f in ['f277w-clear','f356w-clear','f444w-clear',
-                  'f410m-clear','f365m-clear','f460m-clear',
-                  'f480m-clear', 'f335m-clear','f300m-clear',]:
+        for f in ['f277w-clear', 'f356w-clear', 'f444w-clear',
+                  'f410m-clear', 'f365m-clear', 'f460m-clear',
+                  'f480m-clear', 'f335m-clear', 'f300m-clear',
+                  'f250m-clear', 'f360m-clear', 'f430m-clear',
+                  ]:
             if f in all_filters:
                 filters.append(f)
 
@@ -504,6 +507,9 @@ def make_all_tile_images(root, force=False, ref_tile=(8,8), cleanup=True, zoom_l
         elif ('sextans' in root):
             filters = ['f115w-clear','f200w-clear','f360m-clear']
             rgb_scl = [1.3, 0.8, 1.02]
+        elif ('ulasj1342' in root):
+            filters = ['f115w-clear','f250m-clear','f430m-clear']
+            rgb_scl = [1.3, 0.8, 1.02]
         elif ('j031124m5823' in root):
             filters = ['f200w-clear','f300m-clear','f444w-clear']
             rgb_scl = [1.2, 1.05, 1.0]
@@ -707,7 +713,8 @@ def process_tile(field='cos', tile='01.01', filters=TILE_FILTERS, fetch_existing
 
     if field in ('sextansa','cos','abell370','abell2744',
                  'macs0416','macs1149','macs1423','macs0417',
-                 'egs','uds','gds','gdn','egs-v2'):
+                 'egs','uds','gds','gdn','egs-v2',
+                 'ulasj1342'):
         make_catalog = False
 
     utils.LOGFILE = 'mosaic.log'
@@ -974,7 +981,7 @@ def get_random_tile():
     return tile, field
 
 
-def run_one(own_directory=True, rgb_only=True, make_catalog=True, **kwargs):
+def run_one(own_directory=True, rgb_only=True, make_catalog=False, **kwargs):
     """
     Run a single random visit
     """

diff --git a/grizli/utils.py b/grizli/utils.py
@@ -2041,11 +2041,17 @@ def get_line_wavelengths():
     line_wavelengths['OII'] = [3727.092, 3729.875]
     line_ratios['OII'] = [1, 1.]
 
-    line_wavelengths['OI-6302'] = [6302.046, 6365.535]
-    line_ratios['OI-6302'] = [1, 0.33]
     line_wavelengths['OI-5578'] = [5578.89]
     line_ratios['OI-5578'] = [1]
-
+    line_wavelengths['OI-6302'] = [6302.046, 6365.535]
+    line_ratios['OI-6302'] = [1, 0.33]
+    line_wavelengths['OI-7776'] = [ 7776.3]
+    line_ratios['OI-7776'] = [1]
+    line_wavelengths['OI-8448'] = [ 8448.7]
+    line_ratios['OI-8448'] = [1]
+    line_wavelengths['OI-11290'] = [ 11290.]
+    line_ratios['OI-11290'] = [1]
+
     # Auroral OII
     # lines roughly taken from https://arxiv.org/pdf/1610.06939.pdf
     line_wavelengths['OII-7325'] = [7321.9, 7332.21]
@@ -2135,8 +2141,10 @@ def get_line_wavelengths():
     line_ratios['CIII-1906'] = [1.]
     line_wavelengths['CIII-1908'] = [1908.734]
     line_ratios['CIII-1908'] = [1.]
-    line_wavelengths['CI-9580'] = [9850.26]
+    line_wavelengths['CI-9580'] = [9850.26] # leave typo for back compatibility
     line_ratios['CI-9580'] = [1.]
+    line_wavelengths['CI-9850'] = [9850.26]
+    line_ratios['CI-9850'] = [1.]
 
 
     # Sodium D I lines from Davies 2023