Changeset 12958 for branches/eam_02_branch/psModules/src/objects/pmSource.c

Timestamp:

Apr 23, 2007, 8:04:18 AM (19 years ago)

Author:

magnier

Message:

converting to source->maskObj and source->maskView

File:

• branches/eam_02_branch/psModules/src/objects/pmSource.c (modified) (6 diffs)

branches/eam_02_branch/psModules/src/objects/pmSource.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.25.4.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-23 03:26:23 $
+ *  @version $Revision: 1.25.4.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-23 18:04:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -743 +743 @@
 }
 
-pmModel *pmSourceSelectModel (pmSource *source)
-{
-    switch (source->type) {
-    case PM_SOURCE_TYPE_STAR:
-        return source->modelPSF;
-
-    case PM_SOURCE_TYPE_EXTENDED:
-        return source->modelEXT;
-
-    default:
-        return NULL;
-    }
-    return NULL;
-}
-
 // construct a realization of the source model 
 bool pmSourceCacheModel (pmSource *source) {
@@ -763 +748 @@
     // select appropriate model
     pmModel *model = pmSourceGetModel (NULL, source);
-    if (model == NULL) continue;  // model must be defined
+    if (model == NULL) return false;  // model must be defined
         
     // if we already have a cached image, re-use that memory
-    if (source->modelFlux) { 
-        psImageRecycle (source->modelFlux);
-    } else {
-        source->modelFlux = psImageCopy (source->pixels);
-    }
+    source->modelFlux = psImageCopy (source->modelFlux, source->pixels, PS_TYPE_F32);
     psImageInit (source->modelFlux, 0.0);
 
@@ -782 +763 @@
 bool pmSourceOp (pmSource *source, pmModelOpMode mode, bool add) {
 
+    bool status;
+
+    if (add) {
+        psTrace ("psphot", 3, "replacing object at %f,%f\n", source->peak->xf, source->peak->yf);
+    } else {
+        psTrace ("psphot", 3, "removing object at %f,%f\n", source->peak->xf, source->peak->yf);
+    }
+
     pmModel *model = pmSourceGetModel (NULL, source);
-    if (model == NULL) continue;  // model must be defined
+    if (model == NULL) return false;  // model must be defined
 
     if (source->modelFlux) {
@@ -801 +790 @@
         // XXX need to respect the source and model masks?
         for (int iy = 0; iy < source->modelFlux->numRows; iy++) {
-            oy = iy + dY;
+            int oy = iy + dY;
             for (int ix = 0; ix < source->modelFlux->numCols; ix++) {
-                ox = ix + dX;
+                int ox = ix + dX;
                 float value = Io*source->modelFlux->data.F32[iy][ix];
                 if (add) {
@@ -812 +801 @@
             }
         }
+        return true;
+    } 
+
+    if (add) {
+        status = pmModelAdd (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL);
     } else {
-        if (add) {
-            pmModelAdd (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL);
-        } else {
-            pmModelSub (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL);
+        status = pmModelSub (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL);
+    }
+
+    return true;
+}
+
+bool pmSourceAdd (pmSource *source, pmModelOpMode mode) {
+    bool status = pmSourceOp (source, mode, true);
+    return status;
+}
+
+bool pmSourceSub (pmSource *source, pmModelOpMode mode) {
+    bool status = pmSourceOp (source, mode, false);
+    return status;
+}
+
+// given a source, which model is currently appropriate?
+// choose PSF or EXT based on source->type, but fall back on PSF
+// if the EXT model is NULL
+pmModel *pmSourceGetModel (bool *isPSF, const pmSource *source)
+{
+
+    pmModel *model;
+
+    if (isPSF) {
+      *isPSF = false;
+    }
+
+    switch (source->type) {
+    case PM_SOURCE_TYPE_STAR:
+        model = source->modelPSF;
+        if (model == NULL)
+            return NULL;
+        if (isPSF) {
+            *isPSF = true;
         }
-    }   
-
-    if (add) {
-        psTrace ("psphot", 3, "replacing object at %f,%f\n", source->peak->xf, source->peak->yf);
-    } else {
-        psTrace ("psphot", 3, "removing object at %f,%f\n", source->peak->xf, source->peak->yf);
-    }
-    return true;
-}
-
-bool pmSourceAdd (pmSource *source, pmSourceOpMode mode) {
-    pmSourceOp (source, mode, true);
-}
-
-bool pmSourceSub (pmSource *source, pmSourceOpMode mode) {
-    pmSourceOp (source, mode, false);
-}
+        return model;
+
+    case PM_SOURCE_TYPE_EXTENDED:
+        model = source->modelEXT;
+        if (!model && source->modelPSF) {
+            if (isPSF) {
+                *isPSF = true;
+            }
+            return source->modelPSF;
+        }
+        return (model);
+        break;
+
+    default:
+        return NULL;
+    }
+    return NULL;
+}