IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 18029 for trunk/ippTools/share


Ignore:
Timestamp:
Jun 9, 2008, 12:55:57 PM (18 years ago)
Author:
jhoblitt
Message:

merge faketool branch

Location:
trunk/ippTools/share
Files:
4 added
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/Makefile.am

    r17859 r18029  
    11dist_pkgdata_DATA = \
     2        camtool_find_chip_id.sql \
    23        camtool_find_pendingexp.sql \
    34        camtool_find_pendingimfile.sql \
    45        camtool_find_processedexp.sql \
    5         camtool_find_chip_id.sql \
    66        camtool_queue_chip_id.sql \
    77        camtool_reset_faulted_runs.sql \
    … …  
    1818        detselect_search.sql \
    1919        detselect_select.sql \
    20         dettool_tocorrectimfile.sql \
    21         dettool_tocorrectexp.sql \
    22         dettool_stop_completed_correct_runs.sql \
    2320        dettool_find_completed_runs.sql \
    2421        dettool_normalizedstat.sql \
    2522        dettool_raw.sql \
    26         dettool_runs.sql \
    2723        dettool_revertdetrunsummary.sql \
    2824        dettool_revertnormalizedexp.sql \
    … …  
    3430        dettool_revertresidimfile.sql\
    3531        dettool_revertstacked.sql \
     32        dettool_runs.sql \
    3633        dettool_start_new_iteration.sql \
     34        dettool_stop_completed_correct_runs.sql \
     35        dettool_tocorrectexp.sql \
     36        dettool_tocorrectimfile.sql \
    3737        dettool_todetrunsummary.sql \
    3838        dettool_tonormalizedexp.sql \
    … …  
    4444        dettool_tostacked.sql \
    4545        difftool_inputskyfile.sql \
     46        difftool_queue.sql \
     47        difftool_revertdiffskyfile.sql \
    4648        difftool_skyfile.sql \
    4749        difftool_todiffskyfile.sql \
    48         difftool_revertdiffskyfile.sql \
    49         difftool_queue.sql \
     50        faketool_completely_processed_exp.sql \
     51        faketool_find_camrun.sql \
     52        faketool_find_pendingexp.sql \
     53        faketool_pendingimfile.sql \
     54        faketool_processedimfile.sql \
     55        faketool_queue_cam_id.sql \
     56        faketool_revertprocessedimfile.sql \
     57        faketool_unmasked.sql \
     58        flatcorr_completely_processed_chiprun.sql \
    5059        flatcorr_create_tmp_chiprundone.sql \
    51         flatcorr_completely_processed_chiprun.sql \
    5260        flatcorr_find_completed_floatcorruns.sql \
    5361        flatcorr_find_processedimfiles.sql \
    54         magictool_toprocess_inputs.sql \
    55         magictool_toprocess_tree.sql \
    56         magictool_tomask.sql \
    57         magictool_toskyfilemask.sql \
    5862        magictool_find_complete_diffed_exposures.sql \
    5963        magictool_find_complete_warpruns.sql \
    6064        magictool_inputskyfile.sql \
     65        magictool_tomask.sql \
     66        magictool_toprocess_inputs.sql \
     67        magictool_toprocess_tree.sql \
     68        magictool_toskyfilemask.sql \
     69        pxadmin_create_tables.sql \
     70        pxadmin_drop_tables.sql \
    6171        pztool_find_completed_exp.sql \
    6272        pztool_pendingimfile.sql \
    6373        pztool_revertcopied.sql \
    64         pxadmin_create_tables.sql \
    65         pxadmin_drop_tables.sql \
    6674        regtool_pendingexp.sql \
    6775        regtool_pendingimfile.sql \
    … …  
    7987        warptool_scmap.sql \
    8088        warptool_tooverlap.sql \
     89        warptool_revertwarped.sql \
    8190        warptool_towarped.sql \
    82         warptool_warped.sql \
    83         warptool_revertwarped.sql
     91        warptool_warped.sql

  • trunk/ippTools/share/camtool_find_pendingexp.sql

    r15956 r18029  
    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

  • trunk/ippTools/share/camtool_find_pendingimfile.sql

    r14117 r18029  
    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

  • trunk/ippTools/share/camtool_find_processedexp.sql

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

  • trunk/ippTools/share/difftool_inputskyfile.sql

    r16828 r18029  
    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

  • trunk/ippTools/share/difftool_todiffskyfile.sql

    r17713 r18029  
    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

  • trunk/ippTools/share/faketool_pendingimfile.sql

    r17938 r18029  
    2121        chipProcessedImfile.n_cr,
    2222        chipProcessedImfile.n_astrom,
    23         chipProcessedImfile.path_base,
     23        chipProcessedImfile.path_base as chip_path_base,
     24        camProcessedExp.path_base as cam_path_base,
    2425        rawExp.exp_name,
    2526        rawExp.camera,
    … …  
    2829    FROM fakeRun
    2930    JOIN camRun
     31        USING(cam_id)
     32    JOIN camProcessedExp
    3033        USING(cam_id)
    3134    JOIN chipRun

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r17881 r18029  
    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
    … …  
    646645CREATE TABLE detRegisteredImfile (det_id BIGINT, iteration INT, class_id VARCHAR(64), uri VARCHAR(255), bg DOUBLE, bg_stdev DOUBLE, bg_mean_stdev DOUBLE, user_1 DOUBLE, user_2 DOUBLE, user_3 DOUBLE, user_4 DOUBLE, user_5 DOUBLE, path_base VARCHAR(255), fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration, class_id), KEY(fault), FOREIGN KEY (det_id, iteration)  REFERENCES  detRun(det_id, iteration)) ENGINE=innodb DEFAULT CHARSET=latin1;
    647646
    648 CREATE TABLE warpRun (warp_id BIGINT AUTO_INCREMENT, cam_id BIGINT, mode VARCHAR(64), state VARCHAR(64), workdir VARCHAR(255), workdir_state VARCHAR(64), label VARCHAR(64), dvodb VARCHAR(255), tess_id VARCHAR(64), end_stage VARCHAR(64), registered DATETIME, magiced TINYINT, PRIMARY KEY(warp_id), KEY(warp_id), KEY(cam_id), KEY(mode), KEY(state), KEY(workdir_state), KEY(label), KEY(end_stage), KEY(magiced), INDEX(warp_id, cam_id), FOREIGN KEY (cam_id)  REFERENCES  camProcessedExp(cam_id)) ENGINE=innodb DEFAULT CHARSET=latin1;
    649 CREATE TABLE warpSkyCellMap (warp_id BIGINT, skycell_id VARCHAR(64), tess_id VARCHAR(64), cam_id BIGINT, class_id VARCHAR(64), fault SMALLINT, PRIMARY KEY(warp_id, skycell_id, tess_id, cam_id, class_id), KEY(fault), FOREIGN KEY (warp_id, cam_id)  REFERENCES  warpRun(warp_id, cam_id)) ENGINE=innodb DEFAULT CHARSET=latin1;
    650 CREATE TABLE warpSkyfile (warp_id BIGINT, skycell_id VARCHAR(64), tess_id VARCHAR(64), uri VARCHAR(255), path_base VARCHAR(255), bg DOUBLE, bg_stdev DOUBLE, dtime_warp FLOAT, hostname VARCHAR(64), good_frac FLOAT, xmin INT, xmax INT, ymin INT, ymax INT, ignored TINYINT, fault SMALLINT, PRIMARY KEY(warp_id, skycell_id, tess_id), KEY(good_frac), KEY(ignored), KEY(fault), FOREIGN KEY (warp_id, skycell_id, tess_id)  REFERENCES  warpSkyCellMap(warp_id, skycell_id, tess_id)) ENGINE=innodb DEFAULT CHARSET=latin1;
    651 CREATE TABLE warpMask (label VARCHAR(64), PRIMARY KEY(label)) ENGINE=innodb DEFAULT CHARSET=latin1;
     647CREATE TABLE warpRun (
     648    warp_id BIGINT AUTO_INCREMENT,
     649    fake_id BIGINT,
     650    mode VARCHAR(64),
     651    state VARCHAR(64),
     652    workdir VARCHAR(255),
     653    workdir_state VARCHAR(64),
     654    label VARCHAR(64),
     655    dvodb VARCHAR(255),
     656    tess_id VARCHAR(64),
     657    end_stage VARCHAR(64),
     658    registered DATETIME,
     659    magiced TINYINT,
     660    PRIMARY KEY(warp_id),
     661    KEY(warp_id),
     662    KEY(fake_id),
     663    KEY(mode),
     664    KEY(state),
     665    KEY(workdir_state),
     666    KEY(label),
     667    KEY(end_stage),
     668    KEY(magiced),
     669    INDEX(warp_id, fake_id),
     670    FOREIGN KEY (fake_id) 
     671        REFERENCES fakeRun(fake_id)
     672) ENGINE=innodb DEFAULT CHARSET=latin1;
     673
     674CREATE TABLE warpSkyCellMap (
     675    warp_id BIGINT,
     676    skycell_id VARCHAR(64),
     677    tess_id VARCHAR(64),
     678    class_id VARCHAR(64),
     679    fault SMALLINT,
     680    PRIMARY KEY(warp_id, skycell_id, tess_id, class_id),
     681    KEY(fault),
     682    FOREIGN KEY (warp_id)
     683        REFERENCES warpRun(warp_id)
     684) ENGINE=innodb DEFAULT CHARSET=latin1;
     685
     686CREATE TABLE warpSkyfile (
     687    warp_id BIGINT,
     688    skycell_id VARCHAR(64),
     689    tess_id VARCHAR(64),
     690    uri VARCHAR(255),
     691    path_base VARCHAR(255),
     692    bg DOUBLE,
     693    bg_stdev DOUBLE,
     694    dtime_warp FLOAT,
     695    hostname VARCHAR(64),
     696    good_frac FLOAT,
     697    xmin INT,
     698    xmax INT,
     699    ymin INT,
     700    ymax INT,
     701    ignored TINYINT,
     702    fault SMALLINT,
     703    PRIMARY KEY(warp_id, skycell_id, tess_id),
     704    KEY(good_frac),
     705    KEY(ignored), KEY(fault),
     706    FOREIGN KEY (warp_id, skycell_id, tess_id) 
     707        REFERENCES warpSkyCellMap(warp_id, skycell_id, tess_id)
     708) ENGINE=innodb DEFAULT CHARSET=latin1;
     709
     710CREATE TABLE warpMask (
     711    label VARCHAR(64),
     712    PRIMARY KEY(label)
     713) ENGINE=innodb DEFAULT CHARSET=latin1;
     714
    652715CREATE TABLE stackRun (stack_id BIGINT AUTO_INCREMENT, state VARCHAR(64), workdir VARCHAR(255), dvodb VARCHAR(255), registered DATETIME, skycell_id VARCHAR(64), tess_id VARCHAR(64), PRIMARY KEY(stack_id), KEY(stack_id), KEY(state), KEY(skycell_id), KEY(tess_id)) ENGINE=innodb DEFAULT CHARSET=latin1;
    653716CREATE TABLE stackInputSkyfile (stack_id BIGINT, warp_id BIGINT, PRIMARY KEY(stack_id, warp_id), FOREIGN KEY (stack_id)  REFERENCES  stackRun(stack_id), FOREIGN KEY (warp_id)  REFERENCES  warpSkyfile(warp_id)) ENGINE=innodb DEFAULT CHARSET=latin1;

  • trunk/ippTools/share/stacktool_find_complete_warps.sql

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

  • trunk/ippTools/share/stacktool_inputskyfile.sql

    r16828 r18029  
    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

  • trunk/ippTools/share/warptool_exp.sql

    r16733 r18029  
    11SELECT
    2     camProcessedExp.*
     2    fakeRun.*
    33FROM warpRun
    4 JOIN camProcessedExp
    5     USING(cam_id)
     4JOIN fakeRun
     5    USING(fake_id)
    66WHERE
    77    warpRun.state = 'run'
    8     AND camProcessedExp.fault = 0
     8    AND fakeRun.state = 'stop'

  • trunk/ippTools/share/warptool_imfile.sql

    r16733 r18029  
    11SELECT DISTINCT
    22    rawImfile.*,
    3     warpRun.cam_id,
     3    warpRun.fake_id,
    44    chipProcessedImfile.uri as chip_uri,
    55    chipProcessedImfile.path_base as chip_path_base,
    66    camProcessedExp.path_base as cam_path_base
    77FROM warpRun
     8JOIN fakeRun
     9    USING(fake_id)
     10JOIN camRun
     11    USING(cam_id)
    812JOIN camProcessedExp
    913    USING(cam_id)
    1014JOIN chipRun
    11     ON camProcessedExp.chip_id = chipRun.chip_id
     15    ON camRun.chip_id = chipRun.chip_id
    1216JOIN chipProcessedImfile
    13     ON camProcessedExp.chip_id = chipProcessedImfile.chip_id
     17    ON chipRun.chip_id = chipProcessedImfile.chip_id
    1418JOIN rawImfile -- is there any reason not to refer back to rawimfiles?
    15     ON chipProcessedImfile.exp_id = rawImfile.exp_id AND chipProcessedImfile.class_id = rawImfile.class_id
     19    ON chipProcessedImfile.exp_id = rawImfile.exp_id
     20    AND chipProcessedImfile.class_id = rawImfile.class_id
    1621WHERE
    1722    warpRun.state = 'run'
     23    AND fakeRun.state = 'stop'
     24    AND camRun.state = 'stop'
     25    AND chipRun.state = 'stop'
    1826

  • trunk/ippTools/share/warptool_revertwarped.sql

    r17226 r18029  
    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

  • trunk/ippTools/share/warptool_scmap.sql

    r16024 r18029  
    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'

  • trunk/ippTools/share/warptool_tooverlap.sql

    r17145 r18029  
    11SELECT
    22    warpRun.warp_id,
    3     warpRun.cam_id,
     3    warpRun.fake_id,
    44    warpRun.workdir,
    55    warpRun.tess_id,
    … …  
    99    warpRun.magiced
    1010FROM warpRun
    11 JOIN camProcessedExp
     11JOIN fakeRun
     12    USING(fake_id)
     13JOIN camRun
    1214    USING(cam_id)
    1315JOIN chipRun
    … …  
    1618    USING(exp_id)
    1719LEFT JOIN warpSkyCellMap
    18     USING(warp_id, cam_id)
     20    USING(warp_id)
    1921LEFT JOIN warpMask
    2022    ON warpRun.label = warpMask.label
    2123WHERE
    2224    warpRun.state = 'run'
    23     AND camProcessedExp.fault = 0
     25    AND fakeRun.state = 'stop'
     26    AND camRun.state = 'stop'
     27    AND chipRun.state = 'stop'
    2428    AND warpSkyCellMap.warp_id IS NULL
    25     AND warpSkyCellMap.cam_id IS NULL
    2629    AND warpMask.label IS NULL

  • trunk/ippTools/share/warptool_towarped.sql

    r17145 r18029  
    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
Note: See TracChangeset for help on using the changeset viewer.