Project

General

Profile

How to Update from v30 (Instrument Windows Computer) » History » Version 5

Anchi Cheng, 08/13/2014 01:07 PM

1 1 Anchi Cheng
h1. How to Update from v30 (Instrument Windows Computer)
2
3
The changes to v3.1 DOES require upgrade at the microscope and camera computers.
4
5
See [[Installation Troubleshooting]] and  "Leginon Bulletin Board":http://emg.nysbc.org/projects/leginon/boards  searching
6
for "install" if you run into problems.
7
8 5 Anchi Cheng
h2. Download myami-3.1 source code
9
10
h3. Check out SVN Source Files from the repository
11
12
Assuming that you have installed some kind of svn client such as TortoiseSVN "http://tortoisesvn.tigris.org/", you can use your mouse to do the following
13
* Create myami3.1 directory somewhere at your convenience
14
* Change directory into myami3.1
15
* Right-click the mouse botton in this directory window and select Tortoise svn
16
Checkout in the menu: !http://emg.nysbc.org/software/leginon/images/images/svnmenu.png!
17
* Set up svn checkout window like this, but check out from http://emg.nysbc.org/svn/myami/branches/myami-2.2 and save it to myami2.2 folder !http://emg.nysbc.org/software/leginon/images/images/svnco.png!
18
19
Otherwise, you can copy the files from your linux myami-3.1 source.
20
21
h2. Move your existing packages to a backup directory (Optional):
22
23
At the beginning of the syscheck.py output, the location of the exisiting Leginon folder is shown. Although new installation overwrite the old in most cases, problem has been observed in the past. Therefore, it is best to remove the old files from the path before new installation.  Better yet, copy into a backup folder because we need some configuration files from them.
24
You may find these folders here:
25
|leginon|
26
|pyscope|
27
|sinedon|
28
|pyami|
29
30
For example, your installed Leginon folder is at C:\\python27\Lib\site-packages\leginon
31
32
<pre>Go to C\\python27\site-packages
33
Create Leginon3_0_backup folder
34
Move Leginon folder into Leginon3_0_backup folder</pre>
35
36
h2. Install subpackages you downloaded from NRAMM svn repository.  *You should not install numextension, libcv and comarray using this instruction*
37
38
* Start a command line Window from Start Menu
39
40
* Reinstall the package in EACH of the following folders using the included setup.py
41
|leginon|
42
|pyscope|
43
|sinedon|
44
|pyami|
45
46
<pre>cd Your_Download_Place\myami3.1_folder
47
c:\\python27\python.exe setup.py install</pre>
48
49 1 Anchi Cheng
h2. copy the old config files to the global location if you still use local files
50
51
{{include(locate global config directory on Windows)}}
52
53
|_config file_|likely location in 3.0 installation if not in your home directory|
54
|sinedon.cfg|C:\\python27\Lib\site-packages\sinedon\|
55
|leginon.cfg|C:\\python27\Lib\site-packages\leginon\config\|
56
|instruments.cfg|C:\\python27\Lib\site-packages\pyscope\|
57
58
h2. Enter Tietz PXL camera imaging size in instruments.cfg if needed in this format:
59
60
<pre>
61
[camera]
62
tietz.TietzPXL
63
zplane:10
64
height: 2048
65
width: 2048
66
</pre>
67
68
h2. About [[TEM Scripting Beam Tilt Calibration]]
69
70
* If you have done [[TEM_Scripting Beam Tilt Calibration]] and have changed the scale factor in tecnai.py, you should copy the value to your new installation.
71
72
h2. Gatan K2 Summit camera
73
74 4 Anchi Cheng
Check and modify pyscope/dmsem.py for new configuration needed for the camera to indicate its DM version, orientation, and file saving location.  More details in [[Gatan_K2_installation_and_setup#(Version-3.1)-Define-local-configuration]]
75 1 Anchi Cheng
76
<pre>
77
# DM Version
78
DM_VERSION = '2.30.542.0'
79
# the value in DM camera config
80
K2_CONFIG_FLIP = True
81
# multiple of 90 degrees (i.e. put 1 if 90 degrees, 3 if 270 degrees)
82
K2_CONFIG_ROTATE = 3
83
# raw frame base directory. Use '\\' as path separator
84
RAW_FRAME_DIR = 'D:\\frames\\'
85
</pre>
86
______
87
88 2 Anchi Cheng
[[How_to_Update_from_v30_(Linux)|< How to Update from v3.0 (Linux) ]] 
89 1 Anchi Cheng
90
91
______