Changeset 25332

Timestamp:

Sep 10, 2009, 4:55:57 PM (17 years ago)

Author:

Paul Price

Message:

Using pmDetEff so we can write the values out in a useful manner.

File:

• branches/pap/psphot/src/psphotEfficiency.c (modified) (1 diff)

branches/pap/psphot/src/psphotEfficiency.c

@@ -411 +411 @@
     psFree(fakeSources);
 
-    // XXX How do we get the results out?
-    psMetadata *stats = psMetadataAlloc();
-    psMetadataAddS32(stats, PS_LIST_TAIL, "FAKE.NUM", PS_META_REPLACE,
-                     "Number of sources per bin", numSources);
-    psMetadataAddF32(stats, PS_LIST_TAIL, "FAKE.REF", PS_META_REPLACE,
-                     "Efficiency reference magnitude", magLim);
-    psMetadataAddVector(stats, PS_LIST_TAIL, "FAKE.MAG", PS_META_REPLACE,
-                        "Efficiency magnitudes", magOffsets);
-    psMetadataAddVector(stats, PS_LIST_TAIL, "FAKE.COUNTS", PS_META_REPLACE,
-                        "Number of sources retrieved", count);
-    psMetadataAddVector(stats, PS_LIST_TAIL, "FAKE.DIFF.MEAN", PS_META_REPLACE,
-                        "Mean magnitude differences", magDiffMean);
-    psMetadataAddVector(stats, PS_LIST_TAIL, "FAKE.DIFF.STDEV", PS_META_REPLACE,
-                        "Stdev of magnitude differences", magDiffStdev);
-    psMetadataAddVector(stats, PS_LIST_TAIL, "FAKE.ERR.MEAN", PS_META_REPLACE,
-                        "Mean error in magnitude differences", magErrMean);
-    psMetadataConfigWrite(stats, "fake.stats");
-    psFree(stats);
-
-    psFree(count);
-    psFree(magDiffMean);
-    psFree(magDiffStdev);
-    psFree(magErrMean);
+    pmDetEff *de = pmDetEffAlloc(magLim, numSources, numBins); // Detection efficiency
+    de->magOffsets = magOffsets;
+    de->counts = count;
+    de->magDiffMean = magDiffMean;
+    de->magDiffStdev = magDiffStdev;
+    de->magErrMean = magErrMean;
+
+    psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, PM_DETEFF_ANALYSIS, PS_META_REPLACE | PS_DATA_UNKNOWN,
+                     "Detection efficiency", de);
+    psFree(de);
 
     return true;