Changeset 12955

Timestamp:

Apr 22, 2007, 12:36:57 PM (19 years ago)

Author:

eugene

Message:

prepping for pmSource Add/Sub

Location:

branches/eam_02_branch/psphot/src

Files:

• psphotBlendFit.c (modified) (1 diff)
• psphotReplaceUnfit.c (modified) (4 diffs)

branches/eam_02_branch/psphot/src/psphotBlendFit.c

@@ -65 +65 @@
         // replace object in image
         if (source->mode & PM_SOURCE_MODE_SUBTRACTED) {
+          // XXX we will need to remove the existing source->modelFlux if we do 
+          // a non-linear fit
+          // pmSourceSub (!NORM, -)
             pmModelAdd (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
         }

branches/eam_02_branch/psphot/src/psphotReplaceUnfit.c

@@ -20 +20 @@
                  source->modelPSF->params->data.F32[PM_PAR_XPOS], source->modelPSF->params->data.F32[PM_PAR_YPOS]);
 
+        // why am i assuming below that this is a PSF?
+        // pmSourceAdd (!NORM, +)
         pmModelAdd (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
         source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
@@ -47 +49 @@
                model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS]);
 
+      // pmSourceAdd (source, !NORM, "+");
+      // XXX remove model selection and ps
       pmModelAdd (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
       source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
@@ -91 +95 @@
     // replace the model if 1) state says it is missing or 2) useState is false (just do it)
     if (!state || !useState) {
+      // pmSourceSub (!NORM, -)
         pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
@@ -111 +116 @@
     
     if (curState && !newState) {
+      // pmSourceSub (!NORM, -)
         pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     if (newState && !curState) {
+      // pmSourceAdd (!NORM, +)
         pmModelAdd (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }