IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 19092 for trunk/ippTools/share


Ignore:
Timestamp:
Aug 16, 2008, 1:27:58 PM (18 years ago)
Author:
eugene
Message:

extensive changes from eam_branch_20080719:

  • added the 'cleanup' options to camtool, faketool, warptool, difftool, stacktool
  • added corresponding sql code
  • changed the states for camera, fake, warp, diff, and stack to the new set of states: new, full, goto_cleaned, cleaned, update, goto_purged, and purged
  • added 'data_state' entries to the detrend tables and the detRunSummary
  • added 'cleanup' options to dettool using the detRunSummary data_state as the control
  • moved dettool supporting code to dettool_STAGE, where stage is processedimfile, processedexp, etc.
  • converted dettool to use S64 for det_id and exp_id entries
Location:
trunk/ippTools/share
Files:
23 added
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/Makefile.am

    r19038 r19092  
    11dist_pkgdata_DATA = \
    2         camtool_find_chip_id.sql \
    3         camtool_find_pendingexp.sql \
    4         camtool_find_pendingimfile.sql \
    5         camtool_find_processedexp.sql \
    6         camtool_queue_chip_id.sql \
    7         camtool_reset_faulted_runs.sql \
    8         camtool_revertprocessedexp.sql \
    9         chiptool_completely_processed_exp.sql \
    10         chiptool_donecleanup.sql \
    11         chiptool_find_rawexp.sql \
    12         chiptool_pendingcleanupimfile.sql \
    13         chiptool_pendingcleanuprun.sql \
    14         chiptool_pendingimfile.sql \
    15         chiptool_processedimfile.sql \
    16         chiptool_revertprocessedimfile.sql \
    17         chiptool_run.sql \
    18         chiptool_unmasked.sql \
    19         detselect_search.sql \
    20         detselect_select.sql \
    21         dettool_addprocessedexp.sql \
    22         dettool_childlessrun.sql \
    23         dettool_definebydetrun.sql \
    24         dettool_detrunsummary.sql \
    25         dettool_find_completed_runs.sql \
    26         dettool_input.sql \
    27         dettool_normalizedexp.sql \
    28         dettool_normalizedimfile.sql \
    29         dettool_normalizedstat.sql \
    30         dettool_pending.sql \
    31         dettool_processedimfile.sql \
    32         dettool_raw.sql \
    33         dettool_residexp.sql \
    34         dettool_residimfile.sql \
    35         dettool_revertdetrunsummary.sql \
    36         dettool_revertnormalizedexp.sql \
    37         dettool_revertnormalizedimfile.sql \
    38         dettool_revertnormalizedstat.sql \
    39         dettool_revertprocessedexp.sql \
    40         dettool_revertprocessedimfile.sql \
    41         dettool_revertresidexp.sql \
    42         dettool_revertresidimfile.sql\
    43         dettool_revertstacked.sql \
    44         dettool_runs.sql \
    45         dettool_stacked.sql \
    46         dettool_start_new_iteration.sql \
    47         dettool_stop_completed_correct_runs.sql \
    48         dettool_tocorrectexp.sql \
    49         dettool_tocorrectimfile.sql \
    50         dettool_todetrunsummary.sql \
    51         dettool_tonormalize.sql \
    52         dettool_tonormalizedexp.sql \
    53         dettool_tonormalizedstat.sql \
    54         dettool_toprocessedexp.sql \
    55         dettool_toprocessedimfile.sql \
    56         dettool_toresidexp.sql \
    57         dettool_toresidimfile.sql \
    58         dettool_tostacked.sql \
    59         difftool_inputskyfile.sql \
    60         difftool_definebyquery.sql \
    61         difftool_revertdiffskyfile_update.sql \
    62         difftool_revertdiffskyfile_delete.sql \
    63         difftool_skyfile.sql \
    64         difftool_todiffskyfile.sql \
    65         faketool_completely_processed_exp.sql \
    66         faketool_find_camrun.sql \
    67         faketool_find_pendingexp.sql \
    68         faketool_pendingimfile.sql \
    69         faketool_processedimfile.sql \
    70         faketool_queue_cam_id.sql \
    71         faketool_revertprocessedimfile.sql \
    72         faketool_unmasked.sql \
    73         flatcorr_completely_processed_chiprun.sql \
    74         flatcorr_create_tmp_chiprundone.sql \
    75         flatcorr_find_completed_floatcorruns.sql \
    76         flatcorr_find_processedimfiles.sql \
    77         flatcorr_pending.sql \
    78         magictool_definebyquery_temp_create.sql \
    79         magictool_definebyquery_temp_insert.sql \
    80         magictool_definebyquery_temp_insert_groupby.sql \
    81         magictool_definebyquery_select_part1.sql \
    82         magictool_definebyquery_select_part2.sql \
    83         magictool_definebyquery_insert.sql \
    84         magictool_inputskyfile.sql \
    85         magictool_totree.sql \
    86         magictool_tomask.sql \
    87         magictool_toprocess_inputs.sql \
    88         magictool_toprocess_tree.sql \
    89         magictool_toskyfilemask.sql \
    90         magictool_inputs.sql \
    91         magictool_addmask.sql \
    92         magictool_mask.sql \
    93         pstamptool_addjob_otherjob.sql \
    94         pstamptool_addjob_stampjob.sql \
    95         pstamptool_datastore.sql \
    96         pstamptool_pendingjob.sql \
    97         pstamptool_pendingreq.sql \
    98         pxadmin_create_tables.sql \
    99         pxadmin_drop_tables.sql \
    100         pztool_find_completed_exp.sql \
    101         pztool_pendingimfile.sql \
    102         pztool_revert_downloadimfile_faults.sql \
    103         pztool_revert_fileset_faults.sql \
    104         pztool_revertcopied.sql \
    105         regtool_create_dup_table.sql \
    106         regtool_pendingexp.sql \
    107         regtool_pendingimfile.sql \
    108         regtool_populate_dup_table.sql \
    109         regtool_processedexp.sql \
    110         regtool_processedimfile.sql \
    111         regtool_revertprocessedexp.sql \
    112         regtool_revertprocessedimfile.sql \
    113         stacktool_definebyquery_part1.sql \
    114         stacktool_definebyquery_part2.sql \
    115         stacktool_definebyquery_insert.sql \
    116         stacktool_definebyquery_insert_random.sql \
    117         stacktool_inputskyfile.sql \
    118         stacktool_revertsumskyfile_update.sql \
    119         stacktool_revertsumskyfile_delete.sql \
    120         stacktool_sumskyfile.sql \
    121         stacktool_tosum.sql \
    122         warptool_exp.sql \
    123         warptool_imfile.sql \
    124         warptool_revertwarped.sql \
    125         warptool_scmap.sql \
    126         warptool_tooverlap.sql \
    127         warptool_towarped.sql \
    128         warptool_warped.sql
     2     camtool_donecleanup.sql \
     3     camtool_find_chip_id.sql \
     4     camtool_find_pendingexp.sql \
     5     camtool_find_pendingimfile.sql \
     6     camtool_find_processedexp.sql \
     7     camtool_pendingcleanupexp.sql \
     8     camtool_pendingcleanuprun.sql \
     9     camtool_queue_chip_id.sql \
     10     camtool_reset_faulted_runs.sql \
     11     camtool_revertprocessedexp.sql \
     12     chiptool_completely_processed_exp.sql \
     13     chiptool_donecleanup.sql \
     14     chiptool_find_rawexp.sql \
     15     chiptool_pendingcleanupimfile.sql \
     16     chiptool_pendingcleanuprun.sql \
     17     chiptool_pendingimfile.sql \
     18     chiptool_processedimfile.sql \
     19     chiptool_revertprocessedimfile.sql \
     20     chiptool_run.sql \
     21     chiptool_unmasked.sql \
     22     detselect_search.sql \
     23     detselect_select.sql \
     24     dettool_addprocessedexp.sql \
     25     dettool_childlessrun.sql \
     26     dettool_definebydetrun.sql \
     27     dettool_detrunsummary.sql \
     28     dettool_find_completed_runs.sql \
     29     dettool_input.sql \
     30     dettool_normalizedexp.sql \
     31     dettool_normalizedimfile.sql \
     32     dettool_normalizedstat.sql \
     33     dettool_pending.sql \
     34     dettool_pendingcleanup_normalizedexp.sql \
     35     dettool_pendingcleanup_normalizedimfile.sql \
     36     dettool_pendingcleanup_normalizedstat.sql \
     37     dettool_pendingcleanup_processedexp.sql \
     38     dettool_pendingcleanup_processedimfile.sql \
     39     dettool_pendingcleanup_residexp.sql \
     40     dettool_pendingcleanup_residimfile.sql \
     41     dettool_pendingcleanup_stacked.sql \
     42     dettool_processedimfile.sql \
     43     dettool_raw.sql \
     44     dettool_residexp.sql \
     45     dettool_residimfile.sql \
     46     dettool_revertdetrunsummary.sql \
     47     dettool_revertnormalizedexp.sql \
     48     dettool_revertnormalizedimfile.sql \
     49     dettool_revertnormalizedstat.sql \
     50     dettool_revertprocessedexp.sql \
     51     dettool_revertprocessedimfile.sql \
     52     dettool_revertresidexp.sql \
     53     dettool_revertresidimfile.sql \
     54     dettool_revertstacked.sql \
     55     dettool_runs.sql \
     56     dettool_stacked.sql \
     57     dettool_start_new_iteration.sql \
     58     dettool_stop_completed_correct_runs.sql \
     59     dettool_tocorrectexp.sql \
     60     dettool_tocorrectimfile.sql \
     61     dettool_todetrunsummary.sql \
     62     dettool_tonormalize.sql \
     63     dettool_tonormalizedexp.sql \
     64     dettool_tonormalizedstat.sql \
     65     dettool_toprocessedexp.sql \
     66     dettool_toprocessedimfile.sql \
     67     dettool_toresidexp.sql \
     68     dettool_toresidimfile.sql \
     69     dettool_tostacked.sql \
     70     difftool_definebyquery.sql \
     71     difftool_donecleanup.sql \
     72     difftool_inputskyfile.sql \
     73     difftool_pendingcleanuprun.sql \
     74     difftool_pendingcleanupskyfile.sql \
     75     difftool_revertdiffskyfile_delete.sql \
     76     difftool_revertdiffskyfile_update.sql \
     77     difftool_skyfile.sql \
     78     difftool_todiffskyfile.sql \
     79     faketool_completely_processed_exp.sql \
     80     faketool_donecleanup.sql \
     81     faketool_find_camrun.sql \
     82     faketool_find_pendingexp.sql \
     83     faketool_pendingcleanupimfile.sql \
     84     faketool_pendingcleanuprun.sql \
     85     faketool_pendingimfile.sql \
     86     faketool_processedimfile.sql \
     87     faketool_queue_cam_id.sql \
     88     faketool_revertprocessedimfile.sql \
     89     faketool_unmasked.sql \
     90     flatcorr_completely_processed_chiprun.sql \
     91     flatcorr_create_tmp_chiprundone.sql \
     92     flatcorr_find_completed_floatcorruns.sql \
     93     flatcorr_find_processedimfiles.sql \
     94     flatcorr_pending.sql \
     95     magictool_addmask.sql \
     96     magictool_create_tmp_warpcomplete.sql \
     97     magictool_definebyquery.sql \
     98     magictool_definebyquery_insert.sql \
     99     magictool_definebyquery_select_part1.sql \
     100     magictool_definebyquery_select_part2.sql \
     101     magictool_definebyquery_select_test.sql \
     102     magictool_definebyquery_temp_create.sql \
     103     magictool_definebyquery_temp_insert.sql \
     104     magictool_definebyquery_temp_insert_groupby.sql \
     105     magictool_inputs.sql \
     106     magictool_inputskyfile.sql \
     107     magictool_mask.sql \
     108     magictool_tomask.sql \
     109     magictool_toprocess_inputs.sql \
     110     magictool_toprocess_tree.sql \
     111     magictool_toskyfilemask.sql \
     112     magictool_totree.sql \
     113     pstamptool_addjob_otherjob.sql \
     114     pstamptool_addjob_stampjob.sql \
     115     pstamptool_datastore.sql \
     116     pstamptool_pendingjob.sql \
     117     pstamptool_pendingreq.sql \
     118     pxadmin_create_tables.sql \
     119     pxadmin_drop_tables.sql \
     120     pztool_find_completed_exp.sql \
     121     pztool_pendingimfile.sql \
     122     pztool_revert_downloadimfile_faults.sql \
     123     pztool_revert_fileset_faults.sql \
     124     pztool_revertcopied.sql \
     125     regtool_create_dup_table.sql \
     126     regtool_pendingexp.sql \
     127     regtool_pendingimfile.sql \
     128     regtool_populate_dup_table.sql \
     129     regtool_processedexp.sql \
     130     regtool_processedimfile.sql \
     131     regtool_revertprocessedexp.sql \
     132     regtool_revertprocessedimfile.sql \
     133     stacktool_definebyquery_insert.sql \
     134     stacktool_definebyquery_insert_random.sql \
     135     stacktool_definebyquery_part1.sql \
     136     stacktool_definebyquery_part2.sql \
     137     stacktool_definebyquery_test.sql \
     138     stacktool_donecleanup.sql \
     139     stacktool_find_complete_warps.sql \
     140     stacktool_inputskyfile.sql \
     141     stacktool_pendingcleanuprun.sql \
     142     stacktool_pendingcleanupskyfile.sql \
     143     stacktool_revertsumskyfile_delete.sql \
     144     stacktool_revertsumskyfile_update.sql \
     145     stacktool_sumskyfile.sql \
     146     stacktool_tosum.sql \
     147     warptool_donecleanup.sql \
     148     warptool_exp.sql \
     149     warptool_imfile.sql \
     150     warptool_pendingcleanuprun.sql \
     151     warptool_pendingcleanupskyfile.sql \
     152     warptool_revertwarped.sql \
     153     warptool_scmap.sql \
     154     warptool_tooverlap.sql \
     155     warptool_towarped.sql \
     156     warptool_warped.sql

  • trunk/ippTools/share/camtool_find_pendingexp.sql

    r18366 r19092  
    2525    WHERE
    2626        chipRun.state = 'full'
    27         AND camRun.state = 'run'
     27        AND camRun.state = 'new'
    2828        AND camMask.label IS NULL
    2929        AND camProcessedExp.cam_id IS NULL

  • trunk/ippTools/share/camtool_reset_faulted_runs.sql

    r17216 r19092  
    11UPDATE camRun, camProcessedExp, chipRun, rawExp
    2 SET camRun.state = 'run'
     2SET camRun.state = 'new'
    33WHERE
    44    camRun.cam_id = camProcessedExp.cam_id

  • trunk/ippTools/share/dettool_addprocessedexp.sql

    r18561 r19092  
    2525  AND detProcessedExp.exp_id IS NULL
    2626  AND detInputExp.include = 1
    27   AND detRun.det_id = %s
    28   AND detProcessedImfile.exp_id = '%s'
     27  AND detRun.det_id = %lld
     28  AND detProcessedImfile.exp_id = %lld
    2929GROUP BY
    3030   detProcessedImfile.class_id,

  • trunk/ippTools/share/dettool_definebydetrun.sql

    r18561 r19092  
    33INSERT INTO detInputExp
    44   SELECT
    5        %d,
     5       %lld,
    66       0,
    77       detResidExp.exp_id,
    … …  
    1010   JOIN rawExp
    1111       USING(exp_id)
    12    WHERE det_id = %d
     12   WHERE det_id = %lld

  • trunk/ippTools/share/difftool_inputskyfile.sql

    r18448 r19092  
    3030        ON chipRun.exp_id = rawExp.exp_id
    3131    WHERE
    32         diffRun.state = 'run'
    33         AND warpRun.state = 'stop'
    34         AND fakeRun.state = 'stop'
    35         AND camRun.state = 'stop'
     32        diffRun.state = 'new'
     33        AND warpRun.state = 'full'
     34        AND fakeRun.state = 'full'
     35        AND camRun.state = 'full'
    3636        AND chipRun.state = 'full'
    3737    UNION
    … …  
    6666        ON chipRun.exp_id = rawExp.exp_id
    6767    WHERE
    68         diffRun.state = 'run'
    69         AND warpRun.state = 'stop'
    70         AND fakeRun.state = 'stop'
    71         AND camRun.state = 'stop'
     68        diffRun.state = 'new'
     69        AND warpRun.state = 'full'
     70        AND fakeRun.state = 'full'
     71        AND camRun.state = 'full'
    7272        AND chipRun.state = 'full'
    7373    ) as Foo

  • trunk/ippTools/share/difftool_skyfile.sql

    r18975 r19092  
    99JOIN diffSkyfile
    1010    USING(diff_id)
    11 -- my new stuff begins here
     11-- WS: my new stuff begins here
    1212JOIN diffInputSkyfile
    1313    ON diffInputSkyfile.diff_id = diffRun.diff_id
    … …  
    2323JOIN rawExp
    2424    ON chipRun.exp_id = rawExp.exp_id
    25 -- my new stuff ends here
     25-- WS: my new stuff ends here
    2626    WHERE
    2727    -- bogus test to allow appending conditionals
     28    -- XXX EAM : this is not needed if we modify the difftool.c code : fix
    2829    diffRun.diff_id IS NOT NULL
    29 

  • trunk/ippTools/share/difftool_todiffskyfile.sql

    r18448 r19092  
    2525    ON diffInputSkyfile.diff_id = diffSkyfile.diff_id
    2626WHERE
    27   diffRun.state = 'run'
    28   AND warpRun.state = 'stop'
    29   AND fakeRun.state = 'stop'
    30   AND camRun.state = 'stop'
     27  diffRun.state = 'new'
     28  AND warpRun.state = 'full'
     29  AND fakeRun.state = 'full'
     30  AND camRun.state = 'full'
    3131  AND chipRun.state = 'full'
    3232  AND diffSkyfile.diff_id IS NULL

  • trunk/ippTools/share/faketool_completely_processed_exp.sql

    r17938 r19092  
    3131        AND rawImfile.class_id = fakeProcessedImfile.class_id
    3232    WHERE
    33         fakeRun.state = 'run'
     33        fakeRun.state = 'new'
    3434    GROUP BY
    3535        fakeRun.fake_id,

  • trunk/ippTools/share/faketool_find_camrun.sql

    r18448 r19092  
    3232        using(exp_id)
    3333    WHERE
    34         camRun.state = 'stop'
     34        camRun.state = 'full'
    3535        AND chipRun.state = 'full'
    3636) as Foo

  • trunk/ippTools/share/faketool_find_pendingexp.sql

    r18688 r19092  
    2525        ON fakeRun.label = fakeMask.label
    2626    WHERE
    27         fakeRun.state = 'run'
    28         AND camRun.state = 'stop'
     27        fakeRun.state = 'new'
     28        AND camRun.state = 'full'
    2929        AND chipRun.state = 'full'
    3030        AND fakeMask.label IS NULL

  • trunk/ippTools/share/faketool_queue_cam_id.sql

    r17938 r19092  
    1414    FROM camRun
    1515    WHERE
    16         camRun.state = 'stop'
     16        camRun.state = 'full'
    1717        AND camRun.cam_id = %lld

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r18764 r19092  
    485485    user_5 DOUBLE,
    486486    path_base VARCHAR(255),
     487    data_state VARCHAR(64),
    487488    fault SMALLINT NOT NULL,
    488489    PRIMARY KEY(det_id, exp_id, class_id),
    … …  
    512513    user_5 DOUBLE,
    513514    path_base VARCHAR(255),
     515    data_state VARCHAR(64),
    514516    fault SMALLINT NOT NULL,
    515517    PRIMARY KEY(det_id, exp_id),
    … …  
    535537    user_4 DOUBLE,
    536538    user_5 DOUBLE,
     539    data_state VARCHAR(64),
    537540    fault SMALLINT NOT NULL,
    538541    PRIMARY KEY(det_id, iteration, class_id),
    … …  
    549552    class_id VARCHAR(64),
    550553    norm FLOAT,
     554    data_state VARCHAR(64),
    551555    fault SMALLINT NOT NULL,
    552556    PRIMARY KEY(det_id, iteration, class_id),
    … …  
    572576    user_5 DOUBLE,
    573577    path_base VARCHAR(255),
     578    data_state VARCHAR(64),
    574579    fault SMALLINT NOT NULL,
    575580    PRIMARY KEY(det_id, iteration, class_id),
    … …  
    595600    user_5 DOUBLE,
    596601    path_base VARCHAR(255),
     602    data_state VARCHAR(64),
    597603    fault SMALLINT NOT NULL,
    598604    PRIMARY KEY(det_id, iteration),
    … …  
    629635    user_5 DOUBLE,
    630636    path_base VARCHAR(255),
     637    data_state VARCHAR(64),
    631638    fault SMALLINT NOT NULL,
    632639    PRIMARY KEY(det_id, iteration, exp_id, class_id),
    … …  
    641648) ENGINE=innodb DEFAULT CHARSET=latin1;
    642649
    643 CREATE TABLE detResidExp (det_id BIGINT, iteration INT, exp_id BIGINT, recipe VARCHAR(64), bg DOUBLE, bg_stdev DOUBLE, bg_mean_stdev DOUBLE, bg_skewness DOUBLE, bg_kurtosis DOUBLE, bin_stdev DOUBLE, fringe_0 DOUBLE, fringe_1 DOUBLE, fringe_2 DOUBLE, fringe_resid_0 DOUBLE, fringe_resid_1 DOUBLE, fringe_resid_2 DOUBLE, user_1 DOUBLE, user_2 DOUBLE, user_3 DOUBLE, user_4 DOUBLE, user_5 DOUBLE, path_base VARCHAR(255), accept TINYINT, fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration, exp_id), KEY(fault), INDEX(det_id, iteration), FOREIGN KEY (det_id, iteration, exp_id)  REFERENCES  detInputExp(det_id, iteration, exp_id), FOREIGN KEY (det_id, iteration, exp_id)  REFERENCES  detResidImfile(det_id, iteration, exp_id)) ENGINE=innodb DEFAULT CHARSET=latin1;
    644 CREATE TABLE detRunSummary (det_id BIGINT, iteration INT, bg DOUBLE, bg_stdev DOUBLE, bg_mean_stdev DOUBLE, accept TINYINT, fault SMALLINT NOT NULL, PRIMARY KEY(det_id, iteration), KEY(fault), FOREIGN KEY (det_id, iteration)  REFERENCES  detInputExp(det_id, iteration), FOREIGN KEY (det_id, iteration)  REFERENCES  detResidExp(det_id, iteration)) ENGINE=innodb DEFAULT CHARSET=latin1;
    645 CREATE 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;
     650CREATE TABLE detResidExp (
     651       det_id BIGINT,
     652       iteration INT,
     653       exp_id BIGINT,
     654       recipe VARCHAR(64),
     655       bg DOUBLE,
     656       bg_stdev DOUBLE,
     657       bg_mean_stdev DOUBLE,
     658       bg_skewness DOUBLE,
     659       bg_kurtosis DOUBLE,
     660       bin_stdev DOUBLE,
     661       fringe_0 DOUBLE,
     662       fringe_1 DOUBLE,
     663       fringe_2 DOUBLE,
     664       fringe_resid_0 DOUBLE,
     665       fringe_resid_1 DOUBLE,
     666       fringe_resid_2 DOUBLE,
     667       user_1 DOUBLE,
     668       user_2 DOUBLE,
     669       user_3 DOUBLE,
     670       user_4 DOUBLE,
     671       user_5 DOUBLE,
     672       path_base VARCHAR(255),
     673       data_state VARCHAR(64),
     674       accept TINYINT,
     675       fault SMALLINT NOT NULL,
     676       PRIMARY KEY(det_id, iteration, exp_id),
     677       KEY(fault),
     678       INDEX(det_id, iteration),
     679       FOREIGN KEY (det_id, iteration, exp_id) 
     680       REFERENCES  detInputExp(det_id, iteration, exp_id),
     681       FOREIGN KEY (det_id, iteration, exp_id) 
     682       REFERENCES  detResidImfile(det_id, iteration, exp_id)
     683) ENGINE=innodb DEFAULT CHARSET=latin1;
     684
     685CREATE TABLE detRunSummary (
     686       det_id BIGINT,
     687       iteration INT,
     688       data_state VARCHAR(64),
     689       bg DOUBLE,
     690       bg_stdev DOUBLE,
     691       bg_mean_stdev DOUBLE,
     692       accept TINYINT,
     693       fault SMALLINT NOT NULL,
     694       PRIMARY KEY(det_id, iteration),
     695       KEY(fault),
     696       FOREIGN KEY (det_id, iteration) 
     697         REFERENCES  detInputExp(det_id, iteration),
     698       FOREIGN KEY (det_id, iteration) 
     699         REFERENCES  detResidExp(det_id, iteration)
     700) ENGINE=innodb DEFAULT CHARSET=latin1;
     701
     702CREATE TABLE detRegisteredImfile (
     703       det_id BIGINT,
     704       iteration INT,
     705       class_id VARCHAR(64),
     706       uri VARCHAR(255),
     707       bg DOUBLE,
     708       bg_stdev DOUBLE,
     709       bg_mean_stdev DOUBLE,
     710       user_1 DOUBLE,
     711       user_2 DOUBLE,
     712       user_3 DOUBLE,
     713       user_4 DOUBLE,
     714       user_5 DOUBLE,
     715       path_base VARCHAR(255),
     716       data_state VARCHAR(64),
     717       fault SMALLINT NOT NULL,
     718       PRIMARY KEY(det_id, iteration, class_id),
     719       KEY(fault),
     720       FOREIGN KEY (det_id, iteration) 
     721         REFERENCES  detRun(det_id, iteration)
     722) ENGINE=innodb DEFAULT CHARSET=latin1;
    646723
    647724CREATE TABLE warpRun (

  • trunk/ippTools/share/stacktool_definebyquery_part1.sql

    r18609 r19092  
    2323        JOIN rawExp USING(exp_id, tess_id)
    2424    WHERE
    25         warpRun.state = 'stop'
     25        warpRun.state = 'full'
    2626    AND warpSkyfile.ignored = 0
    2727    AND warpSkyfile.fault = 0

  • trunk/ippTools/share/stacktool_definebyquery_test.sql

    r18609 r19092  
    3030        JOIN rawExp USING(exp_id, tess_id)
    3131    WHERE
    32         warpRun.state = 'stop'
     32        warpRun.state = 'full'
    3333    AND warpSkyfile.ignored = 0
    3434    AND warpSkyfile.fault = 0

  • trunk/ippTools/share/stacktool_find_complete_warps.sql

    r18574 r19092  
    2323    AND stackRun.stack_id = stackInputSkyfile.stack_id
    2424WHERE
    25     warpRun.state = 'stop'
     25    warpRun.state = 'full'
    2626    AND warpSkyfile.ignored = 0
    2727GROUP BY

  • trunk/ippTools/share/stacktool_inputskyfile.sql

    r18029 r19092  
    2222    ON chipProcessedImfile.exp_id = rawExp.exp_id
    2323WHERE
    24     stackRun.state = 'run'
     24    stackRun.state = 'new'

  • trunk/ippTools/share/stacktool_sumskyfile.sql

    r18975 r19092  
    2020WHERE
    2121-- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too
     22-- XXX EAM : this is not needed : fix the stacktool code.
    2223    stackRun.stack_id is NOT NULL

  • trunk/ippTools/share/stacktool_tosum.sql

    r18483 r19092  
    2525    USING(stack_id)
    2626WHERE
    27     stackRun.state = 'run'
     27    stackRun.state = 'new'
    2828    AND stackSumSkyfile.stack_id IS NULL

  • trunk/ippTools/share/warptool_exp.sql

    r18029 r19092  
    55    USING(fake_id)
    66WHERE
    7     warpRun.state = 'run'
    8     AND fakeRun.state = 'stop'
     7    warpRun.state = 'new'
     8    AND fakeRun.state = 'full'

  • trunk/ippTools/share/warptool_imfile.sql

    r18448 r19092  
    2121    AND chipProcessedImfile.class_id = rawImfile.class_id
    2222WHERE
    23     warpRun.state = 'run'
    24     AND fakeRun.state = 'stop'
    25     AND camRun.state = 'stop'
     23    warpRun.state = 'new'
     24    AND fakeRun.state = 'full'
     25    AND camRun.state = 'full'
    2626    AND chipRun.state = 'full'
    2727

  • trunk/ippTools/share/warptool_scmap.sql

    r18448 r19092  
    1919    AND warpSkyCellMap.class_id = chipProcessedImfile.class_id
    2020WHERE
    21 --    warpRun.state = 'run'
    22     fakeRun.state = 'stop'
    23     AND camRun.state = 'stop'
     21--    warpRun.state = 'new'
     22    fakeRun.state = 'full'
     23    AND camRun.state = 'full'
    2424    AND chipRun.state = 'full'

  • trunk/ippTools/share/warptool_tooverlap.sql

    r18915 r19092  
    2323    ON warpRun.label = warpMask.label
    2424WHERE
    25     warpRun.state = 'run'
    26     AND fakeRun.state = 'stop'
    27     AND camRun.state = 'stop'
     25    warpRun.state = 'new'
     26    AND fakeRun.state = 'full'
     27    AND camRun.state = 'full'
    2828    AND chipRun.state = 'full'
    2929    AND warpSkyCellMap.warp_id IS NULL

  • trunk/ippTools/share/warptool_towarped.sql

    r18448 r19092  
    2727    ON warpRun.label = warpMask.label
    2828WHERE
    29     warpRun.state = 'run'
    30     AND fakeRun.state = 'stop'
    31     AND camRun.state = 'stop'
     29    warpRun.state = 'new'
     30    AND fakeRun.state = 'full'
     31    AND camRun.state = 'full'
    3232    AND chipRun.state = 'full'
    3333    AND warpSkyfile.warp_id IS NULL

  • trunk/ippTools/share/warptool_warped.sql

    r18975 r19092  
    1717WHERE
    1818-- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too
     19-- XXX EAM : not needed: fix warptool.c
    1920    warpRun.warp_id is NOT NULL
Note: See TracChangeset for help on using the changeset viewer.