Changeset 21381

Timestamp:

Feb 6, 2009, 10:54:14 AM (17 years ago)

Author:

eugene

Message:

some comments re threading and malloc hits

Location:

trunk

Files:

• psModules/src/objects/pmModel.c (modified) (2 diffs)
• psphot/src/psphotGuessModels.c (modified) (2 diffs)

trunk/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-01-27 06:39:38 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-06 20:54:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -167 +167 @@
 }
 
+// XXX this is expensive in terms of malloc calls: the use of image interpolate and the residual images
+// makes this somewhat painful.
 static bool AddOrSubModel(psImage *image,
                           psImage *mask,

trunk/psphot/src/psphotGuessModels.c

@@ -142 +142 @@
     psImageMaskType maskVal = PS_SCALAR_VALUE(job->args->data[3],PS_TYPE_IMAGE_MASK_DATA);
     psImageMaskType markVal = PS_SCALAR_VALUE(job->args->data[4],PS_TYPE_IMAGE_MASK_DATA);
+
+    int nSrc = 0;
+
+    for (int i = 0; i < sources->n; i++) {
+        pmSource *source = sources->data[i];
+
+        // XXXX this is just for a test: use this to mark sources for which the model is measured
+        // check later that all are used.
+        source->mode |= PM_SOURCE_MODE_EXT_LIMIT;
+
+        // skip non-astronomical objects (very likely defects)
+        if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
+        if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
+        if (!source->peak) continue;
+
+        nSrc ++;
+        
+        // XXX if a source is faint, it will not have moments measured.
+        // it must be modelled as a PSF.  In this case, we need to use
+        // the peak centroid to get the coordinates and get the peak flux
+        // from the image?
+        pmModel *modelEXT;
+        if (!source->moments) {
+            modelEXT = wildGuess(source, psf);
+        } else {
+            // use the source moments, etc to guess basic model parameters
+            modelEXT = pmSourceModelGuess (source, psf->type); // ALLOC X5
+            if (!modelEXT) {
+                modelEXT = wildGuess(source, psf);
+            }
+            // these valuse are set in pmSourceModelGuess, should this rule be in there as well?
+            if (source->mode &  PM_SOURCE_MODE_SATSTAR) {
+                modelEXT->params->data.F32[PM_PAR_XPOS] = source->moments->Mx;
+                modelEXT->params->data.F32[PM_PAR_YPOS] = source->moments->My;
+            } else {
+                modelEXT->params->data.F32[PM_PAR_XPOS] = source->peak->xf;
+                modelEXT->params->data.F32[PM_PAR_YPOS] = source->peak->yf;
+            }
+        }
+
+        // set PSF parameters for this model (apply 2D shape model)
+        pmModel *modelPSF = pmModelFromPSF (modelEXT, psf); // ALLOC X5
+        if (modelPSF == NULL) {
+            psError(PSPHOT_ERR_PSF, false,
+                    "Failed to determine PSF model at r,c = (%d,%d); trying centre of image",
+                    source->peak->y, source->peak->x);
+            //
+            // Try the centre of the image
+            //
+            modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*readout->image->numCols;
+            modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*readout->image->numRows;
+            modelPSF = pmModelFromPSF (modelEXT, psf);
+            if (modelPSF == NULL) {
+                psError(PSPHOT_ERR_PSF, false,
+                        "Failed to determine PSF model at centre of image");
+                psFree(modelEXT);
+                return false;
+            }
+
+            source->mode |= PM_SOURCE_MODE_BADPSF;
+        }
+        psFree (modelEXT); // FREE (x3)
+
+        // XXX need to define the guess flux?
+        // set the fit radius based on the object flux limit and the model
+        // this function affects the mask pixels
+        psphotCheckRadiusPSF (readout, source, modelPSF, markVal);
+
+        // set the source PSF model
+        source->modelPSF = modelPSF;
+        source->modelPSF->residuals = psf->residuals;
+
+        pmSourceCacheModel (source, maskVal);  // ALLOC x14 (!)
+
+    }
+
+    return true;
+}
+
+// construct models only for sources in the specified region
+bool psphotGuessModel_Unthreaded (pmReadout *readout, psArray *sources, pmPSF *psf, psImageMaskType maskVal, psImageMaskType markVal) {
 
     int nSrc = 0;
@@ -220 +301 @@
     return true;
 }
-
-// construct models only for sources in the specified region
-bool psphotGuessModel_Unthreaded (pmReadout *readout, psArray *sources, pmPSF *psf, psImageMaskType maskVal, psImageMaskType markVal) {
-
-    int nSrc = 0;
-
-    for (int i = 0; i < sources->n; i++) {
-        pmSource *source = sources->data[i];
-
-        // XXXX this is just for a test: use this to mark sources for which the model is measured
-        // check later that all are used.
-        source->mode |= PM_SOURCE_MODE_EXT_LIMIT;
-
-        // skip non-astronomical objects (very likely defects)
-        if (source->type == PM_SOURCE_TYPE_DEFECT) continue;
-        if (source->type == PM_SOURCE_TYPE_SATURATED) continue;
-        if (!source->peak) continue;
-
-        nSrc ++;
-        
-        // XXX if a source is faint, it will not have moments measured.
-        // it must be modelled as a PSF.  In this case, we need to use
-        // the peak centroid to get the coordinates and get the peak flux
-        // from the image?
-        pmModel *modelEXT;
-        if (!source->moments) {
-            modelEXT = wildGuess(source, psf);
-        } else {
-            // use the source moments, etc to guess basic model parameters
-            modelEXT = pmSourceModelGuess (source, psf->type); // ALLOC
-            if (!modelEXT) {
-                modelEXT = wildGuess(source, psf);
-            }
-            // these valuse are set in pmSourceModelGuess, should this rule be in there as well?
-            if (source->mode &  PM_SOURCE_MODE_SATSTAR) {
-                modelEXT->params->data.F32[PM_PAR_XPOS] = source->moments->Mx;
-                modelEXT->params->data.F32[PM_PAR_YPOS] = source->moments->My;
-            } else {
-                modelEXT->params->data.F32[PM_PAR_XPOS] = source->peak->xf;
-                modelEXT->params->data.F32[PM_PAR_YPOS] = source->peak->yf;
-            }
-        }
-
-        // set PSF parameters for this model (apply 2D shape model)
-        pmModel *modelPSF = pmModelFromPSF (modelEXT, psf); // ALLOC
-        if (modelPSF == NULL) {
-            psError(PSPHOT_ERR_PSF, false,
-                    "Failed to determine PSF model at r,c = (%d,%d); trying centre of image",
-                    source->peak->y, source->peak->x);
-            //
-            // Try the centre of the image
-            //
-            modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*readout->image->numCols;
-            modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*readout->image->numRows;
-            modelPSF = pmModelFromPSF (modelEXT, psf);
-            if (modelPSF == NULL) {
-                psError(PSPHOT_ERR_PSF, false,
-                        "Failed to determine PSF model at centre of image");
-                psFree(modelEXT);
-                return false;
-            }
-
-            source->mode |= PM_SOURCE_MODE_BADPSF;
-        }
-        psFree (modelEXT);
-
-        // XXX need to define the guess flux?
-        // set the fit radius based on the object flux limit and the model
-        // this function affects the mask pixels
-        psphotCheckRadiusPSF (readout, source, modelPSF, markVal);
-
-        // set the source PSF model
-        source->modelPSF = modelPSF;
-        source->modelPSF->residuals = psf->residuals;
-
-        pmSourceCacheModel (source, maskVal);
-
-    }
-
-    return true;
-}