IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 20964


Ignore:
Timestamp:
Dec 11, 2008, 5:22:00 PM (17 years ago)
Author:
bills
Message:

changes to adapt the magic to the re-worked difference stage

Location:
branches/bills_081204
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/bills_081204/dbconfig/changes.txt

    r20954 r20964  
    13701370ALTER TABLE magicRun ADD COLUMN diff_id BIGINT AFTER exp_id;
    13711371ALTER TABLE magicRun ADD CONSTRAINT FOREIGN KEY(diff_id) REFERENCES diffRun(diff_id);
     1372ALTER TABLE magicInputSkyfile DROP PRIMARY KEY, ADD PRIMARY KEY(magic_id, diff_id, node);

  • branches/bills_081204/ippTools/share/difftool_inputskyfile.sql

    r20903 r20964  
    9292    JOIN stackSumSkyfile
    9393        ON  diffInputSkyfile.stack1 = stackSumSkyfile.stack_id
    94     JOIN stackInputSkyfile
    95         ON diffInputSkyfile.stack1 = stackInputSkyfile.stack_id
    9694    JOIN rawExp
    9795        USING(exp_id)
    … …  
    116114    JOIN stackSumSkyfile
    117115        ON  diffInputSkyfile.stack2 = stackSumSkyfile.stack_id
    118     JOIN stackInputSkyfile
    119         ON diffInputSkyfile.stack2 = stackInputSkyfile.stack_id
    120116    JOIN rawExp
    121117        USING(exp_id)

  • branches/bills_081204/ippTools/share/magicdstool_completed_runs.sql

    r20841 r20964  
    6565    JOIN magicRun USING (magic_id)
    6666    JOIN magicInputSkyfile USING(magic_id)
    67     -- Do we really need to join back to diffInputSkyfile here?
    68     JOIN diffRun USING(diff_id)
    69     JOIN diffSkyfile USING(diff_id)
    70     JOIN diffInputSkyfile USING(diff_id)
     67    JOIN diffSkyfile
     68        ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
     69        AND magicInputSkyfile.node = diffSkyfile.skycell_id
    7170    LEFT JOIN magicDSFile
    7271        ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
    73         AND magicDSFile.component = diffInputSkyfile.skycell_id
     72        AND magicDSFile.component = diffSkyfile.skycell_id
    7473    WHERE
    7574        magicDSRun.state = 'run'
    7675        AND magicDSRun.stage = 'diff'
    77         AND diffRun.state = 'full'
    7876        AND diffSkyfile.fault = 0
    7977    GROUP BY

  • branches/bills_081204/ippTools/share/magicdstool_getrunids.sql

    r20846 r20964  
    88FROM magicRun
    99JOIN magicInputSkyfile USING(magic_id)
    10 JOIN diffInputSkyfile USING(diff_id)
    11 JOIN warpRun USING(warp_id)
     10JOIN diffSkyfile
     11    ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
     12    AND magicInputSkyfile.node = diffSkyfile.skycell_id
     13JOIN diffInputSkyfile
     14    ON diffInputSkyfile.diff_id = diffSkyfile.diff_id
     15    AND diffInputSkyfile.skycell_id = diffSkyfile.skycell_id
     16JOIN warpRun
     17    ON diffInputSkyfile.warp1 = warp_id
    1218JOIN fakeRun USING(fake_id)
    1319JOIN camRun USING(cam_id)
    1420JOIN chipRun USING(chip_id)
    15 WHERE template  = 0
    16 AND magic_id = %ld
     21WHERE magic_id = %ld

  • branches/bills_081204/ippTools/share/magicdstool_getskycells.sql

    r20782 r20964  
    11SELECT DISTINCT
    22    diffSkyfile.diff_id,
    3     diffRun.skycell_id,
     3    diffSkyfile.skycell_id,
    44    diffSkyfile.uri,
    55    diffSkyfile.path_base
    66FROM magicDSRun
    77JOIN magicRun USING(magic_id)
    8 JOIN magicInputSkyfile USING(magic_id)
    9 JOIN diffRun USING(diff_id)
    10 JOIN diffSkyfile USING(diff_id)
     8JOIN magicInputSkyfile USING(magic_id, diff_id)
     9JOIN diffSkyfile
     10    ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
     11    AND magicInputSkyfile.node = diffSkyfile.skycell_id
    1112JOIN diffInputSkyfile
    12     ON diffInputSkyfile.diff_id = diffRun.diff_id
    13     AND diffInputSkyfile.skycell_id = diffRun.skycell_id
     13    ON diffInputSkyfile.diff_id = diffSkyfile.diff_id
     14    AND diffInputSkyfile.skycell_id = diffSkyfile.skycell_id
    1415    -- Want input warps only
    15     AND diffInputSkyfile.warp_id IS NOT NULL
    16     AND diffInputSkyfile.template = 0
     16    AND diffInputSkyfile.warp1 IS NOT NULL
    1717JOIN warpSkyCellMap
    18     ON warpSkyCellMap.warp_id = diffInputSkyfile.warp_id
     18    ON warpSkyCellMap.warp_id = diffInputSkyfile.warp1
    1919    AND warpSkyCellMap.skycell_id = diffInputSkyfile.skycell_id
    2020JOIN warpSkyfile
    … …  
    2323    AND warpSkyfile.ignored = 0
    2424WHERE
    25     diffRun.state = 'full'
    26     AND diffSkyfile.fault = 0
     25    diffSkyfile.fault = 0
    2726    AND magic_ds_id = %lld

  • branches/bills_081204/ippTools/share/magicdstool_todestreak.sql

    r20841 r20964  
    106106    magicMask.uri as streaks_uri,
    107107    stage,
    108     diff_id as stage_id,
    109     diffInputSkyfile.skycell_id as component,
     108    magicRun.diff_id as stage_id,
     109    diffSkyfile.skycell_id as component,
    110110    diffSkyfile.uri,
    111111    diffSkyfile.path_base,
    … …  
    120120JOIN magicDSRun USING(magic_id)
    121121JOIN magicInputSkyfile USING(magic_id)
    122 JOIN diffRun USING(diff_id)
    123 JOIN diffSkyfile USING(diff_id)
    124 JOIN diffInputSkyfile USING(diff_id)
     122JOIN diffSkyfile
     123    ON  magicInputSkyfile.diff_id = diffSkyfile.diff_id
     124    AND magicInputSkyfile.node = diffSkyfile.skycell_id
    125125LEFT JOIN magicDSFile
    126126    ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
    127     AND magicDSFile.component = diffInputSkyfile.skycell_id
     127    AND magicDSFile.component = diffSkyfile.skycell_id
    128128WHERE
    129129    magicDSRun.state = 'run'
    130130    AND magicDSRun.stage = 'diff'
    131     AND diffRun.state = 'full'
    132131    AND diffSkyfile.fault = 0
    133132    AND magicDSFile.component IS NULL

  • branches/bills_081204/ippTools/share/magictool_definebyquery_select.sql

    r20903 r20964  
    22SELECT
    33    exp_id,
    4     MAX(diff_id) AS diff_id
     4    MAX(diffRun.diff_id) AS diff_id
    55FROM diffRun
    66JOIN rawExp USING(exp_id)

  • branches/bills_081204/ippTools/share/magictool_inputs.sql

    r20903 r20964  
    1010    diffSkyfile.path_base,
    1111    diffSkyfile.fault
    12 FROM magicInputSkyfile
    13 JOIN magicRun USING(magic_id)
     12FROM magicRun
     13JOIN magicInputSkyfile
     14USING(magic_id)
    1415JOIN diffSkyfile
    15     USING(diff_id)
     16    ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
     17    AND magicInputSkyfile.node = diffSkyfile.skycell_id
    1618UNION
    1719-- Merged skycells

  • branches/bills_081204/ippTools/share/magictool_inputskyfile.sql

    r20696 r20964  
    22    magicInputSkyfile.*,
    33    diffSkyfile.uri
    4 FROM magicInputSkyfile
    5 JOIN magicRun
     4FROM magicRun
     5JOIN magicInputSkyfile
    66    USING(magic_id)
    77JOIN diffSkyfile
    8     USING(diff_id)
     8    ON magicInputSkyfile.diff_id = diffSkyfile.diff_id
     9    AND magicInputSkyfile.node = diffSkyfile.skycell_id
    910WHERE
    1011    magicRun.state = 'run'

  • branches/bills_081204/ippTools/share/magictool_toprocess_inputs.sql

    r20697 r20964  
    1111JOIN magicRun USING(magic_id)
    1212JOIN magicInputSkyfile USING(magic_id, node)
    13 JOIN diffSkyfile USING(diff_id)
     13JOIN diffSkyfile
     14    ON magicRun.diff_id = diffSkyfile.diff_id
     15    AND magicInputSkyfile.node = diffSkyfile.skycell_id
    1416JOIN rawExp USING(exp_id)
    1517LEFT JOIN magicNodeResult

  • branches/bills_081204/ippTools/share/pxadmin_create_tables.sql

    r20954 r20964  
    10381038        diff_id BIGINT,
    10391039        node VARCHAR(64),
    1040         PRIMARY KEY(magic_id, diff_id),
     1040        PRIMARY KEY(magic_id, diff_id, node),
    10411041        FOREIGN KEY (magic_id)  REFERENCES  magicRun(magic_id),
    10421042        FOREIGN KEY (diff_id) REFERENCES diffRun(diff_id)

  • branches/bills_081204/ippTools/src/magicdstool.c

    r20850 r20964  
    469469    if (psArrayLength(output)) {
    470470        // negative simple so the default is true
    471         if (!ippdbPrintMetadatas(stdout, output, "totree", !simple)) {
     471        if (!ippdbPrintMetadatas(stdout, output, "todestreak", !simple)) {
    472472            psError(PS_ERR_UNKNOWN, false, "failed to print array");
    473473            psFree(output);

  • branches/bills_081204/ippTools/src/magictool.c

    r20954 r20964  
    160160            }
    161161        }
     162        // now add the user specified qualifiers
     163        if (psListLength(where->list)) {
     164            psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
     165            psStringAppend(&queryWhere, " %s %s", queryWhere == NULL ? "WHERE" : "AND", whereClause);
     166            psFree(whereClause);
     167        }
     168        psFree(where);
    162169        if (!queryWhere) {
    163170            psStringAppend(&queryWhere, " ");
    … …  
    207214        psMetadata *row = output->data[i]; // Row of interest
    208215        psS64 exp_id = psMetadataLookupS64(NULL, row, "exp_id"); // Exposure identifier
    209         psS64 diff_id = psMetadataLookupS64(NULL, row, "diff_id"); // Exposure identifier
     216        psS64 diff_id = psMetadataLookupS64(NULL, row, "diff_id"); // difference identifier
    210217
    211218        // create a new magicRun for this group
Note: See TracChangeset for help on using the changeset viewer.