Changeset 39094 for trunk/ippToPsps/jython/stackbatch.py

Timestamp:

Nov 9, 2015, 5:55:53 PM (11 years ago)

Author:

eugene

Message:

2.5log(exptime) should be added, not subtracted, from deteff; fix the assignment of skycell/projection/tess ID in diff and forcedwarp; get zpImage from header for Diffs (dvo does NOT calculate); apply platescale to GalShape sizes; remove StackDetectRowID

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (6 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -275 +275 @@
             zpImage = zp
 
-        detectionThreshold = detectionThreshold + zpImage - 2.5 * math.log10(expTime)
+        detectionThreshold = detectionThreshold + zpImage + 2.5 * math.log10(expTime)
         
         # insert stack metadata into table
@@ -345 +345 @@
         self.scratchDb.addRowCountColumn("StackObjectThin", "row")
         self.logger.infoPair("Adding unique psps ids to", "StackObjectThin")
-        self.generateStackDetectRowIDsAndPspsUniqueIDs()
+        self.generatePspsUniqueIDs()
         self.logger.infoPair("Dropping row column from", "StackObjectThin table")
         self.scratchDb.dropColumn("StackObjectThin", "row")
@@ -553 +553 @@
         # self.scratchDb.createIndex(tablename, "objID") 
 
-        #objid
-        #uniquepsps id
+        # objid
+        # uniquepsps id
         # ippobjid
         # randomstackobjid
-        # stackdetectrowid
         # primarydetection
-        #bestdetection
+        # bestdetection
 
         #g / r / i /z / y
@@ -951 +950 @@
             maxRadius = 5
 
+        # XXX : by setting these to -999 here, the values are then
+        # modified downstream to apply exposure time and zero point
+        # factors (or platescale terms).  this means they will not
+        # have the correct -999 values in the end.
+
         # properly -999 these to start with.  the default should take
         # care of this, but does not?
@@ -1286 +1290 @@
         self.scratchDb.execute(sql)
 
-    def generateStackDetectRowIDsAndPspsUniqueIDs(self):
+    def generatePspsUniqueIDs(self):
         sql = "UPDATE StackObjectThin set uniquePspsSTid = (("+str(self.batchID)+"*1000000000 ) + row)"
         self.scratchDb.execute(sql)
@@ -1349 +1353 @@
             self.scratchDb.addColumn(table, filter + "haveData", "tinyint")
 
-        fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, uniquePspsSTID, StackDetectRowID, "
+        fields = "objID, ippObjID, randomStackObjID, primaryDetection, bestDetection, uniquePspsSTID, "
 
         for i in range(len(self.filters)):