Changeset 23711 for branches/pap/ppSub/src/ppSubFiles.c

Timestamp:

Apr 3, 2009, 6:25:39 PM (17 years ago)

Author:

Paul Price

Message:

Still moving stuff around to support 'inverse' mode. Need to define separate output files for the sources. Still doesn't compile.

File:

• branches/pap/ppSub/src/ppSubFiles.c (modified) (4 diffs)

branches/pap/ppSub/src/ppSubFiles.c

@@ -26 +26 @@
                                   NULL };
 
+// Subtraction photometry
+static const char *subPhotFiles[] = { "PPSUB.OUTPUT.SOURCES", NULL };
+
 // Inverse subtraction files
 static const char *invFiles[] = { "PPSUB.OUTINV", "PPSUB.OUTINV.MASK", "PPSUB.OUTINV.VARIANCE",
                                   "PPSUB.OUTINV.KERNELS", "PPSUB.OUTINV.JPEG1", "PPSUB.OUTINV.JPEG2",
                                   NULL };
+
+// Inverse subtraction photometry
+static const char *subPhotFiles[] = { "PPSUB.OUTINV.SOURCES", NULL };
 
 // Calculation (may be either input or output) files
@@ -36 +42 @@
 
 // Activate/deactivate a list of files
-static void filesActivate(const char **files, // List of files
+static void filesActivate(pmConfig *config, // Configuration
+                          const char **files, // List of files
                           bool state    // Activation status to set
     )
@@ -49 +56 @@
 //  This is so we can activate/deactivate the 'calculation' files, which may be either input or output, which
 // is indicated by their 'save' boolean.
-static void filesActivateSave(const char **files, // List of files
+static void filesActivateSave(pmConfig *config, // Configuration
+                              const char **files, // List of files
                               bool save, // Activate when this save state is set
                               bool state // Activation status to set
@@ -69 +77 @@
     if (files & PPSUB_FILES_INPUT) {
         filesActivate(inputFiles, state);
-        filesActivateSave(calcFiles, false, state);
+        filesActivateSave(config, calcFiles, false, state);
     }
     if (files & PPSUB_FILES_CONV) {
-        filesActivate(convFiles, state);
+        filesActivate(config, convFiles, state);
     }
     if (files & PPSUB_FILES_SUB) {
-        filesActivate(subFiles, state);
-        filesActivateSave(calcFiles, true, state);
+        filesActivate(config, subFiles, state);
+        filesActivateSave(config, calcFiles, true, state);
     }
     if (files & PPSUB_FILES_INV) {
-        filesActivate(invFiles, state);
+        filesActivate(config, invFiles, state);
+    }
+    if (files & PPSUB_FILES_PHOT_SUB) {
+        filesActivate(config, subPhotFiles, state);
+    }
+    if (files & PPSUB_FILES_PHOT_INV) {
+        filesActivate(config, invPhotFiles, state);
     }
     if (files & PPSUB_FILES_PHOT) {
-        psphotFilesActivate(config, state);
+        psphotFilesActivate(config, false);
     }