Index: /branches/eam_branches/ipp-20120601/ippTools/src/dettool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/dettool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/dettool.c	(revision 34058)
@@ -2116,5 +2116,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true,  false);
+  // replaced below PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
Index: /branches/eam_branches/ipp-20120601/ippTools/src/dettool_processedexp.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/dettool_processedexp.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/dettool_processedexp.c	(revision 34058)
@@ -266,5 +266,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
 
@@ -283,5 +283,5 @@
 bool updatestateprocessedMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config, NULL);
-  PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
+  // PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
   PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
 
Index: /branches/eam_branches/ipp-20120601/ippTools/src/dettool_processedimfile.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/dettool_processedimfile.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/dettool_processedimfile.c	(revision 34058)
@@ -298,5 +298,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
+    // PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
     PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
 
Index: /branches/eam_branches/ipp-20120601/ippTools/src/dettool_residexp.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/dettool_residexp.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/dettool_residexp.c	(revision 34058)
@@ -356,5 +356,5 @@
 bool updatestateresidMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config, NULL);
-  PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
+  // PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
   PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
 
Index: /branches/eam_branches/ipp-20120601/ippTools/src/disttool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/disttool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/disttool.c	(revision 34058)
@@ -403,4 +403,8 @@
     }
 
+    if (0) {
+	fprintf (stderr, "runJoinStr: %s\n", runJoinStr);
+    }
+
     if (!strcmp(stage, "raw")) {
         if (!no_magic) {
@@ -726,4 +730,5 @@
     }
 
+    if (simple) {/* no option? */}
 
     if (pretend) {
@@ -1833,4 +1838,6 @@
         psStringAppend(&query, " %s last_fileset = '%s'", sep, last_fileset);
     }
+#else
+    if (0) { fprintf (stderr, "sep: %s\n", sep); }
 #endif
 
@@ -2186,6 +2193,6 @@
     PXOPT_COPY_STR(config->args, where, "-state", "state", "==");
 
-    PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
-    PXOPT_LOOKUP_BOOL(full, config->args, "-full", false);
+    // PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
+    // PXOPT_LOOKUP_BOOL(full, config->args, "-full", false);
 
     pxAddLabelSearchArgs (config, where, "-label", "distRun.label", "==");
Index: /branches/eam_branches/ipp-20120601/ippTools/src/dqstatstool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/dqstatstool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/dqstatstool.c	(revision 34058)
@@ -829,5 +829,5 @@
 static bool updaterunMode(pxConfig *config) {
   PS_ASSERT_PTR_NON_NULL(config,false);
-  PXOPT_LOOKUP_S64(dqstats_id, config->args, "-dqstats_id",     true, false);
+  // PXOPT_LOOKUP_S64(dqstats_id, config->args, "-dqstats_id",     true, false);
   PXOPT_LOOKUP_STR(state,      config->args, "-set_state",      true, false);
   PXOPT_LOOKUP_S16(fault,      config->args, "-fault",          false, false);
Index: /branches/eam_branches/ipp-20120601/ippTools/src/faketool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/faketool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/faketool.c	(revision 34058)
@@ -1263,5 +1263,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-fake_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-fake_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
Index: /branches/eam_branches/ipp-20120601/ippTools/src/laptool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/laptool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/laptool.c	(revision 34058)
@@ -464,5 +464,6 @@
 
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
+
+  // require? PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
   PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "==");
 
@@ -633,6 +634,6 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-  PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
-
+
+  // require? PXOPT_LOOKUP_S64(lap_id, config->args, "-lap_id", true, false);
   PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
   PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -705,7 +706,9 @@
 
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_S64(lap_id,  config->args, "-lap_id",  true, false);
-  PXOPT_LOOKUP_S64(exp_id,  config->args, "-exp_id",  true, false);
-  PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
+
+  // test for required opts?
+  // PXOPT_LOOKUP_S64(lap_id,  config->args, "-lap_id",  true, false);
+  // PXOPT_LOOKUP_S64(exp_id,  config->args, "-exp_id",  true, false);
+  // PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", false, false);
 
   PXOPT_LOOKUP_S64(set_chip_id, config->args, "-set_chip_id", false, false);
@@ -841,5 +844,6 @@
 {
   PS_ASSERT_PTR_NON_NULL(config, false);
-  PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
+
+  // PXOPT_LOOKUP_S64(lap_id,          config->args, "-lap_id",          true, false);
   
   psMetadata *where = psMetadataAlloc();
Index: /branches/eam_branches/ipp-20120601/ippTools/src/magicdstool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/magicdstool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/magicdstool.c	(revision 34058)
@@ -1343,5 +1343,5 @@
 {
     // required
-    PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
+    // PXOPT_LOOKUP_S64(magic_ds_id, config->args, "-magic_ds_id", true, false);
 
     psMetadata *where = psMetadataAlloc();
Index: /branches/eam_branches/ipp-20120601/ippTools/src/mergetool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/mergetool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/mergetool.c	(revision 34058)
@@ -738,5 +738,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
     psMetadata *where = psMetadataAlloc();
-    PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
+    // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-merge_id", true, false);
     PXOPT_COPY_S64(config->args, where, "-merge_id",     "mergedvodbProcessed.merge_id", "==");
     PXOPT_LOOKUP_F32(dtime_merge,  config->args, "-set_dtime_merge", false, false);
@@ -1139,10 +1139,11 @@
   PS_ASSERT_PTR_NON_NULL(config, false);
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
-  PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
+
+  // require? PXOPT_LOOKUP_U64(mergedvodbcopy_id,  config->args, "-mergedvodbcopy_id", false, false);
+  // require? PXOPT_LOOKUP_U64(merge_id,  config->args, "-merge_id", false, false);
   PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
   PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
   PXOPT_LOOKUP_STR(rsync_path,  config->args, "-mergedvodb_rsync_path", false, false);
-  PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
+  // PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
   
   PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);
Index: /branches/eam_branches/ipp-20120601/ippTools/src/minidvodbtool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/minidvodbtool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/minidvodbtool.c	(revision 34058)
@@ -411,10 +411,11 @@
   PS_ASSERT_PTR_NON_NULL(config, false);
   psMetadata *where = psMetadataAlloc();
-  PXOPT_LOOKUP_U64(minidvodbcopy_id,  config->args, "-minidvodbcopy_id", false, false);
-  PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", false, false);
+
+  // PXOPT_LOOKUP_U64(minidvodbcopy_id,  config->args, "-minidvodbcopy_id", false, false);
+  // PXOPT_LOOKUP_U64(minidvodb_id,  config->args, "-minidvodb_id", false, false);
   PXOPT_LOOKUP_STR(state,  config->args, "-state", false, false);
   PXOPT_LOOKUP_STR(host,  config->args, "-host", false, false);
   PXOPT_LOOKUP_STR(rsync_path,  config->args, "-minidvodb_rsync_path", false, false);
-  PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
+  // PXOPT_LOOKUP_S16(fault,  config->args, "-fault", false, false);
   
   PXOPT_LOOKUP_S16(set_fault,  config->args, "-set_fault", false, false);
Index: /branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/pstamptool.c	(revision 34058)
@@ -48,4 +48,7 @@
 static bool stopdependentjobMode(pxConfig *config);
 static bool revertjobMode(pxConfig *config);
+
+# if (0)
+// these are unused functions -- since they are 'static', this raises an warning
 static bool addprojectMode(pxConfig *config);
 static bool projectMode(pxConfig *config);
@@ -59,4 +62,5 @@
 static bool listfileMode(pxConfig *config);
 static bool deletefileMode(pxConfig *config);
+# endif
 
 # define MODECASE(caseName, func) \
@@ -98,4 +102,5 @@
         MODECASE(PSTAMPTOOL_MODE_STOPDEPENDENTJOB, stopdependentjobMode);
         MODECASE(PSTAMPTOOL_MODE_REVERTJOB, revertjobMode);
+# if (0)
         MODECASE(PSTAMPTOOL_MODE_ADDPROJECT, addprojectMode);
         MODECASE(PSTAMPTOOL_MODE_MODPROJECT, modprojectMode);
@@ -109,4 +114,5 @@
         MODECASE(PSTAMPTOOL_MODE_LISTFILE, listfileMode);
         MODECASE(PSTAMPTOOL_MODE_DELETEFILE, deletefileMode);
+# endif
         default:
             psAbort("invalid option (this should not happen)");
@@ -1095,4 +1101,6 @@
 }
 
+# if (0)
+// these are unused functions
 static bool addprojectMode(pxConfig *config)
 {
@@ -1634,2 +1642,3 @@
     return true;
 }
+# endif
Index: /branches/eam_branches/ipp-20120601/ippTools/src/pztool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/pztool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/pztool.c	(revision 34058)
@@ -338,8 +338,10 @@
         }
 
