IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 29, 2009, 6:15:31 PM (17 years ago)
Author:
beaumont
Message:

merged with head

Location:
branches/cnb_branches/cnb_branch_20090301
Files:
31 edited
6 copied

Legend:

Unmodified
Added
Removed

  • branches/cnb_branches/cnb_branch_20090301

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/Makefile.am

    r23352 r23594  
    7676     difftool_definebyquery_part2.sql \
    7777     difftool_definebyquery_temp_create.sql \
     78     difftool_definewarpwarp_select.sql \
     79     difftool_definewarpwarp_insert.sql \
    7880     difftool_donecleanup.sql \
    7981     difftool_inputskyfile.sql \
    … …  
    152154     regtool_revertprocessedexp.sql \
    153155     regtool_revertprocessedimfile.sql \
     156     regtool_updateprocessedimfile.sql \
    154157     stacktool_definebyquery_insert.sql \
    155158     stacktool_definebyquery_insert_random_part1.sql \
    … …  
    172175     warptool_donecleanup.sql \
    173176     warptool_exp.sql \
     177     warptool_finished_run_select.sql \
     178     warptool_finish_run.sql \
    174179     warptool_imfile.sql \
    175180     warptool_pendingcleanuprun.sql \

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/camtool_find_processedexp.sql

    r21443 r23594  
    11SELECT DISTINCT
    22    camProcessedExp.*,
     3    chipRun.chip_id,
    34    rawExp.exp_tag,
    45    rawExp.exp_name,

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/chiptool_change_imfile_data_state.sql

    r23352 r23594  
    11-- handle changes in data_state. Used for the modes tocleanedimfile and topurgedimfile
    2 -- args are new data_state, chip_id, class_id, and current expected state for chipRun
     2-- args are new data_state, a possibly empty string for updating the magicked state,
     3-- chip_id and class_id
    34UPDATE chipProcessedImfile
     5JOIN rawImfile USING(exp_id, class_id)
    46    SET
    5     data_state = '%s'
     7    chipProcessedImfile.data_state = '%s'
     8    -- set magicked hook %s
    69WHERE
    710    chip_id = %lld

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/chiptool_completely_processed_exp.sql

    r20608 r23594  
    1111    dvodb,
    1212    tess_id,
    13     end_stage
     13    end_stage,
     14    all_files_magicked as magicked
    1415FROM
    1516    (SELECT
    1617        chipRun.*,
    1718        rawImfile.class_id as rawimfile_class_id,
    18         chipProcessedImfile.class_id
     19        chipProcessedImfile.class_id,
     20        SUM(!chipProcessedImfile.magicked) = 0 as all_files_magicked
    1921    FROM chipRun
    2022    JOIN rawImfile

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/chiptool_pendingimfile.sql

    r21334 r23594  
    44    rawImfile.class_id,
    55    rawImfile.uri,
     6    rawImfile.magicked as raw_magicked,
     7    (rawImfile.user_1 is not NULL and rawImfile.user_1 > 0.5) as deburned,
    68    rawExp.exp_tag,
    79    rawExp.exp_name,

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/difftool_completed_runs.sql

    r20973 r23594  
    11SELECT DISTINCT
    2     diff_id
     2    diff_id,
     3    all_magicked as magicked
    34FROM (
    45    SELECT
    56        COUNT(diffInputSkyfile.skycell_id), COUNT(diffSkyfile.skycell_id),
    6         diffSkyfile.*
     7        diffSkyfile.*,
     8        SUM(!diffSkyfile.magicked) = 0 as all_magicked
    79    FROM diffRun
    810    JOIN diffInputSkyfile USING(diff_id)

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/difftool_inputskyfile.sql

    r20976 r23594  
    99        warpSkyfile.uri,
    1010        warpSkyfile.path_base,
     11        warpSkyfile.magicked as magicked,
    1112        0 as template,
    1213        rawExp.camera
    … …  
    4748        warpSkyfile.uri,
    4849        warpSkyfile.path_base,
     50        warpSkyfile.magicked as magicked,
    4951        1 as template,
    5052        rawExp.camera
    … …  
    8587        stackSumSkyfile.uri,
    8688        stackSumSkyfile.path_base,
     89        0 as magicked,
    8790        0 as template,
    8891        rawExp.camera
    … …  
    117120        stackSumSkyfile.uri,
    118121        stackSumSkyfile.path_base,
     122        0 as magicked,
    119123        1 as template,
    120124        rawExp.camera

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/disttool_pendingcomponent.sql

    r23352 r23594  
    22SELECT
    33    distRun.dist_id,
     4    distRun.label,
    45    stage,
    56    stage_id,
    … …  
    89    rawExp.camera,
    910    outroot,
    10     rawImfile.uri as path_base,
     11    rawImfile.uri as path_base,         -- change this once rawImfile has path_base
    1112    chipProcessedImfile.path_base as chip_path_base,
    1213    NULL as state,
    … …  
    1516FROM distRun
    1617JOIN rawExp ON exp_id = stage_id
    17 JOIN rawImfile using(exp_id)
     18JOIN (                      -- find the last magicked chip run
     19    SELECT
     20        exp_id,
     21        MAX(chip_id) AS chip_id
     22    FROM chipRun
     23    WHERE
     24        chipRun.state = 'full'
     25        AND chipRun.exp_id = exp_id
     26        --   AND chipRun.magicked
     27        -- magicked hook 1 %s
     28        GROUP BY exp_id
     29    ) AS bestChipRun
     30    USING(exp_id)
     31JOIN rawImfile USING(exp_id)
    1832JOIN chipProcessedImfile
    19     ON distRun.chip_id = chipProcessedImfile.chip_id
    20     AND rawImfile.class_id = chipProcessedImfile.class_id
     33    USING(exp_id, chip_id, class_id)
    2134LEFT JOIN distComponent
    2235    ON distRun.dist_id = distComponent.dist_id
    … …  
    2639    AND distRun.stage = 'raw'
    2740    AND distComponent.dist_id IS NULL
     41    -- if magicked add AND rawImfile.magicked here
     42    -- where hook 1 %s
    2843
    2944-- chip stage
    … …  
    3146SELECT
    3247    distRun.dist_id,
     48    distRun.label,
    3349    stage,
    3450    stage_id,
    … …  
    5369    AND distRun.stage = 'chip'
    5470    AND distComponent.dist_id IS NULL
    55 UNION
    56 SELECT
    57     distRun.dist_id,
     71    -- where hook 2 %s
     72UNION
     73SELECT
     74    distRun.dist_id,
     75    distRun.label,
     76    stage,
     77    stage_id,
     78    chipProcessedImfile.class_id AS component,
     79    clean,
     80    rawExp.camera,
     81    outroot,
     82    camProcessedExp.path_base,
     83    chipProcessedImfile.path_base as chip_path_base,
     84    camRun.state,
     85    NULL,
     86    0
     87FROM distRun
     88JOIN camRun ON camRun.cam_id = distRun.stage_id
     89JOIN camProcessedExp USING(cam_id)
     90JOIN chipRun USING(chip_id)
     91JOIN chipProcessedImfile USING(exp_id, chip_id)
     92JOIN rawExp using(exp_id)
     93LEFT JOIN distComponent
     94    ON distRun.dist_id = distComponent.dist_id
     95    AND chipProcessedImfile.class_id = distComponent.component
     96WHERE
     97    distRun.state = 'new'
     98    AND distRun.stage = 'camera'
     99    AND distComponent.dist_id IS NULL
     100    -- where hook 3 %s
     101UNION
     102SELECT
     103    distRun.dist_id,
     104    distRun.label,
     105    stage,
     106    stage_id,
     107    fakeProcessedImfile.class_id AS component,
     108    clean,
     109    rawExp.camera,
     110    outroot,
     111    fakeProcessedImfile.path_base,
     112    NULL,
     113    fakeRun.state,
     114    NULL,
     115    0
     116FROM distRun
     117JOIN fakeRun ON fakeRun.fake_id = distRun.stage_id
     118JOIN fakeProcessedImfile USING(fake_id)
     119JOIN camRun USING(cam_id)
     120JOIN chipRun USING(chip_id, exp_id)
     121JOIN rawExp using(exp_id)
     122LEFT JOIN distComponent
     123    ON distRun.dist_id = distComponent.dist_id
     124    AND fakeProcessedImfile.class_id = distComponent.component
     125WHERE
     126    distRun.state = 'new'
     127    AND distRun.stage = 'fake'
     128    AND distComponent.dist_id IS NULL
     129    -- where hook 4 %s
     130UNION
     131SELECT
     132    distRun.dist_id,
     133    distRun.label,
    58134    stage,
    59135    stage_id,
    … …  
    81157    AND distRun.stage = 'warp'
    82158    AND distComponent.dist_id IS NULL
    83 UNION
    84 SELECT
    85     distRun.dist_id,
     159    -- where hook 5 %s
     160UNION
     161SELECT
     162    distRun.dist_id,
     163    distRun.label,
    86164    stage,
    87165    stage_id,
    … …  
    108186    AND distRun.stage = 'diff'
    109187    AND distComponent.dist_id IS NULL
     188    -- where hook 6 %s
    110189UNION
    111190SELECT DISTINCT
    112191    distRun.dist_id,
     192    distRun.label,
    113193    stage,
    114194    stage_id,
    … …  
    152232    AND distRun.stage = 'stack'
    153233    AND distComponent.dist_id IS NULL
     234    -- where hook 7 %s
    154235) as Foo

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magicdstool_completed_runs.sql

    r20973 r23594  
    1212        AND magicDSFile.component = rawImfile.class_id
    1313    WHERE
    14         magicDSRun.state = 'run'
     14        magicDSRun.state = 'new'
    1515        AND magicDSRun.stage = 'raw'
    1616    GROUP BY
    … …  
    3030        AND magicDSFile.component = chipProcessedImfile.class_id
    3131    WHERE
    32         magicDSRun.state = 'run'
     32        magicDSRun.state = 'new'
    3333        AND magicDSRun.stage = 'chip'
    3434    GROUP BY
    … …  
    4848        AND magicDSFile.component = warpSkyfile.skycell_id
    4949    WHERE
    50         magicDSRun.state = 'run'
     50        magicDSRun.state = 'new'
    5151        AND magicDSRun.stage = 'warp'
    5252        AND warpSkyfile.fault = 0
    … …  
    7272        AND magicDSFile.component = diffSkyfile.skycell_id
    7373    WHERE
    74         magicDSRun.state = 'run'
     74        magicDSRun.state = 'new'
    7575        AND magicDSRun.stage = 'diff'
    7676        AND diffSkyfile.fault = 0

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magicdstool_todestreak.sql

    r20973 r23594  
    2626    AND magicDSFile.component = rawImfile.class_id
    2727WHERE
    28     magicDSRun.state = 'run'
     28    magicDSRun.state = 'new'
    2929    AND magicDSRun.stage = 'raw'
    3030    AND magicDSFile.component IS NULL
    … …  
    5757    AND magicDSFile.component = chipProcessedImfile.class_id
    5858WHERE
    59     magicDSRun.state = 'run'
     59    magicDSRun.state = 'new'
    6060    AND magicDSRun.stage = 'chip'
    6161    AND chipRun.state = 'full'
    … …  
    9191    AND magicDSFile.component = warpSkyfile.skycell_id
    9292WHERE
    93     magicDSRun.state = 'run'
     93    magicDSRun.state = 'new'
    9494    AND magicDSRun.stage = 'warp'
    9595    AND warpRun.state = 'full'
    … …  
    127127    AND magicDSFile.component = diffSkyfile.skycell_id
    128128WHERE
    129     magicDSRun.state = 'run'
     129    magicDSRun.state = 'new'
    130130    AND magicDSRun.stage = 'diff'
    131131    AND diffSkyfile.fault = 0

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_addmask.sql

    r18526 r23594  
    22    magicRun
    33SET
    4     state = 'stop'
     4    state = 'full'
    55WHERE
    6     state != 'stop'
     6    state != 'full'

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_chipprocessedimfile.sql

    r20706 r23594  
    2626    chipRun.state = 'full'
    2727    AND chipProcessedImfile.fault = 0
    28 --   AND magicRun.state = 'stop'
     28--   AND magicRun.state = 'full'
    2929--   AND magicMask.fault = 0

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_diffskyfile.sql

    r20701 r23594  
    2424    diffRun.state = 'full'
    2525    AND diffSkyfile.fault = 0
    26 --   AND magicRun.state = 'stop'
     26--   AND magicRun.state = 'full'
    2727--   AND magicMask.fault = 0

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_inputskyfile.sql

    r20973 r23594  
    99    AND magicInputSkyfile.node = diffSkyfile.skycell_id
    1010WHERE
    11     magicRun.state = 'run'
     11    magicRun.state = 'new'

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_mask.sql

    r20735 r23594  
    66    USING(magic_id)
    77WHERE
    8     magicRun.state = 'stop'
     8    magicRun.state = 'full'
    99    AND magicMask.fault = 0

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_rawimfile.sql

    r20706 r23594  
    2424WHERE
    2525    rawImfile.fault = 0
    26 --   AND magicRun.state = 'stop'
     26--   AND magicRun.state = 'full'
    2727--   AND magicMask.fault = 0

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_tomask.sql

    r18781 r23594  
    1010LEFT JOIN magicNodeResult USING(magic_id, node)
    1111WHERE
    12     magicRun.state = 'run'
     12    magicRun.state = 'new'
    1313    AND magicNodeResult.node = 'root'
    1414    AND magicNodeResult.fault = 0

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_toprocess_inputs.sql

    r21004 r23594  
    1919    AND magicTree.node = magicNodeResult.node
    2020WHERE
    21     magicRun.state = 'run'
     21    magicRun.state = 'new'
    2222    AND magicNodeResult.magic_id IS NULL
    2323    AND magicNodeResult.node IS NULL

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_toprocess_tree.sql

    r21099 r23594  
    1515    AND magicTree.node = magicNodeResult.node
    1616WHERE
    17     magicRun.state = 'run'
     17    magicRun.state = 'new'
    1818    -- where hook %s
    1919ORDER BY

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_toskyfilemask.sql

    r15348 r23594  
    77    USING(magic_id)
    88WHERE
    9     magicRun.state = 'run'
     9    magicRun.state = 'new'
    1010    AND magicSkyfileMask.magic_id IS NULL

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_totree.sql

    r20474 r23594  
    1212    USING(magic_id)
    1313WHERE
    14     magicRun.state = 'run'
     14    magicRun.state = 'new'
    1515    AND magicTree.node IS NULL
    1616    AND magicRun.fault = 0

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/magictool_warpskyfile.sql

    r20701 r23594  
    2121    warpRun.state = 'full'
    2222    AND warpSkyfile.fault = 0
    23 --   AND magicRun.state = 'stop'
     23--   AND magicRun.state = 'full'
    2424--   AND magicMask.fault = 0

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/pxadmin_create_tables.sql

    r23352 r23594  
    167167    fault SMALLINT NOT NULL,
    168168    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     169    magicked TINYINT,
    169170    PRIMARY KEY(exp_id),
    170171    KEY(exp_name),
    … …  
    263264    tess_id VARCHAR(64),
    264265    end_stage VARCHAR(64),
     266    magicked TINYINT,
    265267    PRIMARY KEY(chip_id),
    266268    KEY(chip_id), KEY(exp_id),
    … …  
    826828    end_stage VARCHAR(64),
    827829    registered DATETIME,
     830    magicked TINYINT,
    828831    PRIMARY KEY(warp_id),
    829832    KEY(warp_id),
    … …  
    963966        tess_id VARCHAR(64),
    964967        exp_id  BIGINT,
     968        magicked TINYINT,
    965969        PRIMARY KEY(diff_id),
    966970        KEY(diff_id),
    … …  
    10951099        stage_id BIGINT,
    10961100        cam_id BIGINT,
     1101        label VARCHAR(64),
    10971102        outroot VARCHAR(255),
    10981103        recoveryroot VARCHAR(255),
    … …  
    11021107        KEY(magic_ds_id),
    11031108        KEY(state),
     1109        KEY(magic_id),
     1110        KEY(label),
    11041111        FOREIGN KEY (magic_id)  REFERENCES  magicRun(magic_id)
    11051112) ENGINE=innodb DEFAULT CHARSET=latin1;
    … …  
    12251232        KEY(job_id),
    12261233        FOREIGN KEY (req_id)  REFERENCES  pstampRequest(req_id)
    1227 ) ENGINE=innodb DEFAULT CHARSET=latin1
     1234) ENGINE=innodb DEFAULT CHARSET=latin1;
     1235
     1236CREATE TABLE distTarget (
     1237    target_id   BIGINT AUTO_INCREMENT,
     1238    obs_mode    VARCHAR(64),
     1239    stage       VARCHAR(64),
     1240    clean       TINYINT,
     1241    state       VARCHAR(64),
     1242    comment     VARCHAR(255),
     1243    PRIMARY KEY(target_id)
     1244)  ENGINE=innodb DEFAULT CHARSET=latin1;
     1245
     1246CREATE TABLE distRun (
     1247    dist_id     BIGINT AUTO_INCREMENT,
     1248    target_id   BIGINT,
     1249    stage       VARCHAR(64),
     1250    stage_id    BIGINT,
     1251    label       VARCHAR(64),
     1252    outroot     VARCHAR(255),
     1253    clean       TINYINT,
     1254    state       VARCHAR(64),
     1255    time_stamp  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     1256    fault       SMALLINT,
     1257    PRIMARY KEY(dist_id),
     1258    KEY(state),
     1259    KEY(label),
     1260    FOREIGN KEY(target_id) REFERENCES distTarget(target_id)
     1261)  ENGINE=innodb DEFAULT CHARSET=latin1;
     1262
     1263CREATE TABLE distComponent (
     1264    dist_id     BIGINT,
     1265    component   VARCHAR(64),
     1266    bytes       INT,
     1267    md5sum      VARCHAR(32),
     1268    state       VARCHAR(64),
     1269    name        VARCHAR(255),
     1270    fault       SMALLINT,
     1271    PRIMARY KEY(dist_id, component),
     1272    KEY(state),
     1273    FOREIGN KEY(dist_id) REFERENCES distRun(dist_id)
     1274)  ENGINE=innodb DEFAULT CHARSET=latin1;
     1275
     1276
     1277CREATE TABLE rcDSProduct (
     1278    prod_id     BIGINT AUTO_INCREMENT,
     1279    name        VARCHAR(64),
     1280    dbname      VARCHAR(64),
     1281    dbhost      VARCHAR(64),
     1282    prod_root   VARCHAR(255),
     1283    PRIMARY KEY(prod_id)
     1284)  ENGINE=innodb DEFAULT CHARSET=latin1;
     1285
     1286CREATE TABLE rcDestination (
     1287    dest_id     BIGINT AUTO_INCREMENT,
     1288    prod_id     BIGINT,
     1289    name        VARCHAR(64),
     1290    status_uri  VARCHAR(255),
     1291    comment     VARCHAR(255),
     1292    last_fileset VARCHAR(255),
     1293    state       VARCHAR(64),
     1294    PRIMARY KEY(dest_id),
     1295    FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
     1296)  ENGINE=innodb DEFAULT CHARSET=latin1;
     1297
     1298
     1299CREATE TABLE rcInterest (
     1300    int_id      BIGINT AUTO_INCREMENT,
     1301    dest_id     BIGINT,
     1302    target_id   BIGINT,
     1303    prod_id     BIGINT,
     1304    state       VARCHAR(64),
     1305    PRIMARY KEY(int_id),
     1306    FOREIGN KEY(dest_id) REFERENCES rcDestination(dest_id),
     1307    FOREIGN KEY(target_id) REFERENCES distTarget(target_id),
     1308    FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
     1309)  ENGINE=innodb DEFAULT CHARSET=latin1;
     1310
     1311CREATE TABLE rcDSFileset (
     1312    fs_id       BIGINT AUTO_INCREMENT,
     1313    dist_id     BIGINT,
     1314    prod_id     BIGINT,
     1315    name        VARCHAR(64),
     1316    state       VARCHAR(64),
     1317    registered  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     1318    PRIMARY KEY(fs_id),
     1319    FOREIGN KEY(dist_id) REFERENCES distRun(dist_id),
     1320    FOREIGN KEY(prod_id) REFERENCES rcDSProduct(prod_id)
     1321)  ENGINE=innodb DEFAULT CHARSET=latin1;
     1322
     1323CREATE TABLE rcRun (
     1324    rc_id       BIGINT AUTO_INCREMENT,
     1325    fs_id       BIGINT,
     1326    dest_id     BIGINT,
     1327    state       VARCHAR(64),
     1328    registered  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     1329    PRIMARY KEY(rc_id),
     1330    FOREIGN KEY(fs_id) REFERENCES rcDSFileset(fs_id),
     1331    FOREIGN KEY(dest_id) REFERENCES rcDestination(dest_id)
     1332)  ENGINE=innodb DEFAULT CHARSET=latin1;
     1333
     1334
     1335
     1336-- This comment line is here to avoid empty query error.
     1337-- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/pxadmin_drop_tables.sql

    r21308 r23594  
    5454DROP TABLE IF EXISTS calRun;
    5555DROP TABLE IF EXISTS flatcorrRun;
     56DROP TABLE IF EXISTS flatcorrExp;
    5657DROP TABLE IF EXISTS flatcorrChipLink;
    5758DROP TABLE IF EXISTS flatcorrCamLink;
    … …  
    6061DROP TABLE IF EXISTS pstampRequest;
    6162DROP TABLE IF EXISTS pstampJob;
     63DROP TABLE IF EXISTS distRun;
     64DROP TABLE IF EXISTS distTarget;
     65DROP TABLE IF EXISTS distComponent;
     66DROP TABLE IF EXISTS rcDSProduct;
     67DROP TABLE IF EXISTS rcDestination;
     68DROP TABLE IF EXISTS rcInterest;
     69DROP TABLE IF EXISTS rcDSFileset;
     70DROP TABLE IF EXISTS rcRun;
     71
    6272SET FOREIGN_KEY_CHECKS=1

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/pztool_find_completed_exp.sql

    r17925 r23594  
    11SELECT DISTINCT
    2     exp_name, -- return should match pzDownloadExp
     2    exp_name,
    33    camera,
    44    telescope,
    5     state,
    6     NULL as epoch    -- epoch
     5    state
    76FROM (
    87    SELECT

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/warptool_change_skyfile_data_state.sql

    r23352 r23594  
    88    warp_id = %lld
    99    AND skycell_id = '%s'
    10     -- only update if chipRun.state has the expected value
    11 --    AND (
    12 --        SELECT state from warpRun where warpRun.warp_id = warpSkyfile.warp_id
    13 --    ) = '%s'

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/warptool_definebyquery.sql

    r20041 r23594  
    99        rawExp.dateobs,
    1010        rawExp.exp_tag,
     11        rawExp.exp_name,
    1112        rawExp.exp_type,
    1213        rawExp.filelevel,

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/warptool_pendingcleanuprun.sql

    r19521 r23594  
    1313USING (exp_id)
    1414WHERE
    15     (warpRun.state = 'goto_cleaned' OR warpRun.state = 'goto_purged')
     15    (warpRun.state = 'goto_cleaned' OR warpRun.state = 'goto_scrubbed' OR warpRun.state = 'goto_purged')

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/warptool_pendingcleanupskyfile.sql

    r19521 r23594  
    1010    USING(warp_id)
    1111WHERE
    12     (warpRun.state = 'goto_cleaned' AND warpSkyfile.data_state = 'full')
     12   ((warpRun.state = 'goto_cleaned' AND warpSkyfile.data_state = 'full')
    1313    OR
    14     (warpRun.state = 'goto_purged' AND warpSkyfile.data_state != 'purged')
     14    (warpRun.state = 'goto_scrubbed' AND warpSkyfile.data_state = 'full')
     15    OR
     16    (warpRun.state = 'goto_purged'   AND warpSkyfile.data_state != 'purged'))

  • branches/cnb_branches/cnb_branch_20090301/ippTools/share/warptool_towarped.sql

    r21308 r23594  
    99    rawExp.camera,
    1010    rawExp.exp_tag,
    11     warpRun.workdir
     11    warpRun.workdir,
     12    chipRun.magicked
    1213FROM warpRun
    1314JOIN warpSkyCellMap
Note: See TracChangeset for help on using the changeset viewer.