Changeset 389 for sans/Release/trunk

Timestamp:

Jun 19, 2008 3:18:15 PM (15 years ago)

Author:

srkline

Message:

merging revisions into release r386:HEAD (=388) for 6.011 tag

Location:

sans/Release/trunk

Files:

• Install_Instructions.txt (modified) (6 diffs)
• NCNR_Install_or_Update.pxp (modified) (previous)
• NCNR_User_Procedures/InstalledVersion.txt (modified) (2 diffs)
• NCNR_User_Procedures/SANS/Analysis/Models/Packages/NCNR_Install.ipf (modified) (4 diffs)
• NCNR_User_Procedures/SANS/Reduction/NSORT.ipf (modified) (2 diffs)
• NCNR_User_Procedures/SANS/Reduction/PatchFiles.ipf (modified) (1 diff)

sans/Release/trunk/Install_Instructions.txt

@@ -30 +30 @@
 
 
+
 -------------------------------------------------------------------
 *** Manual Install of the NCNR SANS/USANS Procedures ***
@@ -52 +53 @@
 
 
-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.
+If you can't get full permissions, you may still be able to use the macros. 
+
+Choose from the Menu Macros->Force Install.
+
+The 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.
 
 ------------------
@@ -73 +78 @@
 
 (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.
+
 
 
@@ -101 +107 @@
 NCNR_Help_Files
 
+
 -------------------
 "OLD" Igor Help files could be any of the following:
@@ -118 +125 @@
 NCNR_Help_Files
 
+
 -------------------
 "OLD" Igor Extensions could be any of the following:
@@ -123 +131 @@
 SANS_Analysis.xop
 NCNR_Extensions
+
 Mac_XOP
 Win_XOP

sans/Release/trunk/NCNR_User_Procedures/InstalledVersion.txt

@@ -1 @@
-PACKAGE_VERSION=6.010;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21;
+PACKAGE_VERSION=6.011;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21;
 
 Only the first line of the file is read in.
@@ -6 +6 @@
 
 These are the current versions as of:
-16 JUN 2008 SRK
+19 JUN 2008 SRK
 

sans/Release/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/NCNR_Install.ipf

@@ -10 +10 @@
 // - lots more diagnostics added
 
-Function InstallNCNRMacros()
+Function InstallNCNRMacros(forceInstall)
+        Variable forceInstall           // if == 1, install whatever possible, even if R/W errors from the OS
 
         //first step, check for Igor 6!!!
@@ -44 +45 @@
         endif
         
-        if(UP_err != 0 || IH_err != 0 || IE_err != 0)
-                alertStr += "You will need to install manually."
-                DoAlert 0,alertStr
-                return(0)
+        if(forceInstall == 0)
+                if(UP_err != 0 || IH_err != 0 || IE_err != 0)
+                        alertStr += "You will need to install manually."
+                        DoAlert 0,alertStr
+                        return(0)
+                endif
         endif
         
@@ -263 +266 @@
                 case 2: // mouse up
                         // click code here
-                        InstallNCNRMacros()
+                        InstallNCNRMacros(0)
                         break
         endswitch
@@ -553 +556 @@
         return(V_flag)
 end
+
+// this will "force" an install, even if there are R/W errors
+Macro ForceInstall()
+
+        Execute "InstallNCNRMacros(1)"
+end

sans/Release/trunk/NCNR_User_Procedures/SANS/Reduction/NSORT.ipf

@@ -1859 +1859 @@
                 return(1)               //user cancel, get out before anything is set
         endif
-        saveName[num] = saveStr
-        
-        
-        
+
 
         if( !(num==2 || num==3) )
@@ -1890 +1887 @@
         high[num] = tmpRun[0]
         prefix[num] = GetPrefixStrFromFile(filenames[ii])
-        
+        saveName[num] = saveStr 
 
         return(0)

sans/Release/trunk/NCNR_User_Procedures/SANS/Reduction/PatchFiles.ipf

@@ -771 +771 @@
 
 End
+
+
+// testing, very dangerous batch changing of the file header labels
+//
+// testStr is the string at the front of a label, that will be moved to the "back"
+// if doIt is 1, it will write to the headers, any other value will only print to history
+Function MPatchLabel(testStr,doIt)
+        String testStr
+        Variable doIt
+
+//      SVAR list = root:myGlobals:Patch:gPatchList
+        String list = GetValidPatchPopupList()
+
+        Variable numitems,ii
+        numitems = ItemsInList(list,";")
+        
+        if(numitems == 0)
+                Abort "no items in list for multiple patch"
+        Endif
+        
+        String partialName="", tempName = ""
+        Variable ok,nvars = 20
+        
+        //loop through all of the files in the list, applying changes as dictated by w and wt waves
+        string str1,str2,str3
+        Variable match,loc,len,spc,jj,len1
+        len=strlen(testStr)
+        ii=0
+        do
+                //get current item in the list
+                partialName = StringFromList(ii, list, ";")
+                   
+                //get a valid file based on this partialName and catPathName
+                tempName = FindValidFilename(partialName)
+        
+                //prepend path to tempName for read routine 
+                PathInfo catPathName
+                tempName = S_path + tempName
+        
+                //make sure the file is really a RAW data file
+                ok = CheckIfRawData(tempName)
+                if (!ok)
+                   Print "this file is not recognized as a RAW SANS data file = ",tempName
+                else
+                   //go write the changes to the file
+                   str1 = getSampleLabel(tempName)
+                        match = strsearch(str1, testStr, 0)
+                        if(match != -1)
+                                str2 = ReplaceString(testStr, str1, "", 0, 1)
+                                
+                                jj=strlen(str2)
+                                do
+                                        jj -= 1
+                                        spc = cmpstr(str2[jj], " ", 0)
+                                        if (spc != 0)
+                                                break           //no more spaces found, get out
+                                        endif
+                                While(1)        // jj is the location of the last non-space
+                                
+                                str2[jj+2,jj+1+len] = testStr
+                        
+                        // may need to remove leading spaces???
+                                str2 = PadString(str2, 60, 0x20 )
+                                
+                                if(doIt == 1)
+                                        WriteSamLabelToHeader(tempName,str2)
+                                        print str2," ** Written to file **"
+                                else
+                                        //print str2,strlen(str2)
+                                        print str2," ** Testing, not written to file **"
+                                endif
+                        else
+                                
+                                jj=strlen(str1)
+                                do
+                                        jj -= 1
+                                        spc = cmpstr(str1[jj], " ", 0)
+                                        if (spc != 0)
+                                                break           //no more spaces found, get out
+                                        endif
+                                While(1)
+        
+                                //print str1, jj, str1[jj]      
+                        endif
+                Endif
+                
+                ii+=1
+        while(ii<numitems)
+
+
+end