Merge lp:~maddevelopers/mg5amcnlo/plugin_model into lp:~maddevelopers/mg5amcnlo/2.1.1

[Olivier Mattelaer]

possibility to do:
add model XXX which merge the two model in a single one.
usefull for taudecay and hgg_plugin

Cheers,

Olivier

[Olivier Mattelaer (olivier-mattelaer)]

Some news?

Olivier

[Valentin Hirschi (valentin-hirschi)]

Hi Olivier,

a)

It seems to work fine. I tried to add the tau addon to the sm UFO and run

p p > pi- vt~ vt

I also tried to decay the tau with MadSpin and it went through ok even though it showed a lot of overweights, i.e.

WARNING: Found many weight larger than the computed max_weight (17/10000 = 0.17%)

But I guess it is still ok.

b)

Then I tried to get the same result for g g > h d d~ with HEFT and the sm model with HEFT added.
In the second case the code crash when launching MadEvent with:

  File "/Users/valentin/Documents/Work/MG5/plugin_model/models/check_param_card.py", line 185, in append
    (self.name, obj.lhacode, self.param_dict[tuple(obj.lhacode)].value, obj.value)
InvalidParamCard: mass (24,) is already define to 79.82901 impossible to assign 80.419

I guess I was supposed to use the 'hgg_plugin' instead. But if adding the whole 'heft' was not allowed to start with I would expect MG5_aMC to tell me so.

c)

Also when I tried to add the tau decay to loop_sm, I got:

TypeError : __init__() got an unexpected keyword argument 'counterterm'

Given that it's difficult to know in advance whether it makes sense or not to add a tree model to a loop one, I would simply forbid that altogether with a nicer error message. And also for the converse: i.e. adding a loop model to a tree level one.

d)

When add model reuses an existing model created before with the add model functionality, it might be useful to have an info line explicitly saying that it reuses it and the path of the model reused.

e)

How are the model restrictions handled exactly ? For example I tried to import the SM model with zero b mass and then add the tau decay. After this I saw that the b-mass of the merged model was massive again. Also the existing restriction files where not in the directory of the merged model which was output. So would it be possible to also automatically merge restriction? If not then it's ok but it should be clearly stated, at least in the help.

I have to head off, so I'll continue it later.
This is a great functionality, thanks!

[Olivier Mattelaer (olivier-mattelaer)]

Hi Valentin,

a) I guess so

b) I don't reproduce your problem with the card. But in fact another one (that I fixed)

You are allowed to do it but since all interactions are include you are going to have a lot of double counting since you will have two times the same interactions added.

c) As I told to you, this is linked to the way the loop_sm is built. (in a non linear way which should NOT be allowed in the UFO format!) If we use the one from FR it is working fine!
I don't want to forbid this since the tauddecay might be usefull also at NLO. (especially when/if MS can do three/four body decay.) But if you insist, I can forbid it for the moment.

d) OK done.

e) For the moment they are just completely ignored. I think that this is possible to do. Assuming that only the restriction of the original model are going trough. I'll move on that as fast as possible.

Cheers,

Olivier

[lp:~maddevelopers/mg5amcnlo/plugin_model]

257. By Olivier Mattelaer on 2014-03-22

move the restriction of the original model to the new one.

[Valentin Hirschi (valentin-hirschi)]

Hi Olivier,

We discussed most of this on skype already so let me attend point c) only,
the rest being ok now.

On Sat, Mar 22, 2014 at 11:19 AM, Olivier Mattelaer <
<email address hidden>> wrote:

> Hi Valentin,
>
> a) I guess so
>
> b) I don't reproduce your problem with the card. But in fact another one
> (that I fixed)
>
> You are allowed to do it but since all interactions are include you are
> going to have a lot of double counting since you will have two times the
> same interactions added.
>
> c) As I told to you, this is linked to the way the loop_sm is built. (in a
> non linear way which should NOT be allowed in the UFO format!) If we use
> the one from FR it is working fine!
> I don't want to forbid this since the tauddecay might be usefull also at
> NLO. (especially when/if MS can do three/four body decay.) But if you
> insist, I can forbid it for the moment.
>
>
I propose the following:

i) Never allow to *add* a loop model as this is meaningless most of the
time and anyway not for any time soon. But you can start from a loop model.

ii) Whenever adding a model to a *loop model*, make sure it has no particle
counterterms since this is what prevents you from handling those. I the
future we might alleviate this if I change the way the particle wf
counterterms are implemented. This means that one can add models to UFO NLO
models (which do not need particle wf counterterms for now).

iii) Whenever adding a model to a loop model, one should forbid the added
model to define any coupling order which also appear in the base model and
which is perturbed there (i.e. defined with expansion_order > 1)

These three things still don't guarantee that the resulting model is
consistent (i.e. does not miss R2 or UV counterterms), but it removes what
has no chance of being right.
It would be nice to have warning when adding a model to a loop model
stressing that the resulting model might have inconsistent/missing
counterterms.

Anyway, the rest is working! So after this point is addressed, I approve
the merge, thanks!

> d) OK done.
>
> e) For the moment they are just completely ignored. I think that this is
> possible to do. Assuming that only the restriction of the original model
> are going trough. I'll move on that as fast as possible.
>
> Cheers,
>
> Olivier
>
>
>
>
>
>
>
> --
>
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/plugin_model/+merge/210109
> You are requested to review the proposed merge of
> lp:~maddevelopers/mg5amcnlo/plugin_model into lp:~maddevelopers/mg5amcnlo/
> 2.1.1.
>

--
Valentin

[lp:~maddevelopers/mg5amcnlo/plugin_model]

258. By Valentin Hirschi on 2014-03-24

1. Change UFO@NLO conventions so that the 'loop_particles' attribute of
   the particles instances of the model is no longer a list of instances
   of the 'Particle' class but simple integer PDG. This makes the
   UFO model construction linear.

259. By Olivier Mattelaer on 2014-03-24

- more secure way to add two full model. This should still be discourage but this should be
      working roughly correctly now.
- restrict the usage of loop model.

[Olivier Mattelaer (olivier-mattelaer)]

Hi Valentin,

According to your comment (via Skype) about adding two full model:
1) if an interaction has
   - the same coupling (i.e. the exact same formula or identified like it)
   - the same lorentz structure
   - the same particle content
   - the same color
   Then it is not added (and not warning)
2) if an interaction has
   - the same coupling ORDER
   - the same lorentz structure
   - the same particle content
   - the same color
   Then it is not added but a warning is raised.

Concerning your comment above

(i) the loop model are now forbidden to be used as add-on.
(ii) ok done
(iii) I've change the perturbative order to zero in that case. (with an informative message).

[Valentin Hirschi (valentin-hirschi)]

Given our skype discussion and your recent modifications, I accept the merge!
Thanks!

PS: At one point which should fix the latest details so as to have my hand-written model loop_sm handled.

review: Approve

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2014-03-08 18:07:26 +0000
+++ madgraph/core/base_objects.py	2014-03-24 03:30:32 +0000
@@ -1070,6 +1070,12 @@
             modeldir = os.path.dirname(modeldir)
             modeldir = pjoin(modeldir, modelname)
             return modeldir
+        elif name == 'restrict_name':
+            modeldir = self.get('version_tag').rsplit('##',1)[0]
+            modelname = self['name']            
+            basename = os.path.basename(modeldir)
+            restriction = modelname[len(basename)+1:]
+            return restriction
 
         if (name == 'interaction_dict') and not self[name]:
             if self['interactions']:

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2013-11-29 07:28:53 +0000
+++ madgraph/core/diagram_generation.py	2014-03-24 03:30:32 +0000
@@ -558,9 +558,12 @@
                 part = model.get('particle_dict')[leg.get('id')]
                 try:
                     value = part.get(charge)
-                except AttributeError, PhysicsObjectError:
-                    value = 0
-                    
+                except (AttributeError, base_objects.PhysicsObject.PhysicsObjectError):
+                    try:
+                        value = getattr(part, charge)
+                    except AttributeError:
+                        value = 0
+                        
                 if (leg.get('id') != part['pdg_code']) != leg['state']:
                     total -= value
                 else:

=== modified file 'madgraph/interface/amcatnlo_interface.py'
--- madgraph/interface/amcatnlo_interface.py	2014-03-07 13:18:20 +0000
+++ madgraph/interface/amcatnlo_interface.py	2014-03-24 03:30:32 +0000
@@ -388,8 +388,10 @@
         # Check the validity of the arguments
         self.check_add(args)
 
-        if args[0] != 'process': 
-            raise self.InvalidCmd("The add command can only be used with a process")
+        if args[0] == 'model':
+            return self.add_model(args[1:])
+        elif args[0] != 'process': 
+            raise self.InvalidCmd("The add command can only be used with process or model")
         else:
             line = ' '.join(args[1:])
             

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2014-03-18 21:39:55 +0000
+++ madgraph/interface/madgraph_interface.py	2014-03-24 03:30:32 +0000
@@ -533,7 +533,9 @@
         logger.info("   can still handle these.")
 
     def help_add(self):
-
+        logger.info("-- generate diagrams for a process and add to existing processes",'$MG:color:BLUE')
+        logger.info("   OR merge two model",'$MG:color:BLUE')
+        logger.info('')
         logger.info("-- generate diagrams for a process and add to existing processes",'$MG:color:BLUE')
         logger.info("General leading-order syntax:",'$MG:color:BLACK')
         logger.info(" o add process INITIAL STATE > REQ S-CHANNEL > FINAL STATE $ EXCL S-CHANNEL / FORBIDDEN PARTICLES COUP1=ORDER1 COUP2=ORDER2 @N")
@@ -567,6 +569,17 @@
         logger.info("   the 'virt=' NLO mode. aMC@NLO cannot integrate these processes, but standalone MadLoop5")
         logger.info("   can still handle these.")
 
+        logger.info("--  merge two model to create a new one", '$MG:color:BLUE')
+        logger.info("syntax:",'$MG:color:BLACK')
+        logger.info(" o add model MODELNAME [OPTIONS]")
+        logger.info(" o Example: add model taudecay",'$MG:color:GREEN')
+        logger.info(" > Merge the two model in a single one. If that same merge was done before.")
+        logger.info(" > Just reload the previous merge. (WARNING: This doesn't check if those model are modified)")
+        logger.info(" > Options:")
+        logger.info("   --output=  : Specify the name of the directory where the merge is done.")
+        logger.info("                This allow to do \"import NAME\" to load that merge.")
+        logger.info("   --recreate : Force to recreated the merge model even if the merge model directory already exists.")
+        
     def help_compute_widths(self):
         logger.info("syntax: calculate_width PART [other particles] [OPTIONS]")
         logger.info("  Computes the width and partial width for a set of particles")
@@ -696,37 +709,22 @@
 
     def check_add(self, args):
         """check the validity of line
-        syntax: add process PROCESS
+        syntax: add process PROCESS | add model MODELNAME
         """
 
         if len(args) < 2:
             self.help_add()
             raise self.InvalidCmd('\"add\" requires at least two arguments')
-
-        if args[0] != 'process':
-            raise self.InvalidCmd('\"add\" requires the argument \"process\"')
-
-        if not self._curr_model:
-            logger.info("No model currently active, so we import the Standard Model")
-            self.do_import('model sm')
-
-        if args[-1].startswith('--optimize'):
-            if args[2] != '>':
-                raise self.InvalidCmd('optimize mode valid only for 1->N processes. (See model restriction for 2->N)')
-            if '=' in args[-1]:
-                path = args[-1].split('=',1)[1]
-                if not os.path.exists(path) or \
-                                self.detect_file_type(path) != 'param_card':
-                    raise self.InvalidCmd('%s is not a valid param_card')
-            else:
-                path=None
-            # Update the default value of the model here.
-            if not isinstance(self._curr_model, model_reader.ModelReader):
-                self._curr_model = model_reader.ModelReader(self._curr_model)
-            self._curr_model.set_parameters_and_couplings(path)
-            self.check_process_format(' '.join(args[1:-1]))
-        else:
-            self.check_process_format(' '.join(args[1:]))
+        
+        if args[0] not in  ['model', 'process']:
+            raise self.InvalidCmd('\"add\" requires the argument \"process\" or \"model\"')    
+    
+        if args[0] == 'process':
+            return self.check_generate(args)
+    
+        if args[0] == 'model':
+            pass
+            
 
     def check_define(self, args):
         """check the validity of line
@@ -848,8 +846,29 @@
 
     def check_generate(self, args):
         """check the validity of args"""
-        # Not called anymore see check_add
-        return self.check_add(args)
+
+        if not self._curr_model:
+            logger.info("No model currently active, so we import the Standard Model")
+            self.do_import('model sm')
+        
+        if args[-1].startswith('--optimize'):
+            if args[2] != '>':
+                raise self.InvalidCmd('optimize mode valid only for 1->N processes. (See model restriction for 2->N)')
+            if '=' in args[-1]:
+                path = args[-1].split('=',1)[1]
+                if not os.path.exists(path) or \
+                                self.detect_file_type(path) != 'param_card':
+                    raise self.InvalidCmd('%s is not a valid param_card')
+            else:
+                path=None
+            # Update the default value of the model here.
+            if not isinstance(self._curr_model, model_reader.ModelReader):
+                self._curr_model = model_reader.ModelReader(self._curr_model)
+            self._curr_model.set_parameters_and_couplings(path)
+            self.check_process_format(' '.join(args[1:-1]))
+        else:
+            self.check_process_format(' '.join(args[1:]))
+    
 
     def check_process_format(self, process):
         """ check the validity of the string given to describe a format """
@@ -1801,18 +1820,15 @@
         if len(args) == 1:
             return self.list_completion(text, self._add_opts)
 
-        return self.complete_generate(text, " ".join(args[1:]), begidx, endidx)
-
-        # Return list of particle names and multiparticle names, as well as
-        # coupling orders and allowed symbols
-        couplings = []
-        if len(args) > 2 and args[-1] != '>':
-            couplings = ['>']
-        if '>' in args and args.index('>') < len(args) - 1:
-            couplings = [c + "=" for c in self._couplings] + ['@','$','/','>']
-        return self.list_completion(text, self._particle_names + \
-                                    self._multiparticles.keys() + couplings)
-
+        if args[1] == 'process':
+            return self.complete_generate(text, " ".join(args[1:]), begidx, endidx)
+        
+        elif args[1] == 'model':
+            completion_categories = self.complete_import(text, line, begidx, endidx, 
+                                                         allow_restrict=False, treat_completion=False)
+            completion_categories['options'] = self.list_completion(text,['--modelname=','--recreate'])
+            return self.deal_multiple_categories(completion_categories) 
+            
     def complete_customize_model(self, text, line, begidx, endidx):
         "Complete the customize_model command"
 
@@ -2141,8 +2157,9 @@
                 return self.path_completion(text,
                         pjoin(*[a for a in args if a.endswith(os.path.sep)]),
                         only_dirs = True)
-
-    def complete_import(self, text, line, begidx, endidx):
+        
+    def complete_import(self, text, line, begidx, endidx, allow_restrict=True,
+                        treat_completion=True):
         "Complete the import command"
 
         args=self.split_arg(line[0:begidx])
@@ -2246,12 +2263,15 @@
 
                 if mode == 'model_v4':
                     completion_categories['model name'] = model_list
-                else:
+                elif allow_restrict:
                     # need to update the  list with the possible restriction
                     all_name = []
                     for model_name in model_list:
                         all_name += self.find_restrict_card(model_name,
                                             base_dir=pjoin(MG5DIR,'models'))
+                else:
+                    all_name = model_list
+                    
                 if mode == 'all':
                     cur_path = pjoin(*[a for a in args \
                                                         if a.endswith(os.path.sep)])
@@ -2271,8 +2291,12 @@
                 completion_categories['options'] = self.list_completion(text, ['--modelname','-modelname','--noprefix'])
         if len(args) >= 3 and mode.startswith('banner') and not '--no_launch' in line:
             completion_categories['options'] = self.list_completion(text, ['--no_launch'])
-        return self.deal_multiple_categories(completion_categories)
-
+        
+        if treat_completion:
+            return self.deal_multiple_categories(completion_categories) 
+        else:
+            #this means this function is called as a subgroup of another completion
+            return completion_categories
 
 
     def find_restrict_card(self, model_name, base_dir='./', no_restrict=True):
@@ -2331,7 +2355,7 @@
     _display_opts = ['particles', 'interactions', 'processes', 'diagrams',
                      'diagrams_text', 'multiparticles', 'couplings', 'lorentz',
                      'checks', 'parameters', 'options', 'coupling_order','variable']
-    _add_opts = ['process']
+    _add_opts = ['process', 'model']
     _save_opts = ['model', 'processes', 'options']
     _tutorial_opts = ['aMCatNLO', 'stop', 'MadLoop', 'MadGraph5']
     _switch_opts = ['mg5','aMC@NLO','ML5']
@@ -2495,10 +2519,12 @@
     def do_add(self, line):
         """Generate an amplitude for a given process and add to
         existing amplitudes
+        or merge two model
         """
 
         args = self.split_arg(line)
 
+        
         warning_duplicate = True
         if '--no_warning=duplicate' in args:
             warning_duplicate = False
@@ -2507,6 +2533,9 @@
         # Check the validity of the arguments
         self.check_add(args)
 
+        if args[0] == 'model':
+            return self.add_model(args[1:])
+        
         # special option for 1->N to avoid generation of kinematically forbidden
         #decay.
         if args[-1].startswith('--optimize'):
@@ -2589,8 +2618,58 @@
             ndiags = sum([amp.get_number_of_diagrams() for \
                               amp in self._curr_amps])
             logger.info("Total: %i processes with %i diagrams" % \
-                  (len(self._curr_amps), ndiags))       
-
+                  (len(self._curr_amps), ndiags))        
+                
+    def add_model(self, args):
+        """merge two model"""
+        
+        model_path = args[0]
+        recreate = ('--recreate' in args)
+        output_dir = [a.split('=',1)[1] for a in args if a.startswith('--output')]
+        if output_dir:
+            output_dir = output_dir[0]
+            recreate = True
+            restrict_name = ''
+        else:
+            name = os.path.basename(self._curr_model.get('modelpath'))
+            restrict_name = self._curr_model.get('restrict_name')
+            output_dir = pjoin(MG5DIR, 'models', '%s__%s' % (name,
+                                                  os.path.basename(model_path)))
+        
+        if os.path.exists(output_dir):
+            if recreate:
+                shutil.rmtree(output_dir)
+            else:
+                logger.info('Model already created! Loading it from %s' % output_dir)
+                oldmodel = self._curr_model.get('modelpath')
+                new_model_name = output_dir
+                if restrict_name:
+                    new_model_name = '%s-%s' % (output_dir, restrict_name)
+                try:
+                    self.exec_cmd('import model %s' % new_model_name, errorhandling=False, 
+                              printcmd=False, precmd=True, postcmd=True)
+                except Exception, error:
+                    logger.debug('fail to load model %s with error:\n %s' % (output_dir, error))
+                    logger.warning('Fail to load the model. Restore previous model')
+                    self.exec_cmd('import model %s' % oldmodel, errorhandling=False, 
+                              printcmd=False, precmd=True, postcmd=True)                    
+                    raise Exception('Invalid Model! Please retry with the option \'--recreate\'.')
+                else:
+                    return
+        
+        #Need to do the work!!!        
+        import models.usermod as usermod
+        base_model = usermod.UFOModel(self._curr_model.get('modelpath'))
+        base_model.add_model(path=model_path)
+        base_model.write(output_dir)
+        
+        new_model_name = output_dir
+        if restrict_name:
+            new_model_name = '%s-%s' % (output_dir, restrict_name)
+        self.exec_cmd('import model %s' % new_model_name, errorhandling=False, 
+                              printcmd=False, precmd=True, postcmd=True)         
+        
+        
     # Define a multiparticle label
     def do_define(self, line, log=True):
         """Define a multiparticle"""

=== modified file 'madgraph/various/banner.py'
--- madgraph/various/banner.py	2014-03-18 12:41:26 +0000
+++ madgraph/various/banner.py	2014-03-24 03:30:32 +0000
@@ -880,7 +880,7 @@
             if cmds[1].startswith('model'):
                 self.info['full_model_line'] = line
                 self.clean(remove_bef_last='import', keep_switch=True,
-                        allow_for_removal=['generate', 'add process', 'output'])
+                        allow_for_removal=['generate', 'add process', 'add model', 'output'])
                 if cmds[1] == 'model':
                     self.info['model'] = cmds[2]
                 else:
@@ -908,7 +908,7 @@
         keep_switch force to keep the statement remove_bef_??? which changes starts
         the removal mode.
         """
-        
+
         #check consistency
         if __debug__ and allow_for_removal:
             for arg in to_keep:

=== modified file 'models/build_restriction_lib.py'
--- models/build_restriction_lib.py	2013-11-13 02:21:10 +0000
+++ models/build_restriction_lib.py	2014-03-24 03:30:32 +0000
@@ -47,7 +47,7 @@
             self.append(current_rule)
             first=False
 
-        
+
         
         
         
\ No newline at end of file

