Merge lp:~maddevelopers/mg5amcnlo/2.3.3_scan_options into lp:~maddevelopers/mg5amcnlo/2.3.3

[Olivier Mattelaer]

Allow a simple syntax in order to perform a scan on parameter.

just edit the param_card and enter (instead of a value) scan:[100, 150,200]
for example:

BLOCK MASS #
      5 4.700000e+00 # mb
      6 scan:[170,175,180] # mt
      15 1.777000e+00 # mta
      23 9.118800e+01 # mz
      25 scan: [130,125,120] # mh

This performs a 2D scan.

you can also correlates range by replacing scan by scanX
for example:

BLOCK MASS #
      5 4.700000e+00 # mb
      6 scan1:[170,175,180] # mt
      15 1.777000e+00 # mta
      23 9.118800e+01 # mz
      25 scan1: [130,125,120] # mh
performs a 1D scan.

This functionaline works with
1) generate_events @LO
2) multi_run @LO
3) launch @NLO
4) the reweighting_card
Do you see some other place where I should implement it?
- I do not think that MS should have to support it (since the card will be replace before the call to MS)

At the end of the run a text file is written in Events with multi-colum
to have an easy access of which run is which entry in the various run launched.
(that file also report the cross-section)

For the functionality details:
1) the cards is overwritten by an "standard" card before doing the run.
and all the madspin/pythia/fortran only see a standard param_card.
2) Contrary to the MadWidth, the value of the param_card are restored at the end of the scan.
(so you get back the card with the scan flag.)
3) This is compatible with the use of Auto in the cards

[lp:~maddevelopers/mg5amcnlo/2.3.3_scan_options]

286. By Olivier Mattelaer on 2015-09-19

allow scan syntax in the reweight_card

[marco zaro (marco-zaro)]

Hi Olivier,
very nice idea!
I am trying to do some stupid things to check how it goes and if I am warned.
So I tried ttbar at LO (madevent) and used the set command to change one parameter.

Below you see what works and what does not, and the errors that come in each case.

Cheers,

Marco

set MT scan:[170,171,172] # works ok
set MT scan: [170,171,172] # works ok
set MT scan : [170,171,172] # does not work (1)
set MT scan :[170,171,172] # does not work (1)
set MT scan: [170, 171 , 172] # does not work (2)
set MT scan1:[170,171,172] # does not work (3)

(1) the following error is given
Command "generate_events run_04" interrupted with error:
IndexError : list index out of range
Please report this bug on https://bugs.launchpad.net/madgraph5
More information is found in '/Users/marcozaro/Physics/MadGraph/2.3.3_scan_options/PROC_sm_0/run_04_tag_1_debug.log'.
Please attach this file to your report.

Note that it would be advisable either to use a syntax non-space sensitive and/or to warn the user he is doing something wrong, something like what happens if i do
set MT pippo
WARNING: Invalid input: Expected number and not 'pippo'

(2) it runs but seems not to recognize the setting of the parameter
write compile file for card: /Users/marcozaro/Physics/MadGraph/2.3.3_scan_options/PROC_sm_0/Cards/param_card.dat
WARNING: information about "mass [6]" is missing using default value: 173.0.

(3) WARNING: invalid set command param_card mass 6 scan1:[170,171,172]

review: Needs Fixing

[Olivier Mattelaer (olivier-mattelaer)]

Thanks Marco,

Thanks a lot for this review and to have found those bad feature/bug.

> Below you see what works and what does not, and the errors that come in each case.

> set MT scan : [170,171,172] # does not work (1)
> set MT scan :[170,171,172] # does not work (1)

Ok this is not really a bug but yes this is a good point.
I updated the regular expression to allow for spaces before the “:”

> set MT scan: [170, 171 , 172] # does not work (2)

That’s a real bug, that is really tricky and happens only if you put space before and after a number —thanks to have done it, I’m never doing that—.
The problem was that line was converted (correctly) to
set mass 6 scan: [170, 171 , 172]
and written in the param_card correctly as
6 scan: [170, 171 , 172]
but the python parser recognise that entry for the mass of (6, 171) instead of the mass of (6,)
which makes everything to go wrong.

> set MT scan1:[170,171,172] # does not work (3)

This one I’m not sure what the problem was. It is running fine.
My guess is that the previous crash (2) was preventing that command to run correctly.

> Note that it would be advisable either to use a syntax non-space sensitive and/or to warn the user he is doing something wrong, something like what happens if i do

> set MT pippo
> WARNING: Invalid input: Expected number and not ‘pippo'

Here the test are really weak. Basically as soon as “scan” is written, no test are applied on the rest of the string.
The problem is that you can type stuff like
scan:[a**2+b**2 for a in [100,150,200] for b in [110, 150, 190]]
or
scan: [100, 200] + range(10, 30, 5) + [10**i for i in range(5)]
or
scan:xrange(100, 200, 25)

So parsing all the possible entry is basically impossible.
Also I expect that people (=mainly us) might one to play with this to get contour plot/Markov chain over parameter/…
This is not supported now, but should be possible in the current framework with minimal change, so I do not want to have a rigid parsing here.

Thanks again,

Olivier

PS: At the same time, I have use this revision to make my code a bit nicer.
and to order the output file with all the cross-section.

On 22 Sep 2015, at 13:42, marco zaro <email address hidden> wrote:

> Review: Needs Fixing
>
> Hi Olivier,
> very nice idea!
> I am trying to do some stupid things to check how it goes and if I am warned.
> So I tried ttbar at LO (madevent) and used the set command to change one parameter.
>
> Below you see what works and what does not, and the errors that come in each case.
>
> Cheers,
>
> Marco
>
> set MT scan:[170,171,172] # works ok
> set MT scan: [170,171,172] # works ok
> set MT scan : [170,171,172] # does not work (1)
> set MT scan :[170,171,172] # does not work (1)
> set MT scan: [170, 171 , 172] # does not work (2)
> set MT scan1:[170,171,172] # does not work (3)
>
> (1) the following error is given
> Command "generate_events run_04" interrupted with error:
> IndexError : list index out of range
> Please report this bug on https://bugs.launchpad.net/madgraph5
> More information is found in '/Users/marcozaro/Physics/MadGraph/2.3.3_scan_options/PROC_sm_0/run_04_tag_1_debug.log'.
> Please attach this file to your report.
>
> Note th...

[lp:~maddevelopers/mg5amcnlo/2.3.3_scan_options]

287. By Olivier Mattelaer on 2015-09-22

1. allow space before the : in the scan: syntax.
2. add security to avoid that scan can be used via the web.
3. fix the support of shell for aMC@NLO.
4. slight improve of the code for the iterator on the cards.

[marco zaro (marco-zaro)]

Ciao Olivier,
thanks for fixing these bugs
Another small issue is that if instead of scan1 or scan i write scan + a letter (e.g. scanX) an error is not raised...
Once fixed this I will try to have a look at the code.
Cheers,

Marco

review: Needs Fixing

[Olivier Mattelaer (olivier-mattelaer)]

Hi Marco,

> Another small issue is that if instead of scan1 or scan i write scan + a letter (e.g. scanX) an error is not raised…

Ok I have put check that the syntax is correct when using the “set” command.
and put clear Error if the file was edited by hand with invalid syntax.

Thanks,

Olivier

On 24 Sep 2015, at 08:56, marco zaro <email address hidden> wrote:

> Review: Needs Fixing
>
> Ciao Olivier,
> thanks for fixing these bugs
> Another small issue is that if instead of scan1 or scan i write scan + a letter (e.g. scanX) an error is not raised...
> Once fixed this I will try to have a look at the code.
> Cheers,
>
> Marco
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.3.3_scan_options/+merge/271726
> Your team MadDevelopers is subscribed to branch lp:~maddevelopers/mg5amcnlo/2.3.3.

[lp:~maddevelopers/mg5amcnlo/2.3.3_scan_options]

288. By Olivier Mattelaer on 2015-09-24

nice handling of wrong syntax

[Valentin Hirschi (valentin-hirschi)]

I tried the following:

generate p p > e+ ve [QCD]
output
launch
fixed_order=ON
set aem1 scan1:[100, 200, 300]
set mz scan1:[103, 203, 303]
set ww auto

And it ran fine however, *only the first of the three* runs was in fixed order. The next two were using the default NLO run settings with HERWIG shower.

The file 'scan_run_03.txt' is correctly written with the relevant information. However I'd suggest to call it 'scan_run_01-03.txt' instead. Also, if columns could be aligned it would be nice (just change:
ff.write("%s %s %s \n" % (name,' '.join(bench) ,cross))
to
ff.write("%-30s %-30s %-30s \n" % (name,' '.join(bench) ,cross)).

Also, if one interrupts the run, one loses the original card (i.e. you only have the one with replaced value). Maybe this is really impossible to fix. But maybe we could save the original card in a file <card>.MG5_bkup and erase it whenever the runs complete. So if the user interrupts it and restarts, then we could restore the backedup card (if only the 'scan' items differ).
This shouldn't be difficult to implement but maybe not worth it. Your call.

