Changeset 34290 for trunk/ippToPsps

Timestamp:

Aug 3, 2012, 9:48:53 PM (14 years ago)

Author:

heather

Message:

schema changes tweaks - skycal

Location:

trunk/ippToPsps/jython

Files:

• gpc1db.py (modified) (4 diffs)
• objectbatch.py (modified) (1 diff)

trunk/ippToPsps/jython/gpc1db.py

@@ -72 +72 @@
         elif batchType == "ST":       
 
-            stage = "staticsky"
-            sql = "SELECT DISTINCT stack_id, radeg, decdeg FROM staticskyInput \
-                   JOIN addRun ON(staticskyInput.sky_id = addRun.stage_id) \
+            stage = "skycal"
+            sql = "SELECT DISTINCT stack_id, radeg, decdeg FROM skycalRun \
+                   JOIN addRun ON(skycalRun.skycal_id = addRun.stage_id) \
                    JOIN minidvodbRun USING(minidvodb_name) \
                    JOIN minidvodbProcessed USING(minidvodb_id) \
@@ -269 +269 @@
         '''
 
-        sql = "SELECT DISTINCT staticskyResult.path_base \
-               FROM staticskyRun  \
-               JOIN staticskyInput USING(sky_id)  \
-               JOIN staticskyResult USING(sky_id) \
+        sql = "SELECT DISTINCT skycalResult.path_base \
+               FROM skycalRun  \
+               JOIN skycalResult USING(skycal_id)  \
                JOIN stackRun USING(stack_id)  \
                JOIN stackSumSkyfile USING(stack_id) \
-               JOIN addRun ON sky_id = stage_id \
+               JOIN addRun ON skycal_id = stage_id \
                JOIN minidvodbRun USING (minidvodb_name) \
                JOIN mergedvodbRun using (minidvodb_id) \
@@ -282 +281 @@
                AND mergedvodbRun.state = 'full' \
                AND mergedvodbRun.mergedvodb = '" + dvoDb + "' \
-               AND stage = 'staticsky'"
+               AND stage = 'skycal'"
 
 
@@ -334 +333 @@
         self.logger.debug("Querying GPC1 for stack exposure time")
 
+        #this overcounts... likely also true for skycal., so I don't include skycalRun or staticskyRun
+
         sql = "SELECT SUM(exp_time) * (COUNT(warp_id) - reject_images) / COUNT(warp_id) as EXPTIME \
-               FROM staticskyRun JOIN staticskyInput using(sky_id) \
-               JOIN stackRun using(stack_id) \
+               FROM stackRun using(stack_id) \
                JOIN stackSumSkyfile using(stack_id) \
                JOIN stackInputSkyfile using(stack_id) \

trunk/ippToPsps/jython/objectbatch.py

@@ -120 +120 @@
                    ," + filter[1] + "MeanPSFMag = MAG \
                    ," + filter[1] + "MeanPSFMagErr = MAG_ERR \
+                   ," + filter[1] + "MeanKronMag = MAG_KRON \
+                   ," + filter[1] + "MeanKronMagErr = MAG_KRON_ERR \
+                   ," + filter[1] + "StackPSFFlux = FLUX_PSF \
+                   ," + filter[1] + "StackPSFFluxErr = FLUX_PSF_ERR \
+                   ," + filter[1] + "StackKronMag = -2.5 * log10(FLUX_KRON) -8.9 \
+                   ," + filter[1] + "StackKronMagErr = FLUX_KRON_ERR / FLUX_KRON \
                    ," + filter[1] + "20pct = MAG_20/1000 \
                    ," + filter[1] + "80pct = MAG_80/1000 \