Ignore:
Timestamp:
Jun 10, 2008 4:00:21 PM (14 years ago)
Author:
srkline
Message:

Removed Angstrom symbol (Mac code) and replaced it with simply a capital "A" so strange symbols won't appear anymore on Win.

Location:
sans/Dev/trunk/NCNR_User_Procedures
Files:
130 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/BE_Polyelectrolyte_v40.ipf

    r325 r379  
    1616        Variable num=512,qmin=0.001,qmax=0.2 
    1717        Prompt num "Enter number of data points for model: " 
    18         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    19         Prompt qmax "Enter maximum q-value (^-1) for model: "   
     18        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     19        Prompt qmax "Enter maximum q-value (A^-1) for model: "   
    2020 
    2121        make/o/n=(num) xwave_BE,ywave_BE 
    2222        xwave_BE =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num))      
    2323        make/o coef_BE = {10,7.1,12,10,0.00,0.05,0.7,0.001} 
    24         make/o/t parameters_BE = {"K (barns)","Lb ()","h (-3)","b ()","Cs (mol/L)","alpha","C (mol/L)","Background"}  
     24        make/o/t parameters_BE = {"K (barns)","Lb (A)","h (A-3)","b (A)","Cs (mol/L)","alpha","C (mol/L)","Background"}  
    2525        Edit parameters_BE,coef_BE 
    2626        Variable/G root:g_BE 
     
    2929        Display ywave_BE vs xwave_BE 
    3030        ModifyGraph log=0,marker=29,msize=2,mode=4                      //**** log=0 if linear scale desired 
    31         Label bottom "q (\\S-1\\M)" 
     31        Label bottom "q (A\\S-1\\M)" 
    3232        Label left "S(q) BE , cm\\S-1\\M" 
    3333        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5151        // Setup parameter table for model function 
    5252        make/o smear_coef_BE = {10,7.1,12,10,0.00,0.05,0.7,0.001}                                       //**** mod, coef values to match unsmeared model above 
    53         make/o/t smear_parameters_BE= {"K (barns)","Lb ()","h (-3)","b ()","Cs (mol/L)","alpha","C (mol/L)","Background"}     
     53        make/o/t smear_parameters_BE= {"K (barns)","Lb (A)","h (A-3)","b (A)","Cs (mol/L)","alpha","C (mol/L)","Background"}     
    5454        Edit smear_parameters_BE,smear_coef_BE                                  //**** mod 
    5555         
     
    6464        Display smeared_BE vs smeared_qvals                                                                     //**** mod 
    6565        ModifyGraph log=0,marker=29,msize=2,mode=4 
    66         Label bottom "q (\\S-1\\M)" 
     66        Label bottom "q (A\\S-1\\M)" 
    6767        Label left "I  sBE (cm\\S-1\\M)" 
    6868        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    9494        Variable q 
    9595// Input (fitting) variables are: 
    96         //[0] K  = contrast factor  (barns = 10-24 cm^2=10-4 ^2) 
    97         //[1] Lb = Bjerrum length ; this parameter needs to be kept constant for a given solvent and temperature!  () 
    98         //[2]  h = virial parameter (3) 
    99         //[3]  b = monomer length  () 
     96        //[0] K  = contrast factor  (barns = 10-24 cm^2=10-4 A^2) 
     97        //[1] Lb = Bjerrum length ; this parameter needs to be kept constant for a given solvent and temperature!  (A) 
     98        //[2]  h = virial parameter (A3) 
     99        //[3]  b = monomer length  (A) 
    100100        //[4]  Cs = concentration of monovalent salt (mol/L) 
    101101        //[5]  alpha = ionization degree : ratio of charged monomers  to total number of monomers 
     
    128128// where : b = Sum(batom) ; batom = scattering length in cm-12  
    129129//              vp = partial molar volume of the polymer ; vsolvent= partial molar volume of the solvent 
    130 // NB :K in  Barns = 10^-24 cm2 ; the rest of the expression is in -3 = 10^24 cm3 
     130// NB :K in  Barns = 10^-24 cm2 ; the rest of the expression is in A-3 = 10^24 cm3 
    131131//  -> there is no multiplication factor to get the result in cm-1 .  
    132132// Returns S(q) in cm-1 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/CoreShellCylinder_v40.ipf

    r325 r379  
    1717        Variable num=128,qmin=0.001,qmax=0.7 
    1818        Prompt num "Enter number of data points for model: " 
    19         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    20         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     19        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     20        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2121         
    2222        make/o/d/n=(num) xwave_cscyl,ywave_cscyl 
     
    3030        Display ywave_cscyl vs xwave_cscyl 
    3131        ModifyGraph log=1,marker=29,msize=2,mode=4 
    32         Label bottom "q (\\S-1\\M)" 
     32        Label bottom "q (A\\S-1\\M)" 
    3333        Label left "Intensity (cm\\S-1\\M)" 
    3434        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6565        Display smeared_cscyl vs smeared_qvals 
    6666        ModifyGraph log=1,marker=29,msize=2,mode=4 
    67         Label bottom "q (\\S-1\\M)" 
     67        Label bottom "q (A\\S-1\\M)" 
    6868        Label left "Intensity (cm\\S-1\\M)" 
    6969        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/CoreShell_Sq_v40.ipf

    r325 r379  
    1414        Variable num=256,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/n=(num) xwave_CSS_HS,ywave_CSS_HS 
     
    2727        Display/K=1 ywave_CSS_HS vs xwave_CSS_HS 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131 
     
    6262        Display smeared_CSS_HS vs smeared_qvals                                                                  
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666 
     
    110110        Variable num=256,qmin=0.001,qmax=0.7 
    111111        Prompt num "Enter number of data points for model: " 
    112         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    113         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     112        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     113        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    114114         
    115115        Make/O/D/n=(num) xwave_CSS_SW,ywave_CSS_SW 
     
    123123        Display/K=1 ywave_CSS_SW vs xwave_CSS_SW 
    124124        ModifyGraph log=1,marker=29,msize=2,mode=4 
    125         Label bottom "q (\\S-1\\M)" 
     125        Label bottom "q (A\\S-1\\M)" 
    126126        Label left "Intensity (cm\\S-1\\M)" 
    127127 
     
    158158        Display smeared_CSS_SW vs smeared_qvals                                                                  
    159159        ModifyGraph log=1,marker=29,msize=2,mode=4 
    160         Label bottom "q (\\S-1\\M)" 
     160        Label bottom "q (A\\S-1\\M)" 
    161161        Label left "Intensity (cm\\S-1\\M)" 
    162162 
     
    209209        Variable num=256,qmin=0.001,qmax=0.7 
    210210        Prompt num "Enter number of data points for model: " 
    211         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    212         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     211        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     212        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    213213         
    214214        if(!DataFolderExists(":HayPenMSA")) 
     
    227227        Display/K=1 ywave_CSS_SC vs xwave_CSS_SC 
    228228        ModifyGraph log=1,marker=29,msize=2,mode=4 
    229         Label bottom "q (\\S-1\\M)" 
     229        Label bottom "q (A\\S-1\\M)" 
    230230        Label left "Intensity (cm\\S-1\\M)" 
    231231 
     
    267267        Display smeared_CSS_SC vs smeared_qvals                                                                  
    268268        ModifyGraph log=1,marker=29,msize=2,mode=4 
    269         Label bottom "q (\\S-1\\M)" 
     269        Label bottom "q (A\\S-1\\M)" 
    270270        Label left "Intensity (cm\\S-1\\M)" 
    271271 
     
    319319        Variable num=256,qmin=0.001,qmax=0.7 
    320320        Prompt num "Enter number of data points for model: " 
    321         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    322         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     321        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     322        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    323323         
    324324        Make/O/D/n=(num) xwave_CSS_SHS,ywave_CSS_SHS 
     
    332332        Display/K=1 ywave_CSS_SHS vs xwave_CSS_SHS 
    333333        ModifyGraph log=1,marker=29,msize=2,mode=4 
    334         Label bottom "q (\\S-1\\M)" 
     334        Label bottom "q (A\\S-1\\M)" 
    335335        Label left "Intensity (cm\\S-1\\M)" 
    336336 
     
    367367        Display smeared_CSS_SHS vs smeared_qvals                                                                         
    368368        ModifyGraph log=1,marker=29,msize=2,mode=4 
    369         Label bottom "q (\\S-1\\M)" 
     369        Label bottom "q (A\\S-1\\M)" 
    370370        Label left "Intensity (cm\\S-1\\M)" 
    371371 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/CoreShell_v40.ipf

    r325 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        make/o/d/n=(num) xwave_css,ywave_css 
     
    2828        Display ywave_css vs xwave_css 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)" 
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6464        Display smeared_css vs smeared_qvals                                                                     
    6565        ModifyGraph log=1,marker=29,msize=2,mode=4 
    66         Label bottom "q (\\S-1\\M)" 
     66        Label bottom "q (A\\S-1\\M)" 
    6767        Label left "Intensity (cm\\S-1\\M)" 
    6868        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    9494        // variables are: 
    9595        //[0] scale factor 
    96         //[1] radius of core [] 
    97         //[2] thickness of the shell    [] 
    98         //[3] SLD of the core   [-2] 
     96        //[1] radius of core [A] 
     97        //[2] thickness of the shell    [A] 
     98        //[3] SLD of the core   [A-2] 
    9999        //[4] SLD of the shell 
    100100        //[5] SLD of the solvent 
     
    130130        f += vol*bes*contr 
    131131         
    132         // normalize to particle volume and rescale from [-1] to [cm-1] 
     132        // normalize to particle volume and rescale from [A-1] to [cm-1] 
    133133        f2 = f*f/vol*1.0e8 
    134134         
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Cylinder_Sq_v40.ipf

    r325 r379  
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/n=(num) xwave_CYL_HS,ywave_CYL_HS 
     
    2727        Display ywave_CYL_HS vs xwave_CYL_HS 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131 
     
    6262        Display smeared_CYL_HS vs smeared_qvals                                                                  
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666 
     
    110110        Variable num=128,qmin=0.001,qmax=0.7 
    111111        Prompt num "Enter number of data points for model: " 
    112         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    113         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     112        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     113        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    114114         
    115115        Make/O/D/n=(num) xwave_CYL_SW,ywave_CYL_SW 
     
    123123        Display ywave_CYL_SW vs xwave_CYL_SW 
    124124        ModifyGraph log=1,marker=29,msize=2,mode=4 
    125         Label bottom "q (\\S-1\\M)" 
     125        Label bottom "q (A\\S-1\\M)" 
    126126        Label left "Intensity (cm\\S-1\\M)" 
    127127 
     
    158158        Display smeared_CYL_SW vs smeared_qvals                                                                  
    159159        ModifyGraph log=1,marker=29,msize=2,mode=4 
    160         Label bottom "q (\\S-1\\M)" 
     160        Label bottom "q (A\\S-1\\M)" 
    161161        Label left "Intensity (cm\\S-1\\M)" 
    162162 
     
    208208        Variable num=128,qmin=0.001,qmax=0.7 
    209209        Prompt num "Enter number of data points for model: " 
    210         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    211         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     210        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     211        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    212212         
    213213        if(!DataFolderExists(":HayPenMSA")) 
     
    226226        Display ywave_CYL_SC vs xwave_CYL_SC 
    227227        ModifyGraph log=1,marker=29,msize=2,mode=4 
    228         Label bottom "q (\\S-1\\M)" 
     228        Label bottom "q (A\\S-1\\M)" 
    229229        Label left "Intensity (cm\\S-1\\M)" 
    230230 
     
    266266        Display smeared_CYL_SC vs smeared_qvals                                                                  
    267267        ModifyGraph log=1,marker=29,msize=2,mode=4 
    268         Label bottom "q (\\S-1\\M)" 
     268        Label bottom "q (A\\S-1\\M)" 
    269269        Label left "Intensity (cm\\S-1\\M)" 
    270270 
     
    319319        Variable num=128,qmin=0.001,qmax=0.7 
    320320        Prompt num "Enter number of data points for model: " 
    321         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    322         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     321        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     322        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    323323         
    324324        Make/O/D/n=(num) xwave_CYL_SHS,ywave_CYL_SHS 
     
    332332        Display ywave_CYL_SHS vs xwave_CYL_SHS 
    333333        ModifyGraph log=1,marker=29,msize=2,mode=4 
    334         Label bottom "q (\\S-1\\M)" 
     334        Label bottom "q (A\\S-1\\M)" 
    335335        Label left "Intensity (cm\\S-1\\M)" 
    336336 
     
    367367        Display smeared_CYL_SHS vs smeared_qvals                                                                         
    368368        ModifyGraph log=1,marker=29,msize=2,mode=4 
    369         Label bottom "q (\\S-1\\M)" 
     369        Label bottom "q (A\\S-1\\M)" 
    370370        Label left "Intensity (cm\\S-1\\M)" 
    371371 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Cylinder_v40.ipf

    r325 r379  
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        make/o/D/n=(num) xwave_cyl,ywave_cyl 
     
    2727        Display ywave_cyl vs xwave_cyl 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6262        Display smeared_cyl vs smeared_qvals 
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/DAB_model_v40.ipf

    r325 r379  
    1313        Variable num=512, qmin=.001, qmax=.7 
    1414        Prompt num "Enter number of data points for model: " 
    15         Prompt qmin "Enter minimum q-value (^1) for model: "  
    16          Prompt qmax "Enter maximum q-value (^1) for model: " 
     15        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     16         Prompt qmax "Enter maximum q-value (A^1) for model: " 
    1717// 
    1818        Make/O/D/n=(num) xwave_DAB, ywave_DAB 
    1919        xwave_DAB =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    2020        Make/O/D coef_DAB = {10.0, 40, 1.0} 
    21         make/o/t parameters_DAB = {"Scale Factor, A ", "Correlation Length ()", "Incoherent Bgd (cm-1)"} 
     21        make/o/t parameters_DAB = {"Scale Factor, A ", "Correlation Length (A)", "Incoherent Bgd (cm-1)"} 
    2222        Edit parameters_DAB, coef_DAB 
    2323        Variable/G root:g_DAB 
     
    2727        ModifyGraph marker=29, msize=2, mode=4 
    2828        ModifyGraph log(left)=1 
    29         Label bottom "q (\\S-1\\M) " 
     29        Label bottom "q (A\\S-1\\M) " 
    3030        Label left "Debye-Anderson-Brumberger Model (cm\\S-1\\M)" 
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    4949        // Setup parameter table for model function 
    5050        Make/O/D smear_coef_DAB = {10.0, 40, 1.0}                                       //model  coef values to match unsmeared model above 
    51         make/o/t smear_parameters_DAB = {"Scale Factor, A ", "Correlation Length ()", "Incoherent Bgd (cm-1)"}// parameter names 
     51        make/o/t smear_parameters_DAB = {"Scale Factor, A ", "Correlation Length (A)", "Incoherent Bgd (cm-1)"}// parameter names 
    5252        Edit smear_parameters_DAB,smear_coef_DAB                                        //display parameters in a table 
    5353         
     
    6262        Display smeared_DAB vs smeared_qvals                                                                    // 
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Debye-Anderson-Brumberger Model (cm\\S-1\\M)" 
    6666        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/HPMSA_v40.ipf

    r348 r379  
    2828        Display ywave_hpmsa vs xwave_hpmsa       
    2929        ModifyGraph log=0,marker=29,msize=2,mode=4,grid=1                       //**** log=0 if linear scale desired 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Structure Factor"    
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    7272        variable dialec, Perm, Beta, Temp, zz, charge, ierr 
    7373 
    74         diam=w[0]               //in   (not SI .. should force people to think in nm!!!) 
     74        diam=w[0]               //in A  (not SI .. should force people to think in nm!!!) 
    7575        zz = w[1]               //# of charges 
    7676        VolFrac=w[2]     
    77         QQ=x                    //in ^-1 (not SI .. should force people to think in nm^-1!!!) 
     77        QQ=x                    //in A^-1 (not SI .. should force people to think in nm^-1!!!) 
    7878        Temp=w[3]               //in degrees Kelvin 
    7979        csalt=w[4]              //in molarity 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/HardSphereStruct_v40.ipf

    r325 r379  
    1414        Variable num=128,qmin=0.001,qmax=0.3 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/n=(num) xwave_hss,ywave_hss 
     
    2828        Display ywave_hss vs xwave_hss 
    2929        ModifyGraph marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Structure Factor" 
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/HollowCylinders_v40.ipf

    r325 r379  
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/n=(num) xwave_Hcyl,ywave_Hcyl 
     
    2727        Display ywave_Hcyl vs xwave_Hcyl 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6262        Display smeared_Hcyl vs smeared_qvals 
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Lorentz_model_v40.ipf

    r325 r379  
    88        Variable num=512, qmin=.001, qmax=.7 
    99        Prompt num "Enter number of data points for model: " 
    10         Prompt qmin "Enter minimum q-value (^1) for model: "  
    11          Prompt qmax "Enter maximum q-value (^1) for model: " 
     10        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     11         Prompt qmax "Enter maximum q-value (A^1) for model: " 
    1212// 
    1313        Make/O/D/n=(num) xwave_Lorentz, ywave_Lorentz 
    1414        xwave_Lorentz =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    1515        Make/O/D coef_Lorentz = {100.0, 50.0, 1.0} 
    16         make/o/t parameters_Lorentz = {"Scale Factor, I0 ", "Screening Length ()","Incoherent Bgd (cm-1)"} 
     16        make/o/t parameters_Lorentz = {"Scale Factor, I0 ", "Screening Length (A)","Incoherent Bgd (cm-1)"} 
    1717        Edit parameters_Lorentz, coef_Lorentz 
    1818        Variable/G root:g_Lorentz 
     
    2222        ModifyGraph marker=29, msize=2, mode=4 
    2323        ModifyGraph log(left)=1 
    24         Label bottom "q (\\S-1\\M) " 
     24        Label bottom "q (A\\S-1\\M) " 
    2525        Label left "Lorentzian (cm\\S-1\\M)" 
    2626        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    4444        // Setup parameter table for model function 
    4545        Make/O/D smear_coef_Lorentz = {100.0, 50.0, 1.0} 
    46         make/o/t smear_parameters_Lorentz = {"Scale Factor, I0 ", "Screening Length ()","Incoherent Bgd (cm-1)"} 
     46        make/o/t smear_parameters_Lorentz = {"Scale Factor, I0 ", "Screening Length (A)","Incoherent Bgd (cm-1)"} 
    4747        Edit smear_parameters_Lorentz,smear_coef_Lorentz                                        //display parameters in a table 
    4848         
     
    5757        Display smeared_Lorentz vs smeared_qvals                                                                        // 
    5858        ModifyGraph log=1,marker=29,msize=2,mode=4 
    59         Label bottom "q (\\S-1\\M)" 
     59        Label bottom "q (A\\S-1\\M)" 
    6060        Label left "Lorentz Model (cm\\S-1\\M)" 
    6161        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/Beaucage_v40.ipf

    r253 r379  
    1717        Variable num=256,qmin=0.001,qmax=0.7 
    1818        Prompt num "Enter number of data points for model: " 
    19         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    20         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     19        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     20        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2121         
    2222        make/o/d/n=(num) xwave_b1,ywave_b1 
     
    3030        Display ywave_b1 vs xwave_b1 
    3131        ModifyGraph log=1,marker=29,msize=2,mode=4 
    32         Label bottom "q (\\S-1\\M)" 
     32        Label bottom "q (A\\S-1\\M)" 
    3333        Label left "Intensity (cm\\S-1\\M)" 
    3434        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    4040        Variable num=256,qmin=0.001,qmax=0.7 
    4141        Prompt num "Enter number of data points for model: " 
    42         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    43         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     42        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     43        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    4444         
    4545        make/o/d/n=(num) xwave_b2,ywave_b2 
     
    5353        Display ywave_b2 vs xwave_b2 
    5454        ModifyGraph log=1,marker=29,msize=2,mode=4 
    55         Label bottom "q (\\S-1\\M)" 
     55        Label bottom "q (A\\S-1\\M)" 
    5656        Label left "Intensity (cm\\S-1\\M)" 
    5757        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6363        Variable num=256,qmin=0.001,qmax=0.7 
    6464        Prompt num "Enter number of data points for model: " 
    65         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    66         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     65        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     66        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    6767         
    6868        make/o/d/n=(num) xwave_b3,ywave_b3 
     
    7676        Display ywave_b3 vs xwave_b3 
    7777        ModifyGraph log=1,marker=29,msize=2,mode=4 
    78         Label bottom "q (\\S-1\\M)" 
     78        Label bottom "q (A\\S-1\\M)" 
    7979        Label left "Intensity (cm\\S-1\\M)" 
    8080        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    8686        Variable num=256,qmin=0.001,qmax=0.7 
    8787        Prompt num "Enter number of data points for model: " 
    88         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    89         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     88        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     89        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    9090         
    9191        make/o/d/n=(num) xwave_b4,ywave_b4 
     
    9999        Display ywave_b4 vs xwave_b4 
    100100        ModifyGraph log=1,marker=29,msize=2,mode=4 
    101         Label bottom "q (\\S-1\\M)" 
     101        Label bottom "q (A\\S-1\\M)" 
    102102        Label left "Intensity (cm\\S-1\\M)" 
    103103        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    135135        Display smeared_b1 vs smeared_qvals                                                                      
    136136        ModifyGraph log=1,marker=29,msize=2,mode=4 
    137         Label bottom "q (\\S-1\\M)" 
     137        Label bottom "q (A\\S-1\\M)" 
    138138        Label left "Intensity (cm\\S-1\\M)" 
    139139        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    170170        Display smeared_b2 vs smeared_qvals                                                                      
    171171        ModifyGraph log=1,marker=29,msize=2,mode=4 
    172         Label bottom "q (\\S-1\\M)" 
     172        Label bottom "q (A\\S-1\\M)" 
    173173        Label left "Intensity (cm\\S-1\\M)" 
    174174        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    205205        Display smeared_b3 vs smeared_qvals                                                                      
    206206        ModifyGraph log=1,marker=29,msize=2,mode=4 
    207         Label bottom "q (\\S-1\\M)" 
     207        Label bottom "q (A\\S-1\\M)" 
    208208        Label left "Intensity (cm\\S-1\\M)" 
    209209        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    240240        Display smeared_b4 vs smeared_qvals                                                                      
    241241        ModifyGraph log=1,marker=29,msize=2,mode=4 
    242         Label bottom "q (\\S-1\\M)" 
     242        Label bottom "q (A\\S-1\\M)" 
    243243        Label left "Intensity (cm\\S-1\\M)" 
    244244        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/BimodalSchulzSpheres_v40.ipf

    r273 r379  
    1616        Variable num=128,qmin=0.001,qmax=0.7 
    1717        Prompt num "Enter number of data points for model: " 
    18         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    19         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     18        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     19        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2020         
    2121        Make/O/D/n=(num) xwave_bss,ywave_bss 
     
    3131        Display ywave_bss vs xwave_bss 
    3232        ModifyGraph log=1,marker=29,msize=2,mode=4 
    33         Label bottom "q (\\S-1\\M)" 
     33        Label bottom "q (A\\S-1\\M)" 
    3434        Label left "Intensity (cm\\S-1\\M)" 
    3535        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6969        Display smeared_bss vs smeared_qvals 
    7070        ModifyGraph log=1,marker=29,msize=2,mode=4 
    71         Label bottom "q (\\S-1\\M)" 
     71        Label bottom "q (A\\S-1\\M)" 
    7272        Label left "Intensity (cm\\S-1\\M)" 
    7373        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/BinaryHardSpheres_v40.ipf

    r253 r379  
    4747        Variable num=256, qmin=.001, qmax=.7 
    4848        Prompt num "Enter number of data points for model: " 
    49         Prompt qmin "Enter minimum q-value (-1) for model: "  
    50         Prompt qmax "Enter maximum q-value (-1) for model: " 
     49        Prompt qmin "Enter minimum q-value (A-1) for model: "  
     50        Prompt qmax "Enter maximum q-value (A-1) for model: " 
    5151// 
    5252        Make/O/D/n=(num) xwave_BinaryHS, ywave_BinaryHS 
     
    6363        ModifyGraph marker=29, msize=2, mode=4 
    6464        ModifyGraph log=1 
    65         Label bottom "q (\\S-1\\M) " 
     65        Label bottom "q (A\\S-1\\M) " 
    6666        Label left "I(q) (cm\\S-1\\M)" 
    6767        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    9898        Display smeared_BinaryHS vs smeared_qvals                                                                       // 
    9999        ModifyGraph log=1,marker=29,msize=2,mode=4 
    100         Label bottom "q (\\S-1\\M)" 
     100        Label bottom "q (A\\S-1\\M)" 
    101101        Label left "I(q) (cm\\S-1\\M)" 
    102102        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/Cylinder_PolyLength_v40.ipf

    r273 r379  
    2020        Variable num=100,qmin=0.001,qmax=0.7 
    2121        Prompt num "Enter number of data points for model: " 
    22         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    23         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     22        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     23        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2424         
    2525        make/o/d/n=(num) xwave_cypl,ywave_cypl 
     
    3333        Display ywave_cypl vs xwave_cypl 
    3434        ModifyGraph log=1,marker=29,msize=2,mode=4 
    35         Label bottom "q (\\S-1\\M)" 
     35        Label bottom "q (A\\S-1\\M)" 
    3636        Label left "Intensity (cm\\S-1\\M)" 
    3737        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6767        Display smeared_cypl vs smeared_qvals 
    6868        ModifyGraph log=1,marker=29,msize=2,mode=4 
    69         Label bottom "q (\\S-1\\M)" 
     69        Label bottom "q (A\\S-1\\M)" 
    7070        Label left "Intensity (cm\\S-1\\M)" 
    7171        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/Cylinder_PolyRadius_v40.ipf

    r369 r379  
    2020        Variable num=128,qmin=0.001,qmax=0.7 
    2121        Prompt num "Enter number of data points for model: " 
    22         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    23         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     22        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     23        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2424         
    2525        make/o/d/n=(num) xwave_cypr,ywave_cypr 
     
    3333        Display ywave_cypr vs xwave_cypr 
    3434        ModifyGraph log=1,marker=29,msize=2,mode=4 
    35         Label bottom "q (\\S-1\\M)" 
     35        Label bottom "q (A\\S-1\\M)" 
    3636        Label left "Intensity (cm\\S-1\\M)" 
    3737        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6868        Display smeared_cypr vs smeared_qvals 
    6969        ModifyGraph log=1,marker=29,msize=2,mode=4 
    70         Label bottom "q (\\S-1\\M)" 
     70        Label bottom "q (A\\S-1\\M)" 
    7171        Label left "Intensity (cm\\S-1\\M)" 
    7272        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/Debye_v40.ipf

    r253 r379  
    77        Variable num=256,qmin=0.001,qmax=0.7 
    88        Prompt num "Enter number of data points for model: " 
    9         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    10         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     9        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     10        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1111         
    1212        make/O/D/N=(num) xwave_deb,ywave_deb 
     
    2020        Display ywave_deb vs xwave_deb 
    2121        ModifyGraph marker=29,msize=2,mode=4,log=1 
    22         Label bottom "q (\\S-1\\M)" 
     22        Label bottom "q (A\\S-1\\M)" 
    2323        Label left "Intensity (cm\\S-1\\M)" 
    2424        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5454        Display smeared_deb vs smeared_qvals 
    5555        ModifyGraph log=1,marker=29,msize=2,mode=4 
    56         Label bottom "q (\\S-1\\M)" 
     56        Label bottom "q (A\\S-1\\M)" 
    5757        Label left "Intensity (cm\\S-1\\M)" 
    5858        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    8686        // variables are: 
    8787        //[0] scale factor 
    88         //[1] radius of gyration [] 
     88        //[1] radius of gyration [A] 
    8989        //[2] background        [cm-1] 
    9090         
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/EllipticalCylinder_v40.ipf

    r253 r379  
    1717        Variable num=50,qmin=0.001,qmax=0.7 
    1818        Prompt num "Enter number of data points for model: " 
    19         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    20         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     19        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     20        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2121         
    2222//      //constants needed for the integration if qtrap is used (in a separate procedure file!) 
     
    2828        xwave_ecf =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    2929        Make/O/D coef_ecf = {1.,20.,1.5,400,1.0e-6,6.3e-6,0.0} 
    30         make/o/t parameters_ecf = {"scale","minor radius (A)","nu = major/minor (-)","length ()","SLD cylinder (A^-2)","SLD solvent (A^-2)","incoh. bkg (cm^-1)"} 
     30        make/o/t parameters_ecf = {"scale","minor radius (A)","nu = major/minor (-)","length (A)","SLD cylinder (A^-2)","SLD solvent (A^-2)","incoh. bkg (cm^-1)"} 
    3131        Edit parameters_ecf,coef_ecf 
    3232         
     
    3535        Display ywave_ecf vs xwave_ecf 
    3636        ModifyGraph log=1,marker=29,msize=2,mode=4 
    37         Label bottom "q (\\S-1\\M)" 
     37        Label bottom "q (A\\S-1\\M)" 
    3838        Label left "Intensity (cm\\S-1\\M)" 
    3939        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5757        // Setup parameter table for model function 
    5858        Make/O/D smear_coef_ecf =  {1.,20.,1.5,400,1.0e-6,6.3e-6,0.0} 
    59         make/o/t smear_parameters_ecf = {"scale","minor radius (A)","nu = major/minor (-)","length ()","SLD cylinder (A^-2)","SLD solvent (A^-2)","incoh. bkg (cm^-1)"} 
     59        make/o/t smear_parameters_ecf = {"scale","minor radius (A)","nu = major/minor (-)","length (A)","SLD cylinder (A^-2)","SLD solvent (A^-2)","incoh. bkg (cm^-1)"} 
    6060        Edit smear_parameters_ecf,smear_coef_ecf 
    6161         
     
    7070        Display smeared_ecf vs smeared_qvals 
    7171        ModifyGraph log=1,marker=29,msize=2,mode=4 
    72         Label bottom "q (\\S-1\\M)" 
     72        Label bottom "q (A\\S-1\\M)" 
    7373        Label left "Intensity (cm\\S-1\\M)" 
    7474        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/FlexCyl_EllipCross_v40.ipf

    r273 r379  
    1919        Variable num=128,qmin=0.001,qmax=0.7 
    2020        Prompt num "Enter number of data points for model: " 
    21         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    22         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     21        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     22        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2323         
    2424        Make/O/D/n=(num) xwave_fleell,ywave_fleell 
     
    3232        Display ywave_fleell vs xwave_fleell 
    3333        ModifyGraph log=1,marker=29,msize=2,mode=4 
    34         Label bottom "q (\\S-1\\M)" 
     34        Label bottom "q (A\\S-1\\M)" 
    3535        Label left "Intensity (cm\\S-1\\M)" 
    3636        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6666        Display smeared_fleell vs smeared_qvals                                                                 // 
    6767        ModifyGraph log=1,marker=29,msize=2,mode=4 
    68         Label bottom "q (\\S-1\\M)" 
     68        Label bottom "q (A\\S-1\\M)" 
    6969        Label left "I(q) (cm\\S-1\\M)" 
    7070        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/FlexCyl_PolyLen_v40.ipf

    r273 r379  
    1111        Variable num=128,qmin=0.001,qmax=0.7 
    1212        Prompt num "Enter number of data points for model: " 
    13         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    14         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     13        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     14        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1515         
    1616        // Setup parameter table for model function 
     
    2525        Display ywave_flepl vs xwave_flepl 
    2626        ModifyGraph log=1,marker=29,msize=2,mode=4 
    27         Label bottom "q (\\S-1\\M)" 
     27        Label bottom "q (A\\S-1\\M)" 
    2828        Label left "Intensity (cm\\S-1\\M)" 
    2929        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5959        Display smeared_flepl vs smeared_qvals                                                                  // 
    6060        ModifyGraph log=1,marker=29,msize=2,mode=4 
    61         Label bottom "q (\\S-1\\M)" 
     61        Label bottom "q (A\\S-1\\M)" 
    6262        Label left "I(q) (cm\\S-1\\M)" 
    6363        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/FlexCyl_PolyRadius_v40.ipf

    r273 r379  
    1010        Variable num=100,qmin=0.001,qmax=0.7 
    1111        Prompt num "Enter number of data points for model: " 
    12         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    13         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     12        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     13        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1414         
    1515        Make/O/D/n=(num) xwave_fcpr,ywave_fcpr 
     
    2323        Display ywave_fcpr vs xwave_fcpr 
    2424        ModifyGraph log=1,marker=29,msize=2,mode=4 
    25         Label bottom "q (\\S-1\\M)" 
     25        Label bottom "q (A\\S-1\\M)" 
    2626        Label left "Intensity (cm\\S-1\\M)" 
    2727        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5757        Display smeared_fcpr vs smeared_qvals                                                                    
    5858        ModifyGraph log=1,marker=29,msize=2,mode=4 
    59         Label bottom "q (\\S-1\\M)" 
     59        Label bottom "q (A\\S-1\\M)" 
    6060        Label left "Intensity (cm\\S-1\\M)" 
    6161        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/FlexibleCylinder_v40.ipf

    r253 r379  
    2222        Variable num=128,qmin=0.001,qmax=0.7 
    2323        Prompt num "Enter number of data points for model: " 
    24         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    25         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     24        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     25        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2626                 
    2727        Make/O/D/n=(num) xwave_fle,ywave_fle 
     
    3535        Display ywave_fle vs xwave_fle 
    3636        ModifyGraph log=1,marker=29,msize=2,mode=4 
    37         Label bottom "q (\\S-1\\M)" 
     37        Label bottom "q (A\\S-1\\M)" 
    3838        Label left "Intensity (cm\\S-1\\M)" 
    3939        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    7070        Display smeared_fle vs smeared_qvals                                                                     
    7171        ModifyGraph log=1,marker=29,msize=2,mode=4 
    72         Label bottom "q (\\S-1\\M)" 
     72        Label bottom "q (A\\S-1\\M)" 
    7373        Label left "Intensity (cm\\S-1\\M)" 
    7474        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/Fractal_v40.ipf

    r253 r379  
    1313        Variable num=128,qmin=0.001,qmax=0.5 
    1414        Prompt num "Enter number of data points for model: " 
    15         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    16         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     15        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     16        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1717         
    1818        Make/O/D/n=(num) xwave_fra,ywave_fra                                     
     
    2626        Display ywave_fra vs xwave_fra                                                   
    2727        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    28         Label bottom "q (\\S-1\\M)" 
     28        Label bottom "q (A\\S-1\\M)" 
    2929        Label left "Intensity (cm\\S-1\\M)"                                      
    3030        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6060        Display smeared_fra vs smeared_qvals             
    6161        ModifyGraph log=1,marker=29,msize=2,mode=4 
    62         Label bottom "q (\\S-1\\M)" 
     62        Label bottom "q (A\\S-1\\M)" 
    6363        Label left "I(q) (cm\\S-1\\M)" 
    6464        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/GaussSpheres_Sq_v40.ipf

    r273 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/N=(num) xwave_pgs_HS,ywave_pgs_HS 
     
    2828        Display ywave_pgs_HS vs xwave_pgs_HS 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)" 
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6262        Display smeared_pgs_HS vs smeared_qvals                                                                  
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    118118        Variable num=128,qmin=0.001,qmax=0.7 
    119119        Prompt num "Enter number of data points for model: " 
    120         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    121         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     120        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     121        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    122122         
    123123        Make/O/D/N=(num) xwave_pgs_SW,ywave_pgs_SW 
     
    131131        Display ywave_pgs_SW vs xwave_pgs_SW 
    132132        ModifyGraph log=1,marker=29,msize=2,mode=4 
    133         Label bottom "q (\\S-1\\M)" 
     133        Label bottom "q (A\\S-1\\M)" 
    134134        Label left "Intensity (cm\\S-1\\M)" 
    135135        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    165165        Display smeared_pgs_SW vs smeared_qvals                                                                  
    166166        ModifyGraph log=1,marker=29,msize=2,mode=4 
    167         Label bottom "q (\\S-1\\M)" 
     167        Label bottom "q (A\\S-1\\M)" 
    168168        Label left "Intensity (cm\\S-1\\M)" 
    169169        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    222222        Variable num=256,qmin=0.001,qmax=0.7 
    223223        Prompt num "Enter number of data points for model: " 
    224         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    225         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     224        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     225        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    226226         
    227227        if(!DataFolderExists(":HayPenMSA")) 
     
    240240        Display ywave_pgs_SC vs xwave_pgs_SC 
    241241        ModifyGraph log=1,marker=29,msize=2,mode=4 
    242         Label bottom "q (\\S-1\\M)" 
     242        Label bottom "q (A\\S-1\\M)" 
    243243        Label left "Intensity (cm\\S-1\\M)" 
    244244        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    279279        Display smeared_pgs_SC vs smeared_qvals                                                                  
    280280        ModifyGraph log=1,marker=29,msize=2,mode=4 
    281         Label bottom "q (\\S-1\\M)" 
     281        Label bottom "q (A\\S-1\\M)" 
    282282        Label left "Intensity (cm\\S-1\\M)" 
    283283        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    337337        Variable num=256,qmin=0.001,qmax=0.7 
    338338        Prompt num "Enter number of data points for model: " 
    339         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    340         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     339        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     340        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    341341         
    342342        Make/O/D/N=(num) xwave_pgs_SHS,ywave_pgs_SHS 
     
    350350        Display ywave_pgs_SHS vs xwave_pgs_SHS 
    351351        ModifyGraph log=1,marker=29,msize=2,mode=4 
    352         Label bottom "q (\\S-1\\M)" 
     352        Label bottom "q (A\\S-1\\M)" 
    353353        Label left "Intensity (cm\\S-1\\M)" 
    354354        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    384384        Display smeared_pgs_SHS vs smeared_qvals                                                                         
    385385        ModifyGraph log=1,marker=29,msize=2,mode=4 
    386         Label bottom "q (\\S-1\\M)" 
     386        Label bottom "q (A\\S-1\\M)" 
    387387        Label left "Intensity (cm\\S-1\\M)" 
    388388        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/GaussSpheres_v40.ipf

    r273 r379  
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/N=(num) xwave_pgs,ywave_pgs 
     
    2727        Display ywave_pgs vs xwave_pgs 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6161        Display smeared_pgs vs smeared_qvals                                                                     
    6262        ModifyGraph log=1,marker=29,msize=2,mode=4 
    63         Label bottom "q (\\S-1\\M)" 
     63        Label bottom "q (A\\S-1\\M)" 
    6464        Label left "Intensity (cm\\S-1\\M)" 
    6565        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/LamellarFF_HG_v40.ipf

    r253 r379  
    2626        Variable num=128, qmin=.001, qmax=.5 
    2727        Prompt num "Enter number of data points for model: " 
    28         Prompt qmin "Enter minimum q-value (^1) for model: "  
    29         Prompt qmax "Enter maximum q-value (^1) for model: " 
     28        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     29        Prompt qmax "Enter maximum q-value (A^1) for model: " 
    3030// 
    3131        Make/O/D/n=(num) xwave_LamellarFF_HG, ywave_LamellarFF_HG 
     
    4141        ModifyGraph marker=29, msize=2, mode=4 
    4242        ModifyGraph log=1 
    43         Label bottom "q (\\S-1\\M) " 
     43        Label bottom "q (A\\S-1\\M) " 
    4444        Label left "I(q) (cm\\S-1\\M)" 
    4545        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    7676        Display smeared_LamellarFF_HG vs smeared_qvals                                                                  // 
    7777        ModifyGraph log=1,marker=29,msize=2,mode=4 
    78         Label bottom "q (\\S-1\\M)" 
     78        Label bottom "q (A\\S-1\\M)" 
    7979        Label left "I(q) (cm\\S-1\\M)" 
    8080        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/LamellarFF_v40.ipf

    r253 r379  
    2424        Variable num=128, qmin=.001, qmax=.5 
    2525        Prompt num "Enter number of data points for model: " 
    26         Prompt qmin "Enter minimum q-value (^1) for model: "  
    27         Prompt qmax "Enter maximum q-value (^1) for model: " 
     26        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     27        Prompt qmax "Enter maximum q-value (A^1) for model: " 
    2828// 
    2929        Make/O/D/n=(num) xwave_LamellarFF, ywave_LamellarFF 
     
    3939        ModifyGraph marker=29, msize=2, mode=4 
    4040        ModifyGraph log=1 
    41         Label bottom "q (\\S-1\\M) " 
     41        Label bottom "q (A\\S-1\\M) " 
    4242        Label left "I(q) (cm\\S-1\\M)" 
    4343        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    7474        Display smeared_LamellarFF vs smeared_qvals                                                                     // 
    7575        ModifyGraph log=1,marker=29,msize=2,mode=4 
    76         Label bottom "q (\\S-1\\M)" 
     76        Label bottom "q (A\\S-1\\M)" 
    7777        Label left "I(q) (cm\\S-1\\M)" 
    7878        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/LamellarPS_HG_v40.ipf

    r358 r379  
    5050        Variable num=128, qmin=.001, qmax=.5 
    5151        Prompt num "Enter number of data points for model: " 
    52         Prompt qmin "Enter minimum q-value (^1) for model: "  
    53         Prompt qmax "Enter maximum q-value (^1) for model: " 
     52        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     53        Prompt qmax "Enter maximum q-value (A^1) for model: " 
    5454// 
    5555        // constants 
     
    6969        ModifyGraph marker=29, msize=2, mode=4 
    7070        ModifyGraph log=1 
    71         Label bottom "q (\\S-1\\M) " 
     71        Label bottom "q (A\\S-1\\M) " 
    7272        Label left "I(q) (cm\\S-1\\M)" 
    7373        // 
     
    111111        Display smeared_LamellarPS_HG vs smeared_qvals                                                          // 
    112112        ModifyGraph log=1,marker=29,msize=2,mode=4 
    113         Label bottom "q (\\S-1\\M)" 
     113        Label bottom "q (A\\S-1\\M)" 
    114114        Label left "I(q) (cm\\S-1\\M)" 
    115115         
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/LamellarPS_v40.ipf

    r358 r379  
    5050        Variable num=128, qmin=.001, qmax=.5 
    5151        Prompt num "Enter number of data points for model: " 
    52         Prompt qmin "Enter minimum q-value (^1) for model: "  
    53         Prompt qmax "Enter maximum q-value (^1) for model: " 
     52        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     53        Prompt qmax "Enter maximum q-value (A^1) for model: " 
    5454// 
    5555        // constants 
     
    6969        ModifyGraph marker=29, msize=2, mode=4 
    7070        ModifyGraph log=1 
    71         Label bottom "q (\\S-1\\M) " 
     71        Label bottom "q (A\\S-1\\M) " 
    7272        Label left "I(q) (cm\\S-1\\M)" 
    7373        // 
     
    111111        Display smeared_LamellarPS vs smeared_qvals                                                                     // 
    112112        ModifyGraph log=1,marker=29,msize=2,mode=4 
    113         Label bottom "q (\\S-1\\M)" 
     113        Label bottom "q (A\\S-1\\M)" 
    114114        Label left "I(q) (cm\\S-1\\M)" 
    115115         
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/LogNormalSphere_Sq_v40.ipf

    r273 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/N=(num) xwave_lns_HS,ywave_lns_HS 
     
    2828        Display ywave_lns_HS vs xwave_lns_HS 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)" 
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6262        Display smeared_lns_HS vs smeared_qvals                                                                  
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    117117        Variable num=128,qmin=0.001,qmax=0.7 
    118118        Prompt num "Enter number of data points for model: " 
    119         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    120         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     119        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     120        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    121121         
    122122        Make/O/D/N=(num) xwave_lns_SW,ywave_lns_SW 
     
    130130        Display ywave_lns_SW vs xwave_lns_SW 
    131131        ModifyGraph log=1,marker=29,msize=2,mode=4 
    132         Label bottom "q (\\S-1\\M)" 
     132        Label bottom "q (A\\S-1\\M)" 
    133133        Label left "Intensity (cm\\S-1\\M)" 
    134134        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    164164        Display smeared_lns_SW vs smeared_qvals                                                                  
    165165        ModifyGraph log=1,marker=29,msize=2,mode=4 
    166         Label bottom "q (\\S-1\\M)" 
     166        Label bottom "q (A\\S-1\\M)" 
    167167        Label left "Intensity (cm\\S-1\\M)" 
    168168        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    221221        Variable num=256,qmin=0.001,qmax=0.7 
    222222        Prompt num "Enter number of data points for model: " 
    223         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    224         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     223        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     224        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    225225         
    226226        if(!DataFolderExists(":HayPenMSA")) 
     
    239239        Display ywave_lns_SC vs xwave_lns_SC 
    240240        ModifyGraph log=1,marker=29,msize=2,mode=4 
    241         Label bottom "q (\\S-1\\M)" 
     241        Label bottom "q (A\\S-1\\M)" 
    242242        Label left "Intensity (cm\\S-1\\M)" 
    243243        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    278278        Display smeared_lns_SC vs smeared_qvals                                                                  
    279279        ModifyGraph log=1,marker=29,msize=2,mode=4 
    280         Label bottom "q (\\S-1\\M)" 
     280        Label bottom "q (A\\S-1\\M)" 
    281281        Label left "Intensity (cm\\S-1\\M)" 
    282282        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    337337        Variable num=256,qmin=0.001,qmax=0.7 
    338338        Prompt num "Enter number of data points for model: " 
    339         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    340         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     339        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     340        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    341341         
    342342        Make/O/D/N=(num) xwave_lns_SHS,ywave_lns_SHS 
     
    350350        Display ywave_lns_SHS vs xwave_lns_SHS 
    351351        ModifyGraph log=1,marker=29,msize=2,mode=4 
    352         Label bottom "q (\\S-1\\M)" 
     352        Label bottom "q (A\\S-1\\M)" 
    353353        Label left "Intensity (cm\\S-1\\M)" 
    354354        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    384384        Display smeared_lns_SHS vs smeared_qvals                                                                         
    385385        ModifyGraph log=1,marker=29,msize=2,mode=4 
    386         Label bottom "q (\\S-1\\M)" 
     386        Label bottom "q (A\\S-1\\M)" 
    387387        Label left "Intensity (cm\\S-1\\M)" 
    388388        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/LogNormalSphere_v40.ipf

    r273 r379  
    1111        Variable num=128,qmin=0.001,qmax=0.7 
    1212        Prompt num "Enter number of data points for model: " 
    13         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    14         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     13        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     14        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1515         
    1616        Make/O/D/N=(num) xwave_lns,ywave_lns 
     
    2424        Display ywave_lns vs xwave_lns 
    2525        ModifyGraph log=1,marker=29,msize=2,mode=4 
    26         Label bottom "q (\\S-1\\M)" 
     26        Label bottom "q (A\\S-1\\M)" 
    2727        Label left "Intensity (cm\\S-1\\M)" 
    2828        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5858        Display smeared_lns vs smeared_qvals                                                                     
    5959        ModifyGraph log=1,marker=29,msize=2,mode=4 
    60         Label bottom "q (\\S-1\\M)" 
     60        Label bottom "q (A\\S-1\\M)" 
    6161        Label left "Intensity (cm\\S-1\\M)" 
    6262        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/MultiShell_v40.ipf

    r253 r379  
    1414        Variable num=100,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        make/O/D/N=(num) xwave_mss,ywave_mss 
     
    2727        Display/K=1 ywave_mss vs xwave_mss 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6161        Display/K=1 smeared_mss vs smeared_qvals                                                                         
    6262        ModifyGraph log=1,marker=29,msize=2,mode=4 
    63         Label bottom "q (\\S-1\\M)" 
     63        Label bottom "q (A\\S-1\\M)" 
    6464        Label left "Intensity (cm\\S-1\\M)" 
    6565        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    9292        // variables are: 
    9393        //[0] scale factor 
    94         //[1] radius of core [] 
    95         //[2] thickness of the shell    [] 
     94        //[1] radius of core [A] 
     95        //[2] thickness of the shell    [A] 
    9696        //[3] thickness of the water layer 
    97         //[4] SLD of the core = sld of the solvent[-2] 
     97        //[4] SLD of the core = sld of the solvent[A-2] 
    9898        //[5] SLD of the shell 
    9999        //[6] number of pairs (tw+tsh) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/Parallelepiped_v40.ipf

    r253 r379  
    3030        Variable num=100, qmin=.001, qmax=.7 
    3131        Prompt num "Enter number of data points for model: " 
    32         Prompt qmin "Enter minimum q-value (^1) for model: "  
    33         Prompt qmax "Enter maximum q-value (^1) for model: " 
     32        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     33        Prompt qmax "Enter maximum q-value (A^1) for model: " 
    3434        // 
    3535        Make/O/D/n=(num) xwave_Parallelepiped, ywave_Parallelepiped 
    3636        xwave_Parallelepiped =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    3737        Make/O/D coef_Parallelepiped = {1,35,75,400,1e-6,6.3e-6,0}                      //CH#2 
    38         make/o/t parameters_Parallelepiped = {"Scale Factor","Shortest Edge A ()","B ()","Longest Edge C ()","SLD particle (^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"}     //CH#3 
     38        make/o/t parameters_Parallelepiped = {"Scale Factor","Shortest Edge A (A)","B (A)","Longest Edge C (A)","SLD particle (A^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"}     //CH#3 
    3939        Edit parameters_Parallelepiped, coef_Parallelepiped 
    4040         
     
    4444        ModifyGraph marker=29, msize=2, mode=4 
    4545        ModifyGraph log=1 
    46         Label bottom "q (\\S-1\\M) " 
     46        Label bottom "q (A\\S-1\\M) " 
    4747        Label left "I(q) (cm\\S-1\\M)" 
    4848        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6666        // Setup parameter table for model function 
    6767        Make/O/D smear_coef_Parallelepiped = {1,35,75,400,1e-6,6.3e-6,0}                //CH#4 
    68         make/o/t smear_parameters_Parallelepiped = {"Scale Factor","Shortest Edge A ()","B ()","Longest Edge C ()","SLD particle (^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"} 
     68        make/o/t smear_parameters_Parallelepiped = {"Scale Factor","Shortest Edge A (A)","B (A)","Longest Edge C (A)","SLD particle (A^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"} 
    6969        Edit smear_parameters_Parallelepiped,smear_coef_Parallelepiped                                  //display parameters in a table 
    7070         
     
    7979        Display smeared_Parallelepiped vs smeared_qvals                                                                 // 
    8080        ModifyGraph log=1,marker=29,msize=2,mode=4 
    81         Label bottom "q (\\S-1\\M)" 
     81        Label bottom "q (A\\S-1\\M)" 
    8282        Label left "I(q) (cm\\S-1\\M)" 
    8383        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/PolyCoreShellCylinder_v40.ipf

    r253 r379  
    7272        Display smeared_CSCpr vs smeared_qvals                                                                   
    7373        ModifyGraph log=1,marker=29,msize=2,mode=4 
    74         Label bottom "q (\\S-1\\M)" 
     74        Label bottom "q (A\\S-1\\M)" 
    7575        Label left "Intensity (cm\\S-1\\M)" 
    7676        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/SchulzSpheres_Sq_v40.ipf

    r273 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/N=(num) xwave_sch_HS,ywave_sch_HS 
     
    2828        Display ywave_sch_HS vs xwave_sch_HS 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)" 
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6262        Display smeared_sch_HS vs smeared_qvals                                                                  
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    119119        Variable num=128,qmin=0.001,qmax=0.7 
    120120        Prompt num "Enter number of data points for model: " 
    121         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    122         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     121        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     122        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    123123         
    124124        Make/O/D/N=(num) xwave_sch_SW,ywave_sch_SW 
     
    132132        Display ywave_sch_SW vs xwave_sch_SW 
    133133        ModifyGraph log=1,marker=29,msize=2,mode=4 
    134         Label bottom "q (\\S-1\\M)" 
     134        Label bottom "q (A\\S-1\\M)" 
    135135        Label left "Intensity (cm\\S-1\\M)" 
    136136        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    166166        Display smeared_sch_SW vs smeared_qvals                                                                  
    167167        ModifyGraph log=1,marker=29,msize=2,mode=4 
    168         Label bottom "q (\\S-1\\M)" 
     168        Label bottom "q (A\\S-1\\M)" 
    169169        Label left "Intensity (cm\\S-1\\M)" 
    170170        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    225225        Variable num=256,qmin=0.001,qmax=0.7 
    226226        Prompt num "Enter number of data points for model: " 
    227         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    228         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     227        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     228        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    229229         
    230230        if(!DataFolderExists(":HayPenMSA")) 
     
    243243        Display ywave_sch_SC vs xwave_sch_SC 
    244244        ModifyGraph log=1,marker=29,msize=2,mode=4 
    245         Label bottom "q (\\S-1\\M)" 
     245        Label bottom "q (A\\S-1\\M)" 
    246246        Label left "Intensity (cm\\S-1\\M)" 
    247247        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    282282        Display smeared_sch_SC vs smeared_qvals                                                                  
    283283        ModifyGraph log=1,marker=29,msize=2,mode=4 
    284         Label bottom "q (\\S-1\\M)" 
     284        Label bottom "q (A\\S-1\\M)" 
    285285        Label left "Intensity (cm\\S-1\\M)" 
    286286        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    341341        Variable num=256,qmin=0.001,qmax=0.7 
    342342        Prompt num "Enter number of data points for model: " 
    343         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    344         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     343        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     344        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    345345         
    346346        Make/O/D/N=(num) xwave_sch_SHS,ywave_sch_SHS 
     
    354354        Display ywave_sch_SHS vs xwave_sch_SHS 
    355355        ModifyGraph log=1,marker=29,msize=2,mode=4 
    356         Label bottom "q (\\S-1\\M)" 
     356        Label bottom "q (A\\S-1\\M)" 
    357357        Label left "Intensity (cm\\S-1\\M)" 
    358358        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    388388        Display smeared_sch_SHS vs smeared_qvals                                                                         
    389389        ModifyGraph log=1,marker=29,msize=2,mode=4 
    390         Label bottom "q (\\S-1\\M)" 
     390        Label bottom "q (A\\S-1\\M)" 
    391391        Label left "Intensity (cm\\S-1\\M)" 
    392392        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/SchulzSpheres_v40.ipf

    r253 r379  
    1212        Variable num=128,qmin=0.001,qmax=0.7 
    1313        Prompt num "Enter number of data points for model: " 
    14         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    15         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     14        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     15        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1616         
    1717        Make/O/D/N=(num) xwave_sch,ywave_sch 
     
    2525        Display ywave_sch vs xwave_sch 
    2626        ModifyGraph log=1,marker=29,msize=2,mode=4 
    27         Label bottom "q (\\S-1\\M)" 
     27        Label bottom "q (A\\S-1\\M)" 
    2828        Label left "Intensity (cm\\S-1\\M)" 
    2929        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6060        Display smeared_sch vs smeared_qvals                                                                     
    6161        ModifyGraph log=1,marker=29,msize=2,mode=4 
    62         Label bottom "q (\\S-1\\M)" 
     62        Label bottom "q (A\\S-1\\M)" 
    6363        Label left "Intensity (cm\\S-1\\M)" 
    6464        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/StickyHardSphereStruct_v40.ipf

    r253 r379  
    2525        Variable num=256, qmin=.001, qmax=.5 
    2626        Prompt num "Enter number of data points for model: " 
    27         Prompt qmin "Enter minimum q-value (^1) for model: "  
    28         Prompt qmax "Enter maximum q-value (^1) for model: " 
     27        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     28        Prompt qmax "Enter maximum q-value (A^1) for model: " 
    2929// 
    3030        Make/O/D/n=(num) xwave_shsSQ, ywave_shsSQ 
     
    3939        ModifyGraph marker=29, msize=2, mode=4 
    4040        ModifyGraph log=0 
    41         Label bottom "q (\\S-1\\M) " 
     41        Label bottom "q (A\\S-1\\M) " 
    4242        Label left "S(q)" 
    4343        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/TriaxialEllipsoid_v40.ipf

    r253 r379  
    2626        Variable num=100, qmin=.001, qmax=.7 
    2727        Prompt num "Enter number of data points for model: " 
    28         Prompt qmin "Enter minimum q-value (^1) for model: "  
    29         Prompt qmax "Enter maximum q-value (^1) for model: " 
     28        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     29        Prompt qmax "Enter maximum q-value (A^1) for model: " 
    3030        // 
    3131        Make/O/D/n=(num) xwave_triax, ywave_triax 
    3232        xwave_triax =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    3333        Make/O/D coef_triax = {1,35,100,400,1e-6,6.3e-6,0}                      //CH#2 
    34         make/o/t parameters_triax = {"Scale Factor","Semi-axis A [smallest]()","Semi-axis B ()","Semi-axis C [largest]()","SLD ellipsoid (^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"}       //CH#3 
     34        make/o/t parameters_triax = {"Scale Factor","Semi-axis A [smallest](A)","Semi-axis B (A)","Semi-axis C [largest](A)","SLD ellipsoid (A^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"}       //CH#3 
    3535        Edit parameters_triax, coef_triax 
    3636         
     
    4040        ModifyGraph marker=29, msize=2, mode=4 
    4141        ModifyGraph log=1 
    42         Label bottom "q (\\S-1\\M) " 
     42        Label bottom "q (A\\S-1\\M) " 
    4343        Label left "I(q) (cm\\S-1\\M)" 
    4444        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6363        // Setup parameter table for model function 
    6464        Make/O/D smear_coef_triax = {1,35,100,400,1e-6,6.3e-6,0}                //CH#4 
    65         make/o/t smear_parameters_triax = {"Scale Factor","Semi-axis A [smallest]()","Semi-axis B ()","Semi-axis C [largest]()","SLD ellipsoid (^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"} 
     65        make/o/t smear_parameters_triax = {"Scale Factor","Semi-axis A [smallest](A)","Semi-axis B (A)","Semi-axis C [largest](A)","SLD ellipsoid (A^-2)","SLD solvent (A^-2)","Incoherent Bgd (cm-1)"} 
    6666        Edit smear_parameters_triax,smear_coef_triax                                    //display parameters in a table 
    6767         
     
    7676        Display smeared_triax vs smeared_qvals                                                                  // 
    7777        ModifyGraph log=1,marker=29,msize=2,mode=4 
    78         Label bottom "q (\\S-1\\M)" 
     78        Label bottom "q (A\\S-1\\M)" 
    7979        Label left "I(q) (cm\\S-1\\M)" 
    8080        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/Vesicle_UL_and_Struct_v40.ipf

    r273 r379  
    2020        Variable num=256,qmin=0.001,qmax=0.7 
    2121        Prompt num "Enter number of data points for model: " 
    22         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    23         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     22        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     23        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2424         
    2525        //make the normal model waves 
     
    3434        Display/K=1 ywave_ves_HS vs xwave_ves_HS                                                         
    3535        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    36         Label bottom "q (\\S-1\\M)" 
     36        Label bottom "q (A\\S-1\\M)" 
    3737        Label left "Intensity (cm\\S-1\\M)"                                      
    3838 
     
    6969        Display smeared_ves_HS vs smeared_qvals                                                                  
    7070        ModifyGraph log=1,marker=29,msize=2,mode=4 
    71         Label bottom "q (\\S-1\\M)" 
     71        Label bottom "q (A\\S-1\\M)" 
    7272        Label left "Intensity (cm\\S-1\\M)" 
    7373 
     
    125125        Variable num=256,qmin=0.001,qmax=0.7 
    126126        Prompt num "Enter number of data points for model: " 
    127         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    128         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     127        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     128        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    129129         
    130130        /// 
     
    142142        Display/K=1 ywave_ves_SW vs xwave_ves_SW                                                         
    143143        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    144         Label bottom "q (\\S-1\\M)" 
     144        Label bottom "q (A\\S-1\\M)" 
    145145        Label left "Intensity (cm\\S-1\\M)"                                      
    146146 
     
    176176        Display smeared_ves_SW vs smeared_qvals                                                                  
    177177        ModifyGraph log=1,marker=29,msize=2,mode=4 
    178         Label bottom "q (\\S-1\\M)" 
     178        Label bottom "q (A\\S-1\\M)" 
    179179        Label left "Intensity (cm\\S-1\\M)" 
    180180 
     
    235235        Variable num=256,qmin=0.001,qmax=0.7 
    236236        Prompt num "Enter number of data points for model: " 
    237         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    238         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     237        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     238        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    239239         
    240240        if(!DataFolderExists(":HayPenMSA")) 
     
    254254        Display/K=1 ywave_ves_SC vs xwave_ves_SC                                                         
    255255        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    256         Label bottom "q (\\S-1\\M)" 
     256        Label bottom "q (A\\S-1\\M)" 
    257257        Label left "Intensity (cm\\S-1\\M)"                                      
    258258 
     
    293293        Display smeared_ves_SC vs smeared_qvals                                                                  
    294294        ModifyGraph log=1,marker=29,msize=2,mode=4 
    295         Label bottom "q (\\S-1\\M)" 
     295        Label bottom "q (A\\S-1\\M)" 
    296296        Label left "Intensity (cm\\S-1\\M)" 
    297297 
     
    354354        Variable num=256,qmin=0.001,qmax=0.7 
    355355        Prompt num "Enter number of data points for model: " 
    356         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    357         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     356        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     357        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    358358         
    359359        /// 
     
    371371        Display/K=1 ywave_ves_SHS vs xwave_ves_SHS                                                       
    372372        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    373         Label bottom "q (\\S-1\\M)" 
     373        Label bottom "q (A\\S-1\\M)" 
    374374        Label left "Intensity (cm\\S-1\\M)"                                      
    375375 
     
    405405        Display smeared_ves_SHS vs smeared_qvals                                                                         
    406406        ModifyGraph log=1,marker=29,msize=2,mode=4 
    407         Label bottom "q (\\S-1\\M)" 
     407        Label bottom "q (A\\S-1\\M)" 
    408408        Label left "Intensity (cm\\S-1\\M)" 
    409409 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/NewModels_2006/Vesicle_UL_v40.ipf

    r253 r379  
    2424        Variable num=128,qmin=0.001,qmax=0.7 
    2525        Prompt num "Enter number of data points for model: " 
    26         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    27         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     26        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     27        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2828         
    2929        make/o/d/n=(num) xwave_vesicle,ywave_vesicle 
     
    3737        Display ywave_vesicle vs xwave_vesicle 
    3838        ModifyGraph log=1,marker=29,msize=2,mode=4 
    39         Label bottom "q (\\S-1\\M)" 
     39        Label bottom "q (A\\S-1\\M)" 
    4040        Label left "Intensity (cm\\S-1\\M)" 
    4141        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    7474        Display smeared_vesicle vs smeared_qvals                                                                         
    7575        ModifyGraph log=1,marker=29,msize=2,mode=4 
    76         Label bottom "q (\\S-1\\M)" 
     76        Label bottom "q (A\\S-1\\M)" 
    7777        Label left "Intensity (cm\\S-1\\M)" 
    7878        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    106106        // variables are: 
    107107        //[0] scale factor 
    108         //[1] radius of core [] 
    109         //[2] thickness of the shell    [] 
    110         //[3] SLD of the core and solvent[-2] 
     108        //[1] radius of core [A] 
     109        //[2] thickness of the shell    [A] 
     110        //[3] SLD of the core and solvent[A-2] 
    111111        //[4] SLD of the shell 
    112112        //[5] background        [cm-1] 
     
    141141        f += vol*bes*contr 
    142142         
    143         // normalize to the particle volume and rescale from [-1] to [cm-1] 
     143        // normalize to the particle volume and rescale from [A-1] to [cm-1] 
    144144        //note that for the vesicle model, the volume is ONLY the shell volume 
    145145        vol = 4*pi/3*((rcore+thick)^3-rcore^3) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/OblateCoreShell_Sq_v40.ipf

    r325 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/n=(num) xwave_OEF_HS,ywave_OEF_HS 
     
    2828        Display ywave_OEF_HS vs xwave_OEF_HS 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)" 
    3232 
     
    6363        Display smeared_OEF_HS vs smeared_qvals                                                                  
    6464        ModifyGraph log=1,marker=29,msize=2,mode=4 
    65         Label bottom "q (\\S-1\\M)" 
     65        Label bottom "q (A\\S-1\\M)" 
    6666        Label left "Intensity (cm\\S-1\\M)" 
    6767 
     
    114114        Variable num=128,qmin=0.001,qmax=0.7 
    115115        Prompt num "Enter number of data points for model: " 
    116         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    117         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     116        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     117        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    118118         
    119119        Make/O/D/n=(num) xwave_OEF_SW,ywave_OEF_SW 
     
    127127        Display ywave_OEF_SW vs xwave_OEF_SW 
    128128        ModifyGraph log=1,marker=29,msize=2,mode=4 
    129         Label bottom "q (\\S-1\\M)" 
     129        Label bottom "q (A\\S-1\\M)" 
    130130        Label left "Intensity (cm\\S-1\\M)" 
    131131 
     
    162162        Display smeared_OEF_SW vs smeared_qvals                                                                  
    163163        ModifyGraph log=1,marker=29,msize=2,mode=4 
    164         Label bottom "q (\\S-1\\M)" 
     164        Label bottom "q (A\\S-1\\M)" 
    165165        Label left "Intensity (cm\\S-1\\M)" 
    166166 
     
    215215        Variable num=128,qmin=0.001,qmax=0.7 
    216216        Prompt num "Enter number of data points for model: " 
    217         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    218         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     217        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     218        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    219219         
    220220        if(!DataFolderExists(":HayPenMSA")) 
     
    233233        Display ywave_OEF_SC vs xwave_OEF_SC 
    234234        ModifyGraph log=1,marker=29,msize=2,mode=4 
    235         Label bottom "q (\\S-1\\M)" 
     235        Label bottom "q (A\\S-1\\M)" 
    236236        Label left "Intensity (cm\\S-1\\M)" 
    237237 
     
    273273        Display smeared_OEF_SC vs smeared_qvals                                                                  
    274274        ModifyGraph log=1,marker=29,msize=2,mode=4 
    275         Label bottom "q (\\S-1\\M)" 
     275        Label bottom "q (A\\S-1\\M)" 
    276276        Label left "Intensity (cm\\S-1\\M)" 
    277277 
     
    329329        Variable num=128,qmin=0.001,qmax=0.7 
    330330        Prompt num "Enter number of data points for model: " 
    331         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    332         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     331        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     332        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    333333         
    334334        Make/O/D/n=(num) xwave_OEF_SHS,ywave_OEF_SHS 
     
    342342        Display ywave_OEF_SHS vs xwave_OEF_SHS 
    343343        ModifyGraph log=1,marker=29,msize=2,mode=4 
    344         Label bottom "q (\\S-1\\M)" 
     344        Label bottom "q (A\\S-1\\M)" 
    345345        Label left "Intensity (cm\\S-1\\M)" 
    346346 
     
    377377        Display smeared_OEF_SHS vs smeared_qvals                                                                         
    378378        ModifyGraph log=1,marker=29,msize=2,mode=4 
    379         Label bottom "q (\\S-1\\M)" 
     379        Label bottom "q (A\\S-1\\M)" 
    380380        Label left "Intensity (cm\\S-1\\M)" 
    381381 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/OblateCoreShell_v40.ipf

    r325 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/n=(num) xwave_oef,ywave_oef 
     
    2828        Display ywave_oef vs xwave_oef 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)" 
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6363        Display smeared_oef vs smeared_qvals 
    6464        ModifyGraph log=1,marker=29,msize=2,mode=4 
    65         Label bottom "q (\\S-1\\M)" 
     65        Label bottom "q (A\\S-1\\M)" 
    6666        Label left "Intensity (cm\\S-1\\M)" 
    6767        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    9393//The input variables are (and output) 
    9494        //[0] scale 
    95         //[1] crmaj, major radius of core       [] 
     95        //[1] crmaj, major radius of core       [A] 
    9696        //[2] crmin, minor radius of core 
    9797        //[3] trmaj, overall major radius 
    9898        //[4] trmin, overall minor radius 
    99         //[5] sldc, core [-2] 
     99        //[5] sldc, core [A-2] 
    100100        //[6] slds, shell 
    101101        //[7] sld (solvent) 
     
    190190      answer /= oblatevol 
    191191       
    192       //convert answer [-1] to [cm-1] 
     192      //convert answer [A-1] to [cm-1] 
    193193      answer *= 1.0e8   
    194194      //scale 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/Invariant/Invariant_v40.ipf

    r318 r379  
    4949        inv = 2*pi*pi*delta_rho*delta_rho*phi*(1-phi)*1e8 
    5050         
    51         Printf "The model invariant is %g ^-3 cm^-1\r\r",inv 
     51        Printf "The model invariant is %g A^-3 cm^-1\r\r",inv 
    5252End 
    5353 
     
    6565        invar = areaXY(qw,integrand,qw[0],qw[num-1]) 
    6666         
    67         return(invar)           //units of ^-3 cm^-1 
     67        return(invar)           //units of A^-3 cm^-1 
    6868End 
    6969 
     
    8585        invar *= dQv            //correct for the effects of slit-smearing 
    8686                 
    87         return(invar)           //units of ^-3 cm^-1 
     87        return(invar)           //units of A^-3 cm^-1 
    8888End 
    8989 
     
    140140         
    141141        Printf "I(q=0) = %g (1/cm)\r",G_coef[0] 
    142         Printf "Rg = %g ()\r",sqrt(-3*G_coef[1]) 
     142        Printf "Rg = %g (A)\r",sqrt(-3*G_coef[1]) 
    143143         
    144144        Make/O/D P_coef={0,1,-4}                        //input 
     
    191191        ModifyGraph standoff=0 
    192192        Label left "Intensity (1/cm)" 
    193         Label bottom "q (1/)" 
     193        Label bottom "q (1/A)" 
    194194        ModifyGraph rgb($NameofWave(iw))=(0,0,0) 
    195195        ModifyGraph opaque($NameofWave(iw))=1 
     
    251251        DrawText 158,211,"Extrapolation" 
    252252        SetDrawEnv fstyle= 1 
    253         DrawText 58,349,"Units are [^-3 cm^-1]" 
     253        DrawText 58,349,"Units are [A^-3 cm^-1]" 
    254254        SetDrawEnv fstyle= 1 
    255255        DrawText 61,16,"Calculate the Invariant" 
     
    332332         
    333333        num=numpnts(qw) 
    334         Printf "The invariant over the measured q-range %g to %g is %g ^-3 cm^-1\r\r",qw[0],qw[(num-1)],inv 
     334        Printf "The invariant over the measured q-range %g to %g is %g A^-3 cm^-1\r\r",qw[0],qw[(num-1)],inv 
    335335         
    336336        // update the global display on the panel (there is a dependency for the total) 
     
    378378                 
    379379                Printf "I(q=0) = %g (1/cm)\r",G_coef[0] 
    380                 Printf "Rg = %g ()\r",sqrt(-3*G_coef[1]) 
     380                Printf "Rg = %g (A)\r",sqrt(-3*G_coef[1]) 
    381381        else 
    382382                //do a power-law fit instead 
     
    400400         
    401401        nume=numpnts(extr_lqq) 
    402         Printf "The invariant over the q-range %g to %g is %g ^-3 cm^-1\r\r",extr_lqq[0],extr_lqq[(nume-1)],inv 
     402        Printf "The invariant over the q-range %g to %g is %g A^-3 cm^-1\r\r",extr_lqq[0],extr_lqq[(nume-1)],inv 
    403403         
    404404        // update the global display on the panel (there is a dependency for the total) 
     
    450450 
    451451        nume=numpnts(extr_hqq) 
    452         Printf "The invariant over the q-range %g to %g is %g ^-3 cm^-1\r\r",extr_hqq[0],extr_hqq[(nume-1)],inv 
     452        Printf "The invariant over the q-range %g to %g is %g A^-3 cm^-1\r\r",extr_hqq[0],extr_hqq[(nume-1)],inv 
    453453         
    454454        // update the global display on the panel (there is a dependency for the total) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/LinearizedFits/LinearizedFits_v40.ipf

    r318 r379  
    380380                Duplicate/o xw xAxisWave 
    381381                If (cmpstr("q",S_Value) == 0)    
    382                         SetScale d 0,0,"^-1",xAxisWave 
     382                        SetScale d 0,0,"A^-1",xAxisWave 
    383383                        xAxisWave = xw 
    384384                        xlabel = "q" 
     
    388388                endif 
    389389                If (cmpstr("q^2",S_Value) == 0)  
    390                         SetScale d 0,0,"^-2",xAxisWave 
     390                        SetScale d 0,0,"A^-2",xAxisWave 
    391391                        xAxisWave = xw*xw 
    392392                        xlabel = "q^2" 
     
    561561                                rg = sqrt(-3*W_coef[1]) 
    562562                                rgerr = 3*W_sigma[1]/(2*rg) 
    563                                 textstr_3 += "\rRg () = " + num2str(rg) + " ± " + num2str(rgerr) 
     563                                textstr_3 += "\rRg (A) = " + num2str(rg) + " ± " + num2str(rgerr) 
    564564                                textstr_3 += "\r" + num2str(rg*minfit) + " < Rg*q < " + num2str(rg*maxfit) 
    565565                                break 
     
    599599                                rg = 4*sqrt(-W_coef[1]) 
    600600                                rgerr = 8*W_sigma[1]/rg 
    601                                 textstr_3 = "Rod diameter () = " + num2str(rg) + " ± " + num2str(rgerr) 
     601                                textstr_3 = "Rod diameter (A) = " + num2str(rg) + " ± " + num2str(rgerr) 
    602602                                textstr_3 += "\r" + num2str(rg*minfit) + " < Rg*q < " + num2str(rg*maxfit) 
    603603                                break 
     
    611611                                rg = sqrt(-12*W_coef[1]) 
    612612                                rgerr = 6*W_sigma[1]/(2*rg) 
    613                                 textstr_3 = "Platelet thickness () = " + num2str(rg) + " ± " + num2str(rgerr) 
     613                                textstr_3 = "Platelet thickness (A) = " + num2str(rg) + " ± " + num2str(rgerr) 
    614614                                textstr_3 += "\r" + num2str(rg*minfit) + " < Rg*q < " + num2str(rg*maxfit) 
    615615                                break 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/SumModel/SumSANSModels_v40.ipf

    r354 r379  
    160160        Variable num=128,qmin=0.001,qmax=0.7 
    161161        Prompt num "Enter number of data points for model: " 
    162         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    163         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     162        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     163        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    164164         
    165165        Make/O/D/n=(num) xwave_sum,ywave_sum                                     
     
    207207        Display ywave_sum vs xwave_sum                                                   
    208208        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    209         Label bottom "q (\\S-1\\M)" 
     209        Label bottom "q (A\\S-1\\M)" 
    210210        Label left "Intensity (cm\\S-1\\M)" 
    211211        Legend                                   
     
    291291        Display smeared_sum vs $(str+"_q")                                                                       
    292292        ModifyGraph log=1,marker=29,msize=2,mode=4 
    293         Label bottom "q (\\S-1\\M)" 
     293        Label bottom "q (A\\S-1\\M)" 
    294294        Label left "Intensity (cm\\S-1\\M)" 
    295295        Legend 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Peak_Gauss_model_v40.ipf

    r325 r379  
    88        Variable num=512, qmin=.001, qmax=.7 
    99        Prompt num "Enter number of data points for model: " 
    10         Prompt qmin "Enter minimum q-value (^1) for model: "  
    11          Prompt qmax "Enter maximum q-value (^1) for model: " 
     10        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     11         Prompt qmax "Enter maximum q-value (A^1) for model: " 
    1212// 
    1313        Make/O/D/n=(num) xwave_Peak_Gauss, ywave_Peak_Gauss 
    1414        xwave_Peak_Gauss =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    1515        Make/O/D coef_Peak_Gauss = {100.0, 0.05,0.005, 1.0} 
    16         make/o/t parameters_Peak_Gauss = {"Scale Factor, I0 ", "Peak position (^-1)", "Std Dev (^-1)","Incoherent Bgd (cm-1)"} 
     16        make/o/t parameters_Peak_Gauss = {"Scale Factor, I0 ", "Peak position (A^-1)", "Std Dev (A^-1)","Incoherent Bgd (cm-1)"} 
    1717        Edit parameters_Peak_Gauss, coef_Peak_Gauss 
    1818        Variable/G root:g_Peak_Gauss 
     
    2222        ModifyGraph marker=29, msize=2, mode=4 
    2323        ModifyGraph log(left)=1 
    24         Label bottom "q (\\S-1\\M) " 
     24        Label bottom "q (A\\S-1\\M) " 
    2525        Label left "Peak - Gauss (cm\\S-1\\M)" 
    2626        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    4545        // Setup parameter table for model function 
    4646        Make/O/D smear_coef_Peak_Gauss = {100.0, 0.05,0.005, 1.0} 
    47         make/o/t smear_parameters_Peak_Gauss = {"Scale Factor, I0 ", "Peak position (^-1)", "Std Dev (^-1)","Incoherent Bgd (cm-1)"} 
     47        make/o/t smear_parameters_Peak_Gauss = {"Scale Factor, I0 ", "Peak position (A^-1)", "Std Dev (A^-1)","Incoherent Bgd (cm-1)"} 
    4848        Edit smear_parameters_Peak_Gauss,smear_coef_Peak_Gauss                                  //display parameters in a table 
    4949         
     
    5858        Display smeared_Peak_Gauss vs smeared_qvals                                                                     // 
    5959        ModifyGraph log=1,marker=29,msize=2,mode=4 
    60         Label bottom "q (\\S-1\\M)" 
     60        Label bottom "q (A\\S-1\\M)" 
    6161        Label left "Peak_Gauss Model (cm\\S-1\\M)" 
    6262        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Peak_Lorentz_model_v40.ipf

    r325 r379  
    88        Variable num=512, qmin=.001, qmax=.7 
    99        Prompt num "Enter number of data points for model: " 
    10         Prompt qmin "Enter minimum q-value (^1) for model: "  
    11          Prompt qmax "Enter maximum q-value (^1) for model: " 
     10        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     11         Prompt qmax "Enter maximum q-value (A^1) for model: " 
    1212// 
    1313        Make/O/D/n=(num) xwave_Peak_Lorentz, ywave_Peak_Lorentz 
    1414        xwave_Peak_Lorentz =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    1515        Make/O/D coef_Peak_Lorentz = {100.0, 0.05,0.005, 1.0} 
    16         make/o/t parameters_Peak_Lorentz = {"Scale Factor, I0 ", "Peak position (^-1)", "Peak hwhm (^-1)","Incoherent Bgd (cm-1)"} 
     16        make/o/t parameters_Peak_Lorentz = {"Scale Factor, I0 ", "Peak position (A^-1)", "Peak hwhm (A^-1)","Incoherent Bgd (cm-1)"} 
    1717        Edit parameters_Peak_Lorentz, coef_Peak_Lorentz 
    1818        Variable/G root:g_Peak_Lorentz 
     
    2222        ModifyGraph marker=29, msize=2, mode=4 
    2323        ModifyGraph log(left)=1 
    24         Label bottom "q (\\S-1\\M) " 
     24        Label bottom "q (A\\S-1\\M) " 
    2525        Label left "Peak - Lorentzian (cm\\S-1\\M)" 
    2626        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    4545        // Setup parameter table for model function 
    4646        Make/O/D smear_coef_Peak_Lorentz = {100.0, 0.05,0.005, 1.0} 
    47         make/o/t smear_parameters_Peak_Lorentz = {"Scale Factor, I0 ", "Peak position (^-1)", "Peak hwhm (^-1)","Incoherent Bgd (cm-1)"} 
     47        make/o/t smear_parameters_Peak_Lorentz = {"Scale Factor, I0 ", "Peak position (A^-1)", "Peak hwhm (A^-1)","Incoherent Bgd (cm-1)"} 
    4848        Edit smear_parameters_Peak_Lorentz,smear_coef_Peak_Lorentz                                      //display parameters in a table 
    4949         
     
    5858        Display smeared_Peak_Lorentz vs smeared_qvals                                                                   // 
    5959        ModifyGraph log=1,marker=29,msize=2,mode=4 
    60         Label bottom "q (\\S-1\\M)" 
     60        Label bottom "q (A\\S-1\\M)" 
    6161        Label left "Peak_Lorentz Model (cm\\S-1\\M)" 
    6262        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)   
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PolyCoreShellRatio_Sq_v40.ipf

    r325 r379  
    1414        Variable num=256,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/n=(num) xwave_PCR_HS,ywave_PCR_HS 
     
    2727        Display/K=1 ywave_PCR_HS vs xwave_PCR_HS 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131 
     
    6262        Display smeared_PCR_HS vs smeared_qvals                                                                  
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666 
     
    121121        Variable num=256,qmin=0.001,qmax=0.7 
    122122        Prompt num "Enter number of data points for model: " 
    123         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    124         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     123        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     124        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    125125         
    126126        Make/O/D/n=(num) xwave_PCR_SW,ywave_PCR_SW 
     
    134134        Display/K=1 ywave_PCR_SW vs xwave_PCR_SW 
    135135        ModifyGraph log=1,marker=29,msize=2,mode=4 
    136         Label bottom "q (\\S-1\\M)" 
     136        Label bottom "q (A\\S-1\\M)" 
    137137        Label left "Intensity (cm\\S-1\\M)" 
    138138 
     
    169169        Display smeared_PCR_SW vs smeared_qvals                                                                  
    170170        ModifyGraph log=1,marker=29,msize=2,mode=4 
    171         Label bottom "q (\\S-1\\M)" 
     171        Label bottom "q (A\\S-1\\M)" 
    172172        Label left "Intensity (cm\\S-1\\M)" 
    173173 
     
    231231        Variable num=256,qmin=0.001,qmax=0.7 
    232232        Prompt num "Enter number of data points for model: " 
    233         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    234         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     233        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     234        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    235235         
    236236        if(!DataFolderExists(":HayPenMSA")) 
     
    249249        Display/K=1 ywave_PCR_SC vs xwave_PCR_SC 
    250250        ModifyGraph log=1,marker=29,msize=2,mode=4 
    251         Label bottom "q (\\S-1\\M)" 
     251        Label bottom "q (A\\S-1\\M)" 
    252252        Label left "Intensity (cm\\S-1\\M)" 
    253253 
     
    289289        Display smeared_PCR_SC vs smeared_qvals                                                                  
    290290        ModifyGraph log=1,marker=29,msize=2,mode=4 
    291         Label bottom "q (\\S-1\\M)" 
     291        Label bottom "q (A\\S-1\\M)" 
    292292        Label left "Intensity (cm\\S-1\\M)" 
    293293 
     
    352352        Variable num=256,qmin=0.001,qmax=0.7 
    353353        Prompt num "Enter number of data points for model: " 
    354         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    355         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     354        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     355        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    356356         
    357357        Make/O/D/n=(num) xwave_PCR_SHS,ywave_PCR_SHS 
     
    365365        Display/K=1 ywave_PCR_SHS vs xwave_PCR_SHS 
    366366        ModifyGraph log=1,marker=29,msize=2,mode=4 
    367         Label bottom "q (\\S-1\\M)" 
     367        Label bottom "q (A\\S-1\\M)" 
    368368        Label left "Intensity (cm\\S-1\\M)" 
    369369 
     
    400400        Display smeared_PCR_SHS vs smeared_qvals                                                                         
    401401        ModifyGraph log=1,marker=29,msize=2,mode=4 
    402         Label bottom "q (\\S-1\\M)" 
     402        Label bottom "q (A\\S-1\\M)" 
    403403        Label left "Intensity (cm\\S-1\\M)" 
    404404 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PolyCoreShellRatio_v40.ipf

    r325 r379  
    1717        Variable num=128,qmin=0.001,qmax=0.7 
    1818        Prompt num "Enter number of data points for model: " 
    19         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    20         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     19        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     20        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2121         
    2222        Make/O/D/n=(num) xwave_pcr,ywave_pcr 
     
    3030        Display ywave_pcr vs xwave_pcr 
    3131        ModifyGraph log=1,marker=29,msize=2,mode=4 
    32         Label bottom "q (\\S-1\\M)" 
     32        Label bottom "q (A\\S-1\\M)" 
    3333        Label left "Intensity (cm\\S-1\\M)" 
    3434        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6565        Display smeared_pcr vs smeared_qvals 
    6666        ModifyGraph log=1,marker=29,msize=2,mode=4 
    67         Label bottom "q (\\S-1\\M)" 
     67        Label bottom "q (A\\S-1\\M)" 
    6868        Label left "Intensity (cm\\S-1\\M)" 
    6969        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)   
     
    109109        //assign nice names to the input wave 
    110110        //w[0] = scale 
    111         //w[1] = core radius [] 
    112         //w[2] = shell thickness [] 
     111        //w[1] = core radius [A] 
     112        //w[2] = shell thickness [A] 
    113113        //w[3] = polydispersity index (0<p<1) 
    114         //w[4] = SLD core [^-2] 
    115         //w[5] = SLD shell  [^-2] 
    116         //w[6] = SLD solvent [^-2] 
     114        //w[4] = SLD core [A^-2] 
     115        //w[5] = SLD shell  [A^-2] 
     116        //w[6] = SLD solvent [A^-2] 
    117117        //w[7] = bkg [cm-1] 
    118118        Variable scale,corrad,thick,shlrad,pp,drho1,drho2,sig,zz,bkg 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PolyCore_Sq_v40.ipf

    r325 r379  
    1515        Variable num=256,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/n=(num) xwave_PCF_HS,ywave_PCF_HS 
     
    2828        Display/K=1 ywave_PCF_HS vs xwave_PCF_HS 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)" 
    3232 
     
    6363        Display smeared_PCF_HS vs smeared_qvals                                                                  
    6464        ModifyGraph log=1,marker=29,msize=2,mode=4 
    65         Label bottom "q (\\S-1\\M)" 
     65        Label bottom "q (A\\S-1\\M)" 
    6666        Label left "Intensity (cm\\S-1\\M)" 
    6767 
     
    122122        Variable num=256,qmin=0.001,qmax=0.7 
    123123        Prompt num "Enter number of data points for model: " 
    124         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    125         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     124        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     125        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    126126         
    127127        Make/O/D/n=(num) xwave_PCF_SW,ywave_PCF_SW 
     
    135135        Display/K=1 ywave_PCF_SW vs xwave_PCF_SW 
    136136        ModifyGraph log=1,marker=29,msize=2,mode=4 
    137         Label bottom "q (\\S-1\\M)" 
     137        Label bottom "q (A\\S-1\\M)" 
    138138        Label left "Intensity (cm\\S-1\\M)" 
    139139 
     
    170170        Display smeared_PCF_SW vs smeared_qvals                                                                  
    171171        ModifyGraph log=1,marker=29,msize=2,mode=4 
    172         Label bottom "q (\\S-1\\M)" 
     172        Label bottom "q (A\\S-1\\M)" 
    173173        Label left "Intensity (cm\\S-1\\M)" 
    174174 
     
    232232        Variable num=256,qmin=0.001,qmax=0.7 
    233233        Prompt num "Enter number of data points for model: " 
    234         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    235         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     234        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     235        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    236236         
    237237        if(!DataFolderExists(":HayPenMSA")) 
     
    250250        Display/K=1 ywave_PCF_SC vs xwave_PCF_SC 
    251251        ModifyGraph log=1,marker=29,msize=2,mode=4 
    252         Label bottom "q (\\S-1\\M)" 
     252        Label bottom "q (A\\S-1\\M)" 
    253253        Label left "Intensity (cm\\S-1\\M)" 
    254254 
     
    290290        Display smeared_PCF_SC vs smeared_qvals                                                                  
    291291        ModifyGraph log=1,marker=29,msize=2,mode=4 
    292         Label bottom "q (\\S-1\\M)" 
     292        Label bottom "q (A\\S-1\\M)" 
    293293        Label left "Intensity (cm\\S-1\\M)" 
    294294 
     
    353353        Variable num=256,qmin=0.001,qmax=0.7 
    354354        Prompt num "Enter number of data points for model: " 
    355         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    356         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     355        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     356        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    357357         
    358358        Make/O/D/n=(num) xwave_PCF_SHS,ywave_PCF_SHS 
     
    366366        Display/K=1 ywave_PCF_SHS vs xwave_PCF_SHS 
    367367        ModifyGraph log=1,marker=29,msize=2,mode=4 
    368         Label bottom "q (\\S-1\\M)" 
     368        Label bottom "q (A\\S-1\\M)" 
    369369        Label left "Intensity (cm\\S-1\\M)" 
    370370 
     
    401401        Display smeared_PCF_SHS vs smeared_qvals                                                                         
    402402        ModifyGraph log=1,marker=29,msize=2,mode=4 
    403         Label bottom "q (\\S-1\\M)" 
     403        Label bottom "q (A\\S-1\\M)" 
    404404        Label left "Intensity (cm\\S-1\\M)" 
    405405 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PolyCore_v40.ipf

    r325 r379  
    1818        Variable num=256,qmin=0.001,qmax=0.7 
    1919        Prompt num "Enter number of data points for model: " 
    20         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    21         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     20        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     21        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2222         
    2323        Make/O/D/n=(num) xwave_pcf,ywave_pcf 
     
    3232        Display ywave_pcf vs xwave_pcf 
    3333        ModifyGraph log=1,marker=29,msize=2,mode=4 
    34         Label bottom "q (\\S-1\\M)" 
     34        Label bottom "q (A\\S-1\\M)" 
    3535        Label left "Intensity (cm\\S-1\\M)" 
    3636        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6767        Display smeared_pcf vs smeared_qvals 
    6868        ModifyGraph log=1,marker=29,msize=2,mode=4 
    69         Label bottom "q (\\S-1\\M)" 
     69        Label bottom "q (A\\S-1\\M)" 
    7070        Label left "Intensity (cm\\S-1\\M)" 
    7171        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)   
     
    103103// input parameters are 
    104104        //[0] scale 
    105         //[1] average core radius       [] 
     105        //[1] average core radius       [A] 
    106106        //[2] polydispersity of core (0<sig<1) 
    107         //[3] shell thickness   [] 
    108         //[4] SLD core          [-2] 
     107        //[3] shell thickness   [A] 
     108        //[4] SLD core          [A-2] 
    109109        //[5] SLD shell 
    110110        //[6] SLD solvent 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PolyHardSphereInten_v40.ipf

    r325 r379  
    1616        Variable num=128,qmin=0.001,qmax=0.7 
    1717        Prompt num "Enter number of data points for model: " 
    18         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    19         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     18        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     19        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2020         
    2121        Make/O/D/n=(num) xwave_phs,ywave_phs 
     
    2929        Display ywave_phs vs xwave_phs 
    3030        ModifyGraph log=1,marker=29,msize=2,mode=4 
    31         Label bottom "q (\\S-1\\M)" 
     31        Label bottom "q (A\\S-1\\M)" 
    3232        Label left "Intensity (cm\\S-1\\M)" 
    3333        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6464        Display smeared_phs vs smeared_qvals 
    6565        ModifyGraph log=1,marker=29,msize=2,mode=4 
    66         Label bottom "q (\\S-1\\M)" 
     66        Label bottom "q (A\\S-1\\M)" 
    6767        Label left "Intensity (cm\\S-1\\M)" 
    6868        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)   
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PolyRectSphere_Sq_v40.ipf

    r325 r379  
    1414        Variable num=256,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/n=(num) xwave_RECT_HS,ywave_RECT_HS 
     
    2727        Display/K=1 ywave_RECT_HS vs xwave_RECT_HS 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131 
     
    6262        Display smeared_RECT_HS vs smeared_qvals                                                                         
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666 
     
    118118        Variable num=256,qmin=0.001,qmax=0.7 
    119119        Prompt num "Enter number of data points for model: " 
    120         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    121         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     120        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     121        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    122122         
    123123        Make/O/D/n=(num) xwave_RECT_SW,ywave_RECT_SW 
     
    131131        Display/K=1 ywave_RECT_SW vs xwave_RECT_SW 
    132132        ModifyGraph log=1,marker=29,msize=2,mode=4 
    133         Label bottom "q (\\S-1\\M)" 
     133        Label bottom "q (A\\S-1\\M)" 
    134134        Label left "Intensity (cm\\S-1\\M)" 
    135135 
     
    166166        Display smeared_RECT_SW vs smeared_qvals                                                                         
    167167        ModifyGraph log=1,marker=29,msize=2,mode=4 
    168         Label bottom "q (\\S-1\\M)" 
     168        Label bottom "q (A\\S-1\\M)" 
    169169        Label left "Intensity (cm\\S-1\\M)" 
    170170 
     
    225225        Variable num=256,qmin=0.001,qmax=0.7 
    226226        Prompt num "Enter number of data points for model: " 
    227         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    228         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     227        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     228        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    229229         
    230230        if(!DataFolderExists(":HayPenMSA")) 
     
    243243        Display/K=1 ywave_RECT_SC vs xwave_RECT_SC 
    244244        ModifyGraph log=1,marker=29,msize=2,mode=4 
    245         Label bottom "q (\\S-1\\M)" 
     245        Label bottom "q (A\\S-1\\M)" 
    246246        Label left "Intensity (cm\\S-1\\M)" 
    247247 
     
    283283        Display smeared_RECT_SC vs smeared_qvals                                                                         
    284284        ModifyGraph log=1,marker=29,msize=2,mode=4 
    285         Label bottom "q (\\S-1\\M)" 
     285        Label bottom "q (A\\S-1\\M)" 
    286286        Label left "Intensity (cm\\S-1\\M)" 
    287287 
     
    343343        Variable num=256,qmin=0.001,qmax=0.7 
    344344        Prompt num "Enter number of data points for model: " 
    345         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    346         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     345        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     346        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    347347         
    348348        Make/O/D/n=(num) xwave_RECT_SHS,ywave_RECT_SHS 
     
    356356        Display/K=1 ywave_RECT_SHS vs xwave_RECT_SHS 
    357357        ModifyGraph log=1,marker=29,msize=2,mode=4 
    358         Label bottom "q (\\S-1\\M)" 
     358        Label bottom "q (A\\S-1\\M)" 
    359359        Label left "Intensity (cm\\S-1\\M)" 
    360360 
     
    391391        Display smeared_RECT_SHS vs smeared_qvals                                                                        
    392392        ModifyGraph log=1,marker=29,msize=2,mode=4 
    393         Label bottom "q (\\S-1\\M)" 
     393        Label bottom "q (A\\S-1\\M)" 
    394394        Label left "Intensity (cm\\S-1\\M)" 
    395395 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PolyRectSphere_v40.ipf

    r325 r379  
    1616        Variable num=128,qmin=0.001,qmax=0.7 
    1717        Prompt num "Enter number of data points for model: " 
    18         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    19         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     18        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     19        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2020         
    2121        Make/O/D/n=(num) xwave_rect,ywave_rect 
     
    2929        Display ywave_rect vs xwave_rect 
    3030        ModifyGraph log=1,marker=29,msize=2,mode=4 
    31         Label bottom "q (\\S-1\\M)" 
     31        Label bottom "q (A\\S-1\\M)" 
    3232        Label left "Intensity (cm\\S-1\\M)" 
    3333//      DoAlert 0,"The form facor is not properly normalized with the polydisperse volume" 
     
    6666        Display smeared_rect vs smeared_qvals 
    6767        ModifyGraph log=1,marker=29,msize=2,mode=4 
    68         Label bottom "q (\\S-1\\M)" 
     68        Label bottom "q (A\\S-1\\M)" 
    6969        Label left "Intensity (cm\\S-1\\M)" 
    7070        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)   
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Power_Law_model_v40.ipf

    r325 r379  
    88        Variable num=512, qmin=.001, qmax=.2 
    99        Prompt num "Enter number of data points for model: " 
    10         Prompt qmin "Enter minimum q-value (^1) for model: "  
    11          Prompt qmax "Enter maximum q-value (^1) for model: " 
     10        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     11         Prompt qmax "Enter maximum q-value (A^1) for model: " 
    1212// 
    1313        Make/O/D/n=(num) xwave_Power_Law, ywave_Power_Law 
     
    2323        ModifyGraph log(left)=1 
    2424        ModifyGraph log(bottom)=1 
    25         Label bottom "q (\\S-1\\M) " 
     25        Label bottom "q (A\\S-1\\M) " 
    2626        Label left "Power-Law (cm\\S-1\\M)" 
    2727        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6060        Display smeared_Power_Law vs smeared_qvals                                                                      // 
    6161        ModifyGraph log=1,marker=29,msize=2,mode=4 
    62         Label bottom "q (\\S-1\\M)" 
     62        Label bottom "q (A\\S-1\\M)" 
    6363        Label left "Power_Law (cm\\S-1\\M)" 
    6464        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/ProlateCoreShell_Sq_v40.ipf

    r325 r379  
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/n=(num) xwave_PEF_HS,ywave_PEF_HS 
     
    2727        Display ywave_PEF_HS vs xwave_PEF_HS 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131 
     
    6262        Display smeared_PEF_HS vs smeared_qvals                                                                  
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666 
     
    113113        Variable num=128,qmin=0.001,qmax=0.7 
    114114        Prompt num "Enter number of data points for model: " 
    115         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    116         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     115        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     116        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    117117         
    118118        Make/O/D/n=(num) xwave_PEF_SW,ywave_PEF_SW 
     
    126126        Display ywave_PEF_SW vs xwave_PEF_SW 
    127127        ModifyGraph log=1,marker=29,msize=2,mode=4 
    128         Label bottom "q (\\S-1\\M)" 
     128        Label bottom "q (A\\S-1\\M)" 
    129129        Label left "Intensity (cm\\S-1\\M)" 
    130130 
     
    161161        Display smeared_PEF_SW vs smeared_qvals                                                                  
    162162        ModifyGraph log=1,marker=29,msize=2,mode=4 
    163         Label bottom "q (\\S-1\\M)" 
     163        Label bottom "q (A\\S-1\\M)" 
    164164        Label left "Intensity (cm\\S-1\\M)" 
    165165 
     
    214214        Variable num=128,qmin=0.001,qmax=0.7 
    215215        Prompt num "Enter number of data points for model: " 
    216         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    217         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     216        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     217        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    218218         
    219219        if(!DataFolderExists(":HayPenMSA")) 
     
    232232        Display ywave_PEF_SC vs xwave_PEF_SC 
    233233        ModifyGraph log=1,marker=29,msize=2,mode=4 
    234         Label bottom "q (\\S-1\\M)" 
     234        Label bottom "q (A\\S-1\\M)" 
    235235        Label left "Intensity (cm\\S-1\\M)" 
    236236 
     
    272272        Display smeared_PEF_SC vs smeared_qvals                                                                  
    273273        ModifyGraph log=1,marker=29,msize=2,mode=4 
    274         Label bottom "q (\\S-1\\M)" 
     274        Label bottom "q (A\\S-1\\M)" 
    275275        Label left "Intensity (cm\\S-1\\M)" 
    276276 
     
    328328        Variable num=128,qmin=0.001,qmax=0.7 
    329329        Prompt num "Enter number of data points for model: " 
    330         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    331         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     330        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     331        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    332332         
    333333        Make/O/D/n=(num) xwave_PEF_SHS,ywave_PEF_SHS 
     
    341341        Display ywave_PEF_SHS vs xwave_PEF_SHS 
    342342        ModifyGraph log=1,marker=29,msize=2,mode=4 
    343         Label bottom "q (\\S-1\\M)" 
     343        Label bottom "q (A\\S-1\\M)" 
    344344        Label left "Intensity (cm\\S-1\\M)" 
    345345 
     
    376376        Display smeared_PEF_SHS vs smeared_qvals                                                                         
    377377        ModifyGraph log=1,marker=29,msize=2,mode=4 
    378         Label bottom "q (\\S-1\\M)" 
     378        Label bottom "q (A\\S-1\\M)" 
    379379        Label left "Intensity (cm\\S-1\\M)" 
    380380 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/ProlateCoreShell_v40.ipf

    r325 r379  
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/n=(num) xwave_pef,ywave_pef 
     
    2727        Display ywave_pef vs xwave_pef 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6262        Display smeared_pef vs smeared_qvals 
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2)   
     
    9191//The input variables are (and output) 
    9292        //[0] scale 
    93         //[1] crmaj, major radius of core       [] 
     93        //[1] crmaj, major radius of core       [A] 
    9494        //[2] crmin, minor radius of core 
    9595        //[3] trmaj, overall major radius 
     
    193193        answer /= prolatevol 
    194194         
    195         // rescale from 1/ to 1/cm 
     195        // rescale from 1/A to 1/cm 
    196196        answer *= 1.0e8 
    197197        //scale (arb) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Sphere_Sq_v40.ipf

    r325 r379  
    1414        Variable num=256,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        //make the normal model waves 
     
    2828        Display/K=1 ywave_S_HS vs xwave_S_HS                                                     
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)"                                      
    3232 
     
    6363        Display smeared_S_HS vs smeared_qvals                                                                    
    6464        ModifyGraph log=1,marker=29,msize=2,mode=4 
    65         Label bottom "q (\\S-1\\M)" 
     65        Label bottom "q (A\\S-1\\M)" 
    6666        Label left "Intensity (cm\\S-1\\M)" 
    6767 
     
    108108        Variable num=256,qmin=0.001,qmax=0.7 
    109109        Prompt num "Enter number of data points for model: " 
    110         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    111         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     110        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     111        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    112112         
    113113        /// 
     
    125125        Display/K=1 ywave_S_SW vs xwave_S_SW                                                     
    126126        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    127         Label bottom "q (\\S-1\\M)" 
     127        Label bottom "q (A\\S-1\\M)" 
    128128        Label left "Intensity (cm\\S-1\\M)"                                      
    129129 
     
    159159        Display smeared_S_SW vs smeared_qvals                                                                    
    160160        ModifyGraph log=1,marker=29,msize=2,mode=4 
    161         Label bottom "q (\\S-1\\M)" 
     161        Label bottom "q (A\\S-1\\M)" 
    162162        Label left "Intensity (cm\\S-1\\M)" 
    163163 
     
    206206        Variable num=256,qmin=0.001,qmax=0.7 
    207207        Prompt num "Enter number of data points for model: " 
    208         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    209         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     208        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     209        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    210210         
    211211        if(!DataFolderExists(":HayPenMSA")) 
     
    225225        Display/K=1 ywave_S_SC vs xwave_S_SC                                                     
    226226        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    227         Label bottom "q (\\S-1\\M)" 
     227        Label bottom "q (A\\S-1\\M)" 
    228228        Label left "Intensity (cm\\S-1\\M)"                                      
    229229 
     
    265265        Display smeared_S_SC vs smeared_qvals                                                                    
    266266        ModifyGraph log=1,marker=29,msize=2,mode=4 
    267         Label bottom "q (\\S-1\\M)" 
     267        Label bottom "q (A\\S-1\\M)" 
    268268        Label left "Intensity (cm\\S-1\\M)" 
    269269 
     
    313313        Variable num=256,qmin=0.001,qmax=0.7 
    314314        Prompt num "Enter number of data points for model: " 
    315         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    316         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     315        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     316        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    317317         
    318318        /// 
     
    330330        Display/K=1 ywave_S_SHS vs xwave_S_SHS                                                   
    331331        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    332         Label bottom "q (\\S-1\\M)" 
     332        Label bottom "q (A\\S-1\\M)" 
    333333        Label left "Intensity (cm\\S-1\\M)"                                      
    334334 
     
    365365        Display smeared_S_SHS vs smeared_qvals                                                                   
    366366        ModifyGraph log=1,marker=29,msize=2,mode=4 
    367         Label bottom "q (\\S-1\\M)" 
     367        Label bottom "q (A\\S-1\\M)" 
    368368        Label left "Intensity (cm\\S-1\\M)" 
    369369 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Sphere_v40.ipf

    r325 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/n=(num) xwave_sf,ywave_sf                                       
     
    2828        Display ywave_sf vs xwave_sf                                                     
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4                       
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)"                                      
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6060         
    6161        ModifyGraph log=1,marker=29,msize=2,mode=4 
    62         Label bottom "q (\\S-1\\M)" 
     62        Label bottom "q (A\\S-1\\M)" 
    6363        Label left "Intensity (cm\\S-1\\M)" 
    6464        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    9292        // variables are:                                                        
    9393        //[0] scale 
    94         //[1] radius () 
    95         //[2] sld sphere (-2) 
     94        //[1] radius (A) 
     95        //[2] sld sphere (A-2) 
    9696        //[3] sld solv 
    9797        //[4] background (cm-1) 
     
    118118        bes = 3*(sin(x*radius)-x*radius*cos(x*radius))/x^3/radius^3 
    119119        vol = 4*pi/3*radius^3 
    120         f = vol*bes*delrho              // [=]  
     120        f = vol*bes*delrho              // [=] A 
    121121        // normalize to single particle volume, convert to 1/cm 
    122122        f2 = f * f / vol * 1.0e8                // [=] 1/cm 
     
    174174End 
    175175  
    176  
    177 // wrapper to do the desired fit 
    178 //  
    179 // str is the data folder for the desired data set 
    180 // 
    181 // -- this looks like something that can be made rather generic rather easily 
    182 // 
    183 //Function SphereFitWrapper(str) 
    184 //      String str 
    185 //               
    186 //      SetDataFolder root: 
    187 //      String DF="root:"+str+":" 
    188 //       
    189 //      Struct ResSmearAAOStruct fs 
    190 //      WAVE resW = $(DF+str+"_res")             
    191 //      WAVE fs.resW =  resW 
    192 //       
    193 //      WAVE cw=$(DF+"smear_coef_sf") 
    194 //      WAVE yw=$(DF+str+"_i") 
    195 //      WAVE xw=$(DF+str+"_q") 
    196 //      WAVE sw=$(DF+str+"_s") 
    197 //       
    198 //      Duplicate/O yw $(DF+"FitYw") 
    199 //       
    200 //      //can't use execute if /STRC is needed since structure instance is not a global! 
    201 //      //don't use the auto-destination with no flag, it doesn't appear to work correctly 
    202 //      //force it to use a wave of identical length, at least - no guarantee that the q-values  
    203 //      // will be the same? be sure that the smearing iterpolates 
    204 //      // 
    205 //      // ?? how can I get the hold string in correctly?? - from a global? - no, as string function 
    206 //      // 
    207 //      FuncFit/H=getHoldStr() /NTHR=0 SmearedSphereForm, cw, yw /X=xw /W=sw /I=1 /STRC=fs 
    208 ////    FuncFit/H=getHoldStr() /NTHR=0 SphereForm cw, yw /X=xw /W=sw /I=1 /D=$(DF+"FitYw") 
    209 // 
    210 ////    FuncFit/H="0010"/NTHR=0 SmearedSphereForm cw, yw /X=xw /W=sw /I=1 /D=$(DF+"FitYw") /STRC=fs 
    211 //      Wave fityw =  $(DF+"FitYw") 
    212 //      fs.yW = fityw 
    213 //      SmearedSphereForm(fs) 
    214 //      AppendToGraph fityw vs xw  
    215 //       
    216 //      print "V_chisq = ",V_chisq 
    217 //      print cw 
    218 //      WAVE w_sigma 
    219 //      print w_sigma 
    220 //       
    221 //      return(0) 
    222 //End 
    223 // 
    224 //Function/S getHoldStr() 
    225 // 
    226 //      String str="0010" 
    227 //      return str 
    228 //End 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/SquareWellStruct_v40.ipf

    r325 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.3 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/n=(num) xwave_sws,ywave_sws 
     
    2828        Display ywave_sws vs xwave_sws 
    2929        ModifyGraph marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Structure Factor" 
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/StackedDiscs_v40.ipf

    r325 r379  
    2121        Variable num=500,qmin=0.001,qmax=1.0 
    2222        Prompt num "Enter number of data points for model: " 
    23         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    24         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     23        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     24        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2525         
    2626        make/o/D/n=(num) xwave_scyl,ywave_scyl 
     
    3535        Display ywave_scyl vs xwave_scyl 
    3636        ModifyGraph log=1,marker=29,msize=2,mode=4 
    37         Label bottom "q (\\S-1\\M)" 
     37        Label bottom "q (A\\S-1\\M)" 
    3838        Label left "Intensity (cm\\S-1\\M)" 
    3939        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    7171        Display smeared_scyl vs smeared_qvals 
    7272        ModifyGraph log=1,marker=29,msize=2,mode=4 
    73         Label bottom "q (\\S-1\\M)" 
     73        Label bottom "q (A\\S-1\\M)" 
    7474        Label left "Intensity (cm\\S-1\\M)" 
    7575        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Teubner_v40.ipf

    r325 r379  
    1212        Variable num=128,qmin=0.001,qmax=0.7 
    1313        Prompt num "Enter number of data points for model: " 
    14         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    15         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     14        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     15        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1616         
    1717        Make/O/D/n=(num) xwave_ts,ywave_ts 
     
    2525        Display ywave_ts vs xwave_ts 
    2626        ModifyGraph log=1,marker=29,msize=2,mode=4 
    27         Label bottom "q (\\S-1\\M)" 
     27        Label bottom "q (A\\S-1\\M)" 
    2828        Label left "Intensity (cm\\S-1\\M)" 
    2929        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6161        Display smeared_ts vs smeared_qvals 
    6262        ModifyGraph log=1,marker=29,msize=2,mode=4 
    63         Label bottom "q (\\S-1\\M)" 
     63        Label bottom "q (A\\S-1\\M)" 
    6464        Label left "Intensity (cm\\S-1\\M)" 
    6565        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/UniformEllipsoid_Sq_v40.ipf

    r325 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/n=(num) xwave_EOR_HS,ywave_EOR_HS 
     
    2828        Display ywave_EOR_HS vs xwave_EOR_HS 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)" 
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6262        Display smeared_EOR_HS vs smeared_qvals                                                                  
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666 
     
    111111        Variable num=128,qmin=0.001,qmax=0.7 
    112112        Prompt num "Enter number of data points for model: " 
    113         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    114         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     113        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     114        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    115115         
    116116        Make/O/D/n=(num) xwave_EOR_SW,ywave_EOR_SW 
     
    124124        Display ywave_EOR_SW vs xwave_EOR_SW 
    125125        ModifyGraph log=1,marker=29,msize=2,mode=4 
    126         Label bottom "q (\\S-1\\M)" 
     126        Label bottom "q (A\\S-1\\M)" 
    127127        Label left "Intensity (cm\\S-1\\M)" 
    128128 
     
    159159        Display smeared_EOR_SW vs smeared_qvals                                                                  
    160160        ModifyGraph log=1,marker=29,msize=2,mode=4 
    161         Label bottom "q (\\S-1\\M)" 
     161        Label bottom "q (A\\S-1\\M)" 
    162162        Label left "Intensity (cm\\S-1\\M)" 
    163163 
     
    209209        Variable num=128,qmin=0.001,qmax=0.7 
    210210        Prompt num "Enter number of data points for model: " 
    211         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    212         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     211        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     212        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    213213         
    214214        if(!DataFolderExists(":HayPenMSA")) 
     
    227227        Display ywave_EOR_SC vs xwave_EOR_SC 
    228228        ModifyGraph log=1,marker=29,msize=2,mode=4 
    229         Label bottom "q (\\S-1\\M)" 
     229        Label bottom "q (A\\S-1\\M)" 
    230230        Label left "Intensity (cm\\S-1\\M)" 
    231231 
     
    267267        Display smeared_EOR_SC vs smeared_qvals                                                                  
    268268        ModifyGraph log=1,marker=29,msize=2,mode=4 
    269         Label bottom "q (\\S-1\\M)" 
     269        Label bottom "q (A\\S-1\\M)" 
    270270        Label left "Intensity (cm\\S-1\\M)" 
    271271 
     
    319319        Variable num=128,qmin=0.001,qmax=0.7 
    320320        Prompt num "Enter number of data points for model: " 
    321         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    322         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     321        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     322        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    323323         
    324324        Make/O/D/n=(num) xwave_EOR_SHS,ywave_EOR_SHS 
     
    332332        Display ywave_EOR_SHS vs xwave_EOR_SHS 
    333333        ModifyGraph log=1,marker=29,msize=2,mode=4 
    334         Label bottom "q (\\S-1\\M)" 
     334        Label bottom "q (A\\S-1\\M)" 
    335335        Label left "Intensity (cm\\S-1\\M)" 
    336336 
     
    367367        Display smeared_EOR_SHS vs smeared_qvals                                                                         
    368368        ModifyGraph log=1,marker=29,msize=2,mode=4 
    369         Label bottom "q (\\S-1\\M)" 
     369        Label bottom "q (A\\S-1\\M)" 
    370370        Label left "Intensity (cm\\S-1\\M)" 
    371371 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/UniformEllipsoid_v40.ipf

    r325 r379  
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        Make/O/D/n=(num) xwave_eor,ywave_eor 
     
    2727        Display ywave_eor vs xwave_eor 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6262        Display smeared_eor vs smeared_qvals 
    6363        ModifyGraph log=1,marker=29,msize=2,mode=4 
    64         Label bottom "q (\\S-1\\M)" 
     64        Label bottom "q (A\\S-1\\M)" 
    6565        Label left "Intensity (cm\\S-1\\M)" 
    6666        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/BE_Polyelectrolyte.ipf

    r42 r379  
    1515        Variable num=512,qmin=0.001,qmax=0.2 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: "   
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: "   
    1919 
    2020        make/o/n=(num) xwave_BE,ywave_BE 
    2121        xwave_BE =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num))      
    2222        make/o coef_BE = {10,7.1,12,10,0.00,0.05,0.7,0.001} 
    23         make/o/t parameters_BE = {"K (barns)","Lb ()","h (-3)","b ()","Cs (mol/L)","alpha","C (mol/L)","Background"}  
     23        make/o/t parameters_BE = {"K (barns)","Lb (A)","h (A-3)","b (A)","Cs (mol/L)","alpha","C (mol/L)","Background"}  
    2424        Edit parameters_BE,coef_BE 
    2525        ywave_BE := BEPolyelectrolyte(coef_BE,xwave_BE) 
    2626        Display ywave_BE vs xwave_BE 
    2727        ModifyGraph log=0,marker=29,msize=2,mode=4                      //**** log=0 if linear scale desired 
    28         Label bottom "q (\\S-1\\M)" 
     28        Label bottom "q (A\\S-1\\M)" 
    2929        Label left "S(q) BE , cm\\S-1\\M" 
    3030        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    4343        // Setup parameter table for model function 
    4444        make/o smear_coef_BE = {10,7.1,12,10,0.00,0.05,0.7,0.001}                                       //**** mod, coef values to match unsmeared model above 
    45         make/o/t smear_parameters_BE= {"K (barns)","Lb ()","h (-3)","b ()","Cs (mol/L)","alpha","C (mol/L)","Background"}     
     45        make/o/t smear_parameters_BE= {"K (barns)","Lb (A)","h (A-3)","b (A)","Cs (mol/L)","alpha","C (mol/L)","Background"}     
    4646        Edit smear_parameters_BE,smear_coef_BE                                  //**** mod 
    4747         
     
    5454        Display smeared_BE vs smeared_qvals                                                                     //**** mod 
    5555        ModifyGraph log=0,marker=29,msize=2,mode=4 
    56         Label bottom "q (\\S-1\\M)" 
     56        Label bottom "q (A\\S-1\\M)" 
    5757        Label left "I  sBE (cm\\S-1\\M)" 
    5858        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    7070        Variable q 
    7171// Input (fitting) variables are: 
    72         //[0] K  = contrast factor  (barns = 10-24 cm^2=10-4 ^2) 
    73         //[1] Lb = Bjerrum length ; this parameter needs to be kept constant for a given solvent and temperature!  () 
    74         //[2]  h = virial parameter (3) 
    75         //[3]  b = monomer length  () 
     72        //[0] K  = contrast factor  (barns = 10-24 cm^2=10-4 A^2) 
     73        //[1] Lb = Bjerrum length ; this parameter needs to be kept constant for a given solvent and temperature!  (A) 
     74        //[2]  h = virial parameter (A3) 
     75        //[3]  b = monomer length  (A) 
    7676        //[4]  Cs = concentration of monovalent salt (mol/L) 
    7777        //[5]  alpha = ionization degree : ratio of charged monomers  to total number of monomers 
     
    104104// where : b = Sum(batom) ; batom = scattering length in cm-12  
    105105//              vp = partial molar volume of the polymer ; vsolvent= partial molar volume of the solvent 
    106 // NB :K in  Barns = 10^-24 cm2 ; the rest of the expression is in -3 = 10^24 cm3 
     106// NB :K in  Barns = 10^-24 cm2 ; the rest of the expression is in A-3 = 10^24 cm3 
    107107//  -> there is no multiplication factor to get the result in cm-1 .  
    108108// Returns S(q) in cm-1 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/CoreShell.ipf

    r42 r379  
    1414        Variable num=128,qmin=0.001,qmax=0.7 
    1515        Prompt num "Enter number of data points for model: " 
    16         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    17         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     16        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     17        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1818         
    1919        make/o/d/n=(num) xwave_css,ywave_css 
     
    2525        Display ywave_css vs xwave_css 
    2626        ModifyGraph log=1,marker=29,msize=2,mode=4 
    27         Label bottom "q (\\S-1\\M)" 
     27        Label bottom "q (A\\S-1\\M)" 
    2828        Label left "Intensity (cm\\S-1\\M)" 
    2929        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5555        Display smeared_css vs smeared_qvals                                                                     
    5656        ModifyGraph log=1,marker=29,msize=2,mode=4 
    57         Label bottom "q (\\S-1\\M)" 
     57        Label bottom "q (A\\S-1\\M)" 
    5858        Label left "Intensity (cm\\S-1\\M)" 
    5959        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6969        // variables are: 
    7070        //[0] scale factor 
    71         //[1] radius of core [] 
    72         //[2] thickness of the shell    [] 
    73         //[3] SLD of the core   [-2] 
     71        //[1] radius of core [A] 
     72        //[2] thickness of the shell    [A] 
     73        //[3] SLD of the core   [A-2] 
    7474        //[4] SLD of the shell 
    7575        //[5] SLD of the solvent 
     
    105105        f += vol*bes*contr 
    106106         
    107         // normalize to particle volume and rescale from [-1] to [cm-1] 
     107        // normalize to particle volume and rescale from [A-1] to [cm-1] 
    108108        f2 = f*f/vol*1.0e8 
    109109         
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/CoreShellCylinder.ipf

    r42 r379  
    1616        Variable num=128,qmin=0.001,qmax=0.7 
    1717        Prompt num "Enter number of data points for model: " 
    18         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    19         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     18        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     19        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2020         
    2121        make/o/d/n=(num) xwave_cscyl,ywave_cscyl 
     
    2727        Display ywave_cscyl vs xwave_cscyl 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5555        Display smeared_cscyl vs smeared_qvals 
    5656        ModifyGraph log=1,marker=29,msize=2,mode=4 
    57         Label bottom "q (\\S-1\\M)" 
     57        Label bottom "q (A\\S-1\\M)" 
    5858        Label left "Intensity (cm\\S-1\\M)" 
    5959        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/CoreShell_and_Struct.ipf

    r42 r379  
    1212        Variable num=256,qmin=0.001,qmax=0.7 
    1313        Prompt num "Enter number of data points for model: " 
    14         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    15         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     14        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     15        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1616         
    1717        Make/O/D/n=(num) xwave_CSS_HS,ywave_CSS_HS 
     
    2323        Display/K=1 ywave_CSS_HS vs xwave_CSS_HS 
    2424        ModifyGraph log=1,marker=29,msize=2,mode=4 
    25         Label bottom "q (\\S-1\\M)" 
     25        Label bottom "q (A\\S-1\\M)" 
    2626        Label left "Intensity (cm\\S-1\\M)" 
    2727 
     
    5151        Display smeared_CSS_HS vs smeared_qvals                                                                  
    5252        ModifyGraph log=1,marker=29,msize=2,mode=4 
    53         Label bottom "q (\\S-1\\M)" 
     53        Label bottom "q (A\\S-1\\M)" 
    5454        Label left "Intensity (cm\\S-1\\M)" 
    5555 
     
    9494        Variable num=256,qmin=0.001,qmax=0.7 
    9595        Prompt num "Enter number of data points for model: " 
    96         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    97         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     96        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     97        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    9898         
    9999        Make/O/D/n=(num) xwave_CSS_SW,ywave_CSS_SW 
     
    105105        Display/K=1 ywave_CSS_SW vs xwave_CSS_SW 
    106106        ModifyGraph log=1,marker=29,msize=2,mode=4 
    107         Label bottom "q (\\S-1\\M)" 
     107        Label bottom "q (A\\S-1\\M)" 
    108108        Label left "Intensity (cm\\S-1\\M)" 
    109109 
     
    133133        Display smeared_CSS_SW vs smeared_qvals                                                                  
    134134        ModifyGraph log=1,marker=29,msize=2,mode=4 
    135         Label bottom "q (\\S-1\\M)" 
     135        Label bottom "q (A\\S-1\\M)" 
    136136        Label left "Intensity (cm\\S-1\\M)" 
    137137 
     
    179179        Variable num=256,qmin=0.001,qmax=0.7 
    180180        Prompt num "Enter number of data points for model: " 
    181         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    182         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     181        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     182        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    183183         
    184184        if (DataFolderExists("root:HayPenMSA")) 
     
    197197        Display/K=1 ywave_CSS_SC vs xwave_CSS_SC 
    198198        ModifyGraph log=1,marker=29,msize=2,mode=4 
    199         Label bottom "q (\\S-1\\M)" 
     199        Label bottom "q (A\\S-1\\M)" 
    200200        Label left "Intensity (cm\\S-1\\M)" 
    201201 
     
    232232        Display smeared_CSS_SC vs smeared_qvals                                                                  
    233233        ModifyGraph log=1,marker=29,msize=2,mode=4 
    234         Label bottom "q (\\S-1\\M)" 
     234        Label bottom "q (A\\S-1\\M)" 
    235235        Label left "Intensity (cm\\S-1\\M)" 
    236236 
     
    279279        Variable num=256,qmin=0.001,qmax=0.7 
    280280        Prompt num "Enter number of data points for model: " 
    281         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    282         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     281        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     282        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    283283         
    284284        Make/O/D/n=(num) xwave_CSS_SHS,ywave_CSS_SHS 
     
    290290        Display/K=1 ywave_CSS_SHS vs xwave_CSS_SHS 
    291291        ModifyGraph log=1,marker=29,msize=2,mode=4 
    292         Label bottom "q (\\S-1\\M)" 
     292        Label bottom "q (A\\S-1\\M)" 
    293293        Label left "Intensity (cm\\S-1\\M)" 
    294294 
     
    318318        Display smeared_CSS_SHS vs smeared_qvals                                                                         
    319319        ModifyGraph log=1,marker=29,msize=2,mode=4 
    320         Label bottom "q (\\S-1\\M)" 
     320        Label bottom "q (A\\S-1\\M)" 
    321321        Label left "Intensity (cm\\S-1\\M)" 
    322322 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/CylinderForm.ipf

    r125 r379  
    1313        Variable num=128,qmin=0.001,qmax=0.7 
    1414        Prompt num "Enter number of data points for model: " 
    15         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    16         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     15        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     16        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1717         
    1818        make/o/D/n=(num) xwave_cyl,ywave_cyl 
     
    2424        Display ywave_cyl vs xwave_cyl 
    2525        ModifyGraph log=1,marker=29,msize=2,mode=4 
    26         Label bottom "q (\\S-1\\M)" 
     26        Label bottom "q (A\\S-1\\M)" 
    2727        Label left "Intensity (cm\\S-1\\M)" 
    2828        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5252        Display smeared_cyl vs smeared_qvals 
    5353        ModifyGraph log=1,marker=29,msize=2,mode=4 
    54         Label bottom "q (\\S-1\\M)" 
     54        Label bottom "q (A\\S-1\\M)" 
    5555        Label left "Intensity (cm\\S-1\\M)" 
    5656        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/Cylinder_and_Struct.ipf

    r42 r379  
    1313        Variable num=128,qmin=0.001,qmax=0.7 
    1414        Prompt num "Enter number of data points for model: " 
    15         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    16         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     15        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     16        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1717         
    1818        Make/O/D/n=(num) xwave_CYL_HS,ywave_CYL_HS 
     
    2424        Display ywave_CYL_HS vs xwave_CYL_HS 
    2525        ModifyGraph log=1,marker=29,msize=2,mode=4 
    26         Label bottom "q (\\S-1\\M)" 
     26        Label bottom "q (A\\S-1\\M)" 
    2727        Label left "Intensity (cm\\S-1\\M)" 
    2828 
     
    5252        Display smeared_CYL_HS vs smeared_qvals                                                                  
    5353        ModifyGraph log=1,marker=29,msize=2,mode=4 
    54         Label bottom "q (\\S-1\\M)" 
     54        Label bottom "q (A\\S-1\\M)" 
    5555        Label left "Intensity (cm\\S-1\\M)" 
    5656 
     
    9494        Variable num=128,qmin=0.001,qmax=0.7 
    9595        Prompt num "Enter number of data points for model: " 
    96         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    97         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     96        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     97        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    9898         
    9999        Make/O/D/n=(num) xwave_CYL_SW,ywave_CYL_SW 
     
    105105        Display ywave_CYL_SW vs xwave_CYL_SW 
    106106        ModifyGraph log=1,marker=29,msize=2,mode=4 
    107         Label bottom "q (\\S-1\\M)" 
     107        Label bottom "q (A\\S-1\\M)" 
    108108        Label left "Intensity (cm\\S-1\\M)" 
    109109 
     
    133133        Display smeared_CYL_SW vs smeared_qvals                                                                  
    134134        ModifyGraph log=1,marker=29,msize=2,mode=4 
    135         Label bottom "q (\\S-1\\M)" 
     135        Label bottom "q (A\\S-1\\M)" 
    136136        Label left "Intensity (cm\\S-1\\M)" 
    137137 
     
    177177        Variable num=128,qmin=0.001,qmax=0.7 
    178178        Prompt num "Enter number of data points for model: " 
    179         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    180         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     179        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     180        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    181181         
    182182        if (DataFolderExists("root:HayPenMSA")) 
     
    195195        Display ywave_CYL_SC vs xwave_CYL_SC 
    196196        ModifyGraph log=1,marker=29,msize=2,mode=4 
    197         Label bottom "q (\\S-1\\M)" 
     197        Label bottom "q (A\\S-1\\M)" 
    198198        Label left "Intensity (cm\\S-1\\M)" 
    199199 
     
    230230        Display smeared_CYL_SC vs smeared_qvals                                                                  
    231231        ModifyGraph log=1,marker=29,msize=2,mode=4 
    232         Label bottom "q (\\S-1\\M)" 
     232        Label bottom "q (A\\S-1\\M)" 
    233233        Label left "Intensity (cm\\S-1\\M)" 
    234234 
     
    277277        Variable num=128,qmin=0.001,qmax=0.7 
    278278        Prompt num "Enter number of data points for model: " 
    279         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    280         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     279        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     280        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    281281         
    282282        Make/O/D/n=(num) xwave_CYL_SHS,ywave_CYL_SHS 
     
    288288        Display ywave_CYL_SHS vs xwave_CYL_SHS 
    289289        ModifyGraph log=1,marker=29,msize=2,mode=4 
    290         Label bottom "q (\\S-1\\M)" 
     290        Label bottom "q (A\\S-1\\M)" 
    291291        Label left "Intensity (cm\\S-1\\M)" 
    292292 
     
    316316        Display smeared_CYL_SHS vs smeared_qvals                                                                         
    317317        ModifyGraph log=1,marker=29,msize=2,mode=4 
    318         Label bottom "q (\\S-1\\M)" 
     318        Label bottom "q (A\\S-1\\M)" 
    319319        Label left "Intensity (cm\\S-1\\M)" 
    320320 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/DAB_model.ipf

    r42 r379  
    77        Variable num=512, qmin=.001, qmax=.7 
    88        Prompt num "Enter number of data points for model: " 
    9         Prompt qmin "Enter minimum q-value (^1) for model: "  
    10          Prompt qmax "Enter maximum q-value (^1) for model: " 
     9        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     10         Prompt qmax "Enter maximum q-value (A^1) for model: " 
    1111// 
    1212        Make/O/D/n=(num) xwave_DAB, ywave_DAB 
    1313        xwave_DAB =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    1414        Make/O/D coef_DAB = {10.0, 40, 1.0} 
    15         make/o/t parameters_DAB = {"Scale Factor, A ", "Correlation Length ()", "Incoherent Bgd (cm-1)"} 
     15        make/o/t parameters_DAB = {"Scale Factor, A ", "Correlation Length (A)", "Incoherent Bgd (cm-1)"} 
    1616        Edit parameters_DAB, coef_DAB 
    1717        ywave_DAB  := DAB_Model(coef_DAB, xwave_DAB) 
     
    1919        ModifyGraph marker=29, msize=2, mode=4 
    2020        ModifyGraph log(left)=1 
    21         Label bottom "q (\\S-1\\M) " 
     21        Label bottom "q (A\\S-1\\M) " 
    2222        Label left "Debye-Anderson-Brumberger Model (cm\\S-1\\M)" 
    2323        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    3535        // Setup parameter table for model function 
    3636        Make/O/D smear_coef_DAB = {10.0, 40, 1.0}                                       //model  coef values to match unsmeared model above 
    37         make/o/t smear_parameters_DAB = {"Scale Factor, A ", "Correlation Length ()", "Incoherent Bgd (cm-1)"}// parameter names 
     37        make/o/t smear_parameters_DAB = {"Scale Factor, A ", "Correlation Length (A)", "Incoherent Bgd (cm-1)"}// parameter names 
    3838        Edit smear_parameters_DAB,smear_coef_DAB                                        //display parameters in a table 
    3939         
     
    4646        Display smeared_DAB vs smeared_qvals                                                                    // 
    4747        ModifyGraph log=1,marker=29,msize=2,mode=4 
    48         Label bottom "q (\\S-1\\M)" 
     48        Label bottom "q (A\\S-1\\M)" 
    4949        Label left "Debye-Anderson-Brumberger Model (cm\\S-1\\M)" 
    5050        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/HPMSA.ipf

    r42 r379  
    2828        Display ywave_hpmsa vs xwave_hpmsa       
    2929        ModifyGraph log=0,marker=29,msize=2,mode=4,grid=1                       //**** log=0 if linear scale desired 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Structure Factor"    
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5959        variable dialec, Perm, Beta, Temp, zz, charge, ierr 
    6060 
    61         diam=w[0]               //in   (not SI .. should force people to think in nm!!!) 
     61        diam=w[0]               //in A  (not SI .. should force people to think in nm!!!) 
    6262        zz = w[1]               //# of charges 
    6363        VolFrac=w[2]     
    64         QQ=x                    //in ^-1 (not SI .. should force people to think in nm^-1!!!) 
     64        QQ=x                    //in A^-1 (not SI .. should force people to think in nm^-1!!!) 
    6565        Temp=w[3]               //in degrees Kelvin 
    6666        csalt=w[4]              //in molarity 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/HardSphereStruct.ipf

    r42 r379  
    1313        Variable num=128,qmin=0.001,qmax=0.3 
    1414        Prompt num "Enter number of data points for model: " 
    15         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    16         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     15        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     16        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1717         
    1818        Make/O/D/n=(num) xwave_hss,ywave_hss 
     
    2525        Display ywave_hss vs xwave_hss 
    2626        ModifyGraph marker=29,msize=2,mode=4 
    27         Label bottom "q (\\S-1\\M)" 
     27        Label bottom "q (A\\S-1\\M)" 
    2828        Label left "Structure Factor" 
    2929        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/HollowCylinders.ipf

    r42 r379  
    1313        Variable num=128,qmin=0.001,qmax=0.7 
    1414        Prompt num "Enter number of data points for model: " 
    15         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    16         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     15        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     16        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1717         
    1818        Make/O/D/n=(num) xwave_Hcyl,ywave_Hcyl 
     
    2424        Display ywave_Hcyl vs xwave_Hcyl 
    2525        ModifyGraph log=1,marker=29,msize=2,mode=4 
    26         Label bottom "q (\\S-1\\M)" 
     26        Label bottom "q (A\\S-1\\M)" 
    2727        Label left "Intensity (cm\\S-1\\M)" 
    2828        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5252        Display smeared_Hcyl vs smeared_qvals 
    5353        ModifyGraph log=1,marker=29,msize=2,mode=4 
    54         Label bottom "q (\\S-1\\M)" 
     54        Label bottom "q (A\\S-1\\M)" 
    5555        Label left "Intensity (cm\\S-1\\M)" 
    5656        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/Lorentz_model.ipf

    r42 r379  
    66        Variable num=512, qmin=.001, qmax=.7 
    77        Prompt num "Enter number of data points for model: " 
    8         Prompt qmin "Enter minimum q-value (^1) for model: "  
    9          Prompt qmax "Enter maximum q-value (^1) for model: " 
     8        Prompt qmin "Enter minimum q-value (A^1) for model: "  
     9         Prompt qmax "Enter maximum q-value (A^1) for model: " 
    1010// 
    1111        Make/O/D/n=(num) xwave_Lorentz, ywave_Lorentz 
    1212        xwave_Lorentz =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    1313        Make/O/D coef_Lorentz = {100.0, 50.0, 1.0} 
    14         make/o/t parameters_Lorentz = {"Scale Factor, I0 ", "Screening Length ()","Incoherent Bgd (cm-1)"} 
     14        make/o/t parameters_Lorentz = {"Scale Factor, I0 ", "Screening Length (A)","Incoherent Bgd (cm-1)"} 
    1515        Edit parameters_Lorentz, coef_Lorentz 
    1616        ywave_Lorentz  := Lorentz_Model(coef_Lorentz, xwave_Lorentz) 
     
    1818        ModifyGraph marker=29, msize=2, mode=4 
    1919        ModifyGraph log(left)=1 
    20         Label bottom "q (\\S-1\\M) " 
     20        Label bottom "q (A\\S-1\\M) " 
    2121        Label left "Lorentzian (cm\\S-1\\M)" 
    2222        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    3535        // Setup parameter table for model function 
    3636        Make/O/D smear_coef_Lorentz = {100.0, 50.0, 1.0} 
    37         make/o/t smear_parameters_Lorentz = {"Scale Factor, I0 ", "Screening Length ()","Incoherent Bgd (cm-1)"} 
     37        make/o/t smear_parameters_Lorentz = {"Scale Factor, I0 ", "Screening Length (A)","Incoherent Bgd (cm-1)"} 
    3838        Edit smear_parameters_Lorentz,smear_coef_Lorentz                                        //display parameters in a table 
    3939         
     
    4646        Display smeared_Lorentz vs smeared_qvals                                                                        // 
    4747        ModifyGraph log=1,marker=29,msize=2,mode=4 
    48         Label bottom "q (\\S-1\\M)" 
     48        Label bottom "q (A\\S-1\\M)" 
    4949        Label left "Lorentz Model (cm\\S-1\\M)" 
    5050        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/NewModels_2006/Beaucage.ipf

    r62 r379  
    1616        Variable num=256,qmin=0.001,qmax=0.7 
    1717        Prompt num "Enter number of data points for model: " 
    18         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    19         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     18        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     19        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2020         
    2121        make/o/d/n=(num) xwave_b1,ywave_b1 
     
    2727        Display ywave_b1 vs xwave_b1 
    2828        ModifyGraph log=1,marker=29,msize=2,mode=4 
    29         Label bottom "q (\\S-1\\M)" 
     29        Label bottom "q (A\\S-1\\M)" 
    3030        Label left "Intensity (cm\\S-1\\M)" 
    3131        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    3535        Variable num=256,qmin=0.001,qmax=0.7 
    3636        Prompt num "Enter number of data points for model: " 
    37         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    38         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     37        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     38        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    3939         
    4040        make/o/d/n=(num) xwave_b2,ywave_b2 
     
    4646        Display ywave_b2 vs xwave_b2 
    4747        ModifyGraph log=1,marker=29,msize=2,mode=4 
    48         Label bottom "q (\\S-1\\M)" 
     48        Label bottom "q (A\\S-1\\M)" 
    4949        Label left "Intensity (cm\\S-1\\M)" 
    5050        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5454        Variable num=256,qmin=0.001,qmax=0.7 
    5555        Prompt num "Enter number of data points for model: " 
    56         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    57         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     56        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     57        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    5858         
    5959        make/o/d/n=(num) xwave_b3,ywave_b3 
     
    6565        Display ywave_b3 vs xwave_b3 
    6666        ModifyGraph log=1,marker=29,msize=2,mode=4 
    67         Label bottom "q (\\S-1\\M)" 
     67        Label bottom "q (A\\S-1\\M)" 
    6868        Label left "Intensity (cm\\S-1\\M)" 
    6969        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    7373        Variable num=256,qmin=0.001,qmax=0.7 
    7474        Prompt num "Enter number of data points for model: " 
    75         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    76         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     75        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     76        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    7777         
    7878        make/o/d/n=(num) xwave_b4,ywave_b4 
     
    8484        Display ywave_b4 vs xwave_b4 
    8585        ModifyGraph log=1,marker=29,msize=2,mode=4 
    86         Label bottom "q (\\S-1\\M)" 
     86        Label bottom "q (A\\S-1\\M)" 
    8787        Label left "Intensity (cm\\S-1\\M)" 
    8888        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    111111        Display smeared_b1 vs smeared_qvals                                                                      
    112112        ModifyGraph log=1,marker=29,msize=2,mode=4 
    113         Label bottom "q (\\S-1\\M)" 
     113        Label bottom "q (A\\S-1\\M)" 
    114114        Label left "Intensity (cm\\S-1\\M)" 
    115115        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    136136        Display smeared_b2 vs smeared_qvals                                                                      
    137137        ModifyGraph log=1,marker=29,msize=2,mode=4 
    138         Label bottom "q (\\S-1\\M)" 
     138        Label bottom "q (A\\S-1\\M)" 
    139139        Label left "Intensity (cm\\S-1\\M)" 
    140140        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    161161        Display smeared_b3 vs smeared_qvals                                                                      
    162162        ModifyGraph log=1,marker=29,msize=2,mode=4 
    163         Label bottom "q (\\S-1\\M)" 
     163        Label bottom "q (A\\S-1\\M)" 
    164164        Label left "Intensity (cm\\S-1\\M)" 
    165165        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    186186        Display smeared_b4 vs smeared_qvals                                                                      
    187187        ModifyGraph log=1,marker=29,msize=2,mode=4 
    188         Label bottom "q (\\S-1\\M)" 
     188        Label bottom "q (A\\S-1\\M)" 
    189189        Label left "Intensity (cm\\S-1\\M)" 
    190190        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/NewModels_2006/BimodalSchulzSpheres.ipf

    r42 r379  
    1515        Variable num=128,qmin=0.001,qmax=0.7 
    1616        Prompt num "Enter number of data points for model: " 
    17         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    18         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     17        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     18        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1919         
    2020        Make/O/D/n=(num) xwave_bss,ywave_bss 
     
    2828        Display ywave_bss vs xwave_bss 
    2929        ModifyGraph log=1,marker=29,msize=2,mode=4 
    30         Label bottom "q (\\S-1\\M)" 
     30        Label bottom "q (A\\S-1\\M)" 
    3131        Label left "Intensity (cm\\S-1\\M)" 
    3232        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    6060        Display smeared_bss vs smeared_qvals 
    6161        ModifyGraph log=1,marker=29,msize=2,mode=4 
    62         Label bottom "q (\\S-1\\M)" 
     62        Label bottom "q (A\\S-1\\M)" 
    6363        Label left "Intensity (cm\\S-1\\M)" 
    6464        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/NewModels_2006/BinaryHardSpheres.ipf

    r42 r379  
    4646        Variable num=256, qmin=.001, qmax=.7 
    4747        Prompt num "Enter number of data points for model: " 
    48         Prompt qmin "Enter minimum q-value (-1) for model: "  
    49         Prompt qmax "Enter maximum q-value (-1) for model: " 
     48        Prompt qmin "Enter minimum q-value (A-1) for model: "  
     49        Prompt qmax "Enter maximum q-value (A-1) for model: " 
    5050// 
    5151        Make/O/D/n=(num) xwave_BinaryHS, ywave_BinaryHS 
     
    6161        ModifyGraph marker=29, msize=2, mode=4 
    6262        ModifyGraph log=1 
    63         Label bottom "q (\\S-1\\M) " 
     63        Label bottom "q (A\\S-1\\M) " 
    6464        Label left "I(q) (cm\\S-1\\M)" 
    6565        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    9494        Display smeared_BinaryHS vs smeared_qvals                                                                       // 
    9595        ModifyGraph log=1,marker=29,msize=2,mode=4 
    96         Label bottom "q (\\S-1\\M)" 
     96        Label bottom "q (A\\S-1\\M)" 
    9797        Label left "I(q) (cm\\S-1\\M)" 
    9898        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/NewModels_2006/Cylinder_PolyLength.ipf

    r42 r379  
    1919        Variable num=100,qmin=0.001,qmax=0.7 
    2020        Prompt num "Enter number of data points for model: " 
    21         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    22         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     21        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     22        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2323         
    2424        make/o/d/n=(num) xwave_cypl,ywave_cypl 
     
    3030        Display ywave_cypl vs xwave_cypl 
    3131        ModifyGraph log=1,marker=29,msize=2,mode=4 
    32         Label bottom "q (\\S-1\\M)" 
     32        Label bottom "q (A\\S-1\\M)" 
    3333        Label left "Intensity (cm\\S-1\\M)" 
    3434        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5858        Display smeared_cypl vs smeared_qvals 
    5959        ModifyGraph log=1,marker=29,msize=2,mode=4 
    60         Label bottom "q (\\S-1\\M)" 
     60        Label bottom "q (A\\S-1\\M)" 
    6161        Label left "Intensity (cm\\S-1\\M)" 
    6262        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/NewModels_2006/Cylinder_PolyRadius.ipf

    r42 r379  
    1919        Variable num=128,qmin=0.001,qmax=0.7 
    2020        Prompt num "Enter number of data points for model: " 
    21         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    22         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     21        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     22        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2323         
    2424        make/o/d/n=(num) xwave_cypr,ywave_cypr 
     
    3030        Display ywave_cypr vs xwave_cypr 
    3131        ModifyGraph log=1,marker=29,msize=2,mode=4 
    32         Label bottom "q (\\S-1\\M)" 
     32        Label bottom "q (A\\S-1\\M)" 
    3333        Label left "Intensity (cm\\S-1\\M)" 
    3434        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5959        Display smeared_cypr vs smeared_qvals 
    6060        ModifyGraph log=1,marker=29,msize=2,mode=4 
    61         Label bottom "q (\\S-1\\M)" 
     61        Label bottom "q (A\\S-1\\M)" 
    6262        Label left "Intensity (cm\\S-1\\M)" 
    6363        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/NewModels_2006/Debye.ipf

    r42 r379  
    66        Variable num=256,qmin=0.001,qmax=0.7 
    77        Prompt num "Enter number of data points for model: " 
    8         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    9         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     8        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     9        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1010         
    1111        make/O/D/N=(num) xwave_deb,ywave_deb 
     
    1717        Display ywave_deb vs xwave_deb 
    1818        ModifyGraph marker=29,msize=2,mode=4,log=1 
    19         Label bottom "q (\\S-1\\M)" 
     19        Label bottom "q (A\\S-1\\M)" 
    2020        Label left "Intensity (cm\\S-1\\M)" 
    2121        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    4444        Display smeared_deb vs smeared_qvals 
    4545        ModifyGraph log=1,marker=29,msize=2,mode=4 
    46         Label bottom "q (\\S-1\\M)" 
     46        Label bottom "q (A\\S-1\\M)" 
    4747        Label left "Intensity (cm\\S-1\\M)" 
    4848        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5757        // variables are: 
    5858        //[0] scale factor 
    59         //[1] radius of gyration [] 
     59        //[1] radius of gyration [A] 
    6060        //[2] background        [cm-1] 
    6161         
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/NewModels_2006/EllipticalCylinder.ipf

    r42 r379  
    1616        Variable num=50,qmin=0.001,qmax=0.7 
    1717        Prompt num "Enter number of data points for model: " 
    18         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    19         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     18        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     19        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2020         
    2121//      //constants needed for the integration if qtrap is used (in a separate procedure file!) 
     
    2727        xwave_ecf =  alog(log(qmin) + x*((log(qmax)-log(qmin))/num)) 
    2828        Make/O/D coef_ecf = {1.,20.,1.5,400,3.0e-6,0.0} 
    29         make/o/t parameters_ecf = {"scale","minor radius (A)","nu = major/minor (-)","length ()","SLD diff (A^-2)","incoh. bkg (cm^-1)"} 
     29        make/o/t parameters_ecf = {"scale","minor radius (A)","nu = major/minor (-)","length (A)","SLD diff (A^-2)","incoh. bkg (cm^-1)"} 
    3030        Edit parameters_ecf,coef_ecf 
    3131        ywave_ecf := EllipCylForm(coef_ecf,xwave_ecf) 
    3232        Display ywave_ecf vs xwave_ecf 
    3333        ModifyGraph log=1,marker=29,msize=2,mode=4 
    34         Label bottom "q (\\S-1\\M)" 
     34        Label bottom "q (A\\S-1\\M)" 
    3535        Label left "Intensity (cm\\S-1\\M)" 
    3636        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    4949        // Setup parameter table for model function 
    5050        Make/O/D smear_coef_ecf =  {1.,20.,1.5,400,3.0e-6,0.0} 
    51         make/o/t smear_parameters_ecf = {"scale","minor radius (A)","nu = major/minor (-)","length ()","SLD diff (A^-2)","incoh. bkg (cm^-1)"} 
     51        make/o/t smear_parameters_ecf = {"scale","minor radius (A)","nu = major/minor (-)","length (A)","SLD diff (A^-2)","incoh. bkg (cm^-1)"} 
    5252        Edit smear_parameters_ecf,smear_coef_ecf 
    5353         
     
    6060        Display smeared_ecf vs smeared_qvals 
    6161        ModifyGraph log=1,marker=29,msize=2,mode=4 
    62         Label bottom "q (\\S-1\\M)" 
     62        Label bottom "q (A\\S-1\\M)" 
    6363        Label left "Intensity (cm\\S-1\\M)" 
    6464        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/NewModels_2006/FlexCyl_EllipCross.ipf

    r42 r379  
    1818        Variable num=128,qmin=0.001,qmax=0.7 
    1919        Prompt num "Enter number of data points for model: " 
    20         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    21         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     20        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     21        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    2222         
    2323        Make/O/D/n=(num) xwave_fleell,ywave_fleell 
     
    2929        Display ywave_fleell vs xwave_fleell 
    3030        ModifyGraph log=1,marker=29,msize=2,mode=4 
    31         Label bottom "q (\\S-1\\M)" 
     31        Label bottom "q (A\\S-1\\M)" 
    3232        Label left "Intensity (cm\\S-1\\M)" 
    3333        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     
    5656        Display smeared_fleell vs smeared_qvals                                                                 // 
    5757        ModifyGraph log=1,marker=29,msize=2,mode=4 
    58         Label bottom "q (\\S-1\\M)" 
     58        Label bottom "q (A\\S-1\\M)" 
    5959        Label left "I(q) (cm\\S-1\\M)" 
    6060        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models_v3.00/NewModels_2006/FlexCyl_PolyLen.ipf

    r42 r379  
    1010        Variable num=128,qmin=0.001,qmax=0.7 
    1111        Prompt num "Enter number of data points for model: " 
    12         Prompt qmin "Enter minimum q-value (^-1) for model: " 
    13         Prompt qmax "Enter maximum q-value (^-1) for model: " 
     12        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     13        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
    1414         
    1515        // Setup parameter table for model function 
     
    2222        Display ywave_flepl vs xwave_flepl 
    2323        ModifyGraph log=1,marker=29,msize=2,mode=4 
    24         Label bottom "q (\\S-1\\M)"