Changeset 14652 for trunk/psModules/src/objects/pmSource.h

Timestamp:

Aug 23, 2007, 2:11:02 PM (19 years ago)

Author:

magnier

Message:

• added function pointers to pmModel to provide class-dependent functions
• dropped pmModel*_GetFunction functions (use pmModel->func functions instead)
• added modelParamsFromPSF functions to model classes
• changed pmModelGroup to pmModelClass
• added pmSourceFitSet.[ch]
• updated pmSourceFitSet to allow variable model classes
• added functions to add/sub and eval models & sources with an offset between image and chip
• added function to set a pmModel flux
• added function to instatiate a pmModel from a pmPSF at a coordinate
• moved pmPSF I/O to chip->analysis from readout->analysis
• changed pmPSF I/O function names from *ForPSFmodel to pmPSFmodel*
• changed pmModel.params_NEW back to pmModel.params
• changed pmFind*Peaks to pmPeaksIn* (* = Image,Vector)
• dropped pmCullPeaks (deprecated)
• changed pmModelSetType to pmModelClassGetType
• changed pmModelGetType to pmModelClassGetName
• fixed PGAUSS implementation of modelRadius function

File:

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

trunk/psModules/src/objects/pmSource.h

@@ -3 +3 @@
  * @author EAM, IfA; GLG, MHPCC
  *
- * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-08-15 20:21:18 $
+ * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-08-24 00:11:02 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -57 +57 @@
  *
  */
-typedef struct
-{
+struct pmSource {
     const int id;                       ///< Unique ID for object
     pmPeak *peak;                       ///< Description of peak pixel.
@@ -81 +80 @@
     psRegion region;                    ///< area on image covered by selected pixels
     float sky, skyErr;                  ///< The sky and its error at the center of the object
-}
-pmSource;
+};
 
 /** pmPSFClump data structure
@@ -114 +112 @@
 void pmSourceFreePixels(pmSource *source);
 
-bool pmIsSource(const psPtr ptr);
+bool pmSourceTest(const psPtr ptr);
 
 /** pmSourceDefinePixels()
@@ -218 +216 @@
 bool pmSourceAdd (pmSource *source, pmModelOpMode mode, psMaskType maskVal);
 bool pmSourceSub (pmSource *source, pmModelOpMode mode, psMaskType maskVal);
-
-bool pmSourceOp (pmSource *source, pmModelOpMode mode, bool add, psMaskType maskVal);
+bool pmSourceAddWithOffset (pmSource *source, pmModelOpMode mode, psMaskType maskVal, int dx, int dy);
+bool pmSourceSubWithOffset (pmSource *source, pmModelOpMode mode, psMaskType maskVal, int dx, int dy);
+
+bool pmSourceOp (pmSource *source, pmModelOpMode mode, bool add, psMaskType maskVal, int dx, int dy);
 bool pmSourceCacheModel (pmSource *source, psMaskType maskVal);
 bool pmSourceCachePSF (pmSource *source, psMaskType maskVal);