Changeset 475 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit

Timestamp:

Feb 13, 2009 3:24:12 PM (14 years ago)

Author:

srkline

Message:

Added a new, simpler procedure to do a global fit of two data sets with a single model. This is for the most common case of USANS+SANS data. This now appears as a new Package "Simple Global Fit". Still in testing mode, many features are intentionally NOT there. This is supposed to be simple. Not all features will be added.

Includes, GlobalFit? changed to accomodate the new procedure, and provide better formatted report.

Main_USANS changed to repair display glitch on main panel in the status listbox

Location:

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit

Files:

• GlobalFit2_NCNR_v40.ipf (modified) (4 diffs)
• SimpleGlobalFit_NCNR_v40.ipf (added)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/GlobalFit/GlobalFit2_NCNR_v40.ipf

@@ -4880 +4880 @@
         String topGraph,GF_resultStr
         
+//      String/G root:inputStr=GF_resultStr
+
         String nb = "GF_Report"
         String str=""
@@ -4892 +4894 @@
         
         //setup
-        Notebook $nb defaultTab=36, statusWidth=252, pageMargins={44,44,44,44}          //44 points = 0.6" margin all around
-        Notebook $nb showRuler=1, rulerUnits=1, updating={1, 60}
-        Notebook $nb newRuler=Normal, justification=0, margins={0,0,524}, spacing={0,0,0}, tabs={}, rulerDefaults={"Geneva",10,0,(0,0,0)}
+        Notebook $nb defaultTab=18, statusWidth=252, pageMargins={44,44,44,44}          //44 points = 0.6" margin all around
+        Notebook $nb showRuler=1, rulerUnits=1
+        Notebook $nb newRuler=Normal, justification=0, margins={0,0,524}, spacing={0,0,0}, rulerDefaults={"Geneva",10,0,(0,0,0)}
 //      
         // insert title
@@ -4911 +4913 @@
         SetDataFolder $("root:"+dataFileStr+":")
         paramStr = WaveList("*param*_"+suffix, "", "TEXT:1," )
-        Wave/T pw = $paramStr
+        Wave/T/Z pw = $paramStr
         num=numpnts(pw)
+        
+//      String/G root:beforeStr=GF_resultStr
+        //SRK clean up text a bit
+        GF_resultStr = ReplaceString("data set ",GF_resultStr, "", 1)           //case-sensitive
+        
+        for(ii=0;ii<num;ii+=1)
+                GF_resultStr = ReplaceString("; Coef_"+num2str(ii), GF_resultStr,"")
+        endfor
+        //eSRK
         for(ii=0;ii<num;ii+=1)
                 GF_resultStr = ReplaceString("Coef_"+num2str(ii), GF_resultStr, pw[ii])
         endfor
+        
+//      String/G root:afterStr=GF_resultStr
+        
         SetDataFolder $savDF
         
         Notebook $nb ruler=Normal
-        Notebook $nb  margins={0,0,524}, tabs={63 + 3*8192}
+        Notebook $nb margins={0,0,524}
         Notebook $nb text=GF_resultStr
+        Notebook $nb text="\r"
         
         //the graph
@@ -4949 +4964 @@
         return(0)
 end
-
-