=== added directory 'models/hgg_plugin'
=== added file 'models/hgg_plugin/HEFT_UFO.log'
--- models/hgg_plugin/HEFT_UFO.log	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/HEFT_UFO.log	2014-03-24 03:30:32 +0000
@@ -0,0 +1,75 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Wed 20 Jul 2011 12:57:52
+
+
+# 
+# This is the logfile for the model Higgs_Effective_Couplings
+
+# Authors: N. Christensen, C. Duhr
+# Model version: 1.3
+# Checking the Lagrangians
+   * All Lagrangians are ok.
+#
+# Particle definitions
+#
+
+   * No particles removed. All particles correspond to GenInt setup.
+
+# Automatically assigned PDG numbers
+   * Assigned PDG number 9000001 to particle ghA
+   * Assigned PDG number 9000002 to particle ghZ
+   * Assigned PDG number 9000003 to particle ghWp
+   * Assigned PDG number 9000004 to particle ghWm
+   * Assigned PDG number 9000005 to particle ghG
+   * Assigned PDG number 9000006 to particle h1
+
+
+# Compulsory PDG codes:
+   * Class SM leptons complete.
+   * Class SM neutrinos complete.
+   * Class SM quarks complete.
+   * Class SM gauge bosons complete.
+#
+# Parameter definitions
+#
+
+   * All parameters are ok.
+
+
+# Vertices
+   * Calling FeynmanRules for 1 Lagrangians.
+   * Number of classes vertices: 36
+   * Number of flavored vertices: 77
+   * Saved vertices in InterfaceRun[ 1 ].
+   * Removing all ghosts and Goldstone bosons form the output.
+   * Checked QNumber conservation.
+      - Quantum number GhostNumber conserved in all vertices.
+      - Quantum number LeptonNumber conserved in all vertices.
+      - Quantum number Q conserved in all vertices.
+   * particles.py written.
+   * parameters.py written.
+#
+# Vertex definitions
+#
+
+   * 76 vertices written.
+   * vertices.py written.
+#
+# Lorentz structure definitions
+#
+
+   * 22 lorentz structures written.
+   * lorentz.py written.
+#
+# Coupling definitions
+#
+
+   * 53 couplings written.
+   * couplings.py written.
+#
+# Coupling order definitions
+#
+
+   * 0 couplings orders written.
+   * coupling_orders.py written.

=== added file 'models/hgg_plugin/__init__.py'
--- models/hgg_plugin/__init__.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/__init__.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,32 @@
+
+import particles
+import couplings
+import lorentz
+import parameters
+import vertices
+import coupling_orders
+import write_param_card
+
+
+all_particles = particles.all_particles
+all_vertices = vertices.all_vertices
+all_couplings = couplings.all_couplings
+all_lorentz = lorentz.all_lorentz
+all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
+all_functions = function_library.all_functions
+
+try:
+   import decays
+except ImportError:
+   pass
+else:
+   all_decays = decays.all_decays
+
+
+gauge = [0, 1]
+
+
+__author__ = "N. Christensen, C. Duhr"
+__date__ = "02. 06. 2009"
+__version__= "1.3"

=== added file 'models/hgg_plugin/coupling_orders.py'
--- models/hgg_plugin/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/coupling_orders.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,24 @@
+# This file was automatically created by FeynRules 1.7.55
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (October 6, 2011)
+# Date: Wed 8 Aug 2012 14:16:24
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = 99,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = 99,
+                    hierarchy = 2)
+
+HIG = CouplingOrder(name = 'HIG',
+                    expansion_order = 1,
+                    hierarchy = 2)
+
+HIW = CouplingOrder(name = 'HIW',
+                    expansion_order = 1,
+                    hierarchy = 2)
+

=== added file 'models/hgg_plugin/couplings.py'
--- models/hgg_plugin/couplings.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/couplings.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,29 @@
+# This file was automatically created by FeynRules 1.7.55
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (October 6, 2011)
+# Date: Wed 8 Aug 2012 14:16:24
+
+
+from object_library import all_couplings, Coupling
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+
+GC_13 = Coupling(name = 'GC_13',
+                 value = '-(complex(0,1)*GH)',
+                 order = {'HIG':1})
+
+GC_14 = Coupling(name = 'GC_14',
+                 value = '-(G*GH)',
+                 order = {'HIG':1,'QCD':1})
+
+GC_15 = Coupling(name = 'GC_15',
+                 value = 'complex(0,1)*G**2*GH',
+                 order = {'HIG':1,'QCD':2})
+
+GC_16 = Coupling(name = 'GC_16',
+                 value = '(complex(0,1)*Gphi)/8.',
+                 order = {'HIG':1})
+
+GC_17 = Coupling(name = 'GC_17',
+                 value = '-(G*Gphi)',
+                 order = {'HIG':1,'QCD':1})

=== added file 'models/hgg_plugin/function_library.py'
--- models/hgg_plugin/function_library.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/function_library.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,54 @@
+# This file is part of the UFO.
+#
+# This file contains definitions for functions that
+# are extensions of the cmath library, and correspond
+# either to functions that are in cmath, but inconvenient
+# to access from there (e.g. z.conjugate()),
+# or functions that are simply not defined.
+#
+#
+
+__date__ = "22 July 2010"
+__author__ = "[e-mail]"
+
+import cmath
+from object_library import all_functions, Function
+
+#
+# shortcuts for functions from cmath
+#
+
+complexconjugate = Function(name = 'complexconjugate',
+                            arguments = ('z',),
+                            expression = 'z.conjugate()')
+
+
+re = Function(name = 're',
+              arguments = ('z',),
+              expression = 'z.real')
+
+im = Function(name = 'im',
+              arguments = ('z',),
+              expression = 'z.imag')
+
+# New functions (trigonometric)
+
+sec = Function(name = 'sec',
+             arguments = ('z',),
+             expression = '1./cmath.cos(z)')
+
+asec = Function(name = 'asec',
+             arguments = ('z',),
+             expression = 'cmath.acos(1./z)')
+
+csc = Function(name = 'csc',
+             arguments = ('z',),
+             expression = '1./cmath.sin(z)')
+
+acsc = Function(name = 'acsc',
+             arguments = ('z',),
+             expression = 'cmath.asin(1./z)')
+
+
+
+

=== added file 'models/hgg_plugin/lorentz.py'
--- models/hgg_plugin/lorentz.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/lorentz.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,38 @@
+# This file was automatically created by FeynRules 1.7.55
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (October 6, 2011)
+# Date: Wed 8 Aug 2012 14:16:24
+
+
+from object_library import all_lorentz, Lorentz
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+
+VVS1 = Lorentz(name = 'VVS1',
+               spins = [ 3, 3, 1 ],
+               structure = '-4*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,1) + 4*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,2)')
+
+VVS3 = Lorentz(name = 'VVS3',
+               spins = [ 3, 3, 1 ],
+               structure = 'P(1,2)*P(2,1) - P(-1,1)*P(-1,2)*Metric(1,2)')
+
+VVVS1 = Lorentz(name = 'VVVS1',
+                spins = [ 3, 3, 3, 1 ],
+                structure = 'Epsilon(1,2,3,-1)*P(-1,1) + Epsilon(1,2,3,-1)*P(-1,2) + Epsilon(1,2,3,-1)*P(-1,3)')
+
+VVVS2 = Lorentz(name = 'VVVS2',
+                spins = [ 3, 3, 3, 1 ],
+                structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,3)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,3)*Metric(2,3)')
+
+VVVVS1 = Lorentz(name = 'VVVVS1',
+                 spins = [ 3, 3, 3, 3, 1 ],
+                 structure = 'Metric(1,4)*Metric(2,3) - Metric(1,3)*Metric(2,4)')
+
+VVVVS2 = Lorentz(name = 'VVVVS2',
+                 spins = [ 3, 3, 3, 3, 1 ],
+                 structure = 'Metric(1,4)*Metric(2,3) - Metric(1,2)*Metric(3,4)')
+
+VVVVS3 = Lorentz(name = 'VVVVS3',
+                 spins = [ 3, 3, 3, 3, 1 ],
+                 structure = 'Metric(1,3)*Metric(2,4) - Metric(1,2)*Metric(3,4)')
+

