Index: branches/apertium-tagger/experiments/experiments.py
===================================================================
--- branches/apertium-tagger/experiments/experiments.py	(revision 70330)
+++ branches/apertium-tagger/experiments/experiments.py	(revision 70331)
@@ -68,7 +68,7 @@
 for do_cg in [False, True]:
     for unigram_type in range(1, 4):
         unigram_model = 'unigram' + str(unigram_type)
-        name = ('cg' if do_cg else '') + unigram_model
+        name = ('cg_' if do_cg else '') + unigram_model
 
         @reg
         @group('default')
@@ -89,19 +89,18 @@
                 input=tagger_input, output=xval_fns['test']).check_returncode()
 
 for do_cg in [False, True]:
-    name = ('cg' if do_cg else '') + '1st'
+    name = ('cg_' if do_cg else '') + '1st'
 
     @reg
     @group('default')
+    @xval_experiment
     @exp_name(name)
-    def pick_first_experiment(lab, do_cg=do_cg):
-        first_fn = pjoin(lab.work_dir, 'test.' + name)
+    def pick_first_experiment(lab, xval_fns, do_cg=do_cg):
         if do_cg:
-            tagger_input = cg_proc(lab.cg_fn, input=lab.src_fn)
+            tagger_input = cg_proc(lab.cg_fn, input=xval_fns['src'])
         else:
-            tagger_input = lab.src_fn
-        extract_first_analysis(tagger_input, first_fn)
-        return get_single_analysis(lab, first_fn)
+            tagger_input = xval_fns['src']
+        extract_first_analysis(tagger_input, xval_fns['test'])
 
 for cg_aug in [0, 1, 2, 3, (4, 0), (4, 5), (4, 10), (4, 20), (4, 30)]:
     if isinstance(cg_aug, tuple):