Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
b2129805dc | |||
92765b5665 |
@ -5,4 +5,4 @@ from pyzebra.h5 import *
|
|||||||
from pyzebra.utils import *
|
from pyzebra.utils import *
|
||||||
from pyzebra.xtal import *
|
from pyzebra.xtal import *
|
||||||
|
|
||||||
__version__ = "0.6.1"
|
__version__ = "0.6.2"
|
||||||
|
@ -131,7 +131,7 @@ def merge_scans(scan_into, scan_from):
|
|||||||
|
|
||||||
scan_into[scan_motor] = pos_tmp
|
scan_into[scan_motor] = pos_tmp
|
||||||
scan_into["counts"] = val_tmp / num_tmp
|
scan_into["counts"] = val_tmp / num_tmp
|
||||||
scan_into["counts_err"] = np.sqrt(err_tmp)
|
scan_into["counts_err"] = np.sqrt(err_tmp) / num_tmp
|
||||||
|
|
||||||
scan_from["export"] = False
|
scan_from["export"] = False
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user