implemented -solar option in pp_stackedphotometry

mommermi · Nov 28, 2017 · 5829750 · 5829750
1 parent 5712b3c
commit 5829750
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/doc/functions.rst b/doc/functions.rst
@@ -442,7 +442,7 @@ Functions that provide additional functionality:
 
 .. function:: pp_stackedphotometry ([-comoving], [-filter str],
 	      [-method {average, median, clipped}], [-fixed_aprad
-	      float], [-snr float], images)
+	      float], [-snr float], [-solar], images)
 
    perform automated aperture photometry on stacked images
 
@@ -457,6 +457,9 @@ Functions that provide additional functionality:
                        photometry instead of performing a
                        curve-of-growth analysis
    :param snr: minimum SNR for sources to be identified
+   :param -solar: the photometric calibration (`pp_calibrate`) is only
+		  using stars with solar-like colors (see
+		  `pp_calibrate` documentation for details)
    :param images: images to run `pp_stackedphotometry` on
 
    This function stacks the images provided in the background frame

diff --git a/pp_calibrate.py b/pp_calibrate.py
@@ -455,6 +455,7 @@ def calibrate(filenames, minstars, manfilter, manualcatalog,
     else:
         preferred_catalogs = obsparam['photometry_catalogs']
 
+    ref_cat = None
     if filtername is not None and magzp is None:
         ref_cat = create_photometrycatalog(ra_deg, dec_deg, rad_deg,
                                            filtername, preferred_catalogs,

diff --git a/pp_stackedphotometry.py b/pp_stackedphotometry.py
@@ -82,6 +82,9 @@
     parser.add_argument('-snr',
                         help='SNR limit for detected sources',
                         default=3)
+    parser.add_argument('-solar',
+                        help='restrict to solar-color stars',
+                        action="store_true", default=False)    
     parser.add_argument('images', help='images to process',
                         nargs='+')
     args = parser.parse_args()
@@ -90,6 +93,7 @@
     combinemethod = args.method
     fixed_aprad = float(args.fixed_aprad)
     snr = args.snr
+    solar = args.solar
     filenames = args.images
 
     # use current directory as root directory
@@ -190,7 +194,8 @@
 
     calibration = pp_calibrate.calibrate(['skycoadd.fits'], minstars,
                                          man_filtername,
-                                         manualcatalog, obsparam, display=True,
+                                         manualcatalog, obsparam, solar=solar,
+                                         display=True,
                                          diagnostics=True)
 
     zp = calibration['zeropoints'][0]['zp']
@@ -272,7 +277,7 @@
         calibration = pp_calibrate.calibrate(['comove.fits'], minstars,
                                              man_filtername,
                                              manualcatalog, obsparam,
-                                             magzp=(zp, zp_err),
+                                             magzp=(zp, zp_err), solar=solar,
                                              display=True,
                                              diagnostics=True)