Changeset 23753 for trunk/ppSub/src/ppSubReadoutPhotometry.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/ppSubReadoutPhotometry.c (modified) (3 diffs)

trunk/ppSub/src/ppSubReadoutPhotometry.c

@@ -22 +22 @@
 #include "ppSub.h"
 
-bool ppSubReadoutPhotometry(const char *name, pmConfig *config, ppSubData *data)
+bool ppSubReadoutPhotometry(const char *name, ppSubData *data)
 {
+    psAssert(data, "Require processing data");
+    pmConfig *config = data->config;    // Configuration
     psAssert(config, "Require configuration");
 
@@ -51 +53 @@
         psErrorStackPrint(stderr, "No PSF available");
         psWarning("No PSF available --- suspect bad data quality.");
-        ppSubDataQuality(config, data, psErrorCodeLast(), PPSUB_FILES_PHOT_SUB | PPSUB_FILES_PHOT_INV);
+        ppSubDataQuality(data, psErrorCodeLast(), PPSUB_FILES_PHOT_SUB | PPSUB_FILES_PHOT_INV);
         return true;
     }
@@ -94 +96 @@
         psErrorStackPrint(stderr, "Unable to perform photometry on image");
         psWarning("Unable to perform photometry on image --- suspect bad data quality.");
-        ppSubDataQuality(config, data, psErrorCodeLast(), PPSUB_FILES_PHOT_SUB | PPSUB_FILES_PHOT_INV);
+        ppSubDataQuality(data, psErrorCodeLast(), PPSUB_FILES_PHOT_SUB | PPSUB_FILES_PHOT_INV);
     }