Changeset 36726

Timestamp:

May 2, 2014, 3:32:28 PM (12 years ago)

Author:

heather

Message:

this makes batches! they are full of NULLS but they are batches!

Location:

trunk/ippToPsps/jython

Files:

• batch.py (modified) (1 diff)
• stackbatch.py (modified) (16 diffs)

trunk/ippToPsps/jython/batch.py

@@ -557 +557 @@
            # replace nulls and empty fields with weird PSPS -999 pseudo-null
            _table = stilts.tpipe(_table, cmd='replaceval "" -999 *')
-
-           match = re.match(regex, table)
+           self.logger.infoPair('regex', regex)
+           self.logger.infoPair('table', table)
+           match = re.search(regex, table)
            newTableName = match.group(1)
 

trunk/ippToPsps/jython/stackbatch.py

@@ -526 +526 @@
         # this should work : set header into (grizy)header and run from there
         if filterName == 'g.00000':
-            f = 'g'
             self.header = self.gheader
             tablename = 'gStackMeta'
             stackmetaid = self.gstackID
         if filterName == 'r.00000':
-            f = 'r'
             tablename = 'rStackMeta'
             self.header = self.rheader
             stackmetaid = self.rstackID
         if filterName == 'i.00000':
-            f = 'i'
             tablename = 'iStackMeta'
             self.header = self.iheader
             stackmetaid = self.istackID
         if filterName == 'z.00000':
-            f = 'z'
             tablename = 'zStackMeta'
             self.header = self.zheader
             stackmetaid = self.zstackID
         if filterName == 'y.00000':
-            f = 'y'
             tablename = 'yStackMeta'
             self.header = self.yheader
@@ -568 +563 @@
 
         sql = "INSERT INTO " + tablename + " (\
-        "+f+"stackMetaID \
+        stackMetaID \
         ,skyCellID \
         ,photoCalID \
@@ -595 +590 @@
         ," + self.header['EXPTIME'] + " \
         ,'" + self.psfmodel   + "' \
-        ," + str(self.header['FWHM_MAJ'])    + " \
-        ," + str(self.header['FW_MAJ_UQ']) + " \
+        ," + str(self.fwhm_maj)    + " \
+        ," + str(self.fwhm_maj_uq) + " \
         ,'" + self.header['CTYPE1'] + "' \
         ,'" + self.header['CTYPE2'] + "' \
@@ -651 +646 @@
 
         self.logger.infoPair("inserting filter dependent cmf items into", "StackObject")
-        filters = ['g','r','i','z','y']
+        filters =['g','r','i','z','y']
         for f in filters:
           skip = 0
@@ -769 +764 @@
         
         self.scratchDb.updateAllRows("StackObject", "dataRelease", str(self.skychunk.dataRelease))
-        self.updateStackMetaID("StackObject")
-        
-        self.updateStackTypeID("StackObject")
+        ##self.updateStackMetaID("StackObject")
+        
+        ##self.updateStackTypeID("StackObject")
         
         #self.updateDvoIDsAndFlags("StackObject")
@@ -939 +934 @@
         self.scratchDb.updateAllRows("StackApFlx", "dataRelease", str(self.skychunk.dataRelease))
         self.scratchDb.updateAllRows("StackApFlx", "activeFlag", "0")
-        self.updateStackMetaID("StackApFlx")
+        ##self.updateStackMetaID("StackApFlx")
         self.updateStackTypeID("StackApFlx")
         self.updateDvoIDs("StackApFlx")
@@ -989 +984 @@
 
         self.scratchDb.updateAllRows("StackModelFit", "activeFlag", "0")
-        self.updateStackMetaID("StackModelFit")
+        ##self.updateStackMetaID("StackModelFit")
         self.updateStackTypeID("StackModelFit")
         self.updateDvoIDs("StackModelFit")
@@ -1101 +1096 @@
                       WHERE a.objID = b.objID \
                       AND b.imageID = " + str(imageID)
-            self.logger.infoPair('sql',sql)    
-            self.scratchDb.execute(sql)
-            self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
+                self.logger.infoPair('sql',sql)    
+                self.scratchDb.execute(sql)
+            else:
+                self.logger.infoPair("skipping ingest of dvo for filter",f)
+        #out of the loops - give dataRelase to all        
+        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.skychunk.dataRelease))
 
         ## XXX write this with the select/insert
@@ -1220 +1218 @@
         # populate stack meta per filter
         # insert objid per filter to each table           
-
+        self.tablesToExport=[]    
 
         if self.gstackID > 0:        
@@ -1228 +1226 @@
             self.insertDvoIDs("StackModelFit","g.00000")
             self.insertDvoIDs("StackApFlx","g.00000")
+            self.tablesToExport.append("gStackMeta")
         if self.rstackID > 0:    
             self.logger.infoPair("populating","rStackMeta")    
@@ -1234 +1233 @@
             self.insertDvoIDs("StackModelFit","r.00000")
             self.insertDvoIDs("StackApFlx","r.00000")
+            self.tablesToExport.append("rStackMeta")
         if self.istackID > 0:    
             self.logger.infoPair("populating","iStackMeta")    
@@ -1240 +1240 @@
             self.insertDvoIDs("StackModelFit","i.00000")
             self.insertDvoIDs("StackApFlx","i.00000")
+            self.tablesToExport.append("iStackMeta")
         if self.zstackID > 0:    
             self.logger.infoPair("populating","zStackMeta")    
@@ -1246 +1247 @@
             self.insertDvoIDs("StackModelFit","z.00000")
             self.insertDvoIDs("StackApFlx","z.00000")
+            self.tablesToExport.append("zStackMeta")
         if self.ystackID > 0:    
             self.logger.infoPair("populating","yStackMeta")    
@@ -1252 +1254 @@
             self.insertDvoIDs("StackModelFit","y.00000")
             self.insertDvoIDs("StackApFlx","y.00000")
+            self.tablesToExport.append("yStackMeta")
 
         self.logger.infoPair("populating","StackObject")
@@ -1270 +1273 @@
             ##self.logger.infoPair("populating","StackApFlx") 
             ##self.populateStackApFlx()
-        ##self.logger.infoPair("populating","StackToImage") 
-        ##self.populateStackToImage()
+        self.logger.infoPair("populating","StackToImage") 
+        self.populateStackToImage()
         ##self.logger.infoPair("populating","StackObjectCalib") 
         ##self.populateStackObjectCalib()
@@ -1281 +1284 @@
             ##self.logger.error("No detections to publish")
             ##return False
-        self.infoPair("finishing","populatePspsTables"); 
-        raise
+        self.tablesToExport.append("StackToImage")
+        self.tablesToExport.append("StackObject")
+        self.tablesToExport.append("StackModelFit")
+        self.tablesToExport.append("StackApFlx")
+
+
+
+        self.logger.infoPair("finishing","populatePspsTables"); 
+#        raise
         return True
-
+    '''
+    overidding this method - use regex to trimoff letter before stack
+    '''
+    def exportPspsTablesToFits(self, regex="(.*)"):
+        return super(StackBatch, self).exportPspsTablesToFits("(Stack.*)")