Project

General

Profile

How to Update from v21 (Microscope Windows Computer) » History » Version 13

Anchi Cheng, 06/07/2012 09:52 PM

1 1 Anchi Cheng
h1. How to Update from v21 (Microscope Windows Computer)
2
3 11 Anchi Cheng
The changes from v2.1 DOES require upgrade at the microscope
4 1 Anchi Cheng
5 11 Anchi Cheng
See [[Installation Troubleshooting]] and  "Leginon Bulletin Board":http://emg.nysbc.org/projects/leginon/boards  searching
6
for "install" if you run into problems.
7 1 Anchi Cheng
8 11 Anchi Cheng
h2. Packages required from NRAMM
9
10
All Leginon (and Appion) packages distributed from NRAMM are under one svn control.
11
12
Recommended minimal subpackage upgrade:
13
|pyscope|change in configuration|
14
|pyami|new function related to configuration search|
15
|leginon|change in configuration reading|
16 12 Anchi Cheng
|sinedon|change in configuration reading|
17 11 Anchi Cheng
18
h2. Download myami-2.2 source code
19
20
h3. Check out SVN Source Files from the repository
21
22
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
23
* Create myami2.2 directory somewhere at your convenience
24
* Change directory into myami2.2
25
* Right-click the mouse botton in this directory window and select Tortoise svn
26
Checkout in the menu: !http://emg.nysbc.org/software/leginon/images/images/svnmenu.png!
27
* 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!
28
29
Otherwise, you can copy the files from your linux myami-2.2 source.
30
31
h2. Perform system check if you can't remember where you have installed your Leginon before.
32
33
* Go to ~/myami2.2/leginon
34
* Double click on syscheck.py
35
36
You should have all the supporting packages installed for v2.1. If you see any lines like "*** Failed...", then you have something missing. Otherwise, everything should result in "OK".
37
38
h2. Move your existing packages to a backup directory (Optional):
39
40
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.
41
You may find these folders here:
42
|leginon|
43
|pyscope|
44
|sinedon|
45
|pyami|
46
47
For example, your Leginon folder is at C:\\python25\Lib\site-packages\leginon
48
49
<pre>Go to C\\python25\site-packages
50
Create Leginon2_1_backup folder
51
Move Leginon folder into Leginon2_1_backup folder</pre>
52
53
h2. Install subpackages you downloaded from NRAMM svn repository.  *You should not install numextension, libcv and comarray using this instruction*
54
55
* Start a command line Window from Start Menu
56
57
* Reinstall the package in EACH of the following folders using the included setup.py
58
|leginon|
59
|pyscope|
60
|sinedon|
61
|pyami|
62
63
<pre>cd Your_Download_Place\myami2.2_folder
64
c:\\python25\python.exe setup.py install</pre>
65
66
h2. copy the old config files to the new location.
67
68
*If you want to avoid copying cfg files to new installation in the future, copy them from where you had it in the 2.1 backup to the global config directory*
69
70 1 Anchi Cheng
{{include(locate global config directory on Windows)}}
71 11 Anchi Cheng
72
|_config file_|likely location in 2.1 installation if not in your hoe directory|
73
|sinedon.cfg|C:\\python25\Lib\site-packages\sinedon_2.1_backup\|
74
|leginon.cfg|C:\\python25\Lib\site-packages\leginon_2.1_backup\config\|
75
|instruments.cfg|C:\\python25\Lib\site-packages\pyscope_2.1_backup\|
76
77
h2. modify Tietz PXL camera imaging size if you did so before for Leginon 2.2
78
79
*You should not copy the old one in this case since the file has been changed*
80
*  Go to C:\Python25\Lib\site-packages\pyscope\
81
82
*  Edit tietz.py with a plain text editor
83
84
85
*  Find the lines:
86
87
<pre> def getCameraSize(self):
88
# {'type': dict, 'values': {'x': {'type': int}, 'y': {'type': int}}}}
89
x = self._getParameterValue('cpTotalDimensionX')
90
y = self._getParameterValue('cpTotalDimensionY')
91
return {'x': x, 'y': y}
92
</pre>
93
94
*  Change the last line to:
95
96
<pre>    return {'x': 2048, 'y': 2048}</pre>
97
98
h2. About [[TEM Scripting Beam Tilt Calibration]]
99
100
* 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.
101 1 Anchi Cheng
102 3 Anchi Cheng
h2. Modify pyscope/instruments.cfg
103 1 Anchi Cheng
104 6 Anchi Cheng
Starting from 2.2, Cs values are saved with the scope in instruments.cfg that need to match the value saved in the database.  Also a z-plane needs to be assigned to each camera
105
106 3 Anchi Cheng
{{include(Instrumentscfg_for_22)}}
107 2 Anchi Cheng
______
108
109 10 Anchi Cheng
[[How_to_Update_from_v21_(Linux)|< How to Update from v2.1 (Linux) ]] | [[Check Cs value match before using Leginon after update|Check Cs value match before using Leginon after upgrade >]]
110 2 Anchi Cheng
111
112
______