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

Timestamp:

Nov 9, 2015, 5:55:53 PM (11 years ago)

Author:

eugene

Message:

2.5log(exptime) should be added, not subtracted, from deteff; fix the assignment of skycell/projection/tess ID in diff and forcedwarp; get zpImage from header for Diffs (dvo does NOT calculate); apply platescale to GalShape sizes; remove StackDetectRowID

File:

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

trunk/ippToPsps/jython/forcedwarpbatch.py

@@ -269 +269 @@
         sqlLine.group("photoZero",      zpImage)
 
-        # photoColor -- how do I set this? it's also not set in stack meta
         sqlLine.group("ctype1",         self.getKeyValue(header, 'CTYPE1'));
         sqlLine.group("ctype2",         self.getKeyValue(header, 'CTYPE2'));
@@ -482 +481 @@
         sqlLine = sqlUtility("INSERT INTO " + pspsTableName + " (")
         sqlLine.group("ippDetectID",     "IPP_IDET")
-        sqlLine.group("flxR5", "APER_FLUX_3")
-        sqlLine.group("flxR5Err", "APER_FLUX_ERR_3" )
-        sqlLine.group("flxR5Std", "APER_FLUX_STDEV_3")
-        sqlLine.group("flxR5Fill", "APER_FILL_3")
-        sqlLine.group("flxR6", "APER_FLUX_4")
-        sqlLine.group("flxR6Err", "APER_FLUX_ERR_4" )
-        sqlLine.group("flxR6Std", "APER_FLUX_STDEV_4")
-        sqlLine.group("flxR6Fill", "APER_FILL_4")
-        sqlLine.group("flxR7", "APER_FLUX_5")
-        sqlLine.group("flxR7Err", "APER_FLUX_ERR_5" )
-        sqlLine.group("flxR7Std", "APER_FLUX_STDEV_5")
-        sqlLine.group("flxR7Fill", "APER_FILL_5")
+        sqlLine.group("flxR5",           "APER_FLUX_3")
+        sqlLine.group("flxR5Err",        "APER_FLUX_ERR_3" )
+        sqlLine.group("flxR5Std",        "APER_FLUX_STDEV_3")
+        sqlLine.group("flxR5Fill",       "APER_FILL_3")
+        sqlLine.group("flxR6",           "APER_FLUX_4")
+        sqlLine.group("flxR6Err",        "APER_FLUX_ERR_4" )
+        sqlLine.group("flxR6Std",        "APER_FLUX_STDEV_4")
+        sqlLine.group("flxR6Fill",       "APER_FILL_4")
+        sqlLine.group("flxR7",           "APER_FLUX_5")
+        sqlLine.group("flxR7Err",        "APER_FLUX_ERR_5" )
+        sqlLine.group("flxR7Std",        "APER_FLUX_STDEV_5")
+        sqlLine.group("flxR7Fill",       "APER_FILL_5")
 
         sql = sqlLine.makeRaw(") SELECT ", " FROM " + ippTableName)
@@ -501 +500 @@
         self.logger.infoPair("adding objID, etc from", fMeasTableName)
         sqlLine = sqlUtility("UPDATE " + pspsTableName + " as a, " + fMeasTableName + " as b SET ")
-        sqlLine.group("a.objID","b.objID")
+        sqlLine.group("a.objID",         "b.objID")
         sqlLine.group("a.uniquePspsFWid","b.uniquePspsFWid")
-        sqlLine.group("a.detectID","b.detectID")
-        sqlLine.group("a.ippObjID","b.ippObjID")
-        sqlLine.group("a.filterID","b.filterID")
-        sqlLine.group("a.surveyID","b.surveyID")
-        sqlLine.group("a.forcedWarpID","b.forcedWarpID")
-        sqlLine.group("a.randomWarpID","b.randomWarpID")
-        sqlLine.group("a.skycellID","b.skycellID")
-        sqlLine.group("a.dvoRegionID","b.dvoRegionID")
-        sqlLine.group("a.obsTime","b.obsTime")
-        sql = sqlLine.makeEquals("Where a.ippDetectID = b.ippDetectID")
+        sqlLine.group("a.detectID",      "b.detectID")
+        sqlLine.group("a.ippObjID",      "b.ippObjID")
+        sqlLine.group("a.filterID",      "b.filterID")
+        sqlLine.group("a.surveyID",      "b.surveyID")
+        sqlLine.group("a.forcedWarpID",  "b.forcedWarpID")
+        sqlLine.group("a.randomWarpID",  "b.randomWarpID")
+        sqlLine.group("a.tessID",        "b.tessID")
+        sqlLine.group("a.projectionID",  "b.projectionID")
+        sqlLine.group("a.skycellID",     "b.skycellID")
+        sqlLine.group("a.dvoRegionID",   "b.dvoRegionID")
+        sqlLine.group("a.obsTime",       "b.obsTime")
+        sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID")
         self.scratchDb.execute(sql)
         
