Changeset 23388

Timestamp:

Mar 18, 2009, 10:17:06 AM (17 years ago)

Author:

bills

Message:

add diffRun.magicked

Location:

trunk

Files:

• dbconfig/diff.md (modified) (1 diff)
• ippTools/src/difftool.c (modified) (5 diffs)
• ippTools/src/difftoolConfig.c (modified) (1 diff)

trunk/dbconfig/diff.md

@@ -11 +11 @@
     tess_id     STR         64      # Key
     exp_id      S64         0       # fkey(exp_id) ref rawExp(exp_id)
+    magicked    BOOL        f
 END
 

trunk/ippTools/src/difftool.c

@@ -131 +131 @@
             registered,
             tess_id,
-            exp_id
+            exp_id,
+            false
     );
     if (!run) {
@@ -506 +507 @@
     PXOPT_LOOKUP_STR(hostname, config->args, "-hostname", false, false);
     PXOPT_LOOKUP_F32(good_frac, config->args, "-good_frac", false, false);
+    PXOPT_LOOKUP_BOOL(magicked, config->args, "-magicked", false);
 
     if (!psDBTransaction(config->dbh)) {
@@ -537 +539 @@
                            good_frac,
                            code,
-                           0        // magic_ds_id
+                           magicked
           )) {
         if (!psDBRollback(config->dbh)) {
@@ -792 +794 @@
             registered,
             tess_id,
-            exp_id
+            exp_id,
+            false       // magicked
     );
 
@@ -1132 +1135 @@
                 registered,
                 tess_id,
-                exp_id
+                exp_id,
+                false       // magicked
         );
 

trunk/ippTools/src/difftoolConfig.c

@@ -107 +107 @@
     psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-kernel_xy",  0, "define kernel xy moment", NAN);
     psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-kernel_yy",  0, "define kernel yy moment", NAN);
-    psMetadataAddS32(adddiffskyfileArgs, PS_LIST_TAIL, "-sources",  0,            "define number of sources", 0);
-    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-hostname", 0,            "define hostname", 0);
-    psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-good_frac",  0,            "define %% of good pixels", NAN);
+    psMetadataAddS32(adddiffskyfileArgs, PS_LIST_TAIL, "-sources",  0,   "define number of sources", 0);
+    psMetadataAddStr(adddiffskyfileArgs, PS_LIST_TAIL, "-hostname", 0,   "define hostname", 0);
+    psMetadataAddF32(adddiffskyfileArgs, PS_LIST_TAIL, "-good_frac",  0, "define %% of good pixels", NAN);
+    psMetadataAddBool(adddiffskyfileArgs, PS_LIST_TAIL, "-magicked",  0, "define magicked state", false);
 
     // -diffskyfile