IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 17951


Ignore:
Timestamp:
Jun 5, 2008, 2:19:30 PM (18 years ago)
Author:
jhoblitt
Message:

fake* SQL updates

Location:
branches/faketool/ippTools
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/faketool/ippTools/scripts/warptest.sh

    r17938 r17951  
    55faketest.sh || exit 1
    66
    7 #warptool -definerun -mode warp -workdir file:///foo || exit 1
     7#warp tool -definerun -fake_id 1 -mode warp -workdir file:///foo
     8
    89#warptool -addinputexp -warp_id 1 -cam_id 1 || exit 1
    910#warptool -addinputexp -warp_id 1 -cam_id 2 || exit 1

  • branches/faketool/ippTools/share/camtool_find_pendingexp.sql

    r15956 r17951  
    2020--      ON chipProcessedImfile.exp_id = rawExp.exp_id
    2121    LEFT JOIN camProcessedExp
    22         ON camRun.cam_id = camProcessedExp.cam_id
     22        USING(cam_id)
    2323    LEFT JOIN camMask
    2424        ON camRun.label = camMask.label

  • branches/faketool/ippTools/share/camtool_find_pendingimfile.sql

    r14117 r17951  
    3434        ON chipProcessedImfile.exp_id = rawExp.exp_id
    3535    LEFT JOIN camProcessedExp
    36         ON camRun.cam_id = camProcessedExp.cam_id
     36        USING(cam_id)
    3737    LEFT JOIN camMask
    3838        ON camRun.label = camMask.label

  • branches/faketool/ippTools/share/camtool_find_processedexp.sql

    r14031 r17951  
    66    rawExp.telescope,
    77    rawExp.filelevel
    8 FROM camProcessedExp
     8FROM camRun
     9JOIN camProcessedExp
     10    USING(cam_id)
    911JOIN chipRun
    1012    USING(chip_id)

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

    r16828 r17951  
    1919    JOIN warpRun
    2020        ON diffInputSkyfile.warp_id = warpRun.warp_id
    21     JOIN camProcessedExp
    22         ON warpRun.cam_id = camProcessedExp.cam_id
     21    JOIN fakeRun
     22        USING(fake_id)
     23    JOIN camRun
     24        USING(cam_id)
    2325    JOIN chipRun
    24         ON camProcessedExp.chip_id = chipRun.chip_id
     26        USING(chip_id)
    2527    JOIN chipProcessedImfile
    26         ON chipRun.chip_id = chipProcessedImfile.chip_id
     28        USING(chip_id)
    2729    JOIN rawExp
    28         ON chipProcessedImfile.exp_id = rawExp.exp_id
     30        ON chipRun.exp_id = rawExp.exp_id
    2931    WHERE
    3032        diffRun.state = 'run'
     33        AND warpRun.state = 'stop'
     34        AND fakeRun.state = 'stop'
     35        AND camRun.state = 'stop'
     36        AND chipRun.state = 'stop'
    3137    UNION
    3238    SELECT
    … …  
    4955    JOIN warpRun
    5056        ON stackInputSkyfile.warp_id = warpRun.warp_id
    51     JOIN camProcessedExp
    52         ON warpRun.cam_id = camProcessedExp.cam_id
     57    JOIN fakeRun
     58        USING(fake_id)
     59    JOIN camRun
     60        USING(cam_id)
    5361    JOIN chipRun
    54         ON camProcessedExp.chip_id = chipRun.chip_id
     62        USING(chip_id)
    5563    JOIN chipProcessedImfile
    56         ON chipRun.chip_id = chipProcessedImfile.chip_id
     64        USING(chip_id)
    5765    JOIN rawExp
    58         ON chipProcessedImfile.exp_id = rawExp.exp_id
     66        ON chipRun.exp_id = rawExp.exp_id
    5967    WHERE
    6068        diffRun.state = 'run'
     69        AND warpRun.state = 'stop'
     70        AND fakeRun.state = 'stop'
     71        AND camRun.state = 'stop'
     72        AND chipRun.state = 'stop'
    6173    ) as Foo

  • branches/faketool/ippTools/share/difftool_todiffskyfile.sql

    r17713 r17951  
    1414JOIN warpRun
    1515    ON warpRun.warp_id = warpSkyfile.warp_id
     16JOIN fakeRun
     17    USING(fake_id)
    1618JOIN camRun
    1719    USING(cam_id)
    … …  
    2426WHERE
    2527  diffRun.state = 'run'
     28  AND warpRun.state = 'stop'
     29  AND fakeRun.state = 'stop'
     30  AND camRun.state = 'stop'
     31  AND chipRun.state = 'stop'
    2632  AND diffSkyfile.diff_id IS NULL

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

    r17938 r17951  
    328328CREATE TABLE camProcessedExp (
    329329    cam_id BIGINT,
    330     chip_id BIGINT,
    331330    uri VARCHAR(255),
    332331    bg FLOAT,
    … …  
    356355    path_base VARCHAR(255),
    357356    fault SMALLINT NOT NULL,
    358     PRIMARY KEY(cam_id, chip_id),
    359     KEY(fault),
    360     FOREIGN KEY (cam_id, chip_id) 
    361     REFERENCES camRun(cam_id, chip_id))
     357    PRIMARY KEY(cam_id),
     358    KEY(fault),
     359    FOREIGN KEY (cam_id) 
     360        REFERENCES camRun(cam_id))
    362361ENGINE=innodb DEFAULT CHARSET=latin1;
    363362
    … …  
    677676    skycell_id VARCHAR(64),
    678677    tess_id VARCHAR(64),
    679     fake_id BIGINT,
    680678    class_id VARCHAR(64),
    681679    fault SMALLINT,
    682     PRIMARY KEY(warp_id, skycell_id, tess_id, fake_id, class_id),
     680    PRIMARY KEY(warp_id, skycell_id, tess_id, class_id),
    683681    KEY(fault),
    684     FOREIGN KEY (warp_id, fake_id)
    685         REFERENCES  warpRun(warp_id, fake_id)
     682    FOREIGN KEY (warp_id)
     683        REFERENCES warpRun(warp_id)
    686684) ENGINE=innodb DEFAULT CHARSET=latin1;
    687685

  • branches/faketool/ippTools/share/stacktool_find_complete_warps.sql

    r16827 r17951  
    66    JOIN warpSkyfile
    77        USING(warp_id)
     8    JOIN fakeRun
     9        USING(fake_id)
    810    JOIN camRun
    911        USING(cam_id)

  • branches/faketool/ippTools/share/stacktool_inputskyfile.sql

    r16828 r17951  
    1111JOIN warpRun
    1212    ON stackInputSkyfile.warp_id = warpRun.warp_id
    13 JOIN camProcessedExp
    14     ON warpRun.cam_id = camProcessedExp.cam_id
     13JOIN fakeRun
     14    USING(fake_id)
     15JOIN camRun
     16    USING(cam_id)
    1517JOIN chipRun
    16     ON camProcessedExp.chip_id = chipRun.chip_id
     18    USING(chip_id)
    1719JOIN chipProcessedImfile
    18     ON chipRun.chip_id = chipProcessedImfile.chip_id
     20    USING(chip_id)
    1921JOIN rawExp
    2022    ON chipProcessedImfile.exp_id = rawExp.exp_id

  • branches/faketool/ippTools/share/warptool_revertwarped.sql

    r17226 r17951  
    11DELETE FROM warpSkyfile
    2 USING warpSkyfile, warpRun, camRun, chipRun, rawExp
     2USING warpSkyfile, warpRun, fakeRun, camRun, chipRun, rawExp
    33WHERE
    44    warpSkyfile.warp_id = warpRun.warp_id
    5     AND warpRun.cam_id = camRun.cam_id
     5    AND warpRun.fake_id = fakeRun.fake_id
     6    AND fakeRun.cam_id = camRun.cam_id
    67    AND camRun.chip_id = chipRun.chip_id
    78    AND chipRun.exp_id = rawExp.exp_id

  • branches/faketool/ippTools/share/warptool_scmap.sql

    r16024 r17951  
    77JOIN warpSkyCellMap
    88    USING(warp_id)
     9JOIN fakeRun
     10    USING(fake_id)
     11JOIN camRun
     12    USING(cam_id)
    913JOIN camProcessedExp
    10     ON warpSkyCellMap.cam_id = camProcessedExp.cam_id
     14    USING(cam_id)
     15JOIN chipRun
     16    USING(chip_id)
    1117JOIN chipProcessedImfile
    12     ON camProcessedExp.chip_id = chipProcessedImfile.chip_id
     18    ON chipRun.chip_id = chipProcessedImfile.chip_id
    1319    AND warpSkyCellMap.class_id = chipProcessedImfile.class_id
    14 -- move this as an option into the code
    15 -- WHERE
     20WHERE
    1621--    warpRun.state = 'run'
     22    fakeRun.state = 'stop'
     23    AND camRun.state = 'stop'
     24    AND chipRun.state = 'stop'

  • branches/faketool/ippTools/share/warptool_tooverlap.sql

    r17938 r17951  
    1818    USING(exp_id)
    1919LEFT JOIN warpSkyCellMap
    20     USING(warp_id, fake_id)
     20    USING(warp_id)
    2121LEFT JOIN warpMask
    2222    ON warpRun.label = warpMask.label
    … …  
    2727    AND chipRun.state = 'stop'
    2828    AND warpSkyCellMap.warp_id IS NULL
    29     AND warpSkyCellMap.fake_id IS NULL
    3029    AND warpMask.label IS NULL

  • branches/faketool/ippTools/share/warptool_towarped.sql

    r17145 r17951  
    33    warpSkyCellMap.skycell_id,
    44    warpSkyCellMap.tess_id,
    5     warpSkyCellMap.cam_id,
     5    warpRun.fake_id,
     6    camRun.cam_id,
    67    rawExp.camera,
    78    warpRun.workdir
    … …  
    910JOIN warpSkyCellMap
    1011    USING(warp_id)
    11 JOIN camProcessedExp
    12     ON warpSkyCellMap.cam_id = camProcessedExp.cam_id
     12JOIN fakeRun
     13    USING(fake_id)
     14JOIN camRun
     15    USING(cam_id)
    1316JOIN chipRun
    14     ON camProcessedExp.chip_id = chipRun.chip_id
     17    USING(chip_id)
    1518JOIN chipProcessedImfile
    16     ON chipRun.chip_id = chipProcessedImfile.chip_id
     19    USING(chip_id)
    1720JOIN rawExp
    18     ON chipProcessedImfile.exp_id = rawExp.exp_id
     21    ON chipRun.exp_id = rawExp.exp_id
    1922LEFT JOIN warpSkyfile
    2023    ON warpRun.warp_id = warpSkyfile.warp_id
    … …  
    2528WHERE
    2629    warpRun.state = 'run'
     30    AND fakeRun.state = 'stop'
     31    AND camRun.state = 'stop'
     32    AND chipRun.state = 'stop'
    2733    AND warpSkyfile.warp_id IS NULL
    2834    AND warpSkyfile.skycell_id IS NULL

  • branches/faketool/ippTools/src/camtool.c

    r17938 r17951  
    599599    camProcessedExpRow *row = camProcessedExpRowAlloc(
    600600            pendingRow->cam_id,
    601             pendingRow->chip_id,
    602601            uri,
    603602            bg,
Note: See TracChangeset for help on using the changeset viewer.