Changeset 34747 for branches/eam_branches/ipp-20120905/ippTools/share

Timestamp:

Nov 30, 2012, 9:57:42 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (3 diffs, 1 prop)
• ippTools/share/staticskytool_pendingskycalrun.sql (modified) (1 diff)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)

branches/eam_branches/ipp-20120905/ippTools/share/pxadmin_create_tables.sql

@@ -996 +996 @@
     maskfrac_magic FLOAT,
     maskfrac_advisory FLOAT,
+    background_model SMALLINT,
     PRIMARY KEY(warp_id, skycell_id, tess_id),
     KEY(good_frac),
@@ -1078 +1079 @@
         good_frac FLOAT,
         mjd_obs DOUBLE,
-        quality SMALLINT NOT NULL DEFAULT 0,
         fault SMALLINT,
         software_ver VARCHAR(16),
+        background_model SMALLINT,
+        quality SMALLINT NOT NULL DEFAULT 0,
         PRIMARY KEY(stack_id),
         KEY(dtime_stack),
@@ -2115 +2117 @@
       sigma_dec FLOAT,
       n_astrom INT,
+      n_detections INT,
+      n_extended INT,
       zpt_obs FLOAT,
       zpt_stdev FLOAT,

branches/eam_branches/ipp-20120905/ippTools/share/staticskytool_pendingskycalrun.sql

@@ -6 +6 @@
     staticskyResult.path_base,
     rawExp.camera,
-    staticskyResult.num_inputs = 1 AS singlefilter
+    0 AS  singlefilter
 FROM skycalRun
 JOIN staticskyRun USING (sky_id)