=== added file 'models/hgg_plugin/object_library.py'
--- models/hgg_plugin/object_library.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/object_library.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,259 @@
+##
+##
+## Feynrules Header
+##
+##
+##
+##
+##
+
+import cmath
+
+
+class UFOBaseClass(object):
+    """The class from which all FeynRules classes are derived."""
+
+    require_args = []
+
+    def __init__(self, *args, **options):
+        assert(len(self.require_args) == len (args))
+    
+        for i, name in enumerate(self.require_args):
+            setattr(self, name, args[i])
+    
+        for (option, value) in options.items():
+            setattr(self, option, value)
+
+    def get(self, name):
+        return getattr(self, name)
+    
+    def set(self, name, value):
+        setattr(self, name, value)
+        
+    def get_all(self):
+        """Return a dictionary containing all the information of the object"""
+        return self.__dict__
+
+    def __str__(self):
+        return self.name
+
+    def nice_string(self):
+        """ return string with the full information """
+        return '\n'.join(['%s \t: %s' %(name, value) for name, value in self.__dict__.items()])
+
+    def __repr__(self):
+        replacements = [
+            ('+','__plus__'),
+            ('-','__minus__'),
+            ('@','__at__'),
+            ('!','__exclam__'),
+            ('?','__quest__'),
+            ('*','__star__'),
+            ('~','__tilde__')
+            ]
+        text = self.name
+        for orig,sub in replacements:
+            text = text.replace(orig,sub)
+        return text
+
+
+
+all_particles = []
+
+    
+
+class Particle(UFOBaseClass):
+    """A standard Particle"""
+
+    require_args=['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'charge']
+
+    require_args_all = ['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'charge', 'line', 'propagating', 'goldstoneboson']
+
+    def __init__(self, pdg_code, name, antiname, spin, color, mass, width, texname,
+                 antitexname, charge , line=None, propagating=True, goldstoneboson=False, **options):
+
+        args= (pdg_code, name, antiname, spin, color, mass, width, texname,
+                 antitexname, float(charge))
+
+        UFOBaseClass.__init__(self, *args,  **options)
+
+        global all_particles
+        all_particles.append(self)
+
+        self.propagating = propagating
+        self.goldstoneboson= goldstoneboson
+
+        self.selfconjugate = (name == antiname)
+        if 1: #not line:
+            self.line = self.find_line_type()
+        else:
+            self.line = line
+
+
+
+
+    def find_line_type(self):
+        """ find how we draw a line if not defined
+        valid output: dashed/straight/wavy/curly/double/swavy/scurly
+        """
+        
+        spin = self.spin
+        color = self.color
+        
+        #use default
+        if spin == 1:
+            return 'dashed'
+        elif spin == 2:
+            if not self.selfconjugate:
+                return 'straight'
+            elif color == 1:
+                return 'swavy'
+            else:
+                return 'scurly'
+        elif spin == 3:
+            if color == 1:
+                return 'wavy'
+            
+            else:
+                return 'curly'
+        elif spin == 5:
+            return 'double'
+        elif spin == -1:
+            return 'dotted'
+        else:
+            return 'dashed' # not supported yet
+
+    def anti(self):
+        if self.selfconjugate:
+            raise Exception('%s has no anti particle.' % self.name) 
+        outdic = {}
+        for k,v in self.__dict__.iteritems():
+            if k not in self.require_args_all:                
+                outdic[k] = -v
+        if self.color in [1,8]:
+            newcolor = self.color
+        else:
+            newcolor = -self.color
+                
+        return Particle(-self.pdg_code, self.antiname, self.name, self.spin, newcolor, self.mass, self.width,
+                        self.antitexname, self.texname, -self.charge, self.line, self.propagating, self.goldstoneboson, **outdic)
+
+
+
+all_parameters = []
+
+class Parameter(UFOBaseClass):
+
+    require_args=['name', 'nature', 'type', 'value', 'texname']
+
+    def __init__(self, name, nature, type, value, texname, lhablock=None, lhacode=None):
+
+        args = (name,nature,type,value,texname)
+
+        UFOBaseClass.__init__(self, *args)
+
+        args=(name,nature,type,value,texname)
+
+        global all_parameters
+        all_parameters.append(self)
+
+        if (lhablock is None or lhacode is None)  and nature == 'external':
+            raise Exception('Need LHA information for external parameter "%s".' % name)
+        self.lhablock = lhablock
+        self.lhacode = lhacode
+
+all_vertices = []
+
+class Vertex(UFOBaseClass):
+
+    require_args=['name', 'particles', 'color', 'lorentz', 'couplings']
+
+    def __init__(self, name, particles, color, lorentz, couplings, **opt):
+ 
+        args = (name, particles, color, lorentz, couplings)
+
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        args=(particles,color,lorentz,couplings)
+
+        global all_vertices
+        all_vertices.append(self)
+
+all_couplings = []
+
+class Coupling(UFOBaseClass):
+
+    require_args=['name', 'value', 'order']
+
+    def __init__(self, name, value, order, **opt):
+
+        args =(name, value, order)	
+        UFOBaseClass.__init__(self, *args, **opt)
+        global all_couplings
+        all_couplings.append(self)
+  
+
+
+all_lorentz = []
+
+class Lorentz(UFOBaseClass):
+
+    require_args=['name','spins','structure']
+    
+    def __init__(self, name, spins, structure='external', **opt):
+        args = (name, spins, structure)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_lorentz
+        all_lorentz.append(self)
+
+
+all_functions = []
+
+class Function(object):
+
+    def __init__(self, name, arguments, expression):
+
+        global all_functions
+        all_functions.append(self)
+
+        self.name = name
+        self.arguments = arguments
+        self.expr = expression
+    
+    def __call__(self, *opt):
+
+        for i, arg in enumerate(self.arguments):
+            exec('%s = %s' % (arg, opt[i] ))
+
+        return eval(self.expr)
+
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+
+all_decays = []
+
+class Decay(UFOBaseClass):
+    require_args = ['particle','partial_widths']
+
+    def __init__(self, particle, partial_widths, **opt):
+        args = (particle, partial_widths)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_decays
+        all_decays.append(self)
+    
+        # Add the information directly to the particle
+        particle.partial_widths = partial_widths
+
+        

=== added file 'models/hgg_plugin/parameters.py'
--- models/hgg_plugin/parameters.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/parameters.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,149 @@
+# This file was automatically created by FeynRules 1.7.55
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (October 6, 2011)
+# Date: Wed 8 Aug 2012 14:16:24
+
+
+
+from object_library import all_parameters, Parameter
+
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+# This is a default parameter object representing 0.
+ZERO = Parameter(name = 'ZERO',
+                 nature = 'internal',
+                 type = 'real',
+                 value = '0.0',
+                 texname = '0')
+
+MH = Parameter(name = 'MH',
+               nature = 'external',
+               type = 'real',
+               value = 125,
+               texname = '\\text{MH}',
+               lhablock = 'MASS',
+               lhacode = [ 25 ])
+
+MT = Parameter(name = 'MT',
+               nature = 'external',
+               type = 'real',
+               value = 172,
+               texname = '\\text{MT}',
+               lhablock = 'MASS',
+               lhacode = [ 6 ])
+
+Gf = Parameter(name = 'Gf',
+               nature = 'external',
+               type = 'real',
+               value = 0.0000116637,
+               texname = 'G_f',
+               lhablock = 'SMINPUTS',
+               lhacode = [ 2 ])
+
+
+MZ = Parameter(name = 'MZ',
+               nature = 'external',
+               type = 'real',
+               value = 91.1876,
+               texname = '\\text{MZ}',
+               lhablock = 'MASS',
+               lhacode = [ 23 ])
+
+aEWM1 = Parameter(name = 'aEWM1',
+                  nature = 'external',
+                  type = 'real',
+                  value = 132.50698,
+                  texname = '\\text{aEWM1}',
+                  lhablock = 'SMINPUTS',
+                  lhacode = [ 1 ])
+
+aEW = Parameter(name = 'aEW',
+                nature = 'internal',
+                type = 'real',
+                value = '1/aEWM1',
+                texname = '\\text{aEW}')
+
+MW = Parameter(name = 'MW',
+               nature = 'internal',
+               type = 'real',
+               value = 'cmath.sqrt(MZ**2/2. + cmath.sqrt(MZ**4/4. - (aEW*cmath.pi*MZ**2)/(Gf*cmath.sqrt(2))))',
+               texname = 'M_W')
+
+ee = Parameter(name = 'ee',
+               nature = 'internal',
+               type = 'real',
+               value = '2*cmath.sqrt(aEW)*cmath.sqrt(cmath.pi)',
+               texname = 'e')
+
+sw2 = Parameter(name = 'sw2',
+                nature = 'internal',
+                type = 'real',
+                value = '1 - MW**2/MZ**2',
+                texname = '\\text{sw2}')
+
+sw = Parameter(name = 'sw',
+               nature = 'internal',
+               type = 'real',
+               value = 'cmath.sqrt(sw2)',
+               texname = 's_w')
+
+v = Parameter(name = 'v',
+              nature = 'internal',
+              type = 'real',
+              value = '(2*MW*sw)/ee',
+              texname = 'v')
+
+aS = Parameter(name = 'aS',
+               nature = 'external',
+               type = 'real',
+               value = 0.118,
+               texname = '\\text{aS}',
+               lhablock = 'SMINPUTS',
+               lhacode = [ 3 ])
+
+G = Parameter(name = 'G',
+              nature = 'internal',
+              type = 'real',
+              value = '2*cmath.sqrt(aS)*cmath.sqrt(cmath.pi)',
+              texname = 'G')
+
+GH = Parameter(name = 'GH',
+               nature = 'internal',
+               type = 'real',
+               value = '-(G**2*(1 + (13*MH**6)/(16800.*MT**6) + MH**4/(168.*MT**4) + (7*MH**2)/(120.*MT**2)))/(12.*cmath.pi**2*v)',
+               texname = 'G_H')
+
+
+
+
+
+WH = Parameter(name = 'WH',
+               nature = 'external',
+               type = 'real',
+               value = 6.38233934e-03,
+               texname = '\\text{WH}',
+               lhablock = 'DECAY',
+               lhacode = [ 25 ])
+
+WH1 = Parameter(name = 'WH1',
+                nature = 'external',
+                type = 'real',
+                value = 0.00575308848,
+                texname = '\\text{WH1}',
+                lhablock = 'DECAY',
+                lhacode = [ 9000006 ])
+
+MP = Parameter(name = 'MP',
+               nature = 'external',
+               type = 'real',
+               value = 120,
+               texname = '\\text{MP}',
+               lhablock = 'MASS',
+               lhacode = [ 9000006 ])
+
+Gphi = Parameter(name = 'Gphi',
+                 nature = 'internal',
+                 type = 'real',
+                 value = '-(G**2*(1 + MH**6/(560.*MT**6) + MH**4/(90.*MT**4) + MH**2/(12.*MT**2)))/(8.*cmath.pi**2*v)',
+                 texname = 'G_h')
+

=== added file 'models/hgg_plugin/particles.py'
--- models/hgg_plugin/particles.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/particles.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,48 @@
+# This file was automatically created by FeynRules 1.7.55
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (October 6, 2011)
+# Date: Wed 8 Aug 2012 14:16:24
+
+
+from __future__ import division
+from object_library import all_particles, Particle
+import parameters as Param
+
+G = Particle(pdg_code = 21,
+             name = 'G',
+             antiname = 'G',
+             spin = 3,
+             color = 8,
+             mass = Param.ZERO,
+             width = Param.ZERO,
+             texname = 'G',
+             antitexname = 'G',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0)
+
+H = Particle(pdg_code = 25,
+             name = 'H',
+             antiname = 'H',
+             spin = 1,
+             color = 1,
+             mass = Param.MH,
+             width = Param.WH,
+             texname = '\\phi',
+             antitexname = '\\phi',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0)
+
+h1 = Particle(pdg_code = 9000006,
+              name = 'h1',
+              antiname = 'h1',
+              spin = 1,
+              color = 1,
+              mass = Param.MP,
+              width = Param.WH1,
+              texname = 'h1',
+              antitexname = 'h1',
+              charge = 0,
+              GhostNumber = 0,
+              LeptonNumber = 0)
+

=== added file 'models/hgg_plugin/vertices.py'
--- models/hgg_plugin/vertices.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/vertices.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,40 @@
+# This file was automatically created by FeynRules 1.7.55
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (October 6, 2011)
+# Date: Wed 8 Aug 2012 14:16:24
+
+
+from object_library import all_vertices, Vertex
+import particles as P
+import couplings as C
+import lorentz as L
+
+V_13 = Vertex(name = 'V_13',
+              particles = [ P.G, P.G, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.VVS3 ],
+              couplings = {(0,0):C.GC_13})
+
+V_37 = Vertex(name = 'V_37',
+              particles = [ P.G, P.G, P.h1 ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.VVS1 ],
+              couplings = {(0,0):C.GC_16})
+
+V_41 = Vertex(name = 'V_41',
+              particles = [ P.G, P.G, P.G, P.H ],
+              color = [ 'f(1,2,3)' ],
+              lorentz = [ L.VVVS2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_42 = Vertex(name = 'V_42',
+              particles = [ P.G, P.G, P.G, P.G, P.H ],
+              color = [ 'f(-1,1,2)*f(3,4,-1)', 'f(-1,1,3)*f(2,4,-1)', 'f(-1,1,4)*f(2,3,-1)' ],
+              lorentz = [ L.VVVVS1, L.VVVVS2, L.VVVVS3 ],
+              couplings = {(1,1):C.GC_15,(0,0):C.GC_15,(2,2):C.GC_15})
+
+V_43 = Vertex(name = 'V_43',
+              particles = [ P.G, P.G, P.G, P.h1 ],
+              color = [ 'f(1,2,3)' ],
+              lorentz = [ L.VVVS1 ],
+              couplings = {(0,0):C.GC_17})
+

=== added file 'models/hgg_plugin/write_param_card.py'
--- models/hgg_plugin/write_param_card.py	1970-01-01 00:00:00 +0000
+++ models/hgg_plugin/write_param_card.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,181 @@
+
+__date__ = "02 Aug 2012"
+__author__ = '[e-mail]'
+
+from function_library import *
+
+class ParamCardWriter(object):
+    
+    header = \
+    """######################################################################\n""" + \
+    """## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################\n""" + \
+    """######################################################################\n"""   
+    
+    def __init__(self, filename, list_of_parameters=None, generic=False):
+        """write a valid param_card.dat"""
+        
+        if not list_of_parameters:
+            from parameters import all_parameters
+            list_of_parameters = [param for param in all_parameters if \
+                                                       param.nature=='external']
+        
+        self.generic_output = generic
+        if generic:
+            self.define_not_dep_param(list_of_parameters)
+
+        
+        self.fsock = open(filename, 'w')
+        self.fsock.write(self.header)
+        
+        self.write_card(list_of_parameters)
+        self.fsock.close()
+    
+    def define_not_dep_param(self, list_of_parameters):
+        """define self.dep_mass and self.dep_width in case that they are 
+        requested in the param_card.dat"""
+        from particles import all_particles
+        
+        self.dep_mass = [(part, part.mass) for part in all_particles \
+                            if part.pdg_code > 0 and \
+                                            part.mass not in list_of_parameters]
+        self.dep_width = [(part, part.width) for part in all_particles\
+                             if part.pdg_code > 0 and \
+                                part.width not in list_of_parameters]        
+    
+    @staticmethod
+    def order_param(obj1, obj2):
+        """ order parameter of a given block """
+        
+        maxlen = min([len(obj1.lhacode), len(obj2.lhacode)])
+    
+        for i in range(maxlen):
+            if obj1.lhacode[i] < obj2.lhacode[i]:
+                return -1
+            elif obj1.lhacode[i] == obj2.lhacode[i]:
+                return 0
+            else:
+                return 1
+        #identical up to the first finish
+        if len(obj1.lhacode) > len(obj2.lhacode):
+            return 1
+        elif  len(obj1.lhacode) == len(obj2.lhacode):
+            return 0
+        else:
+            return -1
+        
+    def write_card(self, all_ext_param):
+        """ """
+        
+        # list all lhablock
+        all_lhablock = set([param.lhablock for param in all_ext_param])
+        
+        # ordonate lhablock alphabeticaly
+        all_lhablock = list(all_lhablock)
+        all_lhablock.sort()
+        # put at the beginning SMINPUT + MASS + DECAY
+        for name in ['DECAY', 'MASS','SMINPUTS']:
+            if name in all_lhablock:
+                all_lhablock.remove(name)
+                all_lhablock.insert(0, name)
+        
+        for lhablock in all_lhablock:
+            self.write_block(lhablock)
+            need_writing = [ param for param in all_ext_param if \
+                                                     param.lhablock == lhablock]
+            need_writing.sort(self.order_param)
+            [self.write_param(param, lhablock) for param in need_writing]
+            
+            if self.generic_output:
+                if lhablock in ['MASS', 'DECAY']:
+                    self.write_dep_param_block(lhablock)
+
+        if self.generic_output:
+            self.write_qnumber()
+                               
+    def write_block(self, name):
+        """ write a comment for a block"""
+        
+        self.fsock.writelines(
+        """\n###################################""" + \
+        """\n## INFORMATION FOR %s""" % name.upper() +\
+        """\n###################################\n"""
+         )
+        if name!='DECAY':
+            self.fsock.write("""Block %s \n""" % name)
+
+    def write_param(self, param, lhablock):
+        
+        lhacode=' '.join(['%3s' % key for key in param.lhacode])
+        if lhablock != 'DECAY':
+            text = """  %s %e # %s \n""" % (lhacode, complex(param.value).real, param.name ) 
+        else:
+            text = '''DECAY %s %e \n''' % (lhacode, complex(param.value).real)
+        self.fsock.write(text) 
+                    
+
+
+    
+    def write_dep_param_block(self, lhablock):
+        import cmath
+        from parameters import all_parameters
+        for parameter in all_parameters:
+            exec("%s = %s" % (parameter.name, parameter.value))
+        text = "##  Not dependent paramater.\n"
+        text += "## Those values should be edited following analytical the \n"
+        text += "## analytical expression. Some generator could simply ignore \n"
+        text += "## those values and use the analytical expression\n"
+        
+        if lhablock == 'MASS':
+            data = self.dep_mass
+            prefix = " "
+        else:
+            data = self.dep_width
+            prefix = "DECAY "
+        for part, param in data:
+            if isinstance(param.value, str):
+                value = complex(eval(param.value)).real
+            else:
+                value = param.value
+            
+            text += """%s %s %f # %s : %s \n""" %(prefix, part.pdg_code, 
+                        value, part.name, param.value)
+        self.fsock.write(text)    
+    
+    sm_pdg = [1,2,3,4,5,6,11,12,13,13,14,15,16,21,22,23,24,25]
+    data="""Block QNUMBERS %(pdg)d  # %(name)s 
+        1 %(charge)d  # 3 times electric charge
+        2 %(spin)d  # number of spin states (2S+1)
+        3 %(color)d  # colour rep (1: singlet, 3: triplet, 8: octet)
+        4 %(antipart)d  # Particle/Antiparticle distinction (0=own anti)\n"""
+    
+    def write_qnumber(self):
+        """ write qnumber """
+        from particles import all_particles
+        import particles
+        print particles.__file__
+        text="""#===========================================================\n"""
+        text += """# QUANTUM NUMBERS OF NEW STATE(S) (NON SM PDG CODE)\n"""
+        text += """#===========================================================\n\n"""
+        
+        for part in all_particles:
+            if part.pdg_code in self.sm_pdg or part.pdg_code < 0:
+                continue
+            text += self.data % {'pdg': part.pdg_code,
+                                 'name': part.name,
+                                 'charge': 3 * part.charge,
+                                 'spin': part.spin,
+                                 'color': part.color,
+                                 'antipart': part.name != part.antiname and 1 or 0}
+        
+        self.fsock.write(text)
+        
+            
+            
+            
+            
+        
+            
+if '__main__' == __name__:
+    ParamCardWriter('./param_card.dat', generic=True)
+    print 'write ./param_card.dat'
+    

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2014-03-09 23:55:25 +0000
+++ models/import_ufo.py	2014-03-24 03:30:32 +0000
@@ -137,7 +137,6 @@
     """ a practical and efficient way to import one of those models 
         (no restriction file use)"""
 
-
     assert model_path == find_ufo_path(model_path)
     if prefix is True:
         prefix='mdl_'
@@ -203,14 +202,15 @@
      
     # Load basic information
     ufo_model = ufomodels.load_model(model_path, decay)
-    ufo2mg5_converter = UFOMG5Converter(ufo_model)
+    ufo2mg5_converter = UFOMG5Converter(ufo_model)    
     model = ufo2mg5_converter.load_model()
-    
     if model_path[-1] == '/': model_path = model_path[:-1] #avoid empty name
     model.set('name', os.path.split(model_path)[-1])
-
-    # Load the Parameter/Coupling in a convinient format.
-    parameters, couplings = OrganizeModelExpression(ufo_model).main()
+    
+    # Load the Parameter/Coupling in a convenient format.
+    parameters, couplings = OrganizeModelExpression(ufo_model).main(\
+             additional_couplings = ufo2mg5_converter.wavefunction_CT_couplings)
+    
     model.set('parameters', parameters)
     model.set('couplings', couplings)
     model.set('functions', ufo_model.all_functions)
@@ -244,18 +244,16 @@
     #    model.restrict_model(restrict_file)
 
     return model
-    
 
 class UFOMG5Converter(object):
     """Convert a UFO model to the MG5 format"""
 
-
-
     def __init__(self, model, auto=False):
         """ initialize empty list for particles/interactions """
        
         self.particles = base_objects.ParticleList()
         self.interactions = base_objects.InteractionList()
+        self.wavefunction_CT_couplings = []
                         
         # Check here if we can extract the couplings perturbed in this model
         # which indicate a loop model or if this model is only meant for 
@@ -423,7 +421,7 @@
                     particle.set(key,abs(value))
                     if value<0:
                         particle.set('ghost',True)
-                elif key == 'propagator':
+                elif key == 'propagator' and value:
                     if aloha.unitary_gauge:
                         particle.set(key, str(value[0]))
                     else: 
@@ -471,7 +469,12 @@
             if len([1 for k in key[:-1] if k==1])==1 and \
                not any(k>1 for k in key[:-1]):
                 newParticleCountertermKey=[None,\
-                  tuple([tuple([abs(part.pdg_code) for part in loop_parts]) for\
+#                  The line below is for loop UFO Model with the 'attribute' 
+#                  'loop_particles' of the Particle objects to be defined with
+#                  instances of the particle class. The new convention is to use
+#                  pdg numbers instead.
+#                  tuple([tuple([abs(part.pdg_code) for part in loop_parts]) for\
+                  tuple([tuple(loop_parts) for\
                     loop_parts in loop_particles[key[-1]]])]
                 for i, order in enumerate(self.ufomodel.all_orders[:-1]):
                     if key[i]==1:
@@ -486,6 +489,7 @@
                     name = newCouplingName,
                     value = counterterm,
                     order = {newParticleCountertermKey[0]:2})
+                self.wavefunction_CT_couplings.append(self.ufomodel.all_couplings.pop())
 
         particle.set('counterterm',particle_counterterms)
         self.particles.append(particle)
@@ -535,8 +539,7 @@
                     if poleOrder!=0:
                         newCoupling.name=newCoupling.name+"_"+str(poleOrder)+"eps"
                     newCoupling.value=coupling.pole(poleOrder)
-                    new_couplings[key[2]][poleOrder][(key[0],key[1])]=\
-                      newCoupling
+                    new_couplings[key[2]][poleOrder][(key[0],key[1])] = newCoupling
         
         # Now we can add an interaction for each.         
         for i, all_couplings in enumerate(new_couplings):
@@ -954,12 +957,13 @@
         self.couplings = {}  # depend on -> ModelVariable
         self.all_expr = {} # variable_name -> ModelVariable
     
-    def main(self):
+    def main(self, additional_couplings = []):
         """Launch the actual computation and return the associate 
-        params/couplings."""
+        params/couplings. Possibly consider additional_couplings in addition
+        to those defined in the UFO model attribute all_couplings """
         
         self.analyze_parameters()
-        self.analyze_couplings()
+        self.analyze_couplings(additional_couplings = additional_couplings)
         return self.params, self.couplings
 
 
@@ -1011,27 +1015,27 @@
         
                 
 
-    def analyze_couplings(self):
+    def analyze_couplings(self,additional_couplings=[]):
         """creates the shortcut for all special function/parameter
         separate the couplings dependent of track variables of the others"""
         
         # First expand the couplings on all their non-zero contribution to the 
         # three laurent orders 0, -1 and -2.
         if self.perturbation_couplings:
-            new_couplings_list=[]
-            for coupling in self.model.all_couplings:
+            couplings_list=[]
+            for coupling in self.model.all_couplings + additional_couplings:
                 for poleOrder in range(0,3):
                     newCoupling=copy.deepcopy(coupling)
                     if poleOrder!=0:
                         newCoupling.name=newCoupling.name+"_"+str(poleOrder)+"eps"
                     if newCoupling.pole(poleOrder)!='ZERO':                    
                         newCoupling.value=newCoupling.pole(poleOrder)
-                        new_couplings_list.append(newCoupling)
-            self.model.all_couplings=new_couplings_list
-                        
+                        couplings_list.append(newCoupling)
+        else:
+            couplings_list = self.model.all_couplings + additional_couplings                        
                                         
         
-        for coupling in self.model.all_couplings:
+        for coupling in couplings_list:
             # shorten expression, find dependencies, create short object
             expr = self.shorten_expr(coupling.value)
             depend_on = self.find_dependencies(expr)
@@ -1595,6 +1599,9 @@
             data.remove(param_info[param]['obj'])
 
                 
+
+
+
                 
         
         

=== modified file 'models/loop_sm/object_library.py'
--- models/loop_sm/object_library.py	2012-11-29 22:27:28 +0000
+++ models/loop_sm/object_library.py	2014-03-24 03:30:32 +0000
@@ -149,7 +149,7 @@
 
     require_args=['name', 'nature', 'type', 'value', 'texname']
 
-    def __init__(self, name, nature, type, value, texname, lhablock=None, lhacode=None):
+    def __init__(self, name, nature, type, value, texname, lhablock=None, lhacode=None, loop_particles=None, counterterm=None):
 
         args = (name,nature,type,value,texname)
 

=== modified file 'models/loop_sm/particles.py'
--- models/loop_sm/particles.py	2013-03-03 22:20:25 +0000
+++ models/loop_sm/particles.py	2014-03-24 03:30:32 +0000
@@ -315,28 +315,28 @@
 
 # Wavefunction renormalization
 
-b.loop_particles = [[[b,G]]]
+b.loop_particles = [[[5,21]]]
 b.counterterm = {(1,0,0):CTParam.bWcft_UV.value}
 
-c.loop_particles = [[[c,G]]]
+c.loop_particles = [[[4,21]]]
 c.counterterm = {(1,0,0):CTParam.cWcft_UV.value}
 
-t.loop_particles = [[[t,G]]]
+t.loop_particles = [[[6,21]]]
 t.counterterm = {(1,0,0):CTParam.tWcft_UV.value}
 
-G.loop_particles = [[[c]],[[b]],[[t]]]
+G.loop_particles = [[[4]],[[5]],[[6]]]
 G.counterterm = {(1,0,0):CTParam.GWcft_UV_c.value,(1,0,1):CTParam.GWcft_UV_b.value,(1,0,2):CTParam.GWcft_UV_t.value}
 
 # Set counterterms values
 
-Param.MB.loop_particles= [[[b,G]]]
-Param.MB.counterterm = {(1,0,0):CTParam.bMass_UV.value}
-
-Param.MC.loop_particles= [[[c,G]]]
-Param.MC.counterterm = {(1,0,0):CTParam.cMass_UV.value}
-
-Param.MT.loop_particles= [[[t,G]]]
-Param.MT.counterterm = {(1,0,0):CTParam.tMass_UV.value}
-
-Param.G.loop_particles = [[[u],[d],[s]],[[c]],[[b]],[[t]],[[G]]],
-Param.G.counterterm = {(1,0,0):CTParam.G_UVq.value,(1,0,1):CTParam.G_UVc.value,(1,0,2):CTParam.G_UVb.value,(1,0,3):CTParam.G_UVt.value,(1,0,4):CTParam.G_UVg.value},
+#Param.MB.loop_particles= [[[5,21]]]
+#Param.MB.counterterm = {(1,0,0):CTParam.bMass_UV.value}
+
+#Param.MC.loop_particles= [[[4,21]]]
+#Param.MC.counterterm = {(1,0,0):CTParam.cMass_UV.value}
+
+#Param.MT.loop_particles= [[[6,21]]]
+#Param.MT.counterterm = {(1,0,0):CTParam.tMass_UV.value}
+
+#Param.G.loop_particles = [[[2],[1],[3]],[[4]],[[5]],[[6]],[[21]]],
+#Param.G.counterterm = {(1,0,0):CTParam.G_UVq.value,(1,0,1):CTParam.G_UVc.value,(1,0,2):CTParam.G_UVb.value,(1,0,3):CTParam.G_UVt.value,(1,0,4):CTParam.G_UVg.value},

=== modified file 'models/sm/__init__.py'
--- models/sm/__init__.py	2012-10-25 06:22:56 +0000
+++ models/sm/__init__.py	2014-03-24 03:30:32 +0000
@@ -5,7 +5,10 @@
 import vertices
 import coupling_orders
 import write_param_card
-import decays
+try:
+    import decays
+except ImportError:
+    pass    
 try:
     import build_restrict
 except ImportError:
@@ -22,7 +25,7 @@
 all_parameters = parameters.all_parameters
 all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
-all_decays = decays.all_decays
+#all_decays = decays.all_decays
 
 
 __author__ = "N. Christensen, C. Duhr"

=== added directory 'models/taudecay_UFO'
=== added file 'models/taudecay_UFO/__init__.py'
--- models/taudecay_UFO/__init__.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/__init__.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,48 @@
+
+import particles
+import couplings
+import lorentz
+import parameters
+import vertices
+import coupling_orders
+import write_param_card
+import propagators
+
+
+all_particles = particles.all_particles
+all_vertices = vertices.all_vertices
+all_couplings = couplings.all_couplings
+all_lorentz = lorentz.all_lorentz
+all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
+all_functions = function_library.all_functions
+all_propagators = propagators.all_propagators
+
+try:
+   import decays
+except ImportError:
+   pass
+else:
+   all_decays = decays.all_decays
+
+try:
+   import form_factors
+except ImportError:
+   pass
+else:
+   all_form_factors = form_factors.all_form_factors
+
+try:
+   import CT_vertices
+except ImportError:
+   pass
+else:
+   all_CTvertices = CT_vertices.all_CTvertices
+
+
+gauge = [0]
+
+
+__author__ = "K. Mawatari, J. Nakamura"
+__date__ = "2013.05.29"
+__version__= "1.0"

=== added file 'models/taudecay_UFO/coupling_orders.py'
--- models/taudecay_UFO/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/coupling_orders.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,16 @@
+# This file was automatically created by FeynRules 2.0.6
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (February 23, 2011)
+# Date: Wed 18 Dec 2013 14:14:59
+
+
+from object_library import all_orders, CouplingOrder
+
+
+EFT = CouplingOrder(name = 'EFT',
+                    expansion_order = 99,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = 99,
+                    hierarchy = 1)
+

=== added file 'models/taudecay_UFO/couplings.py'
--- models/taudecay_UFO/couplings.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/couplings.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,15 @@
+# This file was automatically created by FeynRules 2.0.6
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (February 23, 2011)
+# Date: Wed 18 Dec 2013 14:14:59
+
+
+from object_library import all_couplings, Coupling
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec, cot
+
+
+
+GC_1 = Coupling(name = 'GC_1',
+                value = '-(F1*Gf*cmath.cos(cabi)*cmath.sqrt(2))',
+                order = {'EFT':1,'QED':2})
+

=== added file 'models/taudecay_UFO/function_library.py'
--- models/taudecay_UFO/function_library.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/function_library.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,71 @@
+# This file is part of the UFO.
+#
+# This file contains definitions for functions that
+# are extensions of the cmath library, and correspond
+# either to functions that are in cmath, but inconvenient
+# to access from there (e.g. z.conjugate()),
+# or functions that are simply not defined.
+#
+#
+
+__date__ = "22 July 2010"
+__author__ = "[e-mail]"
+
+import cmath
+from object_library import all_functions, Function
+
+#
+# shortcuts for functions from cmath
+#
+
+complexconjugate = Function(name = 'complexconjugate',
+                            arguments = ('z',),
+                            expression = 'z.conjugate()')
+
+
+re = Function(name = 're',
+              arguments = ('z',),
+              expression = 'z.real')
+
+im = Function(name = 'im',
+              arguments = ('z',),
+              expression = 'z.imag')
+
+# New functions (trigonometric)
+
+sec = Function(name = 'sec',
+             arguments = ('z',),
+             expression = '1./cmath.cos(z)')
+
+asec = Function(name = 'asec',
+             arguments = ('z',),
+             expression = 'cmath.acos(1./z)')
+
+csc = Function(name = 'csc',
+             arguments = ('z',),
+             expression = '1./cmath.sin(z)')
+
+acsc = Function(name = 'acsc',
+             arguments = ('z',),
+             expression = 'cmath.asin(1./z)')
+
+cot = Function(name = 'cot',
+               arguments = ('z',),
+               expression = '1./cmath.tan(z)')
+
+# Heaviside theta function
+
+theta_function = Function(name = 'theta_function',
+             arguments = ('x','y','z'),
+             expression = 'y if x else z')
+
+# Auxiliary functions for NLO
+
+cond = Function(name = 'cond',
+                arguments = ('condition','ExprTrue','ExprFalse'),
+                expression = '(ExprTrue if condition==0.0 else ExprFalse)')
+
+reglog = Function(name = 'reglog',
+                arguments = ('z'),
+                expression = '(0.0 if z==0.0 else cmath.log(z))')
+

=== added file 'models/taudecay_UFO/lorentz.py'
--- models/taudecay_UFO/lorentz.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/lorentz.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,14 @@
+# This file was automatically created by FeynRules 2.0.6
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (February 23, 2011)
+# Date: Wed 18 Dec 2013 14:14:59
+
+
+from object_library import all_lorentz, Lorentz
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec, cot
+
+
+FFS1 = Lorentz(name = 'FFS1',
+               spins = [ 2, 2, 1 ],
+               structure = 'P(-1,3)*Gamma(-1,2,-2)*ProjM(-2,1)')
+

=== added file 'models/taudecay_UFO/object_library.py'
--- models/taudecay_UFO/object_library.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/object_library.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,377 @@
+##
+##
+## Feynrules Header
+##
+##
+##
+##
+##
+
+import cmath
+import re
+
+class UFOError(Exception):
+        """Exception raised if when inconsistencies are detected in the UFO model."""
+        pass
+
+class UFOBaseClass(object):
+    """The class from which all FeynRules classes are derived."""
+
+    require_args = []
+
+    def __init__(self, *args, **options):
+        assert(len(self.require_args) == len (args))
+    
+        for i, name in enumerate(self.require_args):
+            setattr(self, name, args[i])
+    
+        for (option, value) in options.items():
+            setattr(self, option, value)
+
+    def get(self, name):
+        return getattr(self, name)
+    
+    def set(self, name, value):
+        setattr(self, name, value)
+        
+    def get_all(self):
+        """Return a dictionary containing all the information of the object"""
+        return self.__dict__
+
+    def __str__(self):
+        return self.name
+
+    def nice_string(self):
+        """ return string with the full information """
+        return '\n'.join(['%s \t: %s' %(name, value) for name, value in self.__dict__.items()])
+
+    def __repr__(self):
+        replacements = [
+            ('+','__plus__'),
+            ('-','__minus__'),
+            ('@','__at__'),
+            ('!','__exclam__'),
+            ('?','__quest__'),
+            ('*','__star__'),
+            ('~','__tilde__')
+            ]
+        text = self.name
+        for orig,sub in replacements:
+            text = text.replace(orig,sub)
+        return text
+
+
+
+all_particles = []
+
+class Particle(UFOBaseClass):
+    """A standard Particle"""
+
+    require_args=['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'charge']
+
+    require_args_all = ['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname','counterterm','charge', 'line', 'propagating', 'goldstoneboson', 'propagator']
+
+    def __init__(self, pdg_code, name, antiname, spin, color, mass, width, texname,
+                 antitexname, charge , line=None, propagating=True, counterterm=None, goldstoneboson=False, 
+                 propagator=None, **options):
+
+        args= (pdg_code, name, antiname, spin, color, mass, width, texname,
+                antitexname, float(charge))
+
+        UFOBaseClass.__init__(self, *args,  **options)
+
+        global all_particles
+        all_particles.append(self)
+
+        self.propagating = propagating
+        self.goldstoneboson= goldstoneboson
+
+        self.selfconjugate = (name == antiname)
+        if not line:                                                                                                                                                                                   
+            self.line = self.find_line_type()
+        else:
+            self.line = line
+
+        if propagator:
+            if isinstance(propagator, dict):
+                self.propagator = propagator
+            else:
+                self.propagator = {0: propagator, 1: propagator}
+             
+    def find_line_type(self):
+        """ find how we draw a line if not defined
+        valid output: dashed/straight/wavy/curly/double/swavy/scurly
+        """
+        
+        spin = self.spin
+        color = self.color
+        
+        #use default
+        if spin == 1:
+            return 'dashed'
+        elif spin == 2:
+            if not self.selfconjugate:
+                return 'straight'
+            elif color == 1:
+                return 'swavy'
+            else:
+                return 'scurly'
+        elif spin == 3:
+            if color == 1:
+                return 'wavy'
+            
+            else:
+                return 'curly'
+        elif spin == 5:
+            return 'double'
+        elif spin == -1:
+            return 'dotted'
+        else:
+            return 'dashed' # not supported yet
+        
+    def anti(self):
+        if self.selfconjugate:
+            raise Exception('%s has no anti particle.' % self.name) 
+        outdic = {}
+        for k,v in self.__dict__.iteritems():
+            if k not in self.require_args_all:                
+                outdic[k] = -v
+        if self.color in [1,8]:
+            newcolor = self.color
+        else:
+            newcolor = -self.color
+                
+        return Particle(-self.pdg_code, self.antiname, self.name, self.spin, newcolor, self.mass, self.width,
+                        self.antitexname, self.texname, -self.charge, self.line, self.propagating, self.goldstoneboson, **outdic)
+
+
+
+all_parameters = []
+
+class Parameter(UFOBaseClass):
+
+    require_args=['name', 'nature', 'type', 'value', 'texname']
+
+    def __init__(self, name, nature, type, value, texname, lhablock=None, lhacode=None):
+
+        args = (name,nature,type,value,texname)
+
+        UFOBaseClass.__init__(self, *args)
+
+        args=(name,nature,type,value,texname)
+
+        global all_parameters
+        all_parameters.append(self)
+
+        if (lhablock is None or lhacode is None)  and nature == 'external':
+            raise Exception('Need LHA information for external parameter "%s".' % name)
+        self.lhablock = lhablock
+        self.lhacode = lhacode
+
+all_CTparameters = []
+
+class CTParameter(UFOBaseClass):
+
+    require_args=['name', 'nature,', 'type', 'value', 'texname']
+
+    def __init__(self, name, type, value, texname):
+
+        args = (name,'internal',type,value,texname)
+
+        UFOBaseClass.__init__(self, *args)
+
+        args=(name,'internal',type,value,texname)
+
+        self.nature='interal'
+
+        global all_CTparameters
+        all_CTparameters.append(self)
+
+    def finite(self):
+        try:
+            return self.value[0]
+        except KeyError:
+            return 'ZERO'
+    
+    def pole(self, x):
+        try:
+            return self.value[-x]
+        except KeyError:
+            return 'ZERO'
+
+all_vertices = []
+
+class Vertex(UFOBaseClass):
+
+    require_args=['name', 'particles', 'color', 'lorentz', 'couplings']
+
+    def __init__(self, name, particles, color, lorentz, couplings, **opt):
+ 
+        args = (name, particles, color, lorentz, couplings)
+
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        args=(particles,color,lorentz,couplings)
+
+        global all_vertices
+        all_vertices.append(self)
+
+all_CTvertices = []
+
+class CTVertex(UFOBaseClass):
+
+    require_args=['name', 'particles', 'color', 'lorentz', 'couplings', 'type', 'loop_particles']
+
+    def __init__(self, name, particles, color, lorentz, couplings, type, loop_particles, **opt):
+ 
+        args = (name, particles, color, lorentz, couplings, type, loop_particles)
+
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        args=(particles,color,lorentz,couplings, type, loop_particles)
+        
+        global all_CTvertices
+        all_CTvertices.append(self)
+
+all_couplings = []
+
+class Coupling(UFOBaseClass):
+
+    require_args=['name', 'value', 'order']
+
+    require_args_all=['name', 'value', 'order', 'loop_particles', 'counterterm']
+
+    def __init__(self, name, value, order, **opt):
+
+        args =(name, value, order)	
+        UFOBaseClass.__init__(self, *args, **opt)
+        global all_couplings
+        all_couplings.append(self)
+
+    def value(self):
+        return self.pole(0)
+
+    def pole(self, x):
+        """ the self.value attribute can be a dictionary directly specifying the Laurent serie using normal
+        parameter or just a string which can possibly contain CTparameter defining the Laurent serie."""
+        
+        if isinstance(self.value,dict):
+            if -x in self.value.keys():
+                return self.value[-x]
+            else:
+                return 'ZERO'
+
+        CTparam=None
+        for param in all_CTparameters:
+           pattern=re.compile(r"(?P<first>\A|\*|\+|\-|\()(?P<name>"+param.name+r")(?P<second>\Z|\*|\+|\-|\))")
+           numberOfMatches=len(pattern.findall(self.value))
+           if numberOfMatches==1:
+               if not CTparam:
+                   CTparam=param
+               else:
+                   raise UFOError, "UFO does not support yet more than one occurence of CTParameters in the couplings values."
+           elif numberOfMatches>1:
+               raise UFOError, "UFO does not support yet more than one occurence of CTParameters in the couplings values."
+
+        if not CTparam:
+            if x==0:
+                return self.value
+            else:
+                return 'ZERO'
+        else:
+            if CTparam.pole(x)=='ZERO':
+                return 'ZERO'
+            else:
+                def substitution(matchedObj):
+                    return matchedObj.group('first')+"("+CTparam.pole(x)+")"+matchedObj.group('second')
+                pattern=re.compile(r"(?P<first>\A|\*|\+|\-|\()(?P<name>"+CTparam.name+r")(?P<second>\Z|\*|\+|\-|\))")
+                return pattern.sub(substitution,self.value)
+
+all_lorentz = []
+
+class Lorentz(UFOBaseClass):
+
+    require_args=['name','spins','structure']
+    
+    def __init__(self, name, spins, structure='external', **opt):
+        args = (name, spins, structure)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_lorentz
+        all_lorentz.append(self)
+
+
+all_functions = []
+
+class Function(object):
+
+    def __init__(self, name, arguments, expression):
+
+        global all_functions
+        all_functions.append(self)
+
+        self.name = name
+        self.arguments = arguments
+        self.expr = expression
+    
+    def __call__(self, *opt):
+
+        for i, arg in enumerate(self.arguments):
+            exec('%s = %s' % (arg, opt[i] ))
+
+        return eval(self.expr)
+
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+        self.perturbative_expansion = perturbative_expansion
+
+all_decays = []
+
+class Decay(UFOBaseClass):
+    require_args = ['particle','partial_widths']
+
+    def __init__(self, particle, partial_widths, **opt):
+        args = (particle, partial_widths)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_decays
+        all_decays.append(self)
+    
+        # Add the information directly to the particle
+        particle.partial_widths = partial_widths
+
+all_form_factors = []
+
+class FormFactor(UFOBaseClass):
+    require_args = ['name','type','value']
+
+    def __init__(self, name, type, value, **opt):
+        args = (name, type, value)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_form_factors
+        all_form_factors.append(self)
+
+        
+all_propagators = []
+
+class Propagator(UFOBaseClass):
+    
+    require_args = ['name','numerator','denominator']
+
+    def __init__(self, name, numerator, denominator=None, **opt):
+        args = (name, numerator, denominator)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_propagators
+        all_propagators.append(self)

=== added file 'models/taudecay_UFO/param_card.dat'
--- models/taudecay_UFO/param_card.dat	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/param_card.dat	2014-03-24 03:30:32 +0000
@@ -0,0 +1,66 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
+######################################################################
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    2 1.166379e-05 # Gf 
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block MASS 
+   15 1.776820e+00 # MTA 
+  111 1.349766e-01 # Mpi0 
+  211 1.395702e-01 # Mpic 
+##  Not dependent paramater.
+## Those values should be edited following analytical the 
+## analytical expression. Some generator could simply ignore 
+## those values and use the analytical expression
+  16 0.000000 # vt : 0.0 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY  15 2.265000e-12 
+##  Not dependent paramater.
+## Those values should be edited following analytical the 
+## analytical expression. Some generator could simply ignore 
+## those values and use the analytical expression
+DECAY  16 0.000000 # vt : 0.0 
+DECAY  211 0.000000 # pi+ : 0.0 
+DECAY  111 0.000000 # pi0 : 0.0 
+
+###################################
+## INFORMATION FOR CKMBLOCK
+###################################
+Block CKMBLOCK 
+    1 2.277360e-01 # cabi 
+
+###################################
+## INFORMATION FOR FRBLOCK
+###################################
+Block FRBlock 
+    1 1.304100e-01 # F1 
+    2 1.000000e+00 # F2 
+    3 1.000000e+00 # F3 
+    4 1.000000e+00 # Fr1 
+    5 1.000000e+00 # Fr2 
+    6 1.000000e+00 # G1 
+    7 1.000000e+00 # G2 
+#===========================================================
+# QUANTUM NUMBERS OF NEW STATE(S) (NON SM PDG CODE)
+#===========================================================
+
+Block QNUMBERS 211  # pi+ 
+        1 3  # 3 times electric charge
+        2 1  # number of spin states (2S+1)
+        3 1  # colour rep (1: singlet, 3: triplet, 8: octet)
+        4 1  # Particle/Antiparticle distinction (0=own anti)
+Block QNUMBERS 111  # pi0 
+        1 0  # 3 times electric charge
+        2 1  # number of spin states (2S+1)
+        3 1  # colour rep (1: singlet, 3: triplet, 8: octet)
+        4 0  # Particle/Antiparticle distinction (0=own anti)

=== added file 'models/taudecay_UFO/parameters.py'
--- models/taudecay_UFO/parameters.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/parameters.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,123 @@
+# This file was automatically created by FeynRules 2.0.6
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (February 23, 2011)
+# Date: Wed 18 Dec 2013 14:14:59
+
+
+
+from object_library import all_parameters, Parameter
+
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec, cot
+
+# This is a default parameter object representing 0.
+ZERO = Parameter(name = 'ZERO',
+                 nature = 'internal',
+                 type = 'real',
+                 value = '0.0',
+                 texname = '0')
+
+# User-defined parameters.
+cabi = Parameter(name = 'cabi',
+                 nature = 'external',
+                 type = 'real',
+                 value = 0.227736,
+                 texname = '\\theta _c',
+                 lhablock = 'CKMBLOCK',
+                 lhacode = [ 1 ])
+
+Gf = Parameter(name = 'Gf',
+               nature = 'external',
+               type = 'real',
+               value = 0.000011663787,
+               texname = 'G_f',
+               lhablock = 'SMINPUTS',
+               lhacode = [ 2 ])
+
+F1 = Parameter(name = 'F1',
+               nature = 'external',
+               type = 'real',
+               value = 0.13041,
+               texname = 'F_1',
+               lhablock = 'FRBlock',
+               lhacode = [ 1 ])
+
+F2 = Parameter(name = 'F2',
+               nature = 'external',
+               type = 'real',
+               value = 1.,
+               texname = 'F_2',
+               lhablock = 'FRBlock',
+               lhacode = [ 2 ])
+
+F3 = Parameter(name = 'F3',
+               nature = 'external',
+               type = 'real',
+               value = 1.,
+               texname = 'F_3',
+               lhablock = 'FRBlock',
+               lhacode = [ 3 ])
+
+Fr1 = Parameter(name = 'Fr1',
+                nature = 'external',
+                type = 'real',
+                value = 1.,
+                texname = 'F_{23}',
+                lhablock = 'FRBlock',
+                lhacode = [ 4 ])
+
+Fr2 = Parameter(name = 'Fr2',
+                nature = 'external',
+                type = 'real',
+                value = 1.,
+                texname = 'F_{13}',
+                lhablock = 'FRBlock',
+                lhacode = [ 5 ])
+
+G1 = Parameter(name = 'G1',
+               nature = 'external',
+               type = 'real',
+               value = 1.,
+               texname = 'G_{23}',
+               lhablock = 'FRBlock',
+               lhacode = [ 6 ])
+
+G2 = Parameter(name = 'G2',
+               nature = 'external',
+               type = 'real',
+               value = 1.,
+               texname = 'G_{13}',
+               lhablock = 'FRBlock',
+               lhacode = [ 7 ])
+
+MTA = Parameter(name = 'MTA',
+                nature = 'external',
+                type = 'real',
+                value = 1.77682,
+                texname = '\\text{MTA}',
+                lhablock = 'MASS',
+                lhacode = [ 15 ])
+
+Mpic = Parameter(name = 'Mpic',
+                 nature = 'external',
+                 type = 'real',
+                 value = 0.13957018,
+                 texname = '\\text{Mpic}',
+                 lhablock = 'MASS',
+                 lhacode = [ 211 ])
+
+Mpi0 = Parameter(name = 'Mpi0',
+                 nature = 'external',
+                 type = 'real',
+                 value = 0.1349766,
+                 texname = '\\text{Mpi0}',
+                 lhablock = 'MASS',
+                 lhacode = [ 111 ])
+
+WTA = Parameter(name = 'WTA',
+                nature = 'external',
+                type = 'real',
+                value = 2.265e-12,
+                texname = '\\text{WTA}',
+                lhablock = 'DECAY',
+                lhacode = [ 15 ])
+

=== added file 'models/taudecay_UFO/particles.py'
--- models/taudecay_UFO/particles.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/particles.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,65 @@
+# This file was automatically created by FeynRules 2.0.6
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (February 23, 2011)
+# Date: Wed 18 Dec 2013 14:14:59
+
+
+from __future__ import division
+from object_library import all_particles, Particle
+import parameters as Param
+
+import propagators as Prop
+
+vt = Particle(pdg_code = 16,
+              name = 'vt',
+              antiname = 'vt~',
+              spin = 2,
+              color = 1,
+              mass = Param.ZERO,
+              width = Param.ZERO,
+              texname = 'vt',
+              antitexname = 'vt~',
+              charge = 0,
+              LeptonNumber = 1)
+
+vt__tilde__ = vt.anti()
+
+ta__minus__ = Particle(pdg_code = 15,
+                       name = 'ta-',
+                       antiname = 'ta+',
+                       spin = 2,
+                       color = 1,
+                       mass = Param.MTA,
+                       width = Param.WTA,
+                       texname = 'ta-',
+                       antitexname = 'ta+',
+                       charge = -1,
+                       LeptonNumber = 1)
+
+ta__plus__ = ta__minus__.anti()
+
+pi__plus__ = Particle(pdg_code = 211,
+                      name = 'pi+',
+                      antiname = 'pi-',
+                      spin = 1,
+                      color = 1,
+                      mass = Param.Mpic,
+                      width = Param.ZERO,
+                      texname = 'pi+',
+                      antitexname = 'pi-',
+                      charge = 1,
+                      LeptonNumber = 0)
+
+pi__minus__ = pi__plus__.anti()
+
+pi0 = Particle(pdg_code = 111,
+               name = 'pi0',
+               antiname = 'pi0',
+               spin = 1,
+               color = 1,
+               mass = Param.Mpi0,
+               width = Param.ZERO,
+               texname = 'pi0',
+               antitexname = 'pi0',
+               charge = 0,
+               LeptonNumber = 0)
+

=== added file 'models/taudecay_UFO/propagators.py'
--- models/taudecay_UFO/propagators.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/propagators.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,35 @@
+# This file was automatically created by FeynRules 1.7.69
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Mon 1 Oct 2012 14:58:26
+
+from object_library import all_propagators, Propagator
+
+
+# define only once the denominator since this is always the same
+denominator = "P('mu', id) * P('mu', id) - Mass(id) * Mass(id) + complex(0,1) * Mass(id) * Width(id)"
+
+# propagator for the scalar
+S = Propagator(name = "S",
+               numerator = "complex(0,1)",
+               denominator = denominator
+               )
+
+# propagator for the incoming fermion # the one for the outcomming is computed on the flight
+F = Propagator(name = "F",
+                numerator = "complex(0,1) * (Gamma('mu', s1, s2) * P('mu', id) + Mass(id) * Identity(s1, s2))",
+                denominator = denominator
+               )
+
+# massive vector in the unitary gauge, can't be use for massless particles
+V1 = Propagator(name = "V1",
+                numerator = "complex(0,1) * (-1 * Metric(l1, l2) + Metric(l1,'mu')* P('mu', id) * P(l2, id) / Mass(id)**2 ",
+                denominator = denominator
+               )
+
+# massless vector and massive vector in unitary gauge
+V2 = Propagator(name = "V2",
+                numerator = "complex(0,-1) * Metric(l1, l2)",
+                denominator =  "P('mu', id) * P('mu', id)"
+               )
+
+

=== added file 'models/taudecay_UFO/taudecay_UFO.log'
--- models/taudecay_UFO/taudecay_UFO.log	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/taudecay_UFO.log	2014-03-24 03:30:32 +0000
@@ -0,0 +1,68 @@
+# This file was automatically created by FeynRules 2.0.6
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (February 23, 2011)
+# Date: Wed 18 Dec 2013 14:14:58
+
+
+# 
+# This is the logfile for the model taudecay
+
+# Authors: K. Mawatari, J. Nakamura
+# Model version: 1.0
+# Checking the Quantum numbers
+   * Electric charge defined.
+# Checking the Lagrangians
+   * All Lagrangians are ok.
+#
+# Particle definitions
+#
+
+   * No particles removed. All particles correspond to GenInt setup.
+
+
+
+# Compulsory PDG codes:
+   * Class SM leptons incomplete. 11, 13 missing.
+   * Class SM neutrinos incomplete. 12, 14 missing.
+   * Class SM quarks incomplete. 1, 2, 3, 4, 5, 6 missing.
+   * Class SM gauge bosons incomplete. 21, 22, 23, 24 missing.
+#
+# Parameter definitions
+#
+
+   * All parameters are ok.
+
+
+# Vertices
+   * Calling FeynmanRules for 1 Lagrangians.
+   * Number of classes vertices: 2
+   * Number of flavored vertices: 2
+   * Saved vertices in InterfaceRun[ 1 ].
+   * Checked QNumber conservation.
+      - Quantum number LeptonNumber conserved in all vertices.
+      - Quantum number Q conserved in all vertices.
+   * particles.py written.
+   * parameters.py written.
+#
+# Vertex definitions
+#
+
+   * 2 vertices written.
+   * vertices.py written.
+#
+# Lorentz structure definitions
+#
+
+   * 1 lorentz structure written.
+   * lorentz.py written.
+#
+# Coupling definitions
+#
+
+   * 1 coupling written.
+   * couplings.py written.
+#
+# Coupling order definitions
+#
+
+   * 0 couplings orders written.
+   * coupling_orders.py written.

=== added file 'models/taudecay_UFO/vertices.py'
--- models/taudecay_UFO/vertices.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/vertices.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,23 @@
+# This file was automatically created by FeynRules 2.0.6
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (February 23, 2011)
+# Date: Wed 18 Dec 2013 14:14:59
+
+
+from object_library import all_vertices, Vertex
+import particles as P
+import couplings as C
+import lorentz as L
+
+
+V_1 = Vertex(name = 'V_1',
+             particles = [ P.vt__tilde__, P.ta__minus__, P.pi__plus__ ],
+             color = [ '1' ],
+             lorentz = [ L.FFS1 ],
+             couplings = {(0,0):C.GC_1})
+
+V_2 = Vertex(name = 'V_2',
+             particles = [ P.ta__plus__, P.vt, P.pi__minus__ ],
+             color = [ '1' ],
+             lorentz = [ L.FFS1 ],
+             couplings = {(0,0):C.GC_1})
+

=== added file 'models/taudecay_UFO/write_param_card.py'
--- models/taudecay_UFO/write_param_card.py	1970-01-01 00:00:00 +0000
+++ models/taudecay_UFO/write_param_card.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,207 @@
+
+__date__ = "02 Aug 2012"
+__author__ = '[e-mail]'
+
+from function_library import *
+
+class ParamCardWriter(object):
+    
+    header = \
+    """######################################################################\n""" + \
+    """## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################\n""" + \
+    """######################################################################\n"""   
+    
+    def __init__(self, filename, list_of_parameters=None, generic=False):
+        """write a valid param_card.dat"""
+        
+        if not list_of_parameters:
+            from parameters import all_parameters
+            list_of_parameters = [param for param in all_parameters if \
+                                                       param.nature=='external']
+        
+        self.generic_output = generic
+        if generic:
+            self.define_not_dep_param(list_of_parameters)
+
+        
+        self.fsock = open(filename, 'w')
+        self.fsock.write(self.header)
+        
+        self.write_card(list_of_parameters)
+        self.fsock.close()
+    
+    def define_not_dep_param(self, list_of_parameters):
+        """define self.dep_mass and self.dep_width in case that they are 
+        requested in the param_card.dat"""
+        from particles import all_particles
+        
+        self.dep_mass = [(part, part.mass) for part in all_particles \
+                            if part.pdg_code > 0 and \
+                                            part.mass not in list_of_parameters]
+        self.dep_width = [(part, part.width) for part in all_particles\
+                             if part.pdg_code > 0 and \
+                                part.width not in list_of_parameters]        
+    
+    @staticmethod
+    def order_param(obj1, obj2):
+        """ order parameter of a given block """
+        
+        maxlen = min([len(obj1.lhacode), len(obj2.lhacode)])
+    
+        for i in range(maxlen):
+            if obj1.lhacode[i] < obj2.lhacode[i]:
+                return -1
+            elif obj1.lhacode[i] == obj2.lhacode[i]:
+                return 0
+            else:
+                return 1
+        #identical up to the first finish
+        if len(obj1.lhacode) > len(obj2.lhacode):
+            return 1
+        elif  len(obj1.lhacode) == len(obj2.lhacode):
+            return 0
+        else:
+            return -1
+        
+    def write_card(self, all_ext_param):
+        """ """
+        
+        # list all lhablock
+        all_lhablock = set([param.lhablock for param in all_ext_param])
+        
+        # ordonate lhablock alphabeticaly
+        all_lhablock = list(all_lhablock)
+        all_lhablock.sort()
+        # put at the beginning SMINPUT + MASS + DECAY
+        for name in ['DECAY', 'MASS','SMINPUTS']:
+            if name in all_lhablock:
+                all_lhablock.remove(name)
+                all_lhablock.insert(0, name)
+        
+        for lhablock in all_lhablock:
+            self.write_block(lhablock)
+            need_writing = [ param for param in all_ext_param if \
+                                                     param.lhablock == lhablock]
+            need_writing.sort(self.order_param)
+            [self.write_param(param, lhablock) for param in need_writing]
+            
+            if self.generic_output:
+                if lhablock in ['MASS', 'DECAY']:
+                    self.write_dep_param_block(lhablock)
+
+        if self.generic_output:
+            self.write_qnumber()
+                               
+    def write_block(self, name):
+        """ write a comment for a block"""
+        
+        self.fsock.writelines(
+        """\n###################################""" + \
+        """\n## INFORMATION FOR %s""" % name.upper() +\
+        """\n###################################\n"""
+         )
+        if name!='DECAY':
+            self.fsock.write("""Block %s \n""" % name)
+
+    def write_param(self, param, lhablock):
+        
+        lhacode=' '.join(['%3s' % key for key in param.lhacode])
+        if lhablock != 'DECAY':
+            text = """  %s %e # %s \n""" % (lhacode, complex(param.value).real, param.name ) 
+        else:
+            text = '''DECAY %s %e \n''' % (lhacode, complex(param.value).real)
+        self.fsock.write(text) 
+                    
+
+
+    
+    def write_dep_param_block(self, lhablock):
+        import cmath
+        from parameters import all_parameters
+        from particles import all_particles
+        for parameter in all_parameters:
+            exec("%s = %s" % (parameter.name, parameter.value))
+        text = "##  Not dependent paramater.\n"
+        text += "## Those values should be edited following analytical the \n"
+        text += "## analytical expression. Some generator could simply ignore \n"
+        text += "## those values and use the analytical expression\n"
+        
+        if lhablock == 'MASS':
+            data = self.dep_mass
+            prefix = " "
+        else:
+            data = self.dep_width
+            prefix = "DECAY "
+
+        for part, param in data:
+            if isinstance(param.value, str):
+                value = complex(eval(param.value)).real
+            else:
+                value = param.value
+            
+            text += """%s %s %f # %s : %s \n""" %(prefix, part.pdg_code, 
+                        value, part.name, param.value)
+        # If more than a particles has the same mass/width we need to write it here
+        # as well
+        if lhablock == 'MASS':
+            arg = 'mass'
+            done = [part for (part, param) in self.dep_mass]
+        else:
+            arg = 'width'
+            done = [part for (part, param) in self.dep_width]
+        for particle in all_particles:
+            if particle.pdg_code <0:
+                continue
+            is_define = True
+            if particle not in done:
+                if getattr(particle, arg).lhacode[0] != particle.pdg_code:
+                    is_define = False                
+            if  not is_define:
+                value = float(particle.get(arg).value )
+                name =  particle.get(arg).name 
+                text += """%s %s %f # %s : %s \n""" %(prefix, particle.pdg_code, 
+                        value, particle.name, name)
+
+
+
+
+        self.fsock.write(text)    
+        
+    sm_pdg = [1,2,3,4,5,6,11,12,13,13,14,15,16,21,22,23,24,25]
+    data="""Block QNUMBERS %(pdg)d  # %(name)s 
+        1 %(charge)d  # 3 times electric charge
+        2 %(spin)d  # number of spin states (2S+1)
+        3 %(color)d  # colour rep (1: singlet, 3: triplet, 8: octet)
+        4 %(antipart)d  # Particle/Antiparticle distinction (0=own anti)\n"""
+    
+    def write_qnumber(self):
+        """ write qnumber """
+        from particles import all_particles
+        import particles
+        print particles.__file__
+        text="""#===========================================================\n"""
+        text += """# QUANTUM NUMBERS OF NEW STATE(S) (NON SM PDG CODE)\n"""
+        text += """#===========================================================\n\n"""
+        
+        for part in all_particles:
+            if part.pdg_code in self.sm_pdg or part.pdg_code < 0:
+                continue
+            text += self.data % {'pdg': part.pdg_code,
+                                 'name': part.name,
+                                 'charge': 3 * part.charge,
+                                 'spin': part.spin,
+                                 'color': part.color,
+                                 'antipart': part.name != part.antiname and 1 or 0}
+        
+        self.fsock.write(text)
+        
+            
+            
+            
+            
+        
+            
+if '__main__' == __name__:
+    ParamCardWriter('./param_card.dat', generic=True)
+    print 'write ./param_card.dat'
+    

=== added file 'models/usermod.py'
--- models/usermod.py	1970-01-01 00:00:00 +0000
+++ models/usermod.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,864 @@
+################################################################################
+#
+# Copyright (c) 2011 The MadGraph Development team and Contributors
+#
+# This file is a part of the MadGraph 5 project, an application which 
+# automatically generates Feynman diagrams and matrix elements for arbitrary
+# high-energy processes in the Standard Model and beyond.
+#
+# It is subject to the MadGraph license which should accompany this 
+# distribution.
+#
+# For more information, please visit: http://madgraph.phys.ucl.ac.be
+#
+################################################################################
+""" Set of Tool in order to modify a given UFO model.
+    (mainly by adding-suppressing interactions and allow to modify by text the 
+    different part of the model. Check of consistency of the model are performed.
+    This produce a new valid UFO model in output.
+"""
+
+import glob
+import logging
+import os
+import re
+import sys
+
+import madgraph.iolibs.files as files
+import madgraph.various.misc as misc
+import models as ufomodels
+import models.import_ufo as import_ufo
+import models.check_param_card as check_param_card
+
+pjoin =os.path.join
+logger = logging.getLogger('madgraph.model')
+
+class USRMODERROR(Exception): pass
+
+class UFOModel(object):
+    """ The class storing the current status of the model """
+    
+    def __init__(self, modelpath, addon='__1'):
+        """load the model from a valid UFO directory (otherwise keep everything
+        as empty."""
+        
+        self.modelpath = modelpath
+        model = ufomodels.load_model(modelpath)
+        
+        # Check the validity of the model. Too old UFO (before UFO 1.0)
+        if not hasattr(model, 'all_orders'):
+            raise USRMODERROR, 'Base Model doesn\'t follows UFO convention (no couplings_order information)\n' +\
+                               'MG5 is able to load such model but NOT to the add model feature.'
+        if isinstance(model.all_particles[0].mass, basestring):
+            raise USRMODERROR, 'Base Model doesn\'t follows UFO convention (Mass/Width of particles are string name, not object)\n' +\
+                               'MG5 is able to load such model but NOT to the add model feature.' 
+                                 
+        
+        self.particles = model.all_particles
+        if any(hasattr(p, 'loop_particles') for p in self.particles):
+            raise USRMODERROR, 'Base Model doesn\'t follows UFO convention '
+        self.vertices = model.all_vertices
+        self.couplings = model.all_couplings
+        self.lorentz = model.all_lorentz
+        self.parameters = model.all_parameters
+        self.Parameter = self.parameters[0].__class__
+        self.orders = model.all_orders
+        
+        self.functions = model.all_functions
+        self.new_external = []
+        # UFO optional file
+        if hasattr(model, 'all_propagators'):
+            self.propagators = model.all_propagators
+        else:
+            self.propagators = [] 
+            
+        # UFO NLO extension
+        if hasattr(model, 'all_CTvertices'):
+            self.CTvertices = model.all_CTvertices
+        else:
+            self.CTvertices = []
+        
+        #translate for how to write the python file
+        if 'self.expr = expression' in open(pjoin(self.modelpath, 'object_library.py')).read():
+            self.translate = {'expr': 'expression'}
+        else:
+            self.translate = {}
+        
+        #translate for the expression of the UFO model
+        self.old_new = {}
+        self.addon = addon
+        
+        # particle id -> object
+        self.particle_dict = {}
+        for particle in self.particles:
+            self.particle_dict[particle.pdg_code] = particle
+            
+        # path to all model that should be used for the Fortran file.
+        self.all_path = [self.modelpath]
+
+    def write(self, outputdir):
+        """ """
+        if not os.path.exists(outputdir):
+            os.mkdir(outputdir)
+        files.cp(os.path.join(self.modelpath, '__init__.py'), outputdir)
+        files.cp(os.path.join(self.modelpath, 'object_library.py'), outputdir)
+        files.cp(os.path.join(self.modelpath, 'write_param_card.py'), outputdir)
+
+        self.write_particles(outputdir)
+        self.write_vertices(outputdir)
+        self.write_couplings(outputdir)
+        self.write_lorentz(outputdir)
+        self.write_parameters(outputdir)
+        self.write_orders(outputdir)
+        self.write_functions(outputdir)
+        self.write_propagators(outputdir)
+        self.write_ctvertices(outputdir)
+        
+        self.write_external_files(outputdir)
+        self.write_restrict_card(outputdir)
+    
+  
+    def write_restrict_card(self, outputdir):
+        """ propagate model restriction of the original model. """
+
+        restrict_list = [l for l in os.listdir(self.modelpath) if l.startswith('restrict_')]
+        if not self.new_external:
+            # no new entry in the card => just copy the restrict_card.dat
+            for p in restrict_list:
+                files.cp(pjoin(self.modelpath, p), outputdir)
+                
+        else:
+            # need to add the parameter and ensure that they will not be restricted!
+            for p in restrict_list: 
+                param_card = check_param_card.ParamCard(pjoin(self.modelpath, p))
+                for parameter in self.new_external:
+                    block = parameter.lhablock 
+                    lhaid = parameter.lhacode
+                    value = parameter.value
+                    if value == 0:
+                        value = 1e-99
+                    elif value == 1:
+                        value = 9.999999e-1
+                    param_card.add_param(block.lower(), lhaid, value, 'from addon')
+                # all added -> write it
+                param_card.write(pjoin(outputdir, p))
+
+                        
+                    
+                    
+                    
+                
+        
+
+    def format_param(self, param):
+        """convert param to string in order to have it written correctly for the 
+        UFO file"""
+
+        if isinstance(param, basestring): 
+            return "'%s'" % param.replace('\'', '\\\'').replace('\"', '\\\"')
+        elif isinstance(param, int) or isinstance(param, float) or \
+                                                       isinstance(param, complex):
+            return "%s" % param
+        elif isinstance(param, list):
+            return '[%s]' % ', '.join(self.format_param(p) for p in param)
+        elif isinstance(param, tuple):
+            if len(param) == 1:
+                return '(%s,)' % self.format_param(param[0]) 
+            else:
+                return '(%s)' % ','.join([self.format_param(p) for p in param])
+        elif isinstance(param, dict):
+            return '{%s}' % ','.join(['%s: %s' % (self.format_param(key), self.format_param(value)) for key, value in param.items()])
+        elif param.__class__.__name__ == 'Parameter':
+            return 'Param.%s' % param.__repr__()
+        elif param.__class__.__name__ == 'Coupling':
+            return 'C.%s' % param.__repr__()
+        elif param.__class__.__name__ == 'Lorentz':
+            return 'L.%s' % param.__repr__()
+        elif param.__class__.__name__ == 'Particle':
+            return 'P.%s' % param.__repr__()
+        elif param is None:
+            return 'None'
+        else:
+            raise Exception, '%s unknow type for writting UFO' % param.__class__.__name__
+
+
+
+    def create_data_text(self, obj):
+        """ create the data associate to the object"""
+        # Most of the object comes from the UFOBASECLASS 
+        # BUT NOT ALL (some object) need to deal with both
+        
+        nb_space = 0    
+        if hasattr(obj, 'require_args_all'):
+            args = obj.require_args_all
+        elif hasattr(obj, 'require_args'):
+            args = obj.require_args
+        else:
+            args = []
+        if args:
+            text = """%s = %s(""" % (obj.__repr__(), obj.__class__.__name__)
+        else:
+            text = """%s = %s(""" % (obj.name, obj.__class__.__name__)
+            
+            
+        for data in args:
+            if data in self.translate:
+                data = self.translate[data]
+            if not nb_space:
+                add_space = len(text)
+            else:
+                add_space = 0
+            
+            try:
+                expr = getattr(obj, data)
+            except:
+                if data in ['counterterm', 'propagator', 'loop_particles']:
+                    expr = None
+                    setattr(obj, data, None)
+                else:
+                    raise
+            name =str(data)
+            if name in self.translate:
+                name = self.translate[name]            
+            #if data == 'lhablock':
+            #    print data, type(self.format_param(getattr(obj, data)))
+            text += '%s%s = %s,\n' % (' ' * nb_space,name, self.format_param(getattr(obj, data)))
+            nb_space += add_space
+
+        if hasattr(obj, 'get_all'):
+            other_attr = [name for name in obj.get_all().keys() 
+                                                  if name not in args]
+        else:
+            other_attr = obj.__dict__.keys()
+            
+        for data in other_attr:
+            name =str(data)
+            if name in ['partial_widths', 'loop_particles']:
+                continue
+            if name in self.translate:
+                name = self.translate[name] 
+            if not nb_space:
+                add_space = len(text)
+            else:
+                add_space = 0
+            text += '%s%s = %s,\n' % (' ' * nb_space, name, self.format_param(getattr(obj, data)))
+            nb_space += add_space
+            
+        text = text[:-2] + ')\n\n'
+
+        return text
+             
+    def create_file_content(self, datalist):
+        """ """
+        return '\n'.join([self.create_data_text(obj) for obj in datalist])
+
+            
+    def write_particles(self, outputdir):
+        """ """
+        text = """
+# This file was automatically created by The UFO_usermod        
+
+from __future__ import division
+from object_library import all_particles, Particle
+import parameters as Param
+
+"""
+        text += self.create_file_content(self.particles)
+        ff = open(os.path.join(outputdir, 'particles.py'), 'w')
+        ff.writelines(text)
+        ff.close()
+        return
+
+    def write_vertices(self, outputdir):
+        """ """
+        text = """
+# This file was automatically created by The UFO_usermod        
+
+from object_library import all_vertices, Vertex
+import particles as P
+import couplings as C
+import lorentz as L
+
+"""
+        text += self.create_file_content(self.vertices)
+        ff = open(os.path.join(outputdir, 'vertices.py'), 'w')
+        ff.writelines(text)
+        ff.close()
+        return
+
+    def write_ctvertices(self, outputdir):
+        """ """
+        
+        if not self.CTvertices:
+            return
+        
+        text = """
+# This file was automatically created by The UFO_usermod        
+
+from object_library import all_vertices, all_CTvertices, Vertex, CTVertex
+import particles as P
+import couplings as C
+import lorentz as L
+
+"""
+        text += self.create_file_content(self.CTvertices)
+        ff = open(os.path.join(outputdir, 'CT_vertices.py'), 'w')
+        ff.writelines(text)
+        ff.close()
+        return
+
+
+    def write_couplings(self, outputdir):
+        """ """
+        text = """
+# This file was automatically created by The UFO_usermod        
+
+from object_library import all_couplings, Coupling
+"""
+        text += self.create_file_content(self.couplings)
+        ff = open(os.path.join(outputdir, 'couplings.py'), 'w')
+        ff.writelines(text)
+        ff.close()
+        return
+
+    def write_lorentz(self, outputdir):
+        """ """
+        text = """
+# This file was automatically created by The UFO_usermod        
+
+from object_library import all_lorentz, Lorentz
+"""
+
+        text += self.create_file_content(self.lorentz)
+        ff = open(os.path.join(outputdir, 'lorentz.py'), 'w')
+        ff.writelines(text)
+        ff.close()
+        return
+
+    def write_parameters(self, outputdir):
+        """ """
+        text = """
+# This file was automatically created by The UFO_usermod        
+
+from object_library import all_parameters, Parameter
+"""
+
+        text += self.create_file_content(self.parameters)
+        ff = open(os.path.join(outputdir, 'parameters.py'), 'w')
+        ff.writelines(text)
+        ff.close()
+        return
+
+    def write_orders(self, outputdir):
+        """ """
+        text = """
+# This file was automatically created by The UFO_usermod        
+
+from object_library import all_orders, CouplingOrder
+"""
+
+        text += self.create_file_content(self.orders)
+        ff = open(os.path.join(outputdir, 'coupling_orders.py'), 'w')
+        ff.writelines(text)
+        ff.close()
+        return
+
+    def write_functions(self, outputdir):
+        """ """
+        text = """
+# This file was automatically created by The UFO_usermod        
+
+import cmath
+from object_library import all_functions, Function
+
+"""
+
+        text += self.create_file_content(self.functions)
+        ff = open(os.path.join(outputdir, 'function_library.py'), 'w')
+        ff.writelines(text)
+        ff.close()
+        return
+
+    def write_propagators(self, outputdir):
+        """ """
+        
+        text = """
+# This file was automatically created by The UFO_usermod   
+from object_library import all_propagators, Propagator
+"""
+
+        text += self.create_file_content(self.propagators)
+        ff = open(os.path.join(outputdir, 'propagators.py'), 'w')
+        ff.writelines(text)
+        ff.close()
+        return
+
+    def write_external_files(self, outputdir):
+        """Copy/merge the routines written in Fortran/C++/pyhton"""
+        
+        #1. Special case for the formfactor written in Fortran
+        re_fct = re.compile('''^\s{7,70}[\w\s]*function (\w*)\(''',re.M+re.I)
+        present_fct = set()
+        for dirpath in self.all_path:
+            if os.path.exists(pjoin(dirpath, 'Fortran', 'functions.f')):
+                text = open(pjoin(dirpath, 'Fortran', 'functions.f')).read()
+                new_fct = re_fct.findall(text)
+                nb_old = len(present_fct)
+                nb_added = len(new_fct)
+                new_fct = set([f.lower() for f in new_fct])
+                present_fct.update(new_fct)
+                if len(present_fct) < nb_old + nb_added:
+                    logger.critical('''Some Functions in functions.f are define in more than one model.
+                    This require AT LEAST manual modification of the resulting file. But more likely the 
+                    model need to be consider as un-physical! Use it very carefully.''')
+                
+                if not os.path.exists(pjoin(outputdir, 'Fortran')):
+                    os.mkdir(pjoin(outputdir, 'Fortran'))
+                fsock = open(pjoin(outputdir, 'Fortran'),'a')
+                fsock.write(text)
+                fsock.close()
+                
+        #2. Ohter files present in Fortran/Cpp/Python directory
+        #   ASk user to handle it if any!
+        for dirpath in self.all_path:
+            for subdir in ['Fortran', 'CPP', 'Python']:
+                if os.path.exists(pjoin(dirpath, subdir)):
+                    for filepath in os.listdir(pjoin(dirpath, subdir)):
+                        if filepath == 'functions.f':
+                            continue
+                        if '.' not in filepath:
+                            continue
+                        logger.warning('Manual HELAS routine associated to the model. Those are not modified automaticaly!! So you need to manually checked them')
+                        nb = 0
+                        name, extension = filepath.rsplit('.', 1) 
+
+                        while 1:
+                            filename = '%s%s%s' %(name, '.moved' * nb, extension)
+                            if os.path.exists(pjoin(outputdir, subdir, filename)):
+                                nb+=1
+                            else:
+                                break
+                        if not os.path.exists(pjoin(outputdir, subdir)):
+                            os.mkdir(pjoin(outputdir, subdir))
+                        files.cp(pjoin(dirpath, subdir, filepath), pjoin(outputdir, subdir, filename))
+                        
+    def get_particle(self, name):
+        """ """
+        for part in self.particles:
+            if part.name == name:
+                return part
+        
+        raise USRMODERROR, 'no particle %s in the model' % name
+
+    def add_parameter(self, parameter):
+        """wrapper to call the correct function"""
+        
+        if parameter.nature == 'internal':
+            self.add_internal_parameter(parameter)
+        else:
+            self.add_external_parameter(parameter)
+
+    def add_particle(self, particle):
+        """Add a particle in a consistent way"""
+        
+        name = particle.name
+        old_part = next((p for p in self.particles if p.name==name), None)
+        if old_part:
+            #Check if the two particles have the same pdgcode
+            if old_part.pdg_code == particle.pdg_code:
+                particle.replace = old_part
+                return self.check_mass_width_of_particle(old_part, particle)
+            else:
+                logger.warning('The particle name \'%s\' is present in both model with different pdg code' % name)
+                logger.warning('The particle coming from the plug-in model will be rename to \'%s%s\'' % (name, self.addon))
+                particle.name = '%s%s' % (name, self.addon)
+                self.particles.append(particle)
+                return
+        
+        pdg = particle.pdg_code
+        if pdg in self.particle_dict:
+            particle.replace = self.particle_dict[pdg]
+            return self.check_mass_width_of_particle(self.particle_dict[pdg], particle)
+        else:
+            self.particles.append(particle)
+        
+                
+    def check_mass_width_of_particle(self, p_base, p_plugin):
+              
+        # Check the mass
+        if p_base.mass.name != p_plugin.mass.name:
+            #different name but actually  the same
+            if p_plugin.mass.name in self.old_new:
+                if self.old_new[p_plugin.mass.name] != p_base.mass.name:
+                    raise USRMODERROR, 'Some inconsistency in the mass assignment in the model: equivalent of %s is %s != %s ' % ( p_plugin.mass.name, self.old_new[p_plugin.mass.name], p_base.mass.name)
+            elif  p_base.mass.name.lower() == 'zero':
+                p_base.mass = p_plugin.mass
+            elif  p_plugin.mass.name.lower() == 'zero':
+                pass
+            else:
+                raise USRMODERROR, 'Some inconsistency in the mass assignment in the model\n' + \
+             '     Mass: %s and %s\n' %(p_base.mass.name, p_plugin.mass.name) + \
+             '     conflict name %s\n' % self.old_new + \
+             '     pdg_code: %s %s' % (p_base.pdg_code, p_plugin.pdg_code)
+        # Check the width
+        if p_base.width.name != p_plugin.width.name:
+            #different name but actually  the same
+            if p_plugin.width.name in self.old_new:
+                if self.old_new[p_plugin.width.name] != p_base.width.name:
+                    raise USRMODERROR, 'Some inconsistency in the mass assignment in the model'
+            elif  p_base.width.name.lower() == 'zero':
+                p_base.width = p_plugin.width
+            elif  p_plugin.width.name.lower() == 'zero':
+                pass
+            else:
+                raise USRMODERROR, 'Some inconsistency in the mass assignment in the model'        
+        
+        return
+
+    def add_external_parameter(self, parameter):
+        """adding a param_card parameter inside the current model.
+           if the parameter block/lhcode already exists then just do nothing
+           (but if the name are different then keep the info for future translation)
+           If the name already exists in the model. raise an exception.
+        """
+  
+        name = parameter.name
+        # check if a parameter already has this name
+        old_param = next((p for p in self.parameters if p.name==name), None)
+        if old_param:
+            if old_param.lhablock == parameter.lhablock and \
+                old_param.lhacode == parameter.lhacode:
+                return #Nothing to do!
+            else:
+                logger.info('The two model defines the parameter \'%s\'\n' % parameter.name +
+                  '      the original model for %s :%s\n' %(old_param.lhablock, old_param.lhacode)+
+                  '      the plugin for %s :%s\n' %(parameter.lhablock,parameter.lhacode)+
+                  '      We will rename the one from the plugin to %s%s' % (parameter.name, self.addon))
+                if old_param.nature == 'internal':
+                    logger.warning('''The parameter %s is actually an internal parameter of the base model.
+    his value is given by %s.
+    If those two parameters are expected to be identical, you need to provide the value in the param_card according to this formula.
+    ''')
+                #add the parameter with a new name. 
+                self.old_new[parameter.name] = '%s%s' % (parameter.name, self.addon)
+                parameter.name = '%s%s' % (parameter.name, self.addon)
+                #
+                #self.parameters.append(parameter)
+                #return
+        
+        #check if a parameter already has this lhablock/code information
+        old_param = next((p for p in self.parameters if p.lhacode==parameter.lhacode \
+                          and p.lhablock==parameter.lhablock), None)
+        if old_param:
+            logger.info('The two model defines the block \'%s\' with id \'%s\' with different parameter name \'%s\', \'%s\'\n'\
+                      %  (old_param.lhablock, old_param.lhacode, parameter.name, old_param.name) + \
+            '     We will merge those two parameters in a single one')
+            if parameter.name in self.old_new.values():
+                key = [k for k in self.old_new if self.old_new[k] == parameter.name][0]
+                self.old_new[key] = old_param.name
+                self.old_new[parameter.name] = old_param.name
+            else:
+                self.old_new[parameter.name] = old_param.name
+            #            self.add_internal_parameter(iden_param)
+        
+        else:
+            #Just add the new parameter to the current list
+            self.parameters.append(parameter) 
+            self.new_external.append(parameter)
+    
+    def add_internal_parameter(self, parameter):
+        """ add a parameter of type internal """
+        
+        name = parameter.name
+        # check if a parameter already has this name
+        old_param = next((p for p in self.parameters if p.name==name), None)
+        if old_param:
+            if old_param.value == parameter.value:
+                return #Nothing to do!
+            else:
+                if self.old_new:
+                    pattern = re.compile(r'\b(%s)\b' % '|'.join(self.old_new.keys()))
+                    def replace(matchobj):
+                        return self.old_new[matchobj.group(0)]
+                    parameter.value = pattern.sub(replace, parameter.value)
+                    self.old_new[parameter.name] = '%s%s' % (parameter.name, self.addon)
+                
+                parameter.name = '%s%s' % (parameter.name, self.addon)
+                self.parameters.append(parameter)
+                return
+        
+        # No name conflict:
+        if self.old_new:
+            pattern = re.compile(r'\b(%s)\b' % '|'.join(self.old_new.keys()))
+            def replace(matchobj):
+                return self.old_new[matchobj.group(0)]
+            parameter.value = pattern.sub(replace, parameter.value)
+
+        self.parameters.append(parameter)
+        
+
+
+
+    def add_coupling(self, coupling):
+        """add one coupling"""
+        
+        # avoid name duplication
+        name = coupling.name
+        same_name = next((p for p in self.couplings if p.name==name), None)
+        if same_name:
+            coupling.name = '%s%s' % (coupling.name, self.addon)
+        
+        if self.old_new:  
+            pattern = re.compile(r'\b(%s)\b' % '|'.join(self.old_new.keys()))
+            def replace(matchobj):
+                return self.old_new[matchobj.group(0)]
+            coupling.value = pattern.sub(replace, coupling.value)
+        
+        old_coupling = next((p for p in self.couplings if p.value==coupling.value), None)
+        
+        if old_coupling:
+            coupling.replace = old_coupling #tag for replacement
+        else:
+            self.couplings.append(coupling)
+    
+    def add_coupling_order(self, coupling_order):
+        """adding a new coupling order inside the model"""
+        
+        name = coupling_order.name
+        same_name = next((p for p in self.orders if p.name==name), None)
+        if same_name:
+            if coupling_order.hierarchy != same_name.hierarchy:
+                logger.warning('%s has different hierarchy use the minimal value (%s, %s) => %s' \
+                               % (name, same_name.hierarchy, coupling_order.hierarchy,
+                                  min(same_name.hierarchy, coupling_order.hierarchy)))
+                same_name.hierarchy = min(same_name.hierarchy, coupling_order.hierarchy)
+            if coupling_order.expansion_order != same_name.expansion_order:
+                logger.warning('%s has different expansion_order use the minimal value (%s, %s) => %s' \
+                               % (name, coupling_order.expansion_order, same_name.expansion_order, 
+                                  min(same_name.expansion_order, coupling_order.expansion_order)))
+                same_name.expansion_order = min(same_name.expansion_order, coupling_order.expansion_order)
+            if hasattr(same_name, 'perturbative_expansion') and same_name.perturbative_expansion:
+                logger.info('%s will be forbidden to run at NLO' % same_name.name)
+                same_name.perturbative_expansion = 0
+                
+                
+        else:
+            self.orders.append(coupling_order)
+    
+    def add_lorentz(self, lorentz):
+        """add one coupling"""
+        
+        # avoid name duplication
+        name = lorentz.name
+        same_name = next((p for p in self.lorentz if p.name==name), None)
+        if same_name:
+            lorentz.name = '%s%s' % (lorentz.name, self.addon)
+        
+        if self.old_new:     
+            pattern = re.compile(r'\b(%s)\b' % '|'.join(self.old_new.keys()))
+            def replace(matchobj):
+                return self.old_new[matchobj.group(0)]
+            lorentz.structure = pattern.sub(replace, lorentz.structure)
+        
+        old_lor = next((p for p in self.lorentz 
+                        if p.structure==lorentz.structure and p.spins == lorentz.spins), 
+                       None)
+        
+        if old_lor:
+            lorentz.replace = old_lor #tag for replacement
+        else:
+            self.lorentz.append(lorentz)    
+        
+    def add_interaction(self, interaction):
+        """Add one interaction to the model. This is UNCONDITIONAL!
+        if the same interaction is in the model this means that the interaction
+        will appear twice. This is now weaken if both interaction are exactly identical!
+        (EXACT same color/lorentz/coupling expression)
+        """
+        
+        #0. check name:
+        name = interaction.name
+        same_name = next((p for p in self.vertices if p.name==name), None)
+        if same_name:
+            interaction.name = '%s%s' % (interaction.name, self.addon)
+        
+        #1. check particles translation
+        particles = [p.replace if hasattr(p, 'replace') else p for p in interaction.particles]
+        interaction.particles = particles
+        
+        #2. check the lorentz structure
+        lorentz = [l.replace if hasattr(l, 'replace') else l for l in interaction.lorentz]
+        interaction.lorentz = lorentz
+
+        #3. check the couplings
+        couplings = [(key, c.replace) if hasattr(c, 'replace') else (key, c)
+                     for key, c in interaction.couplings.items()]
+        interaction.couplings = dict(couplings)
+        
+        #4. Try to avoid duplication of interaction:
+        # A crash is raised if the same particles have already the some lorentz structure
+        # at the same coupling order:
+        get_pdg = lambda vertex: sorted([p.pdg_code for p in vertex.particles])
+        id_part = get_pdg(interaction)
+        iden_vertex = [v for v in self.vertices if get_pdg(v) == id_part]
+        iden = False
+        nb_coupling = len(interaction.couplings)
+        keys = interaction.couplings.keys() # to have a fixed order!
+        
+        get_lor_and_color =  lambda i: (interaction.lorentz[keys[i][1]].structure,
+                       interaction.color[keys[i][0]])
+        for v in iden_vertex:
+            if len(v.couplings) != nb_coupling:
+                continue
+            found = []
+            for ((i,j), coup) in v.couplings.items():
+                new_lorentz = v.lorentz[j].structure
+                new_color = v.color[i]
+                k=0
+                same = [k for k in range(nb_coupling) if k not in found and 
+                        get_lor_and_color(k) == (new_lorentz, new_color)]
+                if not same:
+                    break
+                else:
+                    for k in same:
+                        if interaction.couplings[keys[k]] == coup:
+                            found.append(k)
+                            break
+                    else:
+                        # check only the coupling order
+                        for k in same:
+                            if interaction.couplings[keys[k]].order == coup.order:
+                                found.append(k)
+                                warning = """Did NOT add interaction %s since same particles/lorentz/color/coupling order 
+    BUT did not manage to ensure that the coupling is the same. couplings expression:
+    base model: %s
+    addon model: %s
+    """ % (id_part, coup.value, interaction.couplings[keys[k]].value)
+                                logger.warning(warning)
+                                found.append(k)
+                                break                        
+                        else:
+                            pass
+                            # mat
+            else:
+                # all found one identical...
+                return
+                
+        logger.info('Adding interaction for the following particles: %s' % id_part)
+        
+        
+        
+        
+        self.vertices.append(interaction)
+
+    def add_CTinteraction(self, interaction):
+        """Add one interaction to the model. This is UNCONDITIONAL!
+        if the same interaction is in the model this means that the interaction
+        will appear twice."""
+        
+        #0. check name:
+        name = interaction.name
+        same_name = next((p for p in self.vertices if p.name==name), None)
+        if same_name:
+            interaction.name = '%s%s' % (interaction.name, self.addon)
+        
+        #1. check particles translation
+        particles = [p.replace if hasattr(p, 'replace') else p for p in interaction.particles]
+        interaction.particles = particles
+        
+        #2. check the lorentz structure
+        lorentz = [l.replace if hasattr(l, 'replace') else l for l in interaction.lorentz]
+        interaction.lorentz = lorentz
+
+        #3. check the couplings
+        couplings = [(key, c.replace) if hasattr(c, 'replace') else (key, c)
+                     for key, c in interaction.couplings.items()]
+        interaction.couplings = dict(couplings)
+        
+
+        #4. check the loop_particles
+        loop_particles=[ [p.replace if hasattr(p, 'replace') else p for p in plist]
+                         for plist in interaction.loop_particles]
+        interaction.loop_particles = loop_particles
+        self.CTvertices.append(interaction)
+        
+
+    def add_model(self, model=None, path=None):
+        """add another model in the current one"""
+        
+        self.new_external = []
+        if path:
+            model = ufomodels.load_model(path) 
+        
+        if not model:
+            raise USRMODERROR, 'Need a valid Model'
+        
+        # Check the validity of the model. Too old UFO (before UFO 1.0)
+        if not hasattr(model, 'all_orders'):
+            raise USRMODERROR, 'Add-on Model doesn\'t follows UFO convention (no couplings_order information)\n' +\
+                               'MG5 is able to load such model but NOT to the add model feature.'
+        if isinstance(model.all_particles[0].mass, basestring):
+            raise USRMODERROR, 'Add-on Model doesn\'t follows UFO convention (Mass/Width of particles are string name, not object)\n' +\
+                               'MG5 is able to load such model but NOT to the add model feature.' 
+    
+        for order in model.all_orders:
+            if hasattr(order, 'perturbative_expansion') and order.perturbative_expansion:
+                raise USRMODERROR, 'Add-on model can not be loop model.' 
+                              
+        for order in model.all_orders:
+            self.add_coupling_order(order)
+        for parameter in model.all_parameters:
+            self.add_parameter(parameter)
+        for coupling in model.all_couplings:
+            self.add_coupling(coupling)
+        for lorentz in model.all_lorentz:
+            self.add_lorentz(lorentz)
+        for particle in model.all_particles:
+            self.add_particle(particle)
+        for vertex in model.all_vertices:
+            self.add_interaction(vertex)
+        
+        self.all_path.append(path)
+        
+        return
+
+#    def add_particle_from_model(self, model, name):
+#        """add the particles NAME from model model (either path or object)
+#        names can be either the name of one particle or a list of particle name
+#        """
+#
+#        if isinstance(model, basestring):
+#            model = UFOModel(self.modelpath)
+#
+#        
+#        if isinstance(name, list):
+#            [self.add_particles(self.modelpath, name) for name in names]
+#            return 
+#        
+#        # Check Validity
+#        part = self.get_particle(name)
+#        if self.particles_dict.has_key(part.pdg_code):
+#            raise USRMODERROR, 'The model contains already a particle with pdg_code %s.' % part.pdg_code
+#        
+#        # Add the particles to model
+#        self.particles.append(part)
+#        self.particles_dict[part.pdg_code] = part
+#
+#        # Loop over the interactions of the other model and add (if possible) the interactions 
+#        #associated to the new particles
+#        possibility = [v for v in vertex if part in v.particles]
+#
+#        for vertex in possibility:
+#            # Check that all particles are define in the model
+#            for particles in vertex.particles:
+#                if particles.pdg_code not in self.particles_dict:
+#                    continue
+#            # Add the interactions/lorentz structure/coupling
+#            self.vertices.append(vertex)
+#            # NEED WORK!!!!!
+            
+    
+
+
+
+    

=== modified file 'tests/input_files/LoopSMTest/particles.py'
--- tests/input_files/LoopSMTest/particles.py	2012-02-14 00:46:07 +0000
+++ tests/input_files/LoopSMTest/particles.py	2014-03-24 03:30:32 +0000
@@ -280,31 +280,24 @@
 tt__plus__ = tt__minus__.anti()
 
 
+# Wavefunction renormalization
+
+b.loop_particles = [[[5,21]]]
+b.counterterm = {(1,0,0):CTParam.bWcft_UV.value}
+
+t.loop_particles = [[[6,21]]]
+t.counterterm = {(1,0,0):CTParam.tWcft_UV.value}
+
+G.loop_particles = [[[5]],[[6]]]
+G.counterterm = {(1,0,0):CTParam.GWcft_UV_b.value,(1,0,1):CTParam.GWcft_UV_t.value}
+
 # Set counterterms values
 
-Param.MT.loop_particles= [[[t,G]]]  
-Param.MT.counterterm = {(1,0):CTParam.tMass_UV.value}          
-Param.MB.loop_particles= [[[b,G]]]
-Param.MB.counterterm = {(1,0):CTParam.bMass_UV.value}
-Param.G.loop_particles = [[[u],[d],[c],[s]],[[b]],[[t]],[[G]]]
-Param.G.counterterm = {(1,0):CTParam.G_UVq.value,(1,1):CTParam.G_UVb.value,(1,2):CTParam.G_UVt.value,(1,3):CTParam.G_UVg.value}
-
-# Wavefunction renormalization
-
-b.loop_particles = [[[b,G]]]
-b.counterterm = {(1,0):CTParam.bWcft_UV.value}
-
-t.loop_particles = [[[t,G]]]
-t.counterterm = {(1,0):CTParam.tWcft_UV.value}
-
-G.loop_particles = [[[b]],[[t]]]
-G.counterterm = {(1,0):CTParam.GWcft_UV_b.value,(1,1):CTParam.GWcft_UV_t.value}
-
-Param.MB.loop_particles= [[[b,G]]]
-Param.MB.counterterm = {(1,0):CTParam.bMass_UV.value}
-
-Param.MT.loop_particles= [[[t,G]]]
-Param.MT.counterterm = {(1,0):CTParam.tMass_UV.value}
-
-Param.G.loop_particles = [[[u],[d],[c],[s]],[[b]],[[t]],[[G]]],
-Param.G.counterterm = {(1,0):CTParam.G_UVq.value,(1,1):CTParam.G_UVb.value,(1,2):CTParam.G_UVt.value,(1,3):CTParam.G_UVg.value},
+Param.MB.loop_particles= [[[5,21]]]
+Param.MB.counterterm = {(1,0,0):CTParam.bMass_UV.value}
+
+Param.MT.loop_particles= [[[6,21]]]
+Param.MT.counterterm = {(1,0,0):CTParam.tMass_UV.value}
+
+Param.G.loop_particles = [[[2],[1],[3],[4]],[[5]],[[6]],[[21]]],
+Param.G.counterterm = {(1,0,0):CTParam.G_UVq.value,(1,0,1):CTParam.G_UVb.value,(1,0,2):CTParam.G_UVt.value,(1,0,3):CTParam.G_UVg.value},

=== modified file 'tests/time_db'
--- tests/time_db	2014-03-19 20:30:31 +0000
+++ tests/time_db	2014-03-24 03:30:32 +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.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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_get_length>]> 0.000235080718994
@@ -11,7 +10,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.ProcCardV4ReaderTest testMethod=test_line_creation>]> 0.0172848701477
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_f_product>]> 0.00337600708008
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_generate_helas_diagrams_uux_gepem>]> 0.0183539390564
-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_autocompletion>]> 0.0173709392548
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_diagram_tag_uu_uug>]> 0.0557870864868
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_T_simplify>]> 0.000298023223877
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_standalone_cpp_output>]> 2.42965912819
@@ -36,7 +34,6 @@
 <__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.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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_InvalidCmd>]> 0.300333976746
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order3>]> 0.0537929534912
@@ -56,7 +53,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMECmdShell testMethod=test_e_e_collision>]> 36.1715919971
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_ufo_aloha>]> 8.15419101715
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_majorana_conjugate_process>]> 0.116066932678
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_gauge>]> 30.4052541256
+<__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_group_subprocs.SubProcessGroupTest testMethod=test_even_more_special_group_decay_chain>]> 0.344223976135
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_get_interaction>]> 0.000319004058838
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSMultiProcess_no_fsr>]> 0.15252494812
@@ -75,7 +72,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_AbstractModel testMethod=test_generate_ab_amplitudes>]> 0.394317865372
 <__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_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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_conjugate_index>]> 0.00273394584656
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_Tr_simplify>]> 0.000442028045654
@@ -95,6 +91,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_diagram_list>]> 0.000178098678589
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_flipping>]> 0.0031681060791
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_setget_process_correct>]> 0.000624895095825
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_add_external_parameters>]> 0.00190401077271
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_hasordinate_wronginput>]> 0.000245809555054
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_find_fks_j_from_i>]> 0.0350108146667
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator5>]> 0.182165145874
@@ -103,11 +100,13 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.IOExportV4Test testMethod=test_export_group_decay_chains>]> 0.378351926804
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_flow_string>]> 0.00816702842712
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_part_spin32propagator>]> 0.0205278396606
+<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.TestMadWeight testMethod=test_mw_wproduction>]> 11.4712297916
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWithPathRegExpr>]> 0.00521206855774
+=======
+>>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_NLO_draw_uux_uuxddx>]> 0.00144910812378
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_py6_stdhep>]> 38.5469400883
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_ufo_parsers.UFOParserTest testMethod=test_parse_fortran_IfElseStruct>]> 0.000214099884033
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_fermionfactor_emep_emepemep>]> 0.24795794487
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasDecayChainProcessTest testMethod=test_helas_forbidden_s_channel_decay_chain>]> 0.178428888321
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_values_for_prop>]> 0.000174999237061
@@ -121,10 +120,15 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diquark_models.TestColorTripletModel testMethod=test_check_u_t_antitrip_g>]> 0.479106903076
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_T_f_product>]> 0.00395798683167
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_process_checks.TestMatrixElementChecker testMethod=test_failed_process>]> 1.92713904381
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_particles>]> 0.044410943985
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_coupling_orders_uux_ddxng>]> 0.389806032181
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingOption testMethod=test_option_6g>]> 0.0658371448517
+<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTestExampleWithSetUp testMethod=testIO_IOTestWrappedWithSetUP>]> 0.00829696655273
+=======
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticleList testMethod=test_convert>]> 0.000968933105469
+>>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_exporters.IOExportMadLoopUnitTest testMethod=test_IOTests>]> 12.0391700268
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.TestIdentifyMETagFKS testMethod=test_identify_me_tag_qq_qg>]> 0.0854730606079
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_replace_indices>]> 0.000101089477539
@@ -157,6 +161,7 @@
 <__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.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_combine_legs_gluons>]> 0.00331091880798
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_add_parameters>]> 0.00129199028015
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorFactorTest testMethod=test_d_product>]> 0.00334000587463
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_pert_particles_interactionsi_mssm>]> 7.10099411011
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_misc.IOMiscTest testMethod=test_parse_info_str_error>]> 8.82148742676e-05
@@ -175,6 +180,7 @@
 <__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_usermod.TestModUFO testMethod=test_write_orders>]> 0.00566101074219
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestExtendedCmd testMethod=test_the_exit_from_child_cmd2>]> 0.000120162963867
 <__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_import_ufo.TestRestrictModel testMethod=test_merge_identical_parameters>]> 0.0875990390778