I tried a reweight "scan" run which went surprisingly smoothly (it starts to be quite amazing the amount of "logisitics" going on... the screen gets pretty full quickly).
I even tried a 'scan-ception' (i.e. a reweight scan within a param scan, and with the same scanID in the param and reweight card, and it still went like a charm).

By the way, please remove the following debug statement:
reweight_interface.py at line 393

Notice that the "not-so-relevant" syntax: 'set ww scan:[100.0,200.0,auto]' is not working.
Maybe not worth fixing, depending on how much work it is (i.e. if > 3 min, then no :)).

---------------------------------------------------
Regarding the code (I had a superficial look only):

Isn't there any easier way than 'not hasattr(self, 'do_shell')' to know if you are in WebMode or not? Isn't it possible to scan the bases of 'self' and see if you encounter the class WebInterface in its mothers?

The ParamCardIterator is really neat. If one really wanted to be picky about it though, the dictionary 'all_iterators' should be initialized in '__init__' (and not in the function iterate) and then synchronized for possible modifications in an overloaded version of the setter. In this way you avoid parsing the param_card twice if you run iterate twice (which never happens ^^).
Anyway, this comment was just to 'prove' that I read the code; this refinement is really unnecessary in this context.

So in conclusion, the only important fix is that the NLO scan always use same running mode. The rest is optional, so I accept the merge.

[Valentin Hirschi (valentin-hirschi)]

review: Approve

[Olivier Mattelaer (olivier-mattelaer)]

> And it ran fine however, *only the first of the three* runs was in fixed order. The next two were using the default NLO run settings with HERWIG shower.

Ok Fixed.

> The file 'scan_run_03.txt' is correctly written with the relevant information. However I'd suggest to call it 'scan_run_01-03.txt' instead.

This was boring to do. But ok this is done:
INFO: write all cross-section results in /Users/omatt/Documents/eclipse/2.3.3_scan/PROCNLO_loop_sm_1/Events/scan_run_[13-14]_LO.txt

> Also, if columns could be aligned it would be nice (just change:
ff.write("%s %s %s \n" % (name,' '.join(bench) ,cross))
to
ff.write("%-30s %-30s %-30s \n" % (name,' '.join(bench) ,cross)).

Ok, I put -20 which should be enough.

> Also, if one interrupts the run, one loses the original card (i.e. you only have the one with replaced value). Maybe this is really impossible to fix. But maybe we could save the original card in a file <card>.MG5_bkup and erase it whenever the runs complete. So if the user interrupts it and restarts, then we could restore the backedup card (if only the 'scan' items differ).
This shouldn't be difficult to implement but maybe not worth it. Your call.

I see the point but ... no

> By the way, please remove the following debug statement:
reweight_interface.py at line 393

Thanks.

> Notice that the "not-so-relevant" syntax: 'set ww scan:[100.0,200.0,auto]' is not working.
Maybe not worth fixing, depending on how much work it is (i.e. if > 3 min, then no :)).

actually the scans on the width where bugged (since the width syntax is different than the other values). So i have fixed it, and allow for auto without "''".

> Isn't there any easier way than 'not hasattr(self, 'do_shell')' to know if you are in WebMode or not? Isn't it possible to scan the bases of 'self' and see if you encounter the class WebInterface in its mothers?

you are right, I can replace those by:
isinstance(self.mother, cmd.CmdShell)

>In this way you avoid parsing the param_card twice if you run iterate twice (which never happens ^^).

Actually my implementation do not allow to iterate twice on the same object.
You are force to recreate the object in order to do that. The point is that I want to have the first value out of the for loop and then continue with a for loop.

> So in conclusion, the only important fix is that the NLO scan always use same running mode. The rest is optional, so I accept the merge.

Thanks to you.

Olivier

[lp:~maddevelopers/mg5amcnlo/2.3.3_scan_options]

289. By Olivier Mattelaer on 2015-09-29

make the fix associate to Valentin review

[marco zaro (marco-zaro)]

Hi Olivier,
ok, after the fixes I approve the merge.
Thanks!

Marco

review: Approve

[lp:~maddevelopers/mg5amcnlo/2.3.3_scan_options]

290. By Olivier Mattelaer on 2015-10-11

merge with 2.3.3

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2015-10-05 14:14:43 +0000
+++ UpdateNotes.txt	2015-10-11 19:59:55 +0000
@@ -1,6 +1,8 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
 2.3.3(XX/XX/XX)
+        OM: Allow new syntax for the param_card: instead of an entry you can enter scan:[val1, val2,...]
+            To perform a scan on this parameter.
         OM: Having two mode for "output pythia8" one (default) for pythia8.2 and one for pythia8.1 (with --version=8.1)
 	RF: Rewriting of job-control for NLO processes. Better accuracy estimates for FO processes
 	RF: Fix for factorisation scale setting in FxFx merging when very large difference in scale in the

=== modified file 'VERSION'
--- VERSION	2015-08-20 13:49:51 +0000
+++ VERSION	2015-10-11 19:59:55 +0000
@@ -1,4 +1,4 @@
-version = 2.3.2
+version = 2.3.3_with_scan
 date = 2015-08-20
 
 

=== modified file 'madgraph/interface/amcatnlo_interface.py'
--- madgraph/interface/amcatnlo_interface.py	2015-10-01 16:00:08 +0000
+++ madgraph/interface/amcatnlo_interface.py	2015-10-11 19:59:55 +0000
@@ -30,6 +30,7 @@
 import madgraph.interface.extended_cmd as cmd
 import madgraph.interface.madgraph_interface as mg_interface
 import madgraph.interface.madevent_interface as me_interface
+import madgraph.interface.extended_cmd as extended_cmd
 import madgraph.interface.amcatnlo_run_interface as run_interface
 import madgraph.interface.launch_ext_program as launch_ext
 import madgraph.interface.loop_interface as Loop_interface
@@ -624,7 +625,7 @@
 #            self.options['automatic_html_opening'] = False
 
         if options['interactive']:
-            if hasattr(self, 'do_shell'):
+            if isinstance(self, extended_cmd.CmdShell):
                 ME = run_interface.aMCatNLOCmdShell(me_dir=argss[0], options=self.options)
             else:
                 ME = run_interface.aMCatNLOCmd(me_dir=argss[0],options=self.options)
@@ -636,7 +637,9 @@
             stop = self.define_child_cmd_interface(ME)                
             return stop
 
-        ext_program = launch_ext.aMCatNLOLauncher(argss[0], self, run_mode=argss[1], **options)
+        ext_program = launch_ext.aMCatNLOLauncher(argss[0], self, run_mode=argss[1],
+                                                  shell = isinstance(self, extended_cmd.CmdShell),
+                                                  **options)
         ext_program.run()
         
                     

=== modified file 'madgraph/interface/amcatnlo_run_interface.py'
--- madgraph/interface/amcatnlo_run_interface.py	2015-10-08 11:31:22 +0000
+++ madgraph/interface/amcatnlo_run_interface.py	2015-10-11 19:59:55 +0000
@@ -1155,7 +1155,7 @@
         functions, such as generate_events or calculate_xsect
         mode gives the list of switch needed for the computation (usefull for banner_run)
         """
-        
+
         if not argss and not options:
             self.start_time = time.time()
             argss = self.split_arg(line)
@@ -1164,6 +1164,7 @@
             options = options.__dict__
             self.check_launch(argss, options)
 
+        
         if 'run_name' in options.keys() and options['run_name']:
             self.run_name = options['run_name']
             # if a dir with the given run_name already exists
@@ -1183,6 +1184,7 @@
         
         if not switch:
             mode = argss[0]
+
             if mode in ['LO', 'NLO']:
                 options['parton'] = True
             mode = self.ask_run_configuration(mode, options)
@@ -1229,7 +1231,33 @@
 Please read http://amcatnlo.cern.ch/FxFx_merging.htm for more details.""")
 
 
-
+        #check if the param_card defines a scan.
+        if self.param_card_iterator:
+            param_card_iterator = self.param_card_iterator
+            self.param_card_iterator = [] #avoid to next generate go trough here
+            param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
+            orig_name = self.run_name
+            #go trough the scal
+            for i,card in enumerate(param_card_iterator):
+                card.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+                if not options['force']:
+                    options['force'] = True
+                if options['run_name']:
+                    options['run_name'] = '%s_%s' % (orig_name, i+1)
+                if not argss:
+                    argss = [mode, "-f"]
+                elif argss[0] == "auto":
+                    argss[0] = mode
+                self.do_launch("", options=options, argss=argss, switch=switch)
+                #self.exec_cmd("launch -f ",precmd=True, postcmd=True,errorhandling=False)
+                param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
+            #restore original param_card
+            param_card_iterator.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+            name = misc.get_scan_name(orig_name, self.run_name)
+            path = pjoin(self.me_dir, 'Events','scan_%s.txt' % name)
+            logger.info("write all cross-section results in %s" % path, '$MG:color:BLACK')
+            param_card_iterator.write_summary(path)
+            
     ############################################################################      
     def do_compile(self, line):
         """Advanced commands: just compile the executables """
@@ -4230,7 +4258,6 @@
             switch = switch_default
         else:
             switch.update(dict((k,value) for k,v in switch_default.items() if k not in switch))
