Changeset 28486 for trunk/ippTools/src

Timestamp:

Jun 24, 2010, 3:02:57 PM (16 years ago)

Author:

Paul Price

Message:

Merging (reintegrating) branches/pap (background restoration).

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/Makefile.am (modified) (3 diffs)
• ippTools/src/bgtool.c (copied) (copied from branches/pap/ippTools/src/bgtool.c )
• ippTools/src/bgtool.h (copied) (copied from branches/pap/ippTools/src/bgtool.h )
• ippTools/src/bgtoolConfig.c (copied) (copied from branches/pap/ippTools/src/bgtoolConfig.c )
• ippTools/src/pxtools.c (modified) (2 diffs)
• ippTools/src/pxtools.h (modified) (1 diff)

trunk/ippTools/src

@@ -39 +39 @@
 warptool
 staticskytool
-
+bgtool
 diffphottool

@@ -39 +39 @@
 warptool
 staticskytool
-
+bgtool
 diffphottool

trunk/ippTools/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = \
         addtool \
+        bgtool \
         caltool \
         camtool \
@@ -48 +49 @@
 noinst_HEADERS = \
         addtool.h \
+        bgtool.h \
         caltool.h \
         camtool.h \
@@ -117 +119 @@
     addtoolConfig.c
 
+bgtool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
+bgtool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
+bgtool_SOURCES = \
+    bgtool.c \
+    bgtoolConfig.c
+
 caltool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
 caltool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la

trunk/ippTools/src/pxtools.c

@@ -48 +48 @@
 }
 
+bool pxIsValidCleanedState(const char *state)
+{
+    PS_ASSERT_PTR_NON_NULL(state, false);
+
+    if (!strcmp(state, "cleaned")) return true;
+    if (!strcmp(state, "purged")) return true;
+    if (!strcmp(state, "scrubbed")) return true;
+    return false;
+}
+
 psString pxMergeCodeVersions(psString version1, psString version2)
 {
@@ -211 +221 @@
 
 // change the value for tableName.columName from 'full' to 'cleaned' if necessary
-bool pxSetStateCleaned(const psString tableName, const psString columnName, psArray *rows)
+bool pxSetStateCleaned(const char *tableName, const char *columnName, psArray *rows)
 {
     for (long i = 0; i < psArrayLength(rows); i++) {
         psMetadata *row = rows->data[i];
-        psString state = psMetadataLookupStr(NULL, row, columnName);
+        const char *state = psMetadataLookupStr(NULL, row, columnName);
         if (!state) {
             psError(PS_ERR_PROGRAMMING, false, "%s not found in row %ld of table %s",

trunk/ippTools/src/pxtools.h

@@ -53 +53 @@
 
 bool pxIsValidState(const char *state);
+bool pxIsValidCleanedState(const char *state);
 psString pxMergeCodeVersions(psString version1, psString version2);
 bool pxCoalesceRunStatus(pxConfig *config, const psString dbQFile, psS64 stage_id, psString *software_ver,
-                         psS64 *maskfrac_npix, psF32 *maskfrac_static, psF32 *maskfrac_dynamic,
-                         psF32 *maskfrac_magic, psF32 *maskfrac_advisory);
+                         psS64 *maskfrac_npix, psF32 *maskfrac_static, psF32 *maskfrac_dynamic,
+                         psF32 *maskfrac_magic, psF32 *maskfrac_advisory);
 bool pxSetRunSoftware(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
-                      psString software_ver);
+                      psString software_ver);
 bool pxSetRunMaskfrac(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
-                      psS64 maskfrac_npix, psF32 maskfrac_static, psF32 maskfrac_dynamic,
-                      psF32 maskfrac_magic, psF32 maskfrac_advisory);
+                      psS64 maskfrac_npix, psF32 maskfrac_static, psF32 maskfrac_dynamic,
+                      psF32 maskfrac_magic, psF32 maskfrac_advisory);
 bool pxCamSetRunMaskfrac(pxConfig *config, const psString tableName, const psString stage_id_name, const psS64 stage_id,
-                         psS64 maskfrac_ref_npix, psF32 maskfrac_ref_static, psF32 maskfrac_ref_dynamic,
-                         psF32 maskfrac_ref_magic, psF32 maskfrac_ref_advisory,
-                         psS64 maskfrac_max_npix, psF32 maskfrac_max_static, psF32 maskfrac_max_dynamic,
-                         psF32 maskfrac_max_magic, psF32 maskfrac_max_advisory);
-
-bool pxSetStateCleaned(const psString tableName, const psString columnName, psArray *rows);
+                         psS64 maskfrac_ref_npix, psF32 maskfrac_ref_static, psF32 maskfrac_ref_dynamic,
+                         psF32 maskfrac_ref_magic, psF32 maskfrac_ref_advisory,
+                         psS64 maskfrac_max_npix, psF32 maskfrac_max_static, psF32 maskfrac_max_dynamic,
+                         psF32 maskfrac_max_magic, psF32 maskfrac_max_advisory);
+
+bool pxSetStateCleaned(const char *tableName, const char *columnName, psArray *rows);
 bool pxAddLabelSearchArgs (pxConfig *config, psMetadata *where, char *field, char *name, char *op);
 

@@ -39 +39 @@
 warptool
 staticskytool
-
+bgtool
 diffphottool