Skip to content

Commit 07cd4e6

Browse files
committed
Merge branch 'stable_to_merge' into 'master'
session export more compatible to relion See merge request nextpyp/pyp!47
2 parents 7b34366 + 030fad7 commit 07cd4e6

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/pyp/inout/metadata/pyp_metadata.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ def weak_meta2Star(self, imagelist, filename, input_dir, coords=True, version="3
15291529
_rlnVoltage #5
15301530
_rlnImagePixelSize #6
15311531
_rlnMicrographOriginalPixelSize #7
1532-
1532+
_rlnImageSize #8
15331533
"""
15341534
if coords:
15351535
data_particles_header = """
@@ -1544,12 +1544,11 @@ def weak_meta2Star(self, imagelist, filename, input_dir, coords=True, version="3
15441544
_rlnDefocusV #6
15451545
_rlnDefocusAngle #7
15461546
_rlnCtfFigureOfMerit #8
1547-
_rlnCtfMaxResolution $9
1547+
_rlnCtfMaxResolution #9
15481548
_rlnPhaseShift #10
15491549
_rlnOpticsGroup #11
15501550
_rlnGroupNumber #12
1551-
_rlnRandomSubset #13
1552-
"""
1551+
_rlnRandomSubset #13 """
15531552
else:
15541553
data_particles_header = """
15551554
data_particles
@@ -1560,8 +1559,7 @@ def weak_meta2Star(self, imagelist, filename, input_dir, coords=True, version="3
15601559
_rlnDefocusV #3
15611560
_rlnDefocusAngle #4
15621561
_rlnCtfFigureOfMerit #5
1563-
_rlnCtfMaxResolution $6
1564-
"""
1562+
_rlnCtfMaxResolution $6 """
15651563

15661564
ac = self.scope_data["AC"].values[0]
15671565
cs = self.scope_data["CS"].values[0]
@@ -1574,7 +1572,7 @@ def weak_meta2Star(self, imagelist, filename, input_dir, coords=True, version="3
15741572
image_original_pxl = self.micrograph_global["image_pixel_size"].values[0]
15751573

15761574
data_optics = version + optics_header
1577-
data_optics_value = f"\n{optics_group} {optics_groupname} {ac} {cs} {voltage} {ptl_pxl} {image_original_pxl} \n\n"
1575+
data_optics_value = f"\n{optics_group} {optics_groupname} {ac} {cs} {voltage} {ptl_pxl} {image_original_pxl} 64 \n\n"
15781576
data_optics_str = data_optics + data_optics_value
15791577

15801578
# shifts = - (self.refinement[["SHX", "SHY"]].astype(int))

0 commit comments

Comments
 (0)