Project

General

Profile

How to Update from v31 (Instrument Windows Computer) » History » Version 2

Anchi Cheng, 05/09/2016 07:33 AM

1 1 Anchi Cheng
h1. How to Update from v31 (Instrument Windows Computer)
2
3
The changes to v3.2 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
h2. Download myami-3.2 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.2 directory somewhere at your convenience
14
* Change directory into myami3.2
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-3.2 and save it to myami3.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.2 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_1_backup folder
34
Move Leginon folder into Leginon3_1_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.2_folder
47
c:\\python27\python.exe setup.py install</pre>
48
49
{{include(locate global config directory on Windows)}}
50
51
h2. copy the old config files to the global location if you still use local files
52
53
h2. Enter Tietz PXL camera imaging size in instruments.cfg if needed in this format:
54
55
<pre>
56
[camera]
57
tietz.TietzPXL
58
zplane:10
59
height: 2048
60
width: 2048
61
</pre>
62
63
h2. About [[TEM Scripting Beam Tilt Calibration]]
64
65
* 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.
66
67
h2. Gatan K2 Summit camera
68
69
We moved the configuration from dmsem.py to a configuration file parsed with standard parser.
70
71
# Check your 3.1 pyscope/dmsem.py for the old configuration needed for the camera to indicate its DM version, orientation, and file saving location.
72
# Copy Your_Download_Place\myami3.2\pyscope\dmsem.cfg.template to the standard myami config path C:\Program File\myami\dmsem.cfg
73
# Modify dmsem.cfg according to your old configuration
74
  More details in [[Gatan_K2_installation_and_setup#(Version-3.2)-Define-local-configuration-in-dmsemcfg]]
75
76
<pre>
77
### general dm configurations
78
[dm]
79
# DM Version
80
DM_VERSION = 2.31.734.0
81
82
### K2 Summit configuration through SERIALEMCCD plugin
83
[k2]
84
# Camera ID
85
CAMERA_ID = 0
86
# the value in DM camera config
87
FLIP = True
88
# multiple of 90 degrees (i.e. put 1 if 90 degrees, 3 if 270 degrees)
89
ROTATE = 1
90
# raw frame base directory. Use '\' as path separator
91
RAW_FRAME_DIR = D:\frames\
92
# max number of frames to sum in order to return early
93
EARLY_RETURN_FRAME_COUNT = 0
94
</pre>
95
96
h2. Gatan K2 Summit camera changes upon GMS upgrade
97
98
A change in GMS 2.3.1 and SerialEMCCD which we use at the backend causes the frame saved at different orientation from the reference images saved in standard Leginon orientation. An up-down flip is required in general.
99
100
You must change dmsem.py to reflect this:
101
102 2 Anchi Cheng
GMS upgrade to 3.0 is now tested in the field, and confirmed that functions are not affected.
103 1 Anchi Cheng
104
______
105
106
[[How_to_Update_from_v30_(Linux)|< How to Update from v3.0 (Linux) ]] 
107
108
109
______