Mercurial > repos > lecorguille > camera_annotate

diff CAMERA.r @ 15:77a191e37af4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload commit 9d47e3b467dbbe0af0d90a937c5e9f2c4b958c4b
author lecorguille
date Mon, 25 Apr 2016 11:06:59 -0400
parents e98ca7f0dcbd
children 230f0bc9e792
line wrap: on
line diff
--- a/CAMERA.r	Fri Apr 22 08:36:37 2016 -0400
+++ b/CAMERA.r	Mon Apr 25 11:06:59 2016 -0400
@@ -39,7 +39,8 @@
 
 if (listArguments[["xfunction"]] %in% c("combinexsAnnos")) {
   load(listArguments[["image_pos"]])
-  xaP=xa  
+  xaP=xa
+  listOFlistArgumentsP=listOFlistArguments
   if (exists("xsAnnotate_object")) xaP=xsAnnotate_object
   
   diffrepP=NULL
@@ -47,6 +48,7 @@
 
   load(listArguments[["image_neg"]])
   xaN=xa
+  listOFlistArgumentsN=listOFlistArguments
   if (exists("xsAnnotate_object")) xaN=xsAnnotate_object
 
   diffrepN=NULL
@@ -158,7 +160,7 @@
 }
 
 if (thefunction %in% c("combinexsAnnos")) {
-  cAnnot=combinexsAnnos_function(xaP=xaP,xaN=xaN,diffrepP=diffrepP,diffrepN=diffrepN,convert_param=listArguments[["convert_param"]],pos=listArguments[["pos"]],tol=listArguments[["tol"]],ruleset=listArguments[["ruleset"]],keep_meta=listArguments[["keep_meta"]],variableMetadataOutput=variableMetadataOutput)
+  cAnnot=combinexsAnnos_function(xaP=xaP,xaN=xaN,listOFlistArgumentsP=listOFlistArgumentsP,listOFlistArgumentsN=listOFlistArgumentsN,diffrepP=diffrepP,diffrepN=diffrepN,convert_param=listArguments[["convert_param"]],pos=listArguments[["pos"]],tol=listArguments[["tol"]],ruleset=listArguments[["ruleset"]],keep_meta=listArguments[["keep_meta"]],variableMetadataOutput=variableMetadataOutput)
 }
 
 dev.off()