-/*         psStringAppend(&query, " ORDER BY dateobs"); */
-/*         if (desc) { */
-/*             psStringAppend(&query, " DESC"); */
-/*         } */
+	if (0) {
+	    psStringAppend(&query, " ORDER BY dateobs"); 
+	    if (desc) { 
+		psStringAppend(&query, " DESC"); 
+	    } 
+	}
 
         // request the full "limit" from each known camera and throw away any
Index: /branches/eam_branches/ipp-20120601/ippTools/src/regtool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/regtool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/regtool.c	(revision 34058)
@@ -613,5 +613,5 @@
     PXOPT_LOOKUP_F32(teltemp_extra, config->args, "-teltemp_extra", false, false);
     PXOPT_LOOKUP_F32(pon_time, config->args, "-pon_time", false, false);
-    PXOPT_LOOKUP_S16(burntool_state, config->args, "-burntool_state", false, false);
+    // PXOPT_LOOKUP_S16(burntool_state, config->args, "-burntool_state", false, false);
     PXOPT_LOOKUP_F64(user_1, config->args, "-user_1", false, false);
     PXOPT_LOOKUP_F64(user_2, config->args, "-user_2", false, false);
@@ -1664,5 +1664,5 @@
   PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
 
-  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+  // XXX unused PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
   psString query = pxDataGet("regtool_finishcompressexp.sql");
