Changeset 17784

Timestamp:

May 23, 2008, 2:40:29 PM (18 years ago)

Author:

Paul Price

Message:

Adding additional statistics for output.

Location:

trunk/ppSub/src

Files:

• ppSub.h (modified) (1 diff)
• ppSubLoop.c (modified) (2 diffs)
• ppSubReadout.c (modified) (4 diffs)

trunk/ppSub/src/ppSub.h

@@ -19 +19 @@
 /// Perform PSF-matched image subtraction on the readout
 bool ppSubReadout(pmConfig *config,     ///< Configuration
+                  psMetadata *stats,    ///< Statistics, for output
                   const pmFPAview *view ///< View of readout to subtract
     );

trunk/ppSub/src/ppSubLoop.c

@@ -130 +130 @@
 
                 // Perform the analysis
-                if (!ppSubReadout(config, view)) {
+                if (!ppSubReadout(config, stats, view)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to subtract images.\n");
                     return false;
@@ -168 +168 @@
     // Write out summary statistics
     if (stats) {
+        psMetadataAddF32(stats, PS_LIST_TAIL, "DT_SUB", 0, "Time for subtraction completion",
+                         psTimerMark("ppSub"));
+
         const char *statsMDC = psMetadataConfigFormat(stats);
         if (!statsMDC || strlen(statsMDC) == 0) {

trunk/ppSub/src/ppSubReadout.c

@@ -14 +14 @@
 
 
-bool ppSubReadout(pmConfig *config, const pmFPAview *view)
+bool ppSubReadout(pmConfig *config, psMetadata *stats, const pmFPAview *view)
 {
     pmReadout *inRO = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT"); // Input readout
@@ -122 +122 @@
     // Add kernel descrption to header
     pmSubtractionKernels *kernels = psMetadataLookupPtr(&mdok, inConv->analysis,
-                                                        "SUBTRACTION.KERNEL"); // The subtraction kernels
+                                                        PM_SUBTRACTION_ANALYSIS_KERNEL); // Subtraction kernel
     if (!kernels) {
-        kernels = psMetadataLookupPtr(&mdok, refConv->analysis, "SUBTRACTION.KERNEL");
+        kernels = psMetadataLookupPtr(&mdok, refConv->analysis, PM_SUBTRACTION_ANALYSIS_KERNEL);
     }
     if (!kernels) {
@@ -135 +135 @@
     psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.KERNEL", 0,
                      "Subtraction kernel", kernels->description);
+
+    // Statistics on the matching
+    if (psMetadataLookup(inConv->analysis, PM_SUBTRACTION_ANALYSIS_MODE)) {
+        psMetadataItemSupplement(stats, inConv->analysis, PM_SUBTRACTION_ANALYSIS_MODE);
+        psMetadataItemSupplement(stats, inConv->analysis, PM_SUBTRACTION_ANALYSIS_STAMPS_NUM);
+        psMetadataItemSupplement(stats, inConv->analysis, PM_SUBTRACTION_ANALYSIS_STAMPS_RMS);
+    }
+    if (psMetadataLookup(refConv->analysis, PM_SUBTRACTION_ANALYSIS_MODE)) {
+        psMetadataItemSupplement(stats, refConv->analysis, PM_SUBTRACTION_ANALYSIS_MODE);
+        psMetadataItemSupplement(stats, refConv->analysis, PM_SUBTRACTION_ANALYSIS_STAMPS_NUM);
+        psMetadataItemSupplement(stats, refConv->analysis, PM_SUBTRACTION_ANALYSIS_STAMPS_RMS);
+    }
 
 #ifdef TESTING
@@ -233 +245 @@
 
         pmFPAfileActivate(config->files, false, "PSPHOT.INPUT");
+
+        psArray *sources = psMetadataLookupPtr(NULL, outRO->parent->parent->analysis, "PSPHOT.SOURCES");
+        psMetadataAddS32(stats, PS_LIST_TAIL, "NUM_SOURCES", 0, "Number of sources detected", sources->n);
     }