Ignore:
Timestamp:
Aug 15, 2007 9:21:40 AM (15 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:
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CoreShell.ipf

    r131 r146  
    143143 
    144144////the name of your unsmeared model is the first argument 
    145         s.yW = Smear_Model_20(CoreShellForm,s.coefW,s.xW,s.resW) 
     145        Smear_Model_20(CoreShellForm,s.coefW,s.xW,s.yW,s.resW) 
    146146 
    147147        return(0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Sphere.ipf

    r145 r146  
    175175// -- this looks like something that can be made rather generic rather easily 
    176176// 
    177 Function SphereFitWrapper(str) 
    178         String str 
    179                  
    180         SetDataFolder root: 
    181         String DF="root:"+str+":" 
    182          
    183         Struct ResSmearAAOStruct fs 
    184         WAVE resW = $(DF+str+"_res")             
    185         WAVE fs.resW =  resW 
    186          
    187         WAVE cw=$(DF+"smear_coef_sf") 
    188         WAVE yw=$(DF+str+"_i") 
    189         WAVE xw=$(DF+str+"_q") 
    190         WAVE sw=$(DF+str+"_s") 
    191          
    192         Duplicate/O yw $(DF+"FitYw") 
    193          
    194         //can't use execute if /STRC is needed since structure instance is not a global! 
    195         //don't use the auto-destination with no flag, it doesn't appear to work correctly 
    196         //force it to use a wave of identical length, at least - no guarantee that the q-values  
    197         // will be the same? be sure that the smearing iterpolates 
    198         // 
    199         // ?? how can I get the hold string in correctly?? - from a global? - no, as string function 
    200         // 
    201         FuncFit/H=getHoldStr() /NTHR=0 SmearedSphereForm, cw, yw /X=xw /W=sw /I=1 /STRC=fs 
    202 //      FuncFit/H=getHoldStr() /NTHR=0 SphereForm cw, yw /X=xw /W=sw /I=1 /D=$(DF+"FitYw") 
    203  
    204 //      FuncFit/H="0010"/NTHR=0 SmearedSphereForm cw, yw /X=xw /W=sw /I=1 /D=$(DF+"FitYw") /STRC=fs 
    205         Wave fityw =  $(DF+"FitYw") 
    206         fs.yW = fityw 
    207         SmearedSphereForm(fs) 
    208         AppendToGraph fityw vs xw  
    209          
    210         print "V_chisq = ",V_chisq 
    211         print cw 
    212         WAVE w_sigma 
    213         print w_sigma 
    214          
    215         return(0) 
    216 End 
    217  
    218 Function/S getHoldStr() 
    219  
    220         String str="0010" 
    221         return str 
    222 End 
     177//Function SphereFitWrapper(str) 
     178//      String str 
     179//               
     180//      SetDataFolder root: 
     181//      String DF="root:"+str+":" 
     182//       
     183//      Struct ResSmearAAOStruct fs 
     184//      WAVE resW = $(DF+str+"_res")             
     185//      WAVE fs.resW =  resW 
     186//       
     187//      WAVE cw=$(DF+"smear_coef_sf") 
     188//      WAVE yw=$(DF+str+"_i") 
     189//      WAVE xw=$(DF+str+"_q") 
     190//      WAVE sw=$(DF+str+"_s") 
     191//       
     192//      Duplicate/O yw $(DF+"FitYw") 
     193//       
     194//      //can't use execute if /STRC is needed since structure instance is not a global! 
     195//      //don't use the auto-destination with no flag, it doesn't appear to work correctly 
     196//      //force it to use a wave of identical length, at least - no guarantee that the q-values  
     197//      // will be the same? be sure that the smearing iterpolates 
     198//      // 
     199//      // ?? how can I get the hold string in correctly?? - from a global? - no, as string function 
     200//      // 
     201//      FuncFit/H=getHoldStr() /NTHR=0 SmearedSphereForm, cw, yw /X=xw /W=sw /I=1 /STRC=fs 
     202////    FuncFit/H=getHoldStr() /NTHR=0 SphereForm cw, yw /X=xw /W=sw /I=1 /D=$(DF+"FitYw") 
     203// 
     204////    FuncFit/H="0010"/NTHR=0 SmearedSphereForm cw, yw /X=xw /W=sw /I=1 /D=$(DF+"FitYw") /STRC=fs 
     205//      Wave fityw =  $(DF+"FitYw") 
     206//      fs.yW = fityw 
     207//      SmearedSphereForm(fs) 
     208//      AppendToGraph fityw vs xw  
     209//       
     210//      print "V_chisq = ",V_chisq 
     211//      print cw 
     212//      WAVE w_sigma 
     213//      print w_sigma 
     214//       
     215//      return(0) 
     216//End 
     217// 
     218//Function/S getHoldStr() 
     219// 
     220//      String str="0010" 
     221//      return str 
     222//End 
Note: See TracChangeset for help on using the changeset viewer.