-
         default_switch = ['ON', 'OFF']
         allowed_switch_value = {'order': ['LO', 'NLO'],
                                 'fixed_order': default_switch,
@@ -4329,7 +4356,7 @@
             elif answer in ['0', 'auto', 'done']:
                 return 
             elif answer in special_values:
-                logger.info('Enter mode value: Go to the related mode', '$MG:color:BLACK')
+                logger.info('Enter mode value: %s. Go to the related mode' % answer, '$MG:color:BLACK')
                 #assign_switch('reweight', 'OFF')
                 #assign_switch('madspin', 'OFF')
                 if answer == 'LO':

=== modified file 'madgraph/interface/common_run_interface.py'
--- madgraph/interface/common_run_interface.py	2015-10-01 16:00:08 +0000
+++ madgraph/interface/common_run_interface.py	2015-10-11 19:59:55 +0000
@@ -527,6 +527,8 @@
 
         self.me_dir = me_dir
         self.options = options
+        
+        self.param_card_iterator = [] #an placeholder containing a generator of paramcard for scanning
 
         # usefull shortcut
         self.status = pjoin(self.me_dir, 'status')
@@ -1594,12 +1596,29 @@
 
 
     def check_param_card(self, path, run=True):
-        """Check that all the width are define in the param_card.
-        If some width are set on 'Auto', call the computation tools."""
+        """
+        1) Check that no scan parameter are present
+        2) Check that all the width are define in the param_card.
+        - If a scan parameter is define. create the iterator and recall this fonction 
+          on the first element.
+        - If some width are set on 'Auto', call the computation tools."""
         
-        pattern = re.compile(r'''decay\s+(\+?\-?\d+)\s+auto(@NLO|)''',re.I)
+        pattern_scan = re.compile(r'''^(decay)?[\s\d]*scan''', re.I+re.M)  
+        pattern_width = re.compile(r'''decay\s+(\+?\-?\d+)\s+auto(@NLO|)''',re.I)
         text = open(path).read()
-        pdg_info = pattern.findall(text)
+               
+        if pattern_scan.search(text):
+            if not isinstance(self, cmd.CmdShell):
+                # we are in web mode => forbid scan due to security risk
+                raise Exception, "Scan are not allowed in web mode"
+            # at least one scan parameter found. create an iterator to go trough the cards
+            main_card = check_param_card.ParamCardIterator(text)
+            self.param_card_iterator = main_card
+            first_card = main_card.next(autostart=True)
+            first_card.write(path)
+            return self.check_param_card(path, run)
+        
+        pdg_info = pattern_width.findall(text)
         if pdg_info:
             if run:
                 logger.info('Computing the width set on auto in the param_card.dat')
@@ -2622,6 +2641,7 @@
         """ edit the value of one parameter in the card"""
         
         args = self.split_arg(line)
+        # fix some formatting problem
         if '=' in args[-1]:
             arg1, arg2 = args.pop(-1).split('=')
             args += [arg1, arg2]
@@ -2795,6 +2815,11 @@
         ### PARAM_CARD WITH BLOCK NAME -----------------------------------------
         elif (args[start] in self.param_card or args[start] == 'width') \
                                                   and card in ['','param_card']:
+            #special treatment for scan
+            if any(t.startswith('scan') for t in args):
+                index = [i for i,t in enumerate(args) if t.startswith('scan')][0]
+                args = args[:index] + [' '.join(args[index:])]
+                
             if args[start] in self.conflict and card == '':
                 text  = 'ambiguous name (present in more than one card). Please specify which card to edit'
                 text += ' in the format < set card parameter value>'
@@ -2838,7 +2863,7 @@
                     text += "You need to match this expression for external program (such pythia)."
                     logger.warning(text)
 
-                if args[-1].lower() in ['default', 'auto', 'auto@nlo']:
+                if args[-1].lower() in ['default', 'auto', 'auto@nlo'] or args[-1].startswith('scan'):
                     self.setP(args[start], key, args[-1])
                 else:
                     try:
@@ -3029,6 +3054,18 @@
                 if block != 'decay':
                     logger.warning('Invalid input: \'Auto\' value only valid for DECAY')
                     return
+            elif value.startswith('scan'):
+                if ':' not in value:
+                    logger.warning('Invalid input: \'scan\' mode requires a \':\' before the definition.')
+                    return
+                tag = value.split(':')[0]
+                tag = tag[4:].strip()
+                if tag and not tag.isdigit():
+                    logger.warning('Invalid input: scan tag need to be integer and not "%s"' % tag)
+                    return
+                
+                
+                pass
             else:
                 try:
                     value = float(value)

=== modified file 'madgraph/interface/launch_ext_program.py'
--- madgraph/interface/launch_ext_program.py	2015-10-01 16:00:08 +0000
+++ madgraph/interface/launch_ext_program.py	2015-10-11 19:59:55 +0000
@@ -481,7 +481,7 @@
         assert hasattr(self, 'cluster')
         assert hasattr(self, 'multicore')
         assert hasattr(self, 'name')
-#        assert hasattr(self, 'shell')
+        assert hasattr(self, 'shell')
 
         self.unit = unit
         self.run_mode = run_mode
@@ -519,7 +519,8 @@
                 nb_node=max_node
                 
         import madgraph.interface.amcatnlo_run_interface as run_int
-        if hasattr(self, 'shell'):
+        
+        if hasattr(self, 'shell') and self.shell:
             usecmd = run_int.aMCatNLOCmdShell(me_dir=self.running_dir, options = self.cmd_int.options)
         else:
             usecmd = run_int.aMCatNLOCmd(me_dir=self.running_dir, options = self.cmd_int.options)
@@ -542,7 +543,7 @@
                      usecmd, interface=False)
         #launch.me_dir = self.running_dir
         option_line = ' '.join([' --%s' % opt for opt in self.options.keys() \
-                if self.options[opt] and not opt in ['cluster', 'multicore', 'name', 'appl_start_grid']])
+                if self.options[opt] and not opt in ['cluster', 'multicore', 'name', 'appl_start_grid','shell']])
         if self.options['name']:
             option_line += ' --name %s' %  self.options['name']
         if 'appl_start_grid' in self.options and  self.options['appl_start_grid']:

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2015-10-09 10:39:28 +0000
+++ madgraph/interface/madevent_interface.py	2015-10-11 19:59:55 +0000
@@ -2026,6 +2026,22 @@
             self.exec_cmd('pythia --no_default', postcmd=False, printcmd=False)
             # pythia launches pgs/delphes if needed    
             self.store_result()
