Changeset 37577 for trunk/ippToPsps/jython/objectbatch.py

Timestamp:

Nov 10, 2014, 3:00:51 PM (12 years ago)

Author:

heather

Message:

many fixes, mostly fixing bugs pointed out by pspswg, including missing
objects, random numbers, ext_nsigma

missing objects - (things which have detections and stacks) - these are caused
when we cull objects outside the dvo range. Gene says there is a buffer of
about .09 arcmins and suggests we cull things outside of .2 arcmins. This has
been implemented

random ids are not so random due to not setting a seed for the loaders. Random
numbers for a batch are seeded with the batch_ID

requests for sgSep / ExtNSigma as we had back in the good ol' days. This has
been added back for stack

File:

• trunk/ippToPsps/jython/objectbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/objectbatch.py

@@ -336 +336 @@
         sqlLine.group("ippObjID",        "OBJ_ID + (CAT_ID << 32)") # NOTE: shift by 32 bits exactly
         sqlLine.group("surveyID",        "'" + str(self.surveyID) + "'")
-        sqlLine.group("randomID",        "FLOOR(RAND()*9223372036854775807)") # XXX where does this number come from??
+        sqlLine.group("randomID",        "FLOOR(RAND("+str(self.batchID)+")*9223372036854775807)") # XXX where does this number come from??
         sqlLine.group("batchID",         "'" + str(self.batchID) + "'")
         sqlLine.group("dvoRegionID",     "CAT_ID") 
@@ -410 +410 @@
  
         sql = "DELETE FROM ObjectThin where \
-              ObjectThin.decMean > " + str(decMax) + " or \
-              ObjectThin.decMean < " + str(decMin) + " or \
-              ObjectThin.raMean > " + str(raMax) + " or \
-              ObjectThin.raMean < " + str(raMin) 
+              ObjectThin.decMean > (" + str(decMax) + " + .0033) or \
+              ObjectThin.decMean < (" + str(decMin) + " - .0033) or \
+              ObjectThin.raMean > (" + str(raMax) + " + .0033) or \
+              ObjectThin.raMean < (" + str(raMin) + " - .0033)" 
         self.logger.infoPair("Deleting", str(nToDelete) + " objects outside of ra/dec range")