IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28860


Ignore:
Timestamp:
Aug 6, 2010, 3:12:05 PM (16 years ago)
Author:
eugene
Message:

populate the source peak SN element correctly; add PS1_DV1 format (includes close-neighbor match info)

Location:
branches/eam_branches/ipp-20100621/psModules/src/objects
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20100621/psModules/src/objects/Makefile.am

    r28692 r28860  
    4646        pmSourceIO_CMF_PS1_SV1.c \
    4747        pmSourceIO_CMF_PS1_DV1.c \
     48        pmSourceIO_CMF_PS1_DV2.c \
    4849        pmSourceIO_MatchedRefs.c \
    4950        pmSourcePlots.c \

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSource.c

    r28781 r28860  
    122122    source->type = PM_SOURCE_TYPE_UNKNOWN;
    123123    source->mode = PM_SOURCE_MODE_DEFAULT;
     124    source->mode2 = PM_SOURCE_MODE_DEFAULT;
    124125    source->tmpFlags = 0;
    125126    source->extpars = NULL;

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO.c

    r28643 r28860  
    552552            PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
    553553            PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
     554            PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
    554555
    555556            psFree (outhead);
    … …  
    10061007                sources = pmSourcesRead_CMF_PS1_DV1 (file->fits, hdu->header);
    10071008            }
     1009            if (!strcmp (exttype, "PS1_DV2")) {
     1010                sources = pmSourcesRead_CMF_PS1_DV2 (file->fits, hdu->header);
     1011            }
    10081012
    10091013            if (!pmReadoutReadDetEff(file->fits, readout, deteffname)) {

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO.h

    r28643 r28860  
    6363bool pmSourcesWrite_CMF_PS1_DV1_XFIT(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname);
    6464
     65bool pmSourcesWrite_CMF_PS1_DV2(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, psMetadata *tableHeader, char *extname, psMetadata *recipe);
     66bool pmSourcesWrite_CMF_PS1_DV2_XSRC(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname, psMetadata *recipe);
     67bool pmSourcesWrite_CMF_PS1_DV2_XFIT(psFits *fits, pmReadout *readout, psArray *sources, psMetadata *imageHeader, char *extname);
     68
    6569psArray *pmSourcesReadCMP (char *filename, psMetadata *header);
    6670
    … …  
    7377psArray *pmSourcesRead_CMF_PS1_SV1 (psFits *fits, psMetadata *header);
    7478psArray *pmSourcesRead_CMF_PS1_DV1 (psFits *fits, psMetadata *header);
     79psArray *pmSourcesRead_CMF_PS1_DV2 (psFits *fits, psMetadata *header);
    7580
    7681bool pmSourcesWritePSFs (psArray *sources, char *filename);

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_DV1.c

    r28643 r28860  
    332332        source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE);
    333333        source->peak->flux = peakFlux;
     334        source->peak->xf   = PAR[PM_PAR_XPOS]; // more accurate position
     335        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    334336        source->peak->dx   = dPAR[PM_PAR_XPOS];
    335337        source->peak->dy   = dPAR[PM_PAR_YPOS];
    336         source->peak->SN   = sqrt(source->peak->flux); // XXX a proxy: various functions sort by peak S/N
     338        if (isfinite (source->errMag) && (source->errMag > 0.0)) {
     339          source->peak->SN = 1.0 / source->errMag;
     340        } else {
     341          source->peak->SN = sqrt(source->peak->flux); // an alternate proxy: various functions sort by peak S/N
     342        }
    337343
    338344        source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c

    r28643 r28860  
    361361        source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE);
    362362        source->peak->flux = peakFlux;
     363        source->peak->xf   = PAR[PM_PAR_XPOS]; // more accurate position
     364        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    363365        source->peak->dx   = dPAR[PM_PAR_XPOS];
    364366        source->peak->dy   = dPAR[PM_PAR_YPOS];
    365         source->peak->SN   = sqrt(source->peak->flux); // XXX a proxy: various functions sort by peak S/N
     367        if (isfinite (source->errMag) && (source->errMag > 0.0)) {
     368          source->peak->SN = 1.0 / source->errMag;
     369        } else {
     370          source->peak->SN = sqrt(source->peak->flux); // an alternate proxy: various functions sort by peak S/N
     371        }
    366372
    367373        source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_V1.c

    r28643 r28860  
    318318        source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE);
    319319        source->peak->flux = peakFlux;
     320        source->peak->xf   = PAR[PM_PAR_XPOS]; // more accurate position
     321        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    320322        source->peak->dx   = dPAR[PM_PAR_XPOS];
    321323        source->peak->dy   = dPAR[PM_PAR_YPOS];
     324        if (isfinite (source->errMag) && (source->errMag > 0.0)) {
     325          source->peak->SN = 1.0 / source->errMag;
     326        } else {
     327          source->peak->SN = sqrt(source->peak->flux); // an alternate proxy: various functions sort by peak S/N
     328        }
    322329
    323330        source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c

    r28643 r28860  
    323323        source->peak = pmPeakAlloc(PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], peakFlux, PM_PEAK_LONE);
    324324        source->peak->flux = peakFlux;
     325        source->peak->xf   = PAR[PM_PAR_XPOS]; // more accurate position
     326        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    325327        source->peak->dx   = dPAR[PM_PAR_XPOS];
    326328        source->peak->dy   = dPAR[PM_PAR_YPOS];
    327         source->peak->SN   = sqrt(source->peak->flux); // XXX a proxy: various functions sort by peak S/N
     329        if (isfinite (source->errMag) && (source->errMag > 0.0)) {
     330          source->peak->SN = 1.0 / source->errMag;
     331        } else {
     332          source->peak->SN = sqrt(source->peak->flux); // an alternate proxy: various functions sort by peak S/N
     333        }
    328334
    329335        source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_V3.c

    r28643 r28860  
    354354        source->peak->dx   = dPAR[PM_PAR_XPOS];
    355355        source->peak->dy   = dPAR[PM_PAR_YPOS];
    356         source->peak->SN   = sqrt(source->peak->flux); // XXX a proxy: various functions sort by peak S/N
     356        source->peak->xf   = PAR[PM_PAR_XPOS]; // more accurate position
     357        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
     358        if (isfinite (source->errMag) && (source->errMag > 0.0)) {
     359          source->peak->SN = 1.0 / source->errMag;
     360        } else {
     361          source->peak->SN = sqrt(source->peak->flux); // an alternate proxy: various functions sort by peak S/N
     362        }
    357363
    358364        source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_PS1_CAL_0.c

    r28643 r28860  
    297297        source->peak->dx   = dPAR[PM_PAR_XPOS];
    298298        source->peak->dy   = dPAR[PM_PAR_YPOS];
     299        source->peak->xf   = PAR[PM_PAR_XPOS]; // more accurate position
     300        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    299301
    300302        source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

    r28643 r28860  
    223223        source->peak->dx   = dPAR[PM_PAR_XPOS];
    224224        source->peak->dy   = dPAR[PM_PAR_YPOS];
     225        source->peak->xf   = PAR[PM_PAR_XPOS]; // more accurate position
     226        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    225227
    226228        source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_PS1_DEV_1.c

    r28643 r28860  
    266266        source->peak->dx   = dPAR[PM_PAR_XPOS];
    267267        source->peak->dy   = dPAR[PM_PAR_YPOS];
     268        source->peak->xf   = PAR[PM_PAR_XPOS]; // more accurate position
     269        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    268270
    269271        source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
Note: See TracChangeset for help on using the changeset viewer.