Changeset 388


Ignore:
Timestamp:
Jun 19, 2008 3:10:46 PM (14 years ago)
Author:
srkline
Message:

Last minute tweaks before summer school

Location:
sans/Dev/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/Install_Instructions.txt

    r384 r388  
    3030 
    3131 
     32 
    3233------------------------------------------------------------------- 
    3334*** Manual Install of the NCNR SANS/USANS Procedures *** 
     
    5253 
    5354 
    54 If you can't get full permissions, you may still be able to use the macros. You must have at a minimum, permission to install in /User Procedures. If you can't get permission to install into /Igor Help Files, you can still open the help files manually as needed. If you can't get permission to install into /Igor Extensions, your calculations will be much slower, and you will not have access to any of the 2D analysis functions. 
     55If you can't get full permissions, you may still be able to use the macros.  
     56 
     57Choose from the Menu Macros->Force Install. 
     58 
     59The installer will do as good as it can to install the macros. You must have at a minimum, permission to install in /User Procedures. If you can't get permission to install into /Igor Help Files, you can still open the help files manually as needed. If you can't get permission to install into /Igor Extensions, your calculations will be much slower, and you will not have access to any of the 2D analysis functions. The most common problem is faulty permissions on /Igor Help Files, which is not fatal, just inconvenient. 
    5560 
    5661------------------ 
     
    7378 
    7479(7) The NCNR_SANS_Utilities folder has the three templates for starting SANS or USANS Reduction experiment, and for an analysis experiment. If the templates open up correctly, you're likely OK. In this folder, there are also example data sets and a template for writing your own analysis model. 
     80 
    7581 
    7682 
     
    101107NCNR_Help_Files 
    102108 
     109 
    103110------------------- 
    104111"OLD" Igor Help files could be any of the following: 
     
    118125NCNR_Help_Files 
    119126 
     127 
    120128------------------- 
    121129"OLD" Igor Extensions could be any of the following: 
     
    123131SANS_Analysis.xop 
    124132NCNR_Extensions 
     133 
    125134Mac_XOP 
    126135Win_XOP 
  • sans/Dev/trunk/NCNR_User_Procedures/InstalledVersion.txt

    r385 r388  
    1 PACKAGE_VERSION=6.010;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21; 
     1PACKAGE_VERSION=6.011;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21; 
    22 
    33Only the first line of the file is read in. 
     
    66 
    77These are the current versions as of: 
    8 16 JUN 2008 SRK 
     819 JUN 2008 SRK 
    99 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/NCNR_Install.ipf

    r384 r388  
    1010// - lots more diagnostics added 
    1111 
    12 Function InstallNCNRMacros() 
     12Function InstallNCNRMacros(forceInstall) 
     13        Variable forceInstall           // if == 1, install whatever possible, even if R/W errors from the OS 
    1314 
    1415        //first step, check for Igor 6!!! 
     
    4445        endif 
    4546         
    46         if(UP_err != 0 || IH_err != 0 || IE_err != 0) 
    47                 alertStr += "You will need to install manually." 
    48                 DoAlert 0,alertStr 
    49                 return(0) 
     47        if(forceInstall == 0) 
     48                if(UP_err != 0 || IH_err != 0 || IE_err != 0) 
     49                        alertStr += "You will need to install manually." 
     50                        DoAlert 0,alertStr 
     51                        return(0) 
     52                endif 
    5053        endif 
    5154         
     
    263266                case 2: // mouse up 
    264267                        // click code here 
    265                         InstallNCNRMacros() 
     268                        InstallNCNRMacros(0) 
    266269                        break 
    267270        endswitch 
     
    553556        return(V_flag) 
    554557end 
     558 
     559// this will "force" an install, even if there are R/W errors 
     560Macro ForceInstall() 
     561 
     562        Execute "InstallNCNRMacros(1)" 
     563end 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Reduction/NSORT.ipf

    r328 r388  
    18591859                return(1)               //user cancel, get out before anything is set 
    18601860        endif 
    1861         saveName[num] = saveStr 
    1862          
    1863          
    1864          
     1861 
    18651862 
    18661863        if( !(num==2 || num==3) ) 
     
    18901887        high[num] = tmpRun[0] 
    18911888        prefix[num] = GetPrefixStrFromFile(filenames[ii]) 
    1892          
     1889        saveName[num] = saveStr  
    18931890 
    18941891        return(0) 
  • sans/Dev/trunk/NCNR_User_Procedures/SANS/Reduction/PatchFiles.ipf

    r328 r388  
    771771 
    772772End 
     773 
     774 
     775// testing, very dangerous batch changing of the file header labels 
     776// 
     777// testStr is the string at the front of a label, that will be moved to the "back" 
     778// if doIt is 1, it will write to the headers, any other value will only print to history 
     779Function MPatchLabel(testStr,doIt) 
     780        String testStr 
     781        Variable doIt 
     782 
     783//      SVAR list = root:myGlobals:Patch:gPatchList 
     784        String list = GetValidPatchPopupList() 
     785 
     786        Variable numitems,ii 
     787        numitems = ItemsInList(list,";") 
     788         
     789        if(numitems == 0) 
     790                Abort "no items in list for multiple patch" 
     791        Endif 
     792         
     793        String partialName="", tempName = "" 
     794        Variable ok,nvars = 20 
     795         
     796        //loop through all of the files in the list, applying changes as dictated by w and wt waves 
     797        string str1,str2,str3 
     798        Variable match,loc,len,spc,jj,len1 
     799        len=strlen(testStr) 
     800        ii=0 
     801        do 
     802                //get current item in the list 
     803                partialName = StringFromList(ii, list, ";") 
     804                    
     805                //get a valid file based on this partialName and catPathName 
     806                tempName = FindValidFilename(partialName) 
     807         
     808                //prepend path to tempName for read routine  
     809                PathInfo catPathName 
     810                tempName = S_path + tempName 
     811         
     812                //make sure the file is really a RAW data file 
     813                ok = CheckIfRawData(tempName) 
     814                if (!ok) 
     815                   Print "this file is not recognized as a RAW SANS data file = ",tempName 
     816                else 
     817                   //go write the changes to the file 
     818                   str1 = getSampleLabel(tempName) 
     819                        match = strsearch(str1, testStr, 0) 
     820                        if(match != -1) 
     821                                str2 = ReplaceString(testStr, str1, "", 0, 1) 
     822                                 
     823                                jj=strlen(str2) 
     824                                do 
     825                                        jj -= 1 
     826                                        spc = cmpstr(str2[jj], " ", 0) 
     827                                        if (spc != 0) 
     828                                                break           //no more spaces found, get out 
     829                                        endif 
     830                                While(1)        // jj is the location of the last non-space 
     831                                 
     832                                str2[jj+2,jj+1+len] = testStr 
     833                         
     834                        // may need to remove leading spaces??? 
     835                                str2 = PadString(str2, 60, 0x20 ) 
     836                                 
     837                                if(doIt == 1) 
     838                                        WriteSamLabelToHeader(tempName,str2) 
     839                                        print str2," ** Written to file **" 
     840                                else 
     841                                        //print str2,strlen(str2) 
     842                                        print str2," ** Testing, not written to file **" 
     843                                endif 
     844                        else 
     845                                 
     846                                jj=strlen(str1) 
     847                                do 
     848                                        jj -= 1 
     849                                        spc = cmpstr(str1[jj], " ", 0) 
     850                                        if (spc != 0) 
     851                                                break           //no more spaces found, get out 
     852                                        endif 
     853                                While(1) 
     854         
     855                                //print str1, jj, str1[jj]       
     856                        endif 
     857                Endif 
     858                 
     859                ii+=1 
     860        while(ii<numitems) 
     861 
     862 
     863end 
Note: See TracChangeset for help on using the changeset viewer.