IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Sep 4, 2012, 1:22:26 PM (14 years ago)
Author:
eugene
Message:

added cmf formats PS1_V4 and PS1_SV2 to both psModules and Ohana/libautocode; checked that they both work; checked that dvo schema PS1_V4 can be loaded and read

Location:
branches/eam_branches/ipp-20120805/psModules/src/objects
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r34381 r34383  
    4848        pmSourceIO_CMF_PS1_V4.c \
    4949        pmSourceIO_CMF_PS1_SV1.c \
     50        pmSourceIO_CMF_PS1_SV2.c \
    5051        pmSourceIO_CMF_PS1_DV1.c \
    5152        pmSourceIO_CMF_PS1_DV2.c \
    … …  
    136137
    137138# pmSourceID_CMF_* functions use a common framework
    138 BUILT_SOURCES = pmSourceIO_CMF_PS1_V1.c pmSourceIO_CMF_PS1_V2.c pmSourceIO_CMF_PS1_V3.c pmSourceIO_CMF_PS1_DV1.c pmSourceIO_CMF_PS1_DV2.c pmSourceIO_CMF_PS1_DV3.c pmSourceIO_CMF_PS1_SV1.c
     139BUILT_SOURCES = \
     140pmSourceIO_CMF_PS1_V1.c \
     141pmSourceIO_CMF_PS1_V2.c \
     142pmSourceIO_CMF_PS1_V3.c \
     143pmSourceIO_CMF_PS1_V4.c \
     144pmSourceIO_CMF_PS1_DV1.c \
     145pmSourceIO_CMF_PS1_DV2.c \
     146pmSourceIO_CMF_PS1_DV3.c \
     147pmSourceIO_CMF_PS1_SV1.c \
     148pmSourceIO_CMF_PS1_SV2.c
    139149
    140150pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl

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

    r34376 r34383  
    575575            PM_SOURCES_WRITE("PS1_V4",    CMF_PS1_V4);
    576576            PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
     577            PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
    577578            PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
    578579            PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
     580            PM_SOURCES_WRITE("PS1_DV3",   CMF_PS1_DV3);
    579581
    580582            psFree (outhead);
    … …  
    10481050            PM_SOURCES_READ_PSF("PS1_V4",    CMF_PS1_V4);
    10491051            PM_SOURCES_READ_PSF("PS1_SV1",   CMF_PS1_SV1);
     1052            PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
    10501053            PM_SOURCES_READ_PSF("PS1_DV1",   CMF_PS1_DV1);
    10511054            PM_SOURCES_READ_PSF("PS1_DV2",   CMF_PS1_DV2);
     1055            PM_SOURCES_READ_PSF("PS1_DV3",   CMF_PS1_DV3);
    10521056
    10531057            long *sourceIndex = NULL;
    … …  
    12541258        PM_SOURCES_READ_XSRC("PS1_V4",    CMF_PS1_V4);
    12551259        PM_SOURCES_READ_XSRC("PS1_SV1",   CMF_PS1_SV1);
     1260        PM_SOURCES_READ_XSRC("PS1_SV2",   CMF_PS1_SV2);
    12561261        PM_SOURCES_READ_XSRC("PS1_DV1",   CMF_PS1_DV1);
    12571262        PM_SOURCES_READ_XSRC("PS1_DV2",   CMF_PS1_DV2);
     1263        PM_SOURCES_READ_XSRC("PS1_DV3",   CMF_PS1_DV3);
    12581264    }
    12591265    psFree(tableHeader);
    … …  
    12901296        PM_SOURCES_READ_XFIT("PS1_V4",    CMF_PS1_V4);
    12911297        PM_SOURCES_READ_XFIT("PS1_SV1",   CMF_PS1_SV1);
     1298        PM_SOURCES_READ_XFIT("PS1_SV2",   CMF_PS1_SV2);
    12921299        PM_SOURCES_READ_XFIT("PS1_DV1",   CMF_PS1_DV1);
    12931300        PM_SOURCES_READ_XFIT("PS1_DV2",   CMF_PS1_DV2);
     1301        PM_SOURCES_READ_XFIT("PS1_DV3",   CMF_PS1_DV3);
    12941302    }
    12951303    psFree(tableHeader);
    … …  
    13251333        PM_SOURCES_READ_XRAD("PS1_V4",    CMF_PS1_V4);
    13261334        PM_SOURCES_READ_XRAD("PS1_SV1",   CMF_PS1_SV1);
     1335        PM_SOURCES_READ_XRAD("PS1_SV2",   CMF_PS1_SV2);
    13271336        PM_SOURCES_READ_XRAD("PS1_DV1",   CMF_PS1_DV1);
    13281337        PM_SOURCES_READ_XRAD("PS1_DV2",   CMF_PS1_DV2);
     1338        PM_SOURCES_READ_XRAD("PS1_DV3",   CMF_PS1_DV3);
    13291339    }
    13301340    psFree(tableHeader);

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

    r34367 r34383  
    3636MK_PROTO(CMF_PS1_V4);
    3737MK_PROTO(CMF_PS1_SV1);
     38MK_PROTO(CMF_PS1_SV2);
    3839MK_PROTO(CMF_PS1_DV1);
    3940MK_PROTO(CMF_PS1_DV2);

  • branches/eam_branches/ipp-20120805/psModules/src/objects/pmSourceIO_CMF.c.in

    r34381 r34383  
    142142        @>PS1_DV1,>PS1_V3,>PS1_SV1@ psMetadataAdd (row, PS_LIST_TAIL, "AP_FLUX_SIG",      PS_DATA_F32, "aperture flux error",                        source->apFluxErr);
    143143
    144         @<PS1_V3,PS1_SV?,PS1_DV?@ psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           outputs.peakMag);
     144        @<PS1_V3,PS1_SV1,PS1_DV?@ psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           outputs.peakMag);
    145145
    146146        @ALL@                     psMetadataAdd (row, PS_LIST_TAIL, "CAL_PSF_MAG",      PS_DATA_F32, "PSF Magnitude using supplied calibration",   outputs.calMag);
    … …  
    151151        @ALL,!PS1_V1@             psMetadataAdd (row, PS_LIST_TAIL, "DEC_PSF",          PS_DATA_F64, "PSF DEC coordinate (degrees)",               outputs.dec);
    152152
    153         @>=PS1_V3@                psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           outputs.peakMag);
     153        @>=PS1_V3,>PS1_SV1@       psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           outputs.peakMag);
    154154        @ALL@                     psMetadataAdd (row, PS_LIST_TAIL, "SKY",              PS_DATA_F32, "Sky level",                                  source->sky);
    155155        @ALL@                     psMetadataAdd (row, PS_LIST_TAIL, "SKY_SIGMA",        PS_DATA_F32, "Sigma of sky level",                         source->skyErr);
    … …  
    200200        @ALL@                      psMetadataAdd (row, PS_LIST_TAIL, "FLAGS",            PS_DATA_U32, "psphot analysis flags",                      source->mode);
    201201        @>PS1_V2,PS1_SV?,>PS1_DV1@ psMetadataAdd (row, PS_LIST_TAIL, "FLAGS2",           PS_DATA_U32, "psphot analysis flags",                      source->mode2);
    202         @>PS1_V2@                  psMetadataAdd (row, PS_LIST_TAIL, "PADDING2",         PS_DATA_S32, "more padding", 0);
     202        @PS1_V3,PS1_SV2@           psMetadataAdd (row, PS_LIST_TAIL, "PADDING2",         PS_DATA_S32, "more padding", 0);
    203203        @PS1_SV?@
    204204
Note: See TracChangeset for help on using the changeset viewer.