Changeset 37355

Timestamp:

Sep 4, 2014, 7:53:19 AM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140813 (hackish mods to handle pre-PV5 cmfs / smfs)

Location:

trunk/ippToPsps/jython

Files:

• config.py (modified) (2 diffs)
• detectionbatch.py (modified) (6 diffs)
• loader.py (modified) (1 diff)
• scratchdb.py (modified) (1 diff)

trunk/ippToPsps/jython/config.py

@@ -27 +27 @@
         self.camera = "gpc1"
         self.onebatch = False
+        self.loopBatch = False
 
         if sys.argv.count("-test"):
@@ -61 +62 @@
             self.onebatch = True
             sys.argv.remove("-one-batch")
+
+        if sys.argv.count("-loop"):
+            self.loopBatch = True
+            sys.argv.remove("-loop")
 
         ## name of the top-level jython script

trunk/ippToPsps/jython/detectionbatch.py

@@ -256 +256 @@
         sqlLine.group("polyOrder",        self.getKeyInt(header, 0, 'NPLYTERM'))
 
-        nPolyterm = int(self.getKeyValue(header, 'NPLYTERM'))
+        nPolyterm = int(self.getKeyInt(header, 0, 'NPLYTERM'))
         if nPolyterm > 1:
             sqlLine.group("pca1x2y0",         self.getKeyFloat(header, "%.8e", 'PCA1X2Y0'))
@@ -344 +344 @@
         sqlLine.group("xPosErr",         "X_PSF_SIG")                                               
         sqlLine.group("yPosErr",         "Y_PSF_SIG")                                               
-        sqlLine.group("pltScale",        "PLTSCALE")                                      
-        sqlLine.group("posAngle",        "POSANGLE")                                      
-        sqlLine.group("raErr",           "X_PSF_SIG * abs(PLTSCALE)") 
-        sqlLine.group("decErr",          "Y_PSF_SIG * abs(PLTSCALE)") 
+        if (self.id >= 982483):
+            sqlLine.group("pltScale",        "PLTSCALE")                                      
+            sqlLine.group("posAngle",        "POSANGLE")                                      
+            sqlLine.group("raErr",           "X_PSF_SIG * abs(PLTSCALE)") 
+            sqlLine.group("decErr",          "Y_PSF_SIG * abs(PLTSCALE)") 
+        else:
+            sqlLine.group("pltScale",        "0.257")                                      
+            sqlLine.group("posAngle",        "-999")                                      
+            sqlLine.group("raErr",           "X_PSF_SIG * 0.257") 
+            sqlLine.group("decErr",          "Y_PSF_SIG * 0.257") 
         sqlLine.group("psfFlux",         "PSF_INST_FLUX / " + extTimeString)
         sqlLine.group("psfFluxErr",      "PSF_INST_FLUX_SIG / " + extTimeString)
-        sqlLine.group("psfMajorFWHM",    "PSF_FWHM_MAJ")                                               
-        sqlLine.group("psfMinorFWHM",    "PSF_FWHM_MIN")                                               
+        if (self.id >= 982483):
+            sqlLine.group("psfMajorFWHM",    "PSF_FWHM_MAJ")                                               
+            sqlLine.group("psfMinorFWHM",    "PSF_FWHM_MIN")                                               
+            sqlLine.group("psfCore",         "PSF_CORE")                                                    
         sqlLine.group("psfTheta",        "PSF_THETA")                                               
-        sqlLine.group("psfCore",         "PSF_CORE")                                                    
         sqlLine.group("psfQf",           "PSF_QF")                                                  
         sqlLine.group("psfQfPerfect",    "PSF_QF_PERFECT")                                
@@ -367 +374 @@
         sqlLine.group("momentM4C",       "MOMENTS_M4C")                                             
         sqlLine.group("momentM4S",       "MOMENTS_M4S")                                             
-        sqlLine.group("apFlux",          "AP_FLUX / " + extTimeString)
-        sqlLine.group("apFluxErr",       "AP_FLUX_SIG / " + extTimeString)
-        sqlLine.group("apFillF",         "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))")
+        if (self.id >= 982483):
+            sqlLine.group("apFlux",          "AP_FLUX / " + extTimeString)
+            sqlLine.group("apFluxErr",       "AP_FLUX_SIG / " + extTimeString)
+            sqlLine.group("apFillF",         "AP_NPIX / (3.14159265359 * POW(AP_MAG_RADIUS - 0.5, 2))")
         sqlLine.group("apRadius",        "AP_MAG_RADIUS")
         sqlLine.group("kronFlux",        "KRON_FLUX / " + extTimeString)
@@ -529 +537 @@
                     ota = "XY%d%d" % (x, y)
                 
-                    if self.config.test and not ((x == 0) and (y == 1)):
+                    # I need better control over this..
+                    if False and self.config.test and not ((x == 0) and (y == 1)):
                         print "skipping ota: " + ota
                         continue
@@ -709 +718 @@
                 if ota not in self.imageIDs: continue
 
-                if self.config.test and not ((x == 0) and (y == 1)):
+                if False and self.config.test and not ((x == 0) and (y == 1)):
                     print "skipping ota " + ota
                     continue
@@ -824 +833 @@
         
         regex = ".*.psf"
-        if self.config.test and self.config.camera == "gpc1":
+        if False and self.config.test and self.config.camera == "gpc1":
             regex = "XY01.psf"
             
-        # XXX EAM NOTE : this is fragile : requires PS1_V4
-        # columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG PSF_INST_MAG PSF_INST_MAG_SIG PSF_INST_FLUX PSF_INST_FLUX_SIG PEAK_FLUX_AS_MAG PSF_MAJOR PSF_MINOR PSF_THETA EXT_NSIGMA PSF_QF MOMENTS_XX MOMENTS_XY MOMENTS_YY AP_MAG AP_FLUX KRON_FLUX KRON_FLUX_ERR FLAGS FLAGS2 SKY SKY_SIGMA EXT_NSIGMA PSF_QF_PERFECT PSF_CHISQ"
-
-        # XXX EAM NOTE : this is fragile : requires PS1_V5
-        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"
+        print "my ID: " + str(self.id)
+
+        if (self.id < 982483):
+            # XXX EAM NOTE : this is fragile : requires PS1_V4
+            columns = "IPP_IDET X_PSF Y_PSF X_PSF_SIG Y_PSF_SIG                   PSF_INST_FLUX PSF_INST_FLUX_SIG       PSF_MAJOR PSF_MINOR PSF_THETA          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_MAG_RADIUS KRON_FLUX KRON_FLUX_ERR SKY SKY_SIGMA FLAGS FLAGS2"
+        else:
+            # XXX EAM NOTE : this is fragile : requires PS1_V5
+            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"
 
         return super(DetectionBatch, self).importIppTables(columns, regex)

trunk/ippToPsps/jython/loader.py

@@ -78 +78 @@
            self.onePassOnly = 1
 
-        # set a poll time of about 1 minute
-        self.parsePollTimeArg("0.0166")
+        if self.config.loopBatch:
+            self.parsePollTimeArg("0.0166")
+        else:
+            self.parsePollTimeArg("0.0")
 
         self.skychunk.printAll()

trunk/ippToPsps/jython/scratchdb.py

@@ -509 +509 @@
                flags INT, \
                PRIMARY KEY (imageID, ippDetectID), \
-               KEY (objID, detectID) \
+               KEY (objID, detectID), \
+               KEY (objID, ippDetectID) \
              )"