Changeset 11816 for trunk/ippTools/src

Timestamp:

Feb 14, 2007, 5:32:33 PM (19 years ago)

Author:

jhoblitt

Message:

add solang/label/parent fields

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (6 diffs)
• dettoolConfig.c (modified) (1 diff)
• regtool.c (modified) (1 diff)

trunk/ippTools/src/dettool.c

@@ -422 +422 @@
     }
 
+    psString label = psMetadataLookupStr(&status, config->args, "-label");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -label");
+        return false;
+    }
+
     // we have to support multipe exp_tags
     psMetadataItem *item = psMetadataLookup(config->args, "-exp_tag");
@@ -512 +518 @@
             time_end,
             use_begin,
-            use_end
+            use_end,
+            0.0,    // solang min
+            0.0,    // solang max
+            label,
+            0       // parent
         );
     psFree(registered);
@@ -1062 +1072 @@
             use_end = NULL;
         }
+    }
+
+    psString label = psMetadataLookupStr(&status, config->args, "-label");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -label");
+        return false;
     }
 
@@ -1154 +1170 @@
             time_end,
             use_begin,
-            use_end
+            use_end,
+            0.0,    // solang min
+            0.0,    // solang max
+            label,
+            0       // parent
         );
     psFree(registered);
@@ -6273 +6293 @@
     }
 
+    psString parent = psMetadataLookupStr(&status, config->args, "-parent");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -parent");
+        return false;
+    }
+
+    psString label = psMetadataLookupStr(&status, config->args, "-label");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -label");
+        return false;
+    }
+
     if (!psDBTransaction(config->dbh)) {
         psError(PS_ERR_UNKNOWN, false, "database error");
@@ -6301 +6333 @@
             time_end,
             use_begin,
-            use_end
+            use_end,
+            0.0,        // solang min
+            0.0,        // solang max
+            label,      // label
+            atoi(parent)
     )) {
         psError(PS_ERR_UNKNOWN, false, "database error");

trunk/ippTools/src/dettoolConfig.c

@@ -749 +749 @@
     psMetadataAddF64(register_detrendArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
             "define exposue background mean stdev", NAN);
+    psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-parent",  0,
+            "define parent det_id", NULL);
     psMetadataAddBool(register_detrendArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);

trunk/ippTools/src/regtool.c

@@ -1086 +1086 @@
         posang,
         object,
+        0.0,
         code
     );