Changeset 23753 for trunk/ppSub/src/ppSubLoop.c

Timestamp:

Apr 8, 2009, 2:33:59 PM (17 years ago)

Author:

Paul Price

Message:

Put statistics files in RUN metadata. Removed unnecessary argument from pmConfigDump. Reorganised ppSub so configuration is carried by the ppSubData, which means that the configuration can be dumped when we free the ppSubData (similar operation as for writing statistics).

File:

• trunk/ppSub/src/ppSubLoop.c (modified) (7 diffs)

trunk/ppSub/src/ppSubLoop.c

@@ -20 +20 @@
 #include "ppSub.h"
 
-bool ppSubLoop(pmConfig *config, ppSubData *data)
+bool ppSubLoop(ppSubData *data)
 {
+    psAssert(data, "Require processing data");
+    pmConfig *config = data->config;    // Configuration
     psAssert(config, "Require configuration.");
 
@@ -45 +47 @@
     }
 
-    if (!ppSubMatchPSFs(config, data)) {
+    if (!ppSubMatchPSFs(data)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to match PSFs.");
         return false;
@@ -74 +76 @@
     }
 
-    if (!data->quality && !ppSubMakePSF(config, data)) {
+    if (!data->quality && !ppSubMakePSF(data)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to generate PSF.");
         return false;
@@ -101 +103 @@
     }
 
-    if (!data->quality && !ppSubReadoutPhotometry("PPSUB.OUTPUT", config, data)) {
+    if (!data->quality && !ppSubReadoutPhotometry("PPSUB.OUTPUT", data)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry.");
         return false;
@@ -112 +114 @@
 
     // Perform statistics on the cell
-    if (!ppSubReadoutStats(config, data)) {
+    if (!ppSubReadoutStats(data)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to collect statistics");
         return false;
@@ -150 +152 @@
         }
 
-        if (!data->quality && !ppSubReadoutPhotometry("PPSUB.INVERSE", config, data)) {
+        if (!data->quality && !ppSubReadoutPhotometry("PPSUB.INVERSE", data)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry.");
             return false;
@@ -168 +170 @@
     }
 
-    psString dump_file = psMetadataLookupStr(NULL, config->arguments, "-dumpconfig");
-    if (dump_file) {
-        pmFPAfile *input = psMetadataLookupPtr(NULL, config->files, "PPSUB.INPUT"); // Input file
-        pmConfigDump(config, input->fpa, dump_file);
-    }
-
     return true;
 }