Fixes some minor bug. Refs #4472.

mantidproject · Mar 6, 2012 · 10f1b83 · 10f1b83
1 parent f40bf5d
commit 10f1b83
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/ConvertInstrumentFile.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/ConvertInstrumentFile.py
@@ -145,8 +145,9 @@ def initConstants(self, chopperhertz):
             # ENDIFELSE
 
         else:
-
+            # Cases are not supported
             print "Instrument %s Is Not Setup For CWL, Min/Max d-spacing, and etc"
+            raise NotImplementedError("Chopper frequency %d Hz is not supported" % (chopperhertz))
 
         # ENDIFELSE
 
@@ -191,7 +192,7 @@ def parseFullprofResolutionFile(self, irffilename):
                     terms = line.split("Bank")[1].split()
                     bank = int(terms[0])
                     mdict[bank] = {}
-                    if terms[1] == "CWL" and len(terms) >= 4:
+                    if len(terms) >= 4 and terms[1] == "CWL":
                         # center wave length
                         cwl = float(terms[3].split("A")[0])
                         mdict[bank]["CWL"] = cwl
@@ -534,7 +535,7 @@ def PyExec(self):
             pcrfilename = inputfilename
 
         # 3. Run
-        self.initConstants(60)
+        self.initConstants(self.frequency)
         if useirf is True: 
             self.parseFullprofResolutionFile(irffilename)
         self.convertToGSAS(banks, outputfilename)