Changeset 28012

Timestamp:

May 18, 2010, 3:49:54 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/psphot.20100506

Files:

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

branches/eam_branches/psphot.20100506/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;
@@ -169 +176 @@
         if (!psphotEfficiencyReadout (config, view, filerule, i, recipe)) {
             psError (PSPHOT_ERR_CONFIG, false, "failed to measure detection efficiency for %s entry %d", filerule, i);
-            return false;
-        }
+            return false;
+        }
     }
     return true;

branches/eam_branches/psphot.20100506/src/psphotMosaicChip.c

@@ -21 +21 @@
     pmChip *inChip = pmFPAviewThisChip(view, in->fpa);
     if (!outChip->hdu && !outChip->parent->hdu) {
-        const char *name = psMetadataLookupStr(&status, in->fpa->concepts, "FPA.OBS"); // Name of FPA
-        pmFPAAddSourceFromView(out->fpa, name, view, out->format);
+        pmFPAAddSourceFromView(out->fpa, view, out->format);
     }