Changeset 144 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files

Timestamp:

Aug 14, 2007 3:40:40 PM (15 years ago)

Author:

srkline

Message:

Changed Gauss Utils to use double precision in quadrature

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files

Files:

• Put in User Procedures/SANS_Models_v3.00/GaussUtils.ipf (modified) (5 diffs)
• Put in User Procedures/SANS_Models_v3.00/Sphere.ipf (modified) (2 diffs)
• SANS_Analysis_v3.01.pxt (modified) (previous)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/GaussUtils.ipf

@@ -61 +61 @@
 EndStructure
 
-Function/S getHoldStr()
-
-        String str="0010"
-        return str
-End
-
 // utility used in the "PlotSmeared...() macros to get a list of data folders
 //
@@ -89 +83 @@
                 index += 1
         while(1)
+        
+        // remove myGlobals from the folder list
+        if(type==4)
+                str = RemoveFromList("myGlobals", str , ";" )
+        endif
         
         return(str)
@@ -653 +652 @@
         // returned from the interpolation (as expected)
 
-        Make/O/N=(DimSize(resW, 0)) sigQ,qbar,shad,qvals
+        Make/O/D/N=(DimSize(resW, 0)) sigQ,qbar,shad,qvals
         sigq = resW[p][0]               //std dev of resolution fn
         qbar = resW[p][1]               //mean q-value
@@ -684 +683 @@
                 ii=0                    // loop counter
                 // do the calculation as a single pass w/AAO function
-                Make/O/N=(nord) Resoln,yyy,xGauss
+                Make/O/D/N=(nord) Resoln,yyy,xGauss
                 do
                         // calculate Gauss points on integration interval (q-value for evaluation)
@@ -904 +903 @@
         
         Print "in SANSModelAAO_proto function"
+        return(1)
+end
+
+// prototype function for fit wrapper
+// it intentionally does nothing
+Function SANSModelSTRUCT_proto(s)
+        Struct ResSmearAAOStruct &s     
+
+        Print "in SANSModelSTRUCT_proto function"
         return(1)
 end

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Sphere.ipf

@@ -199 +199 @@
         // ?? how can I get the hold string in correctly?? - from a global? - no, as string function
         //
-        FuncFit/H=getHoldStr() /NTHR=0 SmearedSphereForm cw, yw /X=xw /W=sw /I=1 /D=$(DF+"FitYw") /STRC=fs
+        FuncFit/H=getHoldStr() /NTHR=0 SmearedSphereForm, cw, yw /X=xw /W=sw /I=1 /STRC=fs
+//      FuncFit/H=getHoldStr() /NTHR=0 SphereForm cw, yw /X=xw /W=sw /I=1 /D=$(DF+"FitYw")
 
 //      FuncFit/H="0010"/NTHR=0 SmearedSphereForm cw, yw /X=xw /W=sw /I=1 /D=$(DF+"FitYw") /STRC=fs
-                
-        AppendToGraph $(DF+"FitYw") vs xw 
+        Wave fityw =  $(DF+"FitYw")
+        fs.yW = fityw
+        SmearedSphereForm(fs)
+        AppendToGraph fityw vs xw 
         
         print "V_chisq = ",V_chisq
@@ -212 +215 @@
         return(0)
 End
+
+Function/S getHoldStr()
+
+        String str="0010"
+        return str
+End