Excellent. I just made a final improvement provided by Juan Rojo (with careful testing by the both of us). 

I checked the Acceptance tests as well. There are 5 failing or have error for me (this is not related to my final fix). It seems to be related to the C++ output and the same MadWeight problem that Valentin & Olivier already fixed before.

Cheers,
Rik


======================================================================
ERROR: test_mw_wjjproduction (tests.acceptance_tests.test_madweight.TestMadWeight)
checking that the weight for p p > w+ jj,w+ > e+ ve is working
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/rikkert/Documents/Physics/aMCatNLO/2.2.0/tests/acceptance_tests/test_madweight.py", line 241, in test_mw_wjjproduction
    data = open(pjoin(MG5DIR, 'TEST_MW_W2J_prod', 'Events', 'fermi', 'weights.out')).read()
IOError: [Errno 2] No such file or directory: '/Users/rikkert/Documents/Physics/aMCatNLO/2.2.0/TEST_MW_W2J_prod/Events/fermi/weights.out'

======================================================================
ERROR: test_mw_wproduction (tests.acceptance_tests.test_madweight.TestMadWeight)
checking that the weight for p p > w+ > e+ ve is working
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/rikkert/Documents/Physics/aMCatNLO/2.2.0/tests/acceptance_tests/test_madweight.py", line 181, in test_mw_wproduction
    data = open(pjoin(MG5DIR, 'TEST_MW_W_prod', 'Events', 'fermi', 'weights.out')).read()
IOError: [Errno 2] No such file or directory: '/Users/rikkert/Documents/Physics/aMCatNLO/2.2.0/TEST_MW_W_prod/Events/fermi/weights.out'

======================================================================
FAIL: test_standalone_cpp (tests.acceptance_tests.test_cmd.TestCmdShell2)
test that standalone cpp is working
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/rikkert/Documents/Physics/aMCatNLO/2.2.0/tests/acceptance_tests/test_cmd.py", line 562, in test_standalone_cpp
    self.assertTrue(me_groups)
AssertionError: None is not true

======================================================================
FAIL: test_standalone_cpp_output (tests.acceptance_tests.test_cmd.TestCmdShell2)
Test the C++ standalone output
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/rikkert/Documents/Physics/aMCatNLO/2.2.0/tests/acceptance_tests/test_cmd.py", line 1485, in test_standalone_cpp_output
    self.assertTrue(me_groups)
AssertionError: None is not true

======================================================================
FAIL: test_standalone_cpp_output_consistency (tests.acceptance_tests.test_cmd.TestCmdShell2)
test that standalone cpp is working
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/rikkert/Documents/Physics/aMCatNLO/2.2.0/tests/acceptance_tests/test_cmd.py", line 600, in test_standalone_cpp_output_consistency
    original = get_values()
  File "/Users/rikkert/Documents/Physics/aMCatNLO/2.2.0/tests/acceptance_tests/test_cmd.py", line 597, in get_values
    self.assertTrue(me_groups)
AssertionError: None is not true

----------------------------------------------------------------------
Ran 57 tests in 1406.227s

FAILED (failures=3, errors=2)