Skip to content

Commit 1003b0a

Browse files
committed
minor fix for MIDAS importer
1 parent 7c82c11 commit 1003b0a

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

GSASII/GSASIIctrlGUI.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10084,6 +10084,11 @@ def gitSwitch2DevBranch(event):
1008410084
to the develop (eventually to be renamed main) branch.
1008510085
Complication here is that the GSASII.py file gets renamed
1008610086
to G2.py so "shortcuts" need to be re-created to reference that.
10087+
10088+
This is not yet "plumbed" into the current code, but it has been
10089+
tested with Windows and Mac. At some point this will be made part of the
10090+
update process in the master branch, but this routine is not needed in
10091+
the develop (or eventially main) branch.
1008710092
'''
1008810093
G2frame = wx.App.GetMainTopWindow()
1008910094
gitInst = GSASIIpath.HowIsG2Installed()

GSASII/imports/G2pwd_MIDAS.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ def ContentsValidator(self, filename):
5656
'''Test if valid by seeing if the zarr module recognizes the file. Then
5757
get file type (currently Midas only)
5858
'''
59+
fp = None
5960
try:
6061
fp = zarr.open(filename, 'r')
6162
if all([(i in fp) for i in self.midassections]): # are expected MIDAS sections present?

0 commit comments

Comments
 (0)