IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 18, 2010, 5:06:01 PM (16 years ago)
Author:
watersc1
Message:

Almost working version of the mask-stats/software revision code.

Almost.

Location:
branches/czw_branch/20100427
Files:
3 added
32 edited
5 copied

Legend:

Unmodified
Added
Removed

  • branches/czw_branch/20100427

  • branches/czw_branch/20100427/ippTools/share/Makefile.am

    r27777 r28017  
    2828     chiptool_change_imfile_data_state.sql \
    2929     chiptool_completely_processed_exp.sql \
     30     chiptool_coalesce_run.sql \
    3031     chiptool_definecopy.sql \
    3132     chiptool_donecleanup.sql \
    … …  
    4142     chiptool_runstate.sql \
    4243     chiptool_setimfiletoupdate.sql \
     44     chiptool_export_run.sql \
    4345     chiptool_export_imfile.sql \
    4446     chiptool_export_processed_imfile.sql \
    … …  
    9698     difftool_change_run_state.sql \
    9799     difftool_completed_runs.sql \
     100     difftool_coalesce_run.sql \
    98101     difftool_definewarpstack_part1.sql \
    99102     difftool_definewarpstack_part2.sql \
    … …  
    114117     difftool_pendingcleanupskyfile.sql \
    115118     difftool_revertdiffskyfile_delete.sql \
    116      difftool_revertdiffskyfile_update.sql \
     119     difftool_revertdiffskyfile_updated.sql \
     120     difftool_setskyfiletoupdate.sql \
    117121     difftool_skyfile.sql \
    118122     difftool_todiffskyfile.sql \
    … …  
    196200     magictool_rawimfile.sql \
    197201     magictool_revertnode.sql \
     202     magictool_exposure.sql \
    198203     magicdstool_clearstatefaults.sql \
    199204     magicdstool_completed_runs.sql \
    … …  
    223228     pstamptool_completedreq.sql \
    224229     pstamptool_datastore.sql \
     230     pstamptool_getdependent.sql \
    225231     pstamptool_listjob.sql \
     232     pstamptool_pendingcleanup.sql \
    226233     pstamptool_pendingdependent.sql \
    227234     pstamptool_pendingjob.sql \
    … …  
    293300     warptool_finished_run_select.sql \
    294301     warptool_finish_run.sql \
     302     warptool_coalesce_run.sql \
    295303     warptool_imfile.sql \
    296304     warptool_listrun.sql \

  • branches/czw_branch/20100427/ippTools/share/camtool_find_pendingexp.sql

    r26567 r28017  
    1010    rawExp.telescope,
    1111    rawExp.filelevel,
    12     chipRun.magicked AS chip_magicked
     12    chipRun.magicked AS chip_magicked,
     13    camProcessedExp.path_base
    1314FROM camRun
    1415JOIN chipRun

  • branches/czw_branch/20100427/ippTools/share/camtool_find_processedexp.sql

    r27739 r28017  
    33    camRun.workdir,
    44    camRun.label,
     5    camRun.state,
    56    camRun.magicked,
    67    chipRun.chip_id,

  • branches/czw_branch/20100427/ippTools/share/camtool_queue_chip_id.sql

    r26567 r28017  
    1717        '%s',           -- end_stage
    1818        %lld,           -- magicked
     19        '%s',           -- software ver
     20        '%s',           -- maskfrac_npix
     21        '%s',           --         _static
     22        '%s',           --         _dynamic
     23        '%s',           --         _magic
     24        '%s',           --         _advisory
    1925        '%s'            -- note
    2026    FROM chipRun

  • branches/czw_branch/20100427/ippTools/share/chiptool_listrun.sql

    r27738 r28017  
    1616    rawExp.camera,
    1717    rawExp.filter,
     18    rawExp.dateobs,
     19    rawExp.ra,
     20    rawExp.decl,
     21    rawExp.exp_time,
    1822    rawExp.magicked AS raw_magicked,
    1923    magicDSRun.state AS dsRun_state

  • branches/czw_branch/20100427/ippTools/share/chiptool_pendingimfile.sql

    r27738 r28017  
    1010    rawExp.camera,
    1111    rawExp.telescope,
    12     rawExp.filelevel
     12    rawExp.filelevel,
     13    IFNULL(Label.priority, 10000) AS priority,
     14    chipProcessedImfile.path_base
    1315FROM chipRun
    1416JOIN rawExp
    … …  
    2527LEFT JOIN chipMask
    2628    ON chipRun.label = chipMask.label
     29LEFT JOIN Label ON chipRun.label = Label.label
    2730WHERE
    2831    ((chipRun.state = 'new'
    … …  
    3538    AND chipProcessedImfile.data_state = 'update'
    3639    AND chipProcessedImfile.fault = 0))
     40    AND (Label.active OR Label.active IS NULL)

  • branches/czw_branch/20100427/ippTools/share/chiptool_processedimfile.sql

    r27738 r28017  
    2323    rawExp.telescope,
    2424    rawExp.filelevel,
     25    rawExp.dateobs,
     26    rawExp.ra,
     27    rawExp.decl,
     28    rawExp.exp_time,
    2529    rawImfile.magicked AS raw_magicked,
    2630    rawImfile.burntool_state,

  • branches/czw_branch/20100427/ippTools/share/detselect_search.sql

    r16514 r28017  
    2727    ) as Foo
    2828WHERE
    29     (state = 'stop' OR state = 'register')
     29    (state = 'stop')

  • branches/czw_branch/20100427/ippTools/share/difftool_todiffskyfile.sql

    r27391 r28017  
    1212    diffRun.reduction,
    1313    diffRun.bothways,
    14     diffRun.diff_mode
     14    diffRun.diff_mode,
     15    diffSkyfile.path_base
    1516FROM diffRun
    1617JOIN diffInputSkyfile USING(diff_id)

  • branches/czw_branch/20100427/ippTools/share/magicdstool_todestreak_camera.sql

    r27301 r28017  
    33    magicDSRun.magic_id,
    44    chipRun.exp_id,
     5    camRun.magicked,
    56    magicDSRun.label,
    67    camera,

  • branches/czw_branch/20100427/ippTools/share/magicdstool_todestreak_chip.sql

    r27747 r28017  
    33    magicDSRun.magic_id,
    44    chipRun.exp_id,
     5    chipRun.magicked,
    56    magicDSRun.label,
    67    camera,

  • branches/czw_branch/20100427/ippTools/share/magicdstool_todestreak_diff.sql

    r27476 r28017  
    1010    stage,
    1111    magicRun.diff_id AS stage_id,
     12    diffRun.magicked,
    1213    diffSkyfile.skycell_id AS component,
    1314    CAST(NULL AS CHAR(255)) AS uri,
    … …  
    4748    magicDSRun.label,
    4849    rawExp.camera,
    49     magicMask.uri as streaks_uri,
     50    magicMask.uri AS streaks_uri,
    5051    (SELECT uri from magicMask where magic_id = inv_magic_id) AS inv_streaks_uri,
    5152    stage,
    52     magicRun.diff_id as stage_id,
    53     diffSkyfile.skycell_id as component,
     53    magicRun.diff_id AS stage_id,
     54    diffRun.magicked,
     55    diffSkyfile.skycell_id AS component,
    5456    CAST(NULL AS CHAR(255)) AS uri,
    5557    diffSkyfile.path_base,
    5658    magicRun.inverse,
    57     CAST(NULL AS CHAR(255)) as cam_path_base,
     59    CAST(NULL AS CHAR(255)) AS cam_path_base,
    5860    CAST(NULL AS CHAR(255)) AS cam_reduction,
    5961    outroot,
    … …  
    8082    AND diffSkyfile.quality = 0
    8183    AND magicDSFile.component IS NULL
    82 ) as magicDSRun
     84) AS magicDSRun
    8385-- we need the following so this query is compatible with the other stages
    8486WHERE magic_ds_id IS NOT NULL

  • branches/czw_branch/20100427/ippTools/share/magicdstool_todestreak_raw.sql

    r27454 r28017  
    44    magicRun.exp_id,
    55    magicDSRun.label,
    6     camera,
     6    rawExp.camera,
    77    magicMask.uri as streaks_uri,
    88    CAST(NULL AS CHAR(255)) AS inv_streaks_uri,
    99    stage,
    1010    stage_id,
     11    rawExp.magicked,
    1112    class_id as component,
    1213    rawImfile.uri AS uri,
    … …  
    2526JOIN camRun USING(cam_id)
    2627JOIN camProcessedExp USING(cam_id)
    27 JOIN rawImfile ON magicRun.exp_id = rawImfile.exp_id
     28JOIN rawExp ON magicRun.exp_id = rawExp.exp_id
     29JOIN rawImfile ON rawExp.exp_id = rawImfile.exp_id
    2830LEFT JOIN magicDSFile
    2931    ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id

  • branches/czw_branch/20100427/ippTools/share/magicdstool_todestreak_warp.sql

    r27301 r28017  
    99    stage,
    1010    stage_id,
     11    warpRun.magicked,
    1112    warpSkyfile.skycell_id as component,
    1213    warpSkyfile.uri,

  • branches/czw_branch/20100427/ippTools/share/magicdstool_torevert_camera.sql

    r27015 r28017  
    1313    0 AS bothways,
    1414    0 AS bytes,
    15     0 AS md5sum
     15    0 AS md5sum,
     16    camRun.magicked
    1617FROM magicDSRun
    1718    JOIN magicDSFile using(magic_ds_id)

  • branches/czw_branch/20100427/ippTools/share/magicdstool_torevert_chip.sql

    r27015 r28017  
    1313    0 AS bothways,
    1414    0 AS bytes,
    15     0 AS md5sum
     15    0 AS md5sum,
     16    chipRun.magicked
    1617FROM magicDSRun
    1718    JOIN magicDSFile using(magic_ds_id)
    1819    JOIN camProcessedExp using(cam_id)
    19     JOIN chipProcessedImfile ON (stage_id = chipProcessedImfile.chip_id AND component = class_id)
     20    JOIN chipRun ON (stage_id = chipRun.chip_id)
     21    -- JOIN chipProcessedImfile ON (stage_id = chipProcessedImfile.chip_id AND component = class_id)
     22    JOIN chipProcessedImfile USING(chip_id, exp_id)
    2023    JOIN rawExp using(exp_id)
    2124WHERE magicDSRun.stage = 'chip'

  • branches/czw_branch/20100427/ippTools/share/magicdstool_torevert_diff.sql

    r27015 r28017  
    1313    CAST(diffRun.bothways AS SIGNED) AS bothways,
    1414    0 AS bytes,
    15     0 AS md5sum
     15    0 AS md5sum,
     16    diffRun.magicked
    1617FROM magicDSRun
    1718    JOIN magicRun using(magic_id)

  • branches/czw_branch/20100427/ippTools/share/magicdstool_torevert_raw.sql

    r27015 r28017  
    1010    outroot,
    1111    rawImfile.uri AS path_base,
    12     NULL AS cam_path_base,
     12    CAST(NULL AS CHAR(255)) AS cam_path_base,
    1313    0 AS bothways,
    1414    bytes,
    15     md5sum
     15    md5sum,
     16    0 AS magicked
    1617FROM magicDSRun
    1718    JOIN magicDSFile using(magic_ds_id)

  • branches/czw_branch/20100427/ippTools/share/magicdstool_torevert_warp.sql

    r27015 r28017  
    1313    0 AS bothways,
    1414    0 AS bytes,
    15     0 AS md5sum
     15    0 AS md5sum,
     16    warpRun.magicked
    1617FROM magicDSRun
    1718    JOIN magicDSFile USING(magic_ds_id)

  • branches/czw_branch/20100427/ippTools/share/pstamptool_completedreq.sql

    r25281 r28017  
    1 SELECT *
     1SELECT pstampRequest.* ,
     2    IFNULL(Label.priority, 0) AS priority
    23FROM pstampRequest
     4    LEFT JOIN Label USING(label)
    35WHERE state = 'run'
    46    AND (

  • branches/czw_branch/20100427/ippTools/share/pstamptool_pendingdependent.sql

    r27740 r28017  
    1 SELECT DISTINCT pstampDependent.*
     1SELECT DISTINCT
     2    pstampDependent.*,
     3    IFNULL(Label.priority, 10000) AS priority
    24FROM pstampDependent
    35JOIN pstampJob USING(dep_id)
    46JOIN pstampRequest USING(req_id)
     7LEFT JOIN Label ON pstampRequest.label = Label.label
    58WHERE pstampDependent.state = 'new'
     9    AND pstampDependent.fault = 0
    610    AND pstampJob.state = 'run'
     11    AND (pstampRequest.state = 'run' OR pstampRequest.state = 'new')
     12    AND (Label.active OR Label.active IS NULL)

  • branches/czw_branch/20100427/ippTools/share/pstamptool_pendingjob.sql

    r25793 r28017  
    1 SELECT pstampJob.*
     1SELECT pstampJob.*,
     2    IFNULL(Label.priority, 10000) AS priority
    23FROM pstampJob
    34    JOIN pstampRequest USING(req_id)
    45    LEFT JOIN pstampDependent USING(dep_id)
     6    LEFT JOIN Label ON pstampRequest.label = Label.label
    57WHERE pstampRequest.state = 'run'
    68    AND pstampRequest.fault = 0
    … …  
    810    AND pstampJob.fault = 0
    911    AND (dep_id = 0 OR pstampDependent.state = 'full')
     12    AND (Label.active OR Label.active IS NULL)

  • branches/czw_branch/20100427/ippTools/share/pstamptool_pendingreq.sql

    r25199 r28017  
    11-- postage stamp requests ready for download and parsing
    22SELECT
    3  pstampRequest.*,
    4  pstampDataStore.outProduct as ds_outProduct
    5  FROM pstampRequest
    6  LEFT JOIN pstampDataStore
    7     USING(ds_id)
    8  WHERE pstampRequest.state = 'new'
     3    pstampRequest.*,
     4    pstampDataStore.outProduct AS ds_outProduct,
     5    IFNULL(Label.priority, 10000) AS priority
     6FROM pstampRequest
     7    LEFT JOIN pstampDataStore USING(ds_id)
     8    LEFT JOIN Label ON pstampRequest.label = Label.label
     9WHERE pstampRequest.state = 'new'
    910    AND pstampRequest.fault = 0
     11    AND (Label.active OR Label.active IS NULL)

  • branches/czw_branch/20100427/ippTools/share/pstamptool_revertdependent.sql

    r27740 r28017  
    33    JOIN pstampRequest USING(req_id)
    44SET pstampDependent.fault = 0
     5WHERE pstampDependent.state = 'new'

  • branches/czw_branch/20100427/ippTools/share/pstamptool_updatejob.sql

    r27740 r28017  
    11UPDATE pstampJob LEFT JOIN pstampDependent USING(dep_id)
    2 SET pstampJob.state = '%s'
    3     -- set state hook %s
     2SET

  • branches/czw_branch/20100427/ippTools/share/pxadmin_create_tables.sql

    r27781 r28017  
    276276    end_stage VARCHAR(64),
    277277    magicked BIGINT,
     278    software_ver VARCHAR(16),
     279    maskfrac_npix INT,
     280    maskfrac_static FLOAT,
     281    maskfrac_dynamic FLOAT,
     282    maskfrac_magic FLOAT,
     283    maskfrac_advisory FLOAT,
    278284    note VARCHAR(255),
    279285    PRIMARY KEY(chip_id),
    … …  
    359365    fault SMALLINT NOT NULL,
    360366    magicked BIGINT,
     367    software_ver VARCHAR(16),
     368    maskfrac_npix INT,
     369    maskfrac_static FLOAT,
     370    maskfrac_dynamic FLOAT,
     371    maskfrac_magic FLOAT,
     372    maskfrac_advisory FLOAT,
    361373    PRIMARY KEY(chip_id, exp_id, class_id),
    362374    KEY(data_state),
    … …  
    387399    end_stage VARCHAR(64),
    388400    magicked BIGINT,
     401    software_ver VARCHAR(16),
     402    maskfrac_npix INT,
     403    maskfrac_static FLOAT,
     404    maskfrac_dynamic FLOAT,
     405    maskfrac_magic FLOAT,
     406    maskfrac_advisory FLOAT,
    389407    note VARCHAR(255),
    390408    PRIMARY KEY(cam_id),
    … …  
    464482    quality SMALLINT NOT NULL DEFAULT 0,
    465483    fault SMALLINT NOT NULL,
     484    software_ver VARCHAR(16),
     485    maskfrac_npix INT,
     486    maskfrac_static FLOAT,
     487    maskfrac_dynamic FLOAT,
     488    maskfrac_magic FLOAT,
     489    maskfrac_advisory FLOAT,
    466490    PRIMARY KEY(cam_id),
    467491    KEY(fault),
    … …  
    867891    registered DATETIME,
    868892    magicked BIGINT,
     893    software_ver VARCHAR(16),
     894    maskfrac_npix INT,
     895    maskfrac_static FLOAT,
     896    maskfrac_dynamic FLOAT,
     897    maskfrac_magic FLOAT,
     898    maskfrac_advisory FLOAT,
    869899    note VARCHAR(255),
    870900    PRIMARY KEY(warp_id),
    … …  
    923953    fault SMALLINT,
    924954    magicked BIGINT,
     955    software_ver VARCHAR(16),
     956    maskfrac_npix INT,
     957    maskfrac_static FLOAT,
     958    maskfrac_dynamic FLOAT,
     959    maskfrac_magic FLOAT,
     960    maskfrac_advisory FLOAT,
    925961    PRIMARY KEY(warp_id, skycell_id, tess_id),
    926962    KEY(good_frac),
    … …  
    948984        tess_id VARCHAR(64),
    949985        filter VARCHAR(64),
     986        software_ver VARCHAR(16),
    950987        note VARCHAR(255),
    951988        PRIMARY KEY(stack_id),
    … …  
    9951032        quality SMALLINT NOT NULL DEFAULT 0,
    9961033        fault SMALLINT,
     1034        software_ver VARCHAR(16),
    9971035        PRIMARY KEY(stack_id),
    9981036        KEY(dtime_stack),
    … …  
    10171055        exposure TINYINT DEFAULT 0,
    10181056        magicked BIGINT,
     1057        software_ver VARCHAR(16),
     1058        maskfrac_npix INT,
     1059        maskfrac_static FLOAT,
     1060        maskfrac_dynamic FLOAT,
     1061        maskfrac_magic FLOAT,
     1062        maskfrac_advisory FLOAT,
    10191063        diff_mode SMALLINT NOT NULL,
    10201064        note VARCHAR(255),
    … …  
    10801124        fault SMALLINT,
    10811125        magicked BIGINT,
     1126        software_ver VARCHAR(16),
     1127        maskfrac_npix INT,
     1128        maskfrac_static FLOAT,
     1129        maskfrac_dynamic FLOAT,
     1130        maskfrac_magic FLOAT,
     1131        maskfrac_advisory FLOAT,
    10821132        PRIMARY KEY(diff_id, skycell_id),
    10831133        KEY(good_frac),
    … …  
    13031353        outProduct VARCHAR(64),
    13041354        uri VARCHAR(255),
     1355        outdir     VARCHAR(255),
    13051356        fault SMALLINT,
    13061357        PRIMARY KEY(req_id),
    … …  
    13321383        imagedb    VARCHAR(64),
    13331384        rlabel     VARCHAR(64),
     1385        outdir     VARCHAR(255),
    13341386        need_magic TINYINT,
    13351387        PRIMARY KEY(dep_id),
    … …  
    15991651) ENGINE=innodb DEFAULT CHARSET=latin1;
    16001652
     1653CREATE TABLE Label (
     1654    label       VARCHAR(64),
     1655    priority    INT,
     1656    active      TINYINT,
     1657    comment     VARCHAR(80),
     1658    PRIMARY KEY(label),
     1659    KEY(priority),
     1660    KEY(active)
     1661) ENGINE=innodb DEFAULT CHARSET=latin1;
     1662
    16011663-- This comment line is here to avoid empty query error.
    16021664-- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.

  • branches/czw_branch/20100427/ippTools/share/pxadmin_drop_tables.sql

    r27765 r28017  
    8484DROP TABLE IF EXISTS staticskyResult;
    8585DROP TABLE IF EXISTS staticskyRun;
     86DROP TABLE IF EXISTS Label;
    8687
    8788SET FOREIGN_KEY_CHECKS=1

  • branches/czw_branch/20100427/ippTools/share/stacktool_tosum.sql

    r27679 r28017  
    66    stackRun.reduction,
    77    stackRun.label,
    8     stackRun.state
     8    stackRun.state,
     9    stackSumSkyfile.path_base
    910FROM stackRun
    1011JOIN stackInputSkyfile USING(stack_id)
    … …  
    1617    -- WHERE hook %s
    1718GROUP BY stack_id
    18 HAVING COUNT(warpRun.state = 'full') = COUNT(stackInputSkyfile.warp_id)
     19HAVING SUM(IF(warpRun.state = 'full', 1, 0)) = COUNT(stackInputSkyfile.warp_id)

  • branches/czw_branch/20100427/ippTools/share/warptool_listrun.sql

    r27737 r28017  
    66    rawExp.exp_name,
    77    rawExp.camera,
    8     rawExp.filter
     8    rawExp.filter,
     9    rawExp.dateobs,
     10    rawExp.ra,
     11    rawExp.decl,
     12    rawExp.exp_time
    913FROM warpRun
    1014JOIN fakeRun

  • branches/czw_branch/20100427/ippTools/share/warptool_towarped.sql

    r27737 r28017  
    1111    exp_tag,
    1212    workdir,
    13     magicked
     13    magicked,
     14    path_base
    1415FROM (
    1516    SELECT DISTINCT
    … …  
    2526        rawExp.exp_tag,
    2627        warpRun.workdir,
    27         chipRun.magicked
     28        chipRun.magicked,
     29        CAST(NULL AS CHAR(255)) AS path_base
    2830    FROM warpRun
    2931    JOIN warpSkyCellMap
    … …  
    7375        rawExp.exp_tag,
    7476        warpRun.workdir,
    75         MIN(chipProcessedImfile.magicked) AS magicked
     77        MIN(chipProcessedImfile.magicked) AS magicked,
     78        warpSkyfile.path_base
    7679    FROM warpRun
    7780    JOIN warpImfile USING(warp_id)

  • branches/czw_branch/20100427/ippTools/share/warptool_warped.sql

    r27737 r28017  
    77    rawExp.exp_id,
    88    rawExp.exp_name,
    9     rawExp.camera
     9    rawExp.camera,
     10    rawExp.filter,
     11    rawExp.dateobs,
     12    rawExp.ra,
     13    rawExp.decl,
     14    rawExp.exp_time
    1015FROM warpRun
    1116JOIN warpSkyfile
Note: See TracChangeset for help on using the changeset viewer.