Changeset 38837 for trunk/ippToPsps/jython/forcedwarpbatch.py

Timestamp:

Oct 10, 2015, 12:40:44 PM (11 years ago)

Author:

eugene

Message:

make code less forgiving: sql execute aborts on failures; deal with various hidden problems: add IF EXISTS to drop table operations to avoid raising unneeded error, make sure tables exist before trying to add indexes, test for existence of the stack _xsrc, _xfit, etc tables (and skip if missing); fix sqlLine.group to cast inputs to string before performing string ops; getKeyFloat now returns a float value which is safe with sqlLine.group, but can be used in a math expression; use python math. operators as needed (sqrt, fabs); fulltest.sh runs for camera, stack, object stages; update dvoSkyTable to use REGION_ID instead of special word INDEX; add existsClient method (avoid using mysql failure as a test for table existence); no need to test for exceptions to sql.execute since we abort on failure; replace esoteric SQL with dropTable calls; trap errors in stilts.treads in setupScratchdb; drop StackObjecThin and StackDetOffMeta along with other stack scratch tables

File:

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

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -404 +404 @@
         imageID = self.scratchDb.getImageIDFromExternID(self.warpSkyFileID[num])
         self.logger.infoPair("updating","forcedWarpMeasurement_"+forcedWarpID)
+
         sqlLine = sqlUtility("UPDATE ForcedWarpMeasurement_"+forcedWarpID+" as a, " + self.scratchDb.dvoDetectionTable + " as b SET ")
         sqlLine.group("a.objID",      "b.objID")
@@ -414 +415 @@
         sqlLine.group("a.FinfoFlag3", "b.flags")
 
-        sqlLine.group("a.FpsfFlux",    "a.FpsfFlux     * b.zpFactor")
-        sqlLine.group("a.FpsfFluxErr", "a.FpsfFluxErr  * b.zpFactor")
-        sqlLine.group("a.FapFlux",     "a.FapFlux      * b.zpFactor")
-        sqlLine.group("a.FapFluxErr",  "a.FapFluxErr   * b.zpFactor")
-        sqlLine.group("a.FkronFlux",   "a.FkronFlux    * b.zpFactor")
-        sqlLine.group("a.FkronFluxErr","a.FkronFluxErr * b.zpFactor")
-        sqlLine.group("a.Fsky",        "a.Fsky         * b.zpFactor")
-        sqlLine.group("a.FskyErr",     "a.FskyErr      * b.zpFactor")
+        sqlLine.group("a.FpsfFlux",     "a.FpsfFlux     * b.zpFactor")
+        sqlLine.group("a.FpsfFluxErr",  "a.FpsfFluxErr  * b.zpFactor")
+        sqlLine.group("a.FapFlux",      "a.FapFlux      * b.zpFactor")
+        sqlLine.group("a.FapFluxErr",   "a.FapFluxErr   * b.zpFactor")
+        sqlLine.group("a.FkronFlux",    "a.FkronFlux    * b.zpFactor")
+        sqlLine.group("a.FkronFluxErr", "a.FkronFluxErr * b.zpFactor")
+        sqlLine.group("a.Fsky",         "a.Fsky         * b.zpFactor")
+        sqlLine.group("a.FskyErr",      "a.FskyErr      * b.zpFactor")
 
         sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID AND b.imageID = " +str( imageID))