Changeset 4579 for trunk/psModules/src/pmObjects.c

Timestamp:

Jul 18, 2005, 3:44:48 PM (21 years ago)

Author:

drobbin

Message:

psModules now works with the reorganized version of psLib

File:

• trunk/psModules/src/pmObjects.c (modified) (9 diffs)

trunk/psModules/src/pmObjects.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-13 20:00:49 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-19 01:44:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -108 +108 @@
     }
 
-    psMemSetDeallocator(tmp, (psFreeFcn) modelFree);
+    psMemSetDeallocator(tmp, (psFreeFunc) modelFree);
     return(tmp);
 }
@@ -138 +138 @@
     tmp->models = NULL;
     tmp->type = 0;
-    psMemSetDeallocator(tmp, (psFreeFcn) sourceFree);
+    psMemSetDeallocator(tmp, (psFreeFunc) sourceFree);
 
     return(tmp);
@@ -1895 +1895 @@
     params->data.F32[6] = Sxy;
 *****************************************************************************/
-psF64 pmMinLM_Gauss2D(psVector *deriv,
-                      psVector *params,
-                      psVector *x)
+float pmMinLM_Gauss2D(
+    psVector *deriv,
+    const psVector *params,
+    const psVector *x)
 {
     PS_ASSERT_VECTOR_NON_NULL(params, NAN);
@@ -1931 +1932 @@
     params->data.F32[6] = Sxy;
 *****************************************************************************/
-psF64 pmMinLM_PsuedoGauss2D(psVector *deriv,
-                            psVector *params,
-                            psVector *x)
+float pmMinLM_PsuedoGauss2D(
+    psVector *deriv,
+    const psVector *params,
+    const psVector *x)
 {
     PS_ASSERT_VECTOR_NON_NULL(params, NAN);
@@ -1971 +1973 @@
     params->data.F32[8] = B3;
 *****************************************************************************/
-psF64 pmMinLM_Wauss2D(psVector *deriv,
-                      psVector *params,
-                      psVector *x)
+float pmMinLM_Wauss2D(
+    psVector *deriv,
+    const psVector *params,
+    const psVector *x)
 {
     PS_ASSERT_VECTOR_NON_NULL(params, NAN);
@@ -2019 +2022 @@
     params->data.F32[10] = N;
 *****************************************************************************/
-psF64 pmMinLM_TwistGauss2D(psVector *deriv,
-                           psVector *params,
-                           psVector *x)
+float pmMinLM_TwistGauss2D(
+    psVector *deriv,
+    const psVector *params,
+    const psVector *x)
 {
     PS_ASSERT_VECTOR_NON_NULL(params, NAN);
@@ -2077 +2081 @@
     params->data.F32[7] = Nexp;
 *****************************************************************************/
-psF64 pmMinLM_Sersic(psVector *deriv,
-                     psVector *params,
-                     psVector *x)
+float pmMinLM_Sersic(
+    psVector *deriv,
+    const psVector *params,
+    const psVector *x)
 {
     PS_ASSERT_VECTOR_NON_NULL(params, NAN);
@@ -2102 +2107 @@
     params->data.F32[11] = Nexp;
 *****************************************************************************/
-psF64 pmMinLM_SersicCore(psVector *deriv,
-                         psVector *params,
-                         psVector *x)
+float pmMinLM_SersicCore(
+    psVector *deriv,
+    const psVector *params,
+    const psVector *x)
 {
     PS_ASSERT_VECTOR_NON_NULL(params, NAN);