+            
+            if self.param_card_iterator:
+                param_card_iterator = self.param_card_iterator
+                self.param_card_iterator = []
+                param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
+                #check if the param_card defines a scan.
+                orig_name = self.run_name
+                for card in param_card_iterator:
+                    card.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+                    self.exec_cmd("generate_events -f ",precmd=True, postcmd=True,errorhandling=False)
+                    param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
+                param_card_iterator.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+                name = misc.get_scan_name(orig_name, self.run_name)
+                path = pjoin(self.me_dir, 'Events','scan_%s.txt' % name)
+                logger.info("write all cross-section results in %s" % path ,'$MG:color:BLACK')
+                param_card_iterator.write_summary(path)
     
     def do_initMadLoop(self,line):
         """Compile and run MadLoop for a certain number of PS point so as to 
@@ -2322,9 +2338,11 @@
         self.ask_run_configuration(mode)
         main_name = self.run_name
 
-
-        
-        
+        # check if the param_card requires a scan over parameter.
+        path=pjoin(self.me_dir, 'Cards', 'param_card.dat')
+        self.check_param_card(path, run=False)
+        #store it locally to avoid relaunch
+        param_card_iterator, self.param_card_iterator = self.param_card_iterator, []
         
         crossoversig = 0
         inv_sq_err = 0
@@ -2373,6 +2391,21 @@
         self.update_status('', level='parton')
         self.print_results_in_shell(self.results.current)   
         
+        if param_card_iterator:
+
+            param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
+            #check if the param_card defines a scan.
+            orig_name=self.run_name
+            for card in param_card_iterator:
+                card.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+                self.exec_cmd("multi_run %s -f " % nb_run ,precmd=True, postcmd=True,errorhandling=False)
+                param_card_iterator.store_entry(self.run_name, self.results.current['cross'])
+            param_card_iterator.write(pjoin(self.me_dir,'Cards','param_card.dat'))
+            scan_name = misc.get_scan_name(orig_name, self.run_name)
+            path = pjoin(self.me_dir, 'Events','scan_%s.txt' % scan_name)
+            logger.info("write all cross-section results in %s" % path, '$MG:color:BLACK')
+            param_card_iterator.write_summary(path)
+    
 
     ############################################################################      
     def do_treatcards(self, line, mode=None, opt=None):

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2015-10-01 16:00:08 +0000
+++ madgraph/interface/madgraph_interface.py	2015-10-11 19:59:55 +0000
@@ -5383,7 +5383,8 @@
                                                 options=self.options, **options)
         elif args[0] == 'madevent':
             if options['interactive']:
-                if hasattr(self, 'do_shell'):
+                
+                if isinstance(self, cmd.CmdShell):
                     ME = madevent_interface.MadEventCmdShell(me_dir=args[1], options=self.options)
                 else:
                     ME = madevent_interface.MadEventCmd(me_dir=args[1],options=self.options)
@@ -5403,12 +5404,12 @@
 
             if len(generate_info.split('>')[0].strip().split())>1:
                 ext_program = launch_ext.MELauncher(args[1], self,
-                                shell = hasattr(self, 'do_shell'),
+                                shell = isinstance(self, cmd.CmdShell),
                                 options=self.options,**options)
             else:
                 # This is a width computation
                 ext_program = launch_ext.MELauncher(args[1], self, unit='GeV',
-                                shell = hasattr(self, 'do_shell'),
+                                shell = isinstance(self, cmd.CmdShell),
                                 options=self.options,**options)
 
         elif args[0] == 'pythia8':
@@ -5416,7 +5417,7 @@
 
         elif args[0] == 'aMC@NLO':
             if options['interactive']:
-                if hasattr(self, 'do_shell'):
+                if isinstance(self, cmd.CmdShell):
                     ME = amcatnlo_run.aMCatNLOCmdShell(me_dir=args[1], options=self.options)
                 else:
                     ME = amcatnlo_run.aMCatNLOCmd(me_dir=args[1],options=self.options)
@@ -5427,11 +5428,13 @@
                     ME.exec_cmd(line)
                 stop = self.define_child_cmd_interface(ME)
                 return stop
-            ext_program = launch_ext.aMCatNLOLauncher( args[1], self, **options)
+            ext_program = launch_ext.aMCatNLOLauncher( args[1], self,
+                                                       shell = isinstance(self, cmd.CmdShell),
+                                                        **options)
         elif args[0] == 'madweight':
             import madgraph.interface.madweight_interface as madweight_interface
             if options['interactive']:
-                if hasattr(self, 'do_shell'):
+                if isinstance(self, cmd.CmdShell):
                     MW = madweight_interface.MadWeightCmdShell(me_dir=args[1], options=self.options)
                 else:
                     MW = madweight_interface.MadWeightCmd(me_dir=args[1],options=self.options)
@@ -5442,7 +5445,7 @@
                 stop = self.define_child_cmd_interface(MW)                
                 return stop
             ext_program = launch_ext.MWLauncher( self, args[1],
-                                                 shell = hasattr(self, 'do_shell'),
+                                                 shell = isinstance(self, cmd.CmdShell),
                                                  options=self.options,**options)            
         else:
             os.chdir(start_cwd) #ensure to go to the initial path

=== modified file 'madgraph/interface/reweight_interface.py'
--- madgraph/interface/reweight_interface.py	2015-10-09 10:39:28 +0000
+++ madgraph/interface/reweight_interface.py	2015-10-11 19:59:55 +0000
@@ -369,22 +369,36 @@
             rw_dir = pjoin(path_me, 'rw_me_second')
         else:
             rw_dir = pjoin(path_me, 'rw_me')
-            
-        ff = open(pjoin(rw_dir,'Cards', 'param_card.dat'), 'w')
-        ff.write(self.banner['slha'])
-        ff.close()
-        ff = open(pjoin(path_me, 'rw_me','Cards', 'param_card_orig.dat'), 'w')
-        ff.write(self.banner['slha'])
-        ff.close()        
-        cmd = common_run_interface.CommonRunCmd.ask_edit_card_static(cards=['param_card.dat'],
+        
+        if not '--keep_card' in args:
+            ff = open(pjoin(rw_dir,'Cards', 'param_card.dat'), 'w')
+            ff.write(self.banner['slha'])
+            ff.close()
+            ff = open(pjoin(path_me, 'rw_me','Cards', 'param_card_orig.dat'), 'w')
+            ff.write(self.banner['slha'])
+            ff.close()      
+            cmd = common_run_interface.CommonRunCmd.ask_edit_card_static(cards=['param_card.dat'],
                                    ask=self.ask, pwd=rw_dir, first_cmd=self.stored_line)
-        self.stored_line = None
-        #self.define_child_cmd_interface(cmd, interface=False)
-        new_card = open(pjoin(rw_dir, 'Cards', 'param_card.dat')).read()        
+            self.stored_line = None
+        
+        # check for potential scan in the new card 
+        new_card = open(pjoin(rw_dir, 'Cards', 'param_card.dat')).read()
+        pattern_scan = re.compile(r'''^[\s\d]*scan''', re.I+re.M) 
+        param_card_iterator = []
+        if pattern_scan.search(new_card):
+            if not isinstance(self.mother, cmd.CmdShell): 
+                raise Exception, "scan are not allowed on the Web"
+            # at least one scan parameter found. create an iterator to go trough the cards
+            main_card = check_param_card.ParamCardIterator(new_card)
+
+            param_card_iterator = main_card
+            first_card = param_card_iterator.next(autostart=True)
+            new_card = first_card.write()
+            first_card.write(pjoin(rw_dir, 'Cards', 'param_card.dat'))                
         # check if "Auto" is present for a width parameter
         if "auto" in new_card.lower():            
-            self.mother.check_param_card(pjoin(path_me, 'rw_me', 'Cards', 'param_card.dat'))
-            new_card = open(pjoin(rw_dir, 'Cards', 'param_card.dat')).read() 
+            self.mother.check_param_card(pjoin(rw_dir, 'Cards', 'param_card.dat'))
+            new_card = open(pjoin(rw_dir, 'Cards', 'param_card.dat')).read()
 
         # Find new tag in the banner and add information if needed
         if 'initrwgt' in self.banner:
@@ -614,6 +628,13 @@
         self.terminate_fortran_executables(new_card_only=True)
         #store result
         self.all_cross_section[rewgtid] = (cross, error)
+        
+        # perform the scanning
+        if param_card_iterator:
+            for card in param_card_iterator:
+                card.write(pjoin(rw_dir, 'Cards', 'param_card.dat'))
+                self.exec_cmd("launch --keep_card", printcmd=False, precmd=True)
+        
     
     def do_set(self, line):
         "Not in help"

=== modified file 'madgraph/iolibs/export_cpp.py'
--- madgraph/iolibs/export_cpp.py	2015-10-01 16:00:08 +0000
+++ madgraph/iolibs/export_cpp.py	2015-10-11 19:59:55 +0000
@@ -1104,7 +1104,6 @@
             self.version = opts['version']
             del opts['version']
         else:
-            misc.sprint(opts)
             self.version='8.2'
         super(ProcessExporterPythia8, self).__init__(*args, **opts)
 
@@ -1995,6 +1994,10 @@
         replace_dict['print_dependent_couplings'] = \
                                self.write_print_parameters(self.coups_dep.values())
 
+        if 'include_prefix' not in replace_dict:
+            replace_dict['include_prefix'] = ''
+
+
         file_h = read_template_file(self.param_template_h) % \
                  replace_dict
         file_cc = read_template_file(self.param_template_cc) % \
@@ -2227,7 +2230,6 @@
 
     if not main_file_name:
         num = 1
-        misc.sprint(filepath)
         while os.path.exists(os.path.join(filepath,
                                     'main_%s_%i.cc' % (exporter.model_name, num))) or \
               os.path.exists(os.path.join(filepath,
@@ -2410,7 +2412,6 @@
         if self.default_replace_dict['version'] == "8.2":
             path = 'pythia8.2_makefile.inc'
         else:
-            misc.sprint(self.default_replace_dict['version'])
             path = 'pythia8_makefile.inc'
         makefile = read_template_file(path) % replace_dict
 

=== modified file 'madgraph/madevent/gen_ximprove.py'
--- madgraph/madevent/gen_ximprove.py	2015-10-01 16:00:08 +0000
+++ madgraph/madevent/gen_ximprove.py	2015-10-11 19:59:55 +0000
@@ -151,7 +151,6 @@
             (stdout, _) = p.communicate('')
             
             if os.path.exists(pjoin(self.me_dir,'error')):
-                misc.sprint(open(pjoin(self.me_dir,'error')).read())
                 files.mv(pjoin(self.me_dir,'error'), pjoin(Pdir,'ajob.no_ps.log'))
                 P_zero_result.append(subdir)
                 continue            

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2015-10-01 16:00:08 +0000
+++ madgraph/various/misc.py	2015-10-11 19:59:55 +0000
@@ -319,6 +319,33 @@
     return deco_retry
 
 #===============================================================================
+# helper for scan. providing a nice formatted string for the scan name
+#===============================================================================
+def get_scan_name(first, last):
+    """return a name of the type xxxx[A-B]yyy
+        where xxx and yyy are the common part between the two names.
+    """
+    
+    # find the common string at the beginning     
+    base = [first[i] for i in range(len(first)) if first[:i+1] == last[:i+1]]
+    # remove digit even if in common
+    while base[-1].isdigit():
+        base = base[:-1] 
+    # find the common string at the end 
+    end = [first[-(i+1)] for i in range(len(first)) if first[-(i+1):] == last[-(i+1):]]
+    # remove digit even if in common    
+    while end and end[-1].isdigit():
+        end = end[:-1] 
+    end.reverse()
+    #convert to string
+    base, end = ''.join(base), ''.join(end)
+    if end:
+        name = "%s[%s-%s]%s" % (base, first[len(base):-len(end)], last[len(base):-len(end)],end)
+    else:
+        name = "%s[%s-%s]%s" % (base, first[len(base):], last[len(base):],end)
+    return name
+
+#===============================================================================
 # Compiler which returns smart output error in case of trouble
 #===============================================================================
 def compile(arg=[], cwd=None, mode='fortran', job_specs = True, nb_core=1 ,**opt):

=== modified file 'models/check_param_card.py'
--- models/check_param_card.py	2015-10-01 16:00:08 +0000
+++ models/check_param_card.py	2015-10-11 19:59:55 +0000
@@ -1,7 +1,11 @@
 from __future__ import division
+
+import itertools
 import xml.etree.ElementTree as ET
 import math
+import StringIO
 import os
+import re
 import shutil
 import logging
 
@@ -55,6 +59,9 @@
 
 
         data = data.split()
+        if any(d.startswith('scan') for d in data):
+            position = [i for i,d in enumerate(data) if d.startswith('scan')][0]
+            data = data[:position] + [' '.join(data[position:])] 
         if not len(data):
             return
         try:
@@ -98,7 +105,14 @@
     def __str__(self):
         """ return a SLAH string """
 
+        format = self.format
         if self.format == 'float':
+            try:
+                value = float(self.value)
+            except:
+                format = 'str'
+        
+        if format == 'float':
             if self.lhablock == 'decay' and not isinstance(self.value,basestring):
                 return 'DECAY %s %e # %s' % (' '.join([str(d) for d in self.lhacode]), self.value, self.comment)
             elif self.lhablock == 'decay':
@@ -107,11 +121,11 @@
                 return '      %s %i # %s' % (' '.join([str(d) for d in self.lhacode]), int(self.value), self.comment)
             else:
                 return '      %s %e # %s' % (' '.join([str(d) for d in self.lhacode]), self.value, self.comment)
-        elif self.format == 'int':
+        elif format == 'int':
             return '      %s %i # %s' % (' '.join([str(d) for d in self.lhacode]), int(self.value), self.comment)
-        elif self.format == 'str':
+        elif format == 'str':
             if self.lhablock == 'decay':
-                return 'DECAY %s Auto # %s' % (' '.join([str(d) for d in self.lhacode]), self.comment)
+                return 'DECAY %s %s # %s' % (' '.join([str(d) for d in self.lhacode]),self.value, self.comment)
             return '      %s %s # %s' % (' '.join([str(d) for d in self.lhacode]), self.value, self.comment)
         elif self.format == 'decay_table':
             return '      %e %s # %s' % ( self.value,' '.join([str(d) for d in self.lhacode]), self.comment)
@@ -274,8 +288,7 @@
         self.order = []
         
         if isinstance(input_path, ParamCard):
-            self.order = list(input_path.order)
-            self.update(input_path)
+            self.read(input_path.write())
             self.input_path = input_path.input_path 
         else:
             self.input_path = input_path
@@ -286,7 +299,10 @@
         """ read a card and full this object with the content of the card """
 
         if isinstance(input_path, str):
-            input = open(input_path)
+            if '\n' in input_path:
+                input = StringIO.StringIO(input_path)
+            else:
+                input = open(input_path)
         else:
             input = input_path #Use for banner loading and test
 
@@ -342,7 +358,7 @@
                   
         return self
     
-    def write(self, outpath):
+    def write(self, outpath=None):
         """schedular for writing a card"""
   
         # order the block in a smart way
@@ -566,6 +582,111 @@
                 variable, ('%e' % value)))
 
 
+
+class ParamCardIterator(ParamCard):
+    """A class keeping track of the scan: flag in the param_card and 
+       having an __iter__() function to scan over all the points of the scan.
+    """
+
+    logging = True
+    def __init__(self, input_path=None):
+        super(ParamCardIterator, self).__init__(input_path=input_path)
+        self.itertag = [] #all the current value use
+        self.cross = []   # keep track of all the cross-section computed 
+        self.param_order = []
+        
+    def __iter__(self):
+        """generate the next param_card (in a abstract way) related to the scan.
+           Technically this generates only the generator."""
+        
+        if hasattr(self, 'iterator'):
+            return self.iterator
+        self.iterator = self.iterate()
+        return self.iterator
+    
+    def next(self, autostart=False):
+        """call the next iteration value"""
+        try:
+            iterator = self.iterator
+        except:
+            if autostart:
+                iterator = self.__iter__()
+            else:
+                raise
+        try:
+            out = iterator.next()
+        except StopIteration:
+            del self.iterator
+            raise
+        return out
+    
+    def iterate(self):
+        """create the actual generator"""
+        all_iterators = {} # dictionary of key -> block of object to scan [([param, [values]), ...]
+        auto = 'Auto'
+        pattern = re.compile(r'''scan\s*(?P<id>\d*)\s*:\s*(?P<value>[^#]*)''', re.I)
+        # First determine which parameter to change and in which group
+        # so far only explicit value of the scan (no lambda function are allowed)
+        for block in self.order:
+            for param in block:
+                if isinstance(param.value, str) and param.value.strip().lower().startswith('scan'):
+                    try:
+                        key, def_list = pattern.findall(param.value)[0]
+                    except:
+                        raise Exception, "Fail to handle scanning tag: Please check that the syntax is valid"
+                    if key == '': 
+                        key = -1 * len(all_iterators)
+                    if key not in all_iterators:
+                        all_iterators[key] = []
+                    try:
+                        all_iterators[key].append( (param, eval(def_list)))
+                    except SyntaxError:
+                        raise Exception, "Fail to handle your scan definition. Please check your syntax."
+                    
+        keys = all_iterators.keys() # need to fix an order for the scan
+        param_card = ParamCard(self)
+        #store the type of parameter
+        for key in keys:
+            for param, values in all_iterators[key]:
+                self.param_order.append("%s#%s" % (param.lhablock, '_'.join(`i` for i in param.lhacode)))
+        
+        # do the loop
+        lengths = [range(len(all_iterators[key][0][1])) for key in keys]
+        for positions in itertools.product(*lengths):
+            self.itertag = []
+            if self.logging:
+                logger.info("Create the next param_card in the scan definition", '$MG:color:BLACK')
+            for i, pos in enumerate(positions):
+                key = keys[i]
+                for param, values in all_iterators[key]:
+                    # assign the value in the card.
+                    param_card[param.lhablock].get(param.lhacode).value = values[pos]
+                    self.itertag.append(values[pos])
+                    if self.logging:
+                        logger.info("change parameter %s with code %s to %s", \
+                                   param.lhablock, param.lhacode, values[pos])
+            # retrun the current param_card up to next iteration
+            yield param_card
+        
+    
+    def store_entry(self, run_name, cross):
+        """store the value of the cross-section"""
+        self.cross.append({'bench' : self.itertag, 'run_name': run_name, 'cross':cross})
+        
+
+    def write_summary(self, path):
+        """ """
+        
+        ff = open(path, 'w')
+        ff.write("#%-19s %-20s %-20s\n" % ('run_name',' '.join(self.param_order), 'cross(pb)'))
+        for info in self.cross:
+            bench = [str(p) for p in info['bench']]
+            cross = info['cross']
+            name = info['run_name']
+            ff.write("%-20s %-20s %-20s \n" % (name,' '.join(bench) ,cross))
+            #ff.write("%s %s %s \n" % (name,' '.join(bench) ,cross))
+            
+
 class ParamCardRule(object):
     """ A class for storing the linked between the different parameter of
             the param_card.

