[Swift-commit] r3063 - SwiftApps/SIDGrid/swift/projects/andric/peakfit_pilots/PK2/wholebrain

[noreply at svn.ci.uchicago.edu]

Author: andric
Date: 2009-08-06 10:53:34 -0500 (Thu, 06 Aug 2009)
New Revision: 3063

Modified:
   SwiftApps/SIDGrid/swift/projects/andric/peakfit_pilots/PK2/wholebrain/PK2mediator.swift
Log:
specifies r_script in Mediator call - having different issues recognizing this argument on different grid sites

Modified: SwiftApps/SIDGrid/swift/projects/andric/peakfit_pilots/PK2/wholebrain/PK2mediator.swift
===================================================================
--- SwiftApps/SIDGrid/swift/projects/andric/peakfit_pilots/PK2/wholebrain/PK2mediator.swift	2009-08-06 15:52:31 UTC (rev 3062)
+++ SwiftApps/SIDGrid/swift/projects/andric/peakfit_pilots/PK2/wholebrain/PK2mediator.swift	2009-08-06 15:53:34 UTC (rev 3063)
@@ -17,7 +17,7 @@
 
 ## Mediator app declaration:
 app (file q_result, PeakResult outObj) run_query (string med_args, file config, PeakfitR code){
-    Mediator med_args stdout=@filename(q_result) @filename(code.ShellpeakMediatorPK2);
+    Mediator med_args stdout=@filename(q_result) "--r_script" @filename(code.ShellpeakMediatorPK2);
 }
 
 ## this process sets parameters and calls Mediator:
@@ -28,7 +28,7 @@
     file q_result<single_file_mapper; file=@strcat("Qresults/",subject,"_",h,"vert",vert,".qresult")>;
     string med_args = @strcat("--user ","andric"," --conf ", @filename(config)," --db ", db," --host ", host,
         " --begin_vox ", vert," --end_vox ", evox," --batchstep ", "1"," --subject ", subject,
-        " --query ", query_outline," --r_swift_args ", @filename(outObj)," --r_script ", @filename(code.ShellpeakMediatorPK2)," --outprefix ", theoutprefix);
+        " --query ", query_outline," --r_swift_args ", @filename(outObj)," --outprefix ", theoutprefix);
     trace(med_args);
     (q_result, outObj) = run_query(med_args, config, code);
 }
@@ -44,7 +44,7 @@
 
 ## variables to move across in the foreach loops:
 string declarelist[] = ["PK2smth"];
-string hemilist[] = ["lh"];
+string hemilist[] = ["rh"];
 int vertices[] = [1:2:1];
 
 ## nest the loop_query process in foreach loops to move across variable sets