Changeset 12689 for trunk/psphot/src/psphotAddNoise.c

Timestamp:

Mar 29, 2007, 4:48:20 PM (19 years ago)

Author:

eugene

Message:

added deblend for saturated stars, fixed AddNoise

File:

• trunk/psphot/src/psphotAddNoise.c (modified) (4 diffs)

trunk/psphot/src/psphotAddNoise.c

@@ -4 +4 @@
 
     bool status = false;
-    psTimerStart ("psphot");
+    psEllipseShape oldshape;
+    psEllipseShape newshape;
+    psEllipseAxes axes;
 
     PS_ASSERT (readout, false);
     PS_ASSERT (readout->parent, false);
     PS_ASSERT (readout->parent->concepts, false);
+
+    psTimerStart ("psphot");
 
     // increase variance by factor*(object noise):
@@ -15 +19 @@
 
     float FACTOR = psMetadataLookupF32 (&status, recipe, "NOISE.FACTOR");
+    PS_ASSERT (status, false);
+    float SIZE = psMetadataLookupF32 (&status, recipe, "NOISE.SIZE");
     PS_ASSERT (status, false);
 
@@ -39 +45 @@
         }
 
-        model->params->data.F32[PM_PAR_I0] *= FACTOR;
+        psF32 *PAR = model->params->data.F32;
+
+        // save original values
+        float oldI0  = PAR[PM_PAR_I0];
+        oldshape.sx  = PAR[PM_PAR_SXX];
+        oldshape.sy  = PAR[PM_PAR_SYY];
+        oldshape.sxy = PAR[PM_PAR_SXY];
+
+        // increase size and height of source
+        axes = psEllipseShapeToAxes (oldshape, 20.0);
+        axes.major *= SIZE;
+        axes.minor *= SIZE;
+        newshape = psEllipseAxesToShape (axes);
+        PAR[PM_PAR_I0]  = FACTOR*PS_SQR(oldI0);
+        PAR[PM_PAR_SXX] = newshape.sx;
+        PAR[PM_PAR_SYY] = newshape.sy;
+        PAR[PM_PAR_SXY] = newshape.sxy;
+
         if (add) {
             pmModelAdd (source->weight, source->mask, model, false, false);
@@ -45 +68 @@
             pmModelSub (source->weight, source->mask, model, false, false);
         }
+        
+        // restore original values
+        PAR[PM_PAR_I0]  = oldI0;        
+        PAR[PM_PAR_SXX] = oldshape.sx;
+        PAR[PM_PAR_SYY] = oldshape.sy;
+        PAR[PM_PAR_SXY] = oldshape.sxy;
     }
     if (add) {