Changeset 36863

Timestamp:

Jun 13, 2014, 8:52:06 AM (12 years ago)

Author:

eugene

Message:

call model->class->function instead of model->function

Location:

trunk/psphot/src

Files:

• psphotChoosePSF.c (modified) (1 diff)
• psphotEfficiency.c (modified) (2 diffs)
• psphotEvalFLT.c (modified) (1 diff)
• psphotGalaxyShape.c (modified) (1 diff)
• psphotMakeFluxScale.c (modified) (1 diff)
• psphotRadiusChecks.c (modified) (3 diffs)
• psphotSersicModelClass.c (modified) (1 diff)
• psphotSourceFits.c (modified) (3 diffs)
• psphotVisual.c (modified) (1 diff)

trunk/psphot/src/psphotChoosePSF.c

@@ -448 +448 @@
 
             // get the model full-width at half-max
-            float FWHM_MAJOR = 2*modelPSF->modelRadius (modelPSF->params, 0.5);
+            float FWHM_MAJOR = 2*modelPSF->class->modelRadius (modelPSF->params, 0.5);
 
             // XXX make sure this is consistent with the re-definition of PM_PAR_SXX

trunk/psphot/src/psphotEfficiency.c

@@ -71 +71 @@
                 continue;
             }
-            float flux = normModel->modelFlux(normModel->params); // Total flux for peak of 1.0
+            float flux = normModel->class->modelFlux(normModel->params); // Total flux for peak of 1.0
             psFree(normModel);
             if (!isfinite(flux)) {
@@ -424 +424 @@
                     continue;
                 }
-                float sourceRadius = PS_MAX(radius, model->modelRadius(model->params, minFlux)); // Radius for source
+                float sourceRadius = PS_MAX(radius, model->class->modelRadius(model->params, minFlux)); // Radius for source
                 psFree(model);
                 if (!isfinite(sourceRadius)) {

trunk/psphot/src/psphotEvalFLT.c

@@ -53 +53 @@
     } 
 
-    keep = model->modelFitStatus(model);
+    keep = model->class->modelFitStatus(model);
     if (keep) return true;
 

trunk/psphot/src/psphotGalaxyShape.c

@@ -400 +400 @@
 
     pcm->modelConv->params->data.F32[PM_PAR_I0] = Io;
-    float flux = pcm->modelConv->modelFlux (pcm->modelConv->params);
+    float flux = pcm->modelConv->class->modelFlux (pcm->modelConv->params);
     float dflux = flux * (dIo / Io);
 

trunk/psphot/src/psphotMakeFluxScale.c

@@ -38 +38 @@
             } else {
                 // measure the fitMag for this model
-                fitSum = model->modelFlux (model->params);
+                fitSum = model->class->modelFlux (model->params);
             }
             if (fitSum < 1.e-6) continue;

trunk/psphot/src/psphotRadiusChecks.c

@@ -60 +60 @@
     if (radiusFit <= 0) {               // use fixed radius
         if (moments == NULL) {
-            radiusFit = model->modelRadius(model->params, PSF_FIT_NSIGMA*moments->dSky);
+            radiusFit = model->class->modelRadius(model->params, PSF_FIT_NSIGMA*moments->dSky);
         } else {
-            radiusFit = model->modelRadius(model->params, 1.0);
+            radiusFit = model->class->modelRadius(model->params, 1.0);
         }
         model->fitRadius = (RADIUS_TYPE)(radiusFit + PSF_FIT_PADDING);
@@ -95 +95 @@
     if (radiusFit <= 0) {               // use fixed radius
         if (moments == NULL) {
-            radiusFit = model->modelRadius(model->params, PSF_FIT_NSIGMA*moments->dSky);
+            radiusFit = model->class->modelRadius(model->params, PSF_FIT_NSIGMA*moments->dSky);
         } else {
-            radiusFit = model->modelRadius(model->params, 1.0);
+            radiusFit = model->class->modelRadius(model->params, 1.0);
         }
         model->fitRadius = (RADIUS_TYPE)(radiusFit + PSF_FIT_PADDING);
@@ -294 +294 @@
     float flux = deep ? EXT_FIT_NSIGMA*EXT_FIT_SKY_SIG : 0.1 * model->params->data.F32[PM_PAR_I0];
 
-    float rawRadius = model->modelRadius (model->params, flux);
+    float rawRadius = model->class->modelRadius (model->params, flux);
     if (isnan(rawRadius)) return false;
 

trunk/psphot/src/psphotSersicModelClass.c

@@ -586 +586 @@
             coord->data.F32[1] = (psF32) (i + source->pixels->row0);
 
-            pcm->modelConvFlux->data.F32[i][j] = pcm->modelConv->modelFunc (NULL, params, coord);
+            pcm->modelConvFlux->data.F32[i][j] = pcm->modelConv->class->modelFunc (NULL, params, coord);
         }
     }

trunk/psphot/src/psphotSourceFits.c

@@ -700 +700 @@
         model->params->data.F32[PM_PAR_7] = 0.5/indexGuess[i];
 
-        if (!model->modelGuess(model, source, maskVal, markVal)) {
+        if (!model->class->modelGuess(model, source, maskVal, markVal)) {
             model->flags |= PM_MODEL_STATUS_BADARGS;
             return false;
@@ -723 +723 @@
     model->flags = PM_MODEL_STATUS_NONE; // do not attempt to handle failures here, let the next iteration deal with it
     model->params->data.F32[PM_PAR_7] = 0.5/indexGuess[iMin];
-    model->modelGuess(model, source, maskVal, markVal);
+    model->class->modelGuess(model, source, maskVal, markVal);
 
     return true;
@@ -752 +752 @@
         model->params->data.F32[PM_PAR_7] = indexGuess[i];
         
-        if (!model->modelGuess(model, source, maskVal, markVal)) {
+        if (!model->class->modelGuess(model, source, maskVal, markVal)) {
             model->flags |= PM_MODEL_STATUS_BADARGS;
             return false;

trunk/psphot/src/psphotVisual.c

@@ -1444 +1444 @@
             coord->data.F32[1] = r;
             coord->data.F32[0] = 0.0;
-            fmaj->data.F32[i] = log10(source->modelPSF->modelFunc (NULL, params, coord));
+            fmaj->data.F32[i] = log10(source->modelPSF->class->modelFunc (NULL, params, coord));
 
             coord->data.F32[0] = r;
             coord->data.F32[1] = 0.0;
-            fmin->data.F32[i] = log10(source->modelPSF->modelFunc (NULL, params, coord));
+            fmin->data.F32[i] = log10(source->modelPSF->class->modelFunc (NULL, params, coord));
         }
         psFree (coord);
         psFree (params);
 
-        float FWHM_MAJOR = 2.0*source->modelPSF->modelRadius (source->modelPSF->params, 0.5*source->modelPSF->params->data.F32[PM_PAR_I0]);
+        float FWHM_MAJOR = 2.0*source->modelPSF->class->modelRadius (source->modelPSF->params, 0.5*source->modelPSF->params->data.F32[PM_PAR_I0]);
         float FWHM_MINOR = FWHM_MAJOR * (axes.minor / axes.major);
         if (FWHM_MAJOR < FWHM_MINOR) PS_SWAP (FWHM_MAJOR, FWHM_MINOR);