Merge pull request #2079 from pypeit/APF_tweaks

APF tweaks

Author: bpholden

pypeit/calibrations.py

@@ -1600,16 +1600,18 @@ def get_association(fitstbl, spectrograph, caldir, setup, calib_ID, det, must_ex
 
         # Iterate through each frame type and add the raw and processed
         # calibration frames
+
         for frametype, calib_classes in frame_calibrations.items():
             indx = fitstbl.find_frames(frametype) & in_grp
             if not any(indx):
                 continue
             if not (all(fitstbl['calib'][indx] == fitstbl['calib'][indx][0]) or
                     all([fitstbl['calib'][indx][0] in cc.split(',') for cc in fitstbl['calib'][indx]])):
-                raise PypeItError(f'CODING ERROR: All {frametype} frames in group {calib_ID} '
-                           'are not all associated with the same subset of calibration '
-                           'groups; calib for the first file is '
-                           f'{fitstbl["calib"][indx][0]}.')
+                log_str = f'All {frametype} frames in group {calib_ID} '
+                log_str += 'are not all associated with the same subset of calibration '
+                log_str += 'groups; calib for the first file is '
+                log_str += f'{fitstbl["calib"][indx][0]}.'
+                log.warning(log_str)
             calib_key = CalibFrame.construct_calib_key(setup, fitstbl['calib'][indx][0], detname)
             asn[frametype] = {}
             asn[frametype]['raw'] = fitstbl.frame_paths(indx)

pypeit/spectrographs/apf_levy.py

@@ -16,6 +16,7 @@
 from pypeit import PypeItError
 from pypeit import telescopes
 from pypeit import io
+from pypeit import par
 from pypeit.core import framematch
 from pypeit.par import parset
 from pypeit.spectrographs import spectrograph
@@ -73,11 +74,12 @@ def default_pypeit_par(cls):
         par['calibrations']['wavelengths']['ech_nspec_coeff'] = 4
         par['calibrations']['wavelengths']['ech_norder_coeff'] = 4
         par['calibrations']['wavelengths']['ech_sigrej'] = 3.0
-
+        
         par['calibrations']['flatfield']['slit_illum_finecorr'] = False
         par['calibrations']['flatfield']['tweak_slits'] = False
         par['calibrations']['flatfield']['spat_samp'] = 0.7
-        par['calibrations']['flatfield']['slit_trim'] = 0
+        # this is for the 8" decker
+        par['calibrations']['flatfield']['slit_trim'] = 3
 
 
         # Processing steps
@@ -90,7 +92,7 @@ def default_pypeit_par(cls):
 
         # no sky subtraction on standard stars
         par['reduce']['skysub']['global_sky_std'] = False
-
+        par['reduce']['skysub']['no_local_sky'] = True
         # skip sky subtraction when searching for objects
         # this is because the sky subtraction is not very good with narrow
         # slits and the usual APF target is bright
@@ -378,11 +380,13 @@ def config_specific_par(
             par['reduce']['findobj']['find_trim_edge'] = [0, 0]
             par['calibrations']['slitedges']['pad'] = 5
             par['reduce']['extraction']['sn_gauss'] = 400
+            par['calibrations']['flatfield']['slit_trim'] = 0
             # basically always use the Gaussian model for optimal extraction
 
         if binning == "2,2":
             par['calibrations']['slitedges']['min_edge_side_sep'] = 2.0
             par['calibrations']['slitedges']['pad'] = 2
+            par['calibrations']['flatfield']['slit_trim'] = 1
             par['reduce']['skysub']['no_local_sky'] = True
             par['reduce']['extraction']['sn_gauss'] = 400
             par['reduce']['extraction']['model_full_slit'] = True