Changeset 12951 for branches/eam_02_branch/psModules/src/objects/pmModel.h

Timestamp:

Apr 21, 2007, 11:30:21 AM (19 years ago)

Author:

magnier

Message:

changed API for pmModelAdd

File:

• branches/eam_02_branch/psModules/src/objects/pmModel.h (modified) (4 diffs)

branches/eam_02_branch/psModules/src/objects/pmModel.h

@@ -5 +5 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.6.6.1 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-04-21 00:03:11 $
+ * @version $Revision: 1.6.6.2 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-04-21 21:30:21 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -26 +26 @@
     PM_MODEL_BADARGS   ///< model fit called with invalid args
 } pmModelStatus;
+
+typedef enum {
+    PM_MODEL_ADD_NONE   = 0x00,
+    PM_MODEL_ADD_FUNC   = 0x01,
+    PM_MODEL_ADD_RES0   = 0x02,
+    PM_MODEL_ADD_RES1   = 0x04,
+    PM_MODEL_ADD_FULL   = 0x07,
+    PM_MODEL_ADD_SKY    = 0x08,
+    PM_MODEL_ADD_CENTER = 0x10,
+    PM_MODEL_ADD_NORM   = 0x20,
+} pmModelAddMode;
 
 /** pmModel data structure
@@ -91 +102 @@
  */
 bool pmModelAdd(
-    psImage *image,   ///< The output image (float)
-    psImage *mask,   ///< The image pixel mask (valid == 0)
-    pmModel *model,   ///< The input pmModel
-    bool center,   ///< A boolean flag that determines whether pixels are centered
-    bool sky    ///< A boolean flag that determines if the sky is subtracted
+    psImage *image,                     ///< The output image (float)
+    psImage *mask,                      ///< The image pixel mask (valid == 0)
+    pmModel *model,                     ///< The input pmModel
+    pmModelAddMode mode              ///< mode to control how the model is added into the image
 );
-
 
 /** pmModelSub()
@@ -110 +119 @@
  */
 bool pmModelSub(
-    psImage *image,   ///< The output image (float)
-    psImage *mask,   ///< The image pixel mask (valid == 0)
-    pmModel *model,   ///< The input pmModel
-    bool center,   ///< A boolean flag that determines whether pixels are centered
-    bool sky    ///< A boolean flag that determines if the sky is subtracted
+    psImage *image,                     ///< The output image (float)
+    psImage *mask,                      ///< The image pixel mask (valid == 0)
+    pmModel *model,                     ///< The input pmModel
+    pmModelAddMode mode              ///< mode to control how the model is added into the image
 );