Changeset 31429 for branches/czw_branch/20110406/ippTools/src/laptool.c

Timestamp:

May 3, 2011, 7:28:38 PM (15 years ago)

Author:

watersc1

Message:

Hard coded cleanup commands into the script, but it works, and triggers cleanup for the things we're done with. Edit to diff_skycell.pl to create a dummy refConv file for magic to use when we haven't convolved anything.

File:

• branches/czw_branch/20110406/ippTools/src/laptool.c (modified) (5 diffs)

branches/czw_branch/20110406/ippTools/src/laptool.c

@@ -473 +473 @@
       }
     }
-
   }
 
@@ -690 +689 @@
   PXOPT_LOOKUP_S64(set_chip_id, config->args, "-set_chip_id", false, false);
   PXOPT_LOOKUP_S64(set_pair_id, config->args, "-set_pair_id", false, false);
+  PXOPT_LOOKUP_STR(set_data_state, config->args, "-set_data_state", false, false);
   PXOPT_LOOKUP_BOOL(private,    config->args, "-private",     false);
   PXOPT_LOOKUP_BOOL(public,     config->args, "-public",      false);
@@ -711 +711 @@
   PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
   PXOPT_COPY_S64(config->args, where, "-chip_id", "chip_id", "==");
-  PXOPT_COPY_STR(config->args, where, "-set_data_state", "data_state", "==");
+
 
   psMetadata *values = psMetadataAlloc();
@@ -738 +738 @@
     psMetadataAddBool(values, PS_LIST_TAIL, "pairwise", 0, "==", false);
   }
-  
+  if (set_data_state) {
+    PXOPT_COPY_STR(config->args, values, "-set_data_state", "data_state", "==");
+  }
   long rows = psDBUpdateRows(config->dbh,"lapExp",where,values);
   if (rows) {
@@ -755 +757 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-
+  PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
+  
   psMetadata *where = psMetadataAlloc();
   PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "==");