Changeset 23268 for trunk/psModules/src/detrend/pmDetrendDB.c

Timestamp:

Mar 11, 2009, 10:54:22 AM (17 years ago)

Author:

Paul Price

Message:

Adding functionality of reading input files from the configuration dump. This is principally used for ensuring we apply the same detrend images with ppImage that we used originally. Applying this framework to ppImage. Will soon apply to other products. Reworked the pmFPAfileDefineFrom* functions to use common code; I think it still works.

File:

• trunk/psModules/src/detrend/pmDetrendDB.c (modified) (6 diffs)

trunk/psModules/src/detrend/pmDetrendDB.c

@@ -20 +20 @@
 
 //
-static void pmDetrendSelectOptionsFree (pmDetrendSelectOptions *options)
-{
-
-    if (!options)
+static void pmDetrendSelectOptionsFree(pmDetrendSelectOptions *options)
+{
+
+    if (!options) {
         return;
-
-    psFree (options->camera);
-    psFree (options->filter);
-    psFree (options->dettype);
-    psFree (options->version);
+    }
+
+    psFree(options->camera);
+    psFree(options->filter);
+    psFree(options->dettype);
+    psFree(options->version);
 
     return;
@@ -37 +38 @@
 pmDetrendSelectOptions *pmDetrendSelectOptionsAlloc(const char *camera, psTime time, pmDetrendType type)
 {
-
     pmDetrendSelectOptions *options = psAlloc(sizeof(pmDetrendSelectOptions));
     psMemSetDeallocator(options, (psFreeFunc) pmDetrendSelectOptionsFree);
@@ -63 +63 @@
 }
 
-static void pmDetrendSelectResultsFree (pmDetrendSelectResults *results)
-{
-
-    if (!results)
+static void pmDetrendSelectResultsFree(pmDetrendSelectResults *results)
+{
+
+    if (!results) {
         return;
-
-    psFree (results->detID);
+    }
+
+    psFree(results->detID);
     psFree(results->level);
 
@@ -75 +76 @@
 }
 
-pmDetrendSelectResults *pmDetrendSelectResultsAlloc ()
+pmDetrendSelectResults *pmDetrendSelectResultsAlloc(void)
 {
 
@@ -87 +88 @@
 }
 
-psString pmDetrendTypeToString (pmDetrendType type)
-{
-
-    # define DETREND_STRING_CASE(TTT) \
-case PM_DETREND_TYPE_##TTT: \
-    return psStringCopy (#TTT);
+psString pmDetrendTypeToString(pmDetrendType type)
+{
+
+#define DETREND_STRING_CASE(TYPE) \
+  case PM_DETREND_TYPE_##TYPE: \
+    return psStringCopy(#TYPE);
 
     switch (type) {
-        DETREND_STRING_CASE (MASK);
-        DETREND_STRING_CASE (BIAS);
-        DETREND_STRING_CASE (DARK);
-        DETREND_STRING_CASE (FLAT);
-        DETREND_STRING_CASE (FLATCORR);
-        DETREND_STRING_CASE (SHUTTER);
-        DETREND_STRING_CASE (FRINGE);
-        DETREND_STRING_CASE (ASTROM);
+        DETREND_STRING_CASE(NONE);
+        DETREND_STRING_CASE(MASK);
+        DETREND_STRING_CASE(BIAS);
+        DETREND_STRING_CASE(DARK);
+        DETREND_STRING_CASE(FLAT);
+        DETREND_STRING_CASE(FLATCORR);
+        DETREND_STRING_CASE(SHUTTER);
+        DETREND_STRING_CASE(FRINGE);
+        DETREND_STRING_CASE(ASTROM);
     default:
         return NULL;
@@ -111 +113 @@
 // detselect -camera (camera) -time (time) -type (type) [others]
 // returns: (type) (class) (exp_flag) DONE
-pmDetrendSelectResults *pmDetrendSelect (const pmDetrendSelectOptions *options,
-        const pmConfig *config)
+pmDetrendSelectResults *pmDetrendSelect(const pmDetrendSelectOptions *options, const pmConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(options, NULL);