Merge remote-tracking branch 'origin/feature/7732_Load_Save_Ascii_Mul…

…tiple_Spectra'
mantidproject · Nov 22, 2013 · bb87983 · bb87983
2 parents a53daa3 + 609ec89
commit bb87983
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/SystemTests/AnalysisTests/LoadLotsOfFiles.py b/SystemTests/AnalysisTests/LoadLotsOfFiles.py
@@ -54,7 +54,8 @@
                  r'SANS2D00000808_.+.txt$',
                  r'.*_reduction.log$',
                  r'.+_characterization_\d+_\d+_\d+.*\.txt',
-                 r'.+_d\d+_\d+_\d+_\d+.cal',
+                 r'.*\.cal',
+                 r'.*\.detcal',
                  r'.*Grouping\.xml',
                  r'.*\.map',
                  r'.*\.irf',
@@ -83,7 +84,7 @@ def useFile(direc, filename):
 
     # list of banned files by regexp
     for regexp in BANNED_REGEXP:
-        if re.match(regexp, filename) is not None:
+        if re.match(regexp, filename, re.I) is not None:
             return (False, filename)
 
     filename = os.path.join(direc, filename)