@@ -192,7 +198,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order1>]> 0.0381689071655
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_8fs>]> 0.104753017426
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_colorize_uux_ggg>]> 0.0345070362091
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_vertex_list>]> 7.5101852417e-05
+<__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.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_amcatnlo.TestMECmdShell testMethod=test_generate_events_nlo_hw6_split>]> 85.3567028046
@@ -202,18 +208,18 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_power>]> 0.00031304359436
 <__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.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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvaradd>]> 7.20024108887e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddmult>]> 0.000133991241455
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_find_vertexlist>]> 0.113565921783
-<__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.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_ddx_uux>]> 1.11160707474
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gg_wpwmttx>]> 1.00893592834
-<__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_edit_card.TestEditCardCmd testMethod=test_modif_param_card>]> 0.0154800415039
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testmassisdiffaswidth>]> 0.000320911407471
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_shell_string>]> 0.000377893447876
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_add_particle>]> 0.00152111053467
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_wavefunctions testMethod=test_OR>]> 0.000894069671631
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ParticleTest testMethod=test_setget_particle_exceptions>]> 0.000194072723389
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_representation>]> 5.88893890381e-05
@@ -234,6 +240,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_group_decay_chains>]> 0.438848972321
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_F77writer_complex_mass_scheme>]> 0.0254271030426
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_nlo>]> 11.7403600216
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_vertices>]> 0.53790307045
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasDecayChainProcessTest testMethod=test_helas_decay_chain_process>]> 0.479960918427
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_processes_different_is_particles>]> 0.0413808822632
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_helas_multi_process>]> 0.0335440635681
@@ -243,6 +250,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_cpp.IOExportPythia8Test testMethod=test_write_dec_multiprocess_files>]> 0.481742143631
 <__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.testLorentzObject testMethod=testscalarmanipulation>]> 0.000458955764771
