Changeset 973


Ignore:
Timestamp:
Mar 28, 2010 12:19:55 PM (14 years ago)
Author:
toby
Message:

Updates to doc's

Location:
trunk/doc
Files:
14 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/doc/expgui.html

    r971 r973  
    55   GSAS, EXPGUI">
    66</HEAD>
    7 <style>
    8 A:link {text-decoration:none}
    9 A:vlink {text-decoration:none}
    10 </style>
    117
    128<BODY BGCOLOR="#FFFFFF"
    … …  
    1410      text="#000000" link="#0033ff" vlink="#0033ff" alink="#0033ff">
    1511
    16 <?
    17    include("/var/www/include/navigation.inc");
    18    include("/var/www/include/utility.inc");
    19 ?>
    2012<blockquote><font face="arial, helvetica, sans-serif">
    2113
    … …  
    3123<I><B>
    3224<blockquote>
    33 For the impatient:
    34 <A HREF="../downloads.html">
    35 Download links</A>
     25For the impatient, see download/installation instructions for:
     26<A HREF="https://subversion.xor.aps.anl.gov/trac/EXPGUI/wiki/InstallWindows">
     27Windows</A>,
     28<A HREF="https://subversion.xor.aps.anl.gov/trac/EXPGUI/wiki/InstallOSX">
     29Mac (OS X)</A>, or
     30<A HREF="https://subversion.xor.aps.anl.gov/trac/EXPGUI/wiki/InstallLinux">
     31Linux</A>
    3632</blockquote>
    3733</I></B>
    … …  
    9086<TH><A Href="expgui_Win_readme.html">Windows</A></TH>
    9187<TH>
    92 <A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial3">
    9388<A Href="osx.html">Mac OS X</A></TH>
    9489</TR><TR>
    … …  
    9893</TR>
    9994<TR><TH BGCOLOR="#F0F0F0">Tutorials:</TH>
    100 <TH><A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial3">
     95<TH><A Href="https://subversion.xor.aps.anl.gov/EXPGUI/tutorials/tutorial3/index.html">
    10196NIST<BR>Neutron data</A></TH>
    102 <TH><A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial1/index.html">GSAS Manual<BR>Example #1 (TOF)</A></TH>
    103 <TH><A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial2/index.html">GSAS Manual<BR>Example #2 (Garnet)</A></TH>
     97<TH><A Href="https://subversion.xor.aps.anl.gov/EXPGUI/tutorials/tutorial1/index.html">GSAS Manual<BR>Example #1 (TOF)</A></TH>
     98<TH><A Href="https://subversion.xor.aps.anl.gov/EXPGUI/tutorials/tutorial2/index.html">GSAS Manual<BR>Example #2 (Garnet)</A></TH>
    10499</TR>
    105100<TR><TH BGCOLOR="#F0F0F0">Messages:</TH>

  • trunk/doc/expgui_Unix_readme.html

    r971 r973  
    55   GSAS, EXPGUI, Windows">
    66</HEAD>
    7 <style>
    8 A:link {text-decoration:none}
    9 A:vlink {text-decoration:none}
    10 </style>
    117
    128<BODY BGCOLOR="#FFFFFF"
    … …  
    1410      text="#000000" link="#0033ff" vlink="#0033ff" alink="#0033ff">
    1511
    16 <?
    17    include("/var/www/include/navigation.inc");
    18    include("/var/www/include/utility.inc");
    19 ?>
    2012<blockquote><font face="arial, helvetica, sans-serif">
    2113
    … …  
    3022EXPGUI
    3123</A>
    32 on <BR>SGI & Linux Computers
     24on Linux
    3325<HR noshade width="75%" size="2" align="center">
    3426</H1></CENTER>
     27<P>
     28<TABLE BORDER BGCOLOR="#FFFF40" ALIGN=CENTER><TR><TH>
     29<B>Please note:</B>
     30A new mechanism for installing GSAS & EXPGUI is now recommended. See
     31<A HREF="https://subversion.xor.aps.anl.gov/trac/EXPGUI/wiki/InstallLinux">
     32this link</a>. If this method is used, EXPGUI or a python script can
     33be used to update GSAS & EXPGUI quickly and easily. The information
     34below is all obsolete.
     35Also, GSAS updates for the Silicon Graphics have not been produced for
     36many years.
     37</TH></TR></TABLE><BR CLEAR=ALL>
     38
    3539Note that root access is not required to load this GSAS/EXPGUI package.
    3640You may choose to do this work as root, so that the files may be installed

  • trunk/doc/expgui_Win_readme.html

    r971 r973  
    55   GSAS, EXPGUI, Windows">
    66</HEAD>
    7 <style>
    8 A:link {text-decoration:none}
    9 A:vlink {text-decoration:none}
    10 </style>
    117
    128<BODY BGCOLOR="#FFFFFF"
    … …  
    1410      text="#000000" link="#0033ff" vlink="#0033ff" alink="#0033ff">
    1511
    16 <?
    17    include("/var/www/include/navigation.inc");
    18    include("/var/www/include/utility.inc");
    19 ?>
    2012<blockquote><font face="arial, helvetica, sans-serif">
     13
    2114
    2215<TABLE BORDER BGCOLOR="#FFFF40" ALIGN=RIGHT>
    2316<TR>
    2417<TH>
    25 <a href="http://www.ncnr.nist.gov/xtal/software/gsas+expgui.html">self-installer notes</a></TH>
     18<a href="gsas+expgui.html">self-installer notes</a></TH>
    2619<TH><A  Href="win_old_notes.html">Windows install details</A></TH>
    2720<TH><A  Href="expgui.html">EXPGUI home</A></TH>
    … …  
    4033</H1></CENTER>
    4134
     35<TABLE BORDER BGCOLOR="#FFFF40" ALIGN=CENTER><TR><TH>
     36<B>Please note:</B>
     37A new mechanism for installing GSAS & EXPGUI is now recommended. See
     38<A HREF="https://subversion.xor.aps.anl.gov/trac/EXPGUI/wiki/InstallWindows">
     39this link</a>. If this method is used, EXPGUI or a batch file can
     40be used to update GSAS & EXPGUI quickly and easily.
     41The installer described below will be updated for the foreseeable
     42   future, but likely with less frequency.
     43</TH></TR></TABLE><BR CLEAR=ALL>
     44
    4245<EM>Please note that <A HREF="expgui.html">EXPGUI</A>
    4346 is always under development and gets
    … …  
    5457<a href="http://www.ncnr.nist.gov/xtal/software/gsas.html">GSAS (General Structure Analysis System)</a>
    5558and
    56 <a href="http://www.ncnr.nist.gov/xtal/software/expgui">EXPGUI</a>,
     59<a href="https://subversion.xor.aps.anl.gov/EXPGUI/trunk/doc/expgui.html">EXPGUI</a>
    5760will do so by downloading a single file that installs the GSAS programs,
    5861the Tcl/Tk package (with some extensions), the EXPGUI scripts, as well as
    … …  
    7275<DL><DL>
    7376You can download a single file that installs
    74 <a href="http://www.ncnr.nist.gov/xtal/software/gsas.html">GSAS</A>
     77  <a href="http://www.ncnr.nist.gov/xtal/software/gsas.html">GSAS</A>
    7578and
    76 <a href="http://www.ncnr.nist.gov/xtal/software/expgui">EXPGUI</a>,
     79<a href="expgui.html">EXPGUI</a>,
    7780as well as the Tcl/Tk package, needed by EXPGUI. This self-installing
    7881file uncompresses itself, copies the required files
    … …  
    8083creates the appropriate registry entries needed to run the programs.
    8184A
    82 <a href="http://www.ncnr.nist.gov/xtal/software/gsas+expgui.html">
     85<a href="gsas+expgui.html">
    8386separate web page</a>
    84 provides details a detailed description on this self-installer
    85 (<a href="ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/gsas+expgui.exe">gsas+expgui.exe</A>).
    86 Here are the steps in brief:
     87provides details a detailed description on this self-installer.
     88
     89  Here are the steps in brief:
    8790
    8891<OL>
    8992<P><LI><B>Download
    90 <a href="ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/gsas+expgui.exe">
    91 ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/gsas+expgui.exe</A>
    92 </B><BR>
    93 (Mirrors: select file gsas+expgui.exe from
    94 <A HREF="
    95 http://www.ccp14.ac.uk/ccp/ccp14/ftp-mirror/briantoby/pub/cryst/gsas/">
    96 UK</A>,
    97 
    98 <A HREF="http://ccp14.sims.nrc.ca/ccp/ccp14/ftp-mirror/briantoby/pub/cryst/gsas/">
    99 Canada</A>
     93gsas+expgui.exe
     94from
     95<a href="http://11bm.xor.aps.anl.gov/downloads/gsas/windows/">Argonne</a>
     96(http://11bm.xor.aps.anl.gov/downloads/gsas/windows/)
    10097or
    101 
    102 <A HREF="
    103 http://ccp14.minerals.csiro.au/ccp/ccp14/ftp-mirror/briantoby/pub/cryst/gsas/">
    104 Australia</A>.)
    105 
    106 
    107 <P><LI><B>Run the gsas+expgui.exe file</B>
     98<a href="http://www.ccp14.ac.uk/ccp/ccp14/ftp-mirror/gsas/public/gsas/windows/">
     99CCP14 </A>
     100(http://www.ccp14.ac.uk/ccp/ccp14/ftp-mirror/gsas/public/gsas/windows/) 
     101
     102  <P><LI><B>Run the gsas+expgui.exe file</B>
    108103
    109104<P><LI><B>Page through the installation screens & select install options</B>
    … …  
    116111For more details on the sequence of operations and the installation
    117112options refer to the detailed
    118 <a href="http://www.ncnr.nist.gov/xtal/software/gsas+expgui.html">
     113<a href="gsas+expgui.html">
    119114Windows self-installer instructions</a> web page.
    120115
    … …  
    166161The absolute latest release (which may not have gotten
    167162a lot of testing)
    168 is distributed as
    169 <A HREF="ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/expgui_alpha.zip">
    170 ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/expgui_alpha.zip</A>.
     163is found as a .tar or .zip file in
     164<A HREF="http://11bm.xor.aps.anl.gov/downloads/gsas/">
     165  http://11bm.xor.aps.anl.gov/downloads/gsas/</A>.
    171166On the newest versions of Windows, support for .zip files is built in, but
    172167for older versions, you will need an unzip program, such as WinZip or pkZip.
    … …  
    178173Second, note the EXPGUI package date, by
    179174using the Help/About menu command in EXPGUI.
    180 You then want to download this file:
     175You then want to download file expgui.zip from :
    181176is distributed as
    182177<DL>
    183 <A HREF="ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/expgui_alpha.zip">
    184 ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/expgui_alpha.zip</A>
    185 <BR>
    186 (Mirrors: select file expgui_alpha.zip from
    187 <A HREF="
    188 http://www.ccp14.ac.uk/ccp/ccp14/ftp-mirror/briantoby/pub/cryst/gsas/">
    189 UK</A>,
    190 
    191 <A HREF="http://ccp14.sims.nrc.ca/ccp/ccp14/ftp-mirror/briantoby/pub/cryst/gsas/">
    192 Canada</A>
    193 or
    194 
    195 <A HREF="
    196 http://ccp14.minerals.csiro.au/ccp/ccp14/ftp-mirror/briantoby/pub/cryst/gsas/">
    197 Australia</A>.)
     178<A HREF="http://11bm.xor.aps.anl.gov/downloads/gsas/">
     179  http://11bm.xor.aps.anl.gov/downloads/gsas/</A>.
    198180</DL><P>
    199181 and unpack it to subdirectory <tt>...\gsas\expgui\</tt>.
    … …  
    330312<TR>
    331313<TH>
    332 <a href="http://www.ncnr.nist.gov/xtal/software/gsas+expgui.html">self-installer notes</a></TH>
     314<a href="gsas+expgui.html">self-installer notes</a></TH>
    333315<TH><A  Href="win_old_notes.html">Windows install details</A></TH>
    334316<TH><A  Href="expgui.html">EXPGUI home</A></TH>

  • trunk/doc/osx.html

    r971 r973  
    55   GSAS, EXPGUI, Mac, OS X">
    66</HEAD>
    7 <style>
    8 A:link {text-decoration:none}
    9 A:vlink {text-decoration:none}
    10 </style>
    117
    128<BODY BGCOLOR="#FFFFFF"
    139      topmargin="0" leftmargin="0" marginwidth="0" marginheight="0">
    14 <?
    15    include("/var/www/include/navigation.inc");
    16    include("/var/www/include/utility.inc");
    17 ?>
     10
    1811<blockquote><font face="arial, helvetica, sans-serif">
    1912
    … …  
    3023This page contains information on installing and running GSAS & EXPGUI
    3124on Macintosh OS X computers.
     25<P>
     26<TABLE BORDER BGCOLOR="#FFFF40" ALIGN=CENTER><TR><TH>
     27  <B>Please note:</B>
     28A new mechanism for installing GSAS & EXPGUI is now recommended. See
     29<A HREF="https://subversion.xor.aps.anl.gov/trac/EXPGUI/wiki/InstallOSX">
     30this link</a>. If this method is used, EXPGUI or a python script can
     31be used to update GSAS & EXPGUI quickly and easily.
     32It is not clear how much longer the installation package described
     33  below will continute to be updated.
     34  </TH></TR></TABLE><BR CLEAR=ALL>
    3235
    3336<h2>Installation</H2>
    3437Both GSAS and EXPGUI require that X-windows (X11) be installed on your Mac.
    35 Since 10.3, this has been distributed as part of the operating system, but
    36 is not loaded as part of a default installation. The instructions below
     38Since 10.3, X11 has been distributed as part of the operating system, but
     39for 10.3 and 10.4 must be loaded manually. The instructions below
    3740describe how X11 is installed.
    3841
    3942<OL>
    40 <P><LI>Install X11
     43<P><LI>Install X11 (<=10.4, only)
    4144<DL><DL><I>
    4245Before you can run the GSAS package (or, for that matter,
    … …  
    4447you need to load the X Windows system (X11) onto your computer. </I>
    4548<P>
    46 For 10.4, one can load the Mac OS X install disk. Note that this requires
     49  For 10.5 (Leopard) or 10.6 (Snow Leopard), X11 is installed by
     50  default. Nothing needs to be done.
     51  <P>
     52For 10.4, one can load the Mac OS X from the install disk.
     53  Note that this requires
    4754administrator access to the computer. The X11 installation procedure consist
    4855of the following steps:
    … …  
    5966from the utilities menu of the system Applications folder.
    6067</UL>
    61 See the page on <a href="x11osx/osx_x11.html"> Installing X11 under Mac OS X</a>
    62 for more details.
    6368<P>
    6469For 10.3 (Panther) I am pretty sure a similar process to 10.4 can be used,
    … …  
    7883<P><LI>Download the GSAS & EXPGUI programs as a Mac disk image appropriate
    7984for the CPU type of your computer (to find out what you have
    80 click on the "About This Mac" item in the Apple menu).
    81 
     85click on the "About This Mac" item in the Apple menu) from
     86<a href="http://11bm.xor.aps.anl.gov/downloads/gsas/macOSX/">
     87  http://11bm.xor.aps.anl.gov/downloads/gsas/macOSX/</A>
     88<P>
    8289<DL><UL>
    83 <LI><I>For older Macs with Power PC (G3, G4 or G5) CPUs running OS X 10.4
    84 (& 10.5?) use this link:</I>
    85 <BR><a href=
    86 "ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/OSX_gsas+expgui_PPC_2007Jan15.dmg">
    87 ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/OSX_gsas+expgui_PPC_2007Jan15.dmg
    88 </a> (~14 Mb)
    89 <P>
    90 <LI><I>Newer Macs with Intel (Pentium) CPUs should use this link:</I>
    91 <BR><a href=
    92 "ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/OSX_gsas+expgui_Intel_2007Jan15.dmg">
    93 ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/OSX_gsas+expgui_Intel_2007Jan15.dmg
    94 </a> (~32 Mb)<BR>
    95 Intel-based Macs can also use the PPC version, but will
    96 see at least x5 better performance with the version compiled for this CPU.
    97 <P>
    98 
    99 <LI><I>For older Macs with Power PC (G3, G4 or G5) CPUs running OS X 10.2 or 10.3
    100 can use this link:</I>
    101 <BR><a href=
    102 "ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/OSX_10.3_gsas+expgui_2007Jan15.dmg">
    103 ftp://ftp.ncnr.nist.gov/pub/cryst/gsas/OSX_10.3_gsas+expgui_2007Jan15.dmg
    104 </a> (~14 Mb)
    105 <BR>Note that this is likely to be the update for 10.2 and 10.3.
    106 <P>
    107 for a CCP14 mirror, look in
    108 http://www.ccp14.ac.uk/ccp/ccp14/ftp-mirror/briantoby/pub/cryst/gsas/
    109 </UL></DL>
    110 
    111 Mount the downloaded file by double-clicking on it. This should create a new volume in
    112 your top-level ("Computer") called "GSASvol"; clicking on this device will open
    113 a finder window with a single folder ("gsas") present.
    114 (<I>Note that some browsers will automatically perform this step for
    115 you.</I>)
    116 <P>
    117 
    118 <I>While you can run GSAS & EXPGUI from this location, you are strongly
     90<LI><I>Newer Macs with Intel (Pentium) CPUs should use the Intel
     91  version of the .dmg file</I>
     92<P>
     93<LI><I>Older Macs with Power PC (G3, G4 or G5) should use the PPC
     94  version of the .dmg file</I> (Note, as of 2010, this distribution has not
     95  been updated for a while).
     96<P>
     97
     98While you can run GSAS & EXPGUI from this location, you are strongly
    11999suggested to instead copy the entire package to your computer by dragging the
    120100gsas folder icon to another finder window, or by clicking on it and using
    121 Copy and Paste.</I>
    122 
     101Copy and Paste.
     102</UL>
    123103<LI>Install a "shortcut" to launch EXPGUI
    124104<DL><DL>
Note: See TracChangeset for help on using the changeset viewer.