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

trunk/ppSub/src/ppSub.c

@@ -41 +41 @@
         psErrorStackPrint(stderr, "Error initialising model classes.\n");
         exitValue = PS_EXIT_PROG_ERROR;
+        psFree(config);
         goto die;
     }
@@ -47 +48 @@
         psErrorStackPrint(stderr, "Error initialising psphot.\n");
         exitValue = PS_EXIT_PROG_ERROR;
+        psFree(config);
         goto die;
     }
 
-    data = ppSubDataAlloc(); // Processing data
+    data = ppSubDataAlloc(config);
 
-    if (!ppSubArguments(argc, argv, config, data)) {
+    if (!ppSubArguments(argc, argv, data)) {
         psErrorStackPrint(stderr, "Error reading arguments.\n");
         exitValue = PS_EXIT_CONFIG_ERROR;
@@ -58 +60 @@
     }
 
-    if (!ppSubCamera(config, data)) {
+    if (!ppSubCamera(data)) {
         psErrorStackPrint(stderr, "Error setting up camera.\n");
         exitValue = PS_EXIT_CONFIG_ERROR;
@@ -64 +66 @@
     }
 
-    if (!ppSubLoop(config, data)) {
+    if (!ppSubLoop(data)) {
         psErrorStackPrint(stderr, "Error performing subtraction.\n");
         exitValue = PS_EXIT_SYS_ERROR;
@@ -75 +77 @@
 
     psFree(data);
-    psFree(config);
 
     pmVisualClose(); //close plot windows, if -visual is set