Changeset 16509

Timestamp:

Feb 15, 2008, 9:54:44 AM (18 years ago)

Author:

eugene

Message:

added label to newExp; gets propagated to chipRun on successful registration; added options to supply alternate label to dettool and regtool; added -label to pxinject

Location:

trunk

Files:

• dbconfig/tasks.md (modified) (2 diffs)
• ippTools/src/pxinject.c (modified) (2 diffs)
• ippTools/src/pxinjectConfig.c (modified) (1 diff)
• ippTools/src/pztool.c (modified) (2 diffs)
• ippTools/src/pztoolConfig.c (modified) (1 diff)
• ippTools/src/regtool.c (modified) (3 diffs)
• ippTools/src/regtoolConfig.c (modified) (1 diff)

trunk/dbconfig/tasks.md

@@ -1 @@
-# $Id: tasks.md,v 1.146 2008-02-06 04:45:00 jhoblitt Exp $
+# $Id: tasks.md,v 1.147 2008-02-15 19:54:44 eugene Exp $
 
 # this table records all exposure ID ever seen from the summit
@@ -99 +99 @@
     tess_id     STR         64
     end_stage   STR         64      # Key
+    label       STR         64      # Key
 END
 

trunk/ippTools/src/pxinject.c

@@ -87 +87 @@
     PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", false, false);
     PXOPT_LOOKUP_STR(end_stage, config->args, "-end_stage", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
@@ -100 +101 @@
                 dvodb,
                 tess_id,
-                end_stage
+                end_stage,
+                label
             )
         ) {

trunk/ippTools/src/pxinjectConfig.c

@@ -61 +61 @@
     psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-end_stage",  0,
             "define the end goal processing step", NULL);
+    psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-label",  0,
+            "define a label (carried to chip stage)", NULL);
     psMetadataAddBool(newExpArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);

trunk/ippTools/src/pztool.c

@@ -465 +465 @@
     PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", false, false);
     PXOPT_LOOKUP_STR(end_stage, config->args, "-end_stage", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
 
     // find all exposures that have had all of their imfiles downloaded but do
@@ -516 +517 @@
                     dvodb,              // dvodb
                     tess_id,            // tess_id
-                    end_stage           // end_stage
+                    end_stage,          // end_stage
+                    label
                 )
         ) {

trunk/ippTools/src/pztoolConfig.c

@@ -122 +122 @@
     psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-end_stage",  0,
         "define the end goal processing step", NULL);
+    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-label",  0,
+        "define the label for the chip stage", NULL);
     psMetadataAddS16(copydoneArgs, PS_LIST_TAIL, "-code",  0,
             "set fault code", 0);

trunk/ippTools/src/regtool.c

@@ -543 +543 @@
     PXOPT_LOOKUP_F64(user_5, config->args, "-user_5", false, false);
     PXOPT_LOOKUP_STR(object, config->args, "-object", false, false);
+    PXOPT_LOOKUP_STR(label,  config->args, "-label", false, false);
     PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false);
 
@@ -623 +624 @@
     // carry through these values
     // new CLI options overwrite existing values
-    workdir   = workdir ? workdir : newExp->workdir;
+    workdir   = workdir   ? workdir   : newExp->workdir;
     reduction = reduction ? reduction : newExp->reduction;
-    dvodb     = dvodb ? dvodb : newExp->dvodb;
-    tess_id   = tess_id ? tess_id : newExp->tess_id;
+    dvodb     = dvodb     ? dvodb     : newExp->dvodb;
+    tess_id   = tess_id   ? tess_id   : newExp->tess_id;
     end_stage = end_stage ? end_stage : newExp->end_stage;
+    label     = label     ? label     : newExp->label;
     // don't free newExp until just before we return, or these refs will break
 
@@ -728 +730 @@
                 (psS64)atoll(exp_id),
                 workdir,
-                NULL, // label
+                label,
                 reduction,
                 NULL, // expgroup

trunk/ippTools/src/regtoolConfig.c

@@ -325 +325 @@
         "define exposure object", NULL);
     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-label",  0,
-        "define label for phase 2 processing (non-detrend data only)", NULL);
+        "define label for chip stage (non-detrend data only)", NULL);
     psMetadataAddS16(addprocessedexpArgs, PS_LIST_TAIL, "-code",  0,
         "set fault code", 0);