IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 18607


Ignore:
Timestamp:
Jul 17, 2008, 3:07:11 PM (18 years ago)
Author:
eugene
Message:

updates from eam_branch_20080706

Location:
trunk/ippTasks
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTasks/camera.pro

    r16318 r18607  
    55# test for required global variables
    66check.globals
    7 
    8 $LOGSUBDIR = $LOGDIR/camera
    9 exec mkdir -p $LOGSUBDIR
    107
    118book init camPendingExp
    … …  
    5148  npending     1
    5249
    53   stdout $LOGSUBDIR/camera.exp.log
    54   stderr $LOGSUBDIR/camera.exp.log
     50  stdout NULL
     51  stderr $LOGDIR/camera.exp.log
    5552
    5653  task.exec
    … …  
    119116    set.host.for.camera $CAMERA FPA
    120117
    121     # raw workdir examples:
     118    # set the WORKDIR variable
     119    set.workdir.by.camera $CAMERA FPA $WORKDIR_TEMPLATE $default_host WORKDIR
     120
     121    # notes on how this works:
     122    # -- raw workdir examples:
    122123    # file://data/@HOST@.0/gpc1/20080130
    123124    # neb:///@HOST@-vol0/gpc1/20080130 (need to supply volname?, or are we re-defining this each time?)
    124     set.workdir.by.camera $CAMERA FPA $WORKDIR_TEMPLATE $default_host WORKDIR
    125     # out workdir examples:
     125    # -- out workdir examples:
    126126    # file://data/ipp004.0/gpc1/20080130
    127127    # neb:///ipp004-vol0/gpc1/20080130
    … …  
    130130    sprintf outroot "%s/%s/%s.cm.%s" $WORKDIR $EXP_TAG $EXP_TAG $CAM_ID
    131131
    132     ## generate output log based on filerule (convert the URI to a PATH)
    133     $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id NONE --basename $outroot`
    134     if ("$logfile" == "")
    135       echo "WARNING: logfile not defined in camera.pro:146"
    136       break
    137     end
     132    stdout $LOGDIR/camera.exp.log
     133    stderr $LOGDIR/camera.exp.log
    138134
    139     stdout $logfile
    140     stderr $logfile
    141 
    142     $run = camera_exp.pl --exp_tag $EXP_TAG --cam_id $CAM_ID --camera $CAMERA --outroot $outroot
     135    $run = camera_exp.pl --exp_tag $EXP_TAG --cam_id $CAM_ID --camera $CAMERA --outroot $outroot --redirect-output
    143136    if ("$REDUCTION" != "NULL")
    144137      $run = $run --reduction $REDUCTION

  • trunk/ippTasks/chip.pro

    r18363 r18607  
    151151    stderr $LOGDIR/chip.imfile.log
    152152
    153     $run = chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --uri $URI --camera $CAMERA --outroot $outroot
     153    $run = chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --uri $URI --camera $CAMERA --outroot $outroot --redirect-output
    154154    if ("$REDUCTION" != "NULL")
    155155      $run = $run --reduction $REDUCTION

  • trunk/ippTasks/detrend.norm.pro

    r18568 r18607  
    151151    sprintf outroot "%s/%s.%s.%s/%s.%s.normstat.%s.%s" $WORKDIR $CAMERA $DET_TYPE $DET_ID $CAMERA $DET_TYPE $DET_ID $ITERATION
    152152
    153     ## generate output log
    154     $logfile = `ipp_filename.pl --touch --filerule LOG.EXP --camera $CAMERA --class_id NONE --basename $outroot`
    155 
    156     stdout $logfile
    157     stderr $logfile
    158     dirname $logfile -var outpath
    159     mkdir $outpath
    160 
    161     $run = detrend_norm_calc.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE --outroot $outroot
     153    stdout $LOGDIR/detrend.normstat.log
     154    stderr $LOGDIR/detrend.normstat.log
     155
     156    $run = detrend_norm_calc.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE --outroot $outroot --redirect-output
    162157    add_standard_args run
    163158
    … …  
    379374    sprintf outroot "%s/%s.%s.%s/%s.%s.normexp.%s.%s" $WORKDIR $CAMERA $DET_TYPE $DET_ID $CAMERA $DET_TYPE $DET_ID $ITERATION
    380375
    381     ## generate output log (NOT based on filerule?)
    382     $logfile = `ipp_filename.pl --touch --filerule LOG.EXP --camera $CAMERA --class_id NONE --basename $outroot`
    383 
    384     stdout $logfile
    385     stderr $logfile
    386     dirname $logfile -var outpath
    387     mkdir $outpath
     376    stdout $LOGDIR/detrend.norm.run.log
     377    stderr $LOGDIR/detrend.norm.run.log
    388378
    389379    $run = detrend_norm_exp.pl --det_id $DET_ID --iteration $ITERATION --camera $CAMERA --det_type $DET_TYPE  --outroot $outroot

  • trunk/ippTasks/detrend.reject.pro

    r17699 r18607  
    55# test for required global variables
    66check.globals
    7 
    8 $LOGSUBDIR = $LOGDIR/detrend
    9 exec mkdir -p $LOGSUBDIR
    107
    118book init detRejectExp
    … …  
    5249
    5350  stdout NULL
    54   stderr $LOGSUBDIR/detrend.reject.log
     51  stderr $LOGDIR/detrend.reject.log
    5552
    5653  task.exec
    … …  
    123120    sprintf outroot "%s/%s.%s.%s/%s.%s.%s.%s.detreject" $WORKDIR $CAMERA $DET_TYPE $DET_ID $CAMERA $DET_TYPE $DET_ID $ITERATION
    124121
    125     ## generate output log based on filerule (convert the URI to a PATH)
    126     $logfile = `ipp_filename.pl --touch --filerule LOG.EXP --camera $CAMERA --class_id NONE --basename $outroot`
    127     if ("$logfile" == "")
    128       echo "WARNING: logfile not defined in detrend.reject.pro:282"
    129       break
    130     end
     122    stdout $LOGDIR/detrend.reject.log
     123    stderr $LOGDIR/detrend.reject.log
    131124
    132     stdout $logfile
    133     stderr $logfile
    134     dirname $logfile -var outpath
    135     mkdir $outpath
    136 
    137     $run = detrend_reject_exp.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE --camera $CAMERA --outroot $outroot
     125    $run = detrend_reject_exp.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE --camera $CAMERA --outroot $outroot --redirect-output
    138126    add_standard_args run
    139127

  • trunk/ippTasks/fake.pro

    r18020 r18607  
    55# test for required global variables
    66check.globals
    7 
    8 $LOGSUBDIR = $LOGDIR/fake
    9 exec mkdir -p $LOGSUBDIR
    107
    118book init fakePendingImfile
    … …  
    5249
    5350  stdout NULL
    54   stderr $LOGSUBDIR/fake.imfile.log
     51  stderr $LOGDIR/fake.imfile.log
    5552
    5653  task.exec
    … …  
    126123    sprintf outroot "%s/%s/%s.fk.%s" $WORKDIR $EXP_TAG $EXP_TAG $FAKE_ID
    127124
    128     ## generate output log based on filerule (convert the URI to a PATH)
    129     $logfile = `ipp_filename.pl --filerule LOG.IMFILE --camera $CAMERA --class_id $CLASS_ID --basename $outroot`
    130     if ("$logfile" == "")
    131       echo "WARNING: logfile not defined in fake.pro:152"
    132       break
    133     end
    134 
    135     stdout $logfile
    136     stderr $logfile
    137     dirname $logfile -var outpath
    138     mkdir $outpath
     125    stderr $LOGDIR/fake.imfile.log
     126    stderr $LOGDIR/fake.imfile.log
    139127
    140128    $run = fake_imfile.pl --exp_id $EXP_ID --fake_id $FAKE_ID --class_id $CLASS_ID --chiproot=$CHIPROOT --camroot=$CAMROOT --camera $CAMERA --outroot $outroot

  • trunk/ippTasks/register.pro

    r17966 r18607  
    159159    stderr $LOGDIR/register.imfile.run.log
    160160
     161    # XXX register_imfile.pl differs from the standard script : it does not have an 'outroot' argument, and it does not take '--redirect'
    161162    $run = register_imfile.pl --exp_id $EXP_ID --tmp_class_id $TMP_CLASS_ID --tmp_exp_name $TMP_EXP_NAME --uri $URI --logfile $logfile
    162163    add_standard_args run

  • trunk/ippTasks/warp.pro

    r18057 r18607  
    88### Setups
    99check.globals
    10 
    11 $LOGSUBDIR = $LOGDIR/warp
    12 exec mkdir -p $LOGSUBDIR
    1310
    1411### Initialise the books containing the tasks to do
    … …  
    7572
    7673  stdout NULL
    77   stderr $LOGSUBDIR/warp.exp.log
     74  stderr $LOGDIR/warp.exp.log
    7875
    7976  task.exec
    … …  
    142139    set.workdir.by.camera $CAMERA $WARP_ID $WORKDIR_TEMPLATE $default_host WORKDIR
    143140
    144     sprintf outroot "%s/%s/%s.wrp.%s" $WORKDIR $EXP_ID $EXP_ID $WARP_ID
    145 
    146     ## generate output log based on filerule (convert the URI to a PATH)
    147     $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $WARP_ID --basename $outroot`
    148 
    149     stdout $logfile
    150     stderr $logfile
    151     dirname $logfile -var outpath
    152     mkdir $outpath
    153 
    154     $run = warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --tess_dir $TESS_DIR
     141    ## generate outroot specific to this exposure
     142    sprintf logfile "%s/%s/%s.wrp.%s.log" $WORKDIR $EXP_ID $EXP_ID $WARP_ID
     143
     144    stdout $LOGDIR/warp.exp.log
     145    stderr $LOGDIR/warp.exp.log
     146
     147    # XXX warp_overlap.pl differs from the standard script : it does not have an 'outroot' argument, and it does not take '--redirect'
     148    $run = warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --tess_dir $TESS_DIR --logfile $logfile
    155149    add_standard_args run
    156150
    … …  
    189183
    190184  stdout NULL
    191   stderr $LOGSUBDIR/warp.skycell.log
     185  stderr $LOGDIR/warp.skycell.log
    192186
    193187  task.exec
    … …  
    261255    sprintf outroot "%s/%s/%s/%s.%s.wrp.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $WARP_ID
    262256
    263     ## generate output log based on filerule (convert the URI to a PATH)
    264     $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $WARP_ID --basename $outroot`
    265 
    266     stdout $logfile
    267     stderr $logfile
    268     dirname $logfile -var outpath
    269     mkdir $outpath
    270 
    271     $run = warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_dir $TESS_DIR --camera $CAMERA --outroot $outroot
     257    stdout $LOGDIR/warp.skycell.log
     258    stderr $LOGDIR/warp.skycell.log
     259
     260    $run = warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_dir $TESS_DIR --camera $CAMERA --outroot $outroot --redirect-output
    272261    add_standard_args run
    273262
Note: See TracChangeset for help on using the changeset viewer.