Changeset 146 for sans/Analysis/branches/ajj_23APR07

Timestamp:

Aug 15, 2007 9:21:40 AM (16 years ago)

Author:

srkline

Message:

updated smeared function in CoreShell?

commented out test wrapper in Sphere

Location:

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

Files:

• CoreShell.ipf (modified) (1 diff)
• Sphere.ipf (modified) (1 diff)

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

@@ -143 +143 @@
 
 ////the name of your unsmeared model is the first argument
-        s.yW = Smear_Model_20(CoreShellForm,s.coefW,s.xW,s.resW)
+        Smear_Model_20(CoreShellForm,s.coefW,s.xW,s.yW,s.resW)
 
         return(0)

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

@@ -175 +175 @@
 // -- this looks like something that can be made rather generic rather easily
 //
-Function SphereFitWrapper(str)
-        String str
-                
-        SetDataFolder root:
-        String DF="root:"+str+":"
-        
-        Struct ResSmearAAOStruct fs
-        WAVE resW = $(DF+str+"_res")            
-        WAVE fs.resW =  resW
-        
-        WAVE cw=$(DF+"smear_coef_sf")
-        WAVE yw=$(DF+str+"_i")
-        WAVE xw=$(DF+str+"_q")
-        WAVE sw=$(DF+str+"_s")
-        
-        Duplicate/O yw $(DF+"FitYw")
-        
-        //can't use execute if /STRC is needed since structure instance is not a global!
-        //don't use the auto-destination with no flag, it doesn't appear to work correctly
-        //force it to use a wave of identical length, at least - no guarantee that the q-values 
-        // will be the same? be sure that the smearing iterpolates
-        //
-        // ?? 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 /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
-        Wave fityw =  $(DF+"FitYw")
-        fs.yW = fityw
-        SmearedSphereForm(fs)
-        AppendToGraph fityw vs xw 
-        
-        print "V_chisq = ",V_chisq
-        print cw
-        WAVE w_sigma
-        print w_sigma
-        
-        return(0)
-End
-
-Function/S getHoldStr()
-
-        String str="0010"
-        return str
-End
+//Function SphereFitWrapper(str)
+//      String str
+//              
+//      SetDataFolder root:
+//      String DF="root:"+str+":"
+//      
+//      Struct ResSmearAAOStruct fs
+//      WAVE resW = $(DF+str+"_res")            
+//      WAVE fs.resW =  resW
+//      
+//      WAVE cw=$(DF+"smear_coef_sf")
+//      WAVE yw=$(DF+str+"_i")
+//      WAVE xw=$(DF+str+"_q")
+//      WAVE sw=$(DF+str+"_s")
+//      
+//      Duplicate/O yw $(DF+"FitYw")
+//      
+//      //can't use execute if /STRC is needed since structure instance is not a global!
+//      //don't use the auto-destination with no flag, it doesn't appear to work correctly
+//      //force it to use a wave of identical length, at least - no guarantee that the q-values 
+//      // will be the same? be sure that the smearing iterpolates
+//      //
+//      // ?? 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 /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
+//      Wave fityw =  $(DF+"FitYw")
+//      fs.yW = fityw
+//      SmearedSphereForm(fs)
+//      AppendToGraph fityw vs xw 
+//      
+//      print "V_chisq = ",V_chisq
+//      print cw
+//      WAVE w_sigma
+//      print w_sigma
+//      
+//      return(0)
+//End
+//
+//Function/S getHoldStr()
+//
+//      String str="0010"
+//      return str
+//End