Changeset 38995 for trunk/ippToPsps/jython/detectionbatch.py

Timestamp:

Oct 28, 2015, 8:29:33 PM (11 years ago)

Author:

eugene

Message:

add -stilts option; fix stilts and regex for detectionbatch; add tableprefix option for stacks; alter photcode.type to type_as_int

File:

• trunk/ippToPsps/jython/detectionbatch.py (modified) (3 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -844 +844 @@
         self.updateDvoIDs("Detection_" + chipname, self.imageIDs[chipname])
         self.logger.info("updated dvoids")
+
         results['NULLOBJID'] = self.scratchDb.reportAndDeleteRowsWithNULLS("Detection_" + chipname, "objID")
         self.logger.info("deleted nulls")
@@ -1060 +1061 @@
     def importIppTables(self, filter=""):
         
-        ## XXX does the regex work?
-        regex = "XY*"
+        ## regex only works for -stilts import
+        regex = ".*"
     
         ## for a quick test, just do the first chip:
@@ -1076 +1077 @@
             columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG POSANGLE PLTSCALE PSF_INST_FLUX PSF_INST_FLUX_SIG PSF_FWHM_MAJ PSF_FWHM_MIN PSF_THETA PSF_CORE PSF_QF PSF_QF_PERFECT PSF_CHISQ EXT_NSIGMA MOMENTS_XX MOMENTS_XY MOMENTS_YY MOMENTS_R1 MOMENTS_RH MOMENTS_M3C MOMENTS_M3S MOMENTS_M4C MOMENTS_M4S AP_FLUX AP_FLUX_SIG AP_NPIX AP_MAG_RADIUS KRON_FLUX KRON_FLUX_ERR SKY SKY_SIGMA FLAGS FLAGS2"
 
-            #### crap crap crap
-
-        ## this is apparently over-riding the choices above
-        ## regex = ".*"
-
         ## the list of columns above works fine for *.psf, but breaks the *.deteff tables
         ## just read all columns