Use ParseValue instead of GetAllParams for added_keywords.

LSSTDESC · Jan 20, 2024 · e6124cf · e6124cf
1 parent 4892ee1
commit e6124cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/imsim/readout.py b/imsim/readout.py
@@ -6,7 +6,7 @@
 from astropy.io import fits
 from astropy.time import Time
 import galsim
-from galsim.config import ExtraOutputBuilder, RegisterExtraOutput, GetAllParams
+from galsim.config import ExtraOutputBuilder, RegisterExtraOutput, GetAllParams, ParseValue
 from lsst.afw import cameraGeom
 import lsst.obs.lsst
 from lsst.obs.lsst.translators.lsst import SIMONYI_TELESCOPE
@@ -556,12 +556,16 @@ def finalize(self, config, base, main_data, logger):
             'pcti': float,
             'full_well': float,
             'read_noise': float,
-            'bias_levels_file': str,
-            'added_keywords': dict
+            'bias_levels_file': str
             }
-        ignore = ['file_name', 'dir', 'hdu', 'filter']
+        ignore = ['file_name', 'dir', 'hdu', 'filter', 'added_keywords']
         kwargs = GetAllParams(config, base, opt=opt, ignore=ignore)[0]
 
+        if 'added_keywords' in config:
+            kwargs['added_keywords'] = {}
+            for k in (added_keywords := config.get('added_keywords', {})):
+                kwargs['added_keywords'][k], safe = ParseValue(added_keywords, k, base, str)
+
         ccd_readout = CcdReadout(main_data[0], logger, **kwargs)
 
         hdus = ccd_readout.prepare_hdus(rng)

diff --git a/tests/test_readout.py b/tests/test_readout.py
@@ -39,7 +39,7 @@ def setUp(self):
                     'scti': 1.e-6,
                     'added_keywords' : {
                         'TESTKEY1': 'TESTVAL1',
-                        'TESTKEY2': 'TESTVAL2'
+                        'SOMEMATH': '$1+2'
                     }
                 }
             },
@@ -98,7 +98,7 @@ def test_raw_file_headers(self):
             self.assertEqual(hdus[0].header['IMSIMVER'], imsim.__version__)
             # Test added_keywords are included correctly
             self.assertEqual(hdus[0].header['TESTKEY1'], 'TESTVAL1')
-            self.assertEqual(hdus[0].header['TESTKEY2'], 'TESTVAL2')
+            self.assertEqual(hdus[0].header['SOMEMATH'], '3')
         os.remove(outfile)
 
     def test_no_opsim(self):