Changeset 27537 for branches/pap_delete/ppSub/src/ppSubCamera.c

Timestamp:

Mar 30, 2010, 3:45:08 PM (16 years ago)

Author:

Paul Price

Message:

Branching to branches/pap_delete for development of deletion of convolved diffs.

• ppSub will now only write the convolved images if explicitly requested on the command-line.
• diff_skyfile.pl only requests convolved images for warps (because we don't need to run magic on stacks).
• magic_process.pl deletes the convolved images when done.
• If magic_process.pl can't find the convolved image to use (e.g., it's already been deleted because we're re-running magic), then it is created on the fly using ppSubConvolve and the previously calculated convolution kernel.

Location:

branches/pap_delete

Files:

• . (copied) (copied from trunk )
• ppSub (copied) (copied from trunk/ppSub )
• ppSub/src/ppSubCamera.c (modified) (5 diffs)

branches/pap_delete/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;
     }