+<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_zz_n1n1>]> 0.0138208866119
 <__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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_stop_decay>]> 0.01522397995
@@ -250,9 +258,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessDefinitionTest testMethod=test_setget_process_definition_exceptions>]> 0.000463008880615
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultint>]> 9.48905944824e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_combine_ij>]> 0.00774097442627
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFONoSideEffect testMethod=test_ImportUFONoSideEffectNLO>]> 0.303053855896
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_parity_for_epsilon>]> 0.000375032424927
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_multiple_lorentz_structures_with_fermion_flow_clash>]> 0.034786939621
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_short_cross_gauge>]> 115.8441329
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_Cppwriter_C>]> 0.034628868103
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddint>]> 0.000109910964966
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=testConjugateOperator>]> 0.0886290073395
@@ -290,11 +298,9 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_pdgs>]> 0.0846738815308
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DecayChainAmplitudeTest testMethod=test_setget_process_correct>]> 0.000761985778809
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_product>]> 9.89437103271e-05
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_name>]> 44.6062128544
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization3>]> 0.000184774398804
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_getsetvertexlist_correct>]> 0.112138986588
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_findchannels>]> 8.38987207413
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummulvar>]> 0.000131845474243
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_singletop_fastjet>]> 140.989368916
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanLine testMethod=test_domain_intersection_failure>]> 0.000155925750732
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_mssm_subset_creation>]> 0.190835952759
@@ -352,17 +358,16 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_sumofLorentzObj>]> 0.00670909881592
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_setget_vertex_correct>]> 5.50746917725e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_spin3half>]> 0.154654026031
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_to_immutable>]> 5.88893890381e-05
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.VertexTest testMethod=test_vertex_list>]> 7.5101852417e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madloop.TestCmdLoop testMethod=test_ML_check_timing_epem_ttx>]> 14.4036149979
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.LoopDiagramDrawerTest testMethod=test_fuse_line>]> 0.00980591773987
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testmultaddmult>]> 0.000133991241455
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell1 testMethod=test_import_model>]> 0.106930971146
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.MultiLegTest testMethod=test_representation>]> 5.91278076172e-05
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_model_equivalence.TestModelCreation testMethod=test_all>]> 0.951196908951
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_epsilon_object>]> 0.000172138214111
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_FFV>]> 0.10179400444
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_process_init>]> 0.00924706459045
-<__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_zz_n1n1>]> 0.0138208866119
+<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_import_banner_command>]> 1.45100903511
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_ij_lines>]> 0.0146369934082
 <__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
