Changeset 6056 for trunk/psphot/src/psphotSourceFits.c

Timestamp:

Jan 19, 2006, 2:55:33 PM (21 years ago)

Author:

eugene

Message:

adapted everything to work with pmReadout *readout instead of eamReadout *imdata

File:

• trunk/psphot/src/psphotSourceFits.c (modified) (11 diffs)

trunk/psphot/src/psphotSourceFits.c

@@ -4 +4 @@
 // given a source with an existing modelPSF, attempt a full PSF fit, subtract if successful
 
-bool psphotFitPSF (eamReadout *imdata, pmSource *source) { 
+bool psphotFitPSF (pmReadout *readout, pmSource *source) { 
 
     float x, y;
@@ -12 +12 @@
 
     // extend source radius as needed
-    psphotCheckRadiusPSF (imdata, source, PSF);
+    psphotCheckRadiusPSF (readout, source, PSF);
 
     x = PSF->params->data.F32[2];
@@ -61 +61 @@
 }
 
-bool psphotFitBlob (eamReadout *imdata, pmSource *source, psArray *sources) { 
+bool psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources) { 
 
     bool okEXT, okDBL;
@@ -79 +79 @@
     pmSource *tmpSrc = pmSourceAlloc ();
 
-    pmModel *EXT = psphotFitEXT (imdata, source);
+    pmModel *EXT = psphotFitEXT (readout, source);
     okEXT = psphotEvalEXT (tmpSrc, EXT);
     chiEXT = EXT->chisq / EXT->nDOF;
 
-    psArray *DBL = psphotFitDBL (imdata, source);
+    psArray *DBL = psphotFitDBL (readout, source);
     okDBL  = psphotEvalDBL (tmpSrc, DBL->data[0]);
     okDBL &= psphotEvalDBL (tmpSrc, DBL->data[1]);
@@ -129 +129 @@
 
 // fit a double PSF source to an extended blob
-psArray *psphotFitDBL (eamReadout *imdata, pmSource *source) { 
+psArray *psphotFitDBL (pmReadout *readout, pmSource *source) { 
 
     float x, y, dx, dy;
@@ -149 +149 @@
     // save the PSF model from the Ensemble fit
     PSF = source->modelPSF;
-    psphotCheckRadiusPSF (imdata, source, PSF);
+    psphotCheckRadiusPSF (readout, source, PSF);
 
     modelSet = psArrayAlloc (2);
@@ -176 +176 @@
 }
 
-pmModel *psphotFitEXT (eamReadout *imdata, pmSource *source) { 
+pmModel *psphotFitEXT (pmReadout *readout, pmSource *source) { 
 
     float x, y;
@@ -183 +183 @@
     pmModel *EXT = pmSourceModelGuess (source, modelTypeEXT); 
 
-    psphotCheckRadiusEXT (imdata, source, EXT);
+    psphotCheckRadiusEXT (readout, source, EXT);
 
     x = EXT->params->data.F32[2];
@@ -196 +196 @@
 }
 
-bool psphotFitBlend (eamReadout *imdata, pmSource *source) { 
+bool psphotFitBlend (pmReadout *readout, pmSource *source) { 
 
     float x, y, dR;
@@ -202 +202 @@
     // if this source is not a possible blend, just fit as PSF
     if ((source->blends == NULL) || (source->mode & PM_SOURCE_SATSTAR)) {
-        bool status = psphotFitPSF (imdata, source);
+        bool status = psphotFitPSF (readout, source);
         return status;
     }
@@ -212 +212 @@
 
     // extend source radius as needed
-    psphotCheckRadiusPSF (imdata, source, PSF);
+    psphotCheckRadiusPSF (readout, source, PSF);
 
     x = PSF->params->data.F32[2];