IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 24174 for trunk/ippTools/share


Ignore:
Timestamp:
May 13, 2009, 12:37:33 PM (17 years ago)
Author:
Paul Price
Message:

Merging branches/pap_magic@24173 into trunk. One conflict in dbconfig/changes.txt resolved easily.

Location:
trunk
Files:
4 deleted
17 edited
7 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/ippTools/share/Makefile.am

    r24111 r24174  
    8181     dettool_tostacked.sql \
    8282     difftool_completed_runs.sql \
    83      difftool_definebyquery_part1.sql \
    84      difftool_definebyquery_part2.sql \
    85      difftool_definebyquery_temp_create.sql \
     83     difftool_definewarpstack_part1.sql \
     84     difftool_definewarpstack_part2.sql \
     85     difftool_definewarpstack_temp_create.sql \
     86     difftool_definewarpwarp_temp_create.sql \
     87     difftool_definewarpwarp_temp_insert.sql \
    8688     difftool_definewarpwarp_select.sql \
    8789     difftool_definewarpwarp_insert.sql \

  • trunk/ippTools/share/chiptool_export_imfile.sql

  • trunk/ippTools/share/chiptool_export_processed_imfile.sql

  • trunk/ippTools/share/difftool_definewarpwarp_select.sql

    r23503 r24174  
    11SELECT
    22    inputWarpRun.warp_id AS input_warp_id,
     3    inputWarpRun.tess_id AS tess_id,
    34    inputRawExp.exp_id AS input_exp_id,
    4     inputWarpRun.tess_id AS tess_id,
     5    -- The following trick pulls out the warp_id that has the smallest distance
    56    SUBSTRING_INDEX(GROUP_CONCAT(templateWarpRun.warp_id ORDER BY ABS(ASIN(SQRT(POW(SIN(0.5*(inputRawExp.decl - templateRawExp.decl)),2) + COS(inputRawExp.decl) * COS(templateRawExp.decl) * POW(SIN(0.5*(inputRawExp.ra - templateRawExp.ra)),2))))), ',', 1) AS template_warp_id
    67FROM warpRun AS inputWarpRun
    … …  
    910JOIN chipRun AS inputChipRun USING(chip_id)
    1011JOIN rawExp AS inputRawExp USING(exp_id)
    11 -- To find exposures that haven't been diffed:%s LEFT JOIN diffRun ON diffRun.exp_id = inputRawExp.exp_id
     12-- To find exposures that haven't been diffed, insert newline here:%s LEFT JOIN diffs USING(exp_id)
    1213JOIN warpRun AS templateWarpRun
    1314    ON templateWarpRun.warp_id != inputWarpRun.warp_id -- Don't use self as template!

  • trunk/ippTools/share/difftool_skyfile.sql

    r24112 r24174  
    88    stack1,
    99    warp2,
    10     stack2,
    11     exp_id
     10    stack2
    1211FROM diffRun
    13 JOIN diffSkyfile
    14     USING(diff_id)
    15 JOIN diffInputSkyfile
    16     USING (diff_id, skycell_id)
     12JOIN diffSkyfile USING(diff_id)
     13JOIN diffInputSkyfile USING(diff_id, skycell_id)
    1714JOIN warpRun
    1815    ON warpRun.warp_id = diffInputSkyfile.warp1
    19 JOIN rawExp
    20     USING(exp_id)
     16JOIN fakeRun USING(fake_id)
     17JOIN camRun USING(cam_id)
     18JOIN chipRun USING(chip_id)
     19JOIN rawExp USING(exp_id)

  • trunk/ippTools/share/difftool_todiffskyfile.sql

    r23688 r24174  
    99    diffRun.tess_id,
    1010    diffRun.label,
    11     diffRun.state
     11    diffRun.state,
     12    diffRun.bothways
    1213FROM diffRun
    1314JOIN diffInputSkyfile USING(diff_id)

  • trunk/ippTools/share/magicdstool_todestreak.sql

    r23974 r24174  
    1313    rawImfile.uri as uri,
    1414    NULL as path_base,
     15    magicRun.inverse,
    1516    camProcessedExp.path_base as cam_path_base,
    1617    outroot,
    … …  
    4445    chipProcessedImfile.uri,
    4546    chipProcessedImfile.path_base,
     47    magicRun.inverse,
    4648    camProcessedExp.path_base as cam_path_base,
    4749    outroot,
    … …  
    5153FROM magicDSRun
    5254JOIN magicMask USING (magic_id)
     55JOIN magicRun USING(magic_id)
    5356JOIN camProcessedExp USING(cam_id)
    5457JOIN chipRun ON chip_id = stage_id
    … …  
    7982    warpSkyfile.uri,
    8083    warpSkyfile.path_base,
     84    magicRun.inverse,
    8185    NULL as cam_path_base,
    8286    outroot,
    … …  
    113117    magicRun.diff_id as stage_id,
    114118    diffSkyfile.skycell_id as component,
    115     diffSkyfile.uri,
     119    NULL AS uri,
    116120    diffSkyfile.path_base,
     121    magicRun.inverse,
    117122    NULL as cam_path_base,
    118123    outroot,
    … …  
    126131JOIN magicInputSkyfile USING(magic_id)
    127132JOIN diffSkyfile
    128     ON  magicInputSkyfile.diff_id = diffSkyfile.diff_id
     133    ON  magicRun.diff_id = diffSkyfile.diff_id
    129134    AND magicInputSkyfile.node = diffSkyfile.skycell_id
    130135LEFT JOIN magicDSFile

  • trunk/ippTools/share/magictool_definebyquery_insert.sql

    r23688 r24174  
    33SELECT
    44    @MAGIC_ID@, -- Update this with the appropriate magic_id
    5     diff_id,
    65    skycell_id
    76FROM diffSkyfile

  • trunk/ippTools/share/magictool_definebyquery_select.sql

    r20973 r24174  
    11-- Get a list of exposures on which magic may be performed
    2 SELECT 
     2SELECT
    33    exp_id,
    4     MAX(diffRun.diff_id) AS diff_id
    5 FROM diffRun
    6 JOIN rawExp USING(exp_id)
     4    MAX(diffWarps.diff_id) AS diff_id,
     5    -- 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
     7FROM (
     8    -- Forward diffs
     9    SELECT
     10        diffRun.diff_id,
     11        warp1 AS warp_id,
     12        0 AS inverse
     13    FROM diffRun
     14    JOIN diffInputSkyfile USING(diff_id)
     15    WHERE diffInputSkyfile.warp1 IS NOT NULL
     16        AND diffRun.exposure = 1
     17    -- WHERE hook %s
     18    UNION
     19    -- Backward diffs
     20    SELECT
     21        diffRun.diff_id,
     22        warp2 AS warp_id,
     23        1 AS inverse
     24    FROM diffRun
     25    JOIN diffInputSkyfile USING(diff_id)
     26    WHERE diffInputSkyfile.warp2 IS NOT NULL
     27        AND diffRun.exposure = 1
     28        AND diffRun.bothways = 1
     29    -- WHERE hook %s
     30    ) AS diffWarps
     31JOIN warpRun USING(warp_id)
     32JOIN fakeRun USING(fake_id)
     33JOIN camRun USING(cam_id)
     34JOIN chipRun USING(chip_id)
    735LEFT JOIN magicRun USING(exp_id)
    836-- WHERE hook %s

  • trunk/ippTools/share/magictool_inputs.sql

    r23886 r24174  
    1 SELECT *
    2 FROM (
    3 -- Single skycells
     1-- Get input details for a magic node
    42SELECT
    53    magicRun.magic_id,
    6     magicRun.state,
    7     magicInputSkyfile.node,
    8     diffSkyfile.diff_id,
    9     diffSkyfile.uri,
    10     diffSkyfile.path_base,
    11     diffSkyfile.fault,
    12     diffSkyfile.quality
     4    magicRun.inverse, -- Using the inverse subtraction?
     5    magicRun.diff_id,
     6    magicInputs.node,
     7    -- Only one of diff_path_base and magic_path_base should be non-NULL
     8    -- If diff_path_base is non-NULL, then only one of warp_path_base and stack_path_base should be non-NULL
     9    magicInputs.diff_path_base, -- path_base for the diff (if any)
     10    magicInputs.warp_path_base, -- path_base for the template warp (if any)
     11    magicInputs.stack_path_base, -- path_base for the template stack (if any)
     12    magicInputs.magic_path_base -- path_base for child nodes (if any)
    1313FROM magicRun
    14 JOIN magicInputSkyfile
    15 USING(magic_id)
    16 JOIN diffSkyfile
    17     ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
    18     AND magicInputSkyfile.node = diffSkyfile.skycell_id
    19 UNION
    20 -- Merged skycells
    21 SELECT
    22     magicRun.magic_id,
    23     magicRun.state,
    24     magicTree.node,
    25     0,   -- no diff_id
    26     magicNodeResult.uri,
    27     NULL, -- magicNodeResult doesn't have a path_base
    28     magicNodeResult.fault,
    29     0 as quality
    30 FROM magicTree
    31 JOIN magicRun
    32     USING(magic_id)
    33 JOIN magicNodeResult
    34     ON magicTree.magic_id = magicNodeResult.magic_id
    35     AND magicTree.dep = magicNodeResult.node
    36 ) as Foo
    37 WHERE
    38     fault = 0
    39     AND quality = 0
     14JOIN (
     15    -- Single skycells: have uri=NULL
     16    SELECT
     17        magic_id,
     18        magicRun.diff_id,
     19        skycell_id AS node,
     20        diffSkyfile.path_base AS diff_path_base,
     21        warpSkyfile.path_base AS warp_path_base,
     22        stackSumSkyfile.path_base AS stack_path_base,
     23        NULL AS magic_path_base
     24    FROM magicRun
     25    JOIN magicTree USING(magic_id)
     26    JOIN magicInputSkyfile USING(magic_id, node)
     27    JOIN diffRun USING(diff_id)
     28    JOIN diffSkyfile
     29        ON diffSkyfile.diff_id = magicRun.diff_id
     30        AND diffSkyfile.skycell_id = magicInputSkyfile.node
     31    JOIN (
     32        -- Template for non-inverse
     33        SELECT
     34            magic_id,
     35            skycell_id,
     36            warp1 AS warp_id,
     37            stack1 AS stack_id
     38        FROM magicRun
     39        JOIN diffInputSkyfile USING(diff_id)
     40        WHERE magicRun.inverse = 0
     41            -- WHERE hook (magicRun.magic_id, diffInputSkyfile.skycell_id) %s
     42        UNION
     43        -- Template for inverse
     44        SELECT
     45            magic_id,
     46            skycell_id,
     47            warp2 AS warp_id,
     48            stack2 AS stack_id
     49        FROM magicRun
     50        JOIN diffInputSkyfile USING(diff_id)
     51        WHERE magicRun.inverse = 1
     52            -- WHERE hook (magicRun.magic_id, diffInputSkyfile.skycell_id) %s
     53        ) AS diffTemplates USING(magic_id, skycell_id)
     54    LEFT JOIN warpSkyfile USING(warp_id, skycell_id)
     55    LEFT JOIN stackSumSkyfile USING(stack_id)
     56    -- WHERE hook (magicRun.magic_id, magicTree.node) %s
     57    UNION
     58    -- Merged skycells: have diff_id=0, various_path_base=NULL
     59    SELECT
     60        magicTree.magic_id,
     61        0 AS diff_id,
     62        magicTree.dep,
     63        NULL AS diff_path_base,
     64        NULL AS warp_path_base,
     65        NULL AS stack_path_base,
     66        magicNodeResult.path_base AS magic_path_base
     67    FROM magicTree
     68    JOIN magicRun USING(magic_id)
     69    JOIN magicNodeResult
     70        ON magicTree.magic_id = magicNodeResult.magic_id
     71        AND magicTree.dep = magicNodeResult.node
     72    -- WHERE hook (magicRun.magic_id, magicTree.node) %s
     73    ) AS magicInputs USING(magic_id)

  • trunk/ippTools/share/magictool_inputskyfile.sql

    r23389 r24174  
    11SELECT
    22    magicInputSkyfile.*,
    3     diffSkyfile.uri
     3    magicRun.inverse,
     4    diffSkyfile.path_base
    45FROM magicRun
    5 JOIN magicInputSkyfile
    6     USING(magic_id)
     6JOIN magicInputSkyfile USING(magic_id)
    77JOIN diffSkyfile
    8     ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
    9     AND magicInputSkyfile.node = diffSkyfile.skycell_id
     8    ON diffSkyfile.diff_id = magicRun.diff_id
     9    AND diffSkyfile.skycell_id = magicInputSkyfile.node
    1010WHERE
    1111    magicRun.state = 'new'

  • trunk/ippTools/share/magictool_toprocess_inputs.sql

    r23971 r24174  
    1 SELECT * FROM
    2 (SELECT
     1SELECT
    32    magicTree.*,
     3    magicRun.workdir,
    44    rawExp.exp_id,
    55    rawExp.camera,
    6 --    diffSkyfile.path_base,
    7     magicRun.workdir,
    86    -- convert magic_id into a boolean value (1 or 0)
    97    -- note that the type stays a 64 bit int
    10     magicNodeResult.magic_id IS TRUE as done,
    11     magicNodeResult.fault IS TRUE as bad,
    12     warpSkyfile.uri as template_uri
    13 FROM magicTree
    14 JOIN magicRun USING(magic_id)
     8    magicNodeResult.magic_id IS TRUE AS done,
     9    magicNodeResult.fault IS TRUE AS bad
     10FROM magicRun
     11JOIN magicTree USING(magic_id)
    1512JOIN magicInputSkyfile USING(magic_id, node)
    16 JOIN diffSkyfile
    17     ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
    18     AND magicInputSkyfile.node = diffSkyfile.skycell_id
    19 JOIN diffInputSkyfile
    20     ON diffSkyfile.diff_id = diffInputSkyfile.diff_id
    21     AND diffSkyfile.skycell_id = diffInputSkyfile.skycell_id
    22 JOIN warpSkyfile
    23     ON diffInputSkyfile.warp2 = warpSkyfile.warp_id
    24     AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id
    2513JOIN rawExp USING(exp_id)
    26 LEFT JOIN magicNodeResult
    27     ON magicTree.magic_id = magicNodeResult.magic_id
    28     AND magicTree.node = magicNodeResult.node
     14JOIN diffSkyfile -- only get nodes that match a skycell
     15    ON diffSkyfile.diff_id = magicRun.diff_id
     16    AND diffSkyfile.skycell_id = magicInputSkyfile.node
     17LEFT JOIN magicNodeResult USING(magic_id, node)
    2918WHERE
    3019    magicRun.state = 'new'
    3120    AND magicNodeResult.magic_id IS NULL
    3221    AND magicNodeResult.node IS NULL
    33     -- where hook 1 %s
    34 UNION
    35 SELECT
    36     magicTree.*,
    37     rawExp.exp_id,
    38     rawExp.camera,
    39 --    diffSkyfile.path_base,
    40     magicRun.workdir,
    41     -- convert magic_id into a boolean value (1 or 0)
    42     -- note that the type stays a 64 bit int
    43     magicNodeResult.magic_id IS TRUE as done,
    44     magicNodeResult.fault IS TRUE as bad,
    45     stackSumSkyfile.uri as template_uri
    46 FROM magicTree
    47 JOIN magicRun USING(magic_id)
    48 JOIN magicInputSkyfile USING(magic_id, node)
    49 JOIN diffSkyfile
    50     ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
    51     AND magicInputSkyfile.node = diffSkyfile.skycell_id
    52 JOIN diffInputSkyfile
    53     ON diffSkyfile.diff_id = diffInputSkyfile.diff_id
    54     AND diffSkyfile.skycell_id = diffInputSkyfile.skycell_id
    55 JOIN stackSumSkyfile
    56     ON diffInputSkyfile.stack2 = stackSumSkyfile.stack_id
    57 JOIN rawExp USING(exp_id)
    58 LEFT JOIN magicNodeResult
    59     ON magicTree.magic_id = magicNodeResult.magic_id
    60     AND magicTree.node = magicNodeResult.node
    61 WHERE
    62     magicRun.state = 'new'
    63     AND magicNodeResult.magic_id IS NULL
    64     AND magicNodeResult.node IS NULL
    65     -- where hook 2 %s
    66 ) as foo
     22-- WHERE hook %s

  • trunk/ippTools/share/magictool_toprocess_tree.sql

    r23971 r24174  
    11SELECT
    22    magicTree.*,
    3     exp_id,
    4     camera,
    53    magicRun.workdir,
     4    rawExp.exp_id,
     5    rawExp.camera,
    66    -- convert magic_id into a boolean value (1 or 0)
    77    -- note that the type stays a 64 bit int
    8     magicNodeResult.magic_id IS TRUE as done,
    9     magicNodeResult.fault IS TRUE as bad,
    10     'notused' as template_uri
     8    magicNodeResult.magic_id IS TRUE AS done,
     9    magicNodeResult.fault IS TRUE AS bad
    1110FROM magicTree
    1211JOIN magicRun USING(magic_id)
    1312JOIN rawExp USING(exp_id)
    14 LEFT JOIN magicNodeResult
    15     ON magicTree.magic_id = magicNodeResult.magic_id
    16     AND magicTree.node = magicNodeResult.node
     13LEFT JOIN magicNodeResult USING(magic_id, node)
    1714WHERE
    1815    magicRun.state = 'new'
    19     -- where hook %s
     16-- WHERE hook %s
    2017ORDER BY
    2118    magicRun.magic_id

  • trunk/ippTools/share/magictool_totree.sql

    r23389 r24174  
    66    ra,
    77    decl,
    8     tess_id
     8    diffRun.tess_id
    99FROM magicRun
     10JOIN diffRun USING(diff_id)
    1011JOIN rawExp USING(exp_id)
    1112LEFT JOIN magicTree

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r24125 r24174  
    877877        KEY(state),
    878878        KEY(skycell_id),
    879         KEY(tess_id)
     879        KEY(tess_id),
     880        KEY(label)
    880881) ENGINE=innodb DEFAULT CHARSET=latin1;
    881882
    … …  
    933934        registered DATETIME,
    934935        tess_id VARCHAR(64),
    935         exp_id  BIGINT,
     936        bothways TINYINT DEFAULT 0,
     937        exposure TINYINT DEFAULT 0,
    936938        magicked TINYINT,
    937939        PRIMARY KEY(diff_id),
    … …  
    939941        KEY(state),
    940942        KEY(tess_id),
     943        KEY(label),
    941944        FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id)
    942945) ENGINE=innodb DEFAULT CHARSET=latin1;
    … …  
    969972        diff_id BIGINT,
    970973        skycell_id VARCHAR(64),
    971         uri VARCHAR(255),
    972974        path_base VARCHAR(255),
    973975        data_state VARCHAR(64),
    … …  
    10061008        exp_id BIGINT,
    10071009        diff_id BIGINT,
     1010        inverse TINYINT NOT NULL DEFAULT 0,
    10081011        state VARCHAR(64),
    10091012        workdir VARCHAR(255),
    … …  
    10461049        magic_id BIGINT,
    10471050        node VARCHAR(64),
    1048         uri VARCHAR(255),
     1051        path_base VARCHAR(255),
    10491052        fault SMALLINT,
    10501053        PRIMARY KEY(magic_id, node),

  • trunk/ippTools/share/pxadmin_drop_tables.sql

    r23894 r24174  
    4848DROP TABLE IF EXISTS magicNodeResult;
    4949DROP TABLE IF EXISTS magicMask;
    50 DROP TABLE IF EXISTS magicSkyfileMask;
    5150DROP TABLE IF EXISTS magicDSRun;
    5251DROP TABLE IF EXISTS magicDSFile;
Note: See TracChangeset for help on using the changeset viewer.