@@ -1792,5 +1792,5 @@
   psStringPrepend(&whereClause,"\n AND ");
   PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
-  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
+  // PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
   psString limitString = NULL;
@@ -2033,5 +2033,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-exp_id", true,  false);
+  // unused and wrong! PXOPT_LOOKUP_S64(det_id, config->args, "-exp_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
Index: /branches/eam_branches/ipp-20120601/ippTools/src/stacktool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/stacktool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/stacktool.c	(revision 34058)
@@ -810,5 +810,5 @@
 
     // XXX require at least a stack id (add better search options)
-    PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
+    // PXOPT_LOOKUP_S64(stack_id, config->args, "-stack_id", true, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -1697,5 +1697,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-stack_id", true,  false);
+  // PXOPT_LOOKUP_S64(det_id, config->args, "-stack_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
Index: /branches/eam_branches/ipp-20120601/ippTools/src/staticskytool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/staticskytool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/staticskytool.c	(revision 34058)
@@ -424,5 +424,5 @@
 
     // XXX require at least a sky id (add better search options)
-    PXOPT_LOOKUP_S64(sky_id, config->args, "-sky_id", true, false);
+    // PXOPT_LOOKUP_S64(sky_id, config->args, "-sky_id", true, false);
 
     psMetadata *where = psMetadataAlloc();
@@ -797,5 +797,5 @@
   PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-  PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true,  false);
+  // XXX unused PXOPT_LOOKUP_S64(det_id, config->args, "-sky_id", true,  false);
   PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
   PXOPT_LOOKUP_BOOL(clean, config->args, "-clean", false);
Index: /branches/eam_branches/ipp-20120601/ippTools/src/vptool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/vptool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/vptool.c	(revision 34058)
@@ -126,12 +126,12 @@
         }
 
-        GET_VALUE (psS64,    S64, exp_id,        "exp_id");
+        // GET_VALUE (psS64,    S64, exp_id,        "exp_id");
         GET_VALUE (psString, Str, raw_workdir,   "workdir");
         GET_VALUE (psString, Str, raw_label,     "label");
-        GET_VALUE (psString, Str, raw_reduction, "reduction");
+        // GET_VALUE (psString, Str, raw_reduction, "reduction");
         // GET_VALUE (psString, Str, raw_expgroup,  "expgroup");
