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

Timestamp:

Dec 18, 2014, 6:00:15 PM (12 years ago)

Author:

heather

Message:

st/ob/p2/df/do batches all work but have minimal problems in teh columns

File:

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

trunk/ippToPsps/jython/stackbatch.py

@@ -336 +336 @@
             sqlLine.group("a."+filter+"ApMag",         "b.Map")
             sqlLine.group("a."+filter+"ApMagErr",      "b.dMap")
-            sqlLine.group("a."+filter+"telluricExt",   "b.telluricExt")
+          #  sqlLine.group("a."+filter+"telluricExt",   "b.telluricExt")
 
             sqlLine.group("a."+filter+"infoFlag2",     "(b.flags << 13)")
@@ -431 +431 @@
             sqlLine.group("a."+filter+"KronFluxErr",   "b.KRON_FLUX_ERR / " + str(exptime))
             sqlLine.group("a."+filter+"ApFillFac",     "b.AP_NPIX / (3.14159265359 * POW(b.AP_MAG_RADIUS - 0.5, 2))")
-            sqlLine.group("a."+filter+"ApRadius",      "b.AP_MAG_RADIUS")
+#            sqlLine.group("a."+filter+"ApRadius",      "b.AP_MAG_RADIUS")
             sqlLine.group("a."+filter+"KronRad",       "b.MOMENTS_R1 * 2.5")
             sqlLine.group("a."+filter+"PlateScale",    "b.PLTSCALE")
@@ -441 +441 @@
             except:
                 self.logger.errorPair('failed sql',sql)
-                return
+                raise
 
             # insert detection information for each filter based on the DVO contents
@@ -457 +457 @@
             except:
                 self.logger.errorPair('failed sql',sql)
-                return
+                raise
 
 
@@ -563 +563 @@
         sqlLine = sqlUtility("UPDATE " + tablename + " AS a, " + self.scratchDb.dvoDetectionTable + " as b SET")
         sqlLine.group("a." + filter + model + "Mag",       "a." + filter + model + "Mag + b.zp")
-        sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
-
+        sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID" + " AND b.imageID = " + str(self.imageIDs[filter]))
         try:
             self.scratchDb.execute(sql)
         except:
             self.logger.errorPair('failed sql',sql)
-            return
-
+            raise
         # we have (modulo signs):
         # gRaExp  = gra  + (X_EXT - gxPos)*gPlateScale / cos(gdec)
@@ -607 +605 @@
         except:
             self.logger.errorPair('failed sql',sql)
-            return
+            raise
 
     '''
@@ -666 +664 @@
         sqlLine.group("a." + filter + "petCf",        "b.PETRO_FILL")
 
-        sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET")
+        sql = sqlLine.makeEquals("WHERE a." + filter + "ippDetectID = b.IPP_IDET ")
 
         try: self.scratchDb.execute(sql)
@@ -681 +679 @@
         except:
             self.logger.errorPair('failed sql',sql)
-            return
+            raise
 
     '''
@@ -780 +778 @@
         except:
             self.logger.errorPair('failed sql',sql)
-            return
+            raise
 
         # set the flux values from the cmf file
@@ -844 +842 @@
             sqlLine.group(field + "Err",       field + "err" + " * POW(10, 3.56 - 0.4* b.zp)")
             sqlLine.group(field + "Std",       field + "Std" + " * POW(10, 3.56 - 0.4* b.zp)")
-        sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID")
+        sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID AND b.imageID = " + str(self.imageIDs[filter]) )
         self.scratchDb.execute(sql)
 
@@ -948 +946 @@
         except:
             self.logger.errorPair('failed sql',sql)
-            return
+            raise
 
 
@@ -959 +957 @@
         except:
             self.logger.errorPair('failed sql',sql)
-            return
+            raise
         
 
@@ -1001 +999 @@
         except:
             self.logger.errorPair('failed sql',sql)
-            return
+            raise
 
     '''
@@ -1018 +1016 @@
             fields += filter + "ippDetectID, "
             fields += filter + "stackDetectID, "
-            fields += filter + "stackMetaID" # careful here: do not add comma to last entry
+            fields += filter + "stackMetaID " # careful here: do not add comma to last entry
             if (i < len(self.filters) - 1):
                 fields += ", "
 
         if (table == "StackObjectAttributes"):
-            fields += "stackDetectRowID, "
+            fields += ", stackDetectRowID "
         sql  = "INSERT INTO " + table + " (" + fields + ") "
         sql += "SELECT " + fields + " FROM " + mainTable
@@ -1030 +1028 @@
         except:
             self.logger.errorPair('failed sql',sql)
-            return
+            raise
 
 
@@ -1164 +1162 @@
         self.logger.infoPair("Done. Imported", "%d tables" % count)
         self.indexIppTables()
-                      
+#        return False
         return True