IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 17, 2014, 12:30:45 PM (12 years ago)
Author:
eugene
Message:

merge changes (from past YEAR) into trunk

Location:
branches/eam_branches/ipp-ops-20130712/psModules
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-ops-20130712/psModules

    • Property svn:mergeinfo deleted

  • branches/eam_branches/ipp-ops-20130712/psModules/src/objects

    • Property svn:ignore

      •  

        old new  
        1212pmSourceIO_CMF_PS1_V1.v1.c
        1313pmSourceIO_CMF_PS1_V4.c
         14pmSourceIO_CMF_PS1_V5.c
        1415pmSourceIO_CMF_PS1_SV1.c
        1516pmSourceIO_CMF_PS1_SV2.c
         17pmSourceIO_CMF_PS1_SV3.c
        1618pmSourceIO_CMF_PS1_DV1.c
        1719pmSourceIO_CMF_PS1_DV2.c
        1820pmSourceIO_CMF_PS1_DV3.c
        19 
         21pmSourceIO_CMF_PS1_DV4.c

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

    r34823 r37066  
    2020        pmModelClass.c \
    2121        pmModelUtils.c \
     22        pmModel_CentralPixel.c \
    2223        pmSource.c \
    2324        pmPhotObj.c \
    … …  
    3940        pmSourceIO_SX.c \
    4041        pmSourceIO_CMP.c \
     42        pmSourceIO_CFF.c \
    4143        pmSourceIO_SMPDATA.c \
    4244        pmSourceIO_PS1_DEV_0.c \
    … …  
    4749        pmSourceIO_CMF_PS1_V3.c \
    4850        pmSourceIO_CMF_PS1_V4.c \
     51        pmSourceIO_CMF_PS1_V5.c \
    4952        pmSourceIO_CMF_PS1_SV1.c \
    5053        pmSourceIO_CMF_PS1_SV2.c \
     54        pmSourceIO_CMF_PS1_SV3.c \
    5155        pmSourceIO_CMF_PS1_DV1.c \
    5256        pmSourceIO_CMF_PS1_DV2.c \
    5357        pmSourceIO_CMF_PS1_DV3.c \
     58        pmSourceIO_CMF_PS1_DV4.c \
    5459        pmSourceIO_MatchedRefs.c \
    5560        pmSourcePlots.c \
    … …  
    7479        pmGrowthCurve.c \
    7580        pmSourceMatch.c \
     81        pmSourceLensing.c \
    7682        pmDetEff.c \
    7783        pmSourceGroups.c \
    … …  
    97103        pmModelClass.h \
    98104        pmModelUtils.h \
     105        pmModel_CentralPixel.h \
    99106        pmSource.h \
    100107        pmPhotObj.h \
    … …  
    110117        pmSourceOutputs.h \
    111118        pmSourceIO.h \
    112         pmSourceSatstar.h \ 
     119        pmSourceSatstar.h \
    113120        pmSourcePlots.h \
    114121        pmSourceVisual.h \
    … …  
    122129        pmGrowthCurveGenerate.h \
    123130        pmSourceMatch.h \
     131        pmSourceLensing.h \
    124132        pmDetEff.h \
    125133        pmSourceGroups.h \
    … …  
    142150pmSourceIO_CMF_PS1_V3.c \
    143151pmSourceIO_CMF_PS1_V4.c \
     152pmSourceIO_CMF_PS1_V5.c \
    144153pmSourceIO_CMF_PS1_DV1.c \
    145154pmSourceIO_CMF_PS1_DV2.c \
    146155pmSourceIO_CMF_PS1_DV3.c \
     156pmSourceIO_CMF_PS1_DV4.c \
    147157pmSourceIO_CMF_PS1_SV1.c \
    148 pmSourceIO_CMF_PS1_SV2.c
     158pmSourceIO_CMF_PS1_SV2.c \
     159pmSourceIO_CMF_PS1_SV3.c
    149160
    150161pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl
    … …  
    160171        mksource.pl pmSourceIO_CMF.c.in PS1_V4 pmSourceIO_CMF_PS1_V4.c
    161172
     173pmSourceIO_CMF_PS1_V5.c : pmSourceIO_CMF.c.in mksource.pl
     174        mksource.pl pmSourceIO_CMF.c.in PS1_V5 pmSourceIO_CMF_PS1_V5.c
     175
    162176pmSourceIO_CMF_PS1_DV1.c : pmSourceIO_CMF.c.in mksource.pl
    163177        mksource.pl pmSourceIO_CMF.c.in PS1_DV1 pmSourceIO_CMF_PS1_DV1.c
    … …  
    169183        mksource.pl pmSourceIO_CMF.c.in PS1_DV3 pmSourceIO_CMF_PS1_DV3.c
    170184
     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
    171188pmSourceIO_CMF_PS1_SV1.c : pmSourceIO_CMF.c.in mksource.pl
    172189        mksource.pl pmSourceIO_CMF.c.in PS1_SV1 pmSourceIO_CMF_PS1_SV1.c
    … …  
    175192        mksource.pl pmSourceIO_CMF.c.in PS1_SV2 pmSourceIO_CMF_PS1_SV2.c
    176193
     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
    177197# EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in
Note: See TracChangeset for help on using the changeset viewer.