Changeset 35535 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c

Timestamp:

May 8, 2013, 4:41:42 PM (13 years ago)

Author:

eugene

Message:

warping of background model appears to work

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c (modified) (3 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpParseCamera.c

@@ -38 +38 @@
     }
 
+    // once we have read the input mask headers (if any), we can use that to set the mask bits
+    if (!pswarpSetMaskBits(config)) {
+        psError(psErrorCodeLast(), false, "failed to set mask bits");
+        return false;
+    }
+
     // *** parse the output information (output target, output astrometry [skycell])
 
@@ -95 +101 @@
     // only create an output background if an input background is supplied
     if (foundBackground && psMetadataLookupBool(&status, recipe, "BACKGROUND.MODEL")) {
-      pmFPAfile *outBackground = pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT.BKGMODEL");
-      outBackground->xBin = psMetadataLookupS32(&status, recipe, "BKG.XGRID");
-      outBackground->yBin = psMetadataLookupS32(&status, recipe, "BKG.YGRID");
-      
-      if (!outBackground) {
-        psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.OUTPUT.BKGMODEL");
-        return false;
-      }
-      outBackground->save = true;
+        // pmFPAfile *outBackground = pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT.BKGMODEL");
+        pmFPAfile *outBackground = pmFPAfileDefineOutputForFormat(config, NULL, "PSWARP.OUTPUT.BKGMODEL", skycell->cameraName, skycell->formatName);
+        outBackground->xBin = psMetadataLookupS32(&status, recipe, "BKG.XGRID");
+        outBackground->yBin = psMetadataLookupS32(&status, recipe, "BKG.YGRID");
+        
+        if (!outBackground) {
+            psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.OUTPUT.BKGMODEL");
+            return false;
+        }
+        outBackground->save = true;
     }
 
@@ -152 +159 @@
     }
  
+    // only keep the necessary (output) camera configs and relevant recipes
+    const char *skyCamera = psMetadataLookupStr(NULL, config->arguments, "SKYCELL.CAMERA");
+    pmConfigCamerasCull(config, skyCamera);
+    pmConfigRecipesCull(config, "PSWARP,PPSTATS,PSPHOT,PSASTRO,MASKS,JPEG");
+
     psTrace("pswarp", 1, "Done with pswarpParseCamera...\n");
     return true;