Skip to content

Commit 5d06bac

Browse files
committed
fix formatting issues
1 parent abaee08 commit 5d06bac

2 files changed

Lines changed: 25 additions & 23 deletions

File tree

MDtutorials/RegisterBilbao/RegisterBilbao.md

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
---
2-
title: "Tutorial: Register for Access to the Bilbao Crystallographic Server"
2+
title: "Tutorial: Setup Access to the Bilbao Crystallographic Server"
33
---
44

55
<!--- Don't change the HTML version of this file; edit the .md version -->
66

7-
# Tutorial: Register for Access to the Bilbao Crystallographic Server
8-
97
* No exercise files are needed for this tutorial
108

119
** Note that the process below is still being tested and developed. It
@@ -20,15 +18,15 @@ While one can use this server from a computer browser, access to it via software
2018
## Request a BCS account
2119

2220
<BR clear=all>
23-
<img src="../imgs/BCS1.jpg" alt="Initial Registration Page" width="400px;" align="right">
21+
<img src="imgs/BCS1.jpg" alt="Initial Registration Page" width="400px;" align="right">
2422

2523
- Use this URL to open the following page: [https://cryst.ehu.es/cgi-bin/cryst/programs/UserRegister.pl](https://cryst.ehu.es/cgi-bin/cryst/programs/UserRegister.pl). The web page to the right will open.
2624

2725
Enter your e-mail address and press the "Apply" button.
2826

2927

3028
<BR clear=all><P>&nbsp;</P>
31-
<img src="../imgs/BCS2.jpg" alt="2nd Registration Page" width="400px;" align="right">
29+
<img src="imgs/BCS2.jpg" alt="2nd Registration Page" width="400px;" align="right">
3230

3331
- Once you have pressed "Apply", you should see a page telling you that an e-mail has been sent to that address, as seen to the right:
3432

@@ -48,34 +46,34 @@ The response to the previous web form should be an e-mail allong the lines of th
4846
>> BCS API Team
4947
5048
<BR clear=all>
51-
<img src="../imgs/BCS3.jpg" alt="Registration Page" width="400px;" align="right">
49+
<img src="imgs/BCS3.jpg" alt="Registration Page" width="400px;" align="right">
5250

5351
- Click on the provided link (or copy and paste it into a web browser) which should raise a window like the one to the right, where you will need to provide your name, an institution and a password.
5452

5553

5654
<BR clear=all><P>&nbsp;</P>
57-
<img src="../imgs/BCS4.jpg" alt="Registration Confirmation" width="400px;" align="right">
55+
<img src="imgs/BCS4.jpg" alt="Registration Confirmation" width="400px;" align="right">
5856

5957
- After pressing "Register" on the above page, you will be told that your account has been established, as shown in the window to the right.
6058

6159
## Create a BCS API Key
6260

63-
<img src="../imgs/BCS5.jpg" alt="Login screen" width="400px;" align="right">
61+
<img src="imgs/BCS5.jpg" alt="Login screen" width="400px;" align="right">
6462

6563
- Use the "login page" link in the web page above (or URL [ https://cryst.ehu.es/cgi-bin/cryst/programs/User_Login.pl]( https://cryst.ehu.es/cgi-bin/cryst/programs/User_Login.pl)), which will open a window like the one to the right. Enter your e-mail address and the password you created in the previous step and click on "Sign in".
6664

6765
<BR clear=all>
68-
<img src="../imgs/BCS6.jpg" alt="Options after login" width="400px;" align="right">
66+
<img src="imgs/BCS6.jpg" alt="Options after login" width="400px;" align="right">
6967

7068
- This will bring you to a page with account options, as shown to the right. Select the 4th option, "Create/Update API Key."
7169

7270
<BR clear=all><P>&nbsp;</P>
73-
<img src="../imgs/BCS7.jpg" alt="Request API Key" width="400px;" align="right">
71+
<img src="imgs/BCS7.jpg" alt="Request API Key" width="400px;" align="right">
7472

7573
- The "Create/Update API Key" option opens the page to the right. Click on the "GENERATE A NEW API KEY" option.
7674

7775
<BR clear=all><P>&nbsp;</P>
78-
<img src="../imgs/BCS8.jpg" alt="API Key generated" width="400px;" align="right">
76+
<img src="imgs/BCS8.jpg" alt="API Key generated" width="400px;" align="right">
7977

8078
- This will open a page displaying the key that you have generated, as shown to the right. Highlight the text beginning with BCS_ through the end of the line and use your browser's Copy command (usually control-C or on Mac Command-C).
8179
You should not let anyone else have access to your key. If there is excessive use by the key you have created, your access to the server will be blocked.
@@ -84,38 +82,38 @@ You should not let anyone else have access to your key. If there is excessive us
8482
## Supply the BCS API Key to GSAS-II
8583

8684
<BR clear=all>
87-
<img src="../imgs/BCS9.jpg" alt="Open GSAS-II Preference menu" width="225px;" align="right">
85+
<img src="imgs/BCS9.jpg" alt="Open GSAS-II Preference menu" width="225px;" align="right">
8886

8987
- Now open GSAS-II or use an existing GSAS-II session. In the File menu, use the Preferences menu command, as to the right.
9088

9189
<BR clear=all><P>&nbsp;</P>
92-
<img src="../imgs/BCS10.jpg" alt="In Preference Window Select BCS_API_KEY" width="200px;" align="right">
90+
<img src="imgs/BCS10.jpg" alt="In Preference Window Select BCS_API_KEY" width="200px;" align="right">
9391

9492
- In the Preferences window, select configuration variable "BCS_API_KEY" in the pull-down list,
9593
as seen to the right.
9694

9795
<BR clear=all><P>&nbsp;</P>
98-
<img src="../imgs/BCS11.jpg" alt="Request API Key" width="450px;" align="right">
96+
<img src="imgs/BCS11.jpg" alt="Request API Key" width="450px;" align="right">
9997

10098
- Once the configuration variable "BCS_API_KEY" has been selected in the pull-down list, the window to the right will be populated. Use the paste function (usually control-V or on Mac Command-V) to place the text into the entry box for the variable value. If that does not work, you will need to type it in manually. Press "Save current settings" and the window will close.
10199

102100
## Test Access to BCS Using the API Key
103101

104102
<BR clear=all>
105-
<img src="../imgs/BCS12.jpg" alt="Request API Key" width="250px;" align="right">
103+
<img src="imgs/BCS12.jpg" alt="Request API Key" width="250px;" align="right">
106104

107105
- Once the configuration variable "BCS_API_KEY" has been selected in the pull-down list,
108106
as a simple way to test that access has now been established, select any phase in your project. (If you do not have any phases, use "Add new phase" the data menu to create one.) That will bring up the Compute menu, which has an entry "Test Bilbao access", as seen to the right.
109107

110108
<BR clear=all><P>&nbsp;</P>
111-
<img src="../imgs/BCS13.jpg" alt="Request API Key" width="300px;" align="right">
109+
<img src="imgs/BCS13.jpg" alt="Request API Key" width="300px;" align="right">
112110

113111
- After the "Test Bilbao access" menu command has been used, there will be a short delay, as information is sent to that web server, along with your API Key. When the reply is received, a message such as the one to the right should be displayed.
114112

115113
<BR clear=all>
116114

117115
- Should an error occur, one of the two following errors messages will be displayed:
118116

119-
<img src="../imgs/BCS14.jpg" alt="Request API Key" width="300px">
120-
<img src="../imgs/BCS15.jpg" alt="Request API Key" width="300px">
117+
<img src="imgs/BCS14.jpg" alt="Request API Key" width="300px">
118+
<img src="imgs/BCS15.jpg" alt="Request API Key" width="300px">
121119
<BR clear=all><P>&nbsp;</P>

webdocs/install.rst

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,20 @@ Installing GSAS-II: Overview
1212
GSAS-II requires a number of coordinated installation actions and there are many
1313
different ways this can be accomplished. One needs -- not only the necessary Python source
1414
code for GSAS-II -- but also a Python interpreter that includes a
15-
`number of "add-on" Python
16-
packages<https://gsas-ii.readthedocs.io/en/latest/packages.html#python-requirements>`_
17-
for additional capabilities. This much match the operating system for the
15+
`number of "add-on" Python packages
16+
<https://gsas-ii.readthedocs.io/en/latest/packages.html#python-requirements>`_
17+
for additional capabilities. The Python and add-on modules
18+
much match the operating system for the
1819
computer where the software will be run. Further, GSAS-II requires that a small amount
19-
of its code be compiled, typically for speed and this must be matched both the computer OS and to the Python version. Here I outline different a few different approaches.
20+
of its code be compiled, typically for speed, and these files must
21+
match both the computer OS and to the Python/numpy versions.
22+
Here I outline different a few different installation approaches.
2023

2124
Most users of GSAS-II, particularly those using Windows and MacOS, are seeking
2225
a simple way to install and run the software and can live
2326
with the idea that they may have duplicated Python installations (several hundreds of MB each)
24-
on their computer. The GSAS2MAIN self-installer provides simple installation and can be
27+
on their computer. The GSAS2MAIN self-installer provides for that
28+
simple installation. It can be
2529
`downloaded from here
2630
<https://github.com/AdvancedPhotonSource/GSAS-II-buildtools/releases/latest>`_. The
2731
GSAS2MAIN self-installer also has the advantage that once GSAS-II is

0 commit comments

Comments
 (0)