Changeset 28006 for trunk/psphot

Timestamp:

May 18, 2010, 2:34:09 PM (16 years ago)

Author:

eugene

Message:

merging changes from PAP branch with modifications to the covariance matrix calculation

Location:

trunk

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotEfficiency.c (modified) (2 diffs)

trunk/psphot/src/psphotEfficiency.c

@@ -73 +73 @@
     psTrace("psphot.fake", 1, "Limiting flux: %f\n", fluxLim);
     psTrace("psphot.fake", 1, "Limiting mag: %f\n", *magLim);
+    psLogMsg("psphot", PS_LOG_INFO,
+             "Detection efficiency:\n"
+             "  Mean variance: %f * %f\n"
+             "  Threshold: %f\n"
+             "  Normalisation: %f\n"
+             "  Limiting magnitude: %f\n",
+             meanVar, *covarFactor, thresh, *norm, *magLim);
 
     *radius = smoothSigma * smoothNsigma;
@@ -166 +173 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (i == chisqNum) continue; // skip chisq image
-        if (!psphotEfficiencyReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
+        if (i == chisqNum) continue; // skip chisq image
+        if (!psphotEfficiencyReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to measure detection efficiency for PSPHOT.INPUT entry %d", i);
-            return false;
-        }
+            return false;
+        }
     }
     return true;