IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 18, 2012, 5:56:48 AM (14 years ago)
Author:
eugene
Message:

merge changes from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/eam_branches/ipp-20121130/pswarp/src/pswarpParseCamera.c

    r28442 r34838  
    8484    }
    8585
     86    pmFPAfile *inBackground = defineInputFile(config, NULL, "PSWARP.BKGMODEL", "BACKGROUND",
     87                                              PM_FPA_FILE_IMAGE);
     88    if (!inBackground) {
     89      psLogMsg("pswarp", PS_LOG_INFO, "No background models supplied");
     90    }
     91   
    8692    // The input skycell is a required argument: it defines the output image
    8793    // XXX we may need a different skycell structure here
     
    134140    }
    135141
     142    if (inBackground && psMetadataLookupBool(&mdok, recipe, "BACKGROUND.MODEL")) {
     143      pmFPAfile *outBackground = pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT.BKGMODEL");
     144/*       pmFPAfile *outBackground = pmFPAfileDefineFromFPA(config,output->fpa, */
     145/*                                                      psMetadataLookupS32(&mdok,recipe,"BKG.XGRID"), */
     146/*                                                      psMetadataLookupS32(&mdok,recipe,"BKG.YGRID"), */
     147/*                                                      "PSWARP.OUTPUT.BKGMODEL"); */
     148      outBackground->xBin = psMetadataLookupS32(&mdok, recipe, "BKG.XGRID");
     149      outBackground->yBin = psMetadataLookupS32(&mdok, recipe, "BKG.YGRID");
     150     
     151      if (!outBackground) {
     152        psError(psErrorCodeLast(), false, "Failed to build FPA from PSWARP.OUTPUT.BKGMODEL");
     153        return false;
     154      }
     155      outBackground->save = true;
     156    }
     157   
    136158    if (psMetadataLookupBool(&mdok, recipe, "PSF")) {
    137159        // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by
Note: See TracChangeset for help on using the changeset viewer.