IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 14023 for trunk/ippTools/share


Ignore:
Timestamp:
Jul 5, 2007, 3:16:08 PM (19 years ago)
Author:
jhoblitt
Message:

rename exp_id -> exp_name
rename exp_tag -> exp_id
add add rawExp.exp_tag for use as an external name only

Location:
trunk/ippTools/share
Files:
1 deleted
20 edited

Legend:

Unmodified
Added
Removed
  • trunk/ippTools/share/Makefile.am

    r12581 r14023  
    99        chiptool_pendingimfile.sql \
    1010        chiptool_processedimfile.sql \
    11         chiptool_queuerawexp.sql \
    1211        chiptool_queuerawimfile.sql \
    1312        detselect_search.sql \
  • trunk/ippTools/share/camtool_find_pendingexp.sql

    r14018 r14023  
    44SELECT
    55    camRun.*,
    6     rawExp.exp_tag,
    76    rawExp.exp_id,
     7    rawExp.exp_name,
    88    rawExp.camera,
    99    rawExp.telescope,
     
    1515    USING(chip_id)
    1616JOIN rawExp
    17     ON chipProcessedImfile.exp_tag = rawExp.exp_tag
     17    ON chipProcessedImfile.exp_id = rawExp.exp_id
    1818LEFT JOIN camProcessedExp
    1919    ON camRun.cam_id = camProcessedExp.cam_id
  • trunk/ippTools/share/camtool_find_pendingimfile.sql

    r12259 r14023  
    44    (SELECT
    55        camPendingExp.*,
    6         chipProcessedExp.exp_tag,
     6        chipProcessedExp.exp_id,
    77        chipProcessedExp.guide_id,
    88        chipProcessedImfile.class_id,
     
    1212        chipProcessedImfile.bg_mean_stdev,
    1313        chipProcessedImfile.path_base,
    14         rawExp.exp_id,
     14        rawExp.exp_name,
    1515        rawExp.camera,
    1616        rawExp.telescope,
     
    2222        USING(chip_id)
    2323    JOIN rawExp
    24         ON chipProcessedExp.exp_tag = rawExp.exp_tag
     24        ON chipProcessedExp.exp_id = rawExp.exp_id
    2525    LEFT JOIN camProcessedExp
    2626        ON camPendingExp.cam_id = camProcessedExp.cam_id
  • trunk/ippTools/share/camtool_find_processedexp.sql

    r12736 r14023  
    11SELECT
    22    camProcessedExp.*,
    3     rawExp.exp_id,
     3    rawExp.exp_name,
    44    rawExp.camera,
    55    rawExp.telescope,
     
    99    USING(chip_id)
    1010JOIN rawExp
    11     ON chipProcessedExp.exp_tag = rawExp.exp_tag
     11    ON chipProcessedExp.exp_id = rawExp.exp_id
    1212WHERE -- bogus condition so there is a pre-existing where to append to
    1313    camProcessedExp.cam_id IS NOT NULL
  • trunk/ippTools/share/chiptool_completely_processed_exp.sql

    r14018 r14023  
    1818        USING(chip_id)
    1919    JOIN rawExp
    20         ON chipInputImfile.exp_tag = rawExp.exp_tag
     20        ON chipInputImfile.exp_id = rawExp.exp_id
    2121    JOIN chipProcessedImfile
    2222        ON chipInputImfile.chip_id = chipProcessedImfile.chip_id
    23         AND chipInputImfile.exp_tag = chipProcessedImfile.exp_tag
     23        AND chipInputImfile.exp_id = chipProcessedImfile.exp_id
    2424        AND chipInputImfile.class_id = chipProcessedImfile.class_id
    2525    WHERE
     
    2828    GROUP BY
    2929        chipInputImfile.chip_id,
    30         chipInputImfile.exp_tag
     30        chipInputImfile.exp_id
    3131    HAVING rawExp.imfiles = COUNT(chipProcessedImfile.class_id)) as Foo
  • trunk/ippTools/share/chiptool_find_rawexp.sql

    r12184 r14023  
    22-- processeing
    33SELECT
    4     exp_tag
     4    exp_id
    55FROM rawExp
    66WHERE
  • trunk/ippTools/share/chiptool_pendingimfile.sql

    r14018 r14023  
    11SELECT
    22    chipRun.*,
    3     chipInputImfile.exp_tag,
     3    chipInputImfile.exp_id,
    44    chipInputImfile.class_id,
    55    rawImfile.uri,
    6     rawExp.exp_id,
     6    rawExp.exp_name,
    77    rawExp.camera,
    88    rawExp.telescope,
     
    1313LEFT JOIN chipProcessedImfile
    1414    ON chipInputImfile.chip_id = chipProcessedImfile.chip_id
    15     AND chipInputImfile.exp_tag = chipProcessedImfile.exp_tag
     15    AND chipInputImfile.exp_id = chipProcessedImfile.exp_id
    1616    AND chipInputImfile.class_id = chipProcessedImfile.class_id
    1717JOIN rawImfile
    18     ON chipInputImfile.exp_tag = rawImfile.exp_tag
     18    ON chipInputImfile.exp_id = rawImfile.exp_id
    1919    AND chipInputImfile.class_id = rawImfile.class_id
    2020JOIN rawExp
    21     ON rawImfile.exp_tag = rawExp.exp_tag
     21    ON rawImfile.exp_id = rawExp.exp_id
    2222LEFT JOIN chipMask
    2323    ON chipRun.label = chipMask.label
     
    2525    chipRun.state = 'run'
    2626    AND chipProcessedImfile.chip_id IS NULL
    27     AND chipProcessedImfile.exp_tag IS NULL
     27    AND chipProcessedImfile.exp_id IS NULL
    2828    AND chipProcessedImfile.class_id IS NULL
    2929    AND chipMask.label IS NULL
  • trunk/ippTools/share/chiptool_processedimfile.sql

    r12259 r14023  
    77    chipProcessedImfile.bg_mean_stdev,
    88    chipProcessedImfile.path_base,
    9     rawExp.exp_id,
     9    rawExp.exp_name,
    1010    rawExp.camera,
    1111    rawExp.telescope,
     
    1515    USING(chip_id)
    1616JOIN rawExp
    17     ON chipProcessedExp.exp_tag = rawExp.exp_tag
     17    ON chipProcessedExp.exp_id = rawExp.exp_id
    1818WHERE
    1919-- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too
    20     chipProcessedImfile.exp_tag is NOT NULL
     20    chipProcessedImfile.exp_id is NOT NULL
    2121
  • trunk/ippTools/share/chiptool_queuerawimfile.sql

    r14018 r14023  
    22    SELECT
    33        LAST_INSERT_ID(),
    4         rawImfile.exp_tag,
     4        rawImfile.exp_id,
    55        rawImfile.class_id
    66    FROM rawImfile
    77    JOIN newExp
    8         USING(exp_tag)
     8        USING(exp_id)
    99    WHERE
    1010        rawImfile.fault = 0
    1111        AND newExp.state = 'stop'
    12         AND rawImfile.exp_tag = '%s'
     12        AND rawImfile.exp_id = '%s'
    1313
  • trunk/ippTools/share/dettool_find_completed_runs.sql

    r12424 r14023  
    66        detRun.det_id,
    77        detRun.iteration,
    8         detInputExp.exp_tag
     8        detInputExp.exp_id
    99    FROM detRun
    1010        LEFT JOIN detInputExp
     
    1212        AND detRun.iteration = detInputExp.iteration
    1313    LEFT JOIN rawExp
    14         ON detInputExp.exp_tag = rawExp.exp_tag
     14        ON detInputExp.exp_id = rawExp.exp_id
    1515    LEFT JOIN detResidExp
    1616        ON detRun.det_id = detResidExp.det_id
    1717        AND detRun.iteration = detResidExp.iteration
    18         AND detInputExp.exp_tag = detResidExp.exp_tag
     18        AND detInputExp.exp_id = detResidExp.exp_id
    1919   WHERE
    2020        detRun.state = 'run'
     
    2323        detRun.iteration
    2424    HAVING
    25         COUNT(detResidExp.exp_tag) = COUNT(detInputExp.exp_tag)
     25        COUNT(detResidExp.exp_id) = COUNT(detInputExp.exp_id)
    2626    ) AS residdetrun
  • trunk/ippTools/share/difftool_inputskyfile.sql

    r12312 r14023  
    1717    ON camProcessedExp.chip_id = chipProcessedExp.chip_id
    1818JOIN rawExp
    19     ON chipProcessedExp.exp_tag = rawExp.exp_tag
     19    ON chipProcessedExp.exp_id = rawExp.exp_id
    2020WHERE
    2121    diffRun.state = 'run'
  • trunk/ippTools/share/regtool_find_unprocessed_exp.sql

    r14018 r14023  
    44    FROM newExp
    55    JOIN newImfile
    6        USING(exp_tag)
     6       USING(exp_id)
    77    LEFT JOIN rawExp
    8        USING(exp_tag)
     8       USING(exp_id)
    99    WHERE
    1010        newExp.state = 'run'
    11         AND rawExp.exp_tag IS NULL
     11        AND rawExp.exp_id IS NULL
    1212        AND newExp.imfiles =
    13         (SELECT COUNT(exp_tag) FROM rawImfile
    14             WHERE rawImfile.exp_tag = newExp.exp_tag)) as Foo
     13        (SELECT COUNT(exp_id) FROM rawImfile
     14            WHERE rawImfile.exp_id = newExp.exp_id)) as Foo
    1515WHERE
    16     exp_tag = '%s'
     16    exp_id = '%s'
  • trunk/ippTools/share/regtool_pendingexp.sql

    r14018 r14023  
    33FROM newExp
    44JOIN newImfile
    5     USING(exp_tag)
     5    USING(exp_id)
    66LEFT JOIN rawExp
    7     USING(exp_tag)
     7    USING(exp_id)
    88WHERE
    99    newExp.state = 'run'
    10     AND rawExp.exp_tag IS NULL
     10    AND rawExp.exp_id IS NULL
    1111    AND newExp.imfiles =
    12     (SELECT COUNT(exp_tag) FROM rawImfile
     12    (SELECT COUNT(exp_id) FROM rawImfile
    1313        WHERE
    14             rawImfile.exp_tag = newExp.exp_tag
     14            rawImfile.exp_id = newExp.exp_id
    1515            AND rawImfile.fault = 0)
  • trunk/ippTools/share/regtool_pendingimfile.sql

    r12086 r14023  
    1 SELECT
    2    newImfile.*,
    3    newExp.workdir
    4 FROM newImfile
    5 LEFT JOIN newExp
    6     USING(exp_tag)
    7 LEFT JOIN rawExp
    8     USING(exp_tag)
    9 WHERE
    10     newExp.exp_tag is NOT NULL
    11     AND rawExp.exp_tag IS NULL
     1SELECT DISTINCT * FROM
     2    (SELECT
     3        newExp.exp_id,
     4        newExp.tmp_exp_name,
     5        newExp.tmp_camera,
     6        newExp.tmp_telescope,
     7        newExp.workdir,
     8        newImfile.tmp_class_id,
     9        newImfile.uri
     10    FROM newImfile
     11    JOIN newExp
     12        USING(exp_id)
     13    LEFT JOIN rawImfile
     14        ON newExp.exp_id = rawImfile.exp_id
     15        AND newImfile.tmp_class_id = rawImfile.tmp_class_id
     16    WHERE
     17        newExp.state = 'run'
     18        AND rawImfile.tmp_class_id IS NULL) as Foo
  • trunk/ippTools/share/regtool_processedimfile.sql

    r12347 r14023  
    11SELECT
    22    rawImfile.*,
    3     newExp.exp_id,
     3    newExp.exp_name,
    44    newExp.camera,
    55    newExp.telescope
    66FROM rawImfile
    77JOIN newExp
    8     USING(exp_tag)
     8    USING(exp_id)
    99-- bogus conditional so there is a where clause to append to
    10 WHERE rawImfile.exp_tag is NOT NULL
     10WHERE rawImfile.exp_id is NOT NULL
  • trunk/ippTools/share/stacktool_inputskyfile.sql

    r12419 r14023  
    1616    ON camProcessedExp.chip_id = chipProcessedExp.chip_id
    1717JOIN rawExp
    18     ON chipProcessedExp.exp_tag = rawExp.exp_tag
     18    ON chipProcessedExp.exp_id = rawExp.exp_id
    1919WHERE
    2020    stackRun.state = 'run'
  • trunk/ippTools/share/warptool_imfile.sql

    r13827 r14023  
    1414    ON camProcessedExp.chip_id = chipProcessedImfile.chip_id
    1515JOIN rawImfile -- is there any reason not to refer back to rawimfiles?
    16     ON chipProcessedExp.exp_tag = rawImfile.exp_tag
     16    ON chipProcessedExp.exp_id = rawImfile.exp_id
    1717WHERE
    1818    warpRun.state = 'run'
  • trunk/ippTools/share/warptool_tooverlap.sql

    r12237 r14023  
    1212    ON camProcessedExp.chip_id = chipProcessedExp.chip_id
    1313JOIN rawExp
    14     ON chipProcessedExp.exp_tag = rawExp.exp_tag
     14    ON chipProcessedExp.exp_id = rawExp.exp_id
    1515LEFT JOIN warpSkyCellMap
    1616    ON warpInputExp.warp_id = warpSkyCellMap.warp_id
  • trunk/ippTools/share/warptool_towarped.sql

    r13088 r14023  
    1414    ON camProcessedExp.chip_id = chipProcessedExp.chip_id
    1515JOIN rawExp
    16     ON chipProcessedExp.exp_tag = rawExp.exp_tag
     16    ON chipProcessedExp.exp_id = rawExp.exp_id
    1717LEFT JOIN warpSkyfile
    1818    ON warpRun.warp_id = warpSkyfile.warp_id
Note: See TracChangeset for help on using the changeset viewer.