Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/psphot/src/psphotPetrosianRadialBins.c

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (2 props)
• psphot/src/psphotPetrosianRadialBins.c (modified) (3 diffs)

branches/eam_branches/ps2-tc3-20130727/psphot/src

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce
+psmakecff
+psphotFullForceSummary

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce
+psmakecff
+psphotFullForceSummary

branches/eam_branches/ps2-tc3-20130727/psphot/src/psphotPetrosianRadialBins.c

@@ -36 +36 @@
     pmSourceRadialProfile *profile = source->extpars->petProfile;
 
-    float skyModelErrorSQ = PS_SQR(skynoise);
+    // float skyModelErrorSQ = PS_SQR(skynoise);
 
     int nMax = radiusMax;
@@ -133 +133 @@
         if (radius->data.F32[i] > Rmax) {
             // calculate the value for the nOut bin
-            float value, dvalue;
+            float value; // , dvalue;
             if (values->n > 0) {
                 psVectorStats (stats, values, NULL, NULL, 0);
                 value = stats->robustMedian;
-                dvalue = stats->robustStdev;
+                // dvalue = stats->robustStdev;
             } else {
                 value = NAN;
-                dvalue = NAN;
+                // dvalue = NAN;
             }
 
             binSB->data.F32[nOut] = value;
-            binSBstdev->data.F32[nOut] = sqrt(PS_SQR(dvalue) / values->n + skyModelErrorSQ);
+            // binSBstdev->data.F32[nOut] = sqrt(PS_SQR(dvalue) / values->n + skyModelErrorSQ);
+            binSBstdev->data.F32[nOut] = skynoise / sqrt(values->n);
             binFill->data.F32[nOut] = values->n / binArea->data.F32[nOut];
 
@@ -185 +186 @@
         psFree(values);
         psFree(stats);
+        source->mode2 |= PM_SOURCE_MODE2_RADBIN_NAN_CENTER;
         return true;
     }

@@ -24 +24 @@
 psphotModelTest
 psphotMinimal
+psphotFullForce
+psmakecff
+psphotFullForceSummary