Changeset 12952

Timestamp:

Apr 21, 2007, 11:41:37 AM (19 years ago)

Author:

eugene

Message:

changed API for pmModelAdd

Location:

branches/eam_02_branch/psphot/src

Files:

• psphotAddNoise.c (modified) (1 diff)
• psphotBlendFit.c (modified) (2 diffs)
• psphotChoosePSF.c (modified) (1 diff)
• psphotEnsemblePSF.c (modified) (2 diffs)
• psphotFitSet.c (modified) (1 diff)
• psphotGrowthCurve.c (modified) (1 diff)
• psphotMakeResiduals.c (modified) (1 diff)
• psphotModelTest.c (modified) (1 diff)
• psphotOutput.c (modified) (1 diff)
• psphotReplaceUnfit.c (modified) (5 diffs)
• psphotSourceFits.c (modified) (5 diffs)
• psphotTestPSF.c (modified) (1 diff)
• psphotWeightBias.c (modified) (2 diffs)

branches/eam_02_branch/psphot/src/psphotAddNoise.c

@@ -64 +64 @@
 
         if (add) {
-            pmModelAdd (source->weight, source->mask, model, false, false);
+            pmModelAdd (source->weight, source->mask, model, PM_MODEL_ADD_FULL);
         } else {
-            pmModelSub (source->weight, source->mask, model, false, false);
+            pmModelSub (source->weight, source->mask, model, PM_MODEL_ADD_FULL);
         }
         

branches/eam_02_branch/psphot/src/psphotBlendFit.c

@@ -65 +65 @@
         // replace object in image
         if (source->mode & PM_SOURCE_MODE_SUBTRACTED) {
-            pmModelAdd (source->pixels, source->mask, source->modelPSF, false, false);
+            pmModelAdd (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
         }
         Nfit ++;
@@ -85 +85 @@
 
         // re-subtract PSF for object, leave local sky
-        pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
+        pmModelSub (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
         source->mode |= PM_SOURCE_MODE_SUBTRACTED;
         source->mode |= PM_SOURCE_MODE_TEMPSUB;

branches/eam_02_branch/psphot/src/psphotChoosePSF.c

@@ -240 +240 @@
             // set the mask and subtract the PSF model
             psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK);
-            pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
+            pmModelSub (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
             psImageKeepCircle (source->mask, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK));
         }

branches/eam_02_branch/psphot/src/psphotEnsemblePSF.c

@@ -93 +93 @@
         psImageInit (fitSource->pixels, 0.0);
         psImageKeepCircle (fitSource->mask, x, y, model->radiusFit, "OR", PM_MASK_MARK);
-        pmModelAdd (fitSource->pixels, fitSource->mask, model, false, false);
+        pmModelAdd (fitSource->pixels, fitSource->mask, model, PM_MODEL_ADD_FULL);
 
         // save source in list
@@ -218 +218 @@
 
         // subtract object
-        pmModelSub (Ri->pixels, Ri->mask, model, false, false);
+        pmModelSub (Ri->pixels, Ri->mask, model, PM_MODEL_ADD_FULL);
         Ri->mode |= PM_SOURCE_MODE_SUBTRACTED;
         if (!final) Ri->mode |= PM_SOURCE_MODE_TEMPSUB;

branches/eam_02_branch/psphot/src/psphotFitSet.c

