Changeset 14619 for branches/eam_branch_20070817/psphot/src/models/pmModel_STRAIL.c

Timestamp:

Aug 22, 2007, 3:09:08 PM (19 years ago)

Author:

eugene

Message:

update to pmModel apis: no longer need void * types in embedded functions

File:

• branches/eam_branch_20070817/psphot/src/models/pmModel_STRAIL.c (modified) (7 diffs)

branches/eam_branch_20070817/psphot/src/models/pmModel_STRAIL.c

@@ -475 +475 @@
  
 //fixed I think...no good way of guessing as far as I can tell 
-bool PM_MODEL_GUESS (void *inModel, void *inSource)
+bool PM_MODEL_GUESS (pmModel *model, pmSource *source)
 { 
-    pmModel *model = inModel;
-    pmSource *source = inSource;
-
     pmMoments *Smoments = source->moments; 
     psF32     *params  = model->params->data.F32; 
@@ -520 +517 @@
  
 //fixed 
-bool PM_MODEL_FROM_PSF (void *inModelPSF, void *inModelFLT, void *inPSF)
+bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, pmPSF *psf)
 {
-    pmModel *modelPSF = inModelPSF;
-    pmModel *modelFLT = inModelFLT;
-    pmPSF *psf = inPSF;
- 
     psF32 *out = modelPSF->params->data.F32; 
     psF32 *in  = modelFLT->params->data.F32; 
@@ -537 +530 @@
  
     for (int i = 4; i < 7; i++) { 
-      psPolynomial2D *poly = psf->params_NEW->data[i-4]; 
+      psPolynomial2D *poly = psf->params->data[i-4]; 
         out[i] = psPolynomial2DEval (poly, out[2], out[3]); 
     } 
@@ -545 +538 @@
 // construct the PSF model from the FLT model and the psf
 // XXX is this sufficiently general do be a global function, not a pmModelClass function?
-bool PM_MODEL_PARAMS_FROM_PSF (void *inModel, void *inPSF, float Xo, float Yo, float Io)
+bool PM_MODEL_PARAMS_FROM_PSF (pmModel *model, pmPSF *psf, float Xo, float Yo, float Io)
 {
-    pmModel *model = inModel;
-    pmPSF *psf = inPSF;
-
     psF32 *PAR = model->params->data.F32;
 
     // we require these two parameters to exist
-    assert (psf->params_NEW->n > PM_PAR_YPOS);
-    assert (psf->params_NEW->n > PM_PAR_XPOS);
+    assert (psf->params->n > PM_PAR_YPOS);
+    assert (psf->params->n > PM_PAR_XPOS);
 
     PAR[PM_PAR_SKY]  = 0.0;
@@ -562 +552 @@
     
     // supply the model-fitted parameters, or copy from the input
-    for (int i = 0; i < psf->params_NEW->n; i++) {
+    for (int i = 0; i < psf->params->n; i++) {
         if (i == PM_PAR_SKY) continue;
-        psPolynomial2D *poly = psf->params_NEW->data[i];
+        psPolynomial2D *poly = psf->params->data[i];
         assert (poly);
         PAR[i] = psPolynomial2DEval(poly, Xo, Yo);
@@ -579 +569 @@
     // apply the model limits here: this truncates excessive extrapolation
     // XXX do we need to do this still?  should we put in asserts to test?
-    for (int i = 0; i < psf->params_NEW->n; i++) {
+    for (int i = 0; i < psf->params->n; i++) {
         // apply the limits to all components or just the psf-model parameters?
-        if (psf->params_NEW->data[i] == NULL)
+        if (psf->params->data[i] == NULL)
             continue;
 
@@ -596 +586 @@
 
 //done I think 
-bool PM_MODEL_FIT_STATUS (void *inModel)
+bool PM_MODEL_FIT_STATUS (pmModel *model)
 {
-    pmModel *model = inModel;
- 
     psF32 dP; 
     bool  status;