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

trunk/ppSub/src/ppSubData.c

@@ -22 +22 @@
         psFree(stats);
         fclose(data->statsFile);
+        pmConfigRunFilenameAddWrite(data->config, "STATS", data->statsName);
     }
+    psFree(data->statsName);
     psFree(data->stamps);
     psFree(data->psf);
     psFree(data->stats);
+
+    psString dump_file = psMetadataLookupStr(NULL, data->config->arguments, "-dumpconfig");
+    if (dump_file) {
+        pmConfigDump(data->config, dump_file);
+    }
+    psFree(data->config);
+
     return;
 }
 
-ppSubData *ppSubDataAlloc(void)
+ppSubData *ppSubDataAlloc(pmConfig *config)
 {
     ppSubData *data = psAlloc(sizeof(ppSubData)); // Processing data, to return
     psMemSetDeallocator(data, (psFreeFunc)subDataFree);
 
+    data->config = config;
     data->quality = 0;
     data->photometry = false;
@@ -39 +49 @@
     data->stamps = NULL;
     data->psf = NULL;
+    data->statsName = NULL;
     data->statsFile = NULL;
     data->stats = psMetadataAlloc();
@@ -47 +58 @@
 
 
-void ppSubDataQuality(pmConfig *config, ppSubData *data, psErrorCode error, ppSubFiles files)
+void ppSubDataQuality(ppSubData *data, psErrorCode error, ppSubFiles files)
 {
-    psAssert(config, "Require configuration");
     psAssert(data, "Require processing data");
 
@@ -57 +67 @@
     }
 
-    ppSubFilesActivate(config, files, false);
+    ppSubFilesActivate(data->config, files, false);
 
     psErrorClear();