refs #55: MCA key can have numbers, differentiating multiple MCAs in use

prjemian · Jun 10, 2016 · 8c36521 · 8c36521
1 parent 4e6bb02
commit 8c36521
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/spec2nexus/dev_nexus.py b/src/spec2nexus/dev_nexus.py
@@ -18,6 +18,8 @@
 import nexus
 
 args = 'data/02_03_setup.dat  -f --verbose   -s 46'
+args = 'data/33id_spec.dat  -f --verbose   -s 1'
+args = 'data/spectra_example.dat  -f --verbose   -s 1'
 for _ in args.split():
     sys.argv.append(_)
 

diff --git a/src/spec2nexus/plugins/spec_common_spec2nexus.py b/src/spec2nexus/plugins/spec_common_spec2nexus.py
@@ -782,7 +782,7 @@ class SPEC_MCA_Array(ControlLineHandler):
 
     '''
 
-    key = '@A'
+    key = r'@A\d*'
     # continued lines will be matched by SPEC_DataLine
     # process these lines only after all lines have been read