Changeset 27596 for trunk/ppSub/src

Timestamp:

Apr 5, 2010, 10:16:10 AM (16 years ago)

Author:

Paul Price

Message:

Merging branches/pap_delete/ into trunk after successful testing. This provides automatic deletion of the convolved images from the diff stage.

Location:

trunk

Files:

• . (modified) (1 prop)
• ppSub/src/ppSub.h (modified) (1 diff)
• ppSub/src/ppSubArguments.c (modified) (2 diffs)
• ppSub/src/ppSubCamera.c (modified) (5 diffs)
• ppSub/src/ppSubData.c (modified) (1 diff)

trunk/ppSub/src/ppSub.h

@@ -45 +45 @@
     bool photometry;                    // Perform photometry?
     bool inverse;                       // Output inverse subtraction as well?
+    bool saveInConv;                    // Save convolved input?
+    bool saveRefConv;                   // Save convolved reference?
     psString stamps;                    // Stamps file
     pmPSF *psf;                         // Point Spread Function

trunk/ppSub/src/ppSubArguments.c

@@ -87 +87 @@
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-photometry", 0, "Perform photometry?", NULL);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-zp", 0, "Zero point for photometry", NAN);
-    psMetadataAddBool(arguments, PS_LIST_TAIL, "-inverse", 0, "Generate inverse subtractions?", NULL);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-inverse", 0, "Generate inverse subtractions?", false);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-save-inconv", 0, "Save input convolved images?", false);
+    psMetadataAddBool(arguments, PS_LIST_TAIL, "-save-refconv", 0, "Save reference convolved images?", false);
     psMetadataAddBool(arguments, PS_LIST_TAIL, "-visual", 0, "Show diagnostic plots", NULL);
 
@@ -154 +156 @@
     }
 
+    data->saveInConv = psMetadataLookupBool(NULL, arguments, "-save-inconv");
+    data->saveRefConv = psMetadataLookupBool(NULL, arguments, "-save-refconv");
+
     if (psMetadataLookupBool(NULL, arguments, "-visual")) {
         pmVisualSetVisual(true);

trunk/ppSub/src/ppSubCamera.c

@@ -219 +219 @@
     data->photometry = psMetadataLookupBool(NULL, recipe, "PHOTOMETRY");
 
-    bool mdok;                          // Status of MD lookup
-    bool saveConv = psMetadataLookupBool(&mdok, recipe, "SAVE.CONVOLVED"); // Save convolved images?
-
     // Convolved input image
     pmFPAfile *inConvImage = defineOutputFile(config, input, true, "PPSUB.INPUT.CONV", PM_FPA_FILE_IMAGE);
@@ -230 +227 @@
         return false;
     }
-    if (saveConv) {
-        inConvImage->save = true;
-        inConvMask->save = true;
-    }
+    inConvImage->save = data->saveInConv;
+    inConvMask->save = data->saveInConv;
     if (inVar) {
         pmFPAfile *inConvVar = defineOutputFile(config, inConvImage, false, "PPSUB.INPUT.CONV.VARIANCE",
@@ -241 +236 @@
             return false;
         }
-        if (saveConv) {
-            inConvVar->save = true;
-        }
+        inConvVar->save = data->saveInConv;
     }
 
@@ -254 +247 @@
         return false;
     }
-    if (saveConv) {
-        refConvImage->save = true;
-        refConvMask->save = true;
-    }
+    refConvImage->save = data->saveRefConv;
+    refConvMask->save = data->saveRefConv;
     if (refVar) {
         pmFPAfile *refConvVar = defineOutputFile(config, refConvImage, false, "PPSUB.REF.CONV.VARIANCE",
@@ -265 +256 @@
             return false;
         }
-        if (saveConv) {
-            refConvVar->save = true;
-        }
+        refConvVar->save = data->saveRefConv;
     }
 

trunk/ppSub/src/ppSubData.c

@@ -33 +33 @@
     data->photometry = false;
     data->inverse = false;
+    data->saveInConv = false;
+    data->saveRefConv = false;
     data->stamps = NULL;
     data->psf = NULL;