Changeset 13898 for trunk/psModules/src/objects/pmModel.h

Timestamp:

Jun 19, 2007, 4:22:26 PM (19 years ago)

Author:

Paul Price

Message:

Extensive changes to APIs to allow use of a nominated value to mask
against (the maskVal). Previously, the mask values were either
hard-coded (e.g., PM_MASK_SAT) or taken as anything non-zero. The
code is tested under psphot (which has similar changes) and does not
crash, but neither is it successful in marking all bad pixels (EAM
will investigate). For this reason, I have left the "gutter" pixels
(cell gaps) set to 0 instead of NAN in pmFPAMosaic.

File:

• trunk/psModules/src/objects/pmModel.h (modified) (5 diffs)

trunk/psModules/src/objects/pmModel.h

@@ -5 +5 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-06-13 23:41:51 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-20 02:22:26 $
  *
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 
 typedef enum {
-    PM_MODEL_OP_NONE    = 0x00,
-    PM_MODEL_OP_FUNC    = 0x01,
-    PM_MODEL_OP_RES0    = 0x02,
-    PM_MODEL_OP_RES1    = 0x04,
+    PM_MODEL_OP_NONE    = 0x00,
+    PM_MODEL_OP_FUNC    = 0x01,
+    PM_MODEL_OP_RES0    = 0x02,
+    PM_MODEL_OP_RES1    = 0x04,
     PM_MODEL_OP_FULL    = 0x07,
-    PM_MODEL_OP_SKY     = 0x08,
+    PM_MODEL_OP_SKY     = 0x08,
     PM_MODEL_OP_CENTER  = 0x10,
-    PM_MODEL_OP_NORM    = 0x20,
-    PM_MODEL_OP_NOISE   = 0x40,
+    PM_MODEL_OP_NORM    = 0x20,
+    PM_MODEL_OP_NOISE   = 0x40,
 } pmModelOpMode;
 
@@ -52 +52 @@
 typedef struct
 {
-    pmModelType type;                   ///< Model to be used.
-    psVector *params;                   ///< Paramater values.
-    psVector *dparams;                  ///< Parameter errors.
-    float chisq;                        ///< Fit chi-squared.
-    float chisqNorm;                    ///< re-normalized fit chi-squared.
-    int nDOF;                           ///< number of degrees of freedom
-    int nIter;                          ///< number of iterations to reach min
-    pmModelStatus flags;                ///< model status flags
-    float radiusFit;                    ///< fit radius actually used
-    pmResiduals *residuals;             ///< normalized PSF residuals 
+    pmModelType type;                   ///< Model to be used.
+    psVector *params;                   ///< Paramater values.
+    psVector *dparams;                  ///< Parameter errors.
+    float chisq;                        ///< Fit chi-squared.
+    float chisqNorm;                    ///< re-normalized fit chi-squared.
+    int nDOF;                           ///< number of degrees of freedom
+    int nIter;                          ///< number of iterations to reach min
+    pmModelStatus flags;                ///< model status flags
+    float radiusFit;                    ///< fit radius actually used
+    pmResiduals *residuals;             ///< normalized PSF residuals
 }
 pmModel;
@@ -105 +105 @@
  */
 bool pmModelAdd(
-    psImage *image,                     ///< The output image (float)
-    psImage *mask,                      ///< The image pixel mask (valid == 0)
-    pmModel *model,                     ///< The input pmModel
-    pmModelOpMode mode               ///< mode to control how the model is added into the image
+    psImage *image,                     ///< The output image (float)
+    psImage *mask,                      ///< The image pixel mask (valid == 0)
+    pmModel *model,                     ///< The input pmModel
+    pmModelOpMode mode,                 ///< mode to control how the model is added into the image
+    psMaskType maskVal                  ///< Value to mask
 );
 
@@ -122 +123 @@
  */
 bool pmModelSub(
-    psImage *image,                     ///< The output image (float)
-    psImage *mask,                      ///< The image pixel mask (valid == 0)
-    pmModel *model,                     ///< The input pmModel
-    pmModelOpMode mode               ///< mode to control how the model is added into the image
+    psImage *image,                     ///< The output image (float)
+    psImage *mask,                      ///< The image pixel mask (valid == 0)
+    pmModel *model,                     ///< The input pmModel
+    pmModelOpMode mode,                 ///< mode to control how the model is added into the image
+    psMaskType maskVal                  ///< Value to mask
 );