@@ -372,10 +377,13 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_split_evt_gen>]> 6.80820512772
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_Channel testMethod=test_get_initialfinal>]> 0.125761032104
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_generate_reals_no_combine>]> 0.184464216232
+<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm2>]> 23.508852005
+=======
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummulvar>]> 0.000131845474243
+>>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasAmplitudeTest testMethod=test_sign_flips_to_order>]> 8.08238983154e-05
 <__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=test_write_nfksconfigs_file>]> 0.0158369541168
@@ -386,11 +394,14 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testsummultmul>]> 0.000133991241455
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py8_analyse>]> 0.000602960586548
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_enu_enu>]> 0.008131980896
+<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_merge_iden_couplings>]> 0.0879130363464
 <__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.HelasAmplitudeTest testMethod=test_setget_amplitude_exceptions>]> 0.000211000442505
+>>>>>>> MERGE-SOURCE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_get_base_amplitude>]> 0.140361070633
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorObjectTest testMethod=test_standard>]> 3.79085540771e-05
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_tt_semi>]> 125.299013853
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_convert_number_to_cpp>]> 0.0238170623779
 <__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
@@ -429,7 +440,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_cleaning_history>]> 0.000346899032593
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_py6_stdhep>]> 53.4534900188
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell1 testMethod=test_config>]> 0.0454940795898
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.Testmadweight testMethod=test_tt_semi>]> 8.710709095
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_decay_chain_different_order2>]> 0.0539619922638
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorSquareTest testMethod=test_color_matrix_Nc_restrictions>]> 0.0706989765167
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_expand_list_list>]> 0.00169205665588
@@ -440,6 +450,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_shower_scripts>]> 31.1297941208
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.UFO_model_to_mg4_Test testMethod=test_case_sensitive>]> 0.122036933899
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestMultVariable testMethod=testequality>]> 0.000127077102661
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_add_external_parameters>]> 0.00169491767883
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_uuddg_uudd>]> 0.0242109298706
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTest_SimpleExamples testMethod=testIO_MyCustomNameIOTestWrappedWithReturnPath>]> 0.00258612632751
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ProcessTest testMethod=test_representation>]> 0.00148892402649
@@ -449,7 +460,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_use_of_library_spin2>]> 0.103766918182
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testtensorialproductspin>]> 0.070338010788
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testeinsteinsum2>]> 0.00269603729248
-<__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_permutation.TestPermutation testMethod=test_all_permutation>]> 0.000955820083618
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_setget_interaction_correct>]> 0.000202894210815
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_ddxwpduxgg_gdxwpuxgg>]> 1.28763198853
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_helpers>]> 0.0438580513
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_22>]> 360.097683191
@@ -500,7 +511,10 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_calculate_xsect_lo>]> 26.0977950096
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_base.TestFKSProcess testMethod=test_FKSRealProcess_init>]> 0.0786809921265
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_helas_diagrams_gg_gogo_go_tt1x_t_wpb>]> 0.0463981628418
+<<<<<<< TREE
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_heft_multiparticle_pp_hnj>]> 0.326533079147
+=======
+>>>>>>> MERGE-SOURCE
 <__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.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_ea_ae>]> 0.0131080150604
