Changeset 34772 for branches/czw_branch/20120906/ippTools/share

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• bgtool_towarp.sql (modified) (1 diff)
• camtool_find_pendingimfile.sql (modified) (1 prop)
• chiptool_setimfiletoupdate.sql (modified) (1 prop)
• difftool_definestackstack_part0.sql (modified) (1 diff)
• difftool_definestackstack_part1.sql (modified) (1 diff)
• magicdstool_torevert_camera.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (3 diffs, 1 prop)
• regtool_processedexp.sql (modified) (1 prop) ( previous)
• staticskytool_pendingskycalrun.sql (modified) (2 diffs)
• staticskytool_result.sql (modified) (1 diff)
• staticskytool_todo.sql (modified) (1 diff)
• warptool_towarped.sql (modified) (1 prop)

branches/czw_branch/20120906/ippTools/share/Makefile.am

@@ -391 +391 @@
         stacktool_sassskyfile.sql \
         stacktool_tosum.sql \
+        stacktool_tobkg.sql \
         stacktool_tosummary.sql \
         stacktool_addsummary.sql \

branches/czw_branch/20120906/ippTools/share/bgtool_towarp.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     warpBackgroundRun.*,
     warpRun.tess_id,

branches/czw_branch/20120906/ippTools/share/difftool_definestackstack_part0.sql

@@ -39 +39 @@
           WHERE 1
           @STACK1_QUERY@ -- input condition
-) AS diffExp ON diffExp.stack1 = stackRun.stack_id AND diffExp.stack2 = template.max_stack_id
+) AS diffExp ON diffExp.stack1 = stackRun.stack_id 
 WHERE
         stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0

branches/czw_branch/20120906/ippTools/share/difftool_definestackstack_part1.sql

@@ -40 +40 @@
           WHERE 1
           @STACK1_QUERY@ -- input constraint
-) AS diffExp ON diffExp.stack1 = stackRun.stack_id AND diffExp.stack2 = template.max_stack_id
+) AS diffExp ON diffExp.stack1 = stackRun.stack_id 
 WHERE
         stackSumSkyfile.fault = 0 AND stackSumSkyfile.quality = 0

branches/czw_branch/20120906/ippTools/share/magicdstool_torevert_camera.sql

@@ -23 +23 @@
     JOIN rawExp using(exp_id)
 WHERE magicDSRun.stage = 'camera'
+    AND camProcessedExp.fault = 0
+    AND camRun.state = 'full'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
          OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')

branches/czw_branch/20120906/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/czw_branch/20120906/ippTools/share/staticskytool_pendingskycalrun.sql

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

branches/czw_branch/20120906/ippTools/share/staticskytool_result.sql

@@ -7 +7 @@
     stackRun.skycell_id,
     count(stackRun.filter) AS num_filters,
+    TRUNCATE(skycell.radeg/15., 4) AS rahours,
+    skycell.radeg,
+    skycell.decdeg,
     skycell.glong,
     skycell.glat

branches/czw_branch/20120906/ippTools/share/staticskytool_todo.sql

@@ -7 +7 @@
     stackRun.tess_id,
     stackRun.skycell_id,
+    TRUNCATE(skycell.radeg/15., 4) as rahours,
+    skycell.radeg,
+    skycell.decdeg,
+    skycell.glong,
+    skycell.glat,
     IFNULL(Label.priority, 10000) AS priority
 FROM staticskyRun
 JOIN staticskyInput USING (sky_id)
 JOIN stackRun USING (stack_id)
+JOIN skycell USING(tess_id, skycell_id)
 LEFT JOIN staticskyResult USING(sky_id)
 LEFT JOIN Label ON staticskyRun.label = Label.label