Changeset 157


Ignore:
Timestamp:
Sep 7, 2007 9:20:29 AM (15 years ago)
Author:
srkline
Message:

First pass at modifictations of WM's GlobalFit2 package. The Experiment template (v3.01) has been modified to load in the new file GlobalFit2_NCNR.ipf (through a new SA_includes_v301), and the old GF file GlobalFit4_NCNR.ipf has been tagged as old so it cannot be accidentally loaded into an experiment. It will eventually be deleted from the project.

My changes in the GlobalFit2 are marked with SRK comments, and there are quite a lot of them (3 days worth) since there were many incomatibilites with STRUCT functions.

The new master includes file is SA_includes_v301.ipf. The old one has been deleted from the project.

Location:
sans/Analysis/branches/ajj_23APR07
Files:
3 added
5 edited

Legend:

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

    r145 r157  
    8484        while(1) 
    8585         
    86         // remove myGlobals from the folder list 
     86        // remove myGlobals, Packages from the folder list 
    8787        if(type==4) 
    8888                str = RemoveFromList("myGlobals", str , ";" ) 
     89                str = RemoveFromList("Packages", str, ";") 
    8990        endif 
    9091         
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf

    r153 r157  
    2727        Button button_2,pos={270,93},size={80,20},proc=AppendModelToTarget,title="Append" 
    2828        PopupMenu popup_0,pos={30,21},size={218,20},title="Data Set" 
    29         PopupMenu popup_0,mode=1,value= #"DataSetPopupList()" 
     29        PopupMenu popup_0,mode=1,value= #"W_DataSetPopupList()" 
    3030        PopupMenu popup_1,pos={30,57},size={136,20},title="Function" 
    3131        PopupMenu popup_1,mode=1,value= #"W_FunctionPopupList()" 
     
    4444 
    4545// is there a simpler way to do this? 
    46 Function/S DataSetPopupList() 
     46Function/S W_DataSetPopupList() 
    4747 
    4848        String str=GetAList(4),tmp="",onTargetStr="" 
     
    8484        tmp = FunctionList("*_proto",";","KIND:10")             //prototypes 
    8585        list = RemoveFromList(tmp, list  ,";") 
    86 //      Print "everything - proto = ",list 
    87 //      print " " 
     86        //prototypes that show up if GF is loaded 
     87        list = RemoveFromList("GFFitFuncTemplate", list) 
     88        list = RemoveFromList("GFFitAllAtOnceTemplate", list) 
     89        list = RemoveFromList("NewGlblFitFunc", list) 
     90        list = RemoveFromList("NewGlblFitFuncAllAtOnce", list) 
     91        list = RemoveFromList("GlobalFitFunc", list) 
     92        list = RemoveFromList("GlobalFitAllAtOnce", list) 
     93        list = RemoveFromList("GFFitAAOStructTemplate", list) 
     94        list = RemoveFromList("NewGF_SetXWaveInList", list) 
     95        list = RemoveFromList("NewGlblFitFuncAAOStruct", list) 
    8896 
    8997        tmp = FunctionList("f*",";","NPARAMS:2")                //point calculations 
    90 //      Print "f* = ",tmp 
    91 //      print " " 
    9298        list = RemoveFromList(tmp, list  ,";") 
    9399         
    94100        tmp = FunctionList("fSmear*",";","NPARAMS:3")           //smeared dependency calculations 
    95 //      Print "f* = ",tmp 
    96 //      print " " 
    97101        list = RemoveFromList(tmp, list  ,";") 
    98102         
     
    177181                                endif 
    178182                        else 
    179                                 return(0)               //get out 
     183                                // must be unsmeared model, work in the root folder 
     184                                SetDataFolder root:      
     185                                if(!exists(popStr))             //this should be fine if the coef filter is working, but check anyhow 
     186                                        DoAlert 0,"the coefficient and data sets do not match" 
     187                                        return 0 
     188                                endif 
    180189                        endif 
    181190                         
     
    430439        endif 
    431440 
    432         //if useCursors, and the data is USANS, need to feed a trimmed matrix to the fit 
     441        //if useCursors, and the data is USANS, need to feed a (reassigned) trimmed matrix to the fit 
     442        Variable pt1,pt2,newN 
    433443        if(useCursors && (dimsize(resW,1) > 4) ) 
    434                 Variable pt1,pt2,newN 
    435444                if(pcsr(A) > pcsr(B)) 
    436445                        pt1 = pcsr(B) 
     
    447456                WAVE fs.resW =  crsrResW                 
    448457        endif 
     458//      if(useCursors)          //make a mask wave instead (this DOES NOT work due to the internal workings of FuncFit trimming the wave) 
     459//              if(pcsr(A) > pcsr(B)) 
     460//                      pt1 = pcsr(B) 
     461//                      pt2 = pcsr(A) 
     462//              else 
     463//                      pt1 = pcsr(A) 
     464//                      pt2 = pcsr(B) 
     465//              endif 
     466//              Duplicate/O yw $(DF+"maskW") 
     467//              Wave maskW = $(DF+"maskW") 
     468//              maskW = ((p < pt2) && (p > pt1)) ? 1 : 0                //0 = unused points, 1= keepers 
     469//      Endif 
    449470//// 
    450471 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PlotUtilsMacro.ipf

    r138 r157  
    148148                        // make a resolution matrix for SANS data 
    149149                        Variable np=numpnts($w0) 
    150                         Make/O/N=(np,4) $(baseStr+"_res") 
     150                        Make/D/O/N=(np,4) $(baseStr+"_res") 
    151151                         
    152152                        $(baseStr+"_res")[][0] = $w3[p]         //sigQ 
  • sans/Analysis/branches/ajj_23APR07/XOPs/SANSAnalysis/XCode/SANSAnalysis.xcodeproj/project.pbxproj

    r119 r157  
    4040/* End PBXBuildFile section */ 
    4141 
     42/* Begin PBXBuildStyle section */ 
     43                067F67CF0C5681C800BE7E0F /* Development */ = { 
     44                        isa = PBXBuildStyle; 
     45                        buildSettings = { 
     46                                COPY_PHASE_STRIP = NO; 
     47                        }; 
     48                        name = Development; 
     49                }; 
     50                067F67D00C5681C800BE7E0F /* Deployment */ = { 
     51                        isa = PBXBuildStyle; 
     52                        buildSettings = { 
     53                                COPY_PHASE_STRIP = YES; 
     54                        }; 
     55                        name = Deployment; 
     56                }; 
     57/* End PBXBuildStyle section */ 
     58 
    4259/* Begin PBXCopyFilesBuildPhase section */ 
    4360                05305DB30BDDA19400578444 /* CopyFiles */ = { 
     
    103120                053062400BDE9DC800578444 /* sphereform */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = sphereform; sourceTree = BUILT_PRODUCTS_DIR; }; 
    104121                053062460BDE9DFF00578444 /* sphereform.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sphereform.c; path = ../test/sphereform.c; sourceTree = SOURCE_ROOT; }; 
    105                 058F35C70BDD341100D07487 /* libXOPSupport.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libXOPSupport.a; path = ../../XOPSupport/Xcode/libXOPSupport.a; sourceTree = SOURCE_ROOT; }; 
     122                058F35C70BDD341100D07487 /* libXOPSupport.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libXOPSupport.a; path = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport/Xcode/libXOPSupport.a; sourceTree = "<absolute>"; }; 
    106123                05D47DBA0BF1FFCF00335CA7 /* libFunc2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libFunc2D.h; path = ../lib/libFunc2D.h; sourceTree = SOURCE_ROOT; }; 
    107124                05D47DBB0BF1FFD000335CA7 /* libFunc2D.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libFunc2D.c; path = ../lib/libFunc2D.c; sourceTree = SOURCE_ROOT; }; 
     
    295312                        isa = PBXProject; 
    296313                        buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "SANSAnalysis" */; 
     314                        buildSettings = { 
     315                        }; 
     316                        buildStyles = ( 
     317                                067F67CF0C5681C800BE7E0F /* Development */, 
     318                                067F67D00C5681C800BE7E0F /* Deployment */, 
     319                        ); 
    297320                        hasScannedForEncodings = 1; 
    298321                        mainGroup = 089C166AFE841209C02AAC07 /* SANSAnalysis */; 
     
    514537                                GCC_WARN_ABOUT_RETURN_TYPE = YES; 
    515538                                GCC_WARN_UNUSED_VARIABLE = YES; 
    516                                 PREBINDING = NO; 
     539                                LIBRARY_SEARCH_PATHS = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport/Xcode; 
     540                                PREBINDING = NO; 
     541                                REZ_SEARCH_PATHS = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport; 
    517542                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; 
     543                                USER_HEADER_SEARCH_PATHS = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport; 
    518544                        }; 
    519545                        name = "Release - PPC"; 
     
    584610                                GCC_WARN_ABOUT_RETURN_TYPE = YES; 
    585611                                GCC_WARN_UNUSED_VARIABLE = YES; 
    586                                 PREBINDING = NO; 
     612                                LIBRARY_SEARCH_PATHS = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport/Xcode; 
     613                                PREBINDING = NO; 
     614                                REZ_SEARCH_PATHS = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport; 
    587615                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; 
     616                                USER_HEADER_SEARCH_PATHS = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport; 
    588617                        }; 
    589618                        name = Debug; 
     
    594623                                GCC_WARN_ABOUT_RETURN_TYPE = YES; 
    595624                                GCC_WARN_UNUSED_VARIABLE = YES; 
    596                                 PREBINDING = NO; 
     625                                LIBRARY_SEARCH_PATHS = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport/Xcode; 
     626                                PREBINDING = NO; 
     627                                REZ_SEARCH_PATHS = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport; 
    597628                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; 
     629                                USER_HEADER_SEARCH_PATHS = /Users/srkline/IGOR_Programming/XOP_Toolkit_5/IgorXOPs5/XOPSupport; 
    598630                        }; 
    599631                        name = "Release - Universal"; 
Note: See TracChangeset for help on using the changeset viewer.