IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 19078


Ignore:
Timestamp:
Aug 14, 2008, 3:28:57 PM (18 years ago)
Author:
eugene
Message:

various fixes to the get command-line options for cleanup stages correct

Location:
branches/eam_branch_20080719/ippTools
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20080719/ippTools/share/camtool_pendingcleanuprun.sql

    r18645 r19078  
    44    camRun.state
    55FROM camRun
     6JOIN chipRun
     7USING (chip_id)
    68JOIN rawExp
    79USING (exp_id)

  • branches/eam_branch_20080719/ippTools/share/dettool_addprocessedexp.sql

    r18622 r19078  
    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,

  • branches/eam_branch_20080719/ippTools/share/dettool_definebydetrun.sql

    r18622 r19078  
    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

  • branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedexp.sql

    r18991 r19078  
    11SELECT
    22    detNormalizedExp.*,
    3     detRunSummary.data_state,
     3    detRunSummary.data_state
    44FROM detRunSummary
    55JOIN detNormalizedExp

  • branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql

    r18991 r19078  
    11SELECT
    22    detNormalizedImfile.*,
    3     detRunSummary.data_state,
     3    detRunSummary.data_state
    44FROM detRunSummary
    55JOIN detNormalizedImfile

  • branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_normalizedstat.sql

    r18991 r19078  
    11SELECT
    22    detNormalizedStatImfile.*,
    3     detRunSummary.data_state,
     3    detRunSummary.data_state
    44FROM detRunSummary
    55JOIN detNormalizedStatImfile

  • branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_processedexp.sql

    r18991 r19078  
     1-- need to restrict to a single detRunSummary (require all to say 'cleaned'?)
    12SELECT
    23    detProcessedExp.*,
    3     detRunSummary.data_state,
     4    detRunSummary.data_state
    45FROM detRunSummary
    56JOIN detProcessedExp
    6     USING(det_id,iteration)
     7    USING(det_id)
    78WHERE
    89    detRunSummary.data_state = 'goto_cleaned'

  • branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_processedimfile.sql

    r18991 r19078  
     1-- need to restrict to a single detRunSummary (require all to say 'cleaned'?)
    12SELECT
    23    detProcessedImfile.*,
    3     detRunSummary.data_state,
     4    detRunSummary.data_state
    45FROM detRunSummary
    56JOIN detProcessedImfile
    6     USING(det_id,iteration)
     7    USING(det_id)
    78WHERE
    89    detRunSummary.data_state = 'goto_cleaned'

  • branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_residexp.sql

    r18991 r19078  
    11SELECT
    2     detProcessedImfile.*,
    3     detRunSummary.data_state,
     2    detResidExp.*,
     3    detRunSummary.data_state
    44FROM detRunSummary
    5 JOIN detProcessedImfile
     5JOIN detResidExp
    66    USING(det_id,iteration)
    77WHERE
    88    detRunSummary.data_state = 'goto_cleaned'
    9 AND detProcessedImfile.data_state = 'full'
     9AND detResidExp.data_state = 'full'

  • branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_residimfile.sql

    r18991 r19078  
    11SELECT
    22    detResidImfile.*,
    3     detRunSummary.data_state,
     3    detRunSummary.data_state
    44FROM detRunSummary
    55JOIN detResidImfile

  • branches/eam_branch_20080719/ippTools/share/dettool_pendingcleanup_stacked.sql

    r18991 r19078  
    11SELECT
    22    detStackedImfile.*,
    3     detRunSummary.data_state,
     3    detRunSummary.data_state
    44FROM detRunSummary
    55JOIN detStackedImfile

  • branches/eam_branch_20080719/ippTools/share/difftool_pendingcleanuprun.sql

    r18645 r19078  
     1-- does this result in too many entries (one for each diffInputSkyfile?)
     2-- all of this is just to get the camera used for the diff run
    13SELECT
    24    diffRun.diff_id,
    … …  
    46    diffRun.state
    57FROM diffRun
    6 JOIN rawExp
    7 USING (exp_id)
     8JOIN diffInputSkyfile
     9    USING(diff_id)
     10JOIN warpSkyfile
     11    ON  diffInputSkyfile.warp_id    = warpSkyfile.warp_id
     12    AND diffInputSkyfile.skycell_id = warpSkyfile.skycell_id
     13    AND diffInputSkyfile.tess_id    = warpSkyfile.tess_id
     14JOIN warpRun
     15    ON warpRun.warp_id = warpSkyfile.warp_id
     16JOIN fakeRun
     17    USING(fake_id)
     18JOIN camRun
     19    USING(cam_id)
     20JOIN chipRun
     21    USING(chip_id)
     22JOIN rawExp
     23    USING(exp_id)
    824WHERE
    925    diffRun.state = 'goto_cleaned'

  • branches/eam_branch_20080719/ippTools/share/difftool_pendingcleanupskyfile.sql

    r18942 r19078  
    44    diffRun.workdir,
    55    diffRun.dvodb,
    6     diffRun.tess_id,
     6    diffRun.tess_id
    77FROM diffRun
    88JOIN diffSkyfile

  • branches/eam_branch_20080719/ippTools/share/faketool_pendingcleanuprun.sql

    r18645 r19078  
    44    fakeRun.state
    55FROM fakeRun
     6JOIN camRun
     7USING (cam_id)
     8JOIN chipRun
     9USING (chip_id)
    610JOIN rawExp
    711USING (exp_id)

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

    r19064 r19078  
    714714       user_5 DOUBLE,
    715715       path_base VARCHAR(255),
     716       data_state VARCHAR(64),
    716717       fault SMALLINT NOT NULL,
    717718       PRIMARY KEY(det_id, iteration, class_id),

  • branches/eam_branch_20080719/ippTools/share/stacktool_pendingcleanuprun.sql

    r18645 r19078  
     1-- results in too many output files
     2-- is the camera needed for this?
     3-- is the camera unique for this?
    14SELECT
    25    stackRun.stack_id,
    … …  
    47    stackRun.state
    58FROM stackRun
     9JOIN stackInputSkyfile
     10    USING(stack_id)
     11JOIN warpSkyfile
     12    ON  stackInputSkyfile.warp_id = warpSkyfile.warp_id
     13    AND stackRun.skycell_id       = warpSkyfile.skycell_id
     14    AND stackRun.tess_id          = warpSkyfile.tess_id
     15JOIN warpRun
     16    ON warpRun.warp_id = warpSkyfile.warp_id
     17JOIN fakeRun
     18    USING(fake_id)
     19JOIN camRun
     20    USING(cam_id)
     21JOIN chipRun
     22    USING(chip_id)
    623JOIN rawExp
    7 USING (exp_id)
     24     USING (exp_id)
    825WHERE
    926    stackRun.state = 'goto_cleaned'

  • branches/eam_branch_20080719/ippTools/share/stacktool_pendingcleanupskyfile.sql

    r18942 r19078  
    44    stackRun.workdir,
    55    stackRun.dvodb,
    6     stackRun.tess_id,
     6    stackRun.tess_id
    77FROM stackRun
    88JOIN stackSumSkyfile

  • branches/eam_branch_20080719/ippTools/share/warptool_pendingcleanuprun.sql

    r18645 r19078  
    44    warpRun.state
    55FROM warpRun
     6JOIN fakeRun
     7USING (fake_id)
     8JOIN camRun
     9USING (cam_id)
     10JOIN chipRun
     11USING (chip_id)
    612JOIN rawExp
    713USING (exp_id)

  • branches/eam_branch_20080719/ippTools/src/dettool.c

    r18991 r19078  
    911911    psFree(time_filter);
    912912
    913     if (!p_psDBRunQuery(config->dbh, query, (psS64)newDet_id, det_id)) {
     913    if (!p_psDBRunQuery(config->dbh, query, (long long) newDet_id, (long long) det_id)) {
    914914        psError(PS_ERR_UNKNOWN, false, "database error");
    915915        psFree(query);
    … …  
    18071807
    18081808
    1809 bool setStackedImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *data_state)
    1810 {
    1811     PS_ASSERT_PTR_NON_NULL(config, false);
     1809bool setStackedImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state)
     1810{
     1811    PS_ASSERT_PTR_NON_NULL(config, false);
     1812    PS_ASSERT_PTR_NON_NULL(class_id, false);
    18121813    PS_ASSERT_PTR_NON_NULL(data_state, false);
    18131814
    … …  
    18161817    char *query = "UPDATE detStackedImfile SET data_state = '%s'"
    18171818        " WHERE det_id = %" PRId64
    1818         " AND iteration = %" PRId32;
    1819     if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration)) {
     1819        " AND iteration = %" PRId32
     1820        " AND class_id = %s";
     1821    if (!p_psDBRunQuery(config->dbh, query, data_state, det_id, iteration, class_id)) {
    18201822        psError(PS_ERR_UNKNOWN, false,
    1821                 "failed to change state for det_id %" PRId64 ", iteration %" PRId32,
    1822                 det_id, iteration);
     1823                "failed to change state for det_id %" PRId64 ", iteration %" PRId32 "class_id %s",
     1824                det_id, iteration, class_id);
    18231825        return false;
    18241826    }

  • branches/eam_branch_20080719/ippTools/src/dettool.h

    r18991 r19078  
    216216bool setProcessedImfileDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *class_id, const char *data_state);
    217217bool setProcessedExpDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *data_state);
    218 bool setStackedImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *data_state);
     218bool setStackedImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state);
    219219bool setNormStatImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state);
    220220bool setNormImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state);

  • branches/eam_branch_20080719/ippTools/src/dettoolConfig.c

    r18991 r19078  
    265265    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    266266
     267    // -revertprocessedimfile
     268    psMetadata *revertprocessedimfileArgs = psMetadataAlloc();
     269    psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-det_id",  0,            "search for detrend ID (required)", 0);
     270    psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
     271    psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
     272    psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,            "search by fault code", 0);
     273
    267274    // -updateprocessedimfile
    268275    psMetadata *updateprocessedimfileArgs = psMetadataAlloc();
    … …  
    276283    psMetadataAddBool(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    277284    psMetadataAddU64(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     285    psMetadataAddS64(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     286    psMetadataAddS64(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
     287    psMetadataAddStr(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    278288
    279289    // -donecleanup_processedimfile
    … …  
    281291    psMetadataAddBool(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    282292    psMetadataAddU64(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    283 
    284     // -revertprocessedimfile
    285     psMetadata *revertprocessedimfileArgs = psMetadataAlloc();
    286     psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-det_id",  0,            "search for detrend ID (required)", 0);
    287     psMetadataAddS64(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
    288     psMetadataAddStr(revertprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    289     psMetadataAddS16(revertprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,            "search by fault code", 0);
     293    psMetadataAddS64(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     294    psMetadataAddS64(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
     295    psMetadataAddStr(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    290296
    291297    // -toprocessedexp
    … …  
    331337    psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
    332338    psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    333     psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    334339    psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
    335340
    … …  
    338343    psMetadataAddBool(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    339344    psMetadataAddU64(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     345    psMetadataAddS64(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     346    psMetadataAddS64(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    340347
    341348    // -donecleanup_processedexp
    … …  
    343350    psMetadataAddBool(donecleanup_processedexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    344351    psMetadataAddU64(donecleanup_processedexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     352    psMetadataAddS64(donecleanup_processedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     353    psMetadataAddS64(donecleanup_processedexpArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    345354
    346355    // -tostacked
    … …  
    386395    psMetadata *updatestackedArgs = psMetadataAlloc();
    387396    psMetadataAddS64(updatestackedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
    388     psMetadataAddS64(updatestackedArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    389     psMetadataAddStr(updatestackedArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
     397    psMetadataAddS32(updatestackedArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
     398    psMetadataAddStr(updatestackedArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    390399    psMetadataAddStr(updatestackedArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
    391400
    … …  
    394403    psMetadataAddBool(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    395404    psMetadataAddU64(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     405    psMetadataAddS64(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     406    psMetadataAddS32(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
     407    psMetadataAddStr(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    396408
    397409    // -donecleanup_stacked
    … …  
    399411    psMetadataAddBool(donecleanup_stackedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    400412    psMetadataAddU64(donecleanup_stackedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     413    psMetadataAddS64(donecleanup_stackedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     414    psMetadataAddS32(donecleanup_stackedArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
     415    psMetadataAddStr(donecleanup_stackedArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    401416
    402417    // -tonormalizedstat
    … …  
    432447    psMetadata *updatenormalizedstatArgs = psMetadataAlloc();
    433448    psMetadataAddS64(updatenormalizedstatArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
    434     psMetadataAddS64(updatenormalizedstatArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
     449    psMetadataAddS32(updatenormalizedstatArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    435450    psMetadataAddStr(updatenormalizedstatArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    436451    psMetadataAddStr(updatenormalizedstatArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
    … …  
    440455    psMetadataAddBool(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    441456    psMetadataAddU64(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     457    psMetadataAddS64(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     458    psMetadataAddS32(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
     459    psMetadataAddStr(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    442460
    443461    // -donecleanup_normalizedstat
    … …  
    445463    psMetadataAddBool(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    446464    psMetadataAddU64(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     465    psMetadataAddS64(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     466    psMetadataAddS32(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
     467    psMetadataAddStr(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    447468
    448469    // -tonormalize
    … …  
    488509    psMetadata *updatenormalizedimfileArgs = psMetadataAlloc();
    489510    psMetadataAddS64(updatenormalizedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
    490     psMetadataAddS64(updatenormalizedimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
     511    psMetadataAddS32(updatenormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    491512    psMetadataAddStr(updatenormalizedimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    492513    psMetadataAddStr(updatenormalizedimfileArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
    … …  
    496517    psMetadataAddBool(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    497518    psMetadataAddU64(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     519    psMetadataAddS64(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     520    psMetadataAddS32(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
     521    psMetadataAddStr(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    498522
    499523    // -donecleanup_normalizedimfile
    … …  
    501525    psMetadataAddBool(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    502526    psMetadataAddU64(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     527    psMetadataAddS64(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     528    psMetadataAddS32(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
     529    psMetadataAddStr(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    503530
    504531    // -tonormalizedexp
    … …  
    541568    psMetadata *updatenormalizedexpArgs = psMetadataAlloc();
    542569    psMetadataAddS64(updatenormalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
    543     psMetadataAddS64(updatenormalizedexpArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    544     psMetadataAddStr(updatenormalizedexpArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
     570    psMetadataAddS32(updatenormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    545571    psMetadataAddStr(updatenormalizedexpArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
    546572
    … …  
    549575    psMetadataAddBool(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    550576    psMetadataAddU64(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     577    psMetadataAddS64(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     578    psMetadataAddS32(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    551579
    552580    // -donecleanup_normalizedexp
    … …  
    554582    psMetadataAddBool(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    555583    psMetadataAddU64(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     584    psMetadataAddS64(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     585    psMetadataAddS32(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    556586
    557587    // -toresidimfile
    … …  
    611641    psMetadata *updateresidimfileArgs = psMetadataAlloc();
    612642    psMetadataAddS64(updateresidimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     643    psMetadataAddS32(updateresidimfileArgs, PS_LIST_TAIL, "-iteration", 0,       "search by iteration number", 0);
    613644    psMetadataAddS64(updateresidimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    614645    psMetadataAddStr(updateresidimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    … …  
    619650    psMetadataAddBool(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    620651    psMetadataAddU64(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     652    psMetadataAddS64(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     653    psMetadataAddS32(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-iteration", 0,       "search by iteration number", 0);
     654    psMetadataAddS64(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
     655    psMetadataAddStr(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    621656
    622657    // -donecleanup_residimfile
    … …  
    624659    psMetadataAddBool(donecleanup_residimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    625660    psMetadataAddU64(donecleanup_residimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     661    psMetadataAddS64(donecleanup_residimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     662    psMetadataAddS32(donecleanup_residimfileArgs, PS_LIST_TAIL, "-iteration", 0,       "search by iteration number", 0);
     663    psMetadataAddS64(donecleanup_residimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
     664    psMetadataAddStr(donecleanup_residimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    626665
    627666    // -toresidexp
    … …  
    686725    psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-path_base",  0,            "define base output location", NULL);
    687726    psMetadataAddBool(updateresidexpArgs, PS_LIST_TAIL, "-reject",  0,            "exposure is not to be stacked in the next iteration", false);
     727    psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
    688728
    689729    // -pendingcleanup_residexp
    … …  
    691731    psMetadataAddBool(pendingcleanup_residexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    692732    psMetadataAddU64(pendingcleanup_residexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     733    psMetadataAddS64(pendingcleanup_residexpArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID (required)", 0);
     734    psMetadataAddS32(pendingcleanup_residexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
     735    psMetadataAddS64(pendingcleanup_residexpArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by detrend ID", 0);
    693736
    694737    // -donecleanup_residexp
    … …  
    696739    psMetadataAddBool(donecleanup_residexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    697740    psMetadataAddU64(donecleanup_residexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     741    psMetadataAddS64(donecleanup_residexpArgs, PS_LIST_TAIL, "-det_id", 0,            "search by detrend ID (required)", 0);
     742    psMetadataAddS32(donecleanup_residexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
     743    psMetadataAddS64(donecleanup_residexpArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by detrend ID", 0);
    698744
    699745    // -todetrunsummary
    … …  
    834880    PXOPT_ADD_MODE("-normalizedstat",        "", DETTOOL_MODE_NORMALIZEDSTAT,   normalizedstatArgs);
    835881    PXOPT_ADD_MODE("-revertnormalizedstat",  "", DETTOOL_MODE_REVERTNORMALIZEDSTAT,   revertnormalizedstatArgs);
    836     PXOPT_ADD_MODE("-updatenormalizedstat",  "", DETTOOL_MODE_REVERTNORMALIZEDSTAT,   revertnormalizedstatArgs);
     882    PXOPT_ADD_MODE("-updatenormalizedstat",  "", DETTOOL_MODE_UPDATENORMALIZEDSTAT,   updatenormalizedstatArgs);
    837883    PXOPT_ADD_MODE("-pendingcleanup_normalizedstat", "", DETTOOL_MODE_PENDINGCLEANUP_NORMALIZEDSTAT, pendingcleanup_normalizedstatArgs);
    838884    PXOPT_ADD_MODE("-donecleanup_normalizedstat", "",    DETTOOL_MODE_DONECLEANUP_NORMALIZEDSTAT, donecleanup_normalizedstatArgs);
    … …  
    871917
    872918    PXOPT_ADD_MODE("-todetrunsummary",  "", DETTOOL_MODE_TODETRUNSUMMARY,  todetrunsummaryArgs);
    873     PXOPT_ADD_MODE("-updateresidexp", "", DETTOOL_MODE_UPDATERESIDEXP,updateresidexpArgs);
    874919    PXOPT_ADD_MODE("-adddetrunsummary", "", DETTOOL_MODE_ADDDETRUNSUMMARY,adddetrunsummaryArgs);
    875920    PXOPT_ADD_MODE("-detrunsummary", "", DETTOOL_MODE_DETRUNSUMMARY,detrunsummaryArgs);

  • branches/eam_branch_20080719/ippTools/src/dettool_detrunsummary.c

    r18991 r19078  
    9494        return false;
    9595    }
    96     psString data_state = psMetadataLookupStr(&status, row, "data_state");
    97     if (!status) {
    98         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for iteration");
    99         return false;
    100     }
    10196
    10297    // optional
    … …  
    112107            det_id,
    113108            iteration,
    114             data_state,
     109            "full",
    115110            bg,
    116111            bg_stdev,

  • branches/eam_branch_20080719/ippTools/src/dettool_normalizedexp.c

    r18991 r19078  
    335335
    336336    psMetadata *where = psMetadataAlloc();
    337     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     337    PXOPT_COPY_S64(config->args, where, "-det_id", "detNormalizedExp.det_id", "==");
     338    PXOPT_COPY_S32(config->args, where, "-iteration", "detNormalizedExp.iteration", "==");
    338339
    339340    psString query = pxDataGet("dettool_donecleanup_normalizedexp.sql");

  • branches/eam_branch_20080719/ippTools/src/dettool_normalizedimfile.c

    r18991 r19078  
    317317
    318318    psMetadata *where = psMetadataAlloc();
    319     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     319    PXOPT_COPY_S64(config->args, where, "-det_id", "detNormalizedImfile.det_id", "==");
     320    PXOPT_COPY_S32(config->args, where, "-iteration", "detNormalizedImfile.iteration", "==");
     321    PXOPT_COPY_STR(config->args, where, "-class_id", "detNormalizedImfile.det_id", "==");
    320322
    321323    psString query = pxDataGet("dettool_donecleanup_normalizedimfile.sql");

  • branches/eam_branch_20080719/ippTools/src/dettool_normalizedstat.c

    r19002 r19078  
    297297
    298298    psMetadata *where = psMetadataAlloc();
    299     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     299    PXOPT_COPY_S64(config->args, where, "-det_id", "detNormalizedStatImfile.det_id", "==");
     300    PXOPT_COPY_S32(config->args, where, "-iteration", "detNormalizedStatImfile.iteration", "==");
     301    PXOPT_COPY_STR(config->args, where, "-class_id", "detNormalizedStatImfile.det_id", "==");
    300302
    301303    psString query = pxDataGet("dettool_donecleanup_normalizedstat.sql");

  • branches/eam_branch_20080719/ippTools/src/dettool_processedexp.c

    r18991 r19078  
    105105    }
    106106
    107     if (!p_psDBRunQuery(config->dbh, query, det_id, exp_id)) {
     107    if (!p_psDBRunQuery(config->dbh, query, (long long) det_id, (long long) exp_id)) {
    108108        psError(PS_ERR_UNKNOWN, false, "database error");
    109109        psFree(query);
    … …  
    282282
    283283    psMetadata *where = psMetadataAlloc();
    284     PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedExp.det_id", "==");
    285     PXOPT_COPY_STR(config->args, where, "-label", "detProcessedExp.label", "==");
     284    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     285    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
    286286
    287287    psString query = pxDataGet("dettool_pendingcleanup_processedexp.sql");
    … …  
    344344
    345345    psMetadata *where = psMetadataAlloc();
    346     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     346    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     347    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
    347348
    348349    psString query = pxDataGet("dettool_donecleanup_processedexp.sql");

  • branches/eam_branch_20080719/ippTools/src/dettool_processedimfile.c

    r18991 r19078  
    318318
    319319    psMetadata *where = psMetadataAlloc();
    320     PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedImfile.det_id", "==");
     320    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     321    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
     322    PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "==");
    321323
    322324    psString query = pxDataGet("dettool_pendingcleanup_processedimfile.sql");
    … …  
    379381
    380382    psMetadata *where = psMetadataAlloc();
    381     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     383    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     384    PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
     385    PXOPT_COPY_STR(config->args, where, "-class_id", "class_id", "==");
    382386
    383387    psString query = pxDataGet("dettool_donecleanup_processedimfile.sql");

  • branches/eam_branch_20080719/ippTools/src/dettool_residexp.c

    r18991 r19078  
    361361
    362362    psMetadata *where = psMetadataAlloc();
    363     PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedImfile.det_id", "==");
     363    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     364    PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
     365    PXOPT_COPY_S64(config->args, where, "-exp_id",    "exp_id", "==");
    364366
    365367    psString query = pxDataGet("dettool_pendingcleanup_residexp.sql");
    … …  
    422424
    423425    psMetadata *where = psMetadataAlloc();
    424     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     426    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     427    PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
     428    PXOPT_COPY_S64(config->args, where, "-exp_id",    "exp_id", "==");
    425429
    426430    psString query = pxDataGet("dettool_donecleanup_residexp.sql");

  • branches/eam_branch_20080719/ippTools/src/dettool_residimfile.c

    r18991 r19078  
    284284
    285285    psMetadata *where = psMetadataAlloc();
    286     PXOPT_COPY_S64(config->args, where, "-det_id", "detProcessedImfile.det_id", "==");
     286    PXOPT_COPY_S64(config->args, where, "-det_id",    "det_id", "==");
     287    PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
     288    PXOPT_COPY_S64(config->args, where, "-exp_id",  "exp_id", "==");
     289    PXOPT_COPY_STR(config->args, where, "-class_id",  "class_id", "==");
    287290
    288291    psString query = pxDataGet("dettool_pendingcleanup_residimfile.sql");
    … …  
    345348
    346349    psMetadata *where = psMetadataAlloc();
    347     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     350    PXOPT_COPY_S64(config->args, where, "-det_id",    "det_id", "==");
     351    PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
     352    PXOPT_COPY_S64(config->args, where, "-exp_id",  "exp_id", "==");
     353    PXOPT_COPY_STR(config->args, where, "-class_id",  "class_id", "==");
    348354
    349355    psString query = pxDataGet("dettool_donecleanup_residimfile.sql");

  • branches/eam_branch_20080719/ippTools/src/dettool_stack.c

    r19002 r19078  
    322322    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
    323323    PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false);
     324    PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
    324325    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
    325326
    326     if (!setStackedImfileDataState(config, det_id, iteration, data_state)) {
     327    if (!setStackedImfileDataState(config, det_id, iteration, class_id, data_state)) {
    327328        return false;
    328329    }
    … …  
    340341    PXOPT_COPY_S64(config->args, where, "-det_id", "detStackedImfile.det_id", "==");
    341342    PXOPT_COPY_S32(config->args, where, "-iteration", "detStackedImfile.iteration", "==");
     343    PXOPT_COPY_STR(config->args, where, "-class_id", "detStackedImfile.class_id", "==");
    342344
    343345    psString query = pxDataGet("dettool_pendingcleanup_stacked.sql");
    … …  
    400402
    401403    psMetadata *where = psMetadataAlloc();
    402     PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
     404    PXOPT_COPY_S64(config->args, where, "-det_id", "detStackedImfile.det_id", "==");
     405    PXOPT_COPY_S32(config->args, where, "-iteration", "detStackedImfile.iteration", "==");
     406    PXOPT_COPY_STR(config->args, where, "-class_id", "detStackedImfile.class_id", "==");
    403407
    404408    psString query = pxDataGet("dettool_donecleanup_stacked.sql");
Note: See TracChangeset for help on using the changeset viewer.