Changeset 39110 for trunk

Timestamp:

Nov 12, 2015, 10:02:13 AM (11 years ago)

Author:

eugene

Message:

add ForcedGalaxyShape sersic index and phi; add objflags to dvoDetection; set best detection based on objflags

Location:

trunk/ippToPsps/jython

Files:

• forcedgalaxybatch.py (modified) (1 diff)
• scratchdb.py (modified) (1 diff)
• stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/forcedgalaxybatch.py

@@ -163 +163 @@
             sqlLine.group("a." + filter[1] + "GalMag",          "b.MAG")
             sqlLine.group("a." + filter[1] + "GalMagErr",       "b.MAG_ERR")
+            sqlLine.group("a." + filter[1] + "GalPhi",          "b.THETA")
+            sqlLine.group("a." + filter[1] + "GalIndex",        "b.SERSIC_INDEX")
             sqlLine.group("a." + filter[1] + "GalChisq",        "b.CHISQ")
 

trunk/ippToPsps/jython/scratchdb.py

@@ -575 +575 @@
                dMap FLOAT, \
                flags INT, \
+               objflags INT, \
                PRIMARY KEY (imageID, ippDetectID), \
                KEY (objID, detectID), \

trunk/ippToPsps/jython/stackbatch.py

@@ -399 +399 @@
             sqlLine.group("a."+filter+"stackImageID",  str(stackID))    # eg, gstackImageID (from cmf.IMAGEID)
 
-            sqlLine.group("a.dvoRegionID",             "b.catID")       # this is not filter dependent, but is re-written for each filter (if data exists)
-            sqlLine.group("a.primaryDetection",        "((b.flags & 0x10000) >> 16)") # this is not filter dependent, but is re-written for each filter (if data exists)
+            sqlLine.group("a.dvoRegionID",             "b.catID")                       # this is not filter dependent, but is re-written for each filter (if data exists)
+            sqlLine.group("a.primaryDetection",        "((b.flags & 0x10000) >> 16)")   # this is not filter dependent, but is re-written for each filter (if data exists)
+            sqlLine.group("a.bestDetection",           "((b.objflags & 0x8000) >> 15)") # this is not filter dependent, but is re-written for each filter (if data exists)
 
             sqlLine.group("a."+filter+"haveData",      "'1'")
@@ -448 +449 @@
                 raise
 
-
-            # we do not yet set bestdetection, this is a placeholder until we do
-            sql = "UPDATE StackObjectThin set bestDetection = 0"
-            try:
-                self.scratchDb.execute(sql)
-            except:
-                self.logger.errorPair('failed sql: ', sql)
-                raise
+            ## XX # we do not yet set bestdetection, this is a placeholder until we do
+            ## XX sql = "UPDATE StackObjectThin set bestDetection = 0"
+            ## XX try:
+            ## XX     self.scratchDb.execute(sql)
+            ## XX except:
+            ## XX     self.logger.errorPair('failed sql: ', sql)
+            ## XX     raise