stricter criteria for SDSS stars; cosmetics

mommermi · May 22, 2017 · 30aab63 · 30aab63
1 parent af1bec3
commit 30aab63
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/catalog.py b/catalog.py
@@ -481,8 +481,10 @@ def download_catalog(self, ra_deg, dec_deg, rad_deg,
                                      'e_DEJ2000', 'umag', 'e_umag',
                                      'gmag', 'e_gmag', 'rmag', 'e_rmag',
                                      'imag', 'e_imag', 'zmag', 'e_zmag'],
-                            column_filters={"gmag":
-                                            ("<%f" % max_mag)},
+                            column_filters={"gmag": ("<%f" % max_mag),
+                                            "mode": "1",
+                                            "q_mode" "+"
+                            },
                             row_limit = max_sources)
             try:
                 self.data = vquery.query_region(field,
@@ -493,7 +495,7 @@ def download_catalog(self, ra_deg, dec_deg, rad_deg,
                     print('no data available from %s' % self.catalogname)
                 logging.error('no data available from %s' % self.catalogname)
                 return 0
-                
+
             ### rename column names using PP conventions
             self.data.rename_column('SDSS9', 'ident')
             self.data.rename_column('RAJ2000', 'ra.deg')
@@ -1364,9 +1366,10 @@ def match_with(self, catalog,
 # print cat2.fields
 
 # cat3 = catalog('SDSS-R9')
-# print cat3.download_catalog(80, 40, 0.5, 10000), 'sources grabbed from', cat3.catalogname
-#print cat3[305]
-#print cat3.fields
+# print(cat3.download_catalog(329.50922672, -2.33703204, 0.001, 10000), 'sources grabbed from', cat3.catalogname)
+# print(cat3.data['imag'])
+
+
 
 # cat4 = catalog('USNO-B1')
 # print cat4.download_catalog(80, 0, 0.5, 10000), 'sources grabbed from', cat4.catalogname

diff --git a/pp_distill.py b/pp_distill.py
@@ -577,8 +577,8 @@ def distill(catalogs, man_targetname, offset, fixed_targets_file, posfile,
                            ('%3d ' % dat[14]) +
                            ('%s\n' % dat[13].split(';')[0]))
 
-        outf.writelines('#\n# [1]: Horizons_RA - image_RA [arcsec]\n'+
-                        '# [2]: Horizons_DDec - image_Dec [arcsec]\n'+
+        outf.writelines('#\n# [1]: predicted_RA - image_RA [arcsec]\n'+
+                        '# [2]: predicted_Dec - image_Dec [arcsec]\n'+
                         '# [3,4]: manual target offsets in RA and DEC ' +
                         '[arcsec]\n'+
                         '# [5]: exposure time (s)\n'+