IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 31, 2011, 2:51:48 PM (15 years ago)
Author:
eugene
Message:

merging changes from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/eam_branches/ipp-20101205/ippTasks/nightly_science.pro

    r30102 r30446  
    77    ns.detrends.off
    88    ns.dqstats.on
    9 #    ns.sweetspot.on
    10 #    ns.registration.on
    11 #    ns.burntool.on
    12 #    ns.chips.on
    139    ns.stacks.on
    1410    ns.diffs.on
     
    1915    ns.detrends.off
    2016    ns.dqstats.off
    21 #    ns.sweetspot.off
    22 #    ns.registration.off
    23 #    ns.burntool.off
    24 #    ns.chips.off
    2517    ns.stacks.off
    2618    ns.diffs.off
     
    5345end
    5446
    55 # macro ns.sweetspot.on
    56 #   task ns.sweetspot.load
    57 #     active true
    58 #   end
    59 # end
    60 
    61 # macro ns.registration.on
    62 #   task ns.registration.load
    63 #     active true
    64 #   end
    65 # end
    66 
    67 # macro ns.burntool.on
    68 #   task ns.burntool.load
    69 #     active true
    70 #   end
    71 #   task ns.burntool.run
    72 #     active true
    73 #   end
    74 # end
    75 
    76 # macro ns.chips.on
    77 #   task ns.chips.load
    78 #     active true
    79 #   end
    80 #   task ns.chips.run
    81 #     active true
    82 #   end
    83 # end
    84 
    8547macro ns.stacks.on
    8648  task ns.stacks.load
     
    9153  end
    9254  task ns.stacks.confirm
    93     active true
     55    active false
    9456  end
    9557end
     
    12284end
    12385
    124 # macro ns.sweetspot.off
    125 #   task ns.sweetspot.load
    126 #     active false
    127 #   end
    128 # end
    129 
    130 # macro ns.registration.off
    131 #   task ns.registration.load
    132 #     active false
    133 #   end
    134 # end
    135 
    136 # macro ns.burntool.off
    137 #   task ns.burntool.load
    138 #     active false
    139 #   end
    140 #   task ns.burntool.run
    141 #     active false
    142 #   end
    143 # end
    144 
    145 # macro ns.chips.off
    146 #   task ns.chips.load
    147 #     active false
    148 #   end
    149 #   task ns.chips.run
    150 #     active false
    151 #   end
    152 # end
    153 
    15486macro ns.stacks.off
    15587  task ns.stacks.load
     
    174106end
    175107
    176 # $ns_regPAGE = 0
    177 # $ns_burnPAGE = 0
    178 # $ns_RburnPAGE = 0
    179 # $ns_RburnCELL = 0
    180 # $ns_chipPAGE = 0
    181 # $ns_RchipPAGE = 0
     108macro ns.stacks.confirm.on
     109  task ns.stacks.confirm
     110    active true
     111  end
     112end
     113
     114macro ns.stacks.confirm.off
     115  task ns.stacks.confirm
     116    active false
     117  end
     118end
     119
     120
    182121$ns_stackPAGE = 0
    183122$ns_RstackPAGE = 0
     
    187126
    188127book init nsData
     128book init nsDiffs
     129book init nsStacks
    189130#
    190131# Macros to control the book.
    191132#
    192133macro ns.add.date
     134  if ($0 != 2)
     135    echo "USAGE: ns.add.date (YYYY-MM-DD)"
     136    break
     137  end
     138
    193139   book newpage nsData $1
    194140   book setword nsData $1 nsState NEW
    195    book setword nsData $1 nsStackState TOWARP
    196    book setword nsData $1 nsDiffState TOWARP
     141   book setword nsData $1 dbname $DB:0
     142
     143   book newpage nsDiffs $1
     144   book setword nsDiffs $1 nsDiffState TOWARP
     145   book setword nsDiffs $1 nsObservingState UNKNOWN
     146
     147   book newpage nsStacks $1
     148   book setword nsStacks $1 nsStackState TOWARP
     149
    197150end
    198151
     
    202155       book getpage nsData $i -var date
    203156       book getword nsData $date nsState -var state
    204        book getword nsData $date nsStackState -var Sstate
    205        book getword nsData $date nsDiffState -var Dstate
    206        book getword nsData $date nsObservingState -var Ostate
     157       book getword nsStacks $date nsStackState -var Sstate
     158       book getword nsDiffs $date nsDiffState -var Dstate
     159       book getword nsDiffs $date nsObservingState -var Ostate
    207160       echo $date $state $Sstate $Dstate $Ostate
    208161    end
     
    216169    book setword nsData $1 nsState $2
    217170end
    218 
    219171
    220172
     
    236188    book newpage nsData $today
    237189    book setword nsData $today nsState NEW
    238     book setword nsData $today nsStackState TOWARP
    239     book setword nsData $today nsDiffState TOWARP
     190    book newpage nsStacks $today
     191    book setword nsStacks $today nsStackState TOWARP
     192    book newpage nsDiffs $today
     193    book setword nsDiffs $today nsDiffState TOWARP
    240194    book setword nsData $today dbname $DB:0
    241195
    242196#    command echo $today
    243197   $run = nightly_science.pl --clean_old --date $today --dbname $DB:0
    244     add_standard_args $run
     198#    add_standard_args run
    245199    command $run
    246200  end
     
    279233
    280234    $run = nightly_science.pl --queue_detrends --date $today --dbname $DB:0
    281      add_standard_args $run
     235#     add_standard_args $run
    282236     command $run
    283237  end
     
    317271
    318272    $run = nightly_science.pl --queue_dqstats --date $today --dbname $DB:0
    319      add_standard_args $run
     273#     add_standard_args $run
    320274     command $run
    321275
     
    342296#
    343297task              ns.stacks.load
     298  active          false
    344299  host            local
    345300  periods         -poll $LOADPOLL
     
    353308
    354309     book getpage nsData $ns_stackPAGE -var date
    355      book getword nsData $date nsStackState -var ns_STATE
    356      book getword nsData $date dbname -var $DBNAME
     310     book getword nsStacks $date nsStackState -var ns_STATE
     311     book getword nsDiffs $date nsDiffState -var ns_diff_STATE
     312     book getword nsData $date dbname -var DBNAME
    357313     book npages nsData -var Npages
    358314
     
    367323     if ("$ns_STATE" != "TOWARP") break
    368324
    369      $run = nightly_science.pl --check_stacks --date $date
    370      add_standard_args $run
     325     $run = nightly_science.pl --check_stacks --date $date --dbname $DBNAME
     326#     add_standard_args $run
    371327     command $run
    372328
     
    376332  task.exit   0
    377333#    convert 'stdout' to book format
    378     book delpage nsData $options:0
    379     ipptool2book stdout nsData -uniq -key date
    380 
    381     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     334    book delpage nsStacks $options:0
     335    ipptool2book stdout nsStacks -uniq -key date
     336
     337    book getword nsStacks $options:0 nsNmacros -var ns_Nmacros
    382338    if ("$ns_Nmacros" != "NULL")
    383339        for i 0 $ns_Nmacros
    384340            sprintf macroName "ns%dMacro" $i
    385             book getword nsData $options:0 $macroName -var macroCmd
     341            book getword nsStacks $options:0 $macroName -var macroCmd
    386342            $macroCmd
    387343        end
     
    422378
    423379     book getpage nsData $ns_RstackPAGE -var date
    424      book getword nsData $date nsStackState -var ns_STATE
    425      book getword nsData $date dbname -var $DBNAME
     380     book getword nsStacks $date nsStackState -var ns_STATE
     381     book getword nsDiffs $date nsDiffState -var ns_diff_STATE
     382     book getword nsData $date dbname -var DBNAME
    426383     book npages nsData -var Npages
    427384
     
    434391     option $date
    435392
    436      if (("$ns_STATE" != "QUEUESTACKS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
    437      $run = nightly_science.pl --queue_stacks --date $date
    438      add_standard_args $run
     393     if (("$ns_STATE" != "STACKING")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
     394     $run = nightly_science.pl --queue_stacks --date $date --dbname $DBNAME
     395#     add_standard_args $run
    439396     command $run
    440397   end
     
    442399  task.exit   0
    443400#    convert 'stdout' to book format
    444     book delpage nsData $options:0
     401    book delpage nsStacks $options:0
    445402# We've queued up stacking. We're done with this date, so don't reload the page.
    446     ipptool2book stdout nsData -uniq -key date
    447 
    448     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     403    ipptool2book stdout nsStacks -uniq -key date
     404
     405    book getword nsStacks $options:0 nsNmacros -var ns_Nmacros
    449406    if ("$ns_Nmacros" != "NULL")
    450407        for i 0 $ns_Nmacros
    451408            sprintf macroName "ns%dMacro" $i
    452             book getword nsData $options:0 $macroName -var macroCmd
     409            book getword nsStacks $options:0 $macroName -var macroCmd
    453410            $macroCmd
    454411        end
     
    477434#
    478435task              ns.stacks.confirm
     436  active          false
    479437  host            local
    480438  periods         -poll $LOADPOLL
     
    488446
    489447     book getpage nsData $ns_CstackPAGE -var date
    490      book getword nsData $date nsStackState -var ns_STATE
    491      book getword nsData $date dbname -var $DBNAME
     448     book getword nsStacks $date nsStackState -var ns_STATE
     449     book getword nsData $date dbname -var DBNAME
    492450     book npages nsData -var Npages
    493451
     
    501459
    502460     if ("$ns_STATE" != "STACKING") break
    503      $run = nightly_science.pl --confirm_stacks --date $date
    504      add_standard_args $run
     461     $run = nightly_science.pl --confirm_stacks --date $date --dbname $DBNAME
     462#     add_standard_args $run
    505463     command $run
    506464   end
     
    508466  task.exit   0
    509467#    convert 'stdout' to book format
    510     book delpage nsData $options:0
    511     ipptool2book stdout nsData -uniq -key date
    512 
    513     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     468    book delpage nsStacks $options:0
     469    ipptool2book stdout nsStacks -uniq -key date
     470
     471    book getword nsStacks $options:0 nsNmacros -var ns_Nmacros
    514472    if ("$ns_Nmacros" != "NULL")
    515473        for i 0 $ns_Nmacros
    516474            sprintf macroName "ns%dMacro" $i
    517             book getword nsData $options:0 $macroName -var macroCmd
     475            book getword nsStacks $options:0 $macroName -var macroCmd
    518476            $macroCmd
    519477        end
     
    543501#
    544502task              ns.diffs.load
     503  active          false
    545504  host            local
    546505  periods         -poll $LOADPOLL
     
    554513
    555514     book getpage nsData $ns_diffPAGE -var date
    556      book getword nsData $date nsDiffState -var ns_STATE
    557      book getword nsData $date dbname -var $DBNAME
     515     book getword nsDiffs $date nsDiffState -var ns_STATE
     516     book getword nsStacks $date nsStackState -var ns_stack_STATE
     517     book getword nsData $date dbname -var DBNAME
    558518     book npages nsData -var Npages
    559519
     
    567527
    568528     if ("$ns_STATE" != "TOWARP") break
    569      $run = nightly_science.pl --check_diffs --date $date
    570      add_standard_args $run
     529     $run = nightly_science.pl --check_diffs --date $date --dbname $DBNAME
     530#     add_standard_args $run
    571531     command $run
    572532   end
     
    575535  task.exit   0
    576536#    convert 'stdout' to book format
    577     book delpage nsData $options:0
    578     ipptool2book stdout nsData -uniq -key date
    579 
    580     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     537    book delpage nsDiffs $options:0
     538    ipptool2book stdout nsDiffs -uniq -key date
     539
     540    book getword nsDiffs $options:0 nsNmacros -var ns_Nmacros
    581541    if ("$ns_Nmacros" != "NULL")
    582542        for i 0 $ns_Nmacros
    583543            sprintf macroName "ns%dMacro" $i
    584             book getword nsData $options:0 $macroName -var macroCmd
     544            book getword nsDiffs $options:0 $macroName -var macroCmd
    585545            $macroCmd
    586546        end
     
    613573  periods         -poll $LOADPOLL
    614574  periods         -exec $LOADEXEC
    615   periods         -timeout 120
     575  periods         -timeout 900
    616576  npending        1
    617577
     
    621581
    622582     book getpage nsData $ns_RdiffPAGE -var date
    623      book getword nsData $date nsDiffState -var ns_STATE
    624      book getword nsData $date dbname -var $DBNAME
     583     book getword nsDiffs $date nsDiffState -var ns_STATE
     584     book getword nsStacks $date nsStackState -var ns_stack_STATE
     585     book getword nsData $date dbname -var DBNAME
    625586     book npages nsData -var Npages
    626587
     
    633594     option $date
    634595
    635      if (("$ns_STATE" != "QUEUEDIFFS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
    636      $run = nightly_science.pl --queue_diffs --date $date
    637      add_standard_args $run
     596     if (("$ns_STATE" != "DIFFING")&&("$ns_STATE" != "QUEUEDIFFS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
     597     $run = nightly_science.pl --queue_diffs --date $date --dbname $DBNAME
     598#     add_standard_args $run
    638599     command $run
    639600   end
     
    641602  task.exit   0
    642603#    convert 'stdout' to book format
    643     book delpage nsData $options:0
     604    book delpage nsDiffs $options:0
    644605# We've queued up diffing. We're done with this date, so don't reload the page.
    645     ipptool2book stdout nsData -uniq -key date
    646 
    647     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     606    ipptool2book stdout nsDiffs -uniq -key date
     607
     608    book getword nsDiffs $options:0 nsNmacros -var ns_Nmacros
    648609    if ("$ns_Nmacros" != "NULL")
    649610        for i 0 $ns_Nmacros
    650611            sprintf macroName "ns%dMacro" $i
    651             book getword nsData $options:0 $macroName -var macroCmd
     612            book getword nsDiffs $options:0 $macroName -var macroCmd
    652613            $macroCmd
    653614        end
Note: See TracChangeset for help on using the changeset viewer.