IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 19, 2014, 4:14:54 PM (12 years ago)
Author:
eugene
Message:

merge from trunk; add -photcode-rule option to pmConfig

Location:
branches/eam_branches/ipp-20140610/psModules
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140610/psModules

  • branches/eam_branches/ipp-20140610/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

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

    r36884 r36916  
    365365# define PM_SOURCES_WRITE(NAME,TYPE)                                    \
    366366    if (!strcmp (exttype, NAME)) {                                      \
    367         status &= pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
     367        status = pmSourcesWrite_##TYPE(file->fits, readout, sources, file->header, outhead, dataname, recipe); \
    368368        if (xsrcname) {                                                 \
    369369            status &= pmSourcesWrite_##TYPE##_XSRC(file->fits, readout, sources, file->header, xsrcname, recipe); \
    … …  
    589589
    590590            // these are case-sensitive since the EXTYPE is case-sensitive
    591             status = true;
     591            status = false;
    592592            PM_SOURCES_WRITE("SMPDATA",   SMPDATA);
    593593            PM_SOURCES_WRITE("PS1_DEV_0", PS1_DEV_0);
    … …  
    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;
Note: See TracChangeset for help on using the changeset viewer.