Changeset 4949 for trunk/psphot/src/pspsf.c

Timestamp:

Sep 5, 2005, 8:44:00 PM (21 years ago)

Author:

eugene

Message:

adding pmObjects stuff

File:

• trunk/psphot/src/pspsf.c (modified) (9 diffs)

trunk/psphot/src/pspsf.c

@@ -10 +10 @@
 
 // a PSF always has 4 parameters fewer than the equivalent model
-pmPSF *pmPSFAlloc (psModelType type) {
+pmPSF *pmPSFAlloc (pmModelType type) {
 
     int Nparams;
@@ -19 +19 @@
     psf->chisq = 0.0;
 
-    Nparams = psModelParameterCount (type);
+    Nparams = pmModelParameterCount (type);
     if (!Nparams) {
-        psError(PS_ERR_UNKNOWN, true, "Undefined psModelType");
+        psError(PS_ERR_UNKNOWN, true, "Undefined pmModelType");
         return(NULL);
     }      
@@ -54 +54 @@
 
     // XXX probably need to increment ref counter
-    test->modelType   = psModelSetType (modelName);
+    test->modelType   = pmModelSetType (modelName);
     test->psf         = pmPSFAlloc (test->modelType);
     test->sources     = psMemCopy(sources);
@@ -99 +99 @@
     for (int i = 0; i < test->sources->n; i++) {
 
-        psSource *source = test->sources->data[i];
-        psModel  *model  = pmSourceModelGuess (source, test->modelType); 
+        pmSource *source = test->sources->data[i];
+        pmModel  *model  = pmSourceModelGuess (source, test->modelType); 
         x = source->peak->x;
         y = source->peak->y;
@@ -134 +134 @@
         if (test->mask->data.U8[i]) continue;
 
-        psSource *source = test->sources->data[i];
-        psModel  *modelFLT = test->modelFLT->data[i];
+        pmSource *source = test->sources->data[i];
+        pmModel  *modelFLT = test->modelFLT->data[i];
 
         // set shape for this model based on PSF
-        psModel *modelPSF = psModelFromPSF (modelFLT, test->psf); 
+        pmModel *modelPSF = pmModelFromPSF (modelFLT, test->psf); 
         x = source->peak->x;
         y = source->peak->y;
@@ -185 +185 @@
 }
 
-// input: an array of psModels, pre-allocated psf
+// input: an array of pmModels, pre-allocated psf
 // some of the array entries may be NULL, ignore them
 bool pmPSFFromModels (pmPSF *psf, psArray *models, psVector *mask) {
@@ -197 +197 @@
 
     for (int i = 0; i < models->n; i++) {
-        psModel *model = models->data[i];
+        pmModel *model = models->data[i];
         if (model == NULL) continue;
 
@@ -211 +211 @@
     for (int i = 0; i < psf->params->n; i++) {
         for (int j = 0; j < models->n; j++) {
-            psModel *model = models->data[j];
+            pmModel *model = models->data[j];
             if (model == NULL) continue;
             z->data.F64[j] = model->params->data.F32[i + 4];
@@ -231 +231 @@
 }
 
-psModel *psModelFromPSF (psModel *modelFLT, pmPSF *psf) {
+pmModel *pmModelFromPSF (pmModel *modelFLT, pmPSF *psf) {
 
     // need to define the relationship between the modelFLT and modelPSF ?
     
     // find function used to set the model parameters
-    psModelFromPSFFunc modelFromPSFFunc = psModelFromPSFFunc_GetFunction (psf->type);
+    pmModelFromPSFFunc modelFromPSFFunc = pmModelFromPSFFunc_GetFunction (psf->type);
 
     // do we need a different model for the PSF vs FLT version?
-    psModel *modelPSF = psModelAlloc (psf->type);
+    pmModel *modelPSF = pmModelAlloc (psf->type);
 
     // set model parameters for this source based on PSF information