Changeset 13665

Timestamp:

Jun 5, 2007, 4:07:11 PM (19 years ago)

Author:

Paul Price

Message:

Don't build own masks, but only use those that are provided. Don't attempt to define psphot files unless a PSF model has been provided.

Location:

trunk/ppSub/src

Files:

• ppSubCamera.c (modified) (5 diffs)
• ppSubLoop.c (modified) (2 diffs)

trunk/ppSub/src/ppSubCamera.c

@@ -28 +28 @@
     pmFPAfile *inputMask = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.MASK", "INPUT.MASK");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
-        return NULL;
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
     }
     if (inputMask && inputMask->type != PM_FPA_FILE_MASK) {
@@ -39 +39 @@
     pmFPAfile *inputWeight = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.INPUT.WEIGHT", "INPUT.WEIGHT");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
-        return NULL;
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
     }
     if (inputWeight && inputWeight->type != PM_FPA_FILE_WEIGHT) {
@@ -62 +62 @@
     pmFPAfile *refMask = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.REF.MASK", "REF.MASK");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
-        return NULL;
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
     }
     if (refMask && refMask->type != PM_FPA_FILE_MASK) {
@@ -73 +73 @@
     pmFPAfile *refWeight = pmFPAfileBindFromArgs(&status, input, config, "PPSUB.REF.WEIGHT", "REF.WEIGHT");
     if (!status) {
-        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
-        return NULL;
+        psError (PS_ERR_UNKNOWN, false, "failed to load find definition");
+        return NULL;
     }
     if (refWeight && refWeight->type != PM_FPA_FILE_WEIGHT) {
@@ -115 +115 @@
 
     // psPhot input
-    pmFPAfile *psphot = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");
-    if (!psphot) {
-        psError(PS_ERR_IO, false, "Failed to build FPA from PSPHOT.INPUT");
-        return false;
-    }
-    if (input->type != PM_FPA_FILE_IMAGE) {
-        psError(PS_ERR_IO, true, "PSPHOT.INPUT is not of type IMAGE");
-        return false;
-    }
+    if (psMetadataLookup(config->arguments, "PSPHOT.PSF")) {
+        pmFPAfile *psphot = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");
+        if (!psphot) {
+            psError(PS_ERR_IO, false, "Failed to build FPA from PSPHOT.INPUT");
+            return false;
+        }
+        if (input->type != PM_FPA_FILE_IMAGE) {
+            psError(PS_ERR_IO, true, "PSPHOT.INPUT is not of type IMAGE");
+            return false;
+        }
 
-    if (!psphotDefineFiles(config, psphot)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to set up psphot files.");
-        return false;
+        if (!psphotDefineFiles(config, psphot)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to set up psphot files.");
+            return false;
+        }
     }
 

trunk/ppSub/src/ppSubLoop.c

@@ -13 +13 @@
 bool ppSubLoop(pmConfig *config)
 {
+    // Value to mask
+    psMaskType maskVal = psMetadataLookupU8(NULL, config->arguments, "MASK.BAD") |
+        psMetadataLookupU8(NULL, config->arguments, "MASK.BLANK") |
+        pmConfigMask("SAT", config) |
+        pmConfigMask("BAD", config);
+
     bool mdok;                          // Status of MD lookup
     const char *statsName = psMetadataLookupStr(&mdok, config->arguments, "STATS"); // Filename for statistics
@@ -136 +142 @@
                     return false;
                 }
-                ppStats(stats, output->fpa, view, config);
+                ppStats(stats, output->fpa, view, maskVal, config);
             }