Changeset 371 for sans/Dev/trunk/NCNR_User_Procedures/SANS

Timestamp:

May 29, 2008 8:53:58 AM (15 years ago)

Author:

srkline

Message:

• ILL attenuator table updated
• NCNR install package has more diagnostics

Location:

sans/Dev/trunk/NCNR_User_Procedures/SANS

Files:

• Analysis/Models/Packages/NCNR_Install.ipf (modified) (2 diffs)
• Reduction/ILL_Utils.ipf (modified) (1 diff)

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

@@ -390 +390 @@
         textStr = ReplaceString(";", strFileList, "\r")
         Notebook $nb text=textStr+"\r"
-
-
+//
+//
+        // then get a listing of the "home" directory. If files were not moved properly, they will still be here
+        Notebook $nb text="\r\r**Home (files)**\r"
+//      NewPath /Q/O IgorProcPath, igorPathStr+"Igor Procedures:"
+
+        //files
+        strFileList = IndexedFile(home, -1, "????" )
+        textStr = ReplaceString(";", strFileList, "\r")
+        Notebook $nb text=textStr
+
+        //folders
+        Notebook $nb text="\r**Home (folders)**\r"
+        strFileList = IndexedDir(home, -1, 0 )
+        textStr = ReplaceString(";", strFileList, "\r")
+        Notebook $nb text=textStr+"\r"
+        
         //move to the beginning of the notebook
         Notebook $nb selection={startOfFile, startOfFile}       
@@ -442 +457 @@
         String helpStr = "Please kill the open Help Files by option-clicking (Macintosh) or alt-clicking (Windows) on the close box of each window. Once you have finished, please close this window and install the SANS Macros."
         if(NumHelpFilesOpen != 0)
-                NewNotebook/F=1/K=1/N=HelpNotebook /W=(5,44,547,181) as "Please close the open help files"
-                Notebook HelpNotebook,fsize=12,fstyle=1,showRuler=0,text=helpStr
+                NewNotebook/F=1/K=1/N=HelpNotebook /W=(5,44,547,200) as "Please close the open help files"
+                Notebook HelpNotebook,fsize=18,fstyle=1,showRuler=0,text=helpStr
                 return(0)
         endif

sans/Dev/trunk/NCNR_User_Procedures/SANS/Reduction/ILL_Utils.ipf

@@ -831 +831 @@
         
         Variable attenFactor
-        make/O/N=3 Attenuators_ILL={147,902,2874}
-        
-        attenFactor = Attenuators_ILL[attenNo-1]
+        make/O/N=4 Attenuators_ILL={1,147,902,2874}
+        
+        attenFactor = Attenuators_ILL[attenNo]
         
 //      print attenfactor