Ignore:
Timestamp:
May 20, 2016 4:28:56 PM (7 years ago)
Author:
srkline
Message:

changes to a few analysis models to make these Igor 7-ready

adding mask editing utilities

many changes to event mode for easier processing of split lists

updated event mode help file

+ lots more!

Location:
sans/Dev/trunk/NCNR_User_Procedures/Analysis
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/NewModels_2006/SchulzSpheres_v40.ipf

    r835 r999  
    7272End 
    7373         
    74  
     74// 
     75Proc PlotSchulzSpheresBeta(num,qmin,qmax) 
     76        Variable num=128,qmin=0.001,qmax=0.7 
     77        Prompt num "Enter number of data points for model: " 
     78        Prompt qmin "Enter minimum q-value (A^-1) for model: " 
     79        Prompt qmax "Enter maximum q-value (A^-1) for model: " 
     80         
     81        Make/O/D/N=(num) xwave_sch_beta,ywave_sch_beta 
     82        xwave_sch_beta = alog( log(qmin) + x*((log(qmax)-log(qmin))/num) ) 
     83        Make/O/D coef_sch_beta = {0.01,60,0.2,1e-6,3e-6,0.001} 
     84        make/O/T parameters_sch_beta = {"Volume Fraction (scale)","mean radius (A)","polydisp (sig/avg)","SLD sphere (A-2)","SLD solvent (A-2)","bkg (cm-1 sr-1)"} 
     85        Edit parameters_sch_beta,coef_sch_beta 
     86         
     87        Variable/G root:g_sch_beta 
     88        g_sch_beta := SchulzSpheresBeta(coef_sch_beta,ywave_sch_beta,xwave_sch_beta) 
     89        Display ywave_sch_beta vs xwave_sch_beta 
     90        ModifyGraph log=1,marker=29,msize=2,mode=4 
     91        Label bottom "q (A\\S-1\\M)" 
     92        Label left "Intensity (cm\\S-1\\M)" 
     93        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
     94         
     95        AddModelToStrings("SchulzSpheresBeta","coef_sch_beta","parameters_sch_beta","sch_beta") 
     96End 
    7597 
    7698Function Schulz_Point(x,avg,zz) 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Models/ProlateCoreShell_Sq_v40.ipf

    r774 r999  
    108108//      Killwaves/Z form_PEF_HS,struct_PEF_HS 
    109109         
    110         return (yw) 
     110        return (0) 
    111111End 
    112112 
     
    528528//      Killwaves/Z form_PEF_2Y,struct_PEF_2Y 
    529529         
    530         return (yw) 
     530        return (0) 
    531531End 
    532532 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

    r896 r999  
    8080                 
    8181                // always turn off file checking for me 
    82                 checkForFiles = !(stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"s*ine"))                //zero for me 
    83                 checkForFiles = !(stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"ajj"))          //and zero for me 
    84                 checkForFiles = !(stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"andrewjackson"))                //and zero for me 
    85                  
     82                if( stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"s*ine") ) 
     83                        checkforfiles = 0 
     84                endif 
     85                if( stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"ajj") ) 
     86                        checkforfiles = 0 
     87                endif 
     88                if( stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"andrewjackson") ) 
     89                        checkforfiles = 0 
     90                endif 
     91 
    8692                // turn off file checking if the proper alias to the NCNR procedures is there 
    8793                PathInfo igor 
    8894                NewPath/O/Q tmpUPPath S_Path + "User Procedures"   
    8995                String fileList = IndexedFile(tmpUPPath,-1,"????") 
     96                if(strsearch(fileList, "NCNR_User_Procedures", 0  , 2) != -1)   //ignore case 
     97                        checkforfiles = 0 
     98                        Print "found the proper procedures" 
     99                endif 
     100 
     101        // check the Documents:WaveMetrics:IP: UP folder (always writeable) 
     102        //      print SpecialDirPath("Igor Pro User Files",0,0,0) 
     103        //      Macintosh HD:Users:srkline:Documents:WaveMetrics:Igor Pro 7 User Files: 
     104         
     105                NewPath/O/Q tmpUPPath  SpecialDirPath("Igor Pro User Files",0,0,0) + "User Procedures"  
     106                fileList = IndexedFile(tmpUPPath,-1,"????") 
    90107                if(strsearch(fileList, "NCNR_User_Procedures", 0  , 2) != -1)   //ignore case 
    91108                        checkforfiles = 0 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

    r941 r999  
    627627                        w[0] += 1e-6 
    628628                        w[0] -= 1e-6 
    629          
     629 
     630         
     631                                         
    630632                        break 
    631633        endswitch 
Note: See TracChangeset for help on using the changeset viewer.