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

Timestamp:

Apr 19, 2013, 4:45:57 PM (13 years ago)

Author:

eugene

Message:

carry over changes from eam_branch/20130307

Location:

branches/eam_branches/ipp-20130419

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpParseCamera.c (modified) (5 diffs)

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

@@ -55 +55 @@
 }
 
-
-
-
 bool pswarpParseCamera(pmConfig *config)
 {
@@ -70 +67 @@
     }
 
-    pmFPAfile *astrom = defineInputFile(config, NULL, "PSWARP.ASTROM", "ASTROM", PM_FPA_FILE_CMF);
+    // XXX I should allow the astrometry input to be either WCS or CMF
+    // Define the input astrometry file(s)
+    bool status = false;
+    pmFPAfile *astrom = pmFPAfileDefineFromArgs(&status, config, "PSWARP.ASTROM", "ASTROM");
+    if (!astrom) {
+        // look for the file on the RUN metadata
+        astrom = pmFPAfileDefineFromRun(&status, NULL, config, "PSWARP.ASTROM"); // File to return
+        if (!status) {
+            psLogMsg("pswarp", PS_LOG_INFO, "Failed to load file definition for %s", "PSWARP.ASTROM");
+        }
+    }
+    if ((astrom->type != PM_FPA_FILE_CMF) && (astrom->type != PM_FPA_FILE_WCS)) {
+        psLogMsg("pswarp", PS_LOG_INFO, "%s is neither CMF nor WCS", "PSWARP.ASTROM");
+    }
     psLogMsg("pswarp", PS_LOG_INFO, "Astrometry source: %s", astrom ? "supplied" : "header");
 
+    // Define the input mask file(s)
     pmFPAfile *inMask = defineInputFile(config, input, "PSWARP.MASK", "MASK", PM_FPA_FILE_MASK);
     if (!inMask) {
@@ -78 +89 @@
     }
 
+    // Define the input variance file(s)
     pmFPAfile *inVariance = defineInputFile(config, input, "PSWARP.VARIANCE", "VARIANCE",
                                             PM_FPA_FILE_VARIANCE);
@@ -91 +103 @@
     
     // The input skycell is a required argument: it defines the output image
-    // XXX we may need a different skycell structure here
+    pmConfig *skyConfig = NULL;
     pmFPAfile *skycell = NULL;
-    pmConfig *skyConfig = NULL;
-    bool status = pswarpDefineSkycell(&skycell, &skyConfig, config, "PSWARP.SKYCELL", "SKYCELL");
-    if (!status) {
-        psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.SKYCELL");
-        return false;
-    }
+
+# define USE_PSWARP_DEFINE_SKYCELL 0
+# if (USE_PSWARP_DEFINE_SKYCELL)
+    // XXX this function is no longer needed; drop
+    status = pswarpDefineSkycell(&skycell, &skyConfig, config, "PSWARP.SKYCELL", "SKYCELL");
+# else
+    skycell = pmFPAfileDefineNewConfig(&status, &skyConfig, config, "PSWARP.SKYCELL", "SKYCELL");
+# endif
+
+    if (!status || !skycell) {
+      psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.SKYCELL");
+      return false;
+      }
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "SKYCELL.CAMERA", 0, "Name of camera for skycell", skyConfig->cameraName);
     psFree(skyConfig);
 
@@ -142 +162 @@
     if (inBackground && psMetadataLookupBool(&mdok, recipe, "BACKGROUND.MODEL")) {
       pmFPAfile *outBackground = pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT.BKGMODEL");
-/*       pmFPAfile *outBackground = pmFPAfileDefineFromFPA(config,output->fpa, */
-/*                                                      psMetadataLookupS32(&mdok,recipe,"BKG.XGRID"), */
-/*                                                      psMetadataLookupS32(&mdok,recipe,"BKG.YGRID"), */
-/*                                                      "PSWARP.OUTPUT.BKGMODEL"); */
       outBackground->xBin = psMetadataLookupS32(&mdok, recipe, "BKG.XGRID");
       outBackground->yBin = psMetadataLookupS32(&mdok, recipe, "BKG.YGRID");