Changeset 13982

Timestamp:

Jun 26, 2007, 9:27:37 AM (19 years ago)

Author:

magnier

Message:

adding cached psf model, holder for convolved psf model

Location:

trunk/psModules/src/objects

Files:

• pmSource.c (modified) (8 diffs)
• pmSource.h (modified) (2 diffs)

trunk/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-06-20 02:22:26 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-26 19:27:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
     psFree(tmp->maskView);
     psFree(tmp->modelFlux);
+    psFree(tmp->psfFlux);
     psFree(tmp->moments);
     psFree(tmp->modelPSF);
     psFree(tmp->modelEXT);
+    psFree(tmp->modelConv);
     psFree(tmp->blends);
     psTrace("psModules.objects", 5, "---- end ----\n");
@@ -61 +63 @@
     psFree (source->maskView);
     psFree (source->modelFlux);
+    psFree (source->psfFlux);
 
     source->pixels = NULL;
@@ -67 +70 @@
     source->maskView = NULL;
     source->modelFlux = NULL;
+    source->psfFlux = NULL;
     return;
 }
@@ -86 +90 @@
     source->maskView = NULL;
     source->modelFlux = NULL;
+    source->psfFlux = NULL;
     source->moments = NULL;
     source->blends = NULL;
     source->modelPSF = NULL;
     source->modelEXT = NULL;
+    source->modelConv = NULL;
     source->type = PM_SOURCE_TYPE_UNKNOWN;
     source->mode = PM_SOURCE_MODE_DEFAULT;
@@ -223 +229 @@
         psFree (mySource->modelFlux);
         mySource->modelFlux = NULL;
+
+        // drop the old psfFlux pixels and force the user to re-create
+        psFree (mySource->psfFlux);
+        mySource->psfFlux = NULL;
     }
     return extend;
@@ -765 +775 @@
 }
 
+// construct a realization of the source model
+// XXX this function should optionally save an existing psf image from modelFlux
+bool pmSourceCachePSF (pmSource *source, psMaskType maskVal) {
+
+    // select appropriate model
+    if (source->modelPSF == NULL) return false;  // model must be defined
+
+    // if we already have a cached image, re-use that memory
+    source->psfFlux = psImageCopy (source->psfFlux, source->pixels, PS_TYPE_F32);
+    psImageInit (source->psfFlux, 0.0);
+
+    // in some places (psphotEnsemble), we need a normalized version
+    // in others, we just want the model.  which is more commonly used?
+    // psfFlux always has unity normalization (I0 = 1.0)
+    pmModelAdd (source->psfFlux, source->maskObj, source->modelPSF, PM_MODEL_OP_FULL | PM_MODEL_OP_NORM, maskVal);
+    return true;
+}
+
 // should we call pmSourceCacheModel if it does not exist?
 bool pmSourceOp (pmSource *source, pmModelOpMode mode, bool add, psMaskType maskVal) {
@@ -864 +892 @@
         return model;
 
+// XXX when should I return the modelConv ??
     case PM_SOURCE_TYPE_EXTENDED:
         model = source->modelEXT;

trunk/psModules/src/objects/pmSource.h

@@ -3 +3 @@
  * @author EAM, IfA; GLG, MHPCC
  *
- * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-06-20 02:22:26 $
+ * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-26 19:27:37 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -63 +63 @@
     psImage *pixels;                    ///< Rectangular region including object pixels.
     psImage *weight;                    ///< Image variance.
-    psImage *modelFlux;                 ///< cached copy of the model for this source
     psImage *maskObj;                   ///< unique mask for this object which marks included pixels associated with objects.
     psImage *maskView;                  ///< view into global image mask for this object region
+    psImage *modelFlux;                 ///< cached copy of the best model for this source
+    psImage *psfFlux;                   ///< cached copy of the psf model for this source
     pmMoments *moments;                 ///< Basic moments measure for the object.
     pmModel *modelPSF;                  ///< PSF Model fit (parameters and type)
     pmModel *modelEXT;                  ///< EXT (floating) Model fit (parameters and type).
+    pmModel *modelConv;                 ///< PSF-Convolved Model fit (parameters and type).
     pmSourceType type;                  ///< Best identification of object.
     pmSourceMode mode;                  ///< Best identification of object.