Changeset 37709

Timestamp:

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

Author:

heather

Message:

changes to addtool to do addstar diffs

Location:

trunk

Files:

• ippScripts/scripts/addstar_run.pl (modified) (1 diff)
• ippTools/share/addtool_find_diff_id_dvo.sql (modified) (1 diff)
• ippTools/share/addtool_find_pendingexp_diff.sql (modified) (1 diff)
• ippTools/share/addtool_find_pendingexp_ff.sql (modified) (1 diff)
• ippTools/share/addtool_queue_diff_id.sql (modified) (2 diffs)
• ippTools/share/addtool_queue_ff_id.sql (modified) (2 diffs)
• ippTools/src/addtool.c (modified) (7 diffs)
• tools/heather/queuesliceslap2.pl (modified) (1 diff)

trunk/ippScripts/scripts/addstar_run.pl

@@ -94 +94 @@
 # Recipes to use based on reduction class
 $reduction = 'DEFAULT' unless defined $reduction;
-if ($stage =~/diff/) {
-    $reduction = 'ADDSTAR';
-} 
+#if ($stage =~/diff/) {
+#    $reduction = 'ADDSTAR';
+#} 
 if ($stage =~/forcedwarp/) {
     $reduction = 'ADDSTAR';

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'

trunk/ippTools/src/addtool.c

@@ -373 +373 @@
       //needs to be checked HAF xxx
       if (strcmp(stage,"diff") == 0) {
-        psStringAppend(&query, " GROUP BY diff_id ");  //this needs checking, but I think it shoul be fine? it groups by lots of stuff (including stack - we only want one of each stack in there
+        psStringAppend(&query, " GROUP BY diff_id, diff_skyfile_id ");  //this needs checking, but I think it shoul be fine? it groups by lots of stuff (including stack - we only want one of each stack in there
       }
       //needs to be checked HAF xxx
       if (strcmp(stage,"fullforce") == 0) {
-        psStringAppend(&query, " GROUP BY ff_id, skycal_id ");  //this needs checking, but I think it shoul be fine? it groups by lots of stuff (including stack - we only want one of each stack in there
+        psStringAppend(&query, " GROUP BY ff_id, warp_id ");  //this needs checking, but I think it shoul be fine? it groups by lots of stuff (including stack - we only want one of each stack in there
       }
 
@@ -535 +535 @@
 
     if (strcmp(stage,"diff") == 0) {
+      
       for (long i = 0; i < psArrayLength(output); i++) {
         psMetadata *md = output->data[i];
 
         diffRunRow *row = diffRunObjectFromMetadata(md);
-
+        
         if (!row) {
-          psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun");
+          psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into diffRun");
           psFree(output);
           return false;
@@ -568 +569 @@
 
         if (!row) {
-          psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun");
+          psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into fullforceRun");
           psFree(output);
           return false;
@@ -784 +785 @@
    
     if (strcmp(stage,"diff") == 0) {
+      
     for (long i = 0; i < psArrayLength(output); i++) {
         psMetadata *md = output->data[i];
         psS64 stage_id =0; 
-        
-                  diffRunRow *row = diffRunObjectFromMetadata(md);
-          stage_id = row->diff_id;
+        //      psS64 stage_extra1 = 0;
+        diffRunRow *row = diffRunObjectFromMetadata(md);
+        stage_id = row->diff_id;
+        bool status = false;
+        psS32 stage_extra1 = psMetadataLookupS32(&status, md, "diff_skyfile_id");
+        if (!status) {
+          psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item diff_skyfile_id");
+          return false;
+        }
+
         
         if (!row) {
@@ -796 +805 @@
             return false;
         }
-
+        
         // queue the exp
         if (!pxaddQueueByCamID(config,
                                stage,
                                stage_id,
-                               0,
+                               stage_extra1,
                                workdir     ? workdir   : row->workdir,
                                reduction   ? reduction : row->reduction,
@@ -831 +840 @@
         psS64 stage_id =0; 
         
-                  fullForceRunRow *row = fullForceRunObjectFromMetadata(md);
-          stage_id = row->ff_id;
-        
+        fullForceRunRow *row = fullForceRunObjectFromMetadata(md);
+        stage_id = row->ff_id;
+        bool status = false;
+        psS32 stage_extra1 = psMetadataLookupS32(&status, md, "warp_id");
+        if (!status) {
+          psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item warp_id");
+          return false;
+        }
+
         if (!row) {
             psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into skycalRun");
@@ -844 +859 @@
                                stage,
                                stage_id,
-                               0,
+                               stage_extra1,
                                workdir     ? workdir   : row->workdir,
                                reduction   ? reduction : row->reduction,

trunk/tools/heather/queuesliceslap2.pl

@@ -16 +16 @@
 
 @slices = ("00","02","04","06","08","10","12","14","16","18","20","22");
-@slices = ("00","02","04");
+#@slices = ("00","02","04");
 
 foreach $label (@labels) {