Changeset 32832 for trunk/ippTools

Timestamp:

Nov 29, 2011, 11:46:43 AM (15 years ago)

Author:

heather

Message:

added 'staticsky_multi' stage to addstar to allow processing of staticsky
(multi_filter).

Location:

trunk/ippTools

Files:

• share/Makefile.am (modified) (4 diffs)
• share/addtool_find_pendingexp_staticsky_multi.sql (added)
• share/addtool_find_processedexp_staticsky_multi.sql (added)
• share/addtool_find_sky_id_multi.sql (added)
• share/addtool_find_sky_id_multi_dvo.sql (added)
• share/addtool_queue_cam_id.sql (modified) (1 diff)
• share/addtool_queue_sky_id.sql (modified) (1 diff)
• share/addtool_queue_sky_id_multi.sql (added)
• share/addtool_queue_stack_id.sql (modified) (1 diff)
• share/addtool_revertprocessedexp_staticsky_multi.sql (added)
• src/addtool.c (modified) (13 diffs)
• src/flatcorr.c (modified) (1 diff)
• src/pxadd.c (modified) (3 diffs)
• src/pxadd.h (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -10 +10 @@
         addtool_find_sky_id_dvo.sql \
         addtool_find_sky_id.sql \
+        addtool_find_sky_id_multi_dvo.sql \
+        addtool_find_sky_id_multi.sql \
         addtool_find_stack_id_dvo.sql \
         addtool_find_stack_id.sql \
@@ -16 +18 @@
         addtool_find_pendingexp_stack.sql \
         addtool_find_pendingexp_staticsky.sql \
+        addtool_find_pendingexp_staticsky_multi.sql \
         addtool_find_pendingmergeprocess.sql \
         addtool_find_processedexp_cam.sql \
         addtool_find_processedexp_stack.sql \
         addtool_find_processedexp_staticsky.sql \
+        addtool_find_processedexp_staticsky_multi.sql \
         addtool_find_minidvodbprocessed.sql \
         addtool_find_minidvodbrun.sql \
@@ -27 +31 @@
         addtool_queue_stack_id.sql \
         addtool_queue_sky_id.sql \
+        addtool_queue_sky_id_multi.sql \
         addtool_queue_minidvodbrun.sql \
         addtool_revertminidvodbprocessed.sql \
@@ -32 +37 @@
         addtool_revertprocessedexp_stack.sql \
         addtool_revertprocessedexp_staticsky.sql \
+        addtool_revertprocessedexp_staticsky_multi.sql \
         bgtool_advancechip.sql \
         bgtool_advancewarp.sql \

trunk/ippTools/share/addtool_queue_cam_id.sql

@@ -4 +4 @@
         'cam',          -- stage
         cam_id,         -- stage_id
+        %d,             -- stage_extra1
         '%s',           -- state
         '%s',           -- workdir

trunk/ippTools/share/addtool_queue_sky_id.sql

@@ -4 +4 @@
         'staticsky',            -- stage
         sky_id,         -- stage_id
+        %d,             -- stage_extra1
         '%s',           -- state
         '%s',           -- workdir

trunk/ippTools/share/addtool_queue_stack_id.sql

@@ -4 +4 @@
         'stack',                -- stage
         stack_id,         -- stage_id
+        %d,               --stage_extra1
         '%s',           -- state
         '%s',           -- workdir

trunk/ippTools/src/addtool.c

@@ -143 +143 @@
     pxAddLabelSearchArgs (config, where, "-filter",     "stackRun.filter", "=="); // define using camRun label
     }
-    
+        if (strcmp(stage, "staticsky_multi")== 0) {
+
+    pxAddLabelSearchArgs (config, where, "-label",     "staticskyRun.label", "=="); // define using camRun label
+    pxAddLabelSearchArgs (config, where, "-data_group","staticskyRun.data_group", "=="); // define using camRun label
+    PXOPT_COPY_STR(config->args, where,  "-reduction", "staticskyyRun.reduction", "==");
+    //no filter here
+    }
     if (!psListLength(where->list)) {
         psFree(where);
@@ -237 +243 @@
     }
 
-
+    if (strcmp(stage,"staticsky_multi") == 0) {
+      if (dvodb ) {
+        psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_sky_id_multi_dvo.sql\n%s\n", dvodb,stage);
+        // find the cam_id of all the exposures that we want to queue up.
+        bare_query = pxDataGet("addtool_find_sky_id_multi_dvo.sql");
+        // user supplied dvodb
+        psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb);
+    } else {
+      psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_sky_id_multi.sql\n%s\n",stage);
+        // find the cam_id of all the exposures that we want to queue up.
+        bare_query = pxDataGet("addtool_find_sky_id_multi.sql");
+        // inherit dvodb from camRun, avoid matching NULL
+        psStringAppend(&dvodb_string, "(staticskyRun.dvodb IS NOT NULL AND previous_dvodb = staticskyRun.dvodb)");
+    }
+    }
 
     if (!bare_query) {
@@ -292 +312 @@
         psStringAppend(&query, " GROUP BY stack_id");
       }
-
+    if (strcmp(stage,"staticsky_multi") == 0) {
+      psStringAppend(&query, " GROUP BY sky_id");  //some reason it needs this
+      }
 
 
@@ -405 +427 @@
     }
     }