=== modified file 'tests/acceptance_tests/test_cmd_amcatnlo.py'
--- tests/acceptance_tests/test_cmd_amcatnlo.py	2015-10-01 16:00:08 +0000
+++ tests/acceptance_tests/test_cmd_amcatnlo.py	2015-10-11 19:59:55 +0000
@@ -204,7 +204,7 @@
         card = open('%s/Cards/run_card_default.dat' % self.path).read()
         # this check that the value of lpp/beam are change automatically
         self.assertTrue('0   = lpp1' in card)
-        self.assertTrue('500   = ebeam' in card)
+        self.assertTrue('500.0   = ebeam' in card)
         # pass to the object
         card = banner.RunCardNLO(card)
         card['pdlabel'] = "lhapdf"

=== modified file 'tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/super_auto_dsig.f'
--- tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/super_auto_dsig.f	2015-04-09 16:14:38 +0000
+++ tests/input_files/IOTestsComparison/IOExportV4IOTest/export_matrix_element_v4_madevent_group/super_auto_dsig.f	2015-10-11 19:59:55 +0000
@@ -345,11 +345,6 @@
 C     Reset ALLOW_HELICITY_GRID_ENTRIES
       ALLOW_HELICITY_GRID_ENTRIES = .TRUE.
 
-      IF(GROUPED_MC_GRID_STATUS.GE.1) THEN
-        CALL MAP_3_TO_1(ICONF,IPROC,IMIRROR,MAXSPROC,2,LMAPPED)
-        CALL DS_ADD_ENTRY('grouped_processes',LMAPPED,(DSIG/SELPROC(IMI
-     $   RROR,IPROC,ICONF)))
-      ENDIF
 
       IF(DSIG.GT.0D0)THEN
 C       Update summed weight and number of events

