Changeset 37129 for branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py

Timestamp:

Jul 28, 2014, 6:20:27 AM (12 years ago)

Author:

eugene

Message:

dropping options for stilts dvo import methods; fixing a number of previously ignored errors (eg, dropping non-existent tables); allowing queue questions to strip leading and trailing spaces (so we can read from an input file); echo back the response so input from a file is clearer; re-write big sql blocks with new sql utility code; updating names in MeanObject, ObjectThin to be more consistent; add a new test code program; update detection fields to match new schema; drop the code for the old now-unused tables (detecitonCalib, SkinnyObject, etc)

Location:

branches/eam_branches/ipp-20140717/ippToPsps

Files:

• . (modified) (1 prop)
• jython/stackbatch.py (modified) (8 diffs)

branches/eam_branches/ipp-20140717/ippToPsps/jython/stackbatch.py

@@ -39 +39 @@
                  scratchDb,
                  skyID,
-                 batchID,
-                 useFullTables):
+                 batchID):
 
        super(StackBatch, self).__init__(
@@ -52 +51 @@
                batchID,
                "ST", 
-               "",
-               #gpc1Db.getStackStageCmf(skychunk.dvoLabel, stackID),
-               useFullTables)
-
-       # self.printline = 0
-       # # self.testprint()
-#       self.logger.infoPair("did I get", "here");
+               None)
+
        self.stackType = "DEEP_STACK" # TODO
        ## = stuff I commented out for pv2 stacks
@@ -215 +209 @@
        self.scratchDb.dropTable("StackObject")
        self.logger.infoPair("dropping table:","StackModelFit")
-              
+       self.scratchDb.dropTable("SkinnyObject")
        self.scratchDb.dropTable("StackModelFit")
        self.logger.infoPair("dropping table:","StackApFlx")
@@ -262 +256 @@
        # insert what we know about this stack batch into the stack table
        self.ippToPspsDb.insertStackMeta(self.batchID, "x" , self.stackType)
-
-       # insert sourceID/imageID combo so DVO can look it up
-       ##if not self.useFullTables:
-       ##    self.scratchDb.insertNewDvoExternID(self.header['SOURCEID'], self.header['IMAGEID'])
-
-       # self.testprint()
 
        # dump stuff to log
@@ -785 +773 @@
         self.logger.infoPair("Deleting", "entries with StackObject.objID = 0")
         # response = raw_input("deleted objID is 0 ")
-        
+    '''
+    Populates the SkinnyObject table
+    '''
+    def populateSkinnyObject(self):
+
+        self.logger.infoPair("Procesing table", "SkinnyObject")
+
+        sql = "INSERT INTO SkinnyObject (\
+               objID \
+               ,ippObjID \
+               ,projectionCellID \
+               ) \
+               SELECT \
+               DISTINCT objID \
+               ,ippObjID \
+               ,projectionCellID \
+               FROM StackDetection"
+        self.scratchDb.execute(sql)
+
+        self.scratchDb.updateAllRows("SkinnyObject", "surveyID", str(self.surveyID))
+        self.scratchDb.updateAllRows("SkinnyObject", "dataRelease", str(self.skychunk.dataRelease))
+         
 
     '''
@@ -1189 +1198 @@
         self.logger.infoPair("starting","populatePspsTables");
         self.skipBatch = False
-        if not self.useFullTables:
-             if not self.getIDsFromDVO():
-                return False
-        #do some basics first
+
+        # get the IDs from the DVO tables
+        if not self.getIDsFromDVO():
+            return False
+
+        # do some basics first:
         # populate stack meta per filter
         # insert objid/stackdetectid per filter to each table           
@@ -1307 +1318 @@
 
         ##if self.totalDetections < 1: 
+        #self.logger.infoPair("populating","SkinnyObject") 
+        self.populateSkinnyObject()
 
             ##self.logger.error("No detections to publish")
@@ -1314 +1327 @@
         self.tablesToExport.append("StackModelFit")
         self.tablesToExport.append("StackApFlx")
-
+        self.tablesToExport.append("SkinnyObject")
         self.logger.infoPair("finishing","populatePspsTables"); 
         return True