IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 11360 for trunk/ippTasks


Ignore:
Timestamp:
Jan 29, 2007, 7:37:37 AM (19 years ago)
Author:
eugene
Message:

update workdir and outroot names

Location:
trunk/ippTasks
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTasks/detrend.norm.pro

    r11346 r11360  
    2323book init detPendingNormImfile
    2424book init detPendingNormExp
     25
     26macro detnorm.reset
     27  book init detPendingNormStatImfile
     28  book init detPendingNormImfile
     29  book init detPendingNormExp
     30end
    2531
    2632macro detnorm.status
    … …  
    120126    # XXX use ipp_filename.pl to lookup output file names
    121127    $outroot = `ipp_datapath.pl $WORKDIR`
    122     $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
     128    $outroot = $outroot/$CAMERA.$DET_TYPE.$DET_ID
     129    $logfile = $outroot/$CAMERA.$DET_TYPE.reject.$DET_ID.$ITERATION.log
    123130    stdout $logfile
    124131    stderr $logfile
    … …  
    234241    # XXX use ipp_filename.pl to lookup output file names
    235242    $outroot = `ipp_datapath.pl $WORKDIR`
     243    $outroot = $outroot/$CAMERA.$DET_TYPE.$DET_ID
    236244    $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
    237245    stdout $logfile
    … …  
    345353    # XXX add $WORKDIR/$LOG_DIR
    346354    $outroot = `ipp_datapath.pl $WORKDIR`
     355    $outroot = $outroot/$CAMERA.$DET_TYPE.$DET_ID
    347356    $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
    348357    stdout $logfile

  • trunk/ippTasks/detrend.process.pro

    r11346 r11360  
    2323book init detPendingProcessedExp
    2424
     25macro detproc.reset
     26  book init detPendingProcessedImfile
     27  book init detPendingProcessedExp
     28end
     29
    2530macro detproc.status
     31  echo detPendingProcessedImfile
    2632  book listbook detPendingProcessedImfile
     33  echo detPendingProcessedExp
    2734  book listbook detPendingProcessedExp
    2835end
    … …  
    117124    end
    118125
    119     ## generate output log based on filerule
     126    ## output log filename
    120127    $outroot = `ipp_datapath.pl $WORKDIR`
    121128    $outroot = $outroot/$EXP_TAG
    122     $logfile = $outroot/$EXP_TAG.$CLASS_ID.detproc.$DET_ID.log
     129    $logfile = $outroot/$EXP_TAG.detproc.$DET_ID.$CLASS_ID.log
    123130    stdout $logfile
    124131    stderr $logfile
    … …  
    213220    if ($pageName == NULL) break
    214221
     222    # XXX is ITERATION relevant here??
    215223    book setword detPendingProcessedExp $pageName state RUN
    216224    book getword detPendingProcessedExp $pageName det_id    -var DET_ID

  • trunk/ippTasks/detrend.reject.pro

    r11346 r11360  
    2121
    2222book init detRejectExp
     23
     24macro detreject.reset
     25  book init detRejectExp
     26end
    2327
    2428macro detreject.status
    … …  
    101105    book getword detRejectExp $pageName mode      -var MODE     
    102106    book getword detRejectExp $pageName camera    -var CAMERA   
    103     book getword detRejectExp $pageName workdir   -var WORKDIR
     107    # book getword detRejectExp $pageName workdir   -var WORKDIR
     108    # XXX workdir is not being returned here
     109    $WORKDIR = NONE
    104110    book getword detRejectExp $pageName dbname    -var DBNAME
    105111    set_standard_args
    … …  
    114120    # I'd like to add CAMERA to the log file...
    115121    $outroot = `ipp_datapath.pl $WORKDIR`
    116     $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.log
     122    $outroot = $outroot/$CAMERA.$DET_TYPE.$DET_ID
     123    $logfile = $outroot/$CAMERA.$DET_TYPE.reject.$DET_ID.$ITERATION.log
    117124    stdout $logfile
    118125    stderr $logfile

  • trunk/ippTasks/detrend.resid.pro

    r11346 r11360  
    2222book init detPendingResidImfile
    2323book init detPendingResidExp
     24
     25macro detresid.reset
     26  book init detPendingResidImfile
     27  book init detPendingResidExp
     28end
    2429
    2530macro detresid.status
    … …  
    122127    $outroot = `ipp_datapath.pl $WORKDIR`
    123128    $outroot = $outroot/$EXP_TAG
    124     $logfile = $outroot/$EXP_TAG.$CLASS_ID.detresid.$DET_ID.$ITERATION.log
     129    $logfile = $outroot/$EXP_TAG.detresid.$DET_ID.$ITERATION.$CLASS_ID.log
    125130    stdout $logfile
    126131    stderr $logfile

  • trunk/ippTasks/detrend.stack.pro

    r11346 r11360  
    2222book init detPendingStackedImfile
    2323
     24macro detstack.reset
     25  book init detPendingStackedImfile
     26end
     27
    2428macro detstack.status
     29  echo detPendingStackedImfile
    2530  book listbook detPendingStackedImfile
    2631end
    … …  
    115120    # XXX use ipp_filename.pl to lookup output file names
    116121    $outroot = `ipp_datapath.pl $WORKDIR`
    117     $outroot = $outroot/$EXP_TAG
    118     $logfile = $outroot/$CAMERA.$DET_TYPE.$DET_ID.$ITERATION.$CLASS_ID.log
     122    $outroot = $outroot/$CAMERA.$DET_TYPE.$DET_ID
     123    $logfile = $outroot/$CAMERA.$DET_TYPE.stack.$DET_ID.$ITERATION.$CLASS_ID.log
    119124    stdout $logfile
    120125    stderr $logfile
Note: See TracChangeset for help on using the changeset viewer.