Changeset 12957 for branches/eam_02_branch/psphot/src/psphotSourceFits.c

Timestamp:

Apr 22, 2007, 5:39:10 PM (19 years ago)

Author:

eugene

Message:

changed PM_MODEL_ADD_.. to PM_MODEL_OP_..; added pmSourceAdd/Sub; adding modelFlux and maskView/maskObj to pmSource

File:

• branches/eam_02_branch/psphot/src/psphotSourceFits.c (modified) (5 diffs)

branches/eam_02_branch/psphot/src/psphotSourceFits.c

@@ -110 +110 @@
         blend->modelPSF = psMemIncrRefCounter (model);
         psTrace ("psphot", 5, "fitted blend as PSF\n");
-        pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
+        pmModelSub (source->pixels, source->mask, model, PM_MODEL_OP_FULL);
         blend->mode |=  PM_SOURCE_MODE_SUBTRACTED;
         blend->mode &= ~PM_SOURCE_MODE_TEMPSUB;
@@ -128 +128 @@
 
     psTrace ("psphot", 5, "fitted primary as PSF\n");
-    pmModelSub (source->pixels, source->mask, PSF, PM_MODEL_ADD_FULL);
+    pmModelSub (source->pixels, source->mask, PSF, PM_MODEL_OP_FULL);
     psFree (source->modelPSF);
     source->modelPSF = PSF;
@@ -169 +169 @@
 
     psTrace ("psphot", 5, "fitted as PSF\n");
-    pmModelSub (source->pixels, source->mask, PSF, PM_MODEL_ADD_FULL);
+    pmModelSub (source->pixels, source->mask, PSF, PM_MODEL_OP_FULL);
 
     // free old model, save new model
@@ -264 +264 @@
     // sub EXT
     psFree (DBL);
-    pmModelSub (source->pixels, source->mask, EXT, PM_MODEL_ADD_FULL);
+    pmModelSub (source->pixels, source->mask, EXT, PM_MODEL_OP_FULL);
     psTrace ("psphot", 5, "blob as EXT: %f %f\n", EXT->params->data.F32[PM_PAR_XPOS], EXT->params->data.F32[PM_PAR_YPOS]);
 
@@ -276 +276 @@
     // sub DLB
     psFree (EXT);
-    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[0], PM_MODEL_ADD_FULL);
-    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[1], PM_MODEL_ADD_FULL);
+    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[0], PM_MODEL_OP_FULL);
+    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[1], PM_MODEL_OP_FULL);
     psTrace ("psphot", 5, "blob as DBL: %f %f\n", ONE->params->data.F32[PM_PAR_XPOS], ONE->params->data.F32[PM_PAR_YPOS]);