Changeset 34839 for branches/eam_branches/ipp-20121130/ippTools/share

Timestamp:

Dec 18, 2012, 5:57:19 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121130/ippTools/share

Files:

• Makefile.am (modified) (4 diffs)
• camtool_find_pendingimfile.sql (modified) (1 prop)
• camtool_pendingcleanuprun.sql (modified) (1 diff)
• chiptool_pendingcleanupimfile_all.sql (copied) (copied from trunk/ippTools/share/chiptool_pendingcleanupimfile_all.sql )
• chiptool_pendingcleanuprun.sql (modified) (1 diff)
• chiptool_setimfiletoupdate.sql (modified) (1 prop)
• difftool_pendingcleanuprun.sql (modified) (4 diffs)
• difftool_pendingcleanupskyfile_all.sql (copied) (copied from trunk/ippTools/share/difftool_pendingcleanupskyfile_all.sql )
• pstamptool_revertdependent.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (1 diff, 1 prop)
• stacktool_inputskyfile.sql (modified) (1 diff)
• stacktool_pendingcleanuprun.sql (modified) (1 diff)
• stacktool_tobkg.sql (copied) (copied from trunk/ippTools/share/stacktool_tobkg.sql )
• staticskytool_defineskycalrun.sql (modified) (2 diffs)
• staticskytool_pendingskycalrun.sql (modified) (1 diff)
• warptool_pendingcleanuprun.sql (modified) (1 diff)
• warptool_pendingcleanupskyfile_all.sql (copied) (copied from trunk/ippTools/share/warptool_pendingcleanupskyfile_all.sql )
• warptool_towarped.sql (modified) (1 prop)

branches/eam_branches/ipp-20121130/ippTools/share/Makefile.am

@@ -88 +88 @@
         chiptool_listrun.sql \
         chiptool_pendingcleanupimfile.sql \
+        chiptool_pendingcleanupimfile_all.sql \
         chiptool_pendingcleanuprun.sql \
         chiptool_pendingimfile.sql \
@@ -172 +173 @@
         difftool_pendingcleanuprun.sql \
         difftool_pendingcleanupskyfile.sql \
+        difftool_pendingcleanupskyfile_all.sql \
         difftool_revertdiffskyfile_delete.sql \
         difftool_revertdiffskyfile_updated.sql \
@@ -391 +393 @@
         stacktool_sassskyfile.sql \
         stacktool_tosum.sql \
+        stacktool_tobkg.sql \
         stacktool_tosummary.sql \
         stacktool_addsummary.sql \
@@ -423 +426 @@
         warptool_pendingcleanuprun.sql \
         warptool_pendingcleanupskyfile.sql \
+        warptool_pendingcleanupskyfile_all.sql \
         warptool_revertoverlap.sql \
         warptool_revertwarped_delete.sql \

branches/eam_branches/ipp-20121130/ippTools/share/camtool_pendingcleanuprun.sql

@@ -2 +2 @@
     camRun.cam_id,
     rawExp.camera,
+    rawExp.exp_tag,
+    camRun.workdir,
     camRun.state
 FROM camRun

branches/eam_branches/ipp-20121130/ippTools/share/chiptool_pendingcleanuprun.sql

@@ -1 @@
-SELECT
+SELECT DISTINCT
     chipRun.chip_id,
     rawExp.camera,
-    chipRun.state
+    rawExp.exp_tag,
+    chipRun.state,
+    chipRun.workdir
 FROM chipRun
 JOIN rawExp 

branches/eam_branches/ipp-20121130/ippTools/share/difftool_pendingcleanuprun.sql

@@ -6 +6 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun
@@ -35 +37 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun
@@ -64 +68 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun
@@ -93 +99 @@
             rawExp.camera,
             diffRun.state,
+            diffRun.workdir,
+            diffRun.tess_id,
             diffRun.label
         FROM diffRun

branches/eam_branches/ipp-20121130/ippTools/share/pstamptool_revertdependent.sql

@@ -4 +4 @@
 SET pstampDependent.fault = 0
 -- fault count hook %s
-WHERE pstampDependent.state = 'new'
+WHERE pstampRequest.state ='run'
+    AND pstampJob.state ='run'
+    AND pstampDependent.state = 'new'
     AND (pstampDependent.fault > 0)

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

@@ -2119 +2119 @@
       n_detections INT,
       n_extended INT,
+      n_forced INT,
       zpt_obs FLOAT,
       zpt_stdev FLOAT,

branches/eam_branches/ipp-20121130/ippTools/share/stacktool_inputskyfile.sql

@@ -4 +4 @@
     rawExp.exp_id,
     rawExp.exp_name,
+    rawExp.exp_time,
     rawExp.object,
     rawExp.dateobs,

branches/eam_branches/ipp-20121130/ippTools/share/stacktool_pendingcleanuprun.sql

@@ -8 +8 @@
     stackRun.stack_id,
     rawExp.camera,
-    stackRun.state
+    stackRun.state,
+    stackSumSkyfile.path_base
 FROM stackRun
+JOIN stackSumSkyfile using(stack_id)
 JOIN stackInputSkyfile
     USING(stack_id)

branches/eam_branches/ipp-20121130/ippTools/share/staticskytool_defineskycalrun.sql

@@ -2 +2 @@
     sky_id,
     stack_id,
+    skycell_id,
+    filter,
     staticskyRun.workdir,
     staticskyRun.label,
@@ -11 +13 @@
     JOIN stackRun USING(stack_id)
     JOIN stackSumSkyfile USING(stack_id)
+    JOIN skycell USING(tess_id, skycell_id)
     LEFT JOIN skycalRun USING(sky_id, stack_id)
 WHERE staticskyRun.state = 'full'

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

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

branches/eam_branches/ipp-20121130/ippTools/share/warptool_pendingcleanuprun.sql

@@ -1 +1 @@
 SELECT
     warpRun.warp_id,
+    warpRun.workdir,
     rawExp.camera,
+    rawExp.exp_tag,
     warpRun.state
 FROM warpRun