Changeset 25027 for branches/pap/ippTasks/diff.pro

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTasks/diff.pro (modified) (8 diffs)

branches/pap/ippTasks/diff.pro

@@ -10 +10 @@
 ### Initialise the books containing the tasks to do
 book init diffSkyfile
-book init diffCleanup
+#book init diffCleanup
 
 ### Database lists
 $diffSkycell_DB = 0
-$diffCleanup_DB = 0
+#$diffCleanup_DB = 0
 
 ### Check status of diffing tasks
 macro diff.status
   book listbook diffSkyfile
-  book listbook diffCleanup
+#  book listbook diffCleanup
 end
 
@@ -25 +25 @@
 macro diff.reset
   book init diffSkyfile
-  book init diffCleanup
+#  book init diffCleanup
 end
 
@@ -48 +48 @@
 end
 
-macro diff.cleanup.on
-  task diff.cleanup.load
-    active true
-  end
-  task diff.cleanup.run
-    active true
-  end
-end
-
-macro diff.cleanup.off
-  task diff.cleanup.load
-    active false
-  end
-  task diff.cleanup.run
-    active false
-  end
-end
+# macro diff.cleanup.on
+#   task diff.cleanup.load
+#     active true
+#   end
+#   task diff.cleanup.run
+#     active true
+#   end
+# end
+
+# macro diff.cleanup.off
+#   task diff.cleanup.load
+#     active false
+#   end
+#   task diff.cleanup.run
+#     active false
+#   end
+# end
 
 
@@ -81 +81 @@
 
   task.exec
+    if ($LABEL:n == 0) break
     $run = difftool -todiffskyfile
     if ($DB:n == 0)
@@ -92 +93 @@
     end
     add_poll_args run
+    add_poll_labels run
     command $run
   end
@@ -144 +146 @@
     book getword diffSkyfile $pageName skycell_id -var SKYCELL_ID
     book getword diffSkyfile $pageName camera -var CAMERA
+    book getword diffSkyfile $pageName bothways -var BOTHWAYS
     book getword diffSkyfile $pageName workdir -var WORKDIR_TEMPLATE
     book getword diffSkyfile $pageName dbname -var DBNAME
@@ -162 +165 @@
 
     $run = diff_skycell.pl --threads @MAX_THREADS@ --diff_id $DIFF_ID --skycell_id $SKYCELL_ID --diff_skyfile_id $DIFF_SKYFILE_ID --outroot $outroot --redirect-output
+    if ("$BOTHWAYS" == "T")
+       $run = $run --inverse
+    end
     add_standard_args run
 
@@ -193 +199 @@
 end
 
-# select images ready for diff analysis
-# new entries are added to diffPendingImfile
-# skip already-present entries
-task           diff.cleanup.load
-  host         local
-
-  periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 30
-  npending     1
-  active       false
-
-  stdout NULL
-  stderr $LOGDIR/diff.cleanup.log
-
-  task.exec
-    $run = difftool -pendingcleanuprun
-    if ($DB:n == 0)
-      option DEFAULT
-    else
-      # save the DB name for the exit tasks
-      option $DB:$diffCleanup_DB
-      $run = $run -dbname $DB:$diffCleanup_DB
-      $diffCleanup_DB ++
-      if ($diffCleanup_DB >= $DB:n) set diffCleanup_DB = 0
-    end
-    add_poll_args run
-    command $run
-  end
-
-  # success
-  task.exit    0
-    # convert 'stdout' to book format
-    ipptool2book stdout diffCleanup -key diff_id:skycell_id -uniq -setword dbname $options:0 -setword pantaskState INIT
-    if ($VERBOSE > 2)
-      book listbook diffCleanup
-    end
-
-    # delete existing entries in the appropriate pantaskStates
-    process_cleanup diffCleanup
-  end
-
-  # locked list
-  task.exit    default
-    showcommand failure
-  end
-
-  task.exit    crash
-    showcommand crash
-  end
-
-  # operation times out?
-  task.exit    timeout
-    showcommand timeout
-  end
-end
-
-# run the ipp_cleanup.pl script on pending images
-task           diff.cleanup.run
-  periods      -poll $RUNPOLL
-  periods      -exec $RUNEXEC
-  periods      -timeout 60
-  active       false
-
-  task.exec
-    book npages diffCleanup -var N
-    if ($N == 0) break
-    if ($NETWORK == 0) break
+# # select images ready for diff analysis
+# # new entries are added to diffPendingImfile
+# # skip already-present entries
+# task         diff.cleanup.load
+#   host         local
+
+#   periods      -poll $LOADPOLL
+#   periods      -exec $LOADEXEC
+#   periods      -timeout 30
+#   npending     1
+#   active       false
+
+#   stdout NULL
+#   stderr $LOGDIR/diff.cleanup.log
+
+#   task.exec
+#     if ($LABEL:n == 0) break
+#     $run = difftool -pendingcleanuprun
+#     if ($DB:n == 0)
+#       option DEFAULT
+#     else
+#       # save the DB name for the exit tasks
+#       option $DB:$diffCleanup_DB
+#       $run = $run -dbname $DB:$diffCleanup_DB
+#       $diffCleanup_DB ++
+#       if ($diffCleanup_DB >= $DB:n) set diffCleanup_DB = 0
+#     end
+#     add_poll_args run
+#     add_poll_labels run
+#     command $run
+#   end
+
+#   # success
+#   task.exit    0
+#     # convert 'stdout' to book format
+#     ipptool2book stdout diffCleanup -key diff_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+#     if ($VERBOSE > 2)
+#       book listbook diffCleanup
+#     end
+
+#     # delete existing entries in the appropriate pantaskStates
+#     process_cleanup diffCleanup
+#   end
+
+#   # locked list
+#   task.exit    default
+#     showcommand failure
+#   end
+
+#   task.exit    crash
+#     showcommand crash
+#   end
+
+#   # operation times out?
+#   task.exit    timeout
+#     showcommand timeout
+#   end
+# end
+
+# # run the ipp_cleanup.pl script on pending images
+# task         diff.cleanup.run
+#   periods      -poll $RUNPOLL
+#   periods      -exec $RUNEXEC
+#   periods      -timeout 60
+#   active       false
+
+#   task.exec
+#     book npages diffCleanup -var N
+#     if ($N == 0) break
+#     if ($NETWORK == 0) break
     