@@ -539 +540 @@
         sqlLine.group("lensObjSmearX12", "LENS_X12_SM_OBJ")
         sqlLine.group("lensObjSmearX22", "LENS_X22_SM_OBJ")
-        sqlLine.group("lensObjSmearE1", "LENS_E1_SM_OBJ")
-        sqlLine.group("lensObjSmearE2", "LENS_E2_SM_OBJ")
+        sqlLine.group("lensObjSmearE1",  "LENS_E1_SM_OBJ")
+        sqlLine.group("lensObjSmearE2",  "LENS_E2_SM_OBJ")
         sqlLine.group("lensObjShearX11", "LENS_X11_SH_OBJ")
         sqlLine.group("lensObjShearX12", "LENS_X12_SH_OBJ")
         sqlLine.group("lensObjShearX22", "LENS_X22_SH_OBJ")
-        sqlLine.group("lensObjShearE1", "LENS_E1_SH_OBJ")
-        sqlLine.group("lensObjShearE2", "LENS_E2_SH_OBJ")
+        sqlLine.group("lensObjShearE1",  "LENS_E1_SH_OBJ")
+        sqlLine.group("lensObjShearE2",  "LENS_E2_SH_OBJ")
         sqlLine.group("lensPSFSmearX11", "LENS_X11_SM_PSF")
         sqlLine.group("lensPSFSmearX12", "LENS_X12_SM_PSF")
         sqlLine.group("lensPSFSmearX22", "LENS_X22_SM_PSF")
-        sqlLine.group("lensPSFSmearE1", "LENS_E1_SM_PSF")
-        sqlLine.group("lensPSFSmearE2", "LENS_E2_SM_PSF")
+        sqlLine.group("lensPSFSmearE1",  "LENS_E1_SM_PSF")
+        sqlLine.group("lensPSFSmearE2",  "LENS_E2_SM_PSF")
         sqlLine.group("lensPSFShearX11", "LENS_X11_SH_PSF")
         sqlLine.group("lensPSFShearX12", "LENS_X12_SH_PSF")
         sqlLine.group("lensPSFShearX22", "LENS_X22_SH_PSF")
-        sqlLine.group("lensPSFShearE1", "LENS_E1_SH_PSF")
-        sqlLine.group("lensPSFShearE2", "LENS_E2_SH_PSF")
-        sqlLine.group("psfE1", "LENS_E1_PSF")
-        sqlLine.group("psfE2", "LENS_E2_PSF")
+        sqlLine.group("lensPSFShearE1",  "LENS_E1_SH_PSF")
+        sqlLine.group("lensPSFShearE2",  "LENS_E2_SH_PSF")
+        sqlLine.group("psfE1",           "LENS_E1_PSF")
+        sqlLine.group("psfE2",           "LENS_E2_PSF")
 
         sql = sqlLine.makeRaw(") SELECT ", " FROM " + ippTableName)
@@ -565 +566 @@
         self.logger.infoPair("inserting objID,etc from", fMeasTableName)
         sqlLine = sqlUtility("UPDATE " + pspsTableName + " as a, " + fMeasTableName + " as b SET ")
-        sqlLine.group("a.objID","b.objID")
-        sqlLine.group("a.uniquePspsFWid","b.uniquePspsFWid")
-        sqlLine.group("a.detectID","b.detectID")
-        sqlLine.group("a.ippObjID","b.ippObjID")
-        sqlLine.group("a.filterID","b.filterID")
-        sqlLine.group("a.surveyID","b.surveyID")
-        sqlLine.group("a.forcedWarpID","b.forcedWarpID")
-        sqlLine.group("a.randomWarpID","b.randomWarpID")
-        sqlLine.group("a.skycellID","b.skycellID")
-        sqlLine.group("a.dvoRegionID","b.dvoRegionID")
-        sqlLine.group("a.obsTime","b.obsTime")
-
-        sql = sqlLine.makeEquals("Where a.ippDetectID = b.ippDetectID")
+        sqlLine.group("a.objID",          "b.objID")
+        sqlLine.group("a.uniquePspsFWid", "b.uniquePspsFWid")
+        sqlLine.group("a.detectID",       "b.detectID")
+        sqlLine.group("a.ippObjID",       "b.ippObjID")
+        sqlLine.group("a.filterID",       "b.filterID")
+        sqlLine.group("a.surveyID",       "b.surveyID")
+        sqlLine.group("a.forcedWarpID",   "b.forcedWarpID")
+        sqlLine.group("a.randomWarpID",   "b.randomWarpID")
+        sqlLine.group("a.tessID",         "b.tessID")
+        sqlLine.group("a.projectionID",   "b.projectionID")
+        sqlLine.group("a.skycellID",      "b.skycellID")
+        sqlLine.group("a.dvoRegionID",    "b.dvoRegionID")
+        sqlLine.group("a.obsTime",        "b.obsTime")
+
+        sql = sqlLine.makeEquals("WHERE a.ippDetectID = b.ippDetectID")
         self.scratchDb.execute(sql)