Changeset 35382

Timestamp:

Apr 9, 2013, 12:10:11 PM (13 years ago)

Author:

eugene

Message:

replace pswarpDefineSkycell with pmFPAfileDefineNewConfig

Location:

branches/eam_branches/ipp-20130307/pswarp/src

Files:

• Makefile.am (modified) (1 diff)
• pswarpParseCamera.c (modified) (2 diffs)

branches/eam_branches/ipp-20130307/pswarp/src/Makefile.am

@@ -35 +35 @@
         pswarpDefine.c                  \
         pswarpDefineBackground.c        \
-        pswarpDefineSkycell.c           \
         pswarpErrorCodes.c              \
         pswarpMapGrid.c                 \

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

@@ -91 +91 @@
     
     // The input skycell is a required argument: it defines the output image
-    // XXX we may need a different skycell structure here
-    pmFPAfile *skycell = NULL;
+    bool status = false;
     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;
-    }
+    pmFPAfile *skycell = pmFPAfileDefineNewConfig(&status, &skyConfig, config, "PSWARP.SKYCELL", "SKYCELL");
+    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 +142 @@
     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");