Skip to content

Commit 97101c8

Browse files
authored
MaxIV NeXus importer (#257)
Get work on new importer out. This is what was done to get to this point: * start work on NeXus/HDF5 importer for MAX IV * first working HDF5-MAXIV importer * rework HDF5 importers for MaxIV * Got NXazint1d reader done * save a working snapshot, prior to cleanup * clean up and test against files * typo The importer may get some more review, but should be useful in its current form.
1 parent c63c871 commit 97101c8

File tree

5 files changed

+582
-1
lines changed

5 files changed

+582
-1
lines changed

GSASII/GSASIIdataGUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,7 @@ def GetDefaultParms(self,rd):
16181618
else:
16191619
rd.instmsg = 'default: '+dI.defaultIparm_lbl[res]
16201620
inst1,inst2 = self.ReadPowderInstprm(dI.defaultIparms[res],bank,rd)
1621-
if rd.instdict.get('wave'):
1621+
if rd.instdict.get('wave') and 'Lam' in inst1:
16221622
inst1['Lam'][0] = rd.instdict.get('wave')
16231623
inst1['Lam'][1] = rd.instdict.get('wave')
16241624
return [inst1,inst2]

GSASII/GSASIIobj.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,6 +1433,8 @@ def ReInitialize(self):
14331433
self.instdict = {} # place items here that will be transferred to the instrument parameters
14341434
self.pwdparms = {} # place parameters that are transferred directly to the tree
14351435
# here (typically from an existing GPX file)
1436+
self.selections = []
1437+
self.dnames = []
14361438
######################################################################
14371439
class ImportSmallAngleData(ImportBaseclass):
14381440
'''Defines a base class for the reading of files with small angle data.

0 commit comments

Comments
 (0)