=== modified file 'tests/input_files/LoopSMEWTest/object_library.py'
--- tests/input_files/LoopSMEWTest/object_library.py	2015-10-01 16:00:08 +0000
+++ tests/input_files/LoopSMEWTest/object_library.py	2015-10-11 19:59:55 +0000
@@ -294,7 +294,7 @@
                     #else:
                 def substitution(matchedObj):
                     return matchedObj.group('first')+"("+ctpar.pole(x)+")"+matchedObj.group('second')
-                       pattern=re.compile(r"(?P<first>\A|\*|\+|\-|\(|\s)(?P<name>"+ctpar.name+r")(?P<second>\Z|\*|\+|\-|\)|/|\\|\s)")
+		pattern=re.compile(r"(?P<first>\A|\*|\+|\-|\(|\s)(?P<name>"+ctpar.name+r")(?P<second>\Z|\*|\+|\-|\)|/|\\|\s)")
                 tempvalue2 = tempvalue
                 tempvalue = pattern.sub(substitution,tempvalue)
                 num = numbermatch[i]-1		

=== modified file 'tests/time_db'
--- tests/time_db	2015-08-16 22:19:30 +0000
+++ tests/time_db	2015-10-11 19:59:55 +0000
@@ -1,5 +1,4 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasDiagramTest testMethod=test_setget_diagram_exceptions>]> 0.000161170959473
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_madweight_card>]> 0.015398979187
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_add>]> 0.0435810089111
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_remove_line>]> 8.89301300049e-05
@@ -26,6 +25,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_correct>]> 0.000885009765625
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorSextetModel testMethod=test_check_u_u_six_g>]> 0.506669998169
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_check_majoranas>]> 0.00102400779724
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardIterator testMethod=test_paramcard_scan>]> 0.0014591217041
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppwj>]> 9.92277693748
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingS_EPS testMethod=test_schedular>]> 0.184823036194
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_coloramps_file_EW>]> 0.00352311134338
@@ -39,6 +39,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_simplify>]> 0.000159025192261
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_cc_file>]> 0.0698401927948
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_gg_hh_QCD>]> 0.00105404853821
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_uuxuux>]> 0.00294399261475
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_gg_ng>]> 1.61963582039
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sm>]> 6.53617286682
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_put_parameters_to_zero>]> 0.0871658325195
@@ -52,6 +53,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_epem_elpelmepem>]> 0.0915629863739
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFVC>]> 0.0635468959808
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayAmplitude testMethod=test_group_channels2amplitudes>]> 0.346367835999
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_file_writers.FortranWriterTest testMethod=test_write_fortran_error>]> 0.000140190124512
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_interaction_list>]> 0.000237941741943
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_decay_chain_pp_jj>]> 0.284907102585
@@ -69,6 +71,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p1>]> 502.181219816
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarvar>]> 6.98566436768e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_process_init>]> 1.48353791237
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_width_computation>]> 13.0126650333
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestBlock testMethod=test_block_load_string>]> 6.07967376709e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_setget_multi_leg_exceptions>]> 0.0001060962677
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWritting testMethod=test_define_not_dep_param>]> 0.0775101184845
@@ -84,7 +87,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_def_level>]> 8.58306884766e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_V>]> 0.000189065933228
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_dxd_wpwm_QED>]> 0.00110411643982
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_setget_matrix_element_exceptions>]> 0.00100207328796
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1xg_QCD>]> 167.044816017
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_short_ML5_sm_vs_stored_ML5>]> 148.365936041
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddadd>]> 0.000109910964966
@@ -156,7 +158,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization5>]> 0.000308036804199
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestBanner testMethod=test_get_final_state_particle>]> 0.134166002274
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gd_ggd>]> 0.405319929123
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=test_obj_are_not_modified>]> 0.000224113464355
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain_and_fermion_flow>]> 0.0173728466034
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_decay_chain>]> 0.0154418945312
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_vertex_at_level>]> 0.00156879425049
@@ -184,7 +185,6 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_full_sm_aloha>]> 1.30430817604
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_use_as_benchmark>]> 0.165615081787
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_add>]> 0.199738025665
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_httx>]> 33.0537629128
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_gluons>]> 0.00331091880798
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_maxconfigs_EW>]> 0.004723072052
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppz_loonly>]> 0.107840061188
@@ -212,10 +212,11 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_emep_emepa>]> 0.0428278446198
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_long_decay>]> 0.0534508228302
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_read_param_card>]> 2.07473993301
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorSextetModel testMethod=test_uu_to_six_g>]> 0.172813892365
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_orders>]> 0.00100803375244
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_cross_gauge>]> 115.8441329
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_identical_parameters>]> 0.0867898464203
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_begin_end_wrong_input>]> 0.000144958496094
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_full_write>]> 0.0754480361938
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.CompareMG4WithUFOModel testMethod=test_sm_equivalence>]> 0.110821008682
@@ -236,7 +237,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_export_matrix_element_v4_standalone>]> 0.0386159420013
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter>]> 0.0264060497284
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_complete_decay_chain_process>]> 0.748803853989
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 85.3567028046
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_horizontal_mode>]> 0.00118708610535
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm_nobmass>]> 0.0748410224915
@@ -245,6 +245,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultadd>]> 0.000144004821777
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_all_reconstructed_gg_gg>]> 0.0375239849091
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_hw6_stdhep>]> 95.5102880001
+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_udxwpg_udxwp>]> 0.0118889808655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_uux_guux>]> 0.0011990070343
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_multiple_lorentz_and_symmetry>]> 0.0302782058716
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_setget_process_exceptions>]> 0.000777006149292
@@ -292,7 +293,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_dec_multiprocess_files>]> 0.481742143631
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_amcatnlo_from_file>]> 71.3001720905
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization>]> 0.000678062438965
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_process_overall_orders>]> 0.876585006714
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_identical_parameters>]> 0.0875990390778
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_phi4_vertex>]> 0.000259876251221
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_dictionaries>]> 0.000564098358154
@@ -351,7 +352,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_to_fks_leg_s>]> 0.00046181678772
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasintersection>]> 0.00135803222656
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_hh_hhh_EW>]> 179.770503998
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_load_feynman>]> 0.416143894196
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_4_e500>]> 21.2130401134
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestBenchmarkModel testMethod=test_model_name>]> 0.19921207428
@@ -381,17 +381,17 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uux_uuxuux>]> 0.461228847504
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCALLWriterComplexMass testMethod=test_UFO_Python_helas_call_writer>]> 0.197067022324
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_split_evt_gen>]> 82.7131781578
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_ppwy>]> 41.3791599274
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_python_export_functions>]> 0.0172030925751
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_Pslashproperty>]> 0.0238058567047
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_VVS1>]> 0.028205871582
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_restrict_from_a_param_card>]> 0.106390953064
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_multidiagram_decay_chains>]> 0.431716918945
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 10.1859381199
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_color_links>]> 0.00164699554443
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_hh_hh_QED>]> 0.00143194198608
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_ZPZZ>]> 0.0636489391327
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_gluons>]> 0.00796890258789
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmbbx>]> 61.837485075
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_ppzjj>]> 100.601984024
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_parse_to_cpp>]> 0.0238230228424
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_gauge_loop_p1>]> 427.859879017
@@ -423,7 +423,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCALLWriterComplexMass testMethod=test_UFO_fortran_helas_call_writer>]> 0.194958925247
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=test_power>]> 0.000131845474243
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttxa_QED>]> 0.00152993202209
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_loop_induced>]> 50.1276230812
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_VVS>]> 0.0257358551025
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domainintersection>]> 0.000596046447754
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_group_subprocs_and_get_diagram_maps>]> 0.33548283577
@@ -460,6 +459,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_zz_n1n1>]> 0.0138208866119
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_create_all_pickle>]> 40.2653810978
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_ij_lines>]> 0.0146369934082
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_find_reals>]> 0.0384328365326
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.security_issue.TestSecurity testMethod=test_security_scan>]> 0.276997804642
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.010556936264
@@ -474,7 +474,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Fortranwriter_spin3half>]> 0.154531002045
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_wa_refine>]> 11.0905270576
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_cpp>]> 0.000547170639038
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nfksconfigs_file>]> 0.0158369541168
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_ref_dict_multiple_interactions>]> 0.000741004943848
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestVariable testMethod=test_short_power>]> 0.000148057937622
@@ -487,6 +487,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_enu_enu>]> 0.008131980896
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_coeff_string>]> 0.028568983078
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct_MP>]> 0.0654561519623
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparatorLoop testMethod=test_short_gauge_loop>]> 37.5182161331
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_base_amplitude>]> 0.140361070633
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TESTMadLoopParam testMethod=test_sum_object>]> 0.000658988952637
@@ -497,19 +498,17 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_matrix_4g_decay_chain_process>]> 0.395421028137
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_error_particle_save>]> 4.19616699219e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uu_susug>]> 0.0533299446106
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_define_order>]> 0.214026927948
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_python_routine_are_exec>]> 0.00516891479492
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532
+<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_expr_FFFF3>]> 0.325031042099
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_get_max_level>]> 0.132587909698
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hwpp>]> 0.000180959701538
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_pp_nj>]> 0.145397901535
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_uux_ga_EW>]> 15.2475500107
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_read_particles>]> 0.000508069992065
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest2 testMethod=test_change_to_complex_mass_scheme>]> 0.152688980103
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_launch_amcatnlo_name>]> 49.5285630226
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_custom_propa>]> 1.53734087944
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_particle_save>]> 0.000370025634766
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmz>]> 34.1628520489
@@ -526,7 +525,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testspinsum>]> 0.00285291671753
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp>]> 12.2329871655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_epem_ddx>]> 0.67814207077
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_udx_htbx>]> 12.6998720169
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_link_gghgg_gghg>]> 0.115737915039
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWW>]> 0.0192968845367
@@ -589,6 +587,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_other>]> 4.91142272949e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_set>]> 45.5628159046
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_gg_zccx>]> 41.9109280109
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.000159025192261
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_born_fks>]> 0.057590007782
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups>]> 7.51800894737
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ddx>]> 2.72820210457
@@ -623,12 +622,13 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_lo_hw6_set>]> 102.896171808
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_helas_diagrams_gg_gogo_go_tt1x_t_wpb>]> 0.0463981628418
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_find_vertexlist>]> 0.113565921783
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_ga_QCD_QED>]> 0.00132417678833
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_script>]> 30.6620099545
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_save_load>]> 1.68547606468
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramFDStructTest testMethod=test_gg_5gglgl_bubble_tag>]> 0.00427198410034
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_detect_special_parameters>]> 0.0848360061646
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_coeff_string>]> 0.0342230796814
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_script>]> 30.6620099545
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_13>]> 41.2373769283
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromPdirectory testMethod=test_run_fromP>]> 21.0784730911
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_attx>]> 40.257420063
@@ -666,8 +666,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_split>]> 0.00737619400024
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_pdf_file_EW>]> 5.29289245605e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_FFFF3>]> 0.317361831665
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_modified_mssm_general>]> 8.70347595215
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_write>]> 7.00950622559e-05
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_def_position>]> 0.000124931335449
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_banner.TestConfigFileCase testMethod=test_sum_object>]> 0.000125885009766
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_F77writer_feynman>]> 0.027764081955
@@ -675,23 +675,22 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_sborn_sf>]> 0.00146198272705
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group>]> 9.28846502304
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_setget_process_definition_correct>]> 0.000485897064209
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_ga_QCD_QED>]> 0.00132417678833
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_madevent_directory>]> 16.0076999664
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_get_name>]> 0.030855178833
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator3>]> 0.0653259754181
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_vertexlist>]> 1.92569303513
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_values_for_prop>]> 8.10623168945e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_calculate_xsect_nlo>]> 55.6570930481
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_ug_ttxz>]> 0.11712884903
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_equality>]> 0.000420093536377
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddint>]> 9.20295715332e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSimplify testMethod=testsimplifyMultLorentz>]> 0.0104720592499
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_real_process_init>]> 0.16713809967
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_epem_ttxg_QED>]> 0.00109791755676
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testequality>]> 0.000127077102661
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdMatchBox testMethod=testIO_MatchBoxOutput>]> 3.16356706619
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_get_fks_j_from_i_lines_EW>]> 7.70092010498e-05
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.ExportV4IOTest testMethod=test_replace_make_opt_f_compiler>]> 0.040843963623
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_onshell_s_channel_uux_uuxng>]> 0.0812060832977
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_helas_call_writers.UFOHELASCallWriterTest testMethod=test_UFO_CPP_helas_call_writer>]> 0.0117120742798
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_check_singletop_fastjet>]> 152.502398014
@@ -706,9 +705,11 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_multi_gluons>]> 0.251565933228
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_equal_decay_chains>]> 0.134434938431
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_generate_events_name>]> 66.2333741188
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_full_epem_ttx>]> 42.7599339485
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_helper_lcm_functions>]> 0.000735998153687
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarint>]> 6.48498535156e-05
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_full_lept>]> 29.0376198292
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_representation>]> 0.000728130340576
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_forbidden_s_channel_decay_chain>]> 0.0207369327545
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_sqso_ddx_ddx_WEIGHTEDgt6>]> 20.8691658974
@@ -743,11 +744,12 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_get_rank>]> 0.103627204895
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uux_gepem_no_optimization>]> 0.0196721553802
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_expr_VVS1>]> 0.0284140110016
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorSextetModel testMethod=test_uu_to_six_g>]> 0.172813892365
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_multidiagram_decay_chains>]> 0.431716918945
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_cpp_go_process_cc_file>]> 0.0690608024597
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_madspin_gridpack>]> 31.1755411625
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testTraceofObject>]> 0.000325918197632
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_process_h_file>]> 0.0427629947662
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1x_QCD>]> 69.1381390095
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_leshouche_sextet_diquarks>]> 2.94189381599
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_default>]> 0.000207901000977
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_input_string>]> 0.00074315071106
@@ -787,18 +789,18 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_dxd_zgg>]> 36.6928138733
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_get_aloha_input>]> 0.216245174408
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_ppgogo_amcatnlo>]> 77.5487518311
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarAdd>]> 0.000159025192261
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_process_overall_orders>]> 0.876585006714
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_multiple_lorentz>]> 0.000393867492676
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_values_for_prop>]> 0.110687971115
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_get_fks_info_list>]> 0.993493080139
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_isexternal>]> 0.000101089477539
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_complex_mass_scheme>]> 0.095272064209
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddvar_legacy>]> 0.00015115737915
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_launch_amcatnlo_name>]> 49.5285630226
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_change_number_format_fortran>]> 0.000572919845581
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_decay_width_nlo_model>]> 14.2313911915
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopEWDiagramGenerationTest testMethod=test_diagram_generation_gg_ttxh_EW>]> 60.816671133
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_gg_gogo_QCD>]> 150.644671917
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_vector_clash_majorana_process>]> 0.012188911438
-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_shower_card>]> 0.0273249149323
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_calculate_xsect_nlo>]> 55.6570930481
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_unused_decays_in_decay_chain_pp_jj>]> 0.199378967285
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uu_susu>]> 0.0135440826416
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOTestMadLoopSquaredOrdersExport testMethod=testIO_Loop_sqso_uux_ddx>]> 32.4329109192
@@ -835,7 +837,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_UFOExpressionParserPythonIF>]> 0.0719270706177
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_stdhep>]> 50.4594700336
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_fuse_vertex>]> 0.000200033187866
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5MSSMQCD.ML5MSSMQCDTest testMethod=test_long_mssm_vs_stored_HCR_uux_t1t1x_QCD>]> 69.1381390095
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_wpwmbbx>]> 61.837485075
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_def_begin_end_point>]> 9.89437103271e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin2propagator>]> 0.128522157669
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestMadSpinFCT_in_interface testMethod=test_get_final_part>]> 0.12849187851
@@ -849,16 +851,16 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8_analyse>]> 0.000602960586548
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_ppgogo_amcatnlo>]> 252.850306988
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_butdg_butd>]> 0.0965809822083
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_full_lept>]> 29.0376198292
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_fermion_flow>]> 0.00178098678589
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_comparison>]> 0.225214958191
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p2>]> 750.973557949
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_interaction>]> 0.000797033309937
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_aloha_get_name>]> 0.0285120010376
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_b_sf_fks>]> 2.02799201012
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_representation>]> 0.00421714782715
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_info_file>]> 0.0922110080719
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestNFlav testMethod=test_get_nflav_sm>]> 0.0441629886627
-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_help_category>]> 0.00062894821167
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_diagram_generation_uux_ga>]> 1.02916789055
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_setget_wavefunction_exceptions>]> 0.000231027603149
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_check_generate_optimize>]> 0.301462173462
@@ -877,10 +879,10 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_flipping>]> 0.0031681060791
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_generate_eventsnlo_py6pt_fsr>]> 16.2141349316
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_leshouche_file_EW>]> 0.000738143920898
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_MP_mode>]> 0.0349721908569
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_spin32propagator>]> 0.208134174347
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_mssm_decay_groups_modified_mssm_general>]> 8.70347595215
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_configs_file_born_EW>]> 5.07831573486e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_add_ab_particle>]> 0.127122163773
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_setget_multi_leg_correct>]> 6.60419464111e-05
@@ -889,13 +891,13 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower1>]> 0.000165939331055
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_permutation.TestPermutation testMethod=test_permutation_from_id>]> 0.0379128456116
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_identical_interactions>]> 0.0405609607697
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_width_computation>]> 13.0126650333
+<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_help_category>]> 0.00062894821167
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_html_long_process_strings>]> 20.4391908646
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8>]> 0.000524997711182
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_uux_aa_QED>]> 0.00227403640747
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_add_time_of_flight>]> 19.5163040161
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_nfksconfigs_file_EW>]> 0.0351588726044
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_invalid_operations_for_output>]> 0.0474369525909
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator2>]> 0.152077913284
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_particle>]> 0.000631093978882
@@ -942,7 +944,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_gluons>]> 0.0548150539398
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_complex_mass_SA>]> 1.51796483994
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestLorentzObjectRepresentation testMethod=test_short_sumofLorentzObj>]> 0.00596499443054
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_fks_EW>]> 4.79221343994e-05
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_python_routine_are_exec>]> 0.00470900535583
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_splittings>]> 0.0126750469208
@@ -971,9 +972,10 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_dxd_agg>]> 30.9221031666
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_gg_ttxh_QED>]> 0.00196599960327
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_full_import>]> 0.0387060642242
+<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_shower_card>]> 0.0273249149323
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_from_immutable>]> 0.000111818313599
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_model>]> 0.0530641078949
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 10.1859381199
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_gg_httx>]> 33.0537629128
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_gb_t1go_tttxn1x1m>]> 0.135241031647
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_values_for_prop>]> 0.000351905822754
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.MECmdShell testMethod=test_calculate_xsect_lo>]> 53.5439140797
@@ -984,7 +986,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestSomeObjectProperty testMethod=test_short_parity_for_epsilon>]> 0.000339031219482
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_coloramps_file>]> 0.00445699691772
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_t_channel_vertex>]> 0.000336170196533
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000134944915771
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_setget_matrix_element_exceptions>]> 0.00100207328796
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_four_fermion_vertex_strange_fermion_flow>]> 0.0298500061035
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testIdentityMatrix>]> 0.0287408828735
@@ -1003,20 +1005,20 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAlohaWriter testMethod=test_short_pythonwriter_complex_mass_scheme>]> 0.02272605896
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_rambo testMethod=test_massless>]> 0.000313997268677
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_insert_legs>]> 0.000980854034424
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_gg_ggg>]> 0.128249883652
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_uux_uuxuux>]> 0.00294399261475
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection>]> 0.000416040420532
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_help_generate_ab_amplitude>]> 0.233986139297
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.00019907951355
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_level_with_flipping_triangle>]> 0.00130605697632
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_getsetvertexlist_exceptions>]> 0.110853910446
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testdealingwithpower3>]> 0.0128040313721
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.AlohaFortranWriterTest testMethod=test_header>]> 0.0467920303345
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML5_uux_zzz>]> 28.6060318947
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_reorder_permutation>]> 5.41210174561e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin32propagator>]> 0.232930898666
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=testexpand>]> 0.00191402435303
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_nodiag>]> 0.00244688987732
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=test_obj_are_not_modified>]> 0.000224113464355
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_check_generate>]> 0.00097393989563
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_long_sm_vs_stored_HCR_aa_ttx_QED>]> 0.00158500671387
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.test_aloha_creation testMethod=test_short_aloha_symmetries_and_get_info>]> 0.212943077087
@@ -1025,14 +1027,14 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_legs_to_color_link_string>]> 0.00512909889221
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_sort_fksleglist>]> 0.00221490859985
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_rambo.test_wavefunctions testMethod=test_I>]> 0.000235080718994
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_representation>]> 7.29560852051e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_real_me_wrapper_EW>]> 5.69820404053e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_files.TestFilesGestion testMethod=test_is_uptodate>]> 1.0137488842
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.TestAddVariable testMethod=test_short_factorization5>]> 0.00028395652771
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_particles_uux_uuxng>]> 0.0401759147644
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_find_initial_vertex_position>]> 0.000370979309082
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=testIO_test_pptt_fksreal>]> 13.9149849415
+<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_loop_induced>]> 50.1276230812
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_duxhuduxux_guxhuuxux>]> 1.03614902496
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_hw6_analyse>]> 0.000184059143066
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_get_helicity_states>]> 0.000174045562744
@@ -1049,7 +1051,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_run_card>]> 0.0163931846619
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_madevent.TestMadEventCmd testMethod=test_card_type_recognition>]> 0.0509171485901
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks_EW.IOExportFKSEWTest testMethod=test_write_born_nhel_file_EW>]> 0.125450849533
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_matrix_element_v4_madevent_nogroup>]> 0.109572172165
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5.ML5Test testMethod=test_long_sm_vs_stored_ML4_dxd_zzg>]> 32.0563452244
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_full_sm_decay_groups>]> 5.82679080963
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_output_files.IOExportMadLoopAcceptanceTest testMethod=testIO_ProcOutputIOTests>]> 28.318707943
@@ -1063,7 +1065,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_file_writers.CPPWriterTest testMethod=test_write_cplusplus_line>]> 0.0056209564209
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_single_decay_combinations>]> 0.0449919700623
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_line_orientation>]> 0.000136137008667
-<__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_udxwpg_udxwp>]> 0.0118889808655
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testmultmultint>]> 0.000134944915771
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasWavefunctionTest testMethod=test_values_for_prop>]> 0.000183820724487
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_ML5EW.ML5EWTest testMethod=test_ML5EW_sm_vs_stored_ML5EW_sqso>]> 0.00940799713135
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_get_color_data_lines_from_color_matrix>]> 1.95838093758
@@ -1073,8 +1075,8 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_info_str_error>]> 0.0325899124146
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6>]> 0.000173807144165
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.test_aloha.testLorentzObject testMethod=test_short_expand_veto>]> 0.00168204307556
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_sqso>]> 4.5599489212
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_python.IOExportPythonTest testMethod=test_get_python_matrix_methods>]> 0.0204730033875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.madspin.test_madspin.TestEvent testMethod=test_madspin_event>]> 0.00227999687195
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_epem_sepsemepem>]> 0.074609041214
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testGammaAlgebraDefinition>]> 1.01560497284

