Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/ppMerge/src

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppMerge/src/Makefile.am (modified) (1 diff)
• ppMerge/src/ppMerge.c (modified) (1 diff)
• ppMerge/src/ppMerge.h (modified) (1 diff)
• ppMerge/src/ppMergeArguments.c (modified) (3 diffs)
• ppMerge/src/ppMergeCamera.c (modified) (1 diff)
• ppMerge/src/ppMergeFiles.c (modified) (1 diff)
• ppMerge/src/ppMergeLoop.c (copied) (copied from trunk/ppMerge/src/ppMergeLoop.c )
• ppMerge/src/ppMergeLoop_Threaded.c (deleted)
• ppMerge/src/ppMergeScaleZero.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/Makefile.am

@@ -21 +21 @@
         ppMergeFileGroup.c      \
         ppMergeReadChunk.c      \
-        ppMergeLoop_Threaded.c  \
+        ppMergeLoop.c           \
         ppMergeSetThreads.c     \
         ppMergeMask.c           \

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMerge.c

@@ -55 +55 @@
       case PPMERGE_TYPE_FLAT:
       case PPMERGE_TYPE_FRINGE:
+      case PPMERGE_TYPE_CTEMASK:
         if (!ppMergeScaleZero(config)) {
             psErrorStackPrint(stderr, "Error getting scale and zero-points.");

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMerge.h

@@ -40 +40 @@
     PPMERGE_TYPE_DARK,                  ///< (Multi-)Dark frame
     PPMERGE_TYPE_MASK,                  ///< Mask frame
+    PPMERGE_TYPE_CTEMASK,               ///< CTE Mask based on flat variance
     PPMERGE_TYPE_SHUTTER,               ///< Shutter frame
     PPMERGE_TYPE_FLAT,                  ///< Flat-field frame (dome or sky)

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeArguments.c

@@ -170 +170 @@
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-fringe-ysmooth", 0, "Number of smoothing regions in y", 0);
 
+    /** CTEMASK construction parameters */
+    psMetadataAddF32(arguments, PS_LIST_TAIL, "-cte-min", 0, "min allowed value for good CTE", NAN);
+
     /** Shutter construction parameters */
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-shutter-size", 0, "Size for shutter measurement regions", 0);
@@ -268 +271 @@
       goto VALID;
     }
+    if (strcasecmp(typeStr, "CTEMASK") == 0) {
+      type = PPMERGE_TYPE_CTEMASK;
+      goto VALID;
+    }
     if (strcasecmp(typeStr, "MASK") == 0 ||
         strcasecmp(typeStr, "DARKMASK") == 0 ||
@@ -314 +321 @@
     VALUE_ARG_RECIPE_INT("-fringe-xsmooth", "FRINGE.XSMOOTH", S32, 0);
     VALUE_ARG_RECIPE_INT("-fringe-ysmooth", "FRINGE.YSMOOTH", S32, 0);
+
+    /** CTEMASK construction parameters */
+    VALUE_ARG_RECIPE_FLOAT("-cte-min",      "CTE.MIN",        F32);
 
     /** Shutter construction parameters */

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeCamera.c

@@ -326 +326 @@
         fileType = PM_FPA_FILE_MASK;
         break;
+      case PPMERGE_TYPE_CTEMASK:
+        fileType = PM_FPA_FILE_MASK;
+        break;
       case PPMERGE_TYPE_SHUTTER:
         fileType = PM_FPA_FILE_IMAGE;

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeFiles.c

@@ -209 +209 @@
         outSuffix = "MASK";
         break;
+      case PPMERGE_TYPE_CTEMASK:
+        outSuffix = "MASK";
+        break;
       case PPMERGE_TYPE_SHUTTER:
         outSuffix = "SHUTTER";

branches/cnb_branches/cnb_branch_20090301/ppMerge/src/ppMergeScaleZero.c

@@ -35 +35 @@
       case PPMERGE_TYPE_BIAS:
       case PPMERGE_TYPE_DARK:
+      case PPMERGE_TYPE_CTEMASK:
         // Nothing to measure
         return true;