IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 11, 2012, 2:04:31 PM (14 years ago)
Author:
watersc1
Message:

Merge from my branch including background restoration and stack stage projection cell binned images.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/ppStack/src/ppStackUpdateHeader.c

    r31158 r34800  
    66
    77    pmReadout *outRO = options->outRO;                                      // Output readout
     8    pmReadout *expRO = options->expRO;
    89
    910    // Propagate WCS
    1011    bool wcsDone = false;           // Have we done the WCS?
    1112    for (int i = 0; i < options->num && !wcsDone; i++) {
    12         if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) {
     13      if ((options->inputMask)&&(options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i])) {
    1314            continue;
    1415        }
     
    123124        snprintf (field, 64, "AIR_%04d", i);
    124125        psMetadataAddF32(hdu->header, PS_LIST_TAIL, field, PS_META_REPLACE, "input image airmass", value);
    125     }   
     126    }
     127
     128    // Copy information into expRO, because it should be there too.
     129    if ((expRO)&&(expRO->parent)) {
     130      pmHDU *expROhdu = pmHDUFromCell(expRO->parent);
     131      if (!expROhdu->header) {
     132        expROhdu->header = psMetadataAlloc();
     133      }
     134      expRO->parent->parent->parent->hdu->header = psMetadataCopy(expRO->parent->parent->parent->hdu->header,
     135                                                                  outRO->parent->parent->parent->hdu->header);
     136     
     137      expRO->parent->concepts = psMetadataCopy(expRO->parent->concepts,
     138                                               outRO->parent->concepts);
     139      expRO->parent->parent->concepts = psMetadataCopy(expRO->parent->parent->concepts,
     140                                                       outRO->parent->concepts);
     141      expRO->parent->parent->parent->concepts = psMetadataCopy(expRO->parent->parent->parent->concepts,
     142                                                               outRO->parent->parent->parent->concepts);
     143    }
     144   
    126145    return true;
    127146}
Note: See TracChangeset for help on using the changeset viewer.