Changeset 15843 for trunk/psModules/src/objects

Timestamp:

Dec 14, 2007, 3:24:38 PM (19 years ago)

Author:

Paul Price

Message:

Adding const in some appropriate places.

Location:

trunk/psModules/src/objects

Files:

• pmModel.h (modified) (3 diffs)
• pmModelUtils.c (modified) (3 diffs)
• pmModelUtils.h (modified) (2 diffs)

trunk/psModules/src/objects/pmModel.h

@@ -5 +5 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-11-10 01:09:20 $
+ * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-12-15 01:21:33 $
  *
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63 +63 @@
 //  This function constructs the PSF model for the given source based on the
 //  supplied psf and the EXT model for the object.
-typedef bool (*pmModelFromPSFFunc)(pmModel *modelPSF, pmModel *modelEXT, pmPSF *psf);
+typedef bool (*pmModelFromPSFFunc)(pmModel *modelPSF, pmModel *modelEXT, const pmPSF *psf);
 
 //  This function sets the model parameters based on the PSF for a given coordinate and central
 //  intensity
-typedef bool (*pmModelParamsFromPSF)(pmModel *model, pmPSF *psf, float Xo, float Yo, float Io);
+typedef bool (*pmModelParamsFromPSF)(pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io);
 
 //  This function returns the success / failure status of the given model fit
@@ -166 +166 @@
 
 bool pmModelAddWithOffset(psImage *image,
-                          psImage *mask,
-                          pmModel *model,
-                          pmModelOpMode mode,
-                          psMaskType maskVal,
-                          int dx,
-                          int dy);
+                          psImage *mask,
+                          pmModel *model,
+                          pmModelOpMode mode,
+                          psMaskType maskVal,
+                          int dx,
+                          int dy);
 
 bool pmModelSubWithOffset(psImage *image,
-                          psImage *mask,
-                          pmModel *model,
-                          pmModelOpMode mode,
-                          psMaskType maskVal,
-                          int dx,
-                          int dy);
+                          psImage *mask,
+                          pmModel *model,
+                          pmModelOpMode mode,
+                          psMaskType maskVal,
+                          int dx,
+                          int dy);
 
 /** pmModelFitStatus()

trunk/psModules/src/objects/pmModelUtils.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-10 01:09:20 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-12-15 01:22:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 construct a realization of the PSF model at the object coordinates
  *****************************************************************************/
-pmModel *pmModelFromPSF (pmModel *modelEXT, pmPSF *psf)
+pmModel *pmModelFromPSF (pmModel *modelEXT, const pmPSF *psf)
 {
     PS_ASSERT_PTR_NON_NULL(psf, NULL);
@@ -56 +56 @@
 // instantiate a model for the PSF at this location with peak flux
 // NOTE: psf and (Xo,Yo) are defined wrt chip coordinates
-pmModel *pmModelFromPSFforXY (pmPSF *psf, float Xo, float Yo, float Io)
+pmModel *pmModelFromPSFforXY (const pmPSF *psf, float Xo, float Yo, float Io)
 {
     PS_ASSERT_PTR_NON_NULL(psf, NULL);

trunk/psModules/src/objects/pmModelUtils.h

@@ -5 +5 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-08-24 00:11:02 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-12-15 01:22:11 $
  * Copyright 2007 IfA, University of Hawaii
  */
@@ -27 +27 @@
 pmModel *pmModelFromPSF(
     pmModel *model,                     ///< Add comment
-    pmPSF *psf                          ///< Add comment
+    const pmPSF *psf                    ///< Add comment
 );
 
 pmModel *pmModelFromPSFforXY (
-    pmPSF *psf, 
-    float Xo, 
-    float Yo, 
+    const pmPSF *psf,
+    float Xo,
+    float Yo,
     float Io
     );
 
 bool pmModelSetFlux (
-    pmModel *model, 
+    pmModel *model,
     float flux
     );