Changeset 25835 for trunk/ippTools/src/flatcorr.c

Timestamp:

Oct 14, 2009, 11:06:18 AM (17 years ago)

Author:

bills

Message:

Add data_group, dist_group, and note to the pipeline. These new columns will be used
for some of the tasks that label was used previously.

File:

• trunk/ippTools/src/flatcorr.c (modified) (4 diffs)

trunk/ippTools/src/flatcorr.c

@@ -133 +133 @@
     PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", false, false);
     PXOPT_LOOKUP_STR(region, config->args, "-set_region", false, false);
+    PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false);
 
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
@@ -235 +236 @@
 
         // queue the exp : force this to stop at the chip stage
-        psS64 chip_id = pxchipQueueByExpTag(config, exp_id, workdir, label, reduction, expgroup, dvodb, tess_id, "chip");
+        psS64 chip_id = pxchipQueueByExpTag(config, exp_id, workdir, label, label, NULL, reduction, expgroup, dvodb, tess_id, "chip", note);
         if (!chip_id) {
             if (!psDBRollback(config->dbh)) {
@@ -523 +524 @@
                 row->workdir,
                 row->label,
+                row->data_group,
+                row->dist_group,
                 row->reduction,
                 row->expgroup,
                 row->dvodb,
                 row->tess_id,
-                "camera")) {
+                "camera",
+                NULL // note does not propragate
+                )) {
             if (!psDBRollback(config->dbh)) {
                 psError(PS_ERR_UNKNOWN, false, "database error");
@@ -658 +663 @@
                 row->reduction,
                 row->label,
+                row->data_group,
                 row->dvodb,
+                NULL,       // note is not propagated
                 0)) {
             if (!psDBRollback(config->dbh)) {