Merge branch 'develop' into nirspec

pypeit · Apr 17, 2024 · 33021b2 · 33021b2
2 parents 6033517 + dbf2a60
commit 33021b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/doc/releases/1.15.1dev.rst b/doc/releases/1.15.1dev.rst
@@ -59,3 +59,5 @@ Bug Fixes
   directly a sky spectrum. This fixes a bug in the flexure correction for SlicerIFU.
 - The `--show` option of the `pypeit_coadd_1dspec` script was not properly displaying the
   x-axis of the plot. Both the top and bottom panels now scale together.
+- Fix a bug in `pypeit_sensfunc` that was causing the script to crash because `par['fluxcalib']`
+  was not being passed to `sensfunc.SensFunc.get_instance()`.
diff --git a/pypeit/scripts/sensfunc.py b/pypeit/scripts/sensfunc.py
@@ -170,7 +170,7 @@ def main(args):
                             cfg_lines=spectrograph_config_par.to_config(),
                             merge_with=(sensFile.cfg_lines,))
             else:
-                par = spectrograph_config_par 
+                par = pypeitpar.PypeItPar.from_cfg_lines(cfg_lines=spectrograph_config_par.to_config())
 
             # If algorithm was provided override defaults. Note this does undo .sens
             # file since they cannot both be passed
@@ -193,7 +193,10 @@ def main(args):
             # command line, overwrite the parset values read in from the .sens file
 
             # Instantiate the relevant class for the requested algorithm
-            sensobj = sensfunc.SensFunc.get_instance(file, ofile, par['sensfunc'], debug=args.debug)
+            sensobj = sensfunc.SensFunc.get_instance(file, ofile, par['sensfunc'],
+                                                     par_fluxcalib=par['fluxcalib'],
+                                                     debug=args.debug,
+                                                     chk_version=par['rdx']['chk_version'])
             # Generate the sensfunc
             sensobj.run()
             msgs.info(f'Saved std FWHM as: {sensobj.spat_fwhm_std}')