Changeset 27020 for trunk/ippTools/src

Timestamp:

Feb 19, 2010, 5:46:13 PM (16 years ago)

Author:

watersc1

Message:

Changes to implement diff_mode in the diffRun table to allow diff.pro to set a more descriptive file name.

Location:

trunk/ippTools/src

Files:

• difftool.c (modified) (8 diffs)
• difftoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/difftool.c

@@ -136 +136 @@
     PXOPT_LOOKUP_STR(data_group, config->args, "-set_data_group", false, false);
     PXOPT_LOOKUP_STR(dist_group, config->args, "-set_dist_group", false, false);
-    PXOPT_LOOKUP_STR(reduction, config->args, "-rset_eduction", false, false);
+    PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false);
+    PXOPT_LOOKUP_S16(diff_mode, config->args, "-set_diff_mode", false, false);
     PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false);
 
@@ -157 +158 @@
             exposure,
             false,
+            diff_mode,
             note
     );
@@ -990 +992 @@
         return false;
     }
-
+    psS16 diff_mode = 0;
+    if ((input_warp_id != PS_MAX_S64) && (template_warp_id != PS_MAX_S64)) {
+      diff_mode = 1;
+    }
+    else if ((input_warp_id != PS_MAX_S64) && (template_stack_id != PS_MAX_S64)) {
+      diff_mode = 2;
+    }
+    else if ((input_stack_id != PS_MAX_S64) && (template_warp_id != PS_MAX_S64)) {
+      diff_mode = 3;
+    }
+    else if ((input_stack_id != PS_MAX_S64) && (template_stack_id != PS_MAX_S64)) {
+      diff_mode = 4;
+    }
+    
+    
     // default
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -1009 +1025 @@
             false,
             0,       // magicked
+            diff_mode, // diff_mode
             note
     );
@@ -1114 +1131 @@
 
     psArray *list = psArrayAllocEmpty(16); // List of runs, to print
-
+    // Populated Run will generate the diff_mode value
     if (!populatedrun(list, workdir, skycell_id, tess_id, label, data_group ? data_group : label, dist_group, reduction, note,
                       input_warp_id ? input_warp_id : PS_MAX_S64,
@@ -1419 +1436 @@
                 true,                   // exposure
                 0,       // magicked
+                2,       // diff_mode for warp-stack difference
                 note
         );
@@ -1760 +1778 @@
         }
 
-        diffRunRow *run = diffRunRowAlloc(0, "reg", workdir, label, data_group ? data_group : label, dist_group, reduction, NULL, registered,
-                                          tess_id, true, true, false, note); // Run to insert
+        diffRunRow *run = diffRunRowAlloc(0,
+                                          "reg",
+                                          workdir,
+                                          label,
+                                          data_group ? data_group : label,
+                                          dist_group,
+                                          reduction,
+                                          NULL,  // dvodb
+                                          registered,
+                                          tess_id,
+                                          true,  // bothways
+                                          true,  // exposure
+                                          false, // magicked
+                                          1,     // diff_mode for warp-warp diff
+                                          note); // Run to insert
         if (!diffRunInsertObject(config->dbh, run)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -2042 +2073 @@
                                       false,                 // exposure
                                       0,       // magicked
+                                      4,       // diff_mode
                                       note
                                       );

trunk/ippTools/src/difftoolConfig.c

@@ -56 +56 @@
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-set_data_group",  0,     "define data group", NULL);
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-set_dist_group",  0,     "define dist group", NULL);
+    psMetadataAddS16(definerunArgs, PS_LIST_TAIL, "-set_diff_mode", 0,       "specify type of difference (WW=1,WS=2,SW=3,SS=4)", 0);
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-set_note",  0,           "define note", NULL);
     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
@@ -68 +69 @@
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_data_group", 0,   "define new data_group", NULL);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_dist_group", 0,   "define new dist_group", NULL);
+    psMetadataAddS16(updaterunArgs, PS_LIST_TAIL, "-set_diff_mode", 0,       "specify type of difference (WW=1,WS=2,SW=3,SS=4)", 0);
     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_note", 0,         "define new note", NULL);