Changeset 2811

Timestamp:

Apr 26, 2017 5:10:44 PM (7 years ago)

Author:

vondreele

Message:

fix bug in Bruker powder data importer.

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• imports/G2pwd_BrukerRAW.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -550 +550 @@
                 a,b = G2lat.cell2AB(self.newCell[:6])
                 self.Trans = np.inner(a.T,B)    #correct!
+                self.ifConstr = False
                 self.newSpGrp = 'P 1'
                 SGErr,SGData = G2spc.SpcGroup(self.newSpGrp)
                 self.Phase['General']['SGData'] = SGData
             else:
-                if self.Common == commonNames[-1]:
+                if self.Common == commonNames[-1]:      #change setting
                     self.Vec = G2spc.spg2origins[self.oldSpGrp]
                     self.newSpGrp = self.oldSpGrp

trunk/imports/G2pwd_BrukerRAW.py

@@ -128 +128 @@
                 for iBlock in range(blockNum):
                     headLen = int(st.unpack('<i',File.read(4))[0])
-#                    if nBlock > 1:
-#                        headLen += 40
                     nSteps = int(st.unpack('<i',File.read(4))[0])
                     if not nSteps: break
+                    if nBlock > 1:
+                        File.seek(pos+256)
+                        headLen += st.unpack('<i',File.read(4))[0]
                     if iBlock+1 == blockNum:
+                        File.seek(pos+8)
                         st.unpack('<d',File.read(8))[0]
                         start2Th = st.unpack('<d',File.read(8))[0]