Changeset 14655 for trunk/psphot/src/psphotRadiusChecks.c

Timestamp:

Aug 23, 2007, 2:40:16 PM (19 years ago)

Author:

eugene

Message:

* updates from branch eam_branch_20070817

• changed pmIsFoo to pmFooTest
• changed pmModelGroup to pmModelClass
• added offsets to pmSourceOp
• changed pmModel.params_NEW to pmModel.params
• use new APIs to define a pmModel from a pmPSF at X,Y (pmModelFromPSFforXY)
• use pmModel member functions instead of _GetFunction functions
• added modelParamsFromPSF for STRAIL and TEST1
• move output psf model from readout->analysis to chip->analysis

File:

• trunk/psphot/src/psphotRadiusChecks.c (modified) (7 diffs)

trunk/psphot/src/psphotRadiusChecks.c

@@ -6 +6 @@
 static float PSF_FIT_RADIUS = 0;        // radius to use in fitting (ignored if <= 0,
                                         // and a per-object radius is calculated)
-static pmModelRadius modelRadiusPSF;
 
 bool psphotInitRadiusPSF(const psMetadata *recipe,
@@ -17 +16 @@
     PSF_FIT_RADIUS =  psMetadataLookupF32(&status, recipe, "PSF_FIT_RADIUS");
 
-    // this function specifies the radius at this the model hits the given flux
-    modelRadiusPSF       = pmModelRadius_GetFunction (type);
     return true;
 }
@@ -34 +31 @@
     if (radiusFit <= 0) {               // use fixed radius
         if (moments == NULL) {
-            radiusFit = modelRadiusPSF(model->params, PSF_FIT_NSIGMA*moments->dSky);
+            radiusFit = model->modelRadius(model->params, PSF_FIT_NSIGMA*moments->dSky);
         } else {
-            radiusFit = modelRadiusPSF(model->params, 1.0);
+            radiusFit = model->modelRadius(model->params, 1.0);
         }
     }
@@ -62 +59 @@
 
     // set the fit radius based on the object flux limit and the model
-    model->radiusFit = (RADIUS_TYPE) (modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + dR + PSF_FIT_PADDING);
+    model->radiusFit = (RADIUS_TYPE) (model->modelRadius (model->params, PSF_FIT_NSIGMA*moments->dSky) + dR + PSF_FIT_PADDING);
     if (isnan(model->radiusFit)) psAbort("error in radius");
         
@@ -78 +75 @@
 static float EXT_FIT_NSIGMA;
 static float EXT_FIT_PADDING;
-static pmModelRadius modelRadiusEXT;
 
 bool psphotInitRadiusEXT (psMetadata *recipe, pmModelType type) {
@@ -87 +83 @@
     EXT_FIT_PADDING  = psMetadataLookupF32 (&status, recipe, "EXT_FIT_PADDING");
 
-    // this function specifies the radius at this the model hits the given flux
-    modelRadiusEXT       = pmModelRadius_GetFunction (type);
     return true;
 }
@@ -101 +95 @@
 
     // set the fit radius based on the object flux limit and the model
-    model->radiusFit = (RADIUS_TYPE) (modelRadiusEXT (model->params, EXT_FIT_NSIGMA*moments->dSky) + EXT_FIT_PADDING);
+    model->radiusFit = (RADIUS_TYPE) (model->modelRadius (model->params, EXT_FIT_NSIGMA*moments->dSky) + EXT_FIT_PADDING);
     if (isnan(model->radiusFit)) psAbort("error in radius");