Changeset 37709 for trunk/ippTools/share

Timestamp:

Dec 2, 2014, 3:27:44 PM (12 years ago)

Author:

heather

Message:

changes to addtool to do addstar diffs

Location:

trunk/ippTools/share

Files:

• addtool_find_diff_id_dvo.sql (modified) (1 diff)
• addtool_find_pendingexp_diff.sql (modified) (1 diff)
• addtool_find_pendingexp_ff.sql (modified) (1 diff)
• addtool_queue_diff_id.sql (modified) (2 diffs)
• addtool_queue_ff_id.sql (modified) (2 diffs)

trunk/ippTools/share/addtool_find_diff_id_dvo.sql

@@ -4 +4 @@
 JOIN diffSkyfile using (diff_id, skycell_id) 
 JOIN diffRun using (diff_id)
-
-
-diffRun JOIN diffSkyfile using (diff_id)
 
 WHERE diffRun.state = 'full' and diffSkyfile.quality = 0

trunk/ippTools/share/addtool_find_pendingexp_diff.sql

@@ -2 +2 @@
     addRun.*,
     diffSkyfile.path_base as stageroot,
-    "NULL",
-    "NULL"
+    'GPC1' as camera,
+    'PS1' as telescope
 FROM addRun
 JOIN diffInputSkyfile

trunk/ippTools/share/addtool_find_pendingexp_ff.sql

@@ -1 +1 @@
    SELECT
     addRun.*,
-    fullForceResult.path_base as stageroot,
-    "NULL",
-    "NULL"
+    fullForceResult.path_base as stageroot
 FROM addRun
 JOIN fullForceResult

trunk/ippTools/share/addtool_queue_diff_id.sql

@@ -4 +4 @@
         'diff',         -- stage
         diff_id,        -- stage_id
-        diff_skyfile_id, -- stage_extra1
+        %d, -- stage_extra1
         '%s',           -- state
         '%s',           -- workdir
@@ -17 +17 @@
         '%s',           -- minidvodb_group 
         '%s'            -- minidvodb_name
-    FROM diffInputSkyfile 
-    JOIN diffSkyfile using (diff_id, skycell_id)
-    JOIN diffRun using (diff_id)
+    FROM diffRun
     WHERE
-        diffRun.state = 'full' AND
+        diffRun.state = 'full' 
         AND diffRun.diff_id = %lld
+        

trunk/ippTools/share/addtool_queue_ff_id.sql

@@ -4 +4 @@
         'fullforce',            -- stage
         ff_id,         -- stage_id
-        warp_id,        -- stage_extra1
+        %d,            -- stage_extra1
         '%s',           -- state
         '%s',           -- workdir
@@ -17 +17 @@
         '%s',           -- minidvodb_group 
         '%s'            -- minidvodb_name
-    FROM fullForceResult
-    JOIN fullForceRun using (ff_id)
+    FROM fullForceRun
     WHERE
         fullForceRun.state = 'full'