Allow passing a detector name to extra-data-make-virtual-cxi

extra_data/cli/make_virtual_cxi.py

@@ -61,6 +61,11 @@ def main(argv=None):
              ' incorrect train IDs in the data, but may mean less data is'
              ' available.'
     )
+    ap.add_argument(
+        '--detector-name', default=None,
+        help='Name of the detector to make a VDS for. This can be omitted if'
+             ' only one multi-module detector is being used.'
+    )
     args = ap.parse_args(argv)
     out_file = args.output
     fill_values = None
@@ -100,7 +105,7 @@ def main(argv=None):
     inc_suspect = not args.exc_suspect_trains
     run = RunDirectory(run_dir, inc_suspect_trains=inc_suspect)
 
-    _, det_class = identify_multimod_detectors(run, single=True)
+    _, det_class = identify_multimod_detectors(run, detector_name=args.detector_name, single=True)
 
     n_modules = det_class.n_modules
     kwargs = {}

extra_data/components.py

@@ -2013,7 +2013,10 @@ def identify_multimod_detectors(
     res = set()
     for cls in clses:
         for name in cls._find_detector_names(data):
-            res.add((name, cls))
+            if (detector_name is None
+                or detector_name in name
+            ):
+                res.add((name, cls))
 
     if single:
         if len(res) < 1:

extra_data/tests/cli/test_make_virtual_cxi.py

@@ -23,3 +23,9 @@ def test_make_virtual_cxi_jungfrau(mock_jungfrau_run, tmpdir):
     output = osp.join(str(tmpdir), 'test.cxi')
     main([mock_jungfrau_run, '-o', output])
     assert_isfile(output)
+
+    os.remove(output)
+
+    # Test passing an explicit detector name
+    main([mock_jungfrau_run, '-o', output, '--detector-name', 'SPB_IRDA_JF4M'])
+    assert_isfile(output)