Changeset 2408 for trunk/imports/G2pwd_BrukerRAW.py

Timestamp:

Aug 4, 2016 1:40:47 PM (6 years ago)

Author:

toby

Message:

error message for Bruker v. 4 Raw file import

File:

• trunk/imports/G2pwd_BrukerRAW.py (modified) (3 diffs)

trunk/imports/G2pwd_BrukerRAW.py

@@ -8 +8 @@
 ########### SVN repository information ###################
 '''
-*Module G2pwd_BrukerRAW: Bruker 3 & 4 .raw data*
-------------------------------------
-
-Routine to read in powder data from a Bruker 3 & 4 .raw file
+*Module G2pwd_BrukerRAW: Bruker v.1-v.3 .raw data*
+---------------------------------------------------
+
+Routine to read in powder data from a Bruker versions 1-3 .raw file
 
 '''
@@ -23 +23 @@
 import GSASIIpath
 GSASIIpath.SetVersionNumber("$Revision: 1620 $")
-class xye_ReaderClass(G2IO.ImportPowderData):
+class raw_ReaderClass(G2IO.ImportPowderData):
     'Routines to import powder data from a binary Bruker .RAW file'
     def __init__(self):
@@ -45 +45 @@
         elif head == 'RAW4.00':
             self.formatName = 'Bruker RAW ver. 4'
+            self.errors += "Sorry, this is a Version 4 Bruker file. "
+            self.errors += "We need documentation for it so that it can be implemented in GSAS-II. "
+            self.errors += "Use PowDLL (http://users.uoi.gr/nkourkou/powdll/) to convert it to ASCII xy."
+            print(self.errors)
+            return False
         else:
             self.errors = 'Unexpected information in header: '