IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 33690 for trunk/psModules


Ignore:
Timestamp:
Apr 3, 2012, 5:46:39 PM (14 years ago)
Author:
bills
Message:

In psphot and psphotStack accept exposure number images (EXPNUM) as inputs.
If supplied set the N_FRAMES value for each source based on the
value in the EXPNUM image.

Location:
trunk/psModules/src
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/camera/Makefile.am

    r24836 r33690  
    3030        pmReadoutStack.c \
    3131        pmReadoutFake.c \
    32         pmFPABin.c
     32        pmFPABin.c \
     33        pmFPAExpNumIO.c
    3334
    3435pkginclude_HEADERS = \
    … …  
    5960        pmReadoutStack.h \
    6061        pmReadoutFake.h \
    61         pmFPABin.h
     62        pmFPABin.h \
     63        pmFPAExpNumIO.h
    6264
    6365CLEANFILES = *~

  • trunk/psModules/src/camera/pmFPAfile.c

    r31671 r33690  
    543543    if (!strcasecmp(type, "PATTERN")) {
    544544        return PM_FPA_FILE_PATTERN;
     545    }
     546    if (!strcasecmp(type, "EXPNUM")) {
     547        return PM_FPA_FILE_EXPNUM;
    545548    }
    546549
    … …  
    589592      case PM_FPA_FILE_PATTERN:
    590593        return "PATTERN";
     594      case PM_FPA_FILE_EXPNUM:
     595        return "EXPNUM";
    591596      default:
    592597        return ("NONE");

  • trunk/psModules/src/camera/pmFPAfile.h

    r29833 r33690  
    5151    PM_FPA_FILE_PATTERN,
    5252    PM_FPA_FILE_LINEARITY,
     53    PM_FPA_FILE_EXPNUM,
    5354} pmFPAfileType;
    5455

  • trunk/psModules/src/camera/pmFPAfileIO.c

    r29935 r33690  
    5353#include "pmSubtractionIO.h"
    5454#include "pmPatternIO.h"
     55#include "pmFPAExpNumIO.h"
    5556#include "pmConcepts.h"
    5657#include "pmConfigRun.h"
    … …  
    231232        status = pmAstromModelReadForView (view, file, config);
    232233        break;
     234      case PM_FPA_FILE_EXPNUM:
     235        status = pmExpNumRead(view, file, config);
     236        break;
    233237      case PM_FPA_FILE_ASTROM_REFSTARS:
    234238      case PM_FPA_FILE_JPEG:
    … …  
    291295      case PM_FPA_FILE_DARK:
    292296      case PM_FPA_FILE_PATTERN:
     297      case PM_FPA_FILE_EXPNUM:
    293298        {
    294299            // create FPA structure component based on view
    … …  
    500505        status = pmFPAviewWriteSourcePlot (view, file, config);
    501506        break;
     507
     508      case PM_FPA_FILE_EXPNUM:
     509        // when ppStack output's EXPNUM file it uses a file rule where the file type is MASK
     510        psError(PS_ERR_IO, true, "cannot write type EXPNUM (%s)", file->name);
     511        return false;
    502512
    503513      case PM_FPA_FILE_WCS:
    … …  
    562572      case PM_FPA_FILE_ASTROM_REFSTARS:
    563573      case PM_FPA_FILE_LINEARITY:
     574      case PM_FPA_FILE_EXPNUM:
    564575        psTrace ("psModules.camera", 5, "closing %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
    565576        status = psFitsClose (file->fits);
    … …  
    636647      case PM_FPA_FILE_ASTROM_MODEL:
    637648      case PM_FPA_FILE_ASTROM_REFSTARS:
     649      case PM_FPA_FILE_EXPNUM:
    638650        psTrace ("psModules.camera", 6, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name);
    639651        return true;
    … …  
    797809      case PM_FPA_FILE_ASTROM_REFSTARS:
    798810      case PM_FPA_FILE_LINEARITY:
     811      case PM_FPA_FILE_EXPNUM:
    799812        psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n",
    800813                 file->filename, file->name, view->chip, view->cell, view->readout);
    … …  
    9961009        status = pmAstromRefstarsWritePHU (view, file, config);
    9971010        break;
     1011      case PM_FPA_FILE_EXPNUM:
    9981012      case PM_FPA_FILE_ASTROM_MODEL:
    9991013      case PM_FPA_FILE_SX:

  • trunk/psModules/src/objects/pmSource.c

    r32695 r33690  
    160160    source->parent = NULL;
    161161    source->imageID = -1;
     162    source->nFrames = 0;
    162163
    163164    psMemSetDeallocator(source, (psFreeFunc) sourceFree);

  • trunk/psModules/src/objects/pmSource.h

    r32695 r33690  
    118118    pmSource *parent;                   ///< reference to the master source from which this is derived
    119119    int imageID;
     120    psU16 nFrames;
    120121};
    121122

  • trunk/psModules/src/objects/pmSourceIO_CMF_PS1_DV1.c

    r32347 r33690  
    8181    }
    8282
    83     short nImageOverlap;
    8483    float magOffset;
    8584    float zeroptErr;
    8685    float fwhmMajor;
    8786    float fwhmMinor;
    88     pmSourceOutputsCommonValues (&nImageOverlap, &magOffset, &zeroptErr, &fwhmMajor, &fwhmMinor, readout, imageHeader);
     87    pmSourceOutputsCommonValues (&magOffset, &zeroptErr, &fwhmMajor, &fwhmMinor, readout, imageHeader);
    8988
    9089    table = psArrayAllocEmpty (sources->n);
    … …  
    161160        psMetadataAdd (row, PS_LIST_TAIL, "FLAGS",            PS_DATA_U32, "psphot analysis flags",                      source->mode);
    162161
    163         // XXX not sure how to get this : need to load Nimages with weight?
    164         psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_U16, "Number of frames overlapping source center", nImageOverlap);
     162        psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_U16, "Number of frames overlapping source center", source->nFrames);
    165163        psMetadataAdd (row, PS_LIST_TAIL, "PADDING",          PS_DATA_S16, "padding", 0);
    166164

  • trunk/psModules/src/objects/pmSourceIO_CMF_PS1_DV2.c

    r32347 r33690  
    8282    table = psArrayAllocEmpty (sources->n);
    8383
    84     short nImageOverlap;
    8584    float magOffset;
    8685    float zeroptErr;
    8786    float fwhmMajor;
    8887    float fwhmMinor;
    89     pmSourceOutputsCommonValues (&nImageOverlap, &magOffset, &zeroptErr, &fwhmMajor, &fwhmMinor, readout, imageHeader);
     88    pmSourceOutputsCommonValues (&magOffset, &zeroptErr, &fwhmMajor, &fwhmMinor, readout, imageHeader);
    9089
    9190    // we write out PSF-fits for all sources, regardless of quality.  the source flags tell us the state
    … …  
    180179
    181180        // XXX not sure how to get this : need to load Nimages with weight?
    182         psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_U16, "Number of frames overlapping source center", nImageOverlap);
     181        psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_U16, "Number of frames overlapping source center", source->nFrames);
    183182        psMetadataAdd (row, PS_LIST_TAIL, "PADDING",          PS_DATA_S16, "padding", 0);
    184183

  • trunk/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c

    r32977 r33690  
    8484    table = psArrayAllocEmpty (sources->n);
    8585
    86     short nImageOverlap;
    8786    float magOffset;
    8887    float zeroptErr;
    8988    float fwhmMajor;
    9089    float fwhmMinor;
    91     pmSourceOutputsCommonValues (&nImageOverlap, &magOffset, &zeroptErr, &fwhmMajor, &fwhmMinor, readout, imageHeader);
     90    pmSourceOutputsCommonValues (&magOffset, &zeroptErr, &fwhmMajor, &fwhmMinor, readout, imageHeader);
    9291
    9392    // we write out PSF-fits for all sources, regardless of quality.  the source flags tell us the state
    … …  
    170169        psMetadataAdd (row, PS_LIST_TAIL, "FLAGS2",           PS_DATA_U32, "psphot analysis flags",                     source->mode2);
    171170
    172         // XXX not sure how to get this : need to load Nimages with weight?
    173         psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_U16, "Number of frames overlapping source center", nImageOverlap);
     171        psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_U16, "Number of frames overlapping source center", source->nFrames);
    174172        psMetadataAdd (row, PS_LIST_TAIL, "PADDING",          PS_DATA_S16, "padding", 0);
    175173

  • trunk/psModules/src/objects/pmSourceOutputs.c

    r32347 r33690  
    4040#include "pmSourceOutputs.h"
    4141
    42 bool pmSourceOutputsCommonValues (short *nImageOverlap, float *magOffset, float *zeroptErr, float *fwhmMajor, float *fwhmMinor, pmReadout *readout, psMetadata *header) {
     42bool pmSourceOutputsCommonValues (float *magOffset, float *zeroptErr, float *fwhmMajor, float *fwhmMinor, pmReadout *readout, psMetadata *header) {
    4343
    4444    pmFPA  *fpa  = readout->parent->parent->parent;
    … …  
    7272    }
    7373
    74     *nImageOverlap = psMetadataLookupS32 (&status2, header, "NINPUTS");
    7574    return true;
    7675

  • trunk/psModules/src/objects/pmSourceOutputs.h

    r32347 r33690  
    5656} pmSourceOutputsMoments;
    5757
    58 bool pmSourceOutputsCommonValues (short *nImageOverlap, float *magOffset, float *zeroptErr, float *fwhmMajor, float *fwhmMinor, pmReadout *readout, psMetadata *header);
     58bool pmSourceOutputsCommonValues (float *magOffset, float *zeroptErr, float *fwhmMajor, float *fwhmMinor, pmReadout *readout, psMetadata *header);
    5959
    6060bool pmSourceOutputsSetValues (pmSourceOutputs *outputs, pmSource *source, pmChip *chip, float fwhmMajor, float fwhmMinor, float magOffset);
Note: See TracChangeset for help on using the changeset viewer.