=== modified file 'tests/unit_tests/iolibs/test_export_cpp.py'
--- tests/unit_tests/iolibs/test_export_cpp.py	2015-10-01 16:00:08 +0000
+++ tests/unit_tests/iolibs/test_export_cpp.py	2015-10-11 19:59:55 +0000
@@ -1356,7 +1356,8 @@
             sm_path = import_ufo.find_ufo_path('sm')
             self.model = import_ufo.import_model(sm_path)
         self.model_builder = export_cpp.UFOModelConverterPythia8(\
-                                             self.model, "/tmp")
+                                             self.model, "/tmp",
+                                             replace_dict={'include_prefix':'Pythia8/'})
         
         test_file_writers.CheckFileCreate.clean_files
 

=== modified file 'tests/unit_tests/various/test_check_param_card.py'
--- tests/unit_tests/various/test_check_param_card.py	2015-10-01 16:00:08 +0000
+++ tests/unit_tests/various/test_check_param_card.py	2015-10-11 19:59:55 +0000
@@ -198,6 +198,53 @@
                                              *('polemass', [35], 'width', [24]))
         
     
+    
+    
+class TestParamCardIterator(unittest.TestCase):
+    """ Test the ParamCard Object """
+    
+    def test_paramcard_scan(self):
+        full_card = os.path.join(_file_path, os.path.pardir,
+                                     'input_files', 'param_card_sm.dat')        
+        card = writter.ParamCard(full_card)
+        
+        # create a simple 1D scan
+        card['mass'].get(6).value = "scan:[1,2,3,4,5]"
+        mh = card['mass'].get(25).value # to check that param_card are independant
+        
+        itercard = writter.ParamCardIterator(card)
+        card['mass'].get(25).value = 25.0
+        for i, new_card in enumerate(itercard):
+            self.assertEqual(new_card['mass'].get(6).value, i+1)
+            self.assertEqual(new_card['mass'].get(25).value, mh)
+        self.assertEqual(i, 4)
+        
+        # create a 1D scan with two parameter
+        card['mass'].get(6).value = "scan1:[1,2,3,4,5]"
+        card['mass'].get(25).value = "scan1:[0,10,20,30,40]"
+        itercard = writter.ParamCardIterator(card)
+        for i, new_card in enumerate(itercard):
+            self.assertEqual(new_card['mass'].get(6).value, i+1)
+            self.assertEqual(new_card['mass'].get(25).value, 10*i)
+        self.assertEqual(i, 4)
+        
+        # create a 2D scan with two parameter
+        card['mass'].get(6).value = "scan:[1,2,3]"
+        card['mass'].get(25).value = "scan:[0,10,20,30]"
+        all_possibilities = [(1,0), (1,10),(1,20),(1,30),
+                             (2,0), (2,10),(2,20),(2,30),
+                             (3,0), (3,10),(3,20),(3,30)
+                             ]
+        itercard = writter.ParamCardIterator(card)
+        for i, new_card in enumerate(itercard):
+            choice = (new_card['mass'].get(6).value, new_card['mass'].get(25).value)
+            self.assertIn(choice, all_possibilities)
+            all_possibilities.remove(choice)
+            
+        self.assertEqual(i, 11)                    
+        self.assertFalse(all_possibilities)
+        
+         
 class TestParamCardRule(unittest.TestCase):
     """ Test the ParamCardRule Object"""