Changeset 685


Ignore:
Timestamp:
Apr 12, 2010 12:37:52 PM (12 years ago)
Author:
srkline
Message:

new version of the install instructions

new version of the "installedVersion" - now set to 7.0, but this is open for debate.

adjusted button and control positioning on the 2D MC control panel.

Location:
sans/Dev/trunk
Files:
3 edited

Legend:

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

    r388 r685  
    11To install the NCNR Reduction and Analysis Package: 
    22 
    3 (1) - Unzip the downloaded package 
     3 
     4 
     5(1) - Unzip the downloaded package. Be sure to extract all 
     6 
    47(2) - Double click on the NCNR_Install_or_Update.pxp experiment 
     8 
    59(3) - If there are any help files open, you will be asked to close them. NOTE: be sure to hold down the option (or alt) key when closing them to kill them, not just hide them. 
     10 
    611(4) - Click on "Install SANS Macros" 
    7 (5) - When the installer is finished, you will be asked to Quit Igor (yes, do it, and save changes to the experiment.) 
    8 (6) - If you were informed that some folders did not have proper permissions, skip down to the section for "Manual Install" 
    9  
    10 - SANS_Reduction, USANS_Reduction, and Analysis templates are located in the same folder as the installer (these are the starting points) 
     12 
     13(5) - When the installer is finished, and you will see four lines of "copy...: OK" in the command window at the bottom of the screen, indicating a successful install. You will be asked to Quit Igor (yes, do it, and save changes to the experiment.) 
     14 
     15--- If you were informed that some folders did not have proper permissions, (you'll see "ERROR" rather then OK, and some alerts about procedures that could not be removed) -- then skip down to the section for "Manual Install" 
     16 
     17 
     18 
     19After a successful install: 
     20 
     21 
     22- When you restart Igor, there will be 4 "Load..." macros in the Macros menu for you to load the SANS or USANS Reduction packages, or the Analysis package. This is the starting point. There are no longer any "template" experiments necessary. Any or all of the packages can now be loaded into the same experiment. 
     23 
    1124- Example data for reduction and analysis are in NCNR_SANS_Utilities 
     25 
    1226- A folder with instructions and a template for writing your own analysis function is included (Single_Model_Template) 
    13 - Help files are integral to each template. Open any of the templates and click on "Help" or "?" from any of the panels to view the help files. 
     27 
     28- Help files are integral to each package. Click on "Help" or "?" from any of the panels to view the help files. 
     29 
    1430- Any previous installations, including any files you may have modified are moved to the NCNR_Moved_Files folder. Look in here for anything that you may want to save.  
    1531 
    1632 
     33 
     34 
     35 
    1736To Update the Package: 
    1837 
     38 
     39 
    1940(1) - double click on the NCNR_Install_or_Update.pxp experiment 
     41 
    2042(2) - Click on "Check for Updates" 
     43 
    2144(3) - The updater will check the version installed versus the version available on the NCNR website. If your version is out-of-date, you will be sent to the NCNR website. 
     45 
    2246(4) If you need to update, download the current version (.zip), and run the installer as in the first step. 
    2347 
    2448 
     49 
     50 
     51 
    2552Troubleshooting: 
    2653 
     54 
     55 
    2756(1) - double click on the NCNR_Install_or_Update.pxp experiment 
     57 
    2858(2) - Click on "Print Diagnostics" 
     59 
    2960(3) - Select and copy the entire contents of the notebook of diagnostics, and paste it into an e-mail. 
    3061 
    3162 
    3263 
     64 
     65 
     66 
     67 
    3368------------------------------------------------------------------- 
     69 
    3470*** Manual Install of the NCNR SANS/USANS Procedures *** 
     71 
    3572------------------------------------------------------------------- 
    3673 
    37 If you were directed by the installer to perform a manual install, it is most likely because you do not have the proper permissions to copy the files into the necessary subfolders of the Igor Pro application folder. 
    38  
    39 ------------------- 
     74 
     75 
     76If you were directed by the installer that there were old NCNR procedures present that need to be removes, it is most likely because you do not have the proper permissions to move the files from the necessary subfolders of the Igor Pro application folder. 
     77 
     78 
     79 
     80------------------- 
     81 
    4082First, if possible, contact your system administrator. See if it is possible to grant you full read/write access to these three folders: 
    4183 
     84 
     85 
    4286(on Windows) 
     87 
    4388/Program Files/WaveMetrics/Igor Pro/Igor Help Files 
     89 
    4490/Program Files/WaveMetrics/Igor Pro/Igor Extensions 
     91 
    4592/Program Files/WaveMetrics/Igor Pro/User Procedures 
    4693 
     94 
     95 
    4796(on Mac OSX) 
     97 
    4898/Applications/Igor Pro/Igor Help Files 
     99 
    49100/Applications/Igor Pro/Igor Extensions 
     101 
    50102/Applications/Igor Pro/User Procedures 
    51103 
     104 
     105 
    52106If you or someone can reset the permissions on these folders so you can read and write, then re-run the installer, and it should work correctly without errors. 
    53107 
    54108 
    55 If you can't get full permissions, you may still be able to use the macros.  
    56  
    57 Choose from the Menu Macros->Force Install. 
    58  
    59 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. 
    60  
    61 ------------------ 
    62  
    63 If you want to move the files and folders by hand, follow these steps, skipping those operations that you do not have permission to do: 
     109 
     110 
     111 
     112If you can't get full permissions, you may still be able to use the macros. You may need to remove some of the old NCNR procedures by hand, granting permission for each move. 
     113 
     114To do this, follow these steps, skipping those operations that you do not have permission to do: 
     115 
     116 
    64117 
    65118(0) Quit Igor, if it is open. 
    66119 
     120 
     121 
    67122(1) Clean out ALL of the older versions of the NCNR macros from the User Procedures folder. Move them to the trash/recycle, and be sure to EMPTY the trash/recycle. The files to remove will have a variety of names. See the listing at the bottom of this file. 
    68123 
     124 
     125 
    69126(2) Clean out all of the older versions of the NCNR Help Files from the Igor Help Files folder. Move them to the trash/recycle, and be sure to EMPTY the trash/recycle. Again, see the listing of possible names at the bottom of this file. 
    70127 
     128 
     129 
    71130(3) Clean out all of the older versions of the NCNR Extensions from the Igor Extensions folder. Move them to the trash/recycle, and be sure to EMPTY the trash/recycle. Again, see the listing of possible names at the bottom of this file. 
    72131 
    73 (4) From the downloaded package, move the entire folder NCNR_User_Procedures to the Igor Pro/User Procedures folder. 
    74  
    75 (5) Move the entire folder NCNR_Help_Files to the Igor Pro/Igor Help Files folder. 
    76  
    77 (6) In the NCNR_Extensions folder, move EITHER the Mac_XOP folder or the Win_XOP folder to Igor Pro/Igor Extensions, depending on your operating system. Delete the XOP for the platform that you are not using. 
    78  
    79 (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  
    81  
    82  
    83 ------------------- 
     132 
     133-- now with all of the old material removed, re-run the installer. All should be OK now. If, for some bizarre reason it is not, continue by moving procedures in manually. These locations are not in the application folder, so you will have write permission. 
     134 
     135 
     136 
     137(4) From the downloaded package, move the entire folder NCNR_User_Procedures to: 
     138<user>:Documents:WaveMetrics:Igor Pro 6 User Files:User Procedures 
     139or on Windows: 
     140MyDocuments\WaveMetrics\Igor Pro 6 User Files\User Procedures 
     141 
     142 
     143(5) Move the entire folder NCNR_Help_Files to: 
     144<user>:Documents:WaveMetrics:Igor Pro 6 User Files:Igor Help Files 
     145or on Windows: 
     146MyDocuments\WaveMetrics\Igor Pro 6 User Files\Igor Help Files 
     147 
     148 
     149(6) In the NCNR_Extensions folder, move EITHER the Mac_XOP folder or the Win_XOP folder to: 
     150<user>:Documents:WaveMetrics:Igor Pro 6 User Files:Igor Extensions 
     151or on Windows: 
     152MyDocuments\WaveMetrics\Igor Pro 6 User Files\Igor Extensions 
     153 
     154(7) Move the entire folder NCNR_Igor_Procedures to: 
     155<user>:Documents:WaveMetrics:Igor Pro 6 User Files:Igor Procedures 
     156or on Windows: 
     157MyDocuments\WaveMetrics\Igor Pro 6 User Files\Igor Procedures 
     158 
     159 
     160(8) Launch Igor. The "Load..." macros should appear under the Macros menu. 
     161 
     162 
     163 
     164 
     165 
     166 
     167 
     168------------------- 
     169 
    84170"OLD" User Procedures could be any of the following: 
    85171 
     172 
     173 
    86174SANS_Reduction_v5.00 
     175 
    87176SANS_Reduction_v5.0 
     177 
    88178SANS Redn 28OCT03 
     179 
    89180SANS Redn 18JUN04 
     181 
    90182SANS Redn 23JAN04 
     183 
    91184SANS Redn Beta 
     185 
    92186SANS_Models_B 09MAY03 
     187 
    93188SANS_Models (B) 
     189 
    94190SANS_Models Beta 
     191 
    95192SANS_Models Beta2 
     193 
    96194SANS_Models_v3.00 
     195 
    97196SANS_Models_v3.01 
     197 
    98198USANS Procedures 13AUG02 
     199 
    99200USANS_Procedures_14DEC04 
     201 
    100202USANS_Procedures_15DEC05 
     203 
    101204USANS Beta Procedures 
     205 
    102206USANS Procedures v2.00 
     207 
    103208USANS Procedures v2.20 
     209 
    104210Put in User Procedures 
     211 
    105212NCNR_User_Procedures 
     213 
    106214NCNR_Extensions 
     215 
    107216NCNR_Help_Files 
    108217 
    109218 
    110 ------------------- 
     219 
     220 
     221 
     222------------------- 
     223 
    111224"OLD" Igor Help files could be any of the following: 
    112225 
     226 
     227 
    113228SANS_Reduction_Help_v5.ihf 
     229 
    114230SANSReductionHelp_4p2.ihf 
     231 
    115232SANS_Analysis_Docs_v3.00.ihf 
     233 
    116234SANSAnalysisHelp(B).ihf 
     235 
    117236SANS_Model_Docs_v3.00.ihf 
     237 
    118238SANS_Model_Docs_v3.01.ihf 
     239 
    119240USANSReductionHelp_v2.20.ihf 
     241 
    120242USANSReductionHelp_v2.00.ihf 
     243 
    121244USANSReductionHelp_v1.ihf 
     245 
    122246SANS_Analysis_Docs_09JUN06.ihf 
     247 
    123248SANS_Model_Docs_09JUN06.ihf 
     249 
    124250Put in Igor Help Files 
     251 
    125252NCNR_Help_Files 
    126253 
    127254 
    128 ------------------- 
     255 
     256 
     257 
     258------------------- 
     259 
    129260"OLD" Igor Extensions could be any of the following: 
    130261 
     262 
     263 
    131264SANS_Analysis.xop 
     265 
    132266NCNR_Extensions 
    133267 
     268 
     269 
    134270Mac_XOP 
     271 
    135272Win_XOP 
    136 ------------------- 
    137  
    138  
    139  
    140  
    141 June 2008 SRK 
     273 
     274------------------- 
     275 
     276 
     277 
     278 
     279 
     280 
     281 
     282APR 2010 SRK 
  • sans/Dev/trunk/NCNR_User_Procedures/InstalledVersion.txt

    r645 r685  
    1 PACKAGE_VERSION=6.100;SANS_RED_VERSION=5.2;SANS_ANA_VERSION=4.1;USANS_RED_VERSION=2.3; 
     1PACKAGE_VERSION=7.0;SANS_RED_VERSION=5.20;SANS_ANA_VERSION=4.10;USANS_RED_VERSION=2.3; 
    22 
    33Only the first line of the file is read in. 
     
    66 
    77These are the current versions as of: 
    8 19 MAR 2010 SRK 
    9  
     815 APR 2010 SRK 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

    r630 r685  
    939939        DoWindow/C MC_SASCALC 
    940940         
    941         SetVariable MC_setvar0,pos={28,73},size={144,15},bodyWidth=80,title="# of neutrons" 
     941        SetVariable MC_setvar0,pos={26,73},size={144,15},title="# of neutrons" 
    942942        SetVariable MC_setvar0,format="%5.4g" 
    943943        SetVariable MC_setvar0,limits={0,inf,100},value= root:Packages:NIST:SAS:gImon 
    944         SetVariable MC_setvar0_1,pos={28,119},size={131,15},bodyWidth=60,title="Thickness (cm)" 
     944        SetVariable MC_setvar0_1,pos={26,119},size={140,15},title="Thickness (cm)" 
    945945        SetVariable MC_setvar0_1,limits={0,inf,0.1},value= root:Packages:NIST:SAS:gThick 
    946         SetVariable MC_setvar0_2,pos={28,96},size={149,15},bodyWidth=60,title="Incoherent XS (1/cm)" 
     946        SetVariable MC_setvar0_2,pos={26,96},size={165,15},title="Incoherent XS (1/cm)" 
    947947        SetVariable MC_setvar0_2,limits={0,inf,0.1},value= root:Packages:NIST:SAS:gSig_incoh 
    948         SetVariable MC_setvar0_3,pos={28,142},size={150,15},bodyWidth=60,title="Sample Radius (cm)" 
     948        SetVariable MC_setvar0_3,pos={26,142},size={155,15},title="Sample Radius (cm)" 
    949949        SetVariable MC_setvar0_3,limits={-inf,inf,0.1},value= root:Packages:NIST:SAS:gR2 
    950950        PopupMenu MC_popup0,pos={13,13},size={165,20},proc=MC_ModelPopMenuProc,title="Model Function" 
     
    953953        Button MC_button0,fColor=(3,52428,1) 
    954954        Button MC_button1,pos={17,208},size={80,20},proc=MC_Display2DButtonProc,title="Show 2D" 
    955         Button MC_button3,pos={182,94},size={25,20},proc=showIncohXSHelp,title="?" 
     955        Button MC_button3,pos={210,94},size={25,20},proc=showIncohXSHelp,title="?" 
    956956        SetVariable setvar0_3,pos={105,484},size={50,20},disable=1 
    957957        GroupBox group0,pos={15,42},size={267,130},title="Monte Carlo" 
Note: See TracChangeset for help on using the changeset viewer.