Changeset 36709

Timestamp:

Apr 30, 2014, 4:28:10 PM (12 years ago)

Author:

heather

Message:

stacks need a lot of work

Location:

trunk/ippToPsps/jython

Files:

• gpc1db.py (modified) (2 diffs)
• loader.py (modified) (3 diffs)
• stackbatch.py (modified) (3 diffs)

trunk/ippToPsps/jython/gpc1db.py

@@ -87 +87 @@
 
             stage = "skycal"
-            sql = "SELECT DISTINCT stack_id, radeg, decdeg FROM skycalRun \
+            sql = "SELECT DISTINCT sky_id, radeg, decdeg FROM skycalRun \
                    JOIN addRun ON(skycalRun.skycal_id = addRun.stage_id) \
                    JOIN minidvodbRun USING(minidvodb_name) \
@@ -499 +499 @@
 
 
+    '''
+    grabs the stackID for a particular skyId, filter, and dvodb
+    the mapping of stack_id from sky_id is not unique unless
+    joined to the dvodb 
+    '''
+    def getStackIDsFromSkyID(self,dvoDb,skyID,filter):
+
+        self.logger.infoPair("finding stack_ids from gpc1 for sky_id ", skyID)
+
+        sql = "SELECT DISTINCT stack_id from skycalRun \
+               JOIN addRun ON(skycalRun.skycal_id = addRun.stage_id) \
+               JOIN minidvodbRun USING(minidvodb_name) \
+               JOIN minidvodbProcessed USING(minidvodb_id) \
+               JOIN mergedvodbRun USING(minidvodb_id) \
+               JOIN mergedvodbProcessed USING(merge_id) \
+               JOIN stackRun USING (stack_id) \
+               WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \
+               AND minidvodbRun.state = 'merged' \
+               AND minidvodbProcessed.fault = 0 \
+               AND mergedvodbRun.state = 'full' \
+               AND mergedvodbProcessed.fault = 0  \
+               AND addRun.stage = 'skycal' \
+               AND addRun.state = 'full' \
+               AND filter = '" + filter + "' \
+               AND sky_id = '" + skyID + "'"
+              
+        try:
+            rs = self.executeQuery(sql)
+            while (rs.next()):
+                rows.append([rs.getInt(1)])
+            rs.close()    
+        except:    
+            self.logger.exception("can't query for stackid in DVO")
+            self.logger.infoPair("failed sql:", sql)
+            return rows
+
+        self.logger.infoPair("number of stackIDs found ", len(rows))
+        return rows

trunk/ippToPsps/jython/loader.py

@@ -234 +234 @@
         # loop round IDs of all items to be processed
         self.ippToPspsDb.lockBatchTable()
-        self.logger.infoPair("heather:","lockbatchtable")
+        #self.logger.infoPair("heather:","lockbatchtable")
         unattemptedCount = 0
         for id in ids:
-            self.logger.infoPair("heather:","in ids")
-            self.logger.infoPair("heather:id",str(id))
+            #self.logger.infoPair("heather:","in ids")
+            #self.logger.infoPair("heather:id",str(id))
             batchID = self.ippToPspsDb.createNewBatch(batchType, id)
-            self.logger.infoPair("heather:","creatednewbatch")
-            self.logger.infoPair("heather:batchId", str(batchID))
+            #self.logger.infoPair("heather:","creatednewbatch")
+            #self.logger.infoPair("heather:batchId", str(batchID))
             if batchID < 0: 
                 unattemptedCount += 1
                 continue
-            self.logger.infoPair("heather:","passed logic")
+            #self.logger.infoPair("heather:","passed logic")
             self.ippToPspsDb.unlockTables()
-            self.logger.infoPair("heather:","unlock table")
+            #self.logger.infoPair("heather:","unlock table")
             self.ippToPspsDb.deletePendingItem(batchType, id)
-            self.logger.infoPair("heather:","deleted pending item")
+            #self.logger.infoPair("heather:","deleted pending item")
 
             # catch any raised exceptions in batch constructors
             try:
                 if batchType == "P2":
+                    self.logger.infoPair("defining P2 batch for cam_id:",id)
                     batch = DetectionBatch(self.logger,
                             self.config,
@@ -264 +265 @@
                             useFullTables)
                 elif batchType == "ST":
+                    self.logger.infoPair("defining ST batch for sky_id:",id)
                     batch = StackBatch(self.logger,
                             self.config,
@@ -328 +330 @@
                             batchID,
                             useFullTables)
-    
+                    
                 batch.run()
    

trunk/ippToPsps/jython/stackbatch.py

@@ -37 +37 @@
                  ippToPspsDb,
                  scratchDb,
-                 stackID,
+                 skyID,
                  batchID,
                  useFullTables):
@@ -48 +48 @@
                ippToPspsDb,
                scratchDb,
-               stackID,
+               skyID,
                batchID,
                "ST", 
-               gpc1Db.getStackStageCmf(skychunk.dvoLabel, stackID),
+               "",
+               #gpc1Db.getStackStageCmf(skychunk.dvoLabel, stackID),
                useFullTables)
 
        # self.printline = 0
        # # self.testprint()
-
+       self.logger.infoPair("did I get", "here");
        self.stackType = "DEEP_STACK" # TODO
 
@@ -917 +918 @@
     '''
     def populatePspsTables(self):
-
+        self.infoPair("starting","populatePspsTables");
         self.skipBatch = False
-
-        if not self.useFullTables:
-            if not self.getIDsFromDVO():
-                return False
-        #self.logger.infoPair("populating","StackMeta")    
-        self.populateStackMeta()
-        #self.logger.infoPair("populating","StackObject") 
-        self.populateStackObject()
-        
-        if self.stackType != "NIGHTLY_STACK": 
-            #self.logger.infoPair("populating","StackModelFit") 
-            self.populateStackModelFit()
-            #self.logger.infoPair("populating","StackApFlx") 
-            self.populateStackApFlx()
-        #self.logger.infoPair("populating","StackToImage") 
-        self.populateStackToImage()
-        #self.logger.infoPair("populating","StackObjectCalib") 
-        self.populateStackObjectCalib()
-
-        self.setMinMaxObjID(["StackObject"])
+     
+        # HAF everything is commented out for now with ##
+        ##if not self.useFullTables:
+        ##     if not self.getIDsFromDVO():
+        ##        return False
+        ##self.logger.infoPair("populating","StackMeta")    
+        ##self.populateStackMeta()
+        ##self.logger.infoPair("populating","StackObject") 
+        ##self.populateStackObject()
+        
+        ##if self.stackType != "NIGHTLY_STACK": 
+            ##self.logger.infoPair("populating","StackModelFit") 
+            ##self.populateStackModelFit()
+            ##self.logger.infoPair("populating","StackApFlx") 
+            ##self.populateStackApFlx()
+        ##self.logger.infoPair("populating","StackToImage") 
+        ##self.populateStackToImage()
+        ##self.logger.infoPair("populating","StackObjectCalib") 
+        ##self.populateStackObjectCalib()
+
+        ##self.setMinMaxObjID(["StackObject"])
        
-        if self.totalDetections < 1: 
-
-            self.logger.error("No detections to publish")
-            return False
-
+        ##if self.totalDetections < 1: 
+
+            ##self.logger.error("No detections to publish")
+            ##return False
+        self.infoPair("finishing","populatePspsTables"); 
         return True