-    # look for new images in diffCleanup (pantaskState == INIT)
-    book getpage diffCleanup 0 -var pageName -key pantaskState INIT
-    if ("$pageName" == "NULL") break
-
-    book setword diffCleanup $pageName pantaskState RUN
-    book getword diffCleanup $pageName camera -var CAMERA
-    book getword diffCleanup $pageName state -var CLEANUP_MODE
-    book getword diffCleanup $pageName diff_id -var DIFF_ID
-    book getword diffCleanup $pageName dbname -var DBNAME
-
-    # specify choice of local or remote host based on camera and diff (class_id)
-    set.host.for.camera $CAMERA FPA
-
-    stdout $LOGDIR/diff.cleanup.log
-    stderr $LOGDIR/diff.cleanup.log
-
-    # XXX is everything listed here needed?
-    $run = ipp_cleanup.pl --stage diff --stage_id $DIFF_ID --camera $CAMERA --mode $CLEANUP_MODE
-    add_standard_args run
-
-    # save the pageName for future reference below
-    options $pageName
-
-    # create the command line
-    if ($VERBOSE > 1)
-      echo command $run
-    end
-    command $run
-  end
-
-  # default exit status
-  task.exit    default
-    process_exit diffCleanup $options:0 $JOB_STATUS
-  end
-
-  task.exit    crash
-    showcommand crash
-    book setword diffCleanup $options:0 pantaskState CRASH
-  end
-
-  # operation timed out?
-  task.exit    timeout
-    showcommand timeout
-    book setword diffCleanup $options:0 pantaskState TIMEOUT
-  end
-end
+#     # look for new images in diffCleanup (pantaskState == INIT)
+#     book getpage diffCleanup 0 -var pageName -key pantaskState INIT
+#     if ("$pageName" == "NULL") break
+
+#     book setword diffCleanup $pageName pantaskState RUN
+#     book getword diffCleanup $pageName camera -var CAMERA
+#     book getword diffCleanup $pageName state -var CLEANUP_MODE
+#     book getword diffCleanup $pageName diff_id -var DIFF_ID
+#     book getword diffCleanup $pageName dbname -var DBNAME
+
+#     # specify choice of local or remote host based on camera and diff (class_id)
+#     set.host.for.camera $CAMERA FPA
+
+#     stdout $LOGDIR/diff.cleanup.log
+#     stderr $LOGDIR/diff.cleanup.log
+
+#     # XXX is everything listed here needed?
+#     $run = ipp_cleanup.pl --stage diff --stage_id $DIFF_ID --camera $CAMERA --mode $CLEANUP_MODE
+#     add_standard_args run
+
+#     # save the pageName for future reference below
+#     options $pageName
+
+#     # create the command line
+#     if ($VERBOSE > 1)
+#       echo command $run
+#     end
+#     command $run
+#   end
+
+#   # default exit status
+#   task.exit    default
+#     process_exit diffCleanup $options:0 $JOB_STATUS
+#   end
+
+#   task.exit    crash
+#     showcommand crash
+#     book setword diffCleanup $options:0 pantaskState CRASH
+#   end
+
+#   # operation timed out?
+#   task.exit    timeout
+#     showcommand timeout
+#     book setword diffCleanup $options:0 pantaskState TIMEOUT
+#   end
+# end