fixed catalog.filtername issues related to clear filters

mommermi · Nov 20, 2018 · 360b0aa · 360b0aa
1 parent d8b5e0e
commit 360b0aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pp_calibrate.py b/pp_calibrate.py
@@ -491,7 +491,7 @@ def calibrate(filenames, minstars, manfilter, manualcatalog,
             filternames[filtername] = [filename]
         ldac_filename = filename[:filename.find('.fit')]+'.ldac'
         cat = catalog(filename)
-        if manfilter is not False:
+        if manfilter is not False and manfilter is not None:
             cat.filtername = manfilter
         else:
             cat.filtername = filtername

diff --git a/pp_distill.py b/pp_distill.py
@@ -564,9 +564,10 @@ def distill(catalogs, man_targetname, offset, fixed_targets_file, posfile,
 
         # identify magnitudes
         mag_keys = ['MAG_APER', 'MAGERR_APER']
-        for key in cat.fields:
-            if filtername+'mag' in key:
-                mag_keys.append(key)
+        if filtername is not None:
+            for key in cat.fields:
+                if filtername+'mag' in key:
+                    mag_keys.append(key)
 
         # build field lists for observed catalogs
         match_keys_other_catalog, extract_other_catalog = [], []