Merge pull request #186 from Keck-DataReductionPipelines/develop

Fix overconstrained bias matching and bad master_object naming

Author: MNBrod

kcwidrp/core/kcwi_proctab.py

@@ -158,10 +158,6 @@ def search_proctab(self, frame, target_type=None, target_group=None,
                 self.log.info('Looking for frames with CCDCFG = %s' %
                               frame.header['CCDCFG'])
                 tab = tab[(tab['DID'] == int(frame.header['CCDCFG']))]
-                if target_group is not None:
-                    self.log.info('Looking for frames with GRPID = %s' %
-                                  target_group)
-                    tab = tab[(tab['GRPID'] == target_group)]
             # raw DARKS must have the same CCDCFG and TTIME
             elif target_type == 'DARK':
                 self.log.info('Looking for frames with CCDCFG = %s and '

kcwidrp/primitives/MakeMasterContbars.py

@@ -62,7 +62,7 @@ def _perform(self):
             stack = []
             stackf = []
             for cbs in combine_list:
-                # get arc intensity (int) image file name in redux directory
+                # get cbars intensity (int) image file name in redux directory
                 stackf.append(strip_fname(cbs) + '_int.fits')
                 cbsfn = os.path.join(self.config.instrument.cwd, self.config.instrument.output_directory, stackf[-1])
                 # using [0] gets just the image data
@@ -86,7 +86,7 @@ def _perform(self):
             stacked.header['HISTORY'] = log_string
             self.action.args.ccddata = stacked
 
-            # get master arc output name
+            # get master cbars output name
             mcbars_name = strip_fname(combine_list[0]) + '_' + suffix + '.fits'
 
             kcwi_fits_writer(stacked, output_file=mcbars_name,

kcwidrp/primitives/MakeMasterObject.py

@@ -101,7 +101,7 @@ def _perform(self):
                                                          "stack input file")
             stacked.header['HISTORY'] = log_string
             self.action.args.ccddata = stacked
-            mobj_name = get_master_name(combine_list, "mobj")
+            mobj_name = strip_fname(combine_list[0]) + '_' + suffix + '.fits'
             kcwi_fits_writer(stacked, output_file=mobj_name,
                              output_dir=self.config.instrument.output_directory)
             self.context.proctab.update_proctab(frame=stacked, suffix=suffix,
@@ -110,7 +110,7 @@ def _perform(self):
             # self.action.args.name = mobj_name
             # self.action.args.name = stacked.header['OFNAME']
         else:
-            mobj_name = get_master_name(combine_list, "mobj")
+            mobj_name = strip_fname(combine_list[0]) + '_' + suffix + '.fits'
             self.action.args.ccddata.header['IMTYPE'] = args.new_type
             self.action.args.ccddata.header['HISTORY'] = log_string
             kcwi_fits_writer(self.action.args.ccddata, output_file=mobj_name,