@@ -32 +32 @@
     for (int i = 0; i < modelSet->n; i++) {
         pmModel *model = modelSet->data[i];
-        pmModelSub (source->pixels, source->mask, model, false, false);
+        pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
 
         fprintf (stderr, "output parameters (obj %d):\n", i);

branches/eam_02_branch/psphot/src/psphotGrowthCurve.c

@@ -54 +54 @@
 
         psImageKeepCircle (mask, xc, yc, radius, "OR", PM_MASK_MARK);
-        pmModelAdd (image, mask, model, false, false);
+        pmModelAdd (image, mask, model, PM_MODEL_ADD_FULL);
         pmSourcePhotometryAper (&apMag, model, image, mask);
         psImageKeepCircle (mask, xc, yc, radius, "AND", PS_NOT_U8(PM_MASK_MARK));

branches/eam_02_branch/psphot/src/psphotMakeResiduals.c

@@ -79 +79 @@
         psImage *weight = psImageCopy (NULL, source->weight, PS_TYPE_F32);
         psImage *mask   = psImageCopy (NULL, source->mask,   PS_TYPE_U8);
-        pmModelSub (image, mask, model, false, false);
+        pmModelSub (image, mask, model, PM_MODEL_ADD_FULL);
         
         // re-normalize image and weight

branches/eam_02_branch/psphot/src/psphotModelTest.c

@@ -177 +177 @@
 
     // subtract object, leave local sky
-    pmModelSub (source->pixels, source->mask, model, false, false);
+    pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
 
     fprintf (stderr, "output parameters: \n");

branches/eam_02_branch/psphot/src/psphotOutput.c

@@ -182 +182 @@
     modelEXT->params->data.F32[3] = y;
     pmModel *modelPSF = pmModelFromPSF (modelEXT, psf);
-    pmModelAdd (sample, NULL, modelPSF, false, false);
+    pmModelAdd (sample, NULL, modelPSF, PM_MODEL_ADD_FULL);
     psFree (modelPSF);
     return (sample);

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]);
 
-        pmModelAdd (source->pixels, source->mask, source->modelPSF, false, false);
+        pmModelAdd (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
         source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
         source->mode &= ~PM_SOURCE_MODE_TEMPSUB;
@@ -47 +47 @@
                model->params->data.F32[PM_PAR_XPOS], model->params->data.F32[PM_PAR_YPOS]);
 
-      pmModelAdd (source->pixels, source->mask, model, false, false);
+      pmModelAdd (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
       source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
     }
@@ -70 +70 @@
     // replace the model if 1) state says it is missing or 2) useState is false (just do it)
     if (!state || !useState) {
-        pmModelAdd (source->pixels, source->mask, model, false, false);
+        pmModelAdd (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     return true;
@@ -91 +91 @@
     // replace the model if 1) state says it is missing or 2) useState is false (just do it)
     if (!state || !useState) {
-        pmModelSub (source->pixels, source->mask, model, false, false);
+        pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     return true;
@@ -111 +111 @@
     
     if (curState && !newState) {
-        pmModelSub (source->pixels, source->mask, model, false, false);
+        pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     if (newState && !curState) {
-        pmModelAdd (source->pixels, source->mask, model, false, false);
+        pmModelAdd (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     return true;

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, false, false);
+        pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_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, false, false);
+    pmModelSub (source->pixels, source->mask, PSF, PM_MODEL_ADD_FULL);
     psFree (source->modelPSF);
     source->modelPSF = PSF;
@@ -169 +169 @@
 
     psTrace ("psphot", 5, "fitted as PSF\n");
-    pmModelSub (source->pixels, source->mask, PSF, false, false);
+    pmModelSub (source->pixels, source->mask, PSF, PM_MODEL_ADD_FULL);
 
     // free old model, save new model
@@ -264 +264 @@
     // sub EXT
     psFree (DBL);
-    pmModelSub (source->pixels, source->mask, EXT, false, false);
+    pmModelSub (source->pixels, source->mask, EXT, PM_MODEL_ADD_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], false, false);
-    pmModelSub (source->pixels, source->mask, (pmModel *) DBL->data[1], false, false);
+    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);
     psTrace ("psphot", 5, "blob as DBL: %f %f\n", ONE->params->data.F32[PM_PAR_XPOS], ONE->params->data.F32[PM_PAR_YPOS]);
 

branches/eam_02_branch/psphot/src/psphotTestPSF.c

@@ -124 +124 @@
 
         // subtract model flux
-        pmModelSub (source->pixels, source->mask, model, false, false);
+        pmModelSub (source->pixels, source->mask, model, PM_MODEL_ADD_FULL);
     }
     fclose (f);

branches/eam_02_branch/psphot/src/psphotWeightBias.c

@@ -59 +59 @@
 
         // replace object in image
-        pmModelAdd (source->pixels, source->mask, source->modelPSF, false, false);
+        pmModelAdd (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
 
         // make a temporary model (we don't keep the result of this analysis)
@@ -76 +76 @@
 
         // re-subtract PSF for object, leave local sky
-        pmModelSub (source->pixels, source->mask, source->modelPSF, false, false);
+        pmModelSub (source->pixels, source->mask, source->modelPSF, PM_MODEL_ADD_FULL);
 
         PARp = source->modelPSF->params->data.F32;