IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16743


Ignore:
Timestamp:
Feb 28, 2008, 4:26:54 PM (18 years ago)
Author:
Paul Price
Message:

Updating warp, stack, diff to give the outroot instead of workdir to scripts.

Location:
trunk/ippTasks
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTasks/diff.pro

    r16300 r16743  
    115115    book setword diffSkyfile $pageName pantaskState RUN
    116116    book getword diffSkyfile $pageName diff_id -var DIFF_ID
    117     book getword diffSkyfile $pageName workdir -var WORKDIR
     117    book getword diffSkyfile $pageName workdir -var WORKDIR_TEMPLATE
    118118    book getword diffSkyfile $pageName dbname -var DBNAME
    119119
    120     # specify choice of remote host
    121     # XXX need to choose based on diffs
    122     if ($PARALLEL)
    123       host anyhost
    124     else
    125       host local
    126     end
     120    ### XXX Instead of setting these by camera, need to set by skycell_id
     121    set.host.for.camera $CAMERA $DIFF_ID
     122    set.workdir.by.camera $CAMERA $DIFF_ID $WORKDIR_TEMPLATE $default_host WORKDIR
    127123
    128     ## generate output log based on filerule
    129     if ("$WORKDIR" == "NULL")
    130       $outroot = `pwd`
    131     else
    132       $outroot = `ipp_datapath.pl $WORKDIR`
    133     end
    134     sprintf outroot "%s/diff.%s" $outroot $DIFF_ID
    135     sprintf logfile "%s/skycell.log" $outroot
     124    sprintf outroot "%s/tess_%s/%s/%s.%s.dif.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $DIFF_ID
     125
     126    ## generate output log based on filerule (convert the URI to a PATH)
     127    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $STACK_ID --basename $outroot`
     128
    136129    stdout $logfile
    137130    stderr $logfile
    138     exec mkdir -p $outroot
     131    dirname $logfile -var outpath
     132    mkdir $outpath
    139133
    140     $run = diff_skycell.pl --diff_id $DIFF_ID
    141     if ("$WORKDIR" != "NULL")
    142       $run = $run --workdir $WORKDIR
    143     end
     134    $run = diff_skycell.pl --diff_id $DIFF_ID --outroot $outroot
    144135    add_standard_args run
    145136

  • trunk/ippTasks/stack.pro

    r16300 r16743  
    115115    book setword stackSumSkyfile $pageName pantaskState RUN
    116116    book getword stackSumSkyfile $pageName stack_id -var STACK_ID
    117     book getword stackSumSkyfile $pageName workdir -var WORKDIR
     117    book getword stackSumSkyfile $pageName workdir -var WORKDIR_TEMPLATE
    118118    book getword stackSumSkyfile $pageName dbname -var DBNAME
    119119
    120     # specify choice of remote host
    121     # XXX need to choose based on stacks
    122     if ($PARALLEL)
    123       host anyhost
    124     else
    125       host local
    126     end
     120    ### XXX Instead of setting these by camera, need to set by skycell_id
     121    set.host.for.camera $CAMERA $STACK_ID
     122    set.workdir.by.camera $CAMERA $STACK_ID $WORKDIR_TEMPLATE $default_host WORKDIR
    127123
    128     ## generate output log based on filerule
    129     if ("$WORKDIR" == "NULL")
    130       $outroot = `pwd`
    131     else
    132       $outroot = `ipp_datapath.pl $WORKDIR`
    133     end
    134     sprintf outroot "%s/stack.%s" $outroot $STACK_ID
    135     sprintf logfile "%s/skycell.log" $outroot
     124    sprintf outroot "%s/tess_%s/%s/%s.%s.stk.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $STACK_ID
     125
     126    ## generate output log based on filerule (convert the URI to a PATH)
     127    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $STACK_ID --basename $outroot`
     128
    136129    stdout $logfile
    137130    stderr $logfile
    138     exec mkdir -p $outroot
     131    dirname $logfile -var outpath
     132    mkdir $outpath
    139133
    140     $run = stack_skycell.pl --stack_id $STACK_ID
    141     if ("$WORKDIR" != "NULL")
    142       $run = $run --workdir $WORKDIR
    143     end
     134    $run = stack_skycell.pl --stack_id $STACK_ID --outroot $outroot
    144135    add_standard_args run
    145136

  • trunk/ippTasks/warp.pro

    r16333 r16743  
    132132    book getword warpInputExp $pageName warp_id -var WARP_ID
    133133    book getword warpInputExp $pageName camera -var CAMERA
    134     book getword warpInputExp $pageName workdir -var WORKDIR
     134    book getword warpInputExp $pageName workdir -var WORKDIR_TEMPLATE
    135135    book getword warpInputExp $pageName dbname -var DBNAM
    136136    book getword warpInputExp $pageName tess_id -var TESS_ID
    137 
    138     # specify choice of remote host
    139     # XXX need to choose based on warps
    140     if ($PARALLEL)
    141       host anyhost
    142     else
    143       host local
    144     end
    145 
    146     ## generate output log based on filerule
    147     if ("$WORKDIR" == "NULL")
    148       $outroot = `pwd`
    149     else
    150       $outroot = `ipp_datapath.pl $WORKDIR`
    151     end
    152     sprintf outroot "%s/warp.%s" $outroot $WARP_ID
    153     sprintf logfile "%s/overlap.log" $outroot
     137    book getword warpInputExp $pageName exp_id -var EXP_ID
     138
     139    ### XXX Instead of setting these by camera, need to set by skycell_id
     140    set.host.for.camera $CAMERA $WARP_ID
     141    set.workdir.by.camera $CAMERA $WARP_ID $WORKDIR_TEMPLATE $default_host WORKDIR
     142
     143    sprintf outroot "%s/%s/%s.wrp.%s" $WORKDIR $EXP_ID $EXP_ID $WARP_ID
     144
     145    ## generate output log based on filerule (convert the URI to a PATH)
     146    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $WARP_ID --basename $outroot`
     147
    154148    stdout $logfile
    155149    stderr $logfile
    156     exec mkdir -p $outroot
     150    dirname $logfile -var outpath
     151    mkdir $outpath
    157152
    158153    $run = warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --tess_id $TESS_ID
    159     if ("$WORKDIR" != "NULL")
    160       $run = $run --workdir $WORKDIR
    161     end
    162154    add_standard_args run
    163155
    … …  
    255247    book getword warpPendingSkyCell $pageName tess_id -var TESS_ID
    256248    book getword warpPendingSkyCell $pageName camera -var CAMERA
    257     book getword warpPendingSkyCell $pageName workdir -var WORKDIR
     249    book getword warpPendingSkyCell $pageName workdir -var WORKDIR_TEMPLATE
    258250    book getword warpPendingSkyCell $pageName dbname -var DBNAME
    259251
    260     # specify choice of remote host
    261     # XXX need to choose based on warps
    262     if ($PARALLEL)
    263       host anyhost
    264     else
    265       host local
    266     end
    267 
    268     ## generate output log based on filerule
    269     if ("$WORKDIR" == "NULL")
    270       $outroot = `pwd`
    271     else
    272       $outroot = `ipp_datapath.pl $WORKDIR`
    273     end
    274     sprintf outroot "%s/warp.%s" $outroot $WARP_ID
    275     sprintf logfile "%s/skycell.log" $outroot
     252    ### XXX Instead of setting these by camera, need to set by skycell_id
     253    set.host.for.camera $CAMERA $WARP_ID
     254    set.workdir.by.camera $CAMERA $WARP_ID $WORKDIR_TEMPLATE $default_host WORKDIR
     255
     256    sprintf outroot "%s/tess_%s/%s/%s.%s.wrp.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $WARP_ID
     257
     258    ## generate output log based on filerule (convert the URI to a PATH)
     259    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $WARP_ID --basename $outroot`
     260
    276261    stdout $logfile
    277262    stderr $logfile
    278     exec mkdir -p $outroot
    279 
    280     $run = warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_id $TESS_ID --camera $CAMERA
    281     if ("$WORKDIR" != "NULL")
    282       $run = $run --workdir $WORKDIR
    283     end
     263    dirname $logfile -var outpath
     264    mkdir $outpath
     265
     266    $run = warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_id $TESS_ID --camera $CAMERA --outroot $outroot
    284267    add_standard_args run
    285268
Note: See TracChangeset for help on using the changeset viewer.