Changeset 30560

Timestamp:

Feb 10, 2011, 2:51:05 PM (15 years ago)

Author:

eugene

Message:

push the covariance / deteff fix into the trunk; add EFFECTIVE_AREA and SIGNIFICANCE_SCALE_FACTOR to the output header

Location:

trunk/psphot/src

Files:

• psphotEfficiency.c (modified) (2 diffs)
• psphotOutput.c (modified) (1 diff)

trunk/psphot/src/psphotEfficiency.c

@@ -31 +31 @@
     assert(covarFactor);
 
+    // apply the amplitude of kernel^2 to the covarFactor (why?)
+    // XXX this is simply undoing the scale scalculate in psImageCovarianceCalculateFactor
+    // if this is the right solution, make this extra calculation optional (and explain...)
     psKernel *kernel = psImageSmoothKernel(smoothSigma, smoothNsigma); // Kernel used for smoothing
-    *covarFactor = psImageCovarianceCalculateFactor(kernel, ro->covariance);
+    double sum2 = 0.0;                                               // Sum of kernel squared
+    for (int y = kernel->yMin; y <= kernel->yMax; y++) {
+        for (int x = kernel->xMin; x <= kernel->xMax; x++) {
+            sum2 += PS_SQR(kernel->kernel[y][x]);
+        }
+    }
+    *covarFactor = sum2 * psImageCovarianceCalculateFactor(kernel, ro->covariance);
     psFree(kernel);
 
@@ -70 +79 @@
     float fluxLim = 2.0 * *norm * peakLim; // Limiting flux in original
     *magLim = -2.5 * log10f(fluxLim);
+    psTrace("psphot.fake", 1, "Covar Factor:  %f\n", *covarFactor);
     psTrace("psphot.fake", 1, "Limiting peak: %f\n", peakLim);
     psTrace("psphot.fake", 1, "Limiting flux: %f\n", fluxLim);

trunk/psphot/src/psphotOutput.c

@@ -307 +307 @@
     psMetadataItemSupplement (&status, header, analysis, "PSPHOT.CR.MAX.MAG");
 
+    psMetadataItemSupplement (&status, header, analysis, "EFFECTIVE_AREA");
+    psMetadataItemSupplement (&status, header, analysis, "SIGNIFICANCE_SCALE_FACTOR");
+
     // sky background model statistics
     psMetadataItemSupplement (&status, header, analysis, "MSKY_MN");