Changeset 9832 for trunk/ppMerge/src/ppMergeOptions.c

Timestamp:

Nov 2, 2006, 12:30:06 PM (20 years ago)

Author:

Paul Price

Message:

Adding fringe combination.

File:

• trunk/ppMerge/src/ppMergeOptions.c (modified) (9 diffs)

trunk/ppMerge/src/ppMergeOptions.c

@@ -35 +35 @@
     options->scale = false;
     options->darktime = false;
+    options->fringe = false;
     options->shutter = false;
     options->sample = 1;
     options->mean = PS_STAT_SAMPLE_MEDIAN;
     options->stdev = PS_STAT_SAMPLE_STDEV;
+    options->fringeNum = 100;
+    options->fringeSize = 10;
+    options->fringeSmoothX = 5;
+    options->fringeSmoothY = 5;
     options->shutterSize = 10;
     options->shutterIter = 2;
@@ -122 +127 @@
 
     // First, deal with the recipe.  These are parameters that will typically be constant for a camera.
-    OPTION_PARSE(options->rows,              recipe, "ROWS",      U16 );
-    OPTION_PARSE(options->minElectrons,      recipe, "ELECTRONS", F32 );
-    OPTION_PARSE(options->sample,            recipe, "SAMPLE",    S32 );
-    OPTION_PARSE(options->combine->rej,      recipe, "REJ",       F32 );
-    OPTION_PARSE(options->combine->iter,     recipe, "ITER",      S32 );
-    OPTION_PARSE(options->combine->fracHigh, recipe, "FRACHIGH",  F32 );
-    OPTION_PARSE(options->combine->fracLow,  recipe, "FRACLOW",   F32 );
-    OPTION_PARSE(options->combine->nKeep,    recipe, "NKEEP",     S32 );
-    OPTION_PARSE(options->combine->maskVal,  recipe, "MASKVAL",   S32 );
-    OPTION_PARSE(options->shutterSize,       recipe, "SHUTTER.SIZE", S32 );
-    OPTION_PARSE(options->shutterIter,       recipe, "SHUTTER.ITER", S32 );
-    OPTION_PARSE(options->shutterRej,        recipe, "SHUTTER.REJECT", F32 );
+    OPTION_PARSE(options->rows,              recipe, "ROWS",           U16);
+    OPTION_PARSE(options->minElectrons,      recipe, "ELECTRONS",      F32);
+    OPTION_PARSE(options->sample,            recipe, "SAMPLE",         S32);
+    OPTION_PARSE(options->combine->rej,      recipe, "REJ",            F32);
+    OPTION_PARSE(options->combine->iter,     recipe, "ITER",           S32);
+    OPTION_PARSE(options->combine->fracHigh, recipe, "FRACHIGH",       F32);
+    OPTION_PARSE(options->combine->fracLow,  recipe, "FRACLOW",        F32);
+    OPTION_PARSE(options->combine->nKeep,    recipe, "NKEEP",          S32);
+    OPTION_PARSE(options->combine->maskVal,  recipe, "MASKVAL",        S32);
+    OPTION_PARSE(options->fringeNum,         recipe, "FRINGE.NUM",     S32);
+    OPTION_PARSE(options->fringeSize,        recipe, "FRINGE.SIZE",    S32);
+    OPTION_PARSE(options->fringeSmoothX,     recipe, "FRINGE.XSMOOTH", S32);
+    OPTION_PARSE(options->fringeSmoothY,     recipe, "FRINGE.YSMOOTH", S32);
+    OPTION_PARSE(options->shutterSize,       recipe, "SHUTTER.SIZE",   S32);
+    OPTION_PARSE(options->shutterIter,       recipe, "SHUTTER.ITER",   S32);
+    OPTION_PARSE(options->shutterRej,        recipe, "SHUTTER.REJECT", F32);
 
     options->combine->combine = parseStat(recipe, "COMBINE");
@@ -148 +157 @@
             options->scale = false;
             options->darktime = false;
+            options->fringe = false;
             options->shutter = false;
         } else if (strcasecmp(type, "DARK") == 0) {
@@ -153 +163 @@
             options->scale = false;
             options->darktime = true;
+            options->fringe = false;
             options->shutter = false;
         } else if (strcasecmp(type, "FLAT") == 0) {
@@ -158 +169 @@
             options->scale = true;
             options->darktime = false;
+            options->fringe = false;
             options->shutter = false;
         } else if (strcasecmp(type, "FRINGE") == 0) {
@@ -163 +175 @@
             options->scale = true;
             options->darktime = false;
+            options->fringe = true;
             options->shutter = false;
         } else if (strcasecmp(type, "SHUTTER") == 0) {
@@ -168 +181 @@
             options->scale = false;
             options->darktime = false;
+            options->fringe = false;
             options->shutter = true;
         } else {
@@ -174 +188 @@
             options->scale = false;
             options->darktime = false;
+            options->fringe = false;
             options->shutter = false;
         }
@@ -181 +196 @@
         options->scale = false;
         options->darktime = false;
+        options->fringe = false;
+        options->shutter = false;
     }