[Swift-commit] r3095 - SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy

[noreply at svn.ci.uchicago.edu]

Author: andric
Date: 2009-08-10 10:24:11 -0500 (Mon, 10 Aug 2009)
New Revision: 3095

Modified:
   SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/surfclust.swift
Log:
clustering the interp output. cleaned up the code.

Modified: SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/surfclust.swift
===================================================================
--- SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/surfclust.swift	2009-08-10 14:25:16 UTC (rev 3094)
+++ SwiftApps/SIDGrid/swift/projects/andric/ccf_emblem/NonParametric_lag_analy/surfclust.swift	2009-08-10 15:24:11 UTC (rev 3095)
@@ -1,35 +1,31 @@
-# coded Tuesday; July 22, 2008
-#---- re-coded: Sunday; August 24, 2008
-# this version also loops the rmm value
+#---- re-coded: 10.August.2009
 type file{}
 
-(file surfclustOutput[]) SurfClust (file specFile, file surfFile, file input, int threshVal, float rmmVal, string prefix){
-    app {
-        SurfClust "-spec" @filename(specFile) "-surf_A" @filename(surfFile) "-input" @filename(input) "1" "-rmm" rmmVal "-thresh_col" "1" "-thresh" threshVal "-amm2" "2" "-sort_n_nodes" "-out_clusterdset" "-out_roidset" "-prepend_node_index" "-out_fulllist" "-prefix" prefix;
-    }
+app (file surfclustOutput[]) SurfClust (file spec, file pial, file inputFile, float thresh, float rmm, string outPrefix){
+        SurfClust "-spec" @spec "-surf_A" @pial "-input" @inputFile "1" 
+        "-rmm" rmm "-thresh_col" "1" "-thresh" thresh "-amm2" "2" "-sort_n_nodes" 
+        "-out_clusterdset" "-out_roidset" "-prepend_node_index" "-out_fulllist" "-prefix" outPrefix;
 }
 
 
-string SeedRegions[] = ["IDEAL"];
+string id = "interp";
 string hemis[] = ["lh","rh"];
-int vertexThresh[] = [6,9];
-float rmm_vals[] = [2.5];
+float vertexThresh[] = [5.95, 8.8];
+float rmm_vals[] = [2.2, 2.5, 3.1];
 
-foreach seed in SeedRegions{
-    foreach h in hemis{
-        foreach thresh in vertexThresh{
-            foreach rmm in rmm_vals{
-                file HORRYspec <single_file_mapper;file=@strcat("HORRY.",h,".mesh140_std.spec")>;
-                file HORRYsurf <single_file_mapper;file=@strcat("HORRY.",h,".mesh140_std.pial.asc")>;
-                file inputFile <single_file_mapper;file=@strcat("oldResults/",h,"_",seed,"_new_sorted.txt")>;
-                string outPrefix=@strcat(h,"_",seed,"_Thresh",thresh);
-                string vals_name = @strcat(outPrefix,"_Clustered_r",rmm,"_a2.0.niml.dset, ");
-                string msk_name = @strcat(outPrefix,"_ClstMsk_r",rmm,"_a2.0.niml.dset, ");
-                string table_name = @strcat(outPrefix,"_ClstTable_r",rmm,"_a2.0.1D");
-                string out_files = @strcat(vals_name, msk_name, table_name);
-                file surfclustOutput[] <fixed_array_mapper;files=out_files>;
-                (surfclustOutput) = SurfClust(HORRYspec,HORRYsurf,inputFile,thresh,rmm,outPrefix);
-            }
+foreach h in hemis{
+    foreach thresh in vertexThresh{
+        foreach rmm in rmm_vals{
+            file spec<single_file_mapper;file=@strcat("HORRY.",h,".mesh140_std.spec")>;
+            file pial<single_file_mapper;file=@strcat("HORRY.",h,".mesh140_std.pial.asc")>;
+            file inputFile <single_file_mapper;file=@strcat("output",h,"/new",h,"_FriedmanResult.1D")>;
+            string outPrefix=@strcat("output",h,"/interp",h,"Thresh",thresh);
+            string vals_name = @strcat(outPrefix,"_Clustered_r",rmm,"_a2.0.niml.dset, ");
+            string msk_name = @strcat(outPrefix,"_ClstMsk_r",rmm,"_a2.0.niml.dset, ");
+            string table_name = @strcat(outPrefix,"_ClstTable_r",rmm,"_a2.0.1D");
+            string out_files = @strcat(vals_name, msk_name, table_name);
+            file surfclustOutput[]<fixed_array_mapper;files=out_files>;
+            surfclustOutput = SurfClust(spec, pial, inputFile, thresh, rmm, outPrefix);
         }
     }
 }