IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36891


Ignore:
Timestamp:
Jun 17, 2014, 1:50:57 PM (12 years ago)
Author:
eugene
Message:

merge fix from trunk (missing PS1_SV3 and PS1_DV4 entries)

Location:
tags/ipp-pv3-20140616/psModules
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • tags/ipp-pv3-20140616/psModules

  • tags/ipp-pv3-20140616/psModules/src/objects

    • Property svn:ignore

      •  

        old new  
        1515pmSourceIO_CMF_PS1_SV1.c
        1616pmSourceIO_CMF_PS1_SV2.c
         17pmSourceIO_CMF_PS1_SV3.c
        1718pmSourceIO_CMF_PS1_DV1.c
        1819pmSourceIO_CMF_PS1_DV2.c
        1920pmSourceIO_CMF_PS1_DV3.c
        20 
         21pmSourceIO_CMF_PS1_DV4.c

  • tags/ipp-pv3-20140616/psModules/src/objects/Makefile.am

    r36623 r36891  
    5252        pmSourceIO_CMF_PS1_SV1.c \
    5353        pmSourceIO_CMF_PS1_SV2.c \
     54        pmSourceIO_CMF_PS1_SV3.c \
    5455        pmSourceIO_CMF_PS1_DV1.c \
    5556        pmSourceIO_CMF_PS1_DV2.c \
    5657        pmSourceIO_CMF_PS1_DV3.c \
     58        pmSourceIO_CMF_PS1_DV4.c \
    5759        pmSourceIO_MatchedRefs.c \
    5860        pmSourcePlots.c \
    … …  
    152154pmSourceIO_CMF_PS1_DV2.c \
    153155pmSourceIO_CMF_PS1_DV3.c \
     156pmSourceIO_CMF_PS1_DV4.c \
    154157pmSourceIO_CMF_PS1_SV1.c \
    155 pmSourceIO_CMF_PS1_SV2.c
     158pmSourceIO_CMF_PS1_SV2.c \
     159pmSourceIO_CMF_PS1_SV3.c
    156160
    157161pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl
    … …  
    179183        mksource.pl pmSourceIO_CMF.c.in PS1_DV3 pmSourceIO_CMF_PS1_DV3.c
    180184
     185pmSourceIO_CMF_PS1_DV4.c : pmSourceIO_CMF.c.in mksource.pl
     186        mksource.pl pmSourceIO_CMF.c.in PS1_DV4 pmSourceIO_CMF_PS1_DV4.c
     187
    181188pmSourceIO_CMF_PS1_SV1.c : pmSourceIO_CMF.c.in mksource.pl
    182189        mksource.pl pmSourceIO_CMF.c.in PS1_SV1 pmSourceIO_CMF_PS1_SV1.c
    … …  
    185192        mksource.pl pmSourceIO_CMF.c.in PS1_SV2 pmSourceIO_CMF_PS1_SV2.c
    186193
     194pmSourceIO_CMF_PS1_SV3.c : pmSourceIO_CMF.c.in mksource.pl
     195        mksource.pl pmSourceIO_CMF.c.in PS1_SV3 pmSourceIO_CMF_PS1_SV3.c
     196
    187197# EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in

  • tags/ipp-pv3-20140616/psModules/src/objects/pmSourceIO.c

    r36856 r36891  
    601601            PM_SOURCES_WRITE("PS1_SV1",   CMF_PS1_SV1);
    602602            PM_SOURCES_WRITE("PS1_SV2",   CMF_PS1_SV2);
     603            PM_SOURCES_WRITE("PS1_SV3",   CMF_PS1_SV3);
    603604            PM_SOURCES_WRITE("PS1_DV1",   CMF_PS1_DV1);
    604605            PM_SOURCES_WRITE("PS1_DV2",   CMF_PS1_DV2);
    605606            PM_SOURCES_WRITE("PS1_DV3",   CMF_PS1_DV3);
     607            PM_SOURCES_WRITE("PS1_DV4",   CMF_PS1_DV4);
    606608
    607609            psFree (outhead);
    … …  
    11211123            PM_SOURCES_READ_PSF("PS1_SV1",   CMF_PS1_SV1);
    11221124            PM_SOURCES_READ_PSF("PS1_SV2",   CMF_PS1_SV2);
     1125            PM_SOURCES_READ_PSF("PS1_SV3",   CMF_PS1_SV3);
    11231126            PM_SOURCES_READ_PSF("PS1_DV1",   CMF_PS1_DV1);
    11241127            PM_SOURCES_READ_PSF("PS1_DV2",   CMF_PS1_DV2);
    11251128            PM_SOURCES_READ_PSF("PS1_DV3",   CMF_PS1_DV3);
     1129            PM_SOURCES_READ_PSF("PS1_DV4",   CMF_PS1_DV4);
    11261130
    11271131            long *sourceIndex = NULL;

  • tags/ipp-pv3-20140616/psModules/src/objects/pmSourceIO.h

    r36757 r36891  
    4040MK_PROTO(CMF_PS1_SV1);
    4141MK_PROTO(CMF_PS1_SV2);
     42MK_PROTO(CMF_PS1_SV3);
    4243MK_PROTO(CMF_PS1_DV1);
    4344MK_PROTO(CMF_PS1_DV2);
    4445MK_PROTO(CMF_PS1_DV3);
     46MK_PROTO(CMF_PS1_DV4);
    4547
    4648int pmSourceGetDophotType (pmSource *source);
Note: See TracChangeset for help on using the changeset viewer.