Changeset 27840 for branches/simtest_nebulous_branches/ppSub/src/ppSubData.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ppSub/src (modified) (1 prop)
• ppSub/src/ppSubData.c (modified) (3 diffs)

branches/simtest_nebulous_branches/ppSub/src

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve

branches/simtest_nebulous_branches/ppSub/src/ppSubData.c

@@ -13 +13 @@
 static void subDataFree(ppSubData *data)
 {
-    if (data->statsFile) {
-        psString stats = psMetadataConfigFormat(data->stats); // Statistics to output
-        if (!stats || strlen(stats) == 0) {
-            psWarning("Unable to generate statistics file.");
-        } else {
-            fprintf(data->statsFile, "%s", stats);
-        }
-        psFree(stats);
-        fclose(data->statsFile);
-        pmConfigRunFilenameAddWrite(data->config, "STATS", data->statsName);
-    }
+    psAssert(!data->statsFile, "Statistics file still open.");
     psFree(data->statsName);
     psFree(data->stamps);
@@ -29 +19 @@
     psFree(data->stats);
 
-    psString dump_file = psMetadataLookupStr(NULL, data->config->arguments, "-dumpconfig");
-    if (dump_file) {
-        pmConfigDump(data->config, dump_file);
-    }
     psFree(data->config);
 
@@ -47 +33 @@
     data->photometry = false;
     data->inverse = false;
+    data->saveInConv = false;
+    data->saveRefConv = false;
     data->stamps = NULL;
     data->psf = NULL;

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve