IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Nov 26, 2010, 10:33:51 AM (16 years ago)
Author:
eugene
Message:

merge updates from trunk

Location:
branches/eam_branches/ipp-20101103/ippTools
Files:
4 edited
9 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20101103/ippTools

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20101103/ippTools/share/Makefile.am

    r29627 r29835  
    2121        bgtool_advancechip.sql \
    2222        bgtool_advancewarp.sql \
     23        bgtool_change_chiprun_state.sql \
     24        bgtool_change_imfile_data_state.sql \
     25        bgtool_change_warprun_state.sql \
     26        bgtool_change_skyfile_data_state.sql \
    2327        bgtool_chipinputs.sql \
    2428        bgtool_chip.sql \
    … …  
    2933        bgtool_listchip.sql \
    3034        bgtool_listwarp.sql \
     35        bgtool_pendingcleanupchiprun.sql \
     36        bgtool_pendingcleanupchipimfile.sql \
     37        bgtool_pendingcleanupwarprun.sql \
     38        bgtool_pendingcleanupwarpskyfile.sql \
    3139        bgtool_revertchip.sql \
    3240        bgtool_revertwarp.sql \
    … …  
    377385        warptool_tooverlap.sql \
    378386        warptool_towarped.sql \
     387        warptool_towarped_labels.sql \
    379388        warptool_updateskyfile.sql \
    380389        warptool_warped.sql \

  • branches/eam_branches/ipp-20101103/ippTools/share/magictool_definebyquery_select.sql

    r29363 r29835  
    44    MAX(diffWarps.diff_id) AS diff_id,
    55    -- The following trick pulls out the 'inverse' value for the maximum diff_id
    6     CONVERT(SUBSTRING_INDEX(GROUP_CONCAT(diffWarps.inverse ORDER BY diffWarps.diff_id), ',', 1), UNSIGNED) AS inverse,
     6    CONVERT(SUBSTRING_INDEX(GROUP_CONCAT(diffWarps.inverse ORDER BY diffWarps.diff_id DESC), ',', 1), UNSIGNED) AS inverse,
    77    diff_data_group
    88FROM (

  • branches/eam_branches/ipp-20101103/ippTools/share/warptool_definebyquery.sql

    r23618 r29835  
    2929JOIN chipRun USING(chip_id)
    3030JOIN rawExp USING(exp_id)
    31 WHERE camRun.state = 'full'
     31WHERE fakeRun.state = 'full'
     32AND camRun.state = 'full'
    3233AND chipRun.state = 'full'
Note: See TracChangeset for help on using the changeset viewer.