IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37325


Ignore:
Timestamp:
Aug 28, 2014, 8:21:21 AM (12 years ago)
Author:
bills
Message:

Add cmf format PS1_SV4. Only difference so far is that RA_EXT and
DEC_EXT are added to the XFIT extension

Location:
trunk/psModules/src/objects
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/objects

    • Property svn:ignore

      •  

        old new  
        1616pmSourceIO_CMF_PS1_SV2.c
        1717pmSourceIO_CMF_PS1_SV3.c
         18pmSourceIO_CMF_PS1_SV4.c
        1819pmSourceIO_CMF_PS1_DV1.c
        1920pmSourceIO_CMF_PS1_DV2.c
        2021pmSourceIO_CMF_PS1_DV3.c
        2122pmSourceIO_CMF_PS1_DV4.c
         23

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

    r36890 r37325  
    5353        pmSourceIO_CMF_PS1_SV2.c \
    5454        pmSourceIO_CMF_PS1_SV3.c \
     55        pmSourceIO_CMF_PS1_SV4.c \
    5556        pmSourceIO_CMF_PS1_DV1.c \
    5657        pmSourceIO_CMF_PS1_DV2.c \
    … …  
    157158pmSourceIO_CMF_PS1_SV1.c \
    158159pmSourceIO_CMF_PS1_SV2.c \
    159 pmSourceIO_CMF_PS1_SV3.c
     160pmSourceIO_CMF_PS1_SV3.c \
     161pmSourceIO_CMF_PS1_SV4.c
    160162
    161163pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl
    … …  
    195197        mksource.pl pmSourceIO_CMF.c.in PS1_SV3 pmSourceIO_CMF_PS1_SV3.c
    196198
     199pmSourceIO_CMF_PS1_SV4.c : pmSourceIO_CMF.c.in mksource.pl
     200        mksource.pl pmSourceIO_CMF.c.in PS1_SV4 pmSourceIO_CMF_PS1_SV4.c
     201
    197202# EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in

  • trunk/psModules/src/objects/mksource.pl

    r36864 r37325  
    2929                "PS1_SV2", 2,
    3030                "PS1_SV3", 3,
     31                "PS1_SV4", 4,
    3132    );
    3233

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

    r37051 r37325  
    602602            PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
    603603            PM_SOURCES_WRITE("PS1_SV3",   CMF_PS1_SV3);
     604            PM_SOURCES_WRITE("PS1_SV4",   CMF_PS1_SV4);
    604605            PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
    605606            PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
    … …  
    11241125            PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
    11251126            PM_SOURCES_READ_PSF("PS1_SV3",   CMF_PS1_SV3);
     1127            PM_SOURCES_READ_PSF("PS1_SV4",   CMF_PS1_SV4);
    11261128            PM_SOURCES_READ_PSF("PS1_DV1",   CMF_PS1_DV1);
    11271129            PM_SOURCES_READ_PSF("PS1_DV2",   CMF_PS1_DV2);
    … …  
    14121414        PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
    14131415        PM_SOURCES_READ_XSRC("PS1_SV3",   CMF_PS1_SV3);
     1416        PM_SOURCES_READ_XSRC("PS1_SV4",   CMF_PS1_SV4);
    14141417        PM_SOURCES_READ_XSRC("PS1_DV1",   CMF_PS1_DV1);
    14151418        PM_SOURCES_READ_XSRC("PS1_DV2",   CMF_PS1_DV2);
    … …  
    14541457        PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
    14551458        PM_SOURCES_READ_XFIT("PS1_SV3",   CMF_PS1_SV3);
     1459        PM_SOURCES_READ_XFIT("PS1_SV4",   CMF_PS1_SV4);
    14561460        PM_SOURCES_READ_XFIT("PS1_DV1",   CMF_PS1_DV1);
    14571461        PM_SOURCES_READ_XFIT("PS1_DV2",   CMF_PS1_DV2);
    … …  
    14951499        PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
    14961500        PM_SOURCES_READ_XRAD("PS1_SV3",   CMF_PS1_SV3);
     1501        PM_SOURCES_READ_XRAD("PS1_SV4",   CMF_PS1_SV4);
    14971502        PM_SOURCES_READ_XRAD("PS1_DV1",   CMF_PS1_DV1);
    14981503        PM_SOURCES_READ_XRAD("PS1_DV2",   CMF_PS1_DV2);
    … …  
    15361541        PM_SOURCES_READ_XGAL("PS1_SV2",   CMF_PS1_SV2);
    15371542        PM_SOURCES_READ_XGAL("PS1_SV3",   CMF_PS1_SV3);
     1543        PM_SOURCES_READ_XGAL("PS1_SV4",   CMF_PS1_SV4);
    15381544        PM_SOURCES_READ_XGAL("PS1_DV1",   CMF_PS1_DV1);
    15391545        PM_SOURCES_READ_XGAL("PS1_DV2",   CMF_PS1_DV2);

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

    r36890 r37325  
    4141MK_PROTO(CMF_PS1_SV2);
    4242MK_PROTO(CMF_PS1_SV3);
     43MK_PROTO(CMF_PS1_SV4);
    4344MK_PROTO(CMF_PS1_DV1);
    4445MK_PROTO(CMF_PS1_DV2);

  • trunk/psModules/src/objects/pmSourceIO_CMF.c.in

    r37321 r37325  
    915915    }
    916916
    917     @>PS1_DV2@ pmChip *chip = readout->parent->parent;
     917    @>PS1_DV2,>PS1_SV3@ pmChip *chip = readout->parent->parent;
    918918
    919919    pmModelStatus badModel = PM_MODEL_STATUS_NONE;
    … …  
    974974            }
    975975
    976             @>PS1_DV2@ psSphere ptSky = {0.0, 0.0, 0.0, 0.0};
    977             @>PS1_DV2@ float posAngle = 0.0;
    978             @>PS1_DV2@ float pltScale = 0.0;
    979             @>PS1_DV2@ pmSourceLocalAstrometry (&ptSky, &posAngle, &pltScale, chip, xPos, yPos);
    980             @>PS1_DV2@ double raPos = ptSky.r*PS_DEG_RAD;
    981             @>PS1_DV2@ double decPos = ptSky.d*PS_DEG_RAD;
    982             @>PS1_DV2@ posAngle *= PS_DEG_RAD;
    983             @>PS1_DV2@ pltScale *= PS_DEG_RAD*3600.0;
     976            @>PS1_DV2,>PS1_SV3@ psSphere ptSky = {0.0, 0.0, 0.0, 0.0};
     977            @>PS1_DV2,>PS1_SV3@ float posAngle = 0.0;
     978            @>PS1_DV2,>PS1_SV3@ float pltScale = 0.0;
     979            @>PS1_DV2,>PS1_SV3@ pmSourceLocalAstrometry (&ptSky, &posAngle, &pltScale, chip, xPos, yPos);
     980            @>PS1_DV2,>PS1_SV3@ double raPos = ptSky.r*PS_DEG_RAD;
     981            @>PS1_DV2,>PS1_SV3@ double decPos = ptSky.d*PS_DEG_RAD;
     982            @>PS1_DV2,>PS1_SV3@ posAngle *= PS_DEG_RAD;
     983            @>PS1_DV2,>PS1_SV3@ pltScale *= PS_DEG_RAD*3600.0;
    984984
    985985            float kronFlux = source->moments ? source->moments->KronFlux : NAN;
    … …  
    995995            psMetadataAddF32 (row, PS_LIST_TAIL, "X_EXT_SIG",        0, "Sigma in EXT x coordinate",                  xErr);
    996996            psMetadataAddF32 (row, PS_LIST_TAIL, "Y_EXT_SIG",        0, "Sigma in EXT y coordinate",                  yErr);
    997             @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "RA_EXT",           0, "EXT model ra coordinate",                    raPos);
    998             @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "DEC_EXT",          0, "EXT model dec coordinate",                   decPos);
     997            @>PS1_DV2,>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "RA_EXT",           0, "EXT model ra coordinate",                    raPos);
     998            @>PS1_DV2,>PS1_SV3@ psMetadataAddF32 (row, PS_LIST_TAIL, "DEC_EXT",          0, "EXT model dec coordinate",                   decPos);
    999999            @>PS1_DV2@ float instFlux = isfinite(model->mag) ? pow(10.0, -0.4*model->mag) : NAN;
    10001000            @>PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "EXT_INST_FLUX",    0, "EXT fit instrumental counts",                instFlux);
Note: See TracChangeset for help on using the changeset viewer.