IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12259


Ignore:
Timestamp:
Mar 5, 2007, 5:41:11 PM (19 years ago)
Author:
jhoblitt
Message:

split detselect SQL out into their own files
add rawExp.filelevel field

Location:
trunk/ippTools
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/configure.ac

    r12227 r12259  
    11AC_PREREQ(2.59)
    22
    3 AC_INIT([ipptools], [1.1.15], [ipp-support@ifa.hawaii.edu])
     3AC_INIT([ipptools], [1.1.16], [ipp-support@ifa.hawaii.edu])
    44AC_CONFIG_SRCDIR([autogen.sh])
    55
    … …  
    1818PKG_CHECK_MODULES([PSLIB], [pslib >= 1.1.0])
    1919PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0])
    20 PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.15])
     20PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.16])
    2121
    2222PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}"

  • trunk/ippTools/scripts/regtest.sh

    r12024 r12259  
    2323
    2424for ID in `seq 0 3`; do
    25     $regtool -addprocessedimfile -exp_tag $exp_tag1 -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -object dog -dateobs 2006-10-20T10:10:10Z || exit 1
     25    $regtool -addprocessedimfile -exp_tag $exp_tag1 -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -object dog -dateobs 2006-10-20T10:10:10Z || exit 1
    2626done;
    2727
    2828$regtool -pendingexp|| exit 1
    2929
    30 $regtool -addprocessedexp -exp_tag $exp_tag1 -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -object dog -dateobs "2006-10-20T10:10:10Z" -label foobar $* || exit 1
     30$regtool -addprocessedexp -exp_tag $exp_tag1 -filelevel OTA -filter r -airmass 10 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 10 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 45 -posang 10 -object dog -dateobs "2006-10-20T10:10:10Z" -label foobar $* || exit 1
    3131
    3232$regtool -pendingimfile || exit 1
    3333
    3434for ID in `seq 0 3`; do
    35     $regtool -addprocessedimfile -exp_tag $exp_tag2 -exp_type object -class OTA -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -object dog -dateobs 2006-10-20T10:10:10Z || exit 1
     35    $regtool -addprocessedimfile -exp_tag $exp_tag2 -exp_type object -class_id $ID -filter r -airmass 10 -ra 1 -decl 2 -exp_time 0 -bg 1 -bg_stdev 1 -bg_mean_stdev 10 -alt 10 -az 10 -ccd_temp 10 -posang 10 -object dog -dateobs 2006-10-20T10:10:10Z || exit 1
    3636done;
    3737
    3838$regtool -pendingexp|| exit 1
    3939
    40 $regtool -addprocessedexp -exp_tag $exp_tag2 -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -object dog -dateobs 2006-10-20T10:10:10Z -label foobar $* || exit 1
     40$regtool -addprocessedexp -exp_tag $exp_tag2 -filelevel OTA -filter r -airmass 11 -ra 1 -decl 2 -exp_type bias -exp_time 0 -bg 11 -bg_stdev 1 -bg_mean_stdev 11 -alt 11 -az 11 -ccd_temp 45 -posang 11 -object dog -dateobs 2006-10-20T10:10:10Z -label foobar $* || exit 1

  • trunk/ippTools/share/Makefile.am

    r12237 r12259  
    1111        chiptool_queuerawexp.sql \
    1212        chiptool_queuerawimfile.sql \
     13        detselect_search.sql \
     14        detselect_select.sql \
    1315        regtool_find_unprocessed_exp.sql \
    1416        regtool_find_unprocessed_imfile.sql \
    … …  
    1820        regtool_processedimfile.sql \
    1921        warptool_tooverlap.sql
     22

  • trunk/ippTools/share/camtool_find_pendingexp.sql

    r12254 r12259  
    77    rawExp.exp_id,
    88    rawExp.camera,
    9     rawExp.telescope
     9    rawExp.telescope,
     10    rawExp.filelevel
    1011FROM camPendingExp
    1112JOIN chipProcessedExp

  • trunk/ippTools/share/camtool_find_pendingimfile.sql

    r12233 r12259  
    1414        rawExp.exp_id,
    1515        rawExp.camera,
    16         rawExp.telescope
     16        rawExp.telescope,
     17        rawExp.filelevel
    1718    FROM camPendingExp
    1819    JOIN chipProcessedExp

  • trunk/ippTools/share/camtool_find_processedexp.sql

    r12189 r12259  
    11SELECT
    22    camProcessedExp.*,
     3    rawExp.exp_id,
    34    rawExp.camera,
    4     rawExp.workdir
     5    rawExp.telescope,
     6    rawExp.filelevel
    57FROM camProcessedExp
    68JOIN chipProcessedExp

  • trunk/ippTools/share/chiptool_pendingimfile.sql

    r12226 r12259  
    55    rawExp.exp_id,
    66    rawExp.camera,
    7     rawExp.telescope
     7    rawExp.telescope,
     8    rawExp.filelevel
    89FROM chipPendingImfile
    910JOIN chipPendingExp

  • trunk/ippTools/share/chiptool_processedimfile.sql

    r12226 r12259  
    99    rawExp.exp_id,
    1010    rawExp.camera,
    11     rawExp.telescope
     11    rawExp.telescope,
     12    rawExp.filelevel
    1213FROM chipProcessedImfile
    1314JOIN chipProcessedExp

  • trunk/ippTools/share/regtool_processedimfile.sql

    r12086 r12259  
    11SELECT
    2     *
     2    rawImfile.*
     3    rawExp.exp_id,
     4    rawExp.camera,
     5    rawExp.telescope,
     6    rawExp.filelevel,
     7    rawExp.workdir
    38FROM rawImfile
     9JOIN rawExp
     10    USING(exp_tag)
    411-- bogus conditional so there is a where clause to append to
    512WHERE rawImfile.exp_tag is NOT NULL

  • trunk/ippTools/src/detselect.c

    r11856 r12259  
    168168    }
    169169
    170     psString query = psStringCopy(
    171         "SELECT DISTINCT"
    172         "   detRunSummary.det_id,"
    173         "   detRunSummary.iteration"
    174         " FROM detRun"
    175         " JOIN detRunSummary"
    176         "   USING(det_id)"
    177         " WHERE"
    178         "   detRun.state = 'stop'"
    179         "   AND detRun.mode  = 'master'"
    180         "   AND detRunSummary.accept = 1"
    181     );
     170    psString query = pxDataGet("detselect_search.sql");
     171    if (!query) {
     172        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     173        return false;
     174    }
    182175
    183176    if (config->where) {
    … …  
    246239    PS_ASSERT_PTR_NON_NULL(config, false);
    247240
    248     psString query = psStringCopy(
    249         "SELECT DISTINCT"
    250         "   detNormalizedImfile.*"
    251         " FROM detNormalizedImfile"
    252         " JOIN detRun"
    253         "   USING(det_id)"
    254         " JOIN detRunSummary"
    255         "   ON detNormalizedImfile.det_id = detRunSummary.det_id"
    256         "   AND detNormalizedImfile.iteration = detRunSummary.iteration"
    257         " WHERE"
    258         "   detRun.state = 'stop'"
    259         "   AND detRun.mode  = 'master'"
    260         "   AND detRunSummary.accept = 1"
    261     );
     241    psString query = pxDataGet("detselect_select.sql");
     242    if (!query) {
     243        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     244        return false;
     245    }
     246
    262247
    263248    if (config->where) {

  • trunk/ippTools/src/regtool.c

    r12232 r12259  
    203203            }
    204204        }
    205         psString class = psMetadataLookupStr(&status, config->args, "-class");
    206         if (!status) {
    207             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -class");
    208             psFree(query);
    209             return false;
    210         }
    211         if (class) {
    212             if (!psMetadataAddStr(where, PS_LIST_TAIL, "class", 0, "==", class)) {
    213                 psError(PS_ERR_UNKNOWN, false, "failed to add item class");
    214                 psFree(where);
    215                 psFree(query);
    216                 return false;
    217             }
    218         }
     205
    219206        psString class_id = psMetadataLookupStr(&status, config->args, "-class_id");
    220207        if (!status) {
    … …  
    855842    }
    856843
     844    psString filelevel = psMetadataLookupStr(&status, config->args, "-filelevel");
     845    if (!status) {
     846        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filelevel");
     847        return false;
     848    }
     849    if (!filelevel) {
     850        psError(PS_ERR_UNKNOWN, true, "-filelevel is required");
     851        return false;
     852    }
     853
    857854    psString filter = psMetadataLookupStr(&status, config->args, "-filter");
    858855    if (!status) {
    … …  
    932929        return false;
    933930    }
     931
    934932    psTime *dateobs = NULL;
    935933    {
    … …  
    962960        exp_type,
    963961        exp->imfiles,
     962        filelevel,
    964963        exp->workdir,
    965964        filter,
    … …  
    11021101    rawImfileRow *raw = rawImfileRowAlloc(
    11031102        imfile->exp_tag,
    1104         imfile->class,
    11051103        imfile->class_id,
    11061104        imfile->uri,

  • trunk/ippTools/src/regtoolConfig.c

    r12025 r12259  
    6060    psMetadata *addprocessedimfileArgs = psMetadataAlloc();
    6161    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
    62         "search by exposure ID", NULL);
    63     psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class",  0,
    64         "search by class", NULL);
     62        "define exposure ID", NULL);
    6563    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    66         "search by class ID", NULL);
     64        "define class ID", NULL);
    6765    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_type",  0,
    6866        "define exposure type", NULL);
    … …  
    102100    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
    103101        "search by exposure ID", NULL);
    104     psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class",  0,
    105         "search by class", NULL);
    106102    psMetadataAddStr(processedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    107103        "search by class ID", NULL);
    … …  
    117113    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
    118114        "search by exposure ID", NULL);
    119     psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class",  0,
    120         "search by class", NULL);
    121115    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
    122116        "search by class ID", NULL);
    … …  
    148142    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_type",  0,
    149143        "define exposure type", NULL);
     144    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filelevel",  0,
     145        "define the data partitioning level of this file", NULL);
     146    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-workdir",  0,
     147        "define the \"default\" workdir for this exposure", NULL);
    150148    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-filter",  0,
    151149        "define filter ", NULL);
Note: See TracChangeset for help on using the changeset viewer.