+    if (strcmp(stage,"staticsky_multi") == 0) {
+    for (long i = 0; i < psArrayLength(output); i++) {
+        psMetadata *md = output->data[i];
+        bool status = false;
+        psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs");
+        if (!status) {
+          psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item num_inputs");
+          return false;
+        }
+        if (num_inputs < 0) {
+          psError(PS_ERR_UNKNOWN, true, "invalid value for num_inputs");
+          return false;
+        }
+
+        staticskyRunRow *row = staticskyRunObjectFromMetadata(md);
+        
+        if (!row) {
+            psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun");
+            psFree(output);
+            return false;
+        }
+
+        if (!dvodb) {  //there's no staticsky.dvodb
+            psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, sky_id %" PRId64, row->label, row->sky_id);
+            psFree(output);
+            return false;
+        }
+        if (!workdir && !row->workdir) {
+            psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, sky_id %" PRId64, row->label, row->sky_id);
+            psFree(output);
+            return false;
+        }
+
+        psFree(row);
+    }
+    }
+
+
+
 
     // start a transaction so we don't end up with an exp without any associted
@@ -438 +499 @@
                                stage,
                                stage_id,
+                               0,
                                workdir     ? workdir   : row->workdir,
                                reduction   ? reduction : row->reduction,
@@ -479 +541 @@
                                stage,
                                stage_id,
+                               0,
                                workdir     ? workdir   : row->workdir,
                                reduction   ? reduction : row->reduction,
@@ -520 +583 @@
                                stage,
                                stage_id,
+                               0,
                                workdir     ? workdir   : row->workdir,
                                reduction   ? reduction : row->reduction,
@@ -544 +608 @@
       }
 
+    if (strcmp(stage,"staticsky_multi") == 0) {
+    for (long i = 0; i < psArrayLength(output); i++) {
+        psMetadata *md = output->data[i];
+        psS64 stage_id =0; 
+        bool status = false;
+        psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs");
+        if (!status) {
+          psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item num_inputs");
+          return false;
+        }
+        staticskyRunRow *row = staticskyRunObjectFromMetadata(md);
+        stage_id = row->sky_id;
+        
+        if (!row) {
+            psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun");
+            psFree(output);
+            return false;
+        }
+
+        // queue the exp
+        for (int filter_id = 0; filter_id < num_inputs; filter_id++) {  
+        if (!pxaddQueueByCamID(config,
+                               stage,
+                               stage_id,
+                               filter_id,
+                               workdir     ? workdir   : row->workdir,
+                               reduction   ? reduction : row->reduction,
+                               label       ? label     : row->label,
+                               data_group  ? data_group : (row->data_group ? row->data_group :  (label ? label : row->label)),
+                               dvodb       ? dvodb     : NULL,
+                               note        ? note      : NULL,
+                               image_only,
+                               minidvodb,
+                               minidvodb_group,
+                               minidvodb_name
+        )) {
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error sfg");
+            }
+            psError(PS_ERR_UNKNOWN, false,
+                    "failed to trying to queue stage %s %" PRId64,stage, stage_id);
+            psFree(row);
+            psFree(output);
+            return false;
+        }
+        }
+        psFree(row);
+    }
+      }
+
+
+
+
     psFree(output);
 
@@ -585 +702 @@
     }
     if (strcmp(stage, "staticsky")==0) {
+    query = psStringCopy("UPDATE addRun JOIN staticskyRun on sky_id = stage_id");
+    }
+    if (strcmp(stage, "staticsky_multi")==0) {
     query = psStringCopy("UPDATE addRun JOIN staticskyRun on sky_id = stage_id");
     }
@@ -626 +746 @@
     query = pxDataGet("addtool_find_pendingexp_staticsky.sql");
     }
-
+    if (strcmp(stage, "staticsky_multi")==0) { 
+    query = pxDataGet("addtool_find_pendingexp_staticsky_multi.sql");
+    }
+    
 
     if (!query) {
@@ -648 +771 @@
       psStringAppend(&query, " GROUP BY %s", "sky_id");
     }
-
+    if (strcmp(stage, "staticsky_multi") == 0) {
+      //this group by is needed to join against all the warps (to get camera)
+      psStringAppend(&query, " GROUP BY %s", "sky_id, stage_extra1");
+    }
     // treat limit == 0 as "no limit"
     if (limit) {
@@ -838 +964 @@
     query = pxDataGet("addtool_find_processedexp_staticsky.sql");
     }
+    if (strcmp (stage,"staticsky_multi") == 0) {
+    query = pxDataGet("addtool_find_processedexp_staticsky_multi.sql");
+    }
+
    
     if (!query) {
@@ -948 +1078 @@
          query = pxDataGet("addtool_revertprocessedexp_staticsky.sql");
       }
+   if (strcmp(stage, "staticsky_multi") == 0) {
+         query = pxDataGet("addtool_revertprocessedexp_staticsky_multi.sql");
+      }
+
+
+     
       if (!query) {
             // rollback

trunk/ippTools/src/flatcorr.c

@@ -666 +666 @@
                 "cam",
                 row->cam_id,
+                0,
                 row->workdir,
                 row->reduction,

trunk/ippTools/src/pxadd.c

@@ -131 +131 @@
                        char *stage,
                        psS64 stage_id,
+                       psS32 stage_extra1,
                        char *workdir,
                        char *reduction,
@@ -159 +160 @@
         psMemSetPersistent(query, true);
       }
+      if (strcmp(stage,"staticsky_multi") == 0) {
+        query = pxDataGet("addtool_queue_sky_id_multi.sql");
+        psMemSetPersistent(query, true);
+      }
         if (!query) {
             psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
@@ -170 +175 @@
     // on 32/64
     if (!p_psDBRunQueryF(config->dbh, query,
+                         stage_extra1 ? stage_extra1 : 0,
                          "new", // state
                          workdir  ? workdir   : "NULL",

trunk/ippTools/src/pxadd.h

@@ -33 +33 @@
                        char *stage,
                        psS64 stage_id,
+                       psS32 stage_extra1,
                        char *workdir,
                        char *reduction,