-        GET_VALUE (psString, Str, raw_dvodb,     "dvodb");
-        GET_VALUE (psString, Str, raw_tess_id,   "tess_id");
-        GET_VALUE (psString, Str, raw_end_stage, "end_stage");
+        // GET_VALUE (psString, Str, raw_dvodb,     "dvodb");
+        // GET_VALUE (psString, Str, raw_tess_id,   "tess_id");
+        // GET_VALUE (psString, Str, raw_end_stage, "end_stage");
 
         if (!row->exp_id) {
@@ -672,5 +672,5 @@
     PXOPT_COPY_S16(config->args, where, "-fault", "vpProcessedCell.fault", "==");
 
-    PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
+    // PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
 
     if (!psListLength(where->list)) {
Index: /branches/eam_branches/ipp-20120601/ippTools/src/warptool.c
===================================================================
--- /branches/eam_branches/ipp-20120601/ippTools/src/warptool.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/ippTools/src/warptool.c	(revision 34058)
@@ -1185,5 +1185,5 @@
     pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
-    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    // PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
 
     psString query = pxDataGet("warptool_finished_run_select.sql");
@@ -1831,5 +1831,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
+    // PXOPT_LOOKUP_S64(warp_id, config->args, "-warp_id", true, false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
@@ -2169,5 +2169,5 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    PXOPT_LOOKUP_S64(det_id,  config->args, "-warp_id", true,  false);
+    // PXOPT_LOOKUP_S64(det_id,  config->args, "-warp_id", true,  false);
     PXOPT_LOOKUP_STR(outfile, config->args, "-outfile", true,  false);
     PXOPT_LOOKUP_U64(limit,   config->args, "-limit",   false, false);
@@ -2358,6 +2358,6 @@
     pxAddLabelSearchArgs (config, where, "-label",     "warpRun.label", "LIKE");
 
-//    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
-    PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
+    // PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
+    // PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
Index: /branches/eam_branches/ipp-20120601/magic/remove/src/streakscompare.c
===================================================================
--- /branches/eam_branches/ipp-20120601/magic/remove/src/streakscompare.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/magic/remove/src/streakscompare.c	(revision 34058)
@@ -165,4 +165,6 @@
     }
 
+    if (nebulousImage) { /* do something? */ }
+
     if (argc != 1) {
         psString unexpectedArguments = NULL;
Index: /branches/eam_branches/ipp-20120601/magic/remove/src/streaksio.c
===================================================================
--- /branches/eam_branches/ipp-20120601/magic/remove/src/streaksio.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/magic/remove/src/streaksio.c	(revision 34058)
@@ -659,5 +659,5 @@
 
         // Ensure input is of the expected type
-        psDataType expected = isMask ? PS_TYPE_IMAGE_MASK : PS_TYPE_F32; // Expected type for image
+        psElemType expected = isMask ? PS_TYPE_IMAGE_MASK : PS_TYPE_F32; // Expected type for image
         for (int i = 0; i < in->imagecube->n; i++) {
             psImage *image = in->imagecube->data[i]; // Image of interest
Index: /branches/eam_branches/ipp-20120601/magic/remove/src/streaksrelease.c
===================================================================
--- /branches/eam_branches/ipp-20120601/magic/remove/src/streaksrelease.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/magic/remove/src/streaksrelease.c	(revision 34058)
@@ -288,13 +288,13 @@
     } else {
         // we have an image cube
-        double initValue;
+        // double initValue;
         if (exciseImageCube) {
             // copy the entire input image to the recovery image
             writeImageCube(sf->recImage, sf->inImage->imagecube, extname, sf->extnum);
-            initValue = NAN;
+            // initValue = NAN;
         } else {
             // otherwise write it to the output
             writeImageCube(sf->outImage, sf->inImage->imagecube, extname, sf->extnum);
-            initValue = 0;
+            // initValue = 0;
         }
 
Index: /branches/eam_branches/ipp-20120601/psLib/src/imageops/psImageStructManip.c
===================================================================
--- /branches/eam_branches/ipp-20120601/psLib/src/imageops/psImageStructManip.c	(revision 34057)
+++ /branches/eam_branches/ipp-20120601/psLib/src/imageops/psImageStructManip.c	(revision 34058)
@@ -212,5 +212,5 @@
     elementSize = PSELEMTYPE_SIZEOF(inDatatype);
 
-    if (0) { fprintf (stderr, "%d elements, %d total memory\n", elements, elements * elementsSize); }
+    if (0) { fprintf (stderr, "%d elements, %d total memory\n", elements, elements * elementSize); }
 
     output = p_psImageRecycle(file, lineno, func, output, numCols, numRows, type);