IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 26865


Ignore:
Timestamp:
Feb 10, 2010, 4:05:44 PM (16 years ago)
Author:
eugene
Message:

updates from trunk

Location:
branches/eam_branches/20091201/ippTools
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/20091201/ippTools/share/dettool_pendingcleanup_normalizedexp.sql

    r25324 r26865  
    1 SELECT
     1SELECT DISTINCT
    22    detNormalizedExp.*,
    33    rawExp.camera   
    4 FROM detRunSummary
    5 JOIN detNormalizedExp
    6     USING(det_id,iteration)
     4FROM detNormalizedExp
    75JOIN detInputExp
    8      USING(det_id,iteration)
     6     USING(det_id,exp_id)
    97JOIN rawExp
    108     USING(exp_id)
    119WHERE
    12     ((detRunSummary.data_state = 'goto_cleaned'
    13       AND detNormalizedExp.data_state = 'full')
    14      OR (detRunSummary.data_state = 'goto_scrubbed'
    15       AND detNormalizedExp.data_state = 'full')
    16      OR (detRunSummary.data_state = 'goto_purged'
    17       AND detNormalizedExp.data_state = 'full')
    18      OR detNormalizedExp.data_state = 'goto_cleaned'
     10    (detNormalizedExp.data_state = 'goto_cleaned'
    1911     OR detNormalizedExp.data_state = 'goto_scrubbed'
    2012     OR detNormalizedExp.data_state = 'goto_purged')

  • branches/eam_branches/20091201/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql

    r25324 r26865  
    22    detNormalizedImfile.*,
    33    rawExp.camera
    4 FROM detRunSummary
    5 JOIN detNormalizedImfile
    6     USING(det_id,iteration)
     4FROM detNormalizedImfile
    75JOIN detInputExp
    8      USING(det_id,iteration)
     6     USING(det_id,exp_id)
    97JOIN rawExp
    108     USING(exp_id)
    119WHERE
    12     ((detRunSummary.data_state = 'goto_cleaned'
    13       AND detNormalizedImfile.data_state = 'full')
    14      OR (detRunSummary.data_state = 'goto_scrubbed'
    15       AND detNormalizedImfile.data_state = 'full')
    16      OR (detRunSummary.data_state = 'goto_purged'
    17       AND detNormalizedImfile.data_state = 'full')
    18      OR detNormalizedImfile.data_state = 'goto_cleaned'
     10    (detNormalizedImfile.data_state = 'goto_cleaned'
    1911     OR detNormalizedImfile.data_state = 'goto_scrubbed'
    2012     OR detNormalizedImfile.data_state = 'goto_purged')

  • branches/eam_branches/20091201/ippTools/share/dettool_pendingcleanup_normalizedstat.sql

    r25324 r26865  
    22    detNormalizedStatImfile.*,
    33    rawExp.camera
    4 FROM detRunSummary
    5 JOIN detNormalizedStatImfile
    6     USING(det_id,iteration)
     4FROM detNormalizedStatImfile
    75JOIN detInputExp
    8      USING(det_id,iteration)
     6     USING(det_id,exp_id)
    97JOIN rawExp
    108     USING(exp_id)
    119WHERE
    12     ((detRunSummary.data_state = 'goto_cleaned'
    13       AND detNormalizedStatImfile.data_state = 'full')
    14      OR (detRunSummary.data_state = 'goto_scrubbed'
    15       AND detNormalizedStatImfile.data_state = 'full')
    16      OR (detRunSummary.data_state = 'goto_purged'
    17       AND detNormalizedStatImfile.data_state = 'full')
    18      OR detNormalizedStatImfile.data_state = 'goto_cleaned'
     10    (detNormalizedStatImfile.data_state = 'goto_cleaned'
    1911     OR detNormalizedStatImfile.data_state = 'goto_scrubbed'
    2012     OR detNormalizedStatImfile.data_state = 'goto_purged')

  • branches/eam_branches/20091201/ippTools/share/dettool_pendingcleanup_processedexp.sql

    r25324 r26865  
    11-- need to restrict to a single detRunSummary (require all to say 'cleaned'?)
    2 SELECT
     2SELECT DISTINCT
    33    detProcessedExp.*,
    44    rawExp.camera
    5 FROM detRunSummary
    6 JOIN detProcessedExp
    7     USING(det_id)
     5FROM detProcessedExp
     6JOIN detInputExp
     7     USING(det_id,exp_id)
    88JOIN rawExp
    99     USING(exp_id)
    1010WHERE
    11     ((detRunSummary.data_state = 'goto_cleaned'
    12       AND detProcessedExp.data_state = 'full')
    13      OR (detRunSummary.data_state = 'goto_scrubbed'
    14          AND detProcessedExp.data_state = 'full')
    15      OR (detRunSummary.data_state = 'goto_purged'
    16          AND detProcessedExp.data_state = 'full')
    17      OR detProcessedExp.data_state = 'goto_cleaned'
     11    (detProcessedExp.data_state = 'goto_cleaned'
    1812     OR detProcessedExp.data_state = 'goto_scrubbed'
    1913     OR detProcessedExp.data_state = 'goto_purged')

  • branches/eam_branches/20091201/ippTools/share/dettool_pendingcleanup_processedimfile.sql

    r25324 r26865  
    1 SELECT
     1SELECT DISTINCT
    22    detProcessedImfile.*,
    33    rawExp.camera
    4 FROM detRunSummary
    5 JOIN detProcessedImfile
    6     USING(det_id)
     4    FROM detProcessedImfile
    75JOIN detInputExp
    8      USING(det_id,iteration,exp_id)
     6     USING(det_id,exp_id)
    97JOIN rawExp
    108     USING(exp_id)

  • branches/eam_branches/20091201/ippTools/share/dettool_pendingcleanup_residexp.sql

    r25324 r26865  
    1 SELECT
     1SELECT DISTINCT
    22    detResidExp.*,
    33    rawExp.camera
    4 FROM detRunSummary
    5 JOIN detResidExp
    6     USING(det_id,iteration)
     4FROM detResidExp
    75JOIN detInputExp
    8      USING(det_id,iteration,exp_id)
     6     USING(det_id,exp_id)
    97JOIN rawExp
    108    USING(exp_id)
    119WHERE
    12     ((detRunSummary.data_state = 'goto_cleaned'
    13       AND detResidExp.data_state = 'full')
    14      OR (detRunSummary.data_state = 'goto_scrubbed'
    15          AND detResidExp.data_state = 'full')
    16      OR (detRunSummary.data_state = 'goto_purged'
    17          AND detResidExp.data_state = 'full')
    18      OR detResidExp.data_state = 'goto_cleaned'
     10    (detResidExp.data_state = 'goto_cleaned'
    1911     OR detResidExp.data_state = 'goto_scrubbed'
    2012     OR detResidExp.data_state = 'goto_purged')

  • branches/eam_branches/20091201/ippTools/share/dettool_pendingcleanup_residimfile.sql

    r25324 r26865  
    1 SELECT
     1SELECT DISTINCT
    22    detResidImfile.*,
    33    rawExp.camera
    4 FROM detRunSummary
    5 JOIN detResidImfile
    6     USING(det_id,iteration)
     4FROM detResidImfile
    75JOIN detInputExp
    8     USING(det_id,iteration,exp_id)
     6    USING(det_id,exp_id)
    97JOIN rawExp
    108    USING(exp_id)
    119WHERE
    12     ((detRunSummary.data_state = 'goto_cleaned'
    13       AND detResidImfile.data_state = 'full')
    14      OR (detRunSummary.data_state = 'goto_scrubbed'
    15       AND detResidImfile.data_state = 'full')
    16      OR (detRunSummary.data_state = 'goto_purged'
    17       AND detResidImfile.data_state = 'full')
    18      OR detResidImfile.data_state = 'goto_cleaned'
     10    (detResidImfile.data_state = 'goto_cleaned'
    1911     OR detResidImfile.data_state = 'goto_scrubbed'
    2012     OR detResidImfile.data_state = 'goto_purged')

  • branches/eam_branches/20091201/ippTools/share/dettool_pendingcleanup_stacked.sql

    r25324 r26865  
    1 SELECT DISTINCT
     1ySELECT DISTINCT
    22    detStackedImfile.*,
    33    rawExp.camera
    4 FROM detRunSummary
    5 JOIN detStackedImfile
    6      USING(det_id,iteration)
     4FROM detStackedImfile
    75JOIN detInputExp
    8      USING(det_id,iteration)
     6     USING(det_id,exp_id)
    97JOIN rawExp
    108     USING(exp_id)
    119WHERE
    12     ((detRunSummary.data_state = 'goto_cleaned'
    13       AND detStackedImfile.data_state = 'full')
    14      OR (detRunSummary.data_state = 'goto_scrubbed'
    15       AND detStackedImfile.data_state = 'full')
    16      OR (detRunSummary.data_state = 'goto_purged'
    17       AND detStackedImfile.data_state = 'full')
    18      OR detStackedImfile.data_state = 'goto_cleaned'
     10    (detStackedImfile.data_state = 'goto_cleaned'
    1911     OR detStackedImfile.data_state = 'goto_scrubbed'
    2012     OR detStackedImfile.data_state = 'goto_purged')

  • branches/eam_branches/20091201/ippTools/src/dettool.c

    r26857 r26865  
    9494        MODECASE(DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDEXP, pendingcleanup_processedexpMode);
    9595        MODECASE(DETTOOL_MODE_DONECLEANUP_PROCESSEDEXP, donecleanup_processedexpMode);
     96        MODECASE(DETTOOL_MODE_UPDATESTATE_PROCESSED, updatestateprocessedMode);
    9697        // stacked
    9798        MODECASE(DETTOOL_MODE_TOSTACKED,        tostackedMode);
    … …  
    142143        MODECASE(DETTOOL_MODE_PENDINGCLEANUP_RESIDEXP, pendingcleanup_residexpMode);
    143144        MODECASE(DETTOOL_MODE_DONECLEANUP_RESIDEXP, donecleanup_residexpMode);
     145        MODECASE(DETTOOL_MODE_UPDATESTATE_RESID, updatestateresidMode);
    144146        // detrunsummary
    145147        MODECASE(DETTOOL_MODE_TODETRUNSUMMARY,  todetrunsummaryMode);
    … …  
    18591861
    18601862
    1861 bool setProcessedImfileDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *class_id, const char *data_state)
     1863bool setProcessedImfileDataState(pxConfig *config, psMetadata *where, const char *data_state)
    18621864{
    18631865    PS_ASSERT_PTR_NON_NULL(config, false);
     1866    PS_ASSERT_PTR_NON_NULL(where, false);
    18641867    PS_ASSERT_PTR_NON_NULL(data_state, false);
    1865     PS_ASSERT_PTR_NON_NULL(class_id, false);
    18661868
    18671869    if (!isValidDataState (data_state)) return false;
    1868    
    1869     char *query = "UPDATE detProcessedImfile SET data_state = '%s'"
    1870         " WHERE det_id = %" PRId64
    1871         " AND exp_id = %" PRId64
    1872         " AND class_id = '%s'";
    1873     if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, exp_id, class_id)) {
    1874         psError(PS_ERR_UNKNOWN, false,
    1875                 "failed to change state for det_id %" PRId64 ", exp_id %" PRId64 ", class_id %s",
    1876                 det_id, exp_id, class_id);
    1877         return false;
    1878     }
    1879 
    1880     return true;
    1881 }
    1882 
    1883 bool setProcessedExpDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *data_state)
     1870
     1871    psString query = psStringCopy("UPDATE detProcessedImfile SET data_state = '%s'");
     1872    if (where && psListLength(where->list) > 0) {
     1873      psString whereClause = psDBGenerateWhereSQL(where,NULL);
     1874      psStringAppend(&query," %s",whereClause);
     1875      psFree(whereClause);
     1876    } else {
     1877      psError(PS_ERR_UNKNOWN, true, "search parameters are required");
     1878      return(false);
     1879    }
     1880
     1881    if (!p_psDBRunQueryF(config->dbh, query, data_state)) {
     1882      psFree(query);
     1883      psError(PS_ERR_UNKNOWN, false, "database error");
     1884      return(false);
     1885    }
     1886    psFree(query);
     1887    return(true);
     1888}
     1889
     1890bool setProcessedExpDataState(pxConfig *config, psMetadata *where, const char *data_state)
    18841891{
    18851892    PS_ASSERT_PTR_NON_NULL(config, false);
     1893    PS_ASSERT_PTR_NON_NULL(where, false);
    18861894    PS_ASSERT_PTR_NON_NULL(data_state, false);
    18871895
    18881896    if (!isValidDataState (data_state)) return false;
    18891897
    1890     char *query = "UPDATE detProcessedExp SET data_state = '%s'"
    1891         " WHERE det_id = %" PRId64
    1892         " AND exp_id = %" PRId64;
    1893     if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, exp_id)) {
    1894         psError(PS_ERR_UNKNOWN, false,
    1895                 "failed to change state for det_id %" PRId64 ", exp_id %" PRId64,
    1896                 det_id, exp_id);
    1897         return false;
    1898     }
    1899 
    1900     return true;
    1901 }
    1902 
    1903 
     1898    psString query = psStringCopy("UPDATE detProcessedExp SET data_state = '%s'");
     1899    if (where && psListLength(where->list) > 0) {
     1900      psString whereClause = psDBGenerateWhereSQL(where,NULL);
     1901      psStringAppend(&query," %s",whereClause);
     1902      psFree(whereClause);
     1903    } else {
     1904      psError(PS_ERR_UNKNOWN, true, "search parameters are required");
     1905      return(false);
     1906    }
     1907
     1908    if (!p_psDBRunQueryF(config->dbh, query, data_state)) {
     1909      psFree(query);
     1910      psError(PS_ERR_UNKNOWN, false, "database error");
     1911      return(false);
     1912    }
     1913    psFree(query);
     1914    return(true);
     1915}
     1916
     1917bool setResidImfileDataState(pxConfig *config, psMetadata *where, const char *data_state)
     1918{
     1919    PS_ASSERT_PTR_NON_NULL(config, false);
     1920    PS_ASSERT_PTR_NON_NULL(where,false);
     1921    PS_ASSERT_PTR_NON_NULL(data_state, false);
     1922
     1923    if (!isValidDataState (data_state)) return false;
     1924
     1925    psString query = psStringCopy("UPDATE detResidImfile SET data_state = '%s'");
     1926    if (where && psListLength(where->list) > 0) {
     1927      psString whereClause = psDBGenerateWhereSQL(where,NULL);
     1928      psStringAppend(&query," %s",whereClause);
     1929      psFree(whereClause);
     1930    } else {
     1931      psError(PS_ERR_UNKNOWN, true, "search parameters are required");
     1932      return(false);
     1933    }
     1934
     1935    if (!p_psDBRunQueryF(config->dbh, query, data_state)) {
     1936      psFree(query);
     1937      psError(PS_ERR_UNKNOWN, false, "database error");
     1938      return(false);
     1939    }
     1940    psFree(query);
     1941    return(true);
     1942}
     1943// This function apparently not used anymore.
     1944bool setResidExpDataState(pxConfig *config, psMetadata *where, const char *data_state)
     1945{
     1946    PS_ASSERT_PTR_NON_NULL(config, false);
     1947    PS_ASSERT_PTR_NON_NULL(where,false);
     1948    PS_ASSERT_PTR_NON_NULL(data_state, false);
     1949
     1950    if (!isValidDataState (data_state)) return false;
     1951
     1952    psString query = psStringCopy("UPDATE detResidExp SET data_state = '%s'");
     1953    if (where && psListLength(where->list) > 0) {
     1954      psString whereClause = psDBGenerateWhereSQL(where,NULL);
     1955      psStringAppend(&query," %s",whereClause);
     1956      psFree(whereClause);
     1957    } else {
     1958      psError(PS_ERR_UNKNOWN, true, "search parameters are required");
     1959      return(false);
     1960    }
     1961
     1962    if (!p_psDBRunQueryF(config->dbh, query, data_state)) {
     1963      psFree(query);
     1964      psError(PS_ERR_UNKNOWN, false, "database error");
     1965      return(false);
     1966    }
     1967    psFree(query);
     1968    return(true);
     1969}
     1970
     1971// Not yet updated for cleaning
    19041972bool setStackedImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state)
    19051973{
    … …  
    19882056    return true;
    19892057}
    1990 
    1991 bool setResidImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *class_id, const char *data_state)
    1992 {
    1993     PS_ASSERT_PTR_NON_NULL(config, false);
    1994     PS_ASSERT_PTR_NON_NULL(data_state, false);
    1995     PS_ASSERT_PTR_NON_NULL(class_id, false);
    1996 
    1997     if (!isValidDataState (data_state)) return false;
    1998 
    1999     char *query = "UPDATE detResidImfile SET data_state = '%s'"
    2000         " WHERE det_id = %" PRId64
    2001         " AND iteration = %" PRId32
    2002         " AND exp_id = %" PRId64
    2003         " AND class_id = '%s'";
    2004     if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration, exp_id, class_id)) {
    2005         psError(PS_ERR_UNKNOWN, false,
    2006                 "failed to change state for det_id %" PRId64 ", iteration %" PRId32 ", exp_id %" PRId64 ", class_id %s",
    2007                 det_id, iteration, exp_id, class_id);
    2008         return false;
    2009     }
    2010 
    2011     return true;
    2012 }
    2013 
    2014 bool setResidExpDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *data_state)
    2015 {
    2016     PS_ASSERT_PTR_NON_NULL(config, false);
    2017     PS_ASSERT_PTR_NON_NULL(data_state, false);
    2018 
    2019     if (!isValidDataState (data_state)) return false;
    2020 
    2021     char *query = "UPDATE detResidExp SET data_state = '%s'"
    2022         " WHERE det_id = %" PRId64
    2023         " AND iteration = %" PRId32
    2024         " AND exp_id = %" PRId64;
    2025     if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration, exp_id)) {
    2026         psError(PS_ERR_UNKNOWN, false,
    2027                 "failed to change state for det_id %" PRId64 ", iteration %" PRId32 ", exp_id %" PRId64,
    2028                 det_id, iteration, exp_id);
    2029         return false;
    2030     }
    2031 
    2032     return true;
    2033 }
     2058// End not yet modified for cleanup.
    20342059
    20352060bool exportrunMode(pxConfig *config)

  • branches/eam_branches/20091201/ippTools/src/dettool.h

    r25324 r26865  
    5757    DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDEXP,
    5858    DETTOOL_MODE_DONECLEANUP_PROCESSEDEXP,
     59    DETTOOL_MODE_UPDATESTATE_PROCESSED,
    5960
    6061    DETTOOL_MODE_TOSTACKED,
    … …  
    105106    DETTOOL_MODE_PENDINGCLEANUP_RESIDEXP,
    106107    DETTOOL_MODE_DONECLEANUP_RESIDEXP,
     108    DETTOOL_MODE_UPDATESTATE_RESID,
    107109
    108110    DETTOOL_MODE_TODETRUNSUMMARY,
    … …  
    149151bool pendingcleanup_processedexpMode(pxConfig *config);
    150152bool donecleanup_processedexpMode(pxConfig *config);
     153bool updatestateprocessedMode(pxConfig *config);
    151154
    152155// stackedimfile
    … …  
    203206bool pendingcleanup_residexpMode(pxConfig *config);
    204207bool donecleanup_residexpMode(pxConfig *config);
     208bool updatestateresidMode(pxConfig *config);
    205209
    206210// detrunsummary
    … …  
    220224
    221225// functions to set the 'data_state' for stages
    222 bool setProcessedImfileDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *class_id, const char *data_state);
    223 bool setProcessedExpDataState(pxConfig *config, psS64 det_id, psS64 exp_id, const char *data_state);
     226bool setProcessedImfileDataState(pxConfig *config, psMetadata *where, const char *data_state);
     227bool setProcessedExpDataState(pxConfig *config, psMetadata *where, const char *data_state);
     228bool setResidImfileDataState(pxConfig *config, psMetadata *where, const char *data_state);
     229bool setResidExpDataState(pxConfig *config, psMetadata *where, const char *data_state);
     230
    224231bool setStackedImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state);
    225232bool setNormStatImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state);
    226233bool setNormImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *class_id, const char *data_state);
    227234bool setNormExpDataState(pxConfig *config, psS64 det_id, psS32 iteration, const char *data_state);
    228 bool setResidImfileDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *class_id, const char *data_state);
    229 bool setResidExpDataState(pxConfig *config, psS64 det_id, psS32 iteration, psS64 exp_id, const char *data_state);
    230235
    231236#endif // DETTOOL_H

  • branches/eam_branches/20091201/ippTools/src/dettoolConfig.c

    r26857 r26865  
    306306    // -updateprocessedimfile
    307307    psMetadata *updateprocessedimfileArgs = psMetadataAlloc();
    308     psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     308    psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    309309    psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    310310    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    … …  
    315315    psMetadataAddBool(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    316316    psMetadataAddU64(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    317     psMetadataAddS64(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     317    psMetadataAddS64(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    318318    psMetadataAddS64(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
    319319    psMetadataAddStr(pendingcleanup_processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    … …  
    323323    psMetadataAddBool(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    324324    psMetadataAddU64(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    325     psMetadataAddS64(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     325    psMetadataAddS64(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    326326    psMetadataAddS64(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
    327327    psMetadataAddStr(donecleanup_processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    … …  
    367367    // -updateprocessedexp
    368368    psMetadata *updateprocessedexpArgs = psMetadataAlloc();
    369     psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     369    psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    370370    psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    371371    psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    … …  
    375375    psMetadataAddBool(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    376376    psMetadataAddU64(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    377     psMetadataAddS64(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     377    psMetadataAddS64(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    378378    psMetadataAddS64(pendingcleanup_processedexpArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    379379
    … …  
    382382    psMetadataAddBool(donecleanup_processedexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    383383    psMetadataAddU64(donecleanup_processedexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    384     psMetadataAddS64(donecleanup_processedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     384    psMetadataAddS64(donecleanup_processedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    385385    psMetadataAddS64(donecleanup_processedexpArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
     386
     387    // -updatestate_processed
     388    psMetadata *updatestateprocessedArgs = psMetadataAlloc();
     389    psMetadataAddS64(updatestateprocessedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
     390    psMetadataAddS64(updatestateprocessedArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
     391    psMetadataAddStr(updatestateprocessedArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    386392
    387393    // -tostacked
    … …  
    426432    // -updatestacked
    427433    psMetadata *updatestackedArgs = psMetadataAlloc();
    428     psMetadataAddS64(updatestackedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     434    psMetadataAddS64(updatestackedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    429435    psMetadataAddS32(updatestackedArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    430436    psMetadataAddStr(updatestackedArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    … …  
    435441    psMetadataAddBool(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    436442    psMetadataAddU64(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    437     psMetadataAddS64(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     443    psMetadataAddS64(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    438444    psMetadataAddS32(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    439445    psMetadataAddStr(pendingcleanup_stackedArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    … …  
    443449    psMetadataAddBool(donecleanup_stackedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    444450    psMetadataAddU64(donecleanup_stackedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    445     psMetadataAddS64(donecleanup_stackedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     451    psMetadataAddS64(donecleanup_stackedArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    446452    psMetadataAddS32(donecleanup_stackedArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    447453    psMetadataAddStr(donecleanup_stackedArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    … …  
    478484    // -updatenormalizedstat
    479485    psMetadata *updatenormalizedstatArgs = psMetadataAlloc();
    480     psMetadataAddS64(updatenormalizedstatArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     486    psMetadataAddS64(updatenormalizedstatArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    481487    psMetadataAddS32(updatenormalizedstatArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    482488    psMetadataAddStr(updatenormalizedstatArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    … …  
    487493    psMetadataAddBool(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    488494    psMetadataAddU64(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    489     psMetadataAddS64(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     495    psMetadataAddS64(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    490496    psMetadataAddS32(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    491497    psMetadataAddStr(pendingcleanup_normalizedstatArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    … …  
    495501    psMetadataAddBool(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    496502    psMetadataAddU64(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    497     psMetadataAddS64(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     503    psMetadataAddS64(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    498504    psMetadataAddS32(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    499505    psMetadataAddStr(donecleanup_normalizedstatArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    … …  
    540546    // -updatenormalizedimfile
    541547    psMetadata *updatenormalizedimfileArgs = psMetadataAlloc();
    542     psMetadataAddS64(updatenormalizedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     548    psMetadataAddS64(updatenormalizedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    543549    psMetadataAddS32(updatenormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    544550    psMetadataAddStr(updatenormalizedimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    … …  
    549555    psMetadataAddBool(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    550556    psMetadataAddU64(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    551     psMetadataAddS64(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     557    psMetadataAddS64(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    552558    psMetadataAddS32(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    553559    psMetadataAddStr(pendingcleanup_normalizedimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    … …  
    557563    psMetadataAddBool(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    558564    psMetadataAddU64(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    559     psMetadataAddS64(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     565    psMetadataAddS64(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    560566    psMetadataAddS32(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    561567    psMetadataAddStr(donecleanup_normalizedimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    … …  
    599605    // -updatenormalizedexp
    600606    psMetadata *updatenormalizedexpArgs = psMetadataAlloc();
    601     psMetadataAddS64(updatenormalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     607    psMetadataAddS64(updatenormalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    602608    psMetadataAddS32(updatenormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    603609    psMetadataAddStr(updatenormalizedexpArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    … …  
    607613    psMetadataAddBool(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    608614    psMetadataAddU64(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    609     psMetadataAddS64(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     615    psMetadataAddS64(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    610616    psMetadataAddS32(pendingcleanup_normalizedexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    611617
    … …  
    614620    psMetadataAddBool(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    615621    psMetadataAddU64(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    616     psMetadataAddS64(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     622    psMetadataAddS64(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    617623    psMetadataAddS32(donecleanup_normalizedexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    618624
    … …  
    677683    // -updateresidimfile
    678684    psMetadata *updateresidimfileArgs = psMetadataAlloc();
    679     psMetadataAddS64(updateresidimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     685    psMetadataAddS64(updateresidimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    680686    psMetadataAddS32(updateresidimfileArgs, PS_LIST_TAIL, "-iteration", 0,       "search by iteration number", 0);
    681687    psMetadataAddS64(updateresidimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    … …  
    687693    psMetadataAddBool(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    688694    psMetadataAddU64(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    689     psMetadataAddS64(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     695    psMetadataAddS64(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    690696    psMetadataAddS32(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-iteration", 0,       "search by iteration number", 0);
    691697    psMetadataAddS64(pendingcleanup_residimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    … …  
    696702    psMetadataAddBool(donecleanup_residimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    697703    psMetadataAddU64(donecleanup_residimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    698     psMetadataAddS64(donecleanup_residimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
     704    psMetadataAddS64(donecleanup_residimfileArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
    699705    psMetadataAddS32(donecleanup_residimfileArgs, PS_LIST_TAIL, "-iteration", 0,       "search by iteration number", 0);
    700706    psMetadataAddS64(donecleanup_residimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    … …  
    779785    psMetadataAddS32(donecleanup_residexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    780786    psMetadataAddS64(donecleanup_residexpArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by detrend ID", 0);
     787
     788    // -updatestate_resid
     789    psMetadata *updatestateresidArgs = psMetadataAlloc();
     790    psMetadataAddS64(updatestateresidArgs, PS_LIST_TAIL, "-det_id",               0,            "search by det ID", 0);
     791    psMetadataAddS64(updatestateresidArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
     792    psMetadataAddStr(updatestateresidArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    781793
    782794    // -todetrunsummary
    … …  
    925937    PXOPT_ADD_MODE("-pendingcleanup_processedexp", "", DETTOOL_MODE_PENDINGCLEANUP_PROCESSEDEXP, pendingcleanup_processedexpArgs);
    926938    PXOPT_ADD_MODE("-donecleanup_processedexp", "",    DETTOOL_MODE_DONECLEANUP_PROCESSEDEXP, donecleanup_processedexpArgs);
    927 
     939    PXOPT_ADD_MODE("-updatestate_processed", "", DETTOOL_MODE_UPDATESTATE_PROCESSED, updatestateprocessedArgs);
     940   
    928941    PXOPT_ADD_MODE("-tostacked",       "", DETTOOL_MODE_TOSTACKED,     tostackedArgs);
    929942    PXOPT_ADD_MODE("-addstacked",      "", DETTOOL_MODE_ADDSTACKED,    addstackedArgs);
    … …  
    973986    PXOPT_ADD_MODE("-pendingcleanup_residexp", "", DETTOOL_MODE_PENDINGCLEANUP_RESIDEXP, pendingcleanup_residexpArgs);
    974987    PXOPT_ADD_MODE("-donecleanup_residexp", "",    DETTOOL_MODE_DONECLEANUP_RESIDEXP, donecleanup_residexpArgs);
     988    PXOPT_ADD_MODE("-updatestate_resid", "", DETTOOL_MODE_UPDATESTATE_RESID, updatestateresidArgs);
    975989
    976990    PXOPT_ADD_MODE("-todetrunsummary",  "", DETTOOL_MODE_TODETRUNSUMMARY,  todetrunsummaryArgs);

  • branches/eam_branches/20091201/ippTools/src/dettool_processedexp.c

    r23688 r26865  
    266266
    267267    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
    268     PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false);
    269268    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
    270     if (!setProcessedExpDataState(config, det_id, exp_id, data_state)) {
    271         return false;
    272     }
    273     return true;
     269
     270    psMetadata *where = psMetadataAlloc();
     271
     272    PXOPT_COPY_S64(config->args,where,"-det_id","det_id","==");
     273    PXOPT_COPY_S64(config->args,where,"-exp_id","exp_id","==");
     274
     275    if (!setProcessedExpDataState(config, where, data_state)) {
     276        return false;
     277    }
     278    psFree(where);
     279    return true;
     280}
     281
     282bool updatestateprocessedMode(pxConfig *config) {
     283  PS_ASSERT_PTR_NON_NULL(config, NULL);
     284  PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
     285  PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
     286
     287  psMetadata *where = psMetadataAlloc();
     288
     289  PXOPT_COPY_S64(config->args,where,"-det_id","det_id","==");
     290  PXOPT_COPY_S64(config->args,where,"-exp_id","exp_id","==");
     291
     292  if (!setProcessedExpDataState(config,where,data_state)) {
     293    return(false);
     294  }
     295  if (!setProcessedImfileDataState(config,where,data_state)) {
     296    return(false);
     297  }
     298  psFree(where);
     299  return(true);
    274300}
    275301

  • branches/eam_branches/20091201/ippTools/src/dettool_processedimfile.c

    r25324 r26865  
    298298
    299299    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
    300     PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false);
    301     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
    302300    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
    303 
    304     if (!setProcessedImfileDataState(config, det_id, exp_id, class_id, data_state)) {
    305         return false;
    306     }
     301   
     302    psMetadata *where = psMetadataAlloc();
     303
     304    PXOPT_COPY_S64(config->args,where,"-det_id", "det_id","==");
     305    PXOPT_COPY_S64(config->args,where,"-exp_id", "exp_id","==");
     306    PXOPT_COPY_STR(config->args,where,"-class_id","class_id","==");
     307
     308    if (!setProcessedImfileDataState(config, where, data_state)) {
     309        return false;
     310    }
     311    psFree(where);
    307312    return true;
    308313}

  • branches/eam_branches/20091201/ippTools/src/dettool_residexp.c

    r23688 r26865  
    353353}
    354354
     355bool updatestateresidMode(pxConfig *config) {
     356  PS_ASSERT_PTR_NON_NULL(config, NULL);
     357  PXOPT_LOOKUP_S64(det_id,config->args, "-det_id",true,false);
     358  PXOPT_LOOKUP_STR(data_state,config->args, "-data_state", true, false);
     359
     360  psMetadata *where = psMetadataAlloc();
     361
     362  PXOPT_COPY_S64(config->args,where,"-det_id","det_id","==");
     363  PXOPT_COPY_S64(config->args,where,"-exp_id","exp_id","==");
     364
     365  if (!setResidExpDataState(config,where,data_state)) {
     366    return(false);
     367  }
     368  if (!setResidImfileDataState(config,where,data_state)) {
     369    return(false);
     370  }
     371  psFree(where);
     372  return(true);
     373}
     374
    355375bool pendingcleanup_residexpMode(pxConfig *config)
    356376{

  • branches/eam_branches/20091201/ippTools/src/dettool_residimfile.c

    r23688 r26865  
    282282{
    283283    PS_ASSERT_PTR_NON_NULL(config, NULL);
    284 
     284   
    285285    PXOPT_LOOKUP_S64(det_id, config->args, "-det_id", true, false);
    286     PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", true, false);
    287     PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", true, false);
    288     PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
    289286    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", true, false);
    290     if (!setResidImfileDataState(config, det_id, iteration, exp_id, class_id, data_state)) {
     287
     288    psMetadata *where = psMetadataAlloc();
     289
     290    PXOPT_COPY_S64(config->args,where,"-det_id","det_id","==");
     291    PXOPT_COPY_S32(config->args,where,"-iteration", "iteration","==");
     292    PXOPT_COPY_S64(config->args,where,"-exp_id","exp_id","==");
     293    PXOPT_COPY_STR(config->args,where,"-class_id","class_id","==");
     294   
     295    if (!setResidImfileDataState(config, where, data_state)) {
    291296        return false;
    292297    }

  • branches/eam_branches/20091201/ippTools/src/magictool.c

    r26185 r26865  
    619619        return false;
    620620    }
     621    psS32 numUpdated = psDBAffectedRows(config->dbh);
     622    psLogMsg("magictool", PS_LOG_INFO, "Reverted %d magic runs", numUpdated);
     623
    621624    return true;
    622625}
    … …  
    874877
    875878    // look for tree nodes that need to be processed
     879
     880    // first find incomplete magicRuns
    876881    query = pxDataGet("magictool_toprocess_runs.sql");
    877882    if (!query) {
    … …  
    880885    }
    881886
     887    // we limit the query even though it is cheap (only magic_id is selected)
     888
     889    // XXX: if the first 1000 unfinished magicRuns have no ready nodes
     890    // that haven't faulted, later runs won't get returned even though
     891    // they have work to do. When we used a limit of 100 we actually ran
     892    // into this problem. Since we're using labels a limit of 1000 will
     893    // probably be ok.
    882894    {
    883         psString limitString = psDBGenerateLimitSQL( 100 );
     895        psString limitString = psDBGenerateLimitSQL( 1000 );
    884896        psStringAppend(&query, " %s", limitString);
    885897        psFree(limitString);
    … …  
    10741086
    10751087    psS32 numUpdated = psDBAffectedRows(config->dbh);
    1076     psLogMsg("magictool", PS_LOG_INFO, "Updated %d magic nodes", numUpdated);
     1088    psLogMsg("magictool", PS_LOG_INFO, "Reverted %d magic nodes", numUpdated);
    10771089
    10781090    return true;
Note: See TracChangeset for help on using the changeset viewer.