IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 11138


Ignore:
Timestamp:
Jan 18, 2007, 2:15:22 PM (19 years ago)
Author:
jhoblitt
Message:

add basic workdir support

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippScripts/scripts/inject.pl

    r11110 r11138  
    6969    }
    7070   
    71     my $command_exp = "$pxinject -newExp -exp_id $exp -inst $instrument -telescope $telescope -exp_type $type -imfiles 1 -outroot $outroot" ; # Command to run
     71    my $command_exp = "$pxinject -newExp -exp_id $exp -inst $instrument -telescope $telescope -exp_type $type -imfiles 1 -workdir $outroot" ; # Command to run
    7272
    7373    my ( $success_exp, $error_code_exp, $full_buf_exp, $stdout_buf_exp, $stderr_buf_exp ) =

  • trunk/ippTools/configure.ac

    r11076 r11138  
    1616PKG_CHECK_MODULES([PSLIB], [pslib >= 0.12.99])
    1717PKG_CHECK_MODULES([PSMODULES], [psmodules >= 0.12.0])
    18 PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.74])
     18PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.76])
    1919
    2020dnl check for PSDB support

  • trunk/ippTools/scripts/dettest.sh

    r10962 r11138  
    88
    99#dettool -definebyquery -det_type flat -exp_type fooflat -filter foo -airmass 10 -exp_time 30.0 -ccd_temp 100 -posang 360 -object iobject || exit 1
    10 det_id=`dettool -definebyquery -det_type flat -exp_type fooflat -filter foo -airmass 10 -exp_time 30.0 -object iobject -simple | cut -f1 -d" "` || exit 1
     10det_id=`dettool -definebyquery -det_type flat -exp_type fooflat -filter foo -airmass 10 -exp_time 30.0 -object iobject -workdir file::///some/path -simple | cut -f1 -d" "` || exit 1
    1111
    1212dettool -raw || exit 1

  • trunk/ippTools/scripts/regtest.sh

    r11044 r11138  
    88echo -e "YES\nipp\n\n" | pxadmin -recreate || exit 1
    99
    10 exp_tag1=`$inject -newExp -exp_id t10 -inst gpc -telescope ps1 -exp_type object -imfiles 4 -simple` || exit 1
     10exp_tag1=`$inject -newExp -exp_id t10 -inst gpc -telescope ps1 -exp_type object -imfiles 4 -workdir file::///some/path -simple` || exit 1
    1111
    1212for ID in `seq 0 3`; do
    … …  
    1414done;
    1515
    16 exp_tag2=`$inject -newExp -exp_id t11 -inst gpc -telescope ps1 -exp_type object -imfiles 4 -simple` || exit 1
     16exp_tag2=`$inject -newExp -exp_id t11 -inst gpc -telescope ps1 -exp_type object -imfiles 4 -workdir file::///some/path -simple` || exit 1
    1717
    1818for ID in `seq 0 3`; do
    … …  
    2020done;
    2121
     22$p0tool -pendingimfile || exit 1
     23
    2224for ID in `seq 0 3`; do
    2325    $p0tool -addprocessedimfile -exp_tag $exp_tag1 -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
    2426done;
    2527
     28$p0tool -pendingexp|| exit 1
     29
    2630$p0tool -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
     31
     32$p0tool -pendingimfile || exit 1
    2733
    2834for ID in `seq 0 3`; do
    … …  
    3036done;
    3137
     38$p0tool -pendingexp|| exit 1
     39
    3240$p0tool -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

  • trunk/ippTools/src/camtool.c

    r11075 r11138  
    9191            "SELECT"
    9292            "   p3PendingExp.*,"
    93             "   rawExp.camera"
     93            "   rawExp.camera,"
     94            "   rawExp.workdir"
    9495            " FROM p3PendingExp"
    9596            " JOIN rawExp"
    … …  
    165166            "SELECT"
    166167            "   p2ProcessedImfile.*,"
    167             "   rawExp.camera"   
     168            "   rawExp.camera,"   
     169            "   rawExp.workdir"   
    168170            " FROM p3PendingExp"
    169171            " JOIN rawExp"
    … …  
    467469            "SELECT"
    468470            "   p3ProcessedExp.*,"
    469             "   rawExp.camera"
     471            "   rawExp.camera,"
     472            "   rawExp.workdir"
    470473            " FROM p3ProcessedExp"
    471474            " JOIN rawExp"

  • trunk/ippTools/src/chiptool.c

    r11075 r11138  
    9999            "SELECT"
    100100            "   p2PendingImfile.*,"
    101             "   rawExp.camera"
     101            "   rawExp.camera,"
     102            "   rawExp.workdir"
    102103            " FROM p2PendingImfile"
    103104            " JOIN p2PendingExp"
    … …  
    353354            "SELECT"
    354355            "   p2ProcessedImfile.*,"
    355             "   rawExp.camera"
     356            "   rawExp.camera,"
     357            "   rawExp.workdir"
    356358            " FROM p2ProcessedImfile"
    357359            " JOIN rawExp"

  • trunk/ippTools/src/dettool.c

    r11110 r11138  
    234234    }
    235235
     236    psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
     237    if (!status) {
     238        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
     239        return false;
     240    }
     241    if (!workdir) {
     242        psError(PS_ERR_UNKNOWN, true, "-workdir is required");
     243        return false;
     244    }
     245
    236246    // optional
    237247    psString mode = psMetadataLookupStr(&status, config->args, "-mode");
    … …  
    421431            "run",
    422432            exp_type,
     433            workdir,
    423434            filter,
    424435            airmass,
    … …  
    551562    if (!det_type) {
    552563        psError(PS_ERR_UNKNOWN, true, "-det_type is required");
     564        return false;
     565    }
     566
     567    psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
     568    if (!status) {
     569        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
     570        return false;
     571    }
     572    if (!workdir) {
     573        psError(PS_ERR_UNKNOWN, true, "-workdir is required");
    553574        return false;
    554575    }
    … …  
    859880            "run",
    860881            exp_type,
     882            workdir,
    861883            filter,
    862884            airmass,
    … …  
    14931515            "   detRun.det_id,"
    14941516            "   detRun.det_type,"
     1517            "   detRun.workdir,"
    14951518            "   rawImfile.*,"
    14961519            "   rawExp.camera"
    … …  
    17911814        "    det_type,"
    17921815        "    exp_tag,"
    1793         "    camera"
     1816        "    camera,"
     1817        "    workdir"
    17941818        " FROM"
    17951819        " (SELECT DISTINCT"
    … …  
    17971821        "    detRun.iteration,"
    17981822        "    detRun.det_type,"
     1823        "    detRun.workdir,"
    17991824        "    detProcessedImfile.exp_tag,"
    18001825        "    rawExp.camera,"
    … …  
    21582183        "    detRun.iteration,"
    21592184        "    detRun.det_type,"
     2185        "    detRun.workdir,"
    21602186        "    detProcessedImfile.class_id,"
    21612187        "    rawExp.camera"
    … …  
    26192645        "   det_type,"
    26202646        "   iteration,"
    2621         "   camera"
     2647        "   camera,"
     2648        "   workdir"
    26222649        " FROM"
    26232650        "(SELECT DISTINCT"
    … …  
    26252652        "   detRun.det_type,"
    26262653        "   detRun.iteration,"
     2654        "   detRun.workdir,"
    26272655        "   rawExp.camera,"
    26282656        "   rawExp.imfiles,"
    … …  
    28502878        "SELECT DISTINCT"
    28512879        "   detRun.det_type,"
     2880        "   detRun.workdir,"
    28522881        "   rawExp.camera,"
    28532882        "   detStackedImfile.uri,"
    … …  
    31803209        "    detRun.iteration,"
    31813210        "    detRun.det_type,"
     3211        "    detRun.workdir,"
    31823212        "    rawExp.camera,"
    31833213        "    rawExp.telescope,"
    … …  
    36183648        "   detRun.det_type,\n"
    36193649        "   detRun.mode,\n"
     3650        "   detRun.workdir,\n"
    36203651        "   detProcessedImfile.exp_tag,\n"
    36213652        "   detProcessedImfile.class_id,\n"
    … …  
    36533684        "   detRun.det_type,\n"
    36543685        "   detRun.mode,\n"
     3686        "   detRun.workdir,\n"
    36553687        "   rawImfile.exp_tag,\n"
    36563688        "   rawImfile.class_id,\n"
    … …  
    42644296        "   include,\n"
    42654297        "   camera\n"
     4298        "   workdir\n"
    42664299        " FROM\n"
    42674300        "   (SELECT DISTINCT\n"
    … …  
    42704303        "       detRun.det_type,\n"
    42714304        "       detRun.mode,\n"
     4305        "       detRun.workdir,\n"
    42724306        "       detInputExp.exp_tag,\n"
    42734307        "       detInputExp.include,\n"
    … …  
    57045738    }
    57055739
     5740    psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
     5741    if (!status) {
     5742        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
     5743        return false;
     5744    }
     5745    if (!workdir) {
     5746        psError(PS_ERR_UNKNOWN, true, "-workdir is required");
     5747        return false;
     5748    }
     5749
    57065750    // everything else is optional
    57075751    psString mode = psMetadataLookupStr(&status, config->args, "-mode");
    … …  
    58335877            "reg",
    58345878            exp_type,
     5879            workdir,
    58355880            filter,
    58365881            airmass,

  • trunk/ippTools/src/dettoolConfig.c

    r11089 r11138  
    7474    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-exp_type",  0,
    7575            "define exposure type", NULL);
     76    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-workdir",  0,
     77            "define workdir (required)", NULL);
    7678    psMetadataAddStr(definebytagArgs, PS_LIST_TAIL, "-filter",  0,
    7779            "define filter ", NULL);
    … …  
    103105    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_type",  0,
    104106            "define exposure type", NULL);
     107    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir",  0,
     108            "define workdir (required)", NULL);
    105109    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter",  0,
    106110            "define filter ", NULL);
    … …  
    150154    psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_exp_type",  0,
    151155            "define exposure type", NULL);
     156    psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_workdir",  0,
     157            "define workdir", NULL);
    152158    psMetadataAddStr(definebydetrunArgs, PS_LIST_TAIL, "-set_filter",  0,
    153159            "define filter ", NULL);
    … …  
    651657    psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-exp_type",  0,
    652658            "define exposure type", NULL);
     659    psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-workdir",  0,
     660            "define workdir (required)", NULL);
    653661    psMetadataAddStr(register_detrendArgs, PS_LIST_TAIL, "-filter",  0,
    654662            "define filter ", NULL);

  • trunk/ippTools/src/pxinject.c

    r11047 r11138  
    116116    if (!imfiles) {
    117117        psError(PS_ERR_UNKNOWN, true, "-imfiles is required");
     118        return false;
     119    }
     120
     121    psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
     122    if (!status) {
     123        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
     124        return false;
     125    }
     126    if (!workdir) {
     127        psError(PS_ERR_UNKNOWN, true, "-workdir is required");
    118128        return false;
    119129    }
    … …  
    148158                dateobs,
    149159                exp_type,
    150                 imfiles
     160                imfiles,
     161                workdir
    151162            )
    152163        ) {

  • trunk/ippTools/src/pxinjectConfig.c

    r11089 r11138  
    5656    psMetadataAddS32(newExpArgs, PS_LIST_TAIL, "-imfiles",  0,
    5757        "define the number of imfiles in this exp (required)", 0);
     58    psMetadataAddStr(newExpArgs, PS_LIST_TAIL, "-workdir",  0,
     59        "define workdir (required)", 0);
    5860    psMetadataAddBool(newExpArgs, PS_LIST_TAIL, "-simple",  0,
    5961        "use the simple output format", false);

  • trunk/ippTools/src/regtool.c

    r11080 r11138  
    113113    psString query = psStringCopy(
    114114        "SELECT\n"
    115         "   newImfile.*\n"
     115        "   newImfile.*,\n"
     116        "   newExp.workdir\n"
    116117        " FROM newImfile\n"
    117118        " LEFT JOIN newExp\n"
    … …  
    10141015    rawExpRow *raw = rawExpRowAlloc(
    10151016        exp->exp_tag,
     1017        exp->exp_id,
    10161018        exp->camera,
    10171019        exp->telescope,
     1020        dateobs,
    10181021        exp_type,
    10191022        exp->imfiles,
     1023        exp->workdir,
    10201024        filter,
    10211025        airmass,
    … …  
    10311035        posang,
    10321036        object,
    1033         dateobs,
    10341037        code
    10351038    );

  • trunk/ippTools/src/warptool.c

    r10772 r11138  
    104104    }
    105105
     106    psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
     107    if (!status) {
     108        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
     109        return false;
     110    }
     111    if (!workdir) {
     112        psError(PS_ERR_UNKNOWN, true, "-workdir is required");
     113        return false;
     114    }
     115
    106116    psString filter = psMetadataLookupStr(&status, config->args, "-filter");
    107117    if (!status) {
    … …  
    188198            survey_mode,
    189199            "run",
     200            workdir,
    190201            filter,
    191202            skycell_id,
    … …  
    292303        " SELECT DISTINCT"
    293304        "   p4InputImfile.p4_id,"
    294         "   p2ProcessedImfile.*"
     305        "   p2ProcessedImfile.*,"
     306        "   p4Run.workdir"
    295307        " FROM p4Run"
    296308        " JOIN p4InputImfile"
    … …  
    507519    psString query = psStringCopy(
    508520        " SELECT DISTINCT"
    509         "   p4WarpedImfile.*"
     521        "   p4WarpedImfile.*,"
     522        "   p4Run.workdir"
    510523        " FROM p4Run"
    511524        " JOIN p4WarpedImfile"
    … …  
    695708        " SELECT DISTINCT"
    696709        "   p4StackedImfile.*,"
    697         "   p4WarpedImfile.uri as warped_uri"
     710        "   p4WarpedImfile.uri as warped_uri,"
     711        "   p4Run.workdir"
    698712        " FROM p4Run"
    699713        " JOIN p4StackedImfile"

  • trunk/ippTools/src/warptoolConfig.c

    r11089 r11138  
    5050    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-survey_mode", 0,
    5151            "define the type of suvery (required)", NULL);
     52    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0,
     53            "define workdir (required)", NULL);
    5254    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-filter",  0,
    5355            "define filter (required)", NULL);
Note: See TracChangeset for help on using the changeset viewer.