IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10723 for trunk/ippTasks


Ignore:
Timestamp:
Dec 14, 2006, 8:11:35 AM (20 years ago)
Author:
eugene
Message:

fixed for -limits and failure,timeout reporting

Location:
trunk/ippTasks
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ippTasks/detrend.norm.pro

    r10692 r10723  
    5454
    5555  task.exec
    56     command      dettool -tonormalizedstat -simple -limit {$DetrendNormStatFail + 20}
     56    # command      dettool -tonormalizedstat -simple -limit {$DetrendNormStatFail + 20}
     57    command      dettool -tonormalizedstat -simple
    5758  end
    5859
     
    8687  # default exit status
    8788  task.exit    default
    88     if ($VERBOSE)
    89       echo       "detrend.norm: failure"
    90     end
    91   end
    92 
    93   # operation times out?
    94   task.exit    timeout
    95     if ($VERBOSE)
    96       echo       "detrend.norm: timeout"
    97     end
     89    showcommand failure
     90  end
     91
     92  # operation times out?
     93  task.exit    timeout
     94    showcommand timeout
    9895  end
    9996end
     
    153150  # default exit status
    154151  task.exit    default
    155     if ($VERBOSE)
    156       echo "failure detrend_norm_calc.pl $options:0"
    157     end
     152    showcommand failure
    158153    queuepush DetrendNormStat -replace -key 1:3 "FAIL $options:0"
    159154    $DetrendNormStatFail ++
     
    162157  # operation times out?
    163158  task.exit    timeout
    164     if ($VERBOSE)
    165       echo "failure detrend_norm_calc.pl $options:0"
    166     end
     159    showcommand timeout
    167160    queuepush DetrendNormStat -replace -key 1:3 "TIMEOUT $options:0"
    168161   $DetrendNormStatFail ++
     
    184177
    185178  task.exec
    186     command      dettool -tonormalize -simple -limit {$DetrendNormFail + 20}
     179    # command      dettool -tonormalize -simple -limit {$DetrendNormFail + 20}
     180    command      dettool -tonormalize -simple
    187181  end
    188182
     
    219213  # default exit status
    220214  task.exit    default
    221     if ($VERBOSE)
    222       echo       "detrend.norm: failure"
    223     end
    224   end
    225 
    226   # operation times out?
    227   task.exit    timeout
    228     if ($VERBOSE)
    229       echo       "detrend.norm: timeout"
    230     end
     215    showcommand failure
     216  end
     217
     218  # operation times out?
     219  task.exit    timeout
     220    showcommand timeout
    231221  end
    232222end
     
    288278  # default exit status
    289279  task.exit    default
    290     if ($VERBOSE)
    291       echo "failure detrend_norm_apply.pl $options:0"
    292     end
     280    showcommand failure
    293281    queuepush DetrendNorm -replace -key 4:5 "FAIL $options:0"
    294282    $DetrendNormFail ++
     
    297285  # operation times out?
    298286  task.exit    timeout
    299     if ($VERBOSE)
    300       echo "failure detrend_norm_apply.pl $options:0"
    301     end
     287    showcommand timeout
    302288    queuepush DetrendNorm -replace -key 4:5 "TIMEOUT $options:0"
    303289    $DetrendNormFail ++
     
    319305
    320306  task.exec
    321     command      dettool -tonormalizedexp -simple -limit {$DetrendNormExpFail + 20}
     307    # command      dettool -tonormalizedexp -simple -limit {$DetrendNormExpFail + 20}
     308    command      dettool -tonormalizedexp -simple
    322309  end
    323310
     
    344331      #$EXP_TYPE = $word:5
    345332      #$IMFILES  = $word:6
    346       queuepush DetrendNormalizeExp -uniq -key 1:2 "NEW $DET_ID $ITER $DET_TYPE $CAMERA"
     333      queuepush DetrendNormExp -uniq -key 1:2 "NEW $DET_ID $ITER $DET_TYPE $CAMERA"
    347334    end
    348335
     
    354341  # default exit status
    355342  task.exit    default
    356     if ($VERBOSE)
    357       echo       "detrend.norm: failure"
    358     end
    359   end
    360 
    361   # operation times out?
    362   task.exit    timeout
    363     if ($VERBOSE)
    364       echo       "detrend.norm: timeout"
    365     end
     343    showcommand failure
     344  end
     345
     346  # operation times out?
     347  task.exit    timeout
     348    showcommand timeout
    366349  end
    367350end
     
    425408  # default exit status
    426409  task.exit    default
    427     if ($VERBOSE)
    428       echo "failure detrend_norm_exp.pl $options:0"
    429     end
     410    showcommand failure
    430411    queuepush DetrendNormExp -replace -key 1:2 "FAIL $options:0"
    431    $DetrendNormExpFail ++
    432   end
    433 
    434   # operation times out?
    435   task.exit    timeout
    436     if ($VERBOSE)
    437       echo "failure detrend_norm_exp.pl $options:0"
    438     end
     412    $DetrendNormExpFail ++
     413  end
     414
     415  # operation times out?
     416  task.exit    timeout
     417    showcommand timeout
    439418    queuepush DetrendNormExp -replace -key 1:2 "TIMEOUT $options:0"
    440    $DetrendNormExpFail ++
    441   end
    442 end
     419    $DetrendNormExpFail ++
     420  end
     421end
  • trunk/ippTasks/detrend.process.pro

    r10692 r10723  
    5757
    5858  task.exec
    59     command dettool -toprocessedimfile -simple -limit {$DetrendProcessImfileFail + 20}
     59    # XXX dettool needs -limit command
     60    # command dettool -toprocessedimfile -simple -limit {$DetrendProcessImfileFail + 20}
     61    command dettool -toprocessedimfile -simple
    6062  end
    6163
     
    9193  # error
    9294  task.exit    default
    93     if ($VERBOSE)
    94       echo       "detrend.process: failure"
    95     end
     95    showcommand failure
    9696  end
    9797
    9898  # operation times out?
    9999  task.exit    timeout
    100     if ($VERBOSE)
    101       echo       "detrend.process: timeout"
    102     end
     100    showcommand
    103101  end
    104102end
     
    166164  # default exit status
    167165  task.exit    default
    168     if ($VERBOSE)
    169       echo "failure detrend_process_imfile.pl $options:0"
    170     end
     166    showcommand failure
    171167    queuepush DetrendProcessImfiles -replace -key 1:3:5 "FAIL $options:0"
    172168    $DetrendProcessImfileFail ++
     
    175171  # operation times out?
    176172  task.exit    timeout
    177     if ($VERBOSE)
    178       echo "timeout detrend_process_imfile.pl $options:0"
    179     end
     173    showcommand timeout
    180174    queuepush DetrendProcessImfiles -replace -key 1:3:5 "TIMEOUT $options:0"
    181175    $DetrendProcessImfileFail ++
     
    197191
    198192  task.exec
    199     command dettool -toprocessedexp -simple -limit {$DetrendProcessExpFail + 20}
     193    # command dettool -toprocessedexp -simple -limit {$DetrendProcessExpFail + 20}
     194    command dettool -toprocessedexp -simple
    200195  end
    201196
     
    229224  # error
    230225  task.exit    default
    231     if ($VERBOSE)
    232       echo       "detrend.process: failure"
    233     end
     226    showcommand failure
    234227  end
    235228
    236229  # operation times out?
    237230  task.exit    timeout
    238     if ($VERBOSE)
    239       echo       "detrend.process: timeout"
    240     end
     231    showcommand timeout
    241232  end
    242233end
     
    300291  # default exit status
    301292  task.exit    default
    302     if ($VERBOSE)
    303       echo "failure for detrend_process_exp.pl: $options:0"
    304     end
     293    showcommand failure
    305294    queuepush DetrendProcessExposures -replace -key 1:2:4 "FAIL $options:0"
    306295    $DetrendProcessExpFail ++
     
    309298  # operation times out?
    310299  task.exit    timeout
    311     if ($VERBOSE)
    312       echo "failure for detrend_process_exp.pl: $options:0"
    313     end
     300    showcommand timeout
    314301    queuepush DetrendProcessExposures -replace -key 1:2:4 "TIMEOUT $options:0"
    315302    $DetrendProcessExpFail ++
  • trunk/ippTasks/detrend.reject.pro

    r10692 r10723  
    5353
    5454  task.exec
    55     command dettool -residdetrun -simple -limit {$DetrendRejectExpFail + 20}
     55    # command dettool -residdetrun -simple -limit {$DetrendRejectExpFail + 20}
     56    command dettool -residdetrun -simple
    5657  end
    5758
     
    8384  # locked list
    8485  task.exit    default
    85     if ($VERBOSE)
    86       echo       "detrend.reject: failure"
    87     end
     86    showcommand failure
    8887  end
    8988
    9089  # operation times out?
    9190  task.exit    timeout
    92     if ($VERBOSE)
    93       echo       "detrend.reject: timeout"
    94     end
     91    showcommand failure
    9592  end
    9693end
     
    123120    $ITER     = $word:1
    124121    $DET_TYPE = $word:2
    125     $CAMERA   = $word:3
     122    $MODE     = $word:3
     123    $CAMERA   = $word:4
    126124
    127125    # I'd like to add CAMERA to the log file...
     
    151149  # default exit status
    152150  task.exit    default
    153     if ($VERBOSE)
    154       echo "failure detrend_reject_exp.pl $options:0"
    155     end
     151    showcommand failure
    156152    queuepush DetrendRejectExp -replace -key 1:2 "FAIL $options:0"
    157153    $DetrendRejectExpFail ++
     
    160156  # operation times out?
    161157  task.exit    timeout
    162     if ($VERBOSE)
    163       echo "failure detrend_reject_exp.pl $options:0"
    164     end
     158    showcommand failure
    165159    queuepush DetrendRejectExp -replace -key 1:2 "TIMEOUT $options:0"
    166160   $DetrendRejectExpFail ++
  • trunk/ippTasks/detrend.resid.pro

    r10692 r10723  
    5858
    5959  task.exec
    60     command dettool -toresidimfile -simple -limit {$DetrendResidImfileFail + 20}
     60    # command dettool -toresidimfile -simple -limit {$DetrendResidImfileFail + 20}
     61    command dettool -toresidimfile -simple
    6162  end
    6263
     
    9798  # default exit status
    9899  task.exit    default
    99     if ($VERBOSE)
    100       echo       "detrend.resid: failure"
    101     end
     100    showcommand failure
    102101  end
    103102
    104103  # operation times out?
    105104  task.exit    timeout
    106     if ($VERBOSE)
    107       echo       "detrend.resid: timeout"
    108     end
     105    showcommand timeout
    109106  end
    110107end
     
    173170  # default exit status
    174171  task.exit    default
    175     if ($VERBOSE)
    176       echo "failure detrend_resid.pl $options:0"
    177     end
     172    showcommand failure
    178173    queuepush DetrendResidImfiles -replace -key 1:2:5:6 "FAIL $options:0"
    179174    $DetrendResidImfileFail ++
     
    182177  # operation times out?
    183178  task.exit    timeout
    184     if ($VERBOSE)
    185       echo "failure detrend_resid.pl $options:0"
    186     end
     179    showcommand timeout
    187180    queuepush DetrendResidImfiles -replace -key 1:2:6:6 "TIMEOUT $options:0"
    188181    $DetrendResidImfileFail ++
     
    204197
    205198  task.exec
    206   command      dettool -toresidexp -simple -limit {$DetrendResidExpFail + 20}
     199  # command      dettool -toresidexp -simple -limit {$DetrendResidExpFail + 20}
     200  command      dettool -toresidexp -simple
    207201  end
    208202
     
    239233  # default exit status
    240234  task.exit    default
    241     if ($VERBOSE)
    242       echo       "detrend.residexp: failure"
    243     end
     235    showcommand failure
    244236  end
    245237
    246238  # operation times out?
    247239  task.exit    timeout
    248     if ($VERBOSE)
    249       echo       "detrend.residexp: timeout"
    250     end
     240    showcommand timeout
    251241  end
    252242end
     
    315305  # default exit status
    316306  task.exit    default
    317     if ($VERBOSE)
    318       echo "failure for detrend_reject_imfile.pl: $options:0"
    319     end
     307    showcommand failure
    320308    queuepush DetrendResidExposures -replace -key 1:2:5 "FAIL $options:0"
    321309    $DetrendResidExpFail ++
     
    324312  # operation times out?
    325313  task.exit    timeout
    326     if ($VERBOSE)
    327       echo "failure for detrend_reject_imfile.pl: $options:0"
    328     end
     314    showcommand timeout
    329315    queuepush DetrendResidExposures -replace -key 1:2:5 "TIMEOUT $options:0"
    330316    $DetrendResidExpFail ++
  • trunk/ippTasks/detrend.stack.pro

    r10692 r10723  
    5353
    5454  task.exec
    55     command dettool -tostacked -simple -limit {$DetrendStackClassFail + 20}
     55    # command dettool -tostacked -simple -limit {$DetrendStackClassFail + 20}
     56    command dettool -tostacked -simple
    5657  end
    5758
     
    8384  # locked list
    8485  task.exit    default
    85     if ($VERBOSE)
    86       echo       "detrend.stack: failure"
    87     end
     86    showcommand failure
    8887  end
    8988
    9089  # operation times out?
    9190  task.exit    timeout
    92     if ($VERBOSE)
    93       echo       "detrend.stack: timeout"
    94     end
     91    showcommand timeout
    9592  end
    9693end
     
    153150  # default exit status
    154151  task.exit    default
    155     if ($VERBOSE)
    156       echo "failure detrend_stack.pl $options:0"
    157     end
     152    showcommand failure
    158153   queuepush DetrendStackClass -replace -key 1:2:4 "FAIL $options:0"
    159154   $DetrendStackClassFail ++
     
    162157  # operation times out?
    163158  task.exit    timeout
    164     if ($VERBOSE)
    165       echo "failure detrend_stack.pl $options:0"
    166     end
     159    showcommand timeout
    167160    queuepush DetrendStackClass -replace -key 1:2:4 "TIMEOUT $options:0"
    168161    $DetrendStackClassFail ++
  • trunk/ippTasks/pantasks.pro

    r10691 r10723  
    77# $scripts = $HOME/src/pantasks/ipp/ippTasks
    88$scripts = .
    9 $LOGDIR = `ipp_datapath.pl path://ESSENCE`
     9# $LOGDIR = `ipp_datapath.pl path://ESSENCE`
     10$LOGDIR = `ipp_datapath.pl path://SIMTEST`
     11
    1012$LOGDIR = $LOGDIR/logs
    1113exec mkdir -p $LOGDIR
     
    1921  if ($parallel)
    2022    controller exit true
    21     controller host add sn2
    22     controller host add sn3
    23     controller host add sn4
    24     controller host add sn5
    25 #   controller host add sn6
     23    controller host add alala
     24#    controller host add sn2
     25#    controller host add sn3
     26#    controller host add sn4
     27#    controller host add sn5
     28#    controller host add sn6
    2629# sn7 serves the disk
    2730  end
     
    3134
    3235macro load.tasks
    33   input $scripts/phase0.pro
     36#  input $scripts/phase0.pro
    3437#  input $scripts/phase2.pro
    3538#  input $scripts/phase3.pro
    36 #  input $scripts/detrend.process.pro
    37 #  input $scripts/detrend.stack.pro
    38 #  input $scripts/detrend.norm.pro
    39 #  input $scripts/detrend.resid.pro
    40 #  input $scripts/detrend.reject.pro
     39  input $scripts/detrend.process.pro
     40  input $scripts/detrend.stack.pro
     41  input $scripts/detrend.norm.pro
     42  input $scripts/detrend.resid.pro
     43  input $scripts/detrend.reject.pro
    4144end
    4245
     
    108111  exec rm -f ../object/*.p3.*.jpg
    109112end
     113
     114macro showcommand
     115  local n
     116
     117  if ($VERBOSE)
     118    $command = $taskarg:0
     119    for n 1 $taskarg:n
     120      $command = $command $taskarg:$n
     121    end
     122    if ($0 == 2)
     123      echo "$1 for: $command"
     124    else
     125      echo "command: $command"
     126    end   
     127  end
     128end
  • trunk/ippTasks/phase0.pro

    r10692 r10723  
    7979  # locked list
    8080  task.exit    default
    81     if ($VERBOSE)
    82       echo "phase0 pending imfiles: failure"
    83     end
    84   end
    85 
    86   # operation times out?
    87   task.exit    timeout
    88     if ($VERBOSE)
    89       echo "phase0 pending imfiles: timeout"
    90     end
     81    showcommand
     82  end
     83
     84  # operation times out?
     85  task.exit    timeout
     86    showcommand
    9187  end
    9288end
     
    153149  # default exit status
    154150  task.exit    default
    155     if ($VERBOSE)
    156       echo "failure for phase0imfile.pl: $options:0"
    157     end
     151    showcommand
    158152    queuepush Phase0Imfiles -replace -key 1 "FAIL $options:0"
    159153    $Phase0ImfileFail ++
     
    162156  # operation times out?
    163157  task.exit    timeout
    164     if ($VERBOSE)
    165       echo "timeout for phase0imfile.pl: $options:0"
    166     end
     158    showcommand
    167159    queuepush Phase0Imfiles -replace -key 1 "TIMEOUT $options:0"
    168160    $Phase0ImfileFail ++
     
    222214  # default exit status
    223215  task.exit    default
    224     if ($VERBOSE)
    225       echo       "phase0 pending exp: failure"
    226     end
    227   end
    228 
    229   # operation times out?
    230   task.exit    timeout
    231     if ($VERBOSE)
    232       echo       "phase0 pending exp: timeout"
    233     end
     216    showcommand
     217  end
     218
     219  # operation times out?
     220  task.exit    timeout
     221    showcommand
    234222  end
    235223end
     
    293281  # default exit status
    294282  task.exit    default
    295     if ($VERBOSE)
    296       echo "failure for phase0exp.pl: $options:0"
    297     end
     283    showcommand
    298284    queuepush Phase0Exposures -replace -key 1 "FAIL $options:0"
    299285    $Phase0ExpFail
     
    302288  # operation times out?
    303289  task.exit    timeout
    304     if ($VERBOSE)
    305       echo "failure for phase0exp.pl: $options:0"
    306     end
     290    showcommand
    307291    queuepush Phase0Exposures -replace -key 1 "TIMEOUT $options:0"
    308292    $Phase0ExpFail
  • trunk/ippTasks/testscript.pro

    r10673 r10723  
    77
    88  status
    9   host add sn2
    10   host add sn3
    11   host add sn4
    12   host add sn5
     9  host add alala
    1310
    1411  status
Note: See TracChangeset for help on using the changeset viewer.