@@ -512,6 +526,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_no_cutting_line>]> 0.0152459144592
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_drawing.TestLoopDrawer testMethod=test_loop_convert_diagram>]> 0.000792026519775
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfHEFT testMethod=test_sort_proc>]> 0.0744910240173
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO2 testMethod=test_add_particle>]> 0.00068187713623
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_mssm>]> 11.2124068737
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_setget_interaction_exceptions>]> 0.000231027603149
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_save_model.IOSaveModel testMethod=test_interaction_save>]> 0.000285148620605
@@ -524,7 +539,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_multistage_decay_chain_process>]> 0.203777074814
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestTchannelModels testMethod=test_uu_to_tt_tch>]> 7.79628753662e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestConvertSLAH testMethod=test_convert_to_mg5>]> 0.0130620002747
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_import_banner_command>]> 1.45100903511
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_decay_process_generation>]> 0.0119822025299
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_gg_tt_fullylept>]> 0.189878940582
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCard testMethod=test_mod_param>]> 0.000418901443481
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=test_split>]> 0.00737619400024
@@ -538,6 +553,7 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_madevent_directory>]> 16.0076999664
 <__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.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
@@ -547,6 +563,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMultiProcessTest testMethod=test_majorana_decay_chain_process>]> 0.136888980865
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_4fermion_models.TestTchannelModels testMethod=test_uu_to_ttg_tch>]> 4.60147857666e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_forbidden_s_channel_uux_uuxng>]> 0.0782489776611
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO2 testMethod=test_add_external_parameters>]> 0.00142097473145
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestLorentzObjectRepresentation testMethod=testgetrepresentation>]> 0.00228095054626
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_mg5_sm_23_p3>]> 27.4707448483
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_matrix_element_fks>]> 0.0163419246674
@@ -577,7 +594,6 @@
 <__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.unit_tests.various.test_diquark_models.TestColorSextetModel testMethod=test_uu_to_six_g>]> 0.172813892365
 <__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_amcatnlo.TestMECmdShell testMethod=test_split_evt_gen_zeroev>]> 67.6156620979
 <__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.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_leshouche_sextet_diquarks>]> 2.94189381599
@@ -587,12 +603,12 @@
 <__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_cmd.TestInstall testMethod=test_install_update>]> 0.00136995315552
 <__main__.TestSuiteModified tests=[<tests.unit_tests.interface.test_cmd.TestValidCmd testMethod=test_shell_and_continuation_line>]> 0.0123059749603
-<__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_export_v4.TestMadWeight testMethod=test_ungrouping_lepton>]> 0.0430071353912
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_multiparticle_mirror_pp_3j>]> 0.479301929474
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_rotate_momenta>]> 0.533701896667
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_get_fks_j_from_i_lines>]> 2.00525093079
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_madevent_subproc_group_decay_chain>]> 8.28355312347
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_C>]> 0.0504019260406
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.Test_ADDON_UFO testMethod=test_couplings>]> 0.000942945480347
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_Plorentz>]> 0.0568020343781
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_ue_dve>]> 0.00433206558228
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_link_to_ufo.TestUFOExpressionParsers testMethod=test_parse_to_fortran>]> 0.0236949920654
@@ -613,7 +629,6 @@
 <__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.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.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_uu_susu>]> 0.0135440826416
@@ -630,7 +645,7 @@
 <__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_gauge.GaugeComparator testMethod=test_gauge_2>]> 400.482264042
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_pythonwriter_4_fermion>]> 0.0460660457611
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_drawing_eps.TestDrawingOption testMethod=test_option_6g_second>]> 0.0498158931732
-<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.InteractionTest testMethod=test_setget_interaction_correct>]> 0.000202894210815
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFONoSideEffect testMethod=test_ImportUFONoSideEffectLO>]> 0.00247716903687
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_setget_model_error>]> 0.000347852706909
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_FO_analyse_card.TestFOAnalyseCard testMethod=test_analyse_card_analyse>]> 0.000509977340698
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_generate_loop.TestGenerateLoopFKS testMethod=test_generate_virtuals_single_process>]> 1.24343204498
@@ -646,9 +661,13 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hw6_stdhep>]> 10.500576973
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_spin2propagator3>]> 0.0653259754181
 <__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.various.test_decay.Test_IdentifyHelasTag testMethod=test_helas_comparison>]> 0.225214958191
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_write_param.TestParamWrittingWithRestrict testMethod=test_define_not_dep_param>]> 0.0751221179962
+<<<<<<< TREE
+<__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_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.000688076019287
+>>>>>>> MERGE-SOURCE
 <__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
@@ -663,26 +682,29 @@
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_madevent.TestMEfromPdirectory testMethod=test_run_fromP>]> 21.0784730911
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.MultiProcessTest testMethod=test_wrong_multiparticle>]> 0.00848388671875
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.DiagramTest testMethod=test_setget_diagram_correct>]> 9.48905944824e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.madweight.test_export_v4.TestMadWeight testMethod=test_modification_to_cuts>]> 0.0898389816284
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarvar>]> 6.89029693604e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_den_factor_lines>]> 2.02332401276
 <__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.core.test_diagram_generation.MultiProcessTest testMethod=test_setget_process_exceptions>]> 0.000932931900024
 <__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_aloha.TestAlohaWriter testMethod=test_aloha_MP_mode>]> 0.0349721908569
+<<<<<<< TREE
 <__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.core.test_color_algebra.ColorObjectTest testMethod=test_delta6_simplify>]> 8.51154327393e-05
+>>>>>>> MERGE-SOURCE
 <__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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_complicated_majorana_process>]> 0.110619068146
 <__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.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.acceptance_tests.test_cmd_madevent.TestMEfromfile testMethod=test_add_time_of_flight>]> 19.5163040161
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_setget>]> 2.0447640419
 <__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.000722885131836
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_leshouche_file>]> 0.00247812271118
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_generate_events_lo_hwpp_set>]> 29.2329268456
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_read_madgraph4_proc_card>]> 0.877720832825
@@ -704,7 +726,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_split_leg>]> 0.00107002258301
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testrsumvarvar>]> 7.60555267334e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_complex_conjugate>]> 8.20159912109e-05
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.test_aloha_creation testMethod=test_aloha_VVS>]> 0.0273261070251
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_special_group_decay_chain>]> 0.162132024765
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_helas_objects.testFKSHelasObjects testMethod=test_fks_helas_multi_process_ppz>]> 1.70217895508
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.AmplitudeTest testMethod=test_setget_amplitude_correct>]> 0.00019097328186
@@ -715,7 +736,7 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_particles_type>]> 1.96593403816
 <__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.fks.test_fks_common.TestFKSCommon testMethod=test_find_splittings>]> 0.0126750469208
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.Testmadweight testMethod=test_zh>]> 8.19490408897
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization>]> 0.000458955764771
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_locate_couplings>]> 0.0886061191559
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_model_reader.TestModelReader testMethod=test_set_parameters_and_couplings>]> 0.0923321247101
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestImportUFO testMethod=test_expansion_order>]> 0.0448379516602
@@ -723,15 +744,13 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_diagram_generation.LoopDiagramGenerationTest testMethod=test_CT_vertices_generation_gg_gg>]> 1.53292918205
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_generate_helas_diagrams_WWWWA>]> 0.132983922958
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.ModelTest testMethod=test_pass_in_standard_name>]> 0.0025041103363
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=test_factorization>]> 0.000458955764771
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm3>]> 36.7921011448
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_helas_objects.HelasMatrixElementTest testMethod=test_multi_amp_majorana_process>]> 0.00927495956421
 <__main__.TestSuiteModified tests=[<tests.unit_tests.loop.test_loop_helas_objects.LoopHelasMatrixElementTest testMethod=test_helas_diagrams_gg_ggg>]> 0.551722049713
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_IOTest_examples.IOTestExampleWithSetUp testMethod=testIO_MyHandwrittenIOTest>]> 0.000919103622437
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testmultvarMult>]> 8.82148742676e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_import_v4.IOImportV4Test testMethod=test_full_import>]> 0.0387060642242
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_algebra.ColorStringTest testMethod=test_from_immutable>]> 0.000111818313599
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_heft>]> 10.1859381199
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_usermod.TestModUFO testMethod=test_write_model>]> 0.0592589378357
 <__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.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
@@ -767,12 +786,12 @@
 <__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.unit_tests.fks.test_fks_common.TestFKSCommon testMethod=test_find_particles_interactions_no_ghosts>]> 0.457952976227
-<__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_madweight.TestMadWeight testMethod=test_mw_wjjproduction>]> 14.5608379841
+<__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.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.various.test_4fermion_models.TestSchannelModels testMethod=test_uu_to_tt_sch>]> 0.152179956436
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAddVariable testMethod=testsumaddvar>]> 0.000104904174805
+<__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestFeynmanDiagram testMethod=test_creation_from_cmd>]> 0.0318400859833
 <__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_files.TestFilesGestion testMethod=test_is_uptodate>]> 1.0137488842
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestAlohaWriter testMethod=test_aloha_get_name>]> 0.030855178833
@@ -788,8 +807,6 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_diagram_symmetry.TestDiagramSymmetry testMethod=test_find_symmetry_qq_qqg_with_subprocess_group>]> 0.406945943832
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_check_param>]> 0.0894939899445
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestSomeObjectProperty testMethod=test_other>]> 4.31537628174e-05
-<__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_v4.FullHelasOutputTest testMethod=test_vector_clash_majorana_process>]> 0.012188911438
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd.TestCmdShell2 testMethod=test_output_standalone_directory>]> 8.03073692322
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayModel testMethod=test_find_full_sm_decay_groups>]> 5.82679080963
@@ -799,26 +816,24 @@
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_import_ufo.TestRestrictModel testMethod=test_remove_couplings>]> 0.0872521400452
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_group_subprocs.SubProcessGroupTest testMethod=test_single_decay_combinations>]> 0.0449919700623
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_decay.Test_DecayParticle testMethod=test_setgetinit_exceptions>]> 0.111714839935
-<__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.unit_tests.madspin.test_madspin.TestBanner testMethod=test_extract_info>]> 0.00151705741882
-<__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_aloha.test_aloha_creation testMethod=test_aloha_VVS>]> 0.0273261070251
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_shower_card.TestShowerCard testMethod=test_shower_card_py6>]> 0.000173807144165
-<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.TestVariable testMethod=testsumvarvar>]> 6.89029693604e-05
+<__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_aloha.testLorentzObject testMethod=test_mass_overmass>]> 0.00163412094116
 <__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
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_color_amp.ColorAmpTest testMethod=test_color_flow_string_epsilon>]> 0.00355815887451
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_drawing.TestVertexPoint testMethod=test_add_line>]> 0.000107049942017
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.compare_with_old_mg5_version.OLDMG5Comparator testMethod=test_short_cross_sm1>]> 38.1165001392
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_diagram_generation.DiagramGenerationTest testMethod=test_diagram_generation_uux_gg>]> 0.00705409049988
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestFKSDiagramTag testMethod=test_reorder_permutation>]> 5.41210174561e-05
 <__main__.TestSuiteModified tests=[<tests.unit_tests.fks.test_fks_common.TestLinkRBConfSM testMethod=test_link_uuuug_guug>]> 0.0394339561462
 <__main__.TestSuiteModified tests=[<tests.unit_tests.various.test_check_param_card.TestParamCardRule testMethod=test_read_write_param_card>]> 0.00176000595093
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_v4.FullHelasOutputTest testMethod=test_configs_4f_decay>]> 0.0363750457764
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_misc.IOMiscTest testMethod=test_parse_info_str_correct>]> 0.000116109848022
-<__main__.TestSuiteModified tests=[<tests.parallel_tests.test_madweight.TestMadWeight testMethod=test_short_mw_wa>]> 11.9575219154
 <__main__.TestSuiteModified tests=[<tests.unit_tests.core.test_base_objects.LegTest testMethod=test_setget_leg_exceptions>]> 0.000114917755127
 <__main__.TestSuiteModified tests=[<tests.unit_tests.iolibs.test_export_fks.IOExportFKSTest testMethod=test_write_nexternal_file>]> 0.000472784042358
 <__main__.TestSuiteModified tests=[<tests.acceptance_tests.test_cmd_amcatnlo.TestMECmdShell testMethod=test_check_ppzjj>]> 59.9299731255

=== modified file 'tests/unit_tests/various/test_import_ufo.py'
--- tests/unit_tests/various/test_import_ufo.py	2013-11-29 07:28:53 +0000
+++ tests/unit_tests/various/test_import_ufo.py	2014-03-24 03:30:32 +0000
@@ -25,6 +25,7 @@
 import models.import_ufo as import_ufo
 import models.model_reader as model_reader
 import madgraph.iolibs.export_v4 as export_v4
+import models as ufomodels
 
 _file_path = os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]
 
@@ -74,6 +75,61 @@
         model = import_ufo.import_model(sm_path + '-no_masses')
         self.assertEqual(model.get_nflav(), 5)
 
+class TestImportUFONoSideEffect(unittest.TestCase):
+    """Test class for the the possible side effect on a UFO model loaded when
+       converting it to a MG5 model"""
+
+    def test_ImportUFONoSideEffectLO(self):
+        """Checks that there are no side effects of the import of the LO UFO sm"""       
+        ufo_model = ufomodels.load_model(import_ufo.find_ufo_path('sm'),False)
+        original_all_particles = copy.copy(ufo_model.all_particles)
+        original_all_vertices = copy.copy(ufo_model.all_vertices)
+        original_all_couplings = copy.copy(ufo_model.all_couplings)
+        original_all_lorentz = copy.copy(ufo_model.all_lorentz)
+        original_all_parameters = copy.copy(ufo_model.all_parameters)
+        original_all_orders = copy.copy(ufo_model.all_orders)
+        original_all_functions = copy.copy(ufo_model.all_functions)
+
+        ufo2mg5_converter = import_ufo.UFOMG5Converter(ufo_model)
+        model = ufo2mg5_converter.load_model()
+        parameters, couplings = import_ufo.OrganizeModelExpression(ufo_model).main()        
+
+        self.assertEqual(original_all_particles,ufo_model.all_particles)        
+        self.assertEqual(original_all_vertices,ufo_model.all_vertices)
+        self.assertEqual(original_all_couplings,ufo_model.all_couplings)
+        self.assertEqual(original_all_lorentz,ufo_model.all_lorentz)
+        self.assertEqual(original_all_parameters,ufo_model.all_parameters)
+        self.assertEqual(original_all_orders,ufo_model.all_orders)
+        self.assertEqual(original_all_functions,ufo_model.all_functions)
+        
+    def test_ImportUFONoSideEffectNLO(self):
+        """Checks that there are no side effects of the import of the NLO UFO sm"""
+        ufo_model = ufomodels.load_model(import_ufo.find_ufo_path('loop_sm'),False)
+        original_all_particles = copy.copy(ufo_model.all_particles)
+        original_all_vertices = copy.copy(ufo_model.all_vertices)
+        original_all_couplings = copy.copy(ufo_model.all_couplings)
+        original_all_lorentz = copy.copy(ufo_model.all_lorentz)
+        original_all_parameters = copy.copy(ufo_model.all_parameters)
+        original_all_orders = copy.copy(ufo_model.all_orders)
+        original_all_functions = copy.copy(ufo_model.all_functions)
+        original_all_CTvertices = copy.copy(ufo_model.all_CTvertices)
+        original_all_CTparameters = copy.copy(ufo_model.all_CTparameters)
+
+
+        ufo2mg5_converter = import_ufo.UFOMG5Converter(ufo_model)
+        model = ufo2mg5_converter.load_model()
+        parameters, couplings = import_ufo.OrganizeModelExpression(ufo_model).main()        
+
+        self.assertEqual(original_all_particles,ufo_model.all_particles)
+        self.assertEqual(original_all_vertices,ufo_model.all_vertices)
+#        self.assertEqual(original_all_couplings,ufo_model.all_couplings)
+        self.assertEqual(original_all_lorentz,ufo_model.all_lorentz)
+        self.assertEqual(original_all_parameters,ufo_model.all_parameters)
+        self.assertEqual(original_all_orders,ufo_model.all_orders)
+        self.assertEqual(original_all_functions,ufo_model.all_functions)
+        self.assertEqual(original_all_CTvertices,ufo_model.all_CTvertices)
+        self.assertEqual(original_all_CTparameters,ufo_model.all_CTparameters)
+
 #===============================================================================
 # TestRestrictModel
 #===============================================================================

=== added file 'tests/unit_tests/various/test_usermod.py'
--- tests/unit_tests/various/test_usermod.py	1970-01-01 00:00:00 +0000
+++ tests/unit_tests/various/test_usermod.py	2014-03-24 03:30:32 +0000
@@ -0,0 +1,883 @@
+################################################################################
+#
+# Copyright (c) 2009 The MadGraph Development team and Contributors
+#
+# This file is a part of the MadGraph 5 project, an application which 
+# automatically generates Feynman diagrams and matrix elements for arbitrary
+# high-energy processes in the Standard Model and beyond.
+#
+# It is subject to the MadGraph license which should accompany this 
+# distribution.
+#
+# For more information, please visit: http://madgraph.phys.ucl.ac.be
+#
+################################################################################
+"""Unit test Library for importing and restricting model"""
+from __future__ import division
+
+import copy
+import os
+import sys
+import time
+import tempfile 
+import shutil 
+
+import tests.unit_tests as unittest
+import madgraph.core.base_objects as base_objects
+import models.import_ufo as import_ufo
+import models.usermod as usermod
+import models.model_reader as model_reader
+import madgraph.iolibs.export_v4 as export_v4
+
+_file_path = os.path.split(os.path.dirname(os.path.realpath(__file__)))[0]
+pjoin = os.path.join
+
+import cmath
+
+#
+# UFO CLASS SINCE THEY WILL BE USEFULL!
+#
+
+class UFOBaseClass(object):
+    """The class from which all FeynRules classes are derived."""
+
+    require_args = []
+
+    def __init__(self, *args, **options):
+        assert(len(self.require_args) == len (args))
+    
+        for i, name in enumerate(self.require_args):
+            setattr(self, name, args[i])
+    
+        for (option, value) in options.items():
+            setattr(self, option, value)
+
+    def get(self, name):
+        return getattr(self, name)
+    
+    def set(self, name, value):
+        setattr(self, name, value)
+        
+    def get_all(self):
+        """Return a dictionary containing all the information of the object"""
+        return self.__dict__
+
+    def __str__(self):
+        return self.name
+
+    def nice_string(self):
+        """ return string with the full information """
+        return '\n'.join(['%s \t: %s' %(name, value) for name, value in self.__dict__.items()])
+
+    def __repr__(self):
+        replacements = [
+            ('+','__plus__'),
+            ('-','__minus__'),
+            ('@','__at__'),
+            ('!','__exclam__'),
+            ('?','__quest__'),
+            ('*','__star__'),
+            ('~','__tilde__')
+            ]
+        text = self.name
+        for orig,sub in replacements:
+            text = text.replace(orig,sub)
+        return text
+
+
+
+all_particles = []
+
+    
+
+class Particle(UFOBaseClass):
+    """A standard Particle"""
+
+    require_args=['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'charge']
+
+    require_args_all = ['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'charge', 'line', 'propagating', 'goldstoneboson']
+
+    def __init__(self, pdg_code, name, antiname, spin, color, mass, width, texname,
+                 antitexname, charge , line=None, propagating=True, goldstoneboson=False, **options):
+
+        args= (pdg_code, name, antiname, spin, color, mass, width, texname,
+                 antitexname, float(charge))
+
+        UFOBaseClass.__init__(self, *args,  **options)
+
+        global all_particles
+        all_particles.append(self)
+
+        self.propagating = propagating
+        self.goldstoneboson= goldstoneboson
+
+        self.selfconjugate = (name == antiname)
+        if 1: #not line:
+            self.line = self.find_line_type()
+        else:
+            self.line = line
+
+
+
+
+    def find_line_type(self):
+        """ find how we draw a line if not defined
+        valid output: dashed/straight/wavy/curly/double/swavy/scurly
+        """
+        
+        spin = self.spin
+        color = self.color
+        
+        #use default
+        if spin == 1:
+            return 'dashed'
+        elif spin == 2:
+            if not self.selfconjugate:
+                return 'straight'
+            elif color == 1:
+                return 'swavy'
+            else:
+                return 'scurly'
+        elif spin == 3:
+            if color == 1:
+                return 'wavy'
+            
+            else:
+                return 'curly'
+        elif spin == 5:
+            return 'double'
+        elif spin == -1:
+            return 'dotted'
+        else:
+            return 'dashed' # not supported yet
+
+    def anti(self):
+        if self.selfconjugate:
+            raise Exception('%s has no anti particle.' % self.name) 
+        outdic = {}
+        for k,v in self.__dict__.iteritems():
+            if k not in self.require_args_all:                
+                outdic[k] = -v
+        if self.color in [1,8]:
+            newcolor = self.color
+        else:
+            newcolor = -self.color
+                
+        return Particle(-self.pdg_code, self.antiname, self.name, self.spin, newcolor, self.mass, self.width,
+                        self.antitexname, self.texname, -self.charge, self.line, self.propagating, self.goldstoneboson, **outdic)
+
+
+
+all_parameters = []
+
+class Parameter(UFOBaseClass):
+
+    require_args=['name', 'nature', 'type', 'value', 'texname']
+
+    def __init__(self, name, nature, type, value, texname, lhablock=None, lhacode=None):
+
+        args = (name,nature,type,value,texname)
+
+        UFOBaseClass.__init__(self, *args)
+
+        args=(name,nature,type,value,texname)
+
+        global all_parameters
+        all_parameters.append(self)
+
+        if (lhablock is None or lhacode is None)  and nature == 'external':
+            raise Exception('Need LHA information for external parameter "%s".' % name)
+        self.lhablock = lhablock
+        self.lhacode = lhacode
+
+all_vertices = []
+
+class Vertex(UFOBaseClass):
+
+    require_args=['name', 'particles', 'color', 'lorentz', 'couplings']
+
+    def __init__(self, name, particles, color, lorentz, couplings, **opt):
+ 
+        args = (name, particles, color, lorentz, couplings)
+
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        args=(particles,color,lorentz,couplings)
+
+        global all_vertices
+        all_vertices.append(self)
+
+all_couplings = []
+
+class Coupling(UFOBaseClass):
+
+    require_args=['name', 'value', 'order']
+
+    def __init__(self, name, value, order, **opt):
+
+        args =(name, value, order)    
+        UFOBaseClass.__init__(self, *args, **opt)
+        global all_couplings
+        all_couplings.append(self)
+  
+
+
+all_lorentz = []
+
+class Lorentz(UFOBaseClass):
+
+    require_args=['name','spins','structure']
+    
+    def __init__(self, name, spins, structure='external', **opt):
+        args = (name, spins, structure)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_lorentz
+        all_lorentz.append(self)
+
+
+all_functions = []
+
+class Function(object):
+
+    def __init__(self, name, arguments, expression):
+
+        global all_functions
+        all_functions.append(self)
+
+        self.name = name
+        self.arguments = arguments
+        self.expr = expression
+    
+    def __call__(self, *opt):
+
+        for i, arg in enumerate(self.arguments):
+            exec('%s = %s' % (arg, opt[i] ))
+
+        return eval(self.expr)
+
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+
+all_decays = []
+
+class Decay(UFOBaseClass):
+    require_args = ['particle','partial_widths']
+
+    def __init__(self, particle, partial_widths, **opt):
+        args = (particle, partial_widths)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_decays
+        all_decays.append(self)
+    
+        # Add the information directly to the particle
+        particle.partial_widths = partial_widths
+
+all_form_factors = []
+
+class FormFactor(UFOBaseClass):
+    require_args = ['name','type','value']
+
+    def __init__(self, name, type, value, **opt):
+        args = (name, type, value)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_form_factors
+        all_form_factors.append(self)
+
+
+
+#===============================================================================
+# Test The UFO usermod package 
+#===============================================================================
+class TestModUFO(unittest.TestCase):
+    """Test class for the USERMOD object"""
+
+
+    def setUp(self):
+        
+        self.path = tempfile.mkdtemp(prefix='unitest_usermod') 
+
+        #Read the full SM
+        self.sm_path = import_ufo.find_ufo_path('sm')
+        self.base_model = usermod.UFOModel(self.sm_path)
+        
+    def tearDown(self):
+        
+        shutil.rmtree(self.path)
+
+
+    def test_write_model(self):
+        """ Check that we can write all the require UFO files """
+        
+        output = pjoin(self.path, 'usrmod')
+        self.base_model.write(output)
+        sm_path = import_ufo.find_ufo_path('sm')
+        self.assertEqual(12, 
+                len([1 for name in os.listdir(sm_path) if name.endswith('.py')]), 
+               'New file in  UFO format, usrmod need to be modified')
+
+        self.assertEqual(11, 
+                len([1 for name in os.listdir(output) if name.endswith('.py')]))
+
+        sys.path.insert(0, os.path.dirname(output))
+        import usrmod
+
+
+    def compare(self, text1, text2, optional=[], default={}):
+        """ """
+        
+        texts= [text1, text2]
+        data = []
+        
+        for text in texts:
+            curr_data = []
+            data.append(curr_data)
+            curr_object = {}
+            for line in text.split('\n'):
+                line = line.strip()
+                if line.endswith(',') or line.endswith(')'):
+                    line = line[:-1]
+                    
+                if (line.count('=') == 2 and line.count('(') == 1):
+                    if curr_object:
+                        curr_data.append(curr_object)
+                    curr_object = dict(default)
+                    k,value = line.split('(')[1].split('=')
+                    curr_object[k.strip()] = value.strip()
+                elif line.count('=') == 1:
+                    k,value = line.split('=')
+                    curr_object[k.strip()] =  value.strip()
+            else:
+                if curr_object:
+                    curr_data.append(curr_object)
+        
+        for element in data[0]:
+            #print element, type(element)
+            for i in range(1, len(data)):
+                #for element2 in data[i]:
+                #    print element2,
+                #    if element == element2:
+                #        print 'identical'
+                #        break
+                #    else:
+                #        print 'different'
+                #else:
+                #    self.assertFalse(True)
+                self.assertTrue(element in data[i])
+
+
+    def test_write_orders(self):
+        """Check that the content of the file is valid"""
+
+        output = self.path
+        self.base_model.write_orders(output)
+        filename = os.path.join(output, 'coupling_orders.py')
+        text = open(os.path.join(filename)).read()
+        
+        target = """
+# This file was automatically created by The UFO_usermod        
+
+from object_library import all_orders, CouplingOrder
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = 99,
+                    hierarchy = 1,
+                    perturbative_expansion = 0)
+
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = 99,
+                    hierarchy = 2,
+                    perturbative_expansion = 0)
+
+"""
+
+        self.compare(target, text, default={'perturbative_expansion':'0'})
+        
+
+
+
+
+    def test_write_particles(self):
+        """Check that the content of the file is valid"""
+
+        output = self.path
+        self.base_model.write_particles(output)
+        filename = os.path.join(output, 'particles.py')
+        text = open(os.path.join(filename)).read()
+        target = open(pjoin(self.sm_path, 'particles.py')).read()
+
+
+        
+        #format the ouptut
+        target = target.replace('0.0,','0,')
+        target = target.replace('1/3,','0.333333333333,')
+        target = target.replace('2/3,','0.666666666667,')
+        target = target.split('\n')
+        target = [l.strip() for l in target 
+                  if l.strip() and not l.strip().startswith('#') and 
+                  not l.split('=')[0].strip() in ['line', 'propagating', 'goldstoneboson', 'GoldstoneBoson','selfconjugate']]
+        duplicate = []
+        target = [l for l in target if not '.anti()' in l or duplicate.append(l.split('=')[0].strip())] 
+        
+        text = text.replace('.0,',',')
+        text = text.split('\n')        
+        text = [l.strip() for l in text
+                  if l.strip() and not l.strip().startswith('#') and 
+                  not l.split('=')[0].strip() in ['line', 'propagating', 'goldstoneboson', 'GoldstoneBoson','selfconjugate']]
+        
+        keep = True      
+        new_text = []  
+        for line in text:
+            if 'Particle' in line:
+                if line.split('=')[0].strip() in duplicate:
+                    keep = False
+                else:
+                    keep = True
+            if not keep:
+                continue
+            else:
+                new_text.append(line)
+        text=new_text
+        
+        
+        self.assertEqual(target, text)
+
+    def test_write_vertices(self):
+        """Check that the content of the file is valid"""
+
+        output = self.path
+        self.base_model.vertices = self.base_model.vertices[:2]
+        self.base_model.write_vertices(output)
+        filename = os.path.join(output, 'vertices.py')
+        text = open(os.path.join(filename)).read()
+        target = """V_1 = Vertex(name = 'V_1',
+             particles = [P.G0, P.G0, P.G0, P.G0],
+             color = ['1'],
+             lorentz = [L.SSSS1],
+             couplings = {(0,0): C.GC_33})
+
+
+V_2 = Vertex(name = 'V_2',
+             particles = [P.G0, P.G0, P.G__minus__, P.G__plus__],
+             color = ['1'],
+             lorentz = [L.SSSS1],
+             couplings = {(0,0): C.GC_31})
+        """
+
+
+
+#===============================================================================
+# Test The UFO usermod package 
+#===============================================================================
+class Test_ADDON_UFO(unittest.TestCase):
+    """Test class for the USERMOD object"""
+
+
+    def setUp(self):
+        
+        self.path = tempfile.mkdtemp(prefix='unitest_usermod') 
+
+        #Read the full SM
+        self.sm_path = import_ufo.find_ufo_path('sm')
+        self.base_model = usermod.UFOModel(self.sm_path)
+        
+    def tearDown(self):
+        
+        shutil.rmtree(self.path)
+        
+    def test_add_particle(self):
+        """Check that we can an external parameter consistently"""
+        
+        #ZERO is define in all model => we should just do nothing
+        ZERO = Parameter(name = 'ZERO',
+                 nature = 'internal',
+                 type = 'real',
+                 value = '0.0',
+                 texname = '0')
+
+        MH = Parameter(name = 'MH',
+               nature = 'external',
+               type = 'real',
+               value = 125,
+               texname = '\\text{MH}',
+               lhablock = 'MASS',
+               lhacode = [ 25 ])        
+
+        WH = Parameter(name = 'WH',
+               nature = 'external',
+               type = 'real',
+               value = 125,
+               texname = '\\text{MH}',
+               lhablock = 'WIDTH',
+               lhacode = [ 25 ])
+        
+        H = Particle(pdg_code = 25,
+             name = 'H',
+             antiname = 'H',
+             spin = 1,
+             color = 1,
+             mass = MH,
+             width = WH,
+             texname = 'H',
+             antitexname = 'H',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0,
+             Y = 0)
+        
+        number_particles = len(self.base_model.particles)
+        
+        #Add a particle which is exactly the Higgs like in the Standard Model
+        self.base_model.add_particle(H)
+        self.assertEqual( number_particles, len(self.base_model.particles))
+        
+        #Same name but different pid ->add but with rename
+        H = Particle(pdg_code = 26,
+             name = 'H',
+             antiname = 'H',
+             spin = 1,
+             color = 1,
+             mass = MH,
+             width = WH,
+             texname = 'H',
+             antitexname = 'H',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0,
+             Y = 0) 
+        self.base_model.add_particle(H)
+        self.assertEqual( number_particles+1, len(self.base_model.particles))       
+        number_particles+=1
+        self.assertEqual(H.name, 'H__1')
+        
+        #Different name and different pid keep it
+        H = Particle(pdg_code = 26,
+             name = 'H2',
+             antiname = 'H2',
+             spin = 1,
+             color = 1,
+             mass = MH,
+             width = WH,
+             texname = 'H',
+             antitexname = 'H',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0,
+             Y = 0) 
+        self.base_model.add_particle(H)
+        self.assertEqual( number_particles+1, len(self.base_model.particles))       
+        number_particles+=1
+        self.assertEqual(H.name, 'H2')
+        #Different name But different pid.
+        H = Particle(pdg_code = 25,
+             name = 'H3',
+             antiname = 'H3',
+             spin = 1,
+             color = 1,
+             mass = MH,
+             width = WH,
+             texname = 'H',
+             antitexname = 'H',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0,
+             Y = 0) 
+        self.base_model.add_particle(H)
+        self.assertEqual( number_particles, len(self.base_model.particles))       
+        #number_particles+=1
+        self.assertEqual(H.name, 'H3')
+        
+        ###################################################
+        ##  ALL THOSE TEST WERE NOT CHEKING MASS / WIDTH ##
+        ###################################################                       
+        # plugin to zero -> keep the one of the model
+        H = Particle(pdg_code = 25,
+             name = 'H',
+             antiname = 'H',
+             spin = 1,
+             color = 1,
+             mass = ZERO,
+             width = ZERO,
+             texname = 'H',
+             antitexname = 'H',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0,
+             Y = 0)         
+        self.base_model.add_particle(H)
+        self.assertEqual( number_particles, len(self.base_model.particles))       
+        self.assertEqual(H.name, 'H')        
+        self.assertEqual(H.mass.name, 'ZERO')
+        true_higgs = self.base_model.particle_dict[25]
+        self.assertEqual(true_higgs.name, 'H')        
+        self.assertEqual(true_higgs.mass.name, 'MH')        
+        
+        # base_model to zero -> keep the one of the plugin
+        M5 = Parameter(name = 'M5',
+               nature = 'external',
+               type = 'real',
+               value = 125,
+               texname = '\\text{MH}',
+               lhablock = 'MASS',
+               lhacode = [ 5 ]) 
+        W5 = Parameter(name = 'W5',
+               nature = 'external',
+               type = 'real',
+               value = 125,
+               texname = '\\text{MH}',
+               lhablock = 'DECAY',
+               lhacode = [ 5 ]) 
+        B = Particle(pdg_code = 5,
+             name = 'B',
+             antiname = 'B~',
+             spin = 1,
+             color = 1,
+             mass = M5,
+             width = W5,
+             texname = 'H',
+             antitexname = 'H',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0,
+             Y = 0)   
+
+        self.base_model.add_parameter(M5)
+        self.base_model.add_parameter(W5)
+        self.base_model.add_particle(B)
+        self.assertEqual( number_particles, len(self.base_model.particles))       
+        # For the mass both are define, so this is should be a merge
+        self.assertEqual(B.name, 'B')        
+        self.assertEqual(B.mass.name, 'M5')
+        true_b = self.base_model.particle_dict[5]
+        self.assertEqual(true_b.name, 'b')        
+        self.assertEqual(true_b.mass.name, 'MB') # keep MB since M5 is merge on MB            
+        self.assertEqual(self.base_model.old_new['M5'], 'MB')
+        # For the width the model one is zero => overwrite
+        self.assertEqual(B.name, 'B')        
+        self.assertEqual(B.width.name, 'W5')
+        self.assertEqual(true_b.width.name, 'W5')
+
+
+
+        
+        
+    def test_add_external_parameters(self):
+        """Check that we can an external parameter consistently"""        
+                
+        nb_param = len(self.base_model.parameters)
+        #ZERO is define in all model => we should just do nothing
+        ZERO = Parameter(name = 'ZERO',
+                 nature = 'internal',
+                 type = 'real',
+                 value = '0.0',
+                 texname = '0')
+        # add it and check that nothing happen!
+        self.base_model.add_parameter(ZERO)
+        self.assertEqual(nb_param,  len(self.base_model.parameters))
+        
+        
+        # MH is already define 
+        MH = Parameter(name = 'MH',
+               nature = 'external',
+               type = 'real',
+               value = 125,
+               texname = '\\text{MH}',
+               lhablock = 'MASS',
+               lhacode = [ 25 ])
+        
+        # add it and check that nothing happen!
+        self.base_model.add_parameter(MH)
+        self.assertEqual(nb_param,  len(self.base_model.parameters))           
+        
+        # MH is already definebut has a different name ib both model
+        MH = Parameter(name = 'MH2',
+               nature = 'external',
+               type = 'real',
+               value = 125,
+               texname = '\\text{MH}',
+               lhablock = 'MASS',
+               lhacode = [ 25 ])
+        
+        # add it and check that nothing happen!
+        self.base_model.add_parameter(MH)
+        self.assertEqual(nb_param,  len(self.base_model.parameters)) 
+        # But the information should be present in the old->new dict
+        self.assertEqual(self.base_model.old_new['MH2'], 'MH')
+
+        # Add an internal parameter depending of MH2
+        GH = Parameter(name = 'GH',
+               nature = 'internal',
+               type = 'real',
+               texname = '\\text{MH}',
+               value = '25*MH2**2*AMH2*MH25')
+        
+        self.base_model.add_parameter(GH)
+        self.assertEqual(nb_param+1,  len(self.base_model.parameters)) 
+        #check that the expression of GH is correctly modified
+        self.assertEqual(GH.value, '25*MH**2*AMH2*MH25')
+        self.assertEqual(GH.name, 'GH')
+        nb_param = nb_param+1
+        
+        # Add an internal parameter depending of MH2
+        # But with a name conflict
+        Gf = Parameter(name = 'Gf',
+               nature = 'internal',
+               type = 'real',
+               texname = '\\text{MH}',
+               value = '25*MH2**2*AMH2*MH25')
+        
+        self.base_model.add_parameter(Gf)
+        self.assertEqual(nb_param+1,  len(self.base_model.parameters)) 
+        #check that the expression of GH is correctly modified
+        self.assertEqual(Gf.value, '25*MH**2*AMH2*MH25')
+        self.assertEqual(Gf.name, 'Gf__1')