Merge lp:~maddevelopers/mg5amcnlo/retry_fail_cluster into lp:~madteam/mg5amcnlo/trunk

[Olivier Mattelaer]

A module to resubmit jobs which fails to produce output.

Rikkert could you test that everything is fine for lsf (cern) cluster?

Cheers,

Olivier

[lp:~maddevelopers/mg5amcnlo/retry_fail_cluster]

252. By Olivier Mattelaer on 2013-10-14

fix condor cluster re-submission

253. By Olivier Mattelaer on 2013-10-14

restore the check of the param_card for constrained model

254. By Olivier Mattelaer on 2013-10-14

fix the bug #1208520. problem with color in writting event for group_subprocess=False

255. By Olivier Mattelaer on 2013-10-14

allow the install command to point either on UCL or on UIUC.

256. By Olivier Mattelaer on 2013-10-15

add a security for vbf cut when only one jet is present in the final state

257. By Olivier Mattelaer on 2013-10-15

First part of the auto-review

258. By Olivier Mattelaer on 2013-10-15

fix the points remaining in my auto-review (but the Dim6 stuff which waits for Celine model)

259. By Olivier Mattelaer on 2013-10-21

Udpate the EWdim6 according to the snowmass paper

260. By Olivier Mattelaer on 2013-10-22

add propagators.py to EWdim6

[Rikkert Frederix (frederix)]

Hi Olivier,

There seem to quite a lot more fixes/improvements of the code than what you wrote above. What do you want me to check exactly? What is the difference between this branch and the lp:~maddevelopers/madgraph5/1.5.13 branch?

Cheers,
Rik

review: Needs Information

[lp:~maddevelopers/mg5amcnlo/retry_fail_cluster]

261. By Olivier Mattelaer on 2013-10-22

Fix a bug when the hierarchy of QCD is not at one. (Thanks C. Degrande)

[Olivier Mattelaer (olivier-mattelaer)]

Hi Rik,

In fact this branch is already included in 1.5.13 and contains part of it.
If you could just run one times with this branch (or 1.5.13) on lsf to see that everything goes smoothly.
For the rest of the change, this can/should be done in the 1.5.13 review and didn't need anything special.

Cheers and thanks,

Olivier

On Oct 22, 2013, at 9:54 AM, Rikkert Frederix <email address hidden> wrote:

> Review: Needs Information
>
> Hi Olivier,
>
> There seem to quite a lot more fixes/improvements of the code than what you wrote above. What do you want me to check exactly? What is the difference between this branch and the lp:~maddevelopers/madgraph5/1.5.13 branch?
>
> Cheers,
> Rik
>
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/retry_fail_cluster/+merge/190799
> You proposed lp:~maddevelopers/madgraph5/retry_fail_cluster for merging.

[Rikkert Frederix (frederix)]

I just tested the
generate p p > e+ ve j j
process on lxplus (lsf) and it is working fine.

review: Approve

[Olivier Mattelaer (olivier-mattelaer)]

Perfect Excellent!

Thanks a lot !!

Olivier

On Oct 22, 2013, at 1:06 PM, Rikkert Frederix <email address hidden> wrote:

> Review: Approve
>
> I just tested the
> generate p p > e+ ve j j
> process on lxplus (lsf) and it is working fine.
>
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/retry_fail_cluster/+merge/190799
> You proposed lp:~maddevelopers/madgraph5/retry_fail_cluster for merging.

[lp:~maddevelopers/mg5amcnlo/retry_fail_cluster]

262. By Olivier Mattelaer on 2013-10-22

fix bug #1243189 (problem with path finding for v4 model)

263. By Olivier Mattelaer on 2013-10-25

remove the printout for maxweight

264. By Olivier Mattelaer on 2013-10-25

slightly change the resubmission procedure to avoid the inline waiting time.
This is now just a printout and the waiting time is done without any stopping the
control of the program.
The waiting time is also an input parameter.

=== modified file 'Template/SubProcesses/cuts.f'
--- Template/SubProcesses/cuts.f	2013-02-27 10:09:58 +0000
+++ Template/SubProcesses/cuts.f	2013-10-25 11:38:22 +0000
@@ -734,6 +734,8 @@
                endif
             enddo
             
+            if (hardj2.eq.0) goto 21 ! bypass vbf cut since not enough jets
+
 C-- NOW APPLY THE CUT I            
 
             if (abs(rap(p(0,hardj1))) .lt. xetamin
@@ -757,7 +759,7 @@
 
 C...Set couplings if event passed cuts
 
-      if(.not.fixed_ren_scale) then
+ 21   if(.not.fixed_ren_scale) then
          call set_ren_scale(P,scale)
          if(scale.gt.0) G = SQRT(4d0*PI*ALPHAS(scale))
       endif

=== modified file 'Template/bin/internal/clean_template'
--- Template/bin/internal/clean_template	2011-07-12 16:33:50 +0000
+++ Template/bin/internal/clean_template	2013-10-25 11:38:22 +0000
@@ -100,3 +100,9 @@
 if [[ -e ../grid_card.dat  ]]; then
   mv ../grid_card.dat ./Cards/grid_card.dat
 fi
+cd ..
+# Ensure that default card exists
+if [[ ! -e  ./Cards/run_card_default.dat ]]; then
+  cp ./Cards/run_card.dat ./Cards/run_card_default.dat
+fi
+

=== modified file 'Template/bin/internal/run_pythia'
--- Template/bin/internal/run_pythia	2012-04-19 20:09:38 +0000
+++ Template/bin/internal/run_pythia	2013-10-25 11:38:22 +0000
@@ -18,6 +18,6 @@
 echo " " >> ../Cards/pythia_card.dat
 echo "      LHAPATH=$pydir/PDFsets" >> ../Cards/pythia_card.dat
 export PDG_MASS_TBL=$pydir/mass_width_2004.mc
-
+rm -rf Events/hepmv_event.hepmc &> /dev/null
 $pydir/pythia && touch pythia.done
 

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2013-08-20 23:20:18 +0000
+++ UpdateNotes.txt	2013-10-25 11:38:22 +0000
@@ -1,5 +1,21 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+1.5.13 (xx/09/13) OM: Implement a function which check if jobs submitted to cluster are correctly runned.
+                      In case of failure, you can re-submitted the failing jobs automatically. The maximal 
+                      number of re-submission for a job can be parametrize (default 1).
+                      Supported cluster for this function: condor, lsf, pbs
+                  OM: Fix a problem when more than 10k diagrams are present for a given subprocesses.
+                      (tt~+4jets).
+                  BF: Change nmssm model (The couplings orders were not correctly assigned for some triple 
+                      Higgs interactions) 
+                  OM: use evince by default to open eps file instead of gv.
+		  OM: Fix a problem with the set command for the card edition for the mssm model.
+                  OM: Update EWdim6 paper according to the snowmass paper. (3 more operator)
+                      The default model is restricted in order to exclude those operators. In order
+                      to have those you have to use import model EWdim6-full
+                  OM: Fix bug #1243189, impossible to load v4 model if a local directory has the name of
+                      the models (which is present in the models directory)
+
 1.5.12 (21/08/13) OM: Improve phase-space integration for processes with strong MMJJ cut. Cases where
                       the cross-section were slightly (~4%) under-evaluated due to such strong cut.
                   OM: Add a command print_results in the madevent interface. This command print the 

=== modified file 'aloha/__init__.py'
--- aloha/__init__.py	2012-06-14 15:30:53 +0000
+++ aloha/__init__.py	2013-10-25 11:38:22 +0000
@@ -3,3 +3,5 @@
 loop_mode = False     # Tag for encoding momenta with complex number.
 mp_precision = False  # Tag for passing parameter in quadruple precision
 
+
+class ALOHAERROR(Exception): pass
\ No newline at end of file

=== modified file 'aloha/aloha_lib.py'
--- aloha/aloha_lib.py	2013-02-28 21:01:05 +0000
+++ aloha/aloha_lib.py	2013-10-25 11:38:22 +0000
@@ -126,7 +126,15 @@
         argument = []
         for expression in args:
             if isinstance(expression, (MultLorentz, AddVariable, LorentzObject)):
-                expr = expression.expand().get_rep([0])
+                try:
+                    expr = expression.expand().get_rep([0])
+                except KeyError, error:
+                    if error.args != ((0,),):
+                        raise
+                    else:
+                        raise aloha.ALOHAERROR, '''Error in input format. 
+    Argument of function (or denominator) should be scalar.
+    We found %s''' % expression
                 new = expr.simplify()
                 new = expr.factorize()
                 argument.append(new)

=== modified file 'aloha/create_aloha.py'
--- aloha/create_aloha.py	2013-08-06 19:08:29 +0000
+++ aloha/create_aloha.py	2013-10-25 11:38:22 +0000
@@ -46,7 +46,7 @@
 _spin2_mult = 1000
 
 
-class ALOHAERROR(Exception): pass
+ALOHAERROR = aloha.ALOHAERROR
 
 class AbstractRoutine(object):
     """ store the result of the computation of Helicity Routine

=== modified file 'input/.mg5_configuration_default.txt'
--- input/.mg5_configuration_default.txt	2013-03-30 19:28:32 +0000
+++ input/.mg5_configuration_default.txt	2013-10-25 11:38:22 +0000
@@ -26,44 +26,38 @@
 #
 ################################################################################
 
-# Prefered Fortran Compiler
-# If None: try to find g77 or gfortran on the system
-
-#fortran_compiler = None
-
-# Prefered Text Editor
-#  Default: use the shell default Editor
-#           or try to find one available on the system
-#  Be careful: Only shell based editor are allowed
-
-#text_editor = None
-
-# Prefered WebBrower
-# If None: try to find one available on the system
-
-#web_browser = None
-
-# Prefered PS viewer
-# If None: try to find one available on the system
-
-#eps_viewer = None
-
-# Time allowed to answer question (if no answer takes default value)
-# 0: No time limit
-
-#timeout = 60
-
-# Pythia8 Path.
-# Define the path to the pythia8 directory.
-# relative path start from mg5 directory
-
-#pythia8_path = ./pythia8
-
-# Control when MG5 checks if he is up-to-date.
-# Enter the number of day between two check (0 means never)
-# A question is always asked before any update
-
-#auto_update = 7
+#! Prefered Fortran Compiler
+#! If None: try to find g77 or gfortran on the system
+#!
+# fortran_compiler = None
+
+#! Prefered Text Editor
+#!  Default: use the shell default Editor
+#!           or try to find one available on the system
+#!  Be careful: Only shell based editor are allowed
+# text_editor = None
+
+#! Prefered WebBrower
+#! If None: try to find one available on the system
+# web_browser = None
+
+#! Prefered PS viewer
+#! If None: try to find one available on the system
+# eps_viewer = None
+
+#! Time allowed to answer question (if no answer takes default value)
+#! 0: No time limit
+# timeout = 60
+
+#! Pythia8 Path.
+#! Define the path to the pythia8 directory.
+#! relative path start from mg5 directory
+# pythia8_path = ./pythia8
+
+#! Control when MG5 checks if he is up-to-date.
+#! Enter the number of day between two check (0 means never)
+#! A question is always asked before any update
+# auto_update = 7
 
 ################################################################################
 #  INFO FOR MADEVENT 
@@ -72,57 +66,54 @@
 # containing the SubProcesses directory. Otherwise this is the madgraph5 main
 # directory (containing the directories madgraph and Template)
 
-# Allow/Forbid the automatic opening of the web browser  (on the status page)
-#when launching MadEvent [True/False]
-
-#automatic_html_opening = True
-
-# Default Running mode 
-# 0: single machine/ 1: cluster / 2: multicore
-
-#run_mode = 2
-
-# Cluster Type [pbs|sge|condor|lsf|ge|slurm] Use for cluster run only
-# And cluster queue
-
+#! Allow/Forbid the automatic opening of the web browser  (on the status page)
+#!when launching MadEvent [True/False]
+# automatic_html_opening = True
+
+#! Default Running mode 
+#! 0: single machine/ 1: cluster / 2: multicore
+# run_mode = 2
+
+#! Cluster Type [pbs|sge|condor|lsf|ge|slurm] Use for cluster run only
+#! And cluster queue
 #cluster_type = condor
-#cluster_queue = madgraph
-
-# Path to a node directory to avoid direct writting on the central disk
-#Note that condor cluster avoid direct writting by default (therefore this
-#options didn't modify condor cluster)
-
-#cluster_temp_path = None
-
-# Nb_core to use (None = all) This is use only for multicore run
-
-#nb_core = None
-
-# Pythia-PGS Package
-# relative path start from main directory
-  
-#pythia-pgs_path = ./pythia-pgs
-
-# Delphes Package
-# relative path start from main directory
-
-#delphes_path = ./Delphes
-
-# MadAnalysis Package [For Drawing output]
-# relative path start from main directory
-
-#madanalysis_path = ./MadAnalysis
-
-# ExRootAnalysis Package
-# relative path start from main directory
-
-#exrootanalysis_path = ./ExRootAnalysis
-
-# TOPDRAWER PATH
-# Path to the directory containing td executables
-# relative path start from main directory
-
-#td_path = ./td
+# cluster_queue = madgraph
+
+#! Path to a node directory to avoid direct writting on the central disk
+#!Note that condor cluster avoid direct writting by default (therefore this
+#!options didn't modify condor cluster)
+# cluster_temp_path = None
+
+#! How to deal with failed submission (can occurs on cluster mode)
+#! 0: crash, -1: print error, hangs the program up to manual instructions, N(>0) retry up to N times.
+# cluster_nb_retry = 1
+#! How much time to wait for the output file before resubmission/crash (filesystem can be very slow)
+# cluster_retry_wait = 300
+
+#! Nb_core to use (None = all) This is use only for multicore run
+#! This correspond also to the number core used for code compilation for cluster mode
+# nb_core = None
+
+#! Pythia-PGS Package
+#! relative path start from main directory
+# pythia-pgs_path = ./pythia-pgs
+
+#! Delphes Package
+#! relative path start from main directory
+# delphes_path = ./Delphes
+
+#! MadAnalysis Package [For Drawing output]
+#! relative path start from main directory
+# madanalysis_path = ./MadAnalysis
+
+#! ExRootAnalysis Package
+#! relative path start from main directory
+# exrootanalysis_path = ./ExRootAnalysis
+
+#! TOPDRAWER PATH
+#! Path to the directory containing td executables
+#! relative path start from main directory
+# td_path = ./td
 
 
 

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2013-08-20 23:20:18 +0000
+++ madgraph/VERSION	2013-10-25 11:38:22 +0000
@@ -1,3 +1,3 @@
-version = 1.5.12
+version = 1.5.13
 date = 2013-08-21
 

=== modified file 'madgraph/__init__.py'
--- madgraph/__init__.py	2013-08-16 07:25:03 +0000
+++ madgraph/__init__.py	2013-10-25 11:38:22 +0000
@@ -20,14 +20,21 @@
     """a class for the invalid syntax call"""
 
 import os
+import logging
+import time
 
 #Look for basic file position MG5DIR and MG4DIR
 MG5DIR = os.path.realpath(os.path.join(os.path.dirname(__file__),
                                                                 os.path.pardir))
+if ' ' in MG5DIR:
+   logging.critical('''\033[1;31mpath to MG5: "%s" contains space. 
+    This is likely to create code unstability. 
+    Please consider changing the path location of the code\033[0m''' % MG5DIR)
+   time.sleep(1)
 MG4DIR = MG5DIR
 ReadWrite = True
 try:
     open(os.path.join(MG5DIR,'.test'),'w').write('test')
     os.remove(os.path.join(MG5DIR,'.test'))
 except IOError:
-    ReadWrite = False
\ No newline at end of file
+    ReadWrite = False

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2013-03-19 08:18:53 +0000
+++ madgraph/core/diagram_generation.py	2013-10-25 11:38:22 +0000
@@ -1701,7 +1701,7 @@
                     # Set summed coupling order according to max_order_now
                     # subtracting the removed gluons
                     coupling_orders_now = {coupling: max_order_now - \
-                                           nglue}
+                                           nglue * model['order_hierarchy']['QCD']}
 
                     # Setup process
                     process = base_objects.Process({\

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2013-08-21 00:15:12 +0000
+++ madgraph/interface/madevent_interface.py	2013-10-25 11:38:22 +0000
@@ -1685,7 +1685,9 @@
                          'run_mode':2,
                          'cluster_queue':'madgraph',
                          'nb_core': None,
-                         'cluster_temp_path':None}
+                         'cluster_temp_path':None,
+                         'cluster_nb_retry':1,
+                         'cluster_retry_wait':300}
     
     helporder = ['Main commands', 'Documented commands', 'Require MG5 directory',
                    'Advanced commands']
@@ -2196,6 +2198,14 @@
             opt = self.options
             self.cluster = cluster.from_name[opt['cluster_type']](\
                                  opt['cluster_queue'], opt['cluster_temp_path'])
+            self.cluster.nb_retry = self.options['cluster_nb_retry']
+            self.cluster_retry_wait = self.options['cluster_retry_wait']
+        elif args[0] in ['cluster_nb_retry', 'cluster_retry_wait']:
+            self.options[args[0]] = int(args[1])
+            if args[0] == 'cluster_nb_retry':
+                self.cluster.nb_retry = int(args[1])
+            else:
+                self.cluster_retry_wait = int(args[1])
         elif args[0] == 'nb_core':
             if args[1] == 'None':
                 import multiprocessing
@@ -2464,7 +2474,7 @@
                 if particle and particle not in decay_info:
                     # No decays given, only total width       
                     decay_info[particle] = [[[], width]]
-            else: # Not decay                              
+            else: # Not decay
                 line_number += 1
         # Clean out possible remaining comments at the end of the card
         while not param_card[-1] or param_card[-1].startswith('#'):
@@ -2578,7 +2588,9 @@
                     mg5_param = pjoin(self.me_dir, 'Source', 'MODEL', 'MG5_param.dat')
                     check_param_card.convert_to_mg5card(param_card, mg5_param)
                     check_param_card.check_valid_param_card(mg5_param)
-                    opt['param_card'] = pjoin(self.me_dir, 'Source', 'MODEL', 'MG5_param.dat')            
+                    opt['param_card'] = pjoin(self.me_dir, 'Source', 'MODEL', 'MG5_param.dat')
+            else:
+                check_param_card.check_valid_param_card(opt['param_card'])            
             
             logger.debug('write compile file for card: %s' % opt['param_card']) 
             param_card = check_param_card.ParamCard(opt['param_card'])
@@ -3654,8 +3666,7 @@
                         cwd=pjoin(self.me_dir,'Events'))
         else:
             delphes_log = open(pjoin(self.me_dir, 'Events', self.run_name, "%s_delphes.log" % tag),'w')
-            misc.call([prog, delphes_dir, 
-                                self.run_name, tag, str(cross)],
+            misc.call([prog, delphes_dir, self.run_name, tag, str(cross)],
                                 stdout= delphes_log, stderr=subprocess.STDOUT,
                                 cwd=pjoin(self.me_dir,'Events'))
                 
@@ -3738,6 +3749,8 @@
                 input_files = ['madevent','input_app.txt','symfact.dat','iproc.dat',
                                pjoin(self.me_dir, 'SubProcesses','randinit')]
                 output_files = []
+                required_output = []
+                
 
                 #Find the correct PDF input file
                 if self.pdffile:
@@ -3771,14 +3784,17 @@
                     data = ' '.join(data).split()
                     for nb in data:
                         output_files.append('G%s' % nb)
+                        required_output.append('G%s/results.dat' % nb)
                 else:
                     for G in output_files:
                         if os.path.isdir(pjoin(cwd,G)):
                             input_files.append(G)
+                            required_output.append('%s/results.dat' % G)
                 
                 #submitting
                 self.cluster.submit2(exe, stdout=stdout, cwd=cwd, 
-                             input_files=input_files, output_files=output_files)
+                             input_files=input_files, output_files=output_files,
+                             required_output=required_output)
             
             else:
                 self.cluster.submit(exe, stdout=stdout, cwd=cwd)
@@ -4989,14 +5005,15 @@
         self.run_card = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card.dat'))
         run_card_def = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card_default.dat'))
         try:
-            self.param_card = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card.dat'))   
-        except check_param_card.InvalidParamCard:
+            self.param_card = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card.dat'))
+        except (check_param_card.InvalidParamCard, ValueError) as e:
             logger.error('Current param_card is not valid. We are going to use the default one.')
+            logger.error('problem detected: %s' % e)
             files.cp(pjoin(self.me_dir,'Cards','param_card_default.dat'), 
                      pjoin(self.me_dir,'Cards','param_card.dat'))
             self.param_card = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card.dat'))
+
         default_param = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card_default.dat'))   
-    
         self.pname2block = {}
         self.conflict = []
         self.restricted_value = {}
@@ -5157,6 +5174,10 @@
                 logging.info('replace %s by the default card' % args[0])
                 files.cp(pjoin(self.me_dir,'Cards','%s_default.dat' % args[0]),
                         pjoin(self.me_dir,'Cards','%s.dat'% args[0]))
+                if args[0] == 'param_card':
+                    self.param_card = check_param_card.ParamCard(pjoin(self.me_dir,'Cards','param_card.dat'))
+                elif args[0] == 'run_card':
+                    self.run_card = banner_mod.RunCard(pjoin(self.me_dir,'Cards','run_card.dat'))
                 return
             else:
                 card = args[0]

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2013-08-16 07:25:03 +0000
+++ madgraph/interface/madgraph_interface.py	2013-10-25 11:38:22 +0000
@@ -21,6 +21,7 @@
 import optparse
 import os
 import pydoc
+import random
 import re
 import signal
 import subprocess
@@ -1003,7 +1004,7 @@
             forbiden_chars = ['>','<',';','&']
             for char in forbiden_chars:
                 if char in path:
-                    raise self.invalidCmd('%s is not allowed in the output path' % char)
+                    raise self.InvalidCmd('%s is not allowed in the output path' % char)
             # Check for special directory treatment
             if path == 'auto' and self._export_format in \
                      ['madevent', 'standalone', 'standalone_cpp']:
@@ -1794,6 +1795,8 @@
                        'cluster_type': 'condor',
                        'cluster_temp_path': None,
                        'cluster_queue': None,
+                       'cluster_nb_retry':1,
+                       'cluster_retry_wait':300
                        }
     
     options_madgraph= {'group_subprocesses': 'Auto',
@@ -3062,11 +3065,21 @@
         # Load file with path of the different program:
         import urllib
         path = {}
-        try:
-            data = urllib.urlopen('http://madgraph.phys.ucl.ac.be/package_info.dat')
-        except:
-            raise MadGraph5Error, '''Impossible to connect the server. 
+        data_path = ['http://madgraph.phys.ucl.ac.be/package_info.dat',
+                     'http://madgraph.hep.uiuc.edu/package_info.dat']
+        r = random.randint(0,1)
+        r = [r, (1-r)]
+        for index in r:
+            cluster_path = data_path[index]
+            try:
+                data = urllib.urlopen(cluster_path)
+            except Exception:
+                continue
+            break
+        else:
+            raise MadGraph5Error, '''Impossible to connect any of us servers. 
             Please check your internet connection or retry later'''
+                
         for line in data: 
             split = line.split()   
             path[split[0]] = split[1]
@@ -3908,7 +3921,8 @@
                 self.options['fortran_compiler'] = args[1]
             else:
                 self.options['fortran_compiler'] = None
-        elif args[0] in ['timeout', 'auto_update']:
+        elif args[0] in ['timeout', 'auto_update', 'cluster_nb_retry',
+                         'cluster_retry_wait']:
                 self.options[args[0]] = int(args[1]) 
         elif args[0] in self.options:
             if args[1] in ['None','True','False']:

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2013-08-16 07:25:03 +0000
+++ madgraph/iolibs/export_v4.py	2013-10-25 11:38:22 +0000
@@ -117,7 +117,7 @@
             logger.info('remove old information in %s' % \
                                                   os.path.basename(self.dir_path))
             if os.environ.has_key('MADGRAPH_BASE'):
-                subprocess.call([pjoin('bin', 'internal', 'clean_template'),
+                misc.call([pjoin('bin', 'internal', 'clean_template'),
                                  '--web'], cwd=self.dir_path)
             else:
                 try:
@@ -1118,6 +1118,9 @@
         # Add the driver.f 
         filename = pjoin(self.dir_path,'SubProcesses','driver.f')
         self.write_driver(writers.FortranWriter(filename))
+        #
+        filename = pjoin(self.dir_path,'SubProcesses','addmothers.f')
+        self.write_addmothers(writers.FortranWriter(filename))
         # Copy the different python file in the Template
         self.copy_python_file()
         
@@ -1352,8 +1355,7 @@
                                 ident_perms)
 
         filename = 'symfact_orig.dat'
-        self.write_symfact_file(writers.FortranWriter(filename),
-                           symmetry)
+        self.write_symfact_file(open(filename, 'w'), symmetry)
 
         # Generate diagrams
         filename = "matrix.ps"
@@ -1461,18 +1463,18 @@
             for Pdir in P_dir_list:
                 os.chdir(Pdir)
                 try:
-                    subprocess.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_jpeg-pl')],
+                    misc.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_jpeg-pl')],
                                 stdout = devnull)
                 except:
                     os.system('chmod +x %s ' % pjoin(old_pos, self.dir_path, 'bin', 'internal', '*'))
-                    subprocess.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_jpeg-pl')],
+                    misc.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_jpeg-pl')],
                                 stdout = devnull)
                 os.chdir(os.path.pardir)
 
         logger.info("Generate web pages")
         # Create the WebPage using perl script
 
-        subprocess.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_cardhtml-pl')], \
+        misc.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_cardhtml-pl')], \
                                                                 stdout = devnull)
 
         os.chdir(os.path.pardir)
@@ -1493,17 +1495,17 @@
             output_file.write(text)
             output_file.close()
 
-        subprocess.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_cardhtml-pl')],
+        misc.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_cardhtml-pl')],
                         stdout = devnull)
 
         # Run "make" to generate madevent.tar.gz file
         if os.path.exists(pjoin('SubProcesses', 'subproc.mg')):
             if os.path.exists('madevent.tar.gz'):
                 os.remove('madevent.tar.gz')
-            subprocess.call([os.path.join(old_pos, self.dir_path, 'bin', 'internal', 'make_madevent_tar')],
+            misc.call([os.path.join(old_pos, self.dir_path, 'bin', 'internal', 'make_madevent_tar')],
                         stdout = devnull)
 
-        subprocess.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_cardhtml-pl')],
+        misc.call([pjoin(old_pos, self.dir_path, 'bin', 'internal', 'gen_cardhtml-pl')],
                         stdout = devnull)
 
         #return to the initial dir
@@ -2048,6 +2050,20 @@
         return True
 
     #===========================================================================
+    # write_addmothers
+    #===========================================================================
+    def write_addmothers(self, writer):
+        """Write the SubProcess/addmothers.f"""
+
+        path = pjoin(_file_path,'iolibs','template_files','addmothers.f')
+
+        text = open(path).read() % {'iconfig': 'diag_number'}
+        writer.write(text)
+        
+        return True
+
+
+    #===========================================================================
     # write_combine_events
     #===========================================================================
     def write_combine_events(self, writer):
@@ -2364,9 +2380,9 @@
         # Write out lines for symswap.inc file (used to permute the
         # external leg momenta
         lines = [ form %(i+1, s) for i,s in enumerate(symmetry) if s != 0] 
-
         # Write the file
-        writer.writelines(lines)
+        writer.write('\n'.join(lines))
+        writer.write('\n')
 
         return True
 
@@ -2591,8 +2607,7 @@
                                 ident_perms)
 
         filename = 'symfact_orig.dat'
-        self.write_symfact_file(writers.FortranWriter(filename),
-                           symmetry)
+        self.write_symfact_file(open(filename, 'w'), symmetry)
 
         filename = 'symperms.inc'
         self.write_symperms_file(writers.FortranWriter(filename),
@@ -2717,6 +2732,20 @@
         writer.writelines(lines)
 
     #===========================================================================
+    # write_addmothers
+    #===========================================================================
+    def write_addmothers(self, writer):
+        """Write the SubProcess/addmothers.f"""
+
+        path = pjoin(_file_path,'iolibs','template_files','addmothers.f')
+
+        text = open(path).read() % {'iconfig': 'iconfig'}
+        writer.write(text)
+        
+        return True
+
+
+    #===========================================================================
     # write_coloramps_file
     #===========================================================================
     def write_coloramps_file(self, writer, diagrams_for_config, maxflows,

=== modified file 'madgraph/iolibs/import_v4.py'
--- madgraph/iolibs/import_v4.py	2012-04-09 16:32:56 +0000
+++ madgraph/iolibs/import_v4.py	2013-10-25 11:38:22 +0000
@@ -36,19 +36,23 @@
 #===============================================================================
 # import_v4model
 #===============================================================================
-def import_model(model_path, mgme_dir = MG4DIR):
+def import_model(model_path, mgme_dir = MG4DIR, absolute=True):
     """create a model from a MG4 model directory."""
 
     # Check for a valid directory
-    model_path = find_model_path(model_path, mgme_dir)
+    model_path_old = model_path
+    model_path = find_model_path(model_path, mgme_dir, absolute)
 
     files_list = [os.path.join(model_path, 'particles.dat'),\
                   os.path.join(model_path, 'interactions.dat')]
     
     for filepath in files_list:
         if not os.path.isfile(filepath):
-            raise InvalidCmd,  "%s directory is not a valid v4 model" % \
+            if not absolute:
+                raise InvalidCmd,  "%s directory is not a valid v4 model" % \
                                                                     (model_path)
+            else:
+                return import_model(model_path_old, mgme_dir, False)
                                                                 
     # use pickle files if defined
     if files.is_uptodate(os.path.join(model_path, 'model.pkl'), files_list):
@@ -75,11 +79,11 @@
     return model, model_path  
 
     
-def find_model_path(model_path, mgme_dir):
+def find_model_path(model_path, mgme_dir, absolute=True):
     """Find the path to the model, starting with path model_path."""
 
     # treat simple case (model_path is a valid path/ mgme_dir doesn't exist)
-    if os.path.isdir(model_path):
+    if os.path.isdir(model_path) and absolute:
         return model_path
     elif mgme_dir and os.path.isdir(os.path.join(mgme_dir, 'models',
                                                  model_path + "_v4")):
@@ -295,6 +299,16 @@
                                                    color.f(0, 3, -1)])
                     #cs3.coeff = fractions.Fraction(-1)
                     myinter.set('color', [cs1, cs2, cs3])
+#   The following line are expected to be correct but not physical validations
+#    have been performed. So we keep it commented for the moment.                    
+#                elif colors == [3, 3, 3]:
+#                    my_color_string = color.ColorString(\
+#                        [color.Epsilon(ind[0], ind[1], ind[2])])
+#                    myinter.set('color', [my_color_string])                    
+#                elif colors == [-3, -3, -3]:
+#                    my_color_string = color.ColorString(\
+#                        [color.EpsilonBar(ind[0], ind[1], ind[2])])
+#                    myinter.set('color', [my_color_string])
                 else:
                     logger.warning(\
                         "Color combination %s not yet implemented." % \

=== renamed file 'Template/SubProcesses/addmothers.f' => 'madgraph/iolibs/template_files/addmothers.f'
--- Template/SubProcesses/addmothers.f	2013-06-21 15:27:32 +0000
+++ madgraph/iolibs/template_files/addmothers.f	2013-10-25 11:38:22 +0000
@@ -26,6 +26,9 @@
       double precision xtarget
       data iseed/0/
 
+      integer diag_number
+      common/to_diag_number/diag_number
+
 c     Variables for combination of color indices (including multipart. vert)
       integer maxcolmp
       parameter(maxcolmp=20)
@@ -103,14 +106,14 @@
       nc = int(jamp2(0))
       maxcolor=0
       if(nc.gt.0)then
-      if(icolamp(1,iconfig,iproc)) then
+      if(icolamp(1,%(iconfig)s,iproc)) then
         targetamp(1)=jamp2(1)
 c        print *,'Color flow 1 allowed for config ',iconfig
       else
         targetamp(1)=0d0
       endif
       do ic =2,nc
-        if(icolamp(ic,iconfig,iproc))then
+        if(icolamp(ic,%(iconfig)s,iproc))then
           targetamp(ic) = jamp2(ic)+targetamp(ic-1)
 c          print *,'Color flow ',ic,' allowed for config ',iconfig,targetamp(ic)
         else

=== modified file 'madgraph/iolibs/template_files/madevent_driver.f'
--- madgraph/iolibs/template_files/madevent_driver.f	2012-07-12 08:31:23 +0000
+++ madgraph/iolibs/template_files/madevent_driver.f	2013-10-25 11:38:22 +0000
@@ -194,7 +194,8 @@
 c
 c     Arguments
 c
-      integer ncall,itmax,itmin,iconfig
+      integer ncall,itmax,itmin,iconfig, diag_number
+      common/to_diag_number/diag_number
 c
 c     Local
 c
@@ -257,6 +258,7 @@
       ncode=int(dlog10(3d0)*(max_particles-3))+1
       iconfig = int(dconfig*(1+10**(-ncode)))
       write(*,12) 'Running Configuration Number: ',iconfig
+      diag_number = iconfig
 c
 c     Here I want to set up with B.W. we map and which we don't
 c

=== modified file 'madgraph/various/cluster.py'
--- madgraph/various/cluster.py	2013-04-27 14:46:18 +0000
+++ madgraph/various/cluster.py	2013-10-25 11:38:22 +0000
@@ -17,6 +17,7 @@
 import os
 import time
 import re
+import inspect
 
 logger = logging.getLogger('madgraph.cluster') 
 
@@ -37,6 +38,8 @@
 
 
 multiple_try = misc.multiple_try
+pjoin = os.path.join
+
 
 def check_interupt(error=KeyboardInterrupt):
 
@@ -50,6 +53,22 @@
         return deco_f_interupt
     return deco_interupt
 
+def store_input(arg=''):
+
+    def deco_store(f):
+        def deco_f_store(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None,
+                input_files=[], output_files=[], required_output=[], nb_submit=0):
+            frame = inspect.currentframe()
+            args, i, j, values = inspect.getargvalues(frame)
+            args = dict([(i, values[i]) for i in args if i != 'self'])
+            id = f(self, **args)
+            if self.nb_retry > 0:
+                self.retry_args[id] = args
+            return id
+        return deco_f_store
+    return deco_store
+
+
 class Cluster(object):
     """Basic Class for all cluster type submission"""
     name = 'mother class'
@@ -61,18 +80,24 @@
         self.finish = 0
         self.cluster_queue = cluster_queue
         self.temp_dir = temp_dir
+        # attribute to relaunch jobs if they failed to produce expected data
+        self.nb_retry = 1
+        self.retry_args = {}
     
-    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, 
+               log=None, required_output=[], nb_submit=0):
         """How to make one submission. Return status id on the cluster."""
         raise NotImplemented, 'No implementation of how to submit a job to cluster \'%s\'' % self.name
 
+    @store_input()
     def submit2(self, prog, argument=[], cwd=None, stdout=None, stderr=None, 
-                log=None, input_files=[], output_files=[]):
+                log=None, input_files=[], output_files=[], required_output=[],nb_submit=0):
         """How to make one submission. Return status id on the cluster.
         NO SHARE DISK"""
         
         if not hasattr(self, 'temp_dir') or not self.temp_dir:
-            return self.submit(prog, argument, cwd, stdout, stderr, log)
+            return self.submit(prog, argument, cwd, stdout, stderr, log, 
+                               required_output=required_output, nb_submit=nb_submit)
         print self.temp_dir
         if cwd is None:
             cwd = os.getcwd()
@@ -111,7 +136,8 @@
         open(new_prog, 'w').write(text % dico)
         misc.Popen(['chmod','+x',new_prog],cwd=cwd)
         
-        return self.submit(new_prog, argument, cwd, stdout, stderr, log)
+        return self.submit(new_prog, argument, cwd, stdout, stderr, log, 
+                               required_output=required_output, nb_submit=nb_submit)
         
 
     def control(self, me_dir=None):
@@ -146,14 +172,79 @@
             if fail:
                 raise ClusterManagmentError('Some Jobs are in a Hold/... state. Please try to investigate or contact the IT team')
             if idle + run == 0:
-                time.sleep(20) #security to ensure that the file are really written on the disk
+                #time.sleep(20) #security to ensure that the file are really written on the disk
                 logger.info('All jobs finished')
                 break
             fct(idle, run, finish)
             time.sleep(30)
         self.submitted = 0
         self.submitted_ids = []
-
+        
+    def check_termination(self, job_id):
+        """Check the termination of the jobs with job_id and relaunch it if needed."""
+        
+        if job_id not in self.retry_args:
+            return True
+
+        args = self.retry_args[job_id]
+        if 'time_check' in args:
+            time_check = args['time_check']
+        else:
+            time_check = 0
+
+        for path in args['required_output']:
+            if args['cwd']:
+                path = pjoin(args['cwd'], path)
+            if not os.path.exists(path):
+                break
+        else:
+            # all requested output are present
+            if time_check > 0:
+                logger.info('Job %s Finally found the missing output.' % (job_id))
+            del self.retry_args[job_id]
+            self.submitted_ids.remove(job_id)
+            return True
+        
+        if time_check == 0:
+            logger.warning('''Job %s failed to produce expected output. Waiting for filesystem update.\nMissing file:\n%s''' % (job_id,path))
+            args['time_check'] = time.time()
+            return 'wait'
+        elif self.cluster_retry_wait < time.time() - time_check:    
+            return 'wait'
+        
+
+        #jobs failed to be completed even after waiting time!!
+        if self.nb_retry < 0:
+            logger.critical('''Fail to run correctly job %s.
+            with option: %s
+            file missing: %s''' % (job_id, args, path))
+            raw_input('press enter to continue.')
+        elif self.nb_retry == 0:
+            logger.critical('''Fail to run correctly job %s.
+            with option: %s
+            file missing: %s
+            Stopping all runs.''' % (job_id, args, path))
+            self.remove()
+        elif args['nb_submit'] >= self.nb_retry:
+            logger.critical('''Fail to run correctly job %s.
+            with option: %s
+            file missing: %s
+            Fails %s times
+            Stopping all runs.''' % (job_id, args, path, args['nb_submit']))
+            self.remove()
+        else:
+            args['nb_submit'] += 1            
+            logger.warning('resubmit job (for the %s times)' % args['nb_submit'])
+            del self.retry_args[job_id]
+            self.submitted_ids.remove(job_id)
+            if 'time_check' in args: 
+                del args['time_check']
+            self.submit2(**args)
+            return 'resubmit'
+        return 'done'
+            
+            
+            
     @check_interupt()
     def launch_and_wait(self, prog, argument=[], cwd=None, stdout=None, 
                                                          stderr=None, log=None):
@@ -203,7 +294,8 @@
     job_id = 'CONDOR_ID'
 
     @multiple_try()
-    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None,
+               required_output=[], nb_submit=0):
         """Submit a job prog to a Condor cluster"""
         
         text = """Executable = %(prog)s
@@ -261,9 +353,11 @@
         self.submitted_ids.append(id)
         return id
 
+    @store_input()
     @multiple_try()
     def submit2(self, prog, argument=[], cwd=None, stdout=None, stderr=None, 
-                log=None, input_files=[], output_files=[]):
+                log=None, input_files=[], output_files=[], required_output=[], 
+                nb_submit=0):
         """Submit the job on the cluster NO SHARE DISK
            input/output file should be give relative to cwd
         """
@@ -363,12 +457,14 @@
             return 0, 0, 0, 0
         
         packet = 15000
+        idle, run, fail = 0, 0, 0
+        ongoing = []
         for i in range(1+(len(self.submitted_ids)-1)//packet):
             start = i * packet
             stop = (i+1) * packet
-            cmd = "condor_q " + ' '.join(self.submitted_ids[start:stop]) + " -format \'%-2s \\n\' \'ifThenElse(JobStatus==0,\"U\",ifThenElse(JobStatus==1,\"I\",ifThenElse(JobStatus==2,\"R\",ifThenElse(JobStatus==3,\"X\",ifThenElse(JobStatus==4,\"C\",ifThenElse(JobStatus==5,\"H\",ifThenElse(JobStatus==6,\"E\",string(JobStatus))))))))\'"
-            
-                
+            cmd = "condor_q " + ' '.join(self.submitted_ids[start:stop]) + \
+            " -format \'%-2s\  ' \'ClusterId\' " + \
+            " -format \'%-2s \\n\' \'ifThenElse(JobStatus==0,\"U\",ifThenElse(JobStatus==1,\"I\",ifThenElse(JobStatus==2,\"R\",ifThenElse(JobStatus==3,\"X\",ifThenElse(JobStatus==4,\"C\",ifThenElse(JobStatus==5,\"H\",ifThenElse(JobStatus==6,\"E\",string(JobStatus))))))))\'"
             
             status = misc.Popen([cmd], shell=True, stdout=subprocess.PIPE, 
                                                              stderr=subprocess.PIPE)
@@ -376,10 +472,9 @@
             if status.returncode or error:
                 raise ClusterManagmentError, 'condor_q returns error: %s' % error
                 
-                
-            idle, run, fail = 0, 0, 0
             for line in status.stdout:
-                status = line.strip()
+                id, status = line.strip().split()
+                ongoing.append(int(id))
                 if status in ['I','U']:
                     idle += 1
                 elif status == 'R':
@@ -387,6 +482,14 @@
                 elif status != 'C':
                     fail += 1
 
+        for id in list(self.submitted_ids):
+            if id not in ongoing:
+                status = self.check_termination(id)
+                if status == 'wait':
+                    run += 1
+                elif status == 'resubmit':
+                    idle += 1
+
         return idle, run, self.submitted - (idle+run+fail), fail
     
     @multiple_try()
@@ -409,7 +512,8 @@
     complete_tag = ['C']
 
     @multiple_try()
-    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None,
+               required_output=[], nb_submit=0):
         """Submit a job prog to a PBS cluster"""
         
         me_dir = os.path.realpath(os.path.join(cwd,prog)).rsplit('/SubProcesses',1)[0]
@@ -479,7 +583,7 @@
             return 'R' 
         return 'F'
         
-
+    
     @multiple_try()    
     def control(self, me_dir):
         """ control the status of a single job with it's cluster id """
@@ -491,19 +595,30 @@
         me_dir = hashlib.md5(me_dir).hexdigest()[-14:]
         if not me_dir[0].isalpha():
                   me_dir = 'a' + me_dir[1:]
-
+        
+        ongoing = []
         idle, run, fail = 0, 0, 0
         for line in status.stdout:
             if me_dir in line:
+                ongoing.append(line.split()[0].split('.')[0])
                 status = line.split()[4]
                 if status in self.idle_tag:
                     idle += 1
                 elif status in self.running_tag:
                     run += 1
                 elif status in self.complete_tag:
-                    continue
+                    if not self.check_termination(line.split()[0].split('.')[0]):
+                        idle += 1
                 else:
                     fail += 1
+            
+        for id in list(self.submitted_ids):
+            if id not in ongoing:
+                status = self.check_termination(id)
+                if status == 'wait':
+                    run += 1
+                elif status == 'resubmit':
+                    idle += 1
 
         return idle, run, self.submitted - (idle+run+fail), fail
 
@@ -535,7 +650,8 @@
         return location
 
     @multiple_try()
-    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None,
+               required_output=[], nb_submit=0):
         """Submit a job prog to an SGE cluster"""
 
         me_dir = os.path.realpath(os.path.join(cwd,prog)).rsplit('/SubProcesses',1)[0]
@@ -673,7 +789,8 @@
     job_id = 'LSB_JOBID'
 
     @multiple_try()
-    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None,
+               required_output=[], nb_submit=0):
         """Submit the job prog to an LSF cluster"""
         
         me_dir = os.path.realpath(os.path.join(cwd,prog)).rsplit('/SubProcesses',1)[0]
@@ -771,7 +888,11 @@
             elif status == 'PEND':
                 idle += 1
             elif status == 'DONE':
-                self.submitted_ids.remove(id)
+                status = self.check_termination(id)
+                if status == 'wait':
+                    run += 1
+                elif status == 'resubmit':
+                    idle += 1
             else:
                 fail += 1
 
@@ -795,7 +916,8 @@
     running_tag = ['r']
 
     @multiple_try()
-    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None,
+               required_output=[], nb_submit=0):
         """Submit a job prog to a GE cluster"""
         
         text = ""
@@ -893,8 +1015,10 @@
                         run += 1
                     if statusflag == 'sh':
                         fail += 1
-
-        self.submitted_ids = ongoing
+        for id in list(self.submitted_ids):
+            if id not in ongoing:
+                self.check_termination(id)
+        #self.submitted_ids = ongoing
 
         return idle, run, self.submitted - idle - run - fail, fail
 
@@ -917,7 +1041,8 @@
     complete_tag = ['C']
 
     @multiple_try()
-    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None):
+    def submit(self, prog, argument=[], cwd=None, stdout=None, stderr=None, log=None,
+               required_output=[], nb_submit=0):
         """Submit a job prog to a SLURM cluster"""
         
         me_dir = os.path.realpath(os.path.join(cwd,prog)).rsplit('/SubProcesses',1)[0]
@@ -939,7 +1064,7 @@
         
         command = ['sbatch','-o', stdout,
                    '-J', me_dir, 
-                   '-e', stderr, prog]
+                   '-e', stderr, prog] + argument
                    
         a = misc.Popen(command, stdout=subprocess.PIPE, 
                                       stderr=subprocess.STDOUT,
@@ -1009,7 +1134,6 @@
         if not self.submitted_ids:
             return
         cmd = "scancel %s" % ' '.join(self.submitted_ids)
-        print 'cmd = ',cmd
         status = misc.Popen([cmd], shell=True, stdout=open(os.devnull,'w'))
 
 

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2013-07-29 19:12:10 +0000
+++ madgraph/various/misc.py	2013-10-25 11:38:22 +0000
@@ -479,7 +479,7 @@
         
         # first for eps_viewer
         if not cls.eps_viewer:
-           cls.eps_viewer = cls.find_valid(['gv', 'ggv', 'evince'], 'eps viewer') 
+           cls.eps_viewer = cls.find_valid(['evince','gv', 'ggv'], 'eps viewer') 
             
         # Second for web browser
         if not cls.web_browser:

=== modified file 'models/EWdim6/EWdim6.log'
--- models/EWdim6/EWdim6.log	2013-01-23 01:06:16 +0000
+++ models/EWdim6/EWdim6.log	2013-10-25 11:38:22 +0000
@@ -1,13 +1,13 @@
-# This file was automatically created by FeynRules 1.7.127
+# This file was automatically created by FeynRules 2.1.0
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Tue 22 Jan 2013 16:06:42
+# Date: Tue 15 Oct 2013 22:01:29
 
 
 # 
 # This is the logfile for the model EWdim6
 
 # Authors: C. Degrande
-# Model version: 1.0
+# Model version: 1.1
 # Checking the Quantum numbers
    * Electric charge defined.
 # Checking the Lagrangians
@@ -24,6 +24,7 @@
    * 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:
@@ -40,36 +41,42 @@
    * Parameter CBL2 has no value. Default value 1 assigned.
    * Parameter CPWWWL2 has no value. Default value 1 assigned.
    * Parameter CPWL2 has no value. Default value 1 assigned.
+   * Parameter CphidL2 has no value. Default value 1 assigned.
+   * Parameter CphiWL2 has no value. Default value 1 assigned.
+   * Parameter CphiBL2 has no value. Default value 1 assigned.
+   * Parameter lam has no value. Default value 1 assigned.
+   * Parameter muH has no value. Default value 1 assigned.
 
 
 # Vertices
    * Calling FeynmanRules for 1 Lagrangians.
-   * Number of classes vertices: 58
-   * Number of flavored vertices: 96
+   * Number of classes vertices: 61
+   * Number of flavored vertices: 101
    * Saved vertices in InterfaceRun[ 1 ].
    * Checked QNumber conservation.
       - Quantum number GhostNumber conserved in all vertices.
       - Quantum number LeptonNumber conserved in all vertices.
       - Quantum number Q conserved in all vertices.
+      - Quantum number Y conserved in all vertices.
    * particles.py written.
    * parameters.py written.
 #
 # Vertex definitions
 #
 
-   * 96 vertices written.
+   * 101 vertices written.
    * vertices.py written.
 #
 # Lorentz structure definitions
 #
 
-   * 81 lorentz structures written.
+   * 80 lorentz structures written.
    * lorentz.py written.
 #
 # Coupling definitions
 #
 
-   * 140 couplings written.
+   * 153 couplings written.
    * couplings.py written.
 #
 # Coupling order definitions
@@ -81,7 +88,7 @@
 # Decay definitions
 #
 
-   * 6 decays written.
+   * 8 decays written.
    * decay.py not written
 #
 # CTCoupling definitions

=== modified file 'models/EWdim6/__init__.py'
--- models/EWdim6/__init__.py	2013-01-19 17:33:23 +0000
+++ models/EWdim6/__init__.py	2013-10-25 11:38:22 +0000
@@ -6,6 +6,7 @@
 import vertices
 import coupling_orders
 import write_param_card
+import propagators
 
 
 all_particles = particles.all_particles
@@ -15,17 +16,14 @@
 all_parameters = parameters.all_parameters
 all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
-
-try:
-    import build_restrict
-except ImportError:
-    pass
-try:
-   import decays
-except ImportError:
-   pass
-else:
-   all_decays = decays.all_decays
+all_propagators = propagators.all_propagators
+
+try:
+     import build_restrict
+except ImportError:
+     pass
+
+
 try:
    import form_factors
 except ImportError:
@@ -33,10 +31,17 @@
 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__ = "C. Degrande"
-__date__ = "05.03. 2012"
-__version__= "1.0"
+__date__ = "08.04. 2013"
+__version__= "1.1"

=== modified file 'models/EWdim6/build_restrict.py'
--- models/EWdim6/build_restrict.py	2013-01-19 17:33:23 +0000
+++ models/EWdim6/build_restrict.py	2013-10-25 11:38:22 +0000
@@ -38,11 +38,11 @@
                                   ('WOLFENSTEIN',[4], 0.0)]
                            )
 
-#first_category.add_options(name='c mass = 0', # name
-#                           default=True,        # default
-#                           rules=[('MASS',[4], 0.0),
-#                                  ('YUKAWA',[4], 0.0)]
-#                           )
+first_category.add_options(name='c mass = 0', # name
+                           default=True,        # default
+                           rules=[('MASS',[4], 0.0),
+                                  ('YUKAWA',[4], 0.0)]
+                           )
 
 first_category.add_options(name='b mass = 0',
                            default=False,
@@ -56,11 +56,11 @@
                                   ('YUKAWA',[15], 0.0)]
                            )
 
-#first_category.add_options(name='muon mass = 0',
-#                           default=True,
-#                           rules=[('MASS',[13], 0.0),
-#                                  ('YUKAWA',[13], 0.0)]
-#                           )
+first_category.add_options(name='muon mass = 0',
+                           default=True,
+                           rules=[('MASS',[13], 0.0),
+                                  ('YUKAWA',[13], 0.0)]
+                           )
 
 #first_category.add_options(name='electron mass = 0',
 #                           default=True,
@@ -101,5 +101,20 @@
                           rules=[('DIM6',[5], 0.0)],
                           inverted_display=True
                           )
+dim6_category.add_options(name='Cphid',
+                          default=True,
+                          rules=[('DIM6',[6], 0.0)],
+                          inverted_display=True
+                          )
+dim6_category.add_options(name='CphiW',
+                          default=True,
+                          rules=[('DIM6',[7], 0.0)],
+                          inverted_display=True
+                          )
+dim6_category.add_options(name='CphiB',
+                          default=True,
+                          rules=[('DIM6',[8], 0.0)],
+                          inverted_display=True
+                          )
 
 

=== modified file 'models/EWdim6/coupling_orders.py'
--- models/EWdim6/coupling_orders.py	2013-01-23 01:06:16 +0000
+++ models/EWdim6/coupling_orders.py	2013-10-25 11:38:22 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.127
+# This file was automatically created by FeynRules 2.1.0
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Tue 22 Jan 2013 16:20:55
+# Date: Tue 15 Oct 2013 22:07:41
 
 
 from object_library import all_orders, CouplingOrder
@@ -12,9 +12,17 @@
 
 QCD = CouplingOrder(name = 'QCD',
                     expansion_order = 99,
-                    hierarchy = 1)
+                    hierarchy = 2)
 
 QED = CouplingOrder(name = 'QED',
                     expansion_order = 99,
+                    hierarchy = 4)
+
+HIG = CouplingOrder(name = 'HIG',
+                    expansion_order = 1,
+                    hierarchy = 2)
+
+HIW = CouplingOrder(name = 'HIW',
+                    expansion_order = 1,
                     hierarchy = 2)
 

=== modified file 'models/EWdim6/couplings.py'
--- models/EWdim6/couplings.py	2013-01-23 01:06:16 +0000
+++ models/EWdim6/couplings.py	2013-10-25 11:38:22 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.127
+# This file was automatically created by FeynRules 2.1.0
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Tue 22 Jan 2013 16:20:55
+# Date: Tue 15 Oct 2013 22:07:41
 
 
 from object_library import all_couplings, Coupling
@@ -10,562 +10,614 @@
 
 
 GC_1 = Coupling(name = 'GC_1',
-                value = '-(ee*complex(0,1))/3.',
-                order = {'QED':1})
+                value = '-(AH*complex(0,1))',
+                order = {'HIW':1})
 
 GC_2 = Coupling(name = 'GC_2',
-                value = '(2*ee*complex(0,1))/3.',
-                order = {'QED':1})
+                value = '-(CphidL2*complex(0,1))/250000.',
+                order = {'NP':2,'QED':2})
 
 GC_3 = Coupling(name = 'GC_3',
-                value = '-(ee*complex(0,1))',
+                value = '-(ee*complex(0,1))/3.',
                 order = {'QED':1})
 
 GC_4 = Coupling(name = 'GC_4',
-                value = '-G',
-                order = {'QCD':1})
+                value = '(2*ee*complex(0,1))/3.',
+                order = {'QED':1})
 
 GC_5 = Coupling(name = 'GC_5',
-                value = 'complex(0,1)*G',
-                order = {'QCD':1})
+                value = '-(ee*complex(0,1))',
+                order = {'QED':1})
 
 GC_6 = Coupling(name = 'GC_6',
-                value = 'complex(0,1)*G**2',
-                order = {'QCD':2})
+                value = 'ee*complex(0,1)',
+                order = {'QED':1})
 
 GC_7 = Coupling(name = 'GC_7',
-                value = 'cw*complex(0,1)*gw',
-                order = {'QED':1})
+                value = '-(CPWL2*ee*complex(0,1))/2.e6',
+                order = {'NP':2})
 
 GC_8 = Coupling(name = 'GC_8',
-                value = '(CPWL2*cw*complex(0,1)*gw)/4.e6',
-                order = {'NP':2})
+                value = 'ee**2*complex(0,1)',
+                order = {'QED':2})
 
 GC_9 = Coupling(name = 'GC_9',
-                value = '-(CPWL2*cw**2*complex(0,1)*g1*gw)/8.e6',
+                value = '-(CphiBL2*ee**2*complex(0,1))/1.e6 - (CphiWL2*ee**2*complex(0,1))/500000.',
                 order = {'NP':2,'QED':1})
 
 GC_10 = Coupling(name = 'GC_10',
-                 value = '-(complex(0,1)*gw**2)',
-                 order = {'QED':2})
+                 value = '-G',
+                 order = {'QCD':1})
 
 GC_11 = Coupling(name = 'GC_11',
-                 value = '(CPWL2*complex(0,1)*gw**2)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = 'complex(0,1)*G',
+                 order = {'QCD':1})
 
 GC_12 = Coupling(name = 'GC_12',
-                 value = 'cw**2*complex(0,1)*gw**2',
-                 order = {'QED':2})
+                 value = 'complex(0,1)*G**2',
+                 order = {'QCD':2})
 
 GC_13 = Coupling(name = 'GC_13',
-                 value = '(CWL2*complex(0,1)*gw**2)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '-(complex(0,1)*GH)',
+                 order = {'HIG':1})
 
 GC_14 = Coupling(name = 'GC_14',
-                 value = '-(CBL2*cw*complex(0,1)*g1*gw**2)/4.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '-(G*GH)',
+                 order = {'HIG':1,'QCD':1})
 
 GC_15 = Coupling(name = 'GC_15',
-                 value = '(CPWL2*cw*complex(0,1)*g1*gw**2)/4.e6',
-                 order = {'NP':2,'QED':2})
+                 value = 'complex(0,1)*G**2*GH',
+                 order = {'HIG':1,'QCD':2})
 
 GC_16 = Coupling(name = 'GC_16',
-                 value = '-(cw*CWL2*complex(0,1)*g1*gw**2)/4.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '-6*complex(0,1)*lam',
+                 order = {'QED':2})
 
 GC_17 = Coupling(name = 'GC_17',
-                 value = '-(CPWL2*cw*complex(0,1)*gw**3)/4.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '-(CphiWL2*ee**4*complex(0,1))/(500000.*sw**4) + (CWL2*ee**4*complex(0,1))/(2.e6*sw**4)',
+                 order = {'NP':2,'QED':3})
 
 GC_18 = Coupling(name = 'GC_18',
-                 value = '(CPWWWL2*cw*complex(0,1)*gw**3)/4.e6',
-                 order = {'NP':2})
+                 value = '(CphiWL2*cw*ee**3*complex(0,1))/(500000.*sw**3) - (cw*CWL2*ee**3*complex(0,1))/(4.e6*sw**3)',
+                 order = {'NP':2,'QED':2})
 
 GC_19 = Coupling(name = 'GC_19',
-                 value = '-(cw*CWL2*complex(0,1)*gw**3)/4.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '-(CPWL2*ee**2*complex(0,1))/2.e6 - (CPWL2*cw**2*ee**2*complex(0,1))/(2.e6*sw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_20 = Coupling(name = 'GC_20',
-                 value = '(3*cw*CWWWL2*complex(0,1)*gw**3)/2.e6',
-                 order = {'NP':2})
+                 value = '(CphiWL2*cw**2*ee**4*complex(0,1))/(500000.*sw**4) - (cw**2*CWL2*ee**4*complex(0,1))/(2.e6*sw**4) - (CWL2*ee**4*complex(0,1))/(2.e6*sw**2)',
+                 order = {'NP':2,'QED':3})
 
 GC_21 = Coupling(name = 'GC_21',
-                 value = '-(CPWWWL2*complex(0,1)*gw**4)/2.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '-(CphiWL2*cw*ee**4*complex(0,1))/(250000.*sw**3) + (cw*CWL2*ee**4*complex(0,1))/(2.e6*sw**3) + (CWL2*ee**4*complex(0,1))/(2.e6*cw*sw)',
+                 order = {'NP':2,'QED':3})
 
 GC_22 = Coupling(name = 'GC_22',
-                 value = '(CPWWWL2*cw**2*complex(0,1)*gw**4)/2.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(3*cw**2*CWWWL2*ee**6*complex(0,1))/(500000.*sw**6)',
+                 order = {'NP':2,'QED':3})
 
 GC_23 = Coupling(name = 'GC_23',
-                 value = '(CWL2*complex(0,1)*gw**4)/2.e6',
-                 order = {'NP':2,'QED':3})
+                 value = '-(CPWWWL2*cw*ee**5*complex(0,1))/(500000.*sw**5)',
+                 order = {'NP':2,'QED':2})
 
 GC_24 = Coupling(name = 'GC_24',
-                 value = '(-3*CWWWL2*complex(0,1)*gw**4)/2.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '-(CPWWWL2*cw**3*ee**5*complex(0,1))/(500000.*sw**5)',
+                 order = {'NP':2,'QED':2})
 
 GC_25 = Coupling(name = 'GC_25',
-                 value = '(3*cw**2*CWWWL2*complex(0,1)*gw**4)/2.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(-3*cw*CWWWL2*ee**5*complex(0,1))/(2.e6*sw**5)',
+                 order = {'NP':2,'QED':2})
 
 GC_26 = Coupling(name = 'GC_26',
-                 value = '-(CPWWWL2*cw*complex(0,1)*gw**5)/500000.',
+                 value = '(-3*cw**3*CWWWL2*ee**5*complex(0,1))/(2.e6*sw**5)',
                  order = {'NP':2,'QED':2})
 
 GC_27 = Coupling(name = 'GC_27',
-                 value = '-(CPWWWL2*cw**3*complex(0,1)*gw**5)/500000.',
-                 order = {'NP':2,'QED':2})
+                 value = '(3*cw*CWWWL2*ee**6*complex(0,1))/(500000.*sw**5)',
+                 order = {'NP':2,'QED':3})
 
 GC_28 = Coupling(name = 'GC_28',
-                 value = '(-3*cw*CWWWL2*complex(0,1)*gw**5)/2.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '(CPWWWL2*ee**4*complex(0,1))/(1.e6*sw**4)',
+                 order = {'NP':2,'QED':1})
 
 GC_29 = Coupling(name = 'GC_29',
-                 value = '(-3*cw**3*CWWWL2*complex(0,1)*gw**5)/2.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '-(CPWWWL2*cw**2*ee**4*complex(0,1))/(1.e6*sw**4)',
+                 order = {'NP':2,'QED':1})
 
 GC_30 = Coupling(name = 'GC_30',
-                 value = '(3*cw**2*CWWWL2*complex(0,1)*gw**6)/500000.',
-                 order = {'NP':2,'QED':3})
+                 value = '(-3*CWWWL2*ee**4*complex(0,1))/(2.e6*sw**4)',
+                 order = {'NP':2,'QED':1})
 
 GC_31 = Coupling(name = 'GC_31',
-                 value = '-6*complex(0,1)*lam',
-                 order = {'QED':2})
+                 value = '(3*cw**2*CWWWL2*ee**4*complex(0,1))/(2.e6*sw**4)',
+                 order = {'NP':2,'QED':1})
 
 GC_32 = Coupling(name = 'GC_32',
-                 value = '(ee**2*complex(0,1))/(2.*sw**2)',
-                 order = {'QED':2})
+                 value = '(CPWWWL2*ee**5*complex(0,1))/(500000.*sw**4)',
+                 order = {'NP':2,'QED':2})
 
 GC_33 = Coupling(name = 'GC_33',
-                 value = '(ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '-(CPWWWL2*cw**2*ee**5*complex(0,1))/(500000.*sw**4)',
+                 order = {'NP':2,'QED':2})
 
 GC_34 = Coupling(name = 'GC_34',
-                 value = '(CKM1x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '(-3*CWWWL2*ee**5*complex(0,1))/(2.e6*sw**4)',
+                 order = {'NP':2,'QED':2})
 
 GC_35 = Coupling(name = 'GC_35',
-                 value = '(CKM1x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '(-3*cw**2*CWWWL2*ee**5*complex(0,1))/(2.e6*sw**4)',
+                 order = {'NP':2,'QED':2})
 
 GC_36 = Coupling(name = 'GC_36',
-                 value = '(CKM1x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '(3*CWWWL2*ee**6*complex(0,1))/(500000.*sw**4)',
+                 order = {'NP':2,'QED':3})
 
 GC_37 = Coupling(name = 'GC_37',
-                 value = '(CKM2x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '(CPWL2*cw*ee**3*complex(0,1))/(2.e6*sw**3)',
+                 order = {'NP':2,'QED':2})
 
 GC_38 = Coupling(name = 'GC_38',
-                 value = '(CKM2x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '-(CPWWWL2*cw*ee**3*complex(0,1))/(2.e6*sw**3)',
+                 order = {'NP':2})
 
 GC_39 = Coupling(name = 'GC_39',
-                 value = '(CKM2x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '(3*cw*CWWWL2*ee**3*complex(0,1))/(2.e6*sw**3)',
+                 order = {'NP':2})
 
 GC_40 = Coupling(name = 'GC_40',
-                 value = '(CKM3x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '(CPWWWL2*cw*ee**4*complex(0,1))/(1.e6*sw**3)',
+                 order = {'NP':2,'QED':1})
 
 GC_41 = Coupling(name = 'GC_41',
-                 value = '(CKM3x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '(-3*cw*CWWWL2*ee**4*complex(0,1))/(2.e6*sw**3)',
+                 order = {'NP':2,'QED':1})
 
 GC_42 = Coupling(name = 'GC_42',
-                 value = '(CKM3x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '-(CPWWWL2*cw*ee**5*complex(0,1))/(500000.*sw**3)',
+                 order = {'NP':2,'QED':2})
 
 GC_43 = Coupling(name = 'GC_43',
-                 value = '-(cw*ee*complex(0,1))/(2.*sw)',
-                 order = {'QED':1})
+                 value = '(-3*cw*CWWWL2*ee**5*complex(0,1))/(2.e6*sw**3)',
+                 order = {'NP':2,'QED':2})
 
 GC_44 = Coupling(name = 'GC_44',
-                 value = '(cw*ee*complex(0,1))/(2.*sw)',
-                 order = {'QED':1})
+                 value = '(ee**2*complex(0,1))/(2.*sw**2)',
+                 order = {'QED':2})
 
 GC_45 = Coupling(name = 'GC_45',
-                 value = '-(ee*complex(0,1)*sw)/(6.*cw)',
-                 order = {'QED':1})
+                 value = '-((ee**2*complex(0,1))/sw**2)',
+                 order = {'QED':2})
 
 GC_46 = Coupling(name = 'GC_46',
-                 value = '(ee*complex(0,1)*sw)/(2.*cw)',
-                 order = {'QED':1})
+                 value = '-(CphiWL2*ee**2*complex(0,1))/(500000.*sw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_47 = Coupling(name = 'GC_47',
-                 value = 'complex(0,1)*gw*sw',
-                 order = {'QED':1})
+                 value = '-(CPWL2*ee**2*complex(0,1))/(2.e6*sw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_48 = Coupling(name = 'GC_48',
-                 value = '(CPWL2*complex(0,1)*gw*sw)/4.e6',
-                 order = {'NP':2})
+                 value = '(cw**2*ee**2*complex(0,1))/sw**2',
+                 order = {'QED':2})
 
 GC_49 = Coupling(name = 'GC_49',
-                 value = '-2*cw*complex(0,1)*gw**2*sw',
-                 order = {'QED':2})
+                 value = '(CWL2*ee**2*complex(0,1))/(4.e6*sw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_50 = Coupling(name = 'GC_50',
-                 value = '-(CPWL2*cw*complex(0,1)*gw**2*sw)/8.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '-(CBL2*ee**3*complex(0,1))/(4.e6*sw**2)',
+                 order = {'NP':2,'QED':2})
 
 GC_51 = Coupling(name = 'GC_51',
-                 value = '(CBL2*complex(0,1)*g1*gw**2*sw)/4.e6',
+                 value = '(CphiWL2*ee**3*complex(0,1))/(500000.*sw**2)',
                  order = {'NP':2,'QED':2})
 
 GC_52 = Coupling(name = 'GC_52',
-                 value = '-(CPWL2*complex(0,1)*g1*gw**2*sw)/4.e6',
+                 value = '(CPWL2*ee**3*complex(0,1))/(2.e6*sw**2)',
                  order = {'NP':2,'QED':2})
 
 GC_53 = Coupling(name = 'GC_53',
-                 value = '-(CWL2*complex(0,1)*g1*gw**2*sw)/4.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '-(CPWWWL2*ee**3*complex(0,1))/(2.e6*sw**2)',
+                 order = {'NP':2})
 
 GC_54 = Coupling(name = 'GC_54',
-                 value = '-(CPWL2*complex(0,1)*gw**3*sw)/4.e6',
+                 value = '-(CWL2*ee**3*complex(0,1))/(4.e6*sw**2)',
                  order = {'NP':2,'QED':2})
 
 GC_55 = Coupling(name = 'GC_55',
-                 value = '(CPWWWL2*complex(0,1)*gw**3*sw)/4.e6',
+                 value = '(3*CWWWL2*ee**3*complex(0,1))/(2.e6*sw**2)',
                  order = {'NP':2})
 
 GC_56 = Coupling(name = 'GC_56',
-                 value = '-(CWL2*complex(0,1)*gw**3*sw)/4.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '(CphiWL2*ee**4*complex(0,1))/(500000.*sw**2)',
+                 order = {'NP':2,'QED':3})
 
 GC_57 = Coupling(name = 'GC_57',
-                 value = '(3*CWWWL2*complex(0,1)*gw**3*sw)/2.e6',
-                 order = {'NP':2})
+                 value = '-(CPWWWL2*ee**4*complex(0,1))/(1.e6*sw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_58 = Coupling(name = 'GC_58',
-                 value = '(CPWWWL2*cw*complex(0,1)*gw**4*sw)/2.e6',
+                 value = '(3*CWWWL2*ee**4*complex(0,1))/(2.e6*sw**2)',
                  order = {'NP':2,'QED':1})
 
 GC_59 = Coupling(name = 'GC_59',
-                 value = '(-3*cw*CWWWL2*complex(0,1)*gw**4*sw)/2.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '-(CPWWWL2*ee**5*complex(0,1))/(500000.*sw**2)',
+                 order = {'NP':2,'QED':2})
 
 GC_60 = Coupling(name = 'GC_60',
-                 value = '(CPWWWL2*complex(0,1)*gw**5*sw)/500000.',
+                 value = '(-3*CWWWL2*ee**5*complex(0,1))/(1.e6*sw**2)',
                  order = {'NP':2,'QED':2})
 
 GC_61 = Coupling(name = 'GC_61',
-                 value = '-(CPWWWL2*cw**2*complex(0,1)*gw**5*sw)/500000.',
-                 order = {'NP':2,'QED':2})
+                 value = '(ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_62 = Coupling(name = 'GC_62',
-                 value = '(-3*CWWWL2*complex(0,1)*gw**5*sw)/2.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '(CKM1x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_63 = Coupling(name = 'GC_63',
-                 value = '(-3*cw**2*CWWWL2*complex(0,1)*gw**5*sw)/2.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '(CKM1x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_64 = Coupling(name = 'GC_64',
-                 value = '(3*cw*CWWWL2*complex(0,1)*gw**6*sw)/500000.',
-                 order = {'NP':2,'QED':3})
+                 value = '(CKM1x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_65 = Coupling(name = 'GC_65',
-                 value = '-(CPWL2*complex(0,1)*g1*gw*sw**2)/8.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(CKM2x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_66 = Coupling(name = 'GC_66',
-                 value = 'complex(0,1)*gw**2*sw**2',
-                 order = {'QED':2})
+                 value = '(CKM2x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_67 = Coupling(name = 'GC_67',
-                 value = '(CPWWWL2*complex(0,1)*gw**4*sw**2)/2.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(CKM2x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_68 = Coupling(name = 'GC_68',
-                 value = '(3*CWWWL2*complex(0,1)*gw**4*sw**2)/2.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(CKM3x1*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_69 = Coupling(name = 'GC_69',
-                 value = '-(CPWWWL2*cw*complex(0,1)*gw**5*sw**2)/500000.',
-                 order = {'NP':2,'QED':2})
+                 value = '(CKM3x2*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_70 = Coupling(name = 'GC_70',
-                 value = '(-3*cw*CWWWL2*complex(0,1)*gw**5*sw**2)/2.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '(CKM3x3*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_71 = Coupling(name = 'GC_71',
-                 value = '(3*CWWWL2*complex(0,1)*gw**6*sw**2)/500000.',
-                 order = {'NP':2,'QED':3})
+                 value = '-(cw*ee*complex(0,1))/(2.*sw)',
+                 order = {'QED':1})
 
 GC_72 = Coupling(name = 'GC_72',
-                 value = '-(CPWWWL2*complex(0,1)*gw**5*sw**3)/500000.',
-                 order = {'NP':2,'QED':2})
+                 value = '(cw*ee*complex(0,1))/(2.*sw)',
+                 order = {'QED':1})
 
 GC_73 = Coupling(name = 'GC_73',
-                 value = '(-3*CWWWL2*complex(0,1)*gw**5*sw**3)/1.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '(cw*ee*complex(0,1))/sw',
+                 order = {'QED':1})
 
 GC_74 = Coupling(name = 'GC_74',
-                 value = '(cw*ee*complex(0,1))/(2.*sw) + (ee*complex(0,1)*sw)/(2.*cw)',
-                 order = {'QED':1})
+                 value = '-(CPWL2*cw*ee*complex(0,1))/(2.e6*sw)',
+                 order = {'NP':2})
 
 GC_75 = Coupling(name = 'GC_75',
-                 value = '-(CPWL2*cw**2*complex(0,1)*gw**2)/8.e6 - (CPWL2*cw*complex(0,1)*g1*gw*sw)/8.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(-2*cw*ee**2*complex(0,1))/sw',
+                 order = {'QED':2})
 
 GC_76 = Coupling(name = 'GC_76',
-                 value = '-(CBL2*cw*complex(0,1)*g1**2*sw)/4.e6 + (cw*CWL2*complex(0,1)*gw**2*sw)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(CBL2*ee**3*complex(0,1))/(4.e6*cw*sw)',
+                 order = {'NP':2,'QED':2})
 
 GC_77 = Coupling(name = 'GC_77',
-                 value = '-(cw**2*CWL2*complex(0,1)*gw**4)/2.e6 - (cw*CWL2*complex(0,1)*g1*gw**3*sw)/2.e6',
-                 order = {'NP':2,'QED':3})
+                 value = '(CPWL2*ee**3*complex(0,1))/(2.e6*cw*sw)',
+                 order = {'NP':2,'QED':2})
 
 GC_78 = Coupling(name = 'GC_78',
-                 value = 'ee**2*complex(0,1) + (cw**2*ee**2*complex(0,1))/(2.*sw**2) + (ee**2*complex(0,1)*sw**2)/(2.*cw**2)',
-                 order = {'QED':2})
+                 value = '-(CWL2*ee**3*complex(0,1))/(4.e6*cw*sw)',
+                 order = {'NP':2,'QED':2})
 
 GC_79 = Coupling(name = 'GC_79',
-                 value = '(cw**2*CWL2*complex(0,1)*gw**2)/4.e6 + (CBL2*cw*complex(0,1)*g1*gw*sw)/4.e6 + (cw*CWL2*complex(0,1)*g1*gw*sw)/4.e6 + (CBL2*complex(0,1)*g1**2*sw**2)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '-(ee*complex(0,1)*sw)/(6.*cw)',
+                 order = {'QED':1})
 
 GC_80 = Coupling(name = 'GC_80',
-                 value = '-(cw**2*CWL2*complex(0,1)*g1*gw)/4.e6 + (CBL2*complex(0,1)*g1*gw*sw**2)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(ee*complex(0,1)*sw)/(2.*cw)',
+                 order = {'QED':1})
 
 GC_81 = Coupling(name = 'GC_81',
-                 value = '-(CBL2*cw**2*complex(0,1)*g1*gw)/4.e6 + (CWL2*complex(0,1)*g1*gw*sw**2)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(cw*ee*complex(0,1))/(2.*sw) + (ee*complex(0,1)*sw)/(2.*cw)',
+                 order = {'QED':1})
 
 GC_82 = Coupling(name = 'GC_82',
-                 value = '(CPWL2*cw*complex(0,1)*g1*gw*sw)/8.e6 - (CPWL2*complex(0,1)*gw**2*sw**2)/8.e6',
+                 value = '-(CphiWL2*cw*ee**2*complex(0,1))/(500000.*sw) + (CphiBL2*ee**2*complex(0,1)*sw)/(1.e6*cw)',
                  order = {'NP':2,'QED':1})
 
 GC_83 = Coupling(name = 'GC_83',
-                 value = '(CBL2*cw**2*complex(0,1)*g1**2)/4.e6 - (CBL2*cw*complex(0,1)*g1*gw*sw)/4.e6 - (cw*CWL2*complex(0,1)*g1*gw*sw)/4.e6 + (CWL2*complex(0,1)*gw**2*sw**2)/4.e6',
+                 value = '-(CPWL2*cw*ee**2*complex(0,1))/(2.e6*sw) - (CPWL2*ee**2*complex(0,1)*sw)/(2.e6*cw)',
                  order = {'NP':2,'QED':1})
 
 GC_84 = Coupling(name = 'GC_84',
-                 value = '-(cw**2*CWL2*complex(0,1)*g1*gw**3)/2.e6 + (cw*CWL2*complex(0,1)*gw**4*sw)/1.e6 + (CWL2*complex(0,1)*g1*gw**3*sw**2)/2.e6',
-                 order = {'NP':2,'QED':3})
+                 value = '-(CBL2*cw*ee**2*complex(0,1))/(4.e6*sw) + (cw*CWL2*ee**2*complex(0,1))/(4.e6*sw) - (CBL2*ee**2*complex(0,1)*sw)/(4.e6*cw) + (CWL2*ee**2*complex(0,1)*sw)/(4.e6*cw)',
+                 order = {'NP':2,'QED':1})
 
 GC_85 = Coupling(name = 'GC_85',
-                 value = '(cw*CWL2*complex(0,1)*g1*gw**3*sw)/2.e6 - (CWL2*complex(0,1)*gw**4*sw**2)/2.e6',
-                 order = {'NP':2,'QED':3})
+                 value = 'ee**2*complex(0,1) + (cw**2*ee**2*complex(0,1))/(2.*sw**2) + (ee**2*complex(0,1)*sw**2)/(2.*cw**2)',
+                 order = {'QED':2})
 
 GC_86 = Coupling(name = 'GC_86',
-                 value = '-(CPWL2*cw**2*complex(0,1)*g1*gw*v)/8.e6',
-                 order = {'NP':2})
+                 value = '(CBL2*ee**2*complex(0,1))/4.e6 + (CWL2*ee**2*complex(0,1))/4.e6 + (cw**2*CWL2*ee**2*complex(0,1))/(4.e6*sw**2) + (CBL2*ee**2*complex(0,1)*sw**2)/(4.e6*cw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_87 = Coupling(name = 'GC_87',
-                 value = '(CPWL2*complex(0,1)*gw**2*v)/4.e6',
-                 order = {'NP':2})
+                 value = '-(CphiWL2*cw**2*ee**2*complex(0,1))/(500000.*sw**2) - (CphiBL2*ee**2*complex(0,1)*sw**2)/(1.e6*cw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_88 = Coupling(name = 'GC_88',
-                 value = '(CWL2*complex(0,1)*gw**2*v)/4.e6',
-                 order = {'NP':2})
+                 value = '-(CphidL2*complex(0,1)*vev)/250000.',
+                 order = {'NP':2,'QED':1})
 
 GC_89 = Coupling(name = 'GC_89',
-                 value = '-(CBL2*cw*complex(0,1)*g1*gw**2*v)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '-6*complex(0,1)*lam*vev',
+                 order = {'QED':1})
 
 GC_90 = Coupling(name = 'GC_90',
-                 value = '(CPWL2*cw*complex(0,1)*g1*gw**2*v)/4.e6',
+                 value = '(CPWL2*cw*ee**3*complex(0,1)*vev)/(2.e6*sw**3)',
                  order = {'NP':2,'QED':1})
 
 GC_91 = Coupling(name = 'GC_91',
-                 value = '-(cw*CWL2*complex(0,1)*g1*gw**2*v)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(ee**2*complex(0,1)*vev)/(2.*sw**2)',
+                 order = {'QED':1})
 
 GC_92 = Coupling(name = 'GC_92',
-                 value = '-(CPWL2*cw*complex(0,1)*gw**3*v)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '-(CphiWL2*ee**2*complex(0,1)*vev)/(500000.*sw**2)',
+                 order = {'NP':2})
 
 GC_93 = Coupling(name = 'GC_93',
-                 value = '-(cw*CWL2*complex(0,1)*gw**3*v)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '-(CPWL2*ee**2*complex(0,1)*vev)/(2.e6*sw**2)',
+                 order = {'NP':2})
 
 GC_94 = Coupling(name = 'GC_94',
-                 value = '(CWL2*complex(0,1)*gw**4*v)/2.e6',
-                 order = {'NP':2,'QED':2})
+                 value = '(CWL2*ee**2*complex(0,1)*vev)/(4.e6*sw**2)',
+                 order = {'NP':2})
 
 GC_95 = Coupling(name = 'GC_95',
-                 value = '-6*complex(0,1)*lam*v',
-                 order = {'QED':1})
+                 value = '-(CBL2*ee**3*complex(0,1)*vev)/(4.e6*sw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_96 = Coupling(name = 'GC_96',
-                 value = '(ee**2*complex(0,1)*v)/(2.*sw**2)',
-                 order = {'QED':1})
+                 value = '(CphiWL2*ee**3*complex(0,1)*vev)/(500000.*sw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_97 = Coupling(name = 'GC_97',
-                 value = '-(CPWL2*cw*complex(0,1)*gw**2*sw*v)/8.e6',
-                 order = {'NP':2})
+                 value = '(CPWL2*ee**3*complex(0,1)*vev)/(2.e6*sw**2)',
+                 order = {'NP':2,'QED':1})
 
 GC_98 = Coupling(name = 'GC_98',
-                 value = '(CBL2*complex(0,1)*g1*gw**2*sw*v)/4.e6',
+                 value = '-(CWL2*ee**3*complex(0,1)*vev)/(4.e6*sw**2)',
                  order = {'NP':2,'QED':1})
 
 GC_99 = Coupling(name = 'GC_99',
-                 value = '-(CPWL2*complex(0,1)*g1*gw**2*sw*v)/4.e6',
-                 order = {'NP':2,'QED':1})
+                 value = '(CphiWL2*ee**4*complex(0,1)*vev)/(500000.*sw**2)',
+                 order = {'NP':2,'QED':2})
 
 GC_100 = Coupling(name = 'GC_100',
-                  value = '-(CWL2*complex(0,1)*g1*gw**2*sw*v)/4.e6',
+                  value = '(CBL2*ee**3*complex(0,1)*vev)/(4.e6*cw*sw)',
                   order = {'NP':2,'QED':1})
 
 GC_101 = Coupling(name = 'GC_101',
-                  value = '-(CPWL2*complex(0,1)*gw**3*sw*v)/4.e6',
+                  value = '(CPWL2*ee**3*complex(0,1)*vev)/(2.e6*cw*sw)',
                   order = {'NP':2,'QED':1})
 
 GC_102 = Coupling(name = 'GC_102',
-                  value = '-(CWL2*complex(0,1)*gw**3*sw*v)/4.e6',
+                  value = '-(CWL2*ee**3*complex(0,1)*vev)/(4.e6*cw*sw)',
                   order = {'NP':2,'QED':1})
 
 GC_103 = Coupling(name = 'GC_103',
-                  value = '-(CPWL2*complex(0,1)*g1*gw*sw**2*v)/8.e6',
-                  order = {'NP':2})
+                  value = '(AH*CphidL2*complex(0,1)*vev**2)/1.e6',
+                  order = {'HIW':1,'NP':2})
 
 GC_104 = Coupling(name = 'GC_104',
-                  value = '-(CBL2*cw*complex(0,1)*g1*gw**2*v**2)/8.e6',
-                  order = {'NP':2})
+                  value = '(CphidL2*complex(0,1)*GH*vev**2)/1.e6',
+                  order = {'HIG':1,'NP':2})
 
 GC_105 = Coupling(name = 'GC_105',
-                  value = '(CPWL2*cw*complex(0,1)*g1*gw**2*v**2)/8.e6',
-                  order = {'NP':2})
+                  value = '(CphidL2*G*GH*vev**2)/1.e6',
+                  order = {'HIG':1,'NP':2,'QCD':1})
 
 GC_106 = Coupling(name = 'GC_106',
-                  value = '-(cw*CWL2*complex(0,1)*g1*gw**2*v**2)/8.e6',
-                  order = {'NP':2})
+                  value = '-(CphidL2*complex(0,1)*G**2*GH*vev**2)/1.e6',
+                  order = {'HIG':1,'NP':2,'QCD':2})
 
 GC_107 = Coupling(name = 'GC_107',
-                  value = '-(CPWL2*cw*complex(0,1)*gw**3*v**2)/8.e6',
-                  order = {'NP':2})
+                  value = '(3*CphidL2*complex(0,1)*lam*vev**2)/125000.',
+                  order = {'NP':2,'QED':2})
 
 GC_108 = Coupling(name = 'GC_108',
-                  value = '-(cw*CWL2*complex(0,1)*gw**3*v**2)/8.e6',
-                  order = {'NP':2})
+                  value = '(CWL2*ee**4*complex(0,1)*vev**2)/(4.e6*sw**4)',
+                  order = {'NP':2,'QED':1})
 
 GC_109 = Coupling(name = 'GC_109',
-                  value = '(CWL2*complex(0,1)*gw**4*v**2)/4.e6',
-                  order = {'NP':2,'QED':1})
+                  value = '(CPWL2*cw*ee**3*complex(0,1)*vev**2)/(4.e6*sw**3)',
+                  order = {'NP':2})
 
 GC_110 = Coupling(name = 'GC_110',
-                  value = '(CBL2*complex(0,1)*g1*gw**2*sw*v**2)/8.e6',
+                  value = '-(cw*CWL2*ee**3*complex(0,1)*vev**2)/(8.e6*sw**3)',
                   order = {'NP':2})
 
 GC_111 = Coupling(name = 'GC_111',
-                  value = '-(CPWL2*complex(0,1)*g1*gw**2*sw*v**2)/8.e6',
-                  order = {'NP':2})
+                  value = '-(CphidL2*ee**2*complex(0,1)*vev**2)/(1.e6*sw**2)',
+                  order = {'NP':2,'QED':2})
 
 GC_112 = Coupling(name = 'GC_112',
-                  value = '-(CWL2*complex(0,1)*g1*gw**2*sw*v**2)/8.e6',
+                  value = '(CPWL2*ee**3*complex(0,1)*vev**2)/(4.e6*sw**2)',
                   order = {'NP':2})
 
 GC_113 = Coupling(name = 'GC_113',
-                  value = '-(CPWL2*complex(0,1)*gw**3*sw*v**2)/8.e6',
+                  value = '(CBL2*ee**3*complex(0,1)*vev**2)/(8.e6*cw*sw)',
                   order = {'NP':2})
 
 GC_114 = Coupling(name = 'GC_114',
-                  value = '-(CWL2*complex(0,1)*gw**3*sw*v**2)/8.e6',
+                  value = '(CPWL2*ee**3*complex(0,1)*vev**2)/(4.e6*cw*sw)',
                   order = {'NP':2})
 
 GC_115 = Coupling(name = 'GC_115',
-                  value = '-(CPWL2*cw**2*complex(0,1)*gw**2*v)/8.e6 - (CPWL2*cw*complex(0,1)*g1*gw*sw*v)/8.e6',
+                  value = '-(CWL2*ee**3*complex(0,1)*vev**2)/(8.e6*cw*sw)',
                   order = {'NP':2})
 
 GC_116 = Coupling(name = 'GC_116',
-                  value = '-(CBL2*cw*complex(0,1)*g1**2*sw*v)/4.e6 + (cw*CWL2*complex(0,1)*gw**2*sw*v)/4.e6',
-                  order = {'NP':2})
+                  value = '(9*CphidL2*complex(0,1)*lam*vev**3)/500000.',
+                  order = {'NP':2,'QED':1})
 
 GC_117 = Coupling(name = 'GC_117',
-                  value = '-(cw**2*CWL2*complex(0,1)*gw**4*v)/2.e6 - (cw*CWL2*complex(0,1)*g1*gw**3*sw*v)/2.e6',
-                  order = {'NP':2,'QED':2})
+                  value = '-(CphidL2*ee**2*complex(0,1)*vev**3)/(2.e6*sw**2)',
+                  order = {'NP':2,'QED':1})
 
 GC_118 = Coupling(name = 'GC_118',
-                  value = 'ee**2*complex(0,1)*v + (cw**2*ee**2*complex(0,1)*v)/(2.*sw**2) + (ee**2*complex(0,1)*sw**2*v)/(2.*cw**2)',
-                  order = {'QED':1})
+                  value = '-(CphiBL2*ee**2*complex(0,1)*vev)/1.e6 - (CphiWL2*ee**2*complex(0,1)*vev)/500000.',
+                  order = {'NP':2})
 
 GC_119 = Coupling(name = 'GC_119',
-                  value = '(cw**2*CWL2*complex(0,1)*gw**2*v)/4.e6 + (CBL2*cw*complex(0,1)*g1*gw*sw*v)/4.e6 + (cw*CWL2*complex(0,1)*g1*gw*sw*v)/4.e6 + (CBL2*complex(0,1)*g1**2*sw**2*v)/4.e6',
-                  order = {'NP':2})
+                  value = '-(CphiWL2*ee**4*complex(0,1)*vev)/(500000.*sw**4) + (CWL2*ee**4*complex(0,1)*vev)/(2.e6*sw**4)',
+                  order = {'NP':2,'QED':2})
 
 GC_120 = Coupling(name = 'GC_120',
-                  value = '-(cw**2*CWL2*complex(0,1)*g1*gw*v)/4.e6 + (CBL2*complex(0,1)*g1*gw*sw**2*v)/4.e6',
-                  order = {'NP':2})
+                  value = '(CphiWL2*cw*ee**3*complex(0,1)*vev)/(500000.*sw**3) - (cw*CWL2*ee**3*complex(0,1)*vev)/(4.e6*sw**3)',
+                  order = {'NP':2,'QED':1})
 
 GC_121 = Coupling(name = 'GC_121',
-                  value = '-(CBL2*cw**2*complex(0,1)*g1*gw*v)/4.e6 + (CWL2*complex(0,1)*g1*gw*sw**2*v)/4.e6',
+                  value = '-(CPWL2*ee**2*complex(0,1)*vev)/2.e6 - (CPWL2*cw**2*ee**2*complex(0,1)*vev)/(2.e6*sw**2)',
                   order = {'NP':2})
 
 GC_122 = Coupling(name = 'GC_122',
-                  value = '(CPWL2*cw*complex(0,1)*g1*gw*sw*v)/8.e6 - (CPWL2*complex(0,1)*gw**2*sw**2*v)/8.e6',
-                  order = {'NP':2})
+                  value = '(CphiWL2*cw**2*ee**4*complex(0,1)*vev)/(500000.*sw**4) - (cw**2*CWL2*ee**4*complex(0,1)*vev)/(2.e6*sw**4) - (CWL2*ee**4*complex(0,1)*vev)/(2.e6*sw**2)',
+                  order = {'NP':2,'QED':2})
 
 GC_123 = Coupling(name = 'GC_123',
-                  value = '(CBL2*cw**2*complex(0,1)*g1**2*v)/4.e6 - (CBL2*cw*complex(0,1)*g1*gw*sw*v)/4.e6 - (cw*CWL2*complex(0,1)*g1*gw*sw*v)/4.e6 + (CWL2*complex(0,1)*gw**2*sw**2*v)/4.e6',
-                  order = {'NP':2})
+                  value = '-(CphiWL2*cw*ee**4*complex(0,1)*vev)/(250000.*sw**3) + (cw*CWL2*ee**4*complex(0,1)*vev)/(2.e6*sw**3) + (CWL2*ee**4*complex(0,1)*vev)/(2.e6*cw*sw)',
+                  order = {'NP':2,'QED':2})
 
 GC_124 = Coupling(name = 'GC_124',
-                  value = '-(cw**2*CWL2*complex(0,1)*g1*gw**3*v)/2.e6 + (cw*CWL2*complex(0,1)*gw**4*sw*v)/1.e6 + (CWL2*complex(0,1)*g1*gw**3*sw**2*v)/2.e6',
-                  order = {'NP':2,'QED':2})
+                  value = '-(CphiWL2*cw*ee**2*complex(0,1)*vev)/(500000.*sw) + (CphiBL2*ee**2*complex(0,1)*sw*vev)/(1.e6*cw)',
+                  order = {'NP':2})
 
 GC_125 = Coupling(name = 'GC_125',
-                  value = '(cw*CWL2*complex(0,1)*g1*gw**3*sw*v)/2.e6 - (CWL2*complex(0,1)*gw**4*sw**2*v)/2.e6',
-                  order = {'NP':2,'QED':2})
+                  value = '-(CPWL2*cw*ee**2*complex(0,1)*vev)/(2.e6*sw) - (CPWL2*ee**2*complex(0,1)*sw*vev)/(2.e6*cw)',
+                  order = {'NP':2})
 
 GC_126 = Coupling(name = 'GC_126',
-                  value = '-(cw**2*CWL2*complex(0,1)*gw**4*v**2)/4.e6 - (cw*CWL2*complex(0,1)*g1*gw**3*sw*v**2)/4.e6',
-                  order = {'NP':2,'QED':1})
+                  value = '-(CBL2*cw*ee**2*complex(0,1)*vev)/(4.e6*sw) + (cw*CWL2*ee**2*complex(0,1)*vev)/(4.e6*sw) - (CBL2*ee**2*complex(0,1)*sw*vev)/(4.e6*cw) + (CWL2*ee**2*complex(0,1)*sw*vev)/(4.e6*cw)',
+                  order = {'NP':2})
 
 GC_127 = Coupling(name = 'GC_127',
-                  value = '-(cw**2*CWL2*complex(0,1)*g1*gw**3*v**2)/4.e6 + (cw*CWL2*complex(0,1)*gw**4*sw*v**2)/2.e6 + (CWL2*complex(0,1)*g1*gw**3*sw**2*v**2)/4.e6',
-                  order = {'NP':2,'QED':1})
+                  value = 'ee**2*complex(0,1)*vev + (cw**2*ee**2*complex(0,1)*vev)/(2.*sw**2) + (ee**2*complex(0,1)*sw**2*vev)/(2.*cw**2)',
+                  order = {'QED':1})
 
 GC_128 = Coupling(name = 'GC_128',
-                  value = '(cw*CWL2*complex(0,1)*g1*gw**3*sw*v**2)/4.e6 - (CWL2*complex(0,1)*gw**4*sw**2*v**2)/4.e6',
-                  order = {'NP':2,'QED':1})
+                  value = '(CBL2*ee**2*complex(0,1)*vev)/4.e6 + (CWL2*ee**2*complex(0,1)*vev)/4.e6 + (cw**2*CWL2*ee**2*complex(0,1)*vev)/(4.e6*sw**2) + (CBL2*ee**2*complex(0,1)*sw**2*vev)/(4.e6*cw**2)',
+                  order = {'NP':2})
 
 GC_129 = Coupling(name = 'GC_129',
+                  value = '-(CphiWL2*cw**2*ee**2*complex(0,1)*vev)/(500000.*sw**2) - (CphiBL2*ee**2*complex(0,1)*sw**2*vev)/(1.e6*cw**2)',
+                  order = {'NP':2})
+
+GC_130 = Coupling(name = 'GC_130',
+                  value = '-(CBL2*ee**3*complex(0,1)*vev**2)/(8.e6*sw**2) - (CWL2*ee**3*complex(0,1)*vev**2)/(8.e6*sw**2)',
+                  order = {'NP':2})
+
+GC_131 = Coupling(name = 'GC_131',
+                  value = '-(cw**2*CWL2*ee**4*complex(0,1)*vev**2)/(4.e6*sw**4) - (CWL2*ee**4*complex(0,1)*vev**2)/(4.e6*sw**2)',
+                  order = {'NP':2,'QED':1})
+
+GC_132 = Coupling(name = 'GC_132',
+                  value = '(cw*CWL2*ee**4*complex(0,1)*vev**2)/(4.e6*sw**3) + (CWL2*ee**4*complex(0,1)*vev**2)/(4.e6*cw*sw)',
+                  order = {'NP':2,'QED':1})
+
+GC_133 = Coupling(name = 'GC_133',
+                  value = '-(CphidL2*ee**2*complex(0,1)*vev**2)/500000. - (CphidL2*cw**2*ee**2*complex(0,1)*vev**2)/(1.e6*sw**2) - (CphidL2*ee**2*complex(0,1)*sw**2*vev**2)/(1.e6*cw**2)',
+                  order = {'NP':2,'QED':2})
+
+GC_134 = Coupling(name = 'GC_134',
+                  value = '-(CphidL2*ee**2*complex(0,1)*vev**3)/1.e6 - (CphidL2*cw**2*ee**2*complex(0,1)*vev**3)/(2.e6*sw**2) - (CphidL2*ee**2*complex(0,1)*sw**2*vev**3)/(2.e6*cw**2)',
+                  order = {'NP':2,'QED':1})
+
+GC_135 = Coupling(name = 'GC_135',
                   value = '-((complex(0,1)*yb)/cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_130 = Coupling(name = 'GC_130',
+GC_136 = Coupling(name = 'GC_136',
+                  value = '(CphidL2*complex(0,1)*vev**2*yb)/(1.e6*cmath.sqrt(2))',
+                  order = {'NP':2,'QED':1})
+
+GC_137 = Coupling(name = 'GC_137',
+                  value = '-((complex(0,1)*yc)/cmath.sqrt(2))',
+                  order = {'QED':1})
+
+GC_138 = Coupling(name = 'GC_138',
+                  value = '(CphidL2*complex(0,1)*vev**2*yc)/(1.e6*cmath.sqrt(2))',
+                  order = {'NP':2,'QED':1})
+
+GC_139 = Coupling(name = 'GC_139',
+                  value = '-((complex(0,1)*ym)/cmath.sqrt(2))',
+                  order = {'QED':1})
+
+GC_140 = Coupling(name = 'GC_140',
+                  value = '(CphidL2*complex(0,1)*vev**2*ym)/(1.e6*cmath.sqrt(2))',
+                  order = {'NP':2,'QED':1})
+
+GC_141 = Coupling(name = 'GC_141',
                   value = '-((complex(0,1)*yt)/cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_131 = Coupling(name = 'GC_131',
+GC_142 = Coupling(name = 'GC_142',
+                  value = '(CphidL2*complex(0,1)*vev**2*yt)/(1.e6*cmath.sqrt(2))',
+                  order = {'NP':2,'QED':1})
+
+GC_143 = Coupling(name = 'GC_143',
                   value = '-((complex(0,1)*ytau)/cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_132 = Coupling(name = 'GC_132',
+GC_144 = Coupling(name = 'GC_144',
+                  value = '(CphidL2*complex(0,1)*vev**2*ytau)/(1.e6*cmath.sqrt(2))',
+                  order = {'NP':2,'QED':1})
+
+GC_145 = Coupling(name = 'GC_145',
                   value = '(ee*complex(0,1)*complexconjugate(CKM1x1))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_133 = Coupling(name = 'GC_133',
+GC_146 = Coupling(name = 'GC_146',
                   value = '(ee*complex(0,1)*complexconjugate(CKM1x2))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_134 = Coupling(name = 'GC_134',
+GC_147 = Coupling(name = 'GC_147',
                   value = '(ee*complex(0,1)*complexconjugate(CKM1x3))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_135 = Coupling(name = 'GC_135',
+GC_148 = Coupling(name = 'GC_148',
                   value = '(ee*complex(0,1)*complexconjugate(CKM2x1))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_136 = Coupling(name = 'GC_136',
+GC_149 = Coupling(name = 'GC_149',
                   value = '(ee*complex(0,1)*complexconjugate(CKM2x2))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_137 = Coupling(name = 'GC_137',
+GC_150 = Coupling(name = 'GC_150',
                   value = '(ee*complex(0,1)*complexconjugate(CKM2x3))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_138 = Coupling(name = 'GC_138',
+GC_151 = Coupling(name = 'GC_151',
                   value = '(ee*complex(0,1)*complexconjugate(CKM3x1))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_139 = Coupling(name = 'GC_139',
+GC_152 = Coupling(name = 'GC_152',
                   value = '(ee*complex(0,1)*complexconjugate(CKM3x2))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
-GC_140 = Coupling(name = 'GC_140',
+GC_153 = Coupling(name = 'GC_153',
                   value = '(ee*complex(0,1)*complexconjugate(CKM3x3))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 

=== modified file 'models/EWdim6/function_library.py'
--- models/EWdim6/function_library.py	2013-01-23 01:06:16 +0000
+++ models/EWdim6/function_library.py	2013-10-25 11:38:22 +0000
@@ -59,4 +59,13 @@
              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))')
 

=== modified file 'models/EWdim6/lorentz.py'
--- models/EWdim6/lorentz.py	2013-01-23 01:06:16 +0000
+++ models/EWdim6/lorentz.py	2013-10-25 11:38:22 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.127
+# This file was automatically created by FeynRules 2.1.0
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Tue 22 Jan 2013 16:20:54
+# Date: Tue 15 Oct 2013 22:07:41
 
 
 from object_library import all_lorentz, Lorentz
@@ -20,9 +20,13 @@
                spins = [ 1, 1, 1 ],
                structure = '1')
 
+SSS2 = Lorentz(name = 'SSS2',
+               spins = [ 1, 1, 1 ],
+               structure = 'P(-1,1)*P(-1,2) + P(-1,1)*P(-1,3) + P(-1,2)*P(-1,3)')
+
 FFS1 = Lorentz(name = 'FFS1',
                spins = [ 2, 2, 1 ],
-               structure = 'Identity(2,1)')
+               structure = 'ProjM(2,1) + ProjP(2,1)')
 
 FFV1 = Lorentz(name = 'FFV1',
                spins = [ 2, 2, 3 ],
@@ -46,55 +50,43 @@
 
 VSS1 = Lorentz(name = 'VSS1',
                spins = [ 3, 1, 1 ],
-               structure = '2*Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2) + 2*Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)')
+               structure = '-(Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2)) - Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)')
 
 VVS1 = Lorentz(name = 'VVS1',
                spins = [ 3, 3, 1 ],
-               structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)')
+               structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)')
 
 VVS2 = Lorentz(name = 'VVS2',
                spins = [ 3, 3, 1 ],
-               structure = '2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
+               structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
 
 VVS3 = Lorentz(name = 'VVS3',
                spins = [ 3, 3, 1 ],
-               structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)) + 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
+               structure = 'Metric(1,2)')
 
 VVS4 = Lorentz(name = 'VVS4',
                spins = [ 3, 3, 1 ],
-               structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)) + Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
+               structure = 'P(1,2)*P(2,1) - P(-1,1)*P(-1,2)*Metric(1,2)')
 
 VVS5 = Lorentz(name = 'VVS5',
                spins = [ 3, 3, 1 ],
-               structure = '-2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2) + 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
+               structure = 'P(1,3)*P(2,1) - P(-1,1)*P(-1,3)*Metric(1,2)')
 
 VVS6 = Lorentz(name = 'VVS6',
                spins = [ 3, 3, 1 ],
-               structure = 'Metric(1,2)')
-
-VVS7 = Lorentz(name = 'VVS7',
-               spins = [ 3, 3, 1 ],
-               structure = 'P(1,3)*P(2,1) - P(-1,1)*P(-1,3)*Metric(1,2)')
-
-VVS8 = Lorentz(name = 'VVS8',
-               spins = [ 3, 3, 1 ],
-               structure = 'P(1,2)*P(2,3) - P(-1,2)*P(-1,3)*Metric(1,2)')
-
-VVS9 = Lorentz(name = 'VVS9',
-               spins = [ 3, 3, 1 ],
                structure = 'P(1,3)*P(2,1) + P(1,2)*P(2,3) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,2)*P(-1,3)*Metric(1,2)')
 
 VVV1 = Lorentz(name = 'VVV1',
                spins = [ 3, 3, 3 ],
-               structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2)')
+               structure = '-(Epsilon(1,2,3,-1)*P(-1,1))')
 
 VVV2 = Lorentz(name = 'VVV2',
                spins = [ 3, 3, 3 ],
-               structure = '2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3)')
+               structure = '-(Epsilon(1,2,3,-1)*P(-1,1)) - Epsilon(1,2,3,-1)*P(-1,2)')
 
 VVV3 = Lorentz(name = 'VVV3',
                spins = [ 3, 3, 3 ],
-               structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3)')
+               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)')
 
 VVV4 = Lorentz(name = 'VVV4',
                spins = [ 3, 3, 3 ],
@@ -114,67 +106,59 @@
 
 VVV8 = Lorentz(name = 'VVV8',
                spins = [ 3, 3, 3 ],
-               structure = 'P(3,2)*Metric(1,2) - P(2,3)*Metric(1,3) - P(1,2)*Metric(2,3) + P(1,3)*Metric(2,3)')
+               structure = '-(P(1,2)*P(2,3)*P(3,1)) + P(1,3)*P(2,1)*P(3,2) + P(-1,2)*P(-1,3)*P(3,1)*Metric(1,2) - P(-1,1)*P(-1,3)*P(3,2)*Metric(1,2) - P(-1,2)*P(-1,3)*P(2,1)*Metric(1,3) + P(-1,1)*P(-1,2)*P(2,3)*Metric(1,3) + P(-1,1)*P(-1,3)*P(1,2)*Metric(2,3) - P(-1,1)*P(-1,2)*P(1,3)*Metric(2,3)')
 
 VVV9 = Lorentz(name = 'VVV9',
                spins = [ 3, 3, 3 ],
-               structure = '-(P(1,2)*P(2,3)*P(3,1)) + P(1,3)*P(2,1)*P(3,2) + P(-1,2)*P(-1,3)*P(3,1)*Metric(1,2) - P(-1,1)*P(-1,3)*P(3,2)*Metric(1,2) - P(-1,2)*P(-1,3)*P(2,1)*Metric(1,3) + P(-1,1)*P(-1,2)*P(2,3)*Metric(1,3) + P(-1,1)*P(-1,3)*P(1,2)*Metric(2,3) - P(-1,1)*P(-1,2)*P(1,3)*Metric(2,3)')
-
-VVV10 = Lorentz(name = 'VVV10',
-                spins = [ 3, 3, 3 ],
-                structure = '4*Epsilon(1,2,3,-2)*P(-2,3)*P(-1,1)*P(-1,2) + 4*Epsilon(1,2,3,-2)*P(-2,2)*P(-1,1)*P(-1,3) + 4*Epsilon(1,2,3,-2)*P(-2,1)*P(-1,2)*P(-1,3) - 2*Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*P(1,2) + 2*Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,3)*P(1,2) - 2*Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,1)*P(1,3) + 2*Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,2)*P(1,3) + 2*Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,2)*P(2,1) - 2*Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,3)*P(2,1) - 2*Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,1)*P(2,3) + 2*Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,2)*P(2,3) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)*P(3,1) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)*P(3,1) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)*P(3,2) - 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*P(3,2) + Epsilon(3,-1,-2,-3)*P(-3,3)*P(-2,2)*P(-1,1)*Metric(1,2) - Epsilon(3,-1,-2,-3)*P(-3,3)*P(-2,1)*P(-1,2)*Metric(1,2) + Epsilon(3,-1,-2,-3)*P(-3,2)*P(-2,1)*P(-1,3)*Metric(1,2) - Epsilon(3,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)*Metric(1,2) - Epsilon(2,-1,-2,-3)*P(-3,2)*P(-2,3)*P(-1,1)*Metric(1,3) - Epsilon(2,-1,-2,-3)*P(-3,3)*P(-2,1)*P(-1,2)*Metric(1,3) + Epsilon(2,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2)*Metric(1,3) + Epsilon(2,-1,-2,-3)*P(-3,2)*P(-2,1)*P(-1,3)*Metric(1,3) + Epsilon(1,-1,-2,-3)*P(-3,3)*P(-2,2)*P(-1,1)*Metric(2,3) - Epsilon(1,-1,-2,-3)*P(-3,2)*P(-2,3)*P(-1,1)*Metric(2,3) + Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2)*Metric(2,3) - Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)*Metric(2,3)')
+               structure = '-2*Epsilon(1,2,3,-2)*P(-2,3)*P(-1,1)*P(-1,2) - 2*Epsilon(1,2,3,-2)*P(-2,2)*P(-1,1)*P(-1,3) - 2*Epsilon(1,2,3,-2)*P(-2,1)*P(-1,2)*P(-1,3) + Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*P(1,2) - Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,3)*P(1,2) + Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,1)*P(1,3) - Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,2)*P(1,3) - Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,2)*P(2,1) + Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,3)*P(2,1) + Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,1)*P(2,3) - Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,2)*P(2,3) - Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)*P(3,1) + Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)*P(3,1) - Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)*P(3,2) + Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*P(3,2) - (Epsilon(3,-1,-2,-3)*P(-3,3)*P(-2,2)*P(-1,1)*Metric(1,2))/2. + (Epsilon(3,-1,-2,-3)*P(-3,3)*P(-2,1)*P(-1,2)*Metric(1,2))/2. - (Epsilon(3,-1,-2,-3)*P(-3,2)*P(-2,1)*P(-1,3)*Metric(1,2))/2. + (Epsilon(3,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)*Metric(1,2))/2. + (Epsilon(2,-1,-2,-3)*P(-3,2)*P(-2,3)*P(-1,1)*Metric(1,3))/2. + (Epsilon(2,-1,-2,-3)*P(-3,3)*P(-2,1)*P(-1,2)*Metric(1,3))/2. - (Epsilon(2,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2)*Metric(1,3))/2. - (Epsilon(2,-1,-2,-3)*P(-3,2)*P(-2,1)*P(-1,3)*Metric(1,3))/2. - (Epsilon(1,-1,-2,-3)*P(-3,3)*P(-2,2)*P(-1,1)*Metric(2,3))/2. + (Epsilon(1,-1,-2,-3)*P(-3,2)*P(-2,3)*P(-1,1)*Metric(2,3))/2. - (Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2)*Metric(2,3))/2. + (Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)*Metric(2,3))/2.')
 
 SSSS1 = Lorentz(name = 'SSSS1',
                 spins = [ 1, 1, 1, 1 ],
                 structure = '1')
 
+SSSS2 = Lorentz(name = 'SSSS2',
+                spins = [ 1, 1, 1, 1 ],
+                structure = 'P(-1,1)*P(-1,2) + P(-1,1)*P(-1,3) + P(-1,2)*P(-1,3) + P(-1,1)*P(-1,4) + P(-1,2)*P(-1,4) + P(-1,3)*P(-1,4)')
+
 VVSS1 = Lorentz(name = 'VVSS1',
                 spins = [ 3, 3, 1, 1 ],
-                structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)) - Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4)')
+                structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) + Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4)')
 
 VVSS2 = Lorentz(name = 'VVSS2',
                 spins = [ 3, 3, 1, 1 ],
-                structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)) - Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2) + 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)')
+                structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)')
 
 VVSS3 = Lorentz(name = 'VVSS3',
                 spins = [ 3, 3, 1, 1 ],
-                structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)) - Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1) + Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2) + Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4) - 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)')
+                structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) - Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,3) + Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4) - Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,4)')
 
 VVSS4 = Lorentz(name = 'VVSS4',
                 spins = [ 3, 3, 1, 1 ],
-                structure = '-2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1) - 2*Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2) + 2*Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2) + 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)')
+                structure = 'Metric(1,2)')
 
 VVSS5 = Lorentz(name = 'VVSS5',
                 spins = [ 3, 3, 1, 1 ],
-                structure = '2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + 2*Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,3) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,4)')
+                structure = 'P(1,2)*P(2,1) - P(-1,1)*P(-1,2)*Metric(1,2)')
 
 VVSS6 = Lorentz(name = 'VVSS6',
                 spins = [ 3, 3, 1, 1 ],
-                structure = 'Metric(1,2)')
+                structure = 'P(1,3)*P(2,1) + P(1,4)*P(2,1) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,1)*P(-1,4)*Metric(1,2)')
 
 VVSS7 = Lorentz(name = 'VVSS7',
                 spins = [ 3, 3, 1, 1 ],
-                structure = 'P(1,3)*P(2,1) + P(1,4)*P(2,1) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,1)*P(-1,4)*Metric(1,2)')
-
-VVSS8 = Lorentz(name = 'VVSS8',
-                spins = [ 3, 3, 1, 1 ],
-                structure = 'P(1,2)*P(2,3) + P(1,2)*P(2,4) - P(-1,2)*P(-1,3)*Metric(1,2) - P(-1,2)*P(-1,4)*Metric(1,2)')
-
-VVSS9 = Lorentz(name = 'VVSS9',
-                spins = [ 3, 3, 1, 1 ],
                 structure = 'P(1,3)*P(2,1) + P(1,4)*P(2,1) + P(1,2)*P(2,3) + P(1,2)*P(2,4) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,2)*P(-1,3)*Metric(1,2) - P(-1,1)*P(-1,4)*Metric(1,2) - P(-1,2)*P(-1,4)*Metric(1,2)')
 
 VVVS1 = Lorentz(name = 'VVVS1',
                 spins = [ 3, 3, 3, 1 ],
-                structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,4)')
+                structure = '-(Epsilon(1,2,3,-1)*P(-1,1)) - Epsilon(1,2,3,-1)*P(-1,2) - Epsilon(1,2,3,-1)*P(-1,4)')
 
 VVVS2 = Lorentz(name = 'VVVS2',
                 spins = [ 3, 3, 3, 1 ],
-                structure = '2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3) + 2*Epsilon(1,2,3,-1)*P(-1,4)')
+                structure = '-(Epsilon(1,2,3,-1)*P(-1,1)) - 2*Epsilon(1,2,3,-1)*P(-1,4)')
 
 VVVS3 = Lorentz(name = 'VVVS3',
                 spins = [ 3, 3, 3, 1 ],
-                structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3) + 6*Epsilon(1,2,3,-1)*P(-1,4)')
+                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) - 3*Epsilon(1,2,3,-1)*P(-1,4)')
 
 VVVS4 = Lorentz(name = 'VVVS4',
                 spins = [ 3, 3, 3, 1 ],
@@ -182,16 +166,16 @@
 
 VVVS5 = Lorentz(name = 'VVVS5',
                 spins = [ 3, 3, 3, 1 ],
+                structure = 'P(3,1)*Metric(1,2) - P(3,4)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,4)*Metric(1,3)')
+
+VVVS6 = Lorentz(name = 'VVVS6',
+                spins = [ 3, 3, 3, 1 ],
                 structure = 'P(2,3)*Metric(1,3) - P(1,3)*Metric(2,3)')
 
-VVVS6 = Lorentz(name = 'VVVS6',
+VVVS7 = Lorentz(name = 'VVVS7',
                 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)')
 
-VVVS7 = Lorentz(name = 'VVVS7',
-                spins = [ 3, 3, 3, 1 ],
-                structure = 'P(3,2)*Metric(1,2) - P(3,4)*Metric(1,2) - P(2,3)*Metric(1,3) + P(2,4)*Metric(1,3) - P(1,2)*Metric(2,3) + P(1,3)*Metric(2,3)')
-
 VVVS8 = Lorentz(name = 'VVVS8',
                 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,4)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,4)*Metric(2,3)')
@@ -202,11 +186,11 @@
 
 VVVV2 = Lorentz(name = 'VVVV2',
                 spins = [ 3, 3, 3, 3 ],
-                structure = '2*Epsilon(1,2,3,4)*P(-1,1)*P(-1,3) - 2*Epsilon(1,2,3,4)*P(-1,2)*P(-1,3) - 2*Epsilon(1,2,3,4)*P(-1,1)*P(-1,4) + 2*Epsilon(1,2,3,4)*P(-1,2)*P(-1,4) + 2*Epsilon(2,3,4,-1)*P(-1,3)*P(1,2) - 2*Epsilon(2,3,4,-1)*P(-1,4)*P(1,2) + 2*Epsilon(2,3,4,-1)*P(-1,1)*P(1,3) + 2*Epsilon(2,3,4,-1)*P(-1,2)*P(1,3) - 2*Epsilon(2,3,4,-1)*P(-1,1)*P(1,4) - 2*Epsilon(2,3,4,-1)*P(-1,2)*P(1,4) + 2*Epsilon(1,3,4,-1)*P(-1,3)*P(2,1) - 2*Epsilon(1,3,4,-1)*P(-1,4)*P(2,1) + 2*Epsilon(1,3,4,-1)*P(-1,1)*P(2,3) + 2*Epsilon(1,3,4,-1)*P(-1,2)*P(2,3) - 2*Epsilon(1,3,4,-1)*P(-1,1)*P(2,4) - 2*Epsilon(1,3,4,-1)*P(-1,2)*P(2,4) + 2*Epsilon(1,2,4,-1)*P(-1,3)*P(3,1) + 2*Epsilon(1,2,4,-1)*P(-1,4)*P(3,1) - 2*Epsilon(1,2,4,-1)*P(-1,3)*P(3,2) - 2*Epsilon(1,2,4,-1)*P(-1,4)*P(3,2) + 2*Epsilon(1,2,4,-1)*P(-1,1)*P(3,4) - 2*Epsilon(1,2,4,-1)*P(-1,2)*P(3,4) + 2*Epsilon(1,2,3,-1)*P(-1,3)*P(4,1) + 2*Epsilon(1,2,3,-1)*P(-1,4)*P(4,1) - 2*Epsilon(1,2,3,-1)*P(-1,3)*P(4,2) - 2*Epsilon(1,2,3,-1)*P(-1,4)*P(4,2) + 2*Epsilon(1,2,3,-1)*P(-1,1)*P(4,3) - 2*Epsilon(1,2,3,-1)*P(-1,2)*P(4,3) - 2*Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,2) + 2*Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,2) - 2*Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(1,2) + 2*Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,2) - Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,3) - 2*Epsilon(2,4,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,3) + Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,3) + 2*Epsilon(2,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(1,3) - 2*Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,4) - Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,4) + Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,4)*Metric(1,4) + 2*Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,4) - Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(2,3) - 2*Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,3) + 2*Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(2,3) + Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(2,3) - 2*Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,2)*Metric(2,4) - Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,4) + 2*Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,4)*Metric(2,4) + Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,4) - 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*Metric(3,4) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)*Metric(3,4) - 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4)*Metric(3,4) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)*Metric(3,4)')
+                structure = '-(Epsilon(1,2,3,4)*P(-1,1)*P(-1,3)) + Epsilon(1,2,3,4)*P(-1,2)*P(-1,3) + Epsilon(1,2,3,4)*P(-1,1)*P(-1,4) - Epsilon(1,2,3,4)*P(-1,2)*P(-1,4) - Epsilon(2,3,4,-1)*P(-1,3)*P(1,2) + Epsilon(2,3,4,-1)*P(-1,4)*P(1,2) - Epsilon(2,3,4,-1)*P(-1,1)*P(1,3) - Epsilon(2,3,4,-1)*P(-1,2)*P(1,3) + Epsilon(2,3,4,-1)*P(-1,1)*P(1,4) + Epsilon(2,3,4,-1)*P(-1,2)*P(1,4) - Epsilon(1,3,4,-1)*P(-1,3)*P(2,1) + Epsilon(1,3,4,-1)*P(-1,4)*P(2,1) - Epsilon(1,3,4,-1)*P(-1,1)*P(2,3) - Epsilon(1,3,4,-1)*P(-1,2)*P(2,3) + Epsilon(1,3,4,-1)*P(-1,1)*P(2,4) + Epsilon(1,3,4,-1)*P(-1,2)*P(2,4) - Epsilon(1,2,4,-1)*P(-1,3)*P(3,1) - Epsilon(1,2,4,-1)*P(-1,4)*P(3,1) + Epsilon(1,2,4,-1)*P(-1,3)*P(3,2) + Epsilon(1,2,4,-1)*P(-1,4)*P(3,2) - Epsilon(1,2,4,-1)*P(-1,1)*P(3,4) + Epsilon(1,2,4,-1)*P(-1,2)*P(3,4) - Epsilon(1,2,3,-1)*P(-1,3)*P(4,1) - Epsilon(1,2,3,-1)*P(-1,4)*P(4,1) + Epsilon(1,2,3,-1)*P(-1,3)*P(4,2) + Epsilon(1,2,3,-1)*P(-1,4)*P(4,2) - Epsilon(1,2,3,-1)*P(-1,1)*P(4,3) + Epsilon(1,2,3,-1)*P(-1,2)*P(4,3) + (Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,4)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,2))/2. + (Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,3))/2. + (Epsilon(2,4,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,3))/2. + (Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,4)*Metric(1,3))/2. + (Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,4)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,4))/2. + (Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,3))/2. + (Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,1)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,2)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,4))/2. - (Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,3)*Metric(2,4))/2. - (Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,4)*Metric(2,4))/2. - (Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)*Metric(3,4))/2.')
 
 VVVV3 = Lorentz(name = 'VVVV3',
                 spins = [ 3, 3, 3, 3 ],
-                structure = '2*Epsilon(1,2,3,4)*P(-1,1)*P(-1,2) - 2*Epsilon(1,2,3,4)*P(-1,1)*P(-1,3) - 2*Epsilon(1,2,3,4)*P(-1,2)*P(-1,4) + 2*Epsilon(1,2,3,4)*P(-1,3)*P(-1,4) + 2*Epsilon(2,3,4,-1)*P(-1,1)*P(1,2) + 2*Epsilon(2,3,4,-1)*P(-1,4)*P(1,2) - 2*Epsilon(2,3,4,-1)*P(-1,1)*P(1,3) - 2*Epsilon(2,3,4,-1)*P(-1,4)*P(1,3) + 2*Epsilon(2,3,4,-1)*P(-1,2)*P(1,4) - 2*Epsilon(2,3,4,-1)*P(-1,3)*P(1,4) - 2*Epsilon(1,3,4,-1)*P(-1,2)*P(2,1) - 2*Epsilon(1,3,4,-1)*P(-1,3)*P(2,1) - 2*Epsilon(1,3,4,-1)*P(-1,1)*P(2,3) + 2*Epsilon(1,3,4,-1)*P(-1,4)*P(2,3) + 2*Epsilon(1,3,4,-1)*P(-1,2)*P(2,4) + 2*Epsilon(1,3,4,-1)*P(-1,3)*P(2,4) - 2*Epsilon(1,2,4,-1)*P(-1,2)*P(3,1) - 2*Epsilon(1,2,4,-1)*P(-1,3)*P(3,1) - 2*Epsilon(1,2,4,-1)*P(-1,1)*P(3,2) + 2*Epsilon(1,2,4,-1)*P(-1,4)*P(3,2) + 2*Epsilon(1,2,4,-1)*P(-1,2)*P(3,4) + 2*Epsilon(1,2,4,-1)*P(-1,3)*P(3,4) + 2*Epsilon(1,2,3,-1)*P(-1,2)*P(4,1) - 2*Epsilon(1,2,3,-1)*P(-1,3)*P(4,1) + 2*Epsilon(1,2,3,-1)*P(-1,1)*P(4,2) + 2*Epsilon(1,2,3,-1)*P(-1,4)*P(4,2) - 2*Epsilon(1,2,3,-1)*P(-1,1)*P(4,3) - 2*Epsilon(1,2,3,-1)*P(-1,4)*P(4,3) + Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,2) + 2*Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,2) - Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(1,2) - 2*Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,2) + 2*Epsilon(2,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,3) + Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,3) - Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,3) - 2*Epsilon(2,4,-1,-2)*P(-2,4)*P(-1,3)*Metric(1,3) - 2*Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,4) + 2*Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,4) - 2*Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,4) + 2*Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,4)*Metric(1,4) - 2*Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(2,3) + 2*Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,3) - 2*Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(2,3) + 2*Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,3)*Metric(2,3) + 2*Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,2)*Metric(2,4) + Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,4) - Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,4) - 2*Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,4)*Metric(2,4) + 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*Metric(3,4) + Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,3)*Metric(3,4) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)*Metric(3,4) - Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,4)*Metric(3,4)')
+                structure = 'Epsilon(1,2,3,4)*P(-1,1)*P(-1,2) - Epsilon(1,2,3,4)*P(-1,1)*P(-1,3) - Epsilon(1,2,3,4)*P(-1,2)*P(-1,4) + Epsilon(1,2,3,4)*P(-1,3)*P(-1,4) + Epsilon(2,3,4,-1)*P(-1,1)*P(1,2) + Epsilon(2,3,4,-1)*P(-1,4)*P(1,2) - Epsilon(2,3,4,-1)*P(-1,1)*P(1,3) - Epsilon(2,3,4,-1)*P(-1,4)*P(1,3) + Epsilon(2,3,4,-1)*P(-1,2)*P(1,4) - Epsilon(2,3,4,-1)*P(-1,3)*P(1,4) - Epsilon(1,3,4,-1)*P(-1,2)*P(2,1) - Epsilon(1,3,4,-1)*P(-1,3)*P(2,1) - Epsilon(1,3,4,-1)*P(-1,1)*P(2,3) + Epsilon(1,3,4,-1)*P(-1,4)*P(2,3) + Epsilon(1,3,4,-1)*P(-1,2)*P(2,4) + Epsilon(1,3,4,-1)*P(-1,3)*P(2,4) - Epsilon(1,2,4,-1)*P(-1,2)*P(3,1) - Epsilon(1,2,4,-1)*P(-1,3)*P(3,1) - Epsilon(1,2,4,-1)*P(-1,1)*P(3,2) + Epsilon(1,2,4,-1)*P(-1,4)*P(3,2) + Epsilon(1,2,4,-1)*P(-1,2)*P(3,4) + Epsilon(1,2,4,-1)*P(-1,3)*P(3,4) + Epsilon(1,2,3,-1)*P(-1,2)*P(4,1) - Epsilon(1,2,3,-1)*P(-1,3)*P(4,1) + Epsilon(1,2,3,-1)*P(-1,1)*P(4,2) + Epsilon(1,2,3,-1)*P(-1,4)*P(4,2) - Epsilon(1,2,3,-1)*P(-1,1)*P(4,3) - Epsilon(1,2,3,-1)*P(-1,4)*P(4,3) + (Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,2))/2. + (Epsilon(2,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,3))/2. + (Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,4)*P(-1,3)*Metric(1,3))/2. + (Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,4)*Metric(1,3))/2. - (Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,2)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,3)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,4)*Metric(1,4))/2. + (Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,3)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,4)*Metric(2,3))/2. - (Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,1)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,2)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,3)*Metric(2,4))/2. - (Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,4))/2. - (Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,4)*Metric(2,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,3)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,4)*Metric(3,4))/2.')
 
 VVVV4 = Lorentz(name = 'VVVV4',
                 spins = [ 3, 3, 3, 3 ],
@@ -234,15 +218,15 @@
 
 VVVSS1 = Lorentz(name = 'VVVSS1',
                  spins = [ 3, 3, 3, 1, 1 ],
-                 structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,4) + 2*Epsilon(1,2,3,-1)*P(-1,5)')
+                 structure = '-(Epsilon(1,2,3,-1)*P(-1,1)) - Epsilon(1,2,3,-1)*P(-1,2) - Epsilon(1,2,3,-1)*P(-1,4) - Epsilon(1,2,3,-1)*P(-1,5)')
 
 VVVSS2 = Lorentz(name = 'VVVSS2',
                  spins = [ 3, 3, 3, 1, 1 ],
-                 structure = '2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3) + 2*Epsilon(1,2,3,-1)*P(-1,4) + 2*Epsilon(1,2,3,-1)*P(-1,5)')
+                 structure = '-(Epsilon(1,2,3,-1)*P(-1,1)) - 2*Epsilon(1,2,3,-1)*P(-1,4) - 2*Epsilon(1,2,3,-1)*P(-1,5)')
 
 VVVSS3 = Lorentz(name = 'VVVSS3',
                  spins = [ 3, 3, 3, 1, 1 ],
-                 structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3) + 6*Epsilon(1,2,3,-1)*P(-1,4) + 6*Epsilon(1,2,3,-1)*P(-1,5)')
+                 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) - 3*Epsilon(1,2,3,-1)*P(-1,4) - 3*Epsilon(1,2,3,-1)*P(-1,5)')
 
 VVVSS4 = Lorentz(name = 'VVVSS4',
                  spins = [ 3, 3, 3, 1, 1 ],
@@ -250,25 +234,37 @@
 
 VVVSS5 = Lorentz(name = 'VVVSS5',
                  spins = [ 3, 3, 3, 1, 1 ],
+                 structure = 'P(3,1)*Metric(1,2) - P(3,4)*Metric(1,2) - P(3,5)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,4)*Metric(1,3) + P(2,5)*Metric(1,3)')
+
+VVVSS6 = Lorentz(name = 'VVVSS6',
+                 spins = [ 3, 3, 3, 1, 1 ],
                  structure = 'P(2,3)*Metric(1,3) - P(1,3)*Metric(2,3)')
 
-VVVSS6 = Lorentz(name = 'VVVSS6',
+VVVSS7 = Lorentz(name = 'VVVSS7',
                  spins = [ 3, 3, 3, 1, 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)')
 
-VVVSS7 = Lorentz(name = 'VVVSS7',
-                 spins = [ 3, 3, 3, 1, 1 ],
-                 structure = 'P(3,2)*Metric(1,2) - P(3,4)*Metric(1,2) - P(3,5)*Metric(1,2) - P(2,3)*Metric(1,3) + P(2,4)*Metric(1,3) + P(2,5)*Metric(1,3) - P(1,2)*Metric(2,3) + P(1,3)*Metric(2,3)')
-
 VVVSS8 = Lorentz(name = 'VVVSS8',
                  spins = [ 3, 3, 3, 1, 1 ],
                  structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,4)*Metric(1,3) + P(2,5)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,4)*Metric(2,3) - P(1,5)*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,3)*Metric(2,4) - 2*Metric(1,2)*Metric(3,4)')
 
-VVVVS2 = Lorentz(name = 'VVVVS2',
+VVVVS3 = Lorentz(name = 'VVVVS3',
+                 spins = [ 3, 3, 3, 3, 1 ],
+                 structure = 'Metric(1,4)*Metric(2,3) - Metric(1,2)*Metric(3,4)')
+
+VVVVS4 = Lorentz(name = 'VVVVS4',
+                 spins = [ 3, 3, 3, 3, 1 ],
+                 structure = 'Metric(1,3)*Metric(2,4) - Metric(1,2)*Metric(3,4)')
+
+VVVVS5 = Lorentz(name = 'VVVVS5',
                  spins = [ 3, 3, 3, 3, 1 ],
                  structure = 'Metric(1,4)*Metric(2,3) - (Metric(1,3)*Metric(2,4))/2. - (Metric(1,2)*Metric(3,4))/2.')
 
@@ -282,12 +278,12 @@
 
 VVVVV3 = Lorentz(name = 'VVVVV3',
                  spins = [ 3, 3, 3, 3, 3 ],
+                 structure = 'Epsilon(2,3,4,5)*P(1,2) - Epsilon(2,3,4,5)*P(1,5) + Epsilon(1,3,4,5)*P(2,1) - Epsilon(1,3,4,5)*P(2,5) + Epsilon(1,2,3,4)*P(5,1) - Epsilon(1,2,3,4)*P(5,2) + Epsilon(3,4,5,-1)*P(-1,1)*Metric(1,2) + Epsilon(3,4,5,-1)*P(-1,2)*Metric(1,2) + Epsilon(3,4,5,-1)*P(-1,5)*Metric(1,2) + (Epsilon(2,4,5,-1)*P(-1,2)*Metric(1,3))/2. - (Epsilon(2,4,5,-1)*P(-1,5)*Metric(1,3))/2. - (Epsilon(2,3,5,-1)*P(-1,2)*Metric(1,4))/2. + (Epsilon(2,3,5,-1)*P(-1,5)*Metric(1,4))/2. + Epsilon(2,3,4,-1)*P(-1,1)*Metric(1,5) + Epsilon(2,3,4,-1)*P(-1,2)*Metric(1,5) + Epsilon(2,3,4,-1)*P(-1,5)*Metric(1,5) + (Epsilon(1,4,5,-1)*P(-1,1)*Metric(2,3))/2. - (Epsilon(1,4,5,-1)*P(-1,5)*Metric(2,3))/2. - (Epsilon(1,3,5,-1)*P(-1,1)*Metric(2,4))/2. + (Epsilon(1,3,5,-1)*P(-1,5)*Metric(2,4))/2. + Epsilon(1,3,4,-1)*P(-1,1)*Metric(2,5) + Epsilon(1,3,4,-1)*P(-1,2)*Metric(2,5) + Epsilon(1,3,4,-1)*P(-1,5)*Metric(2,5) - (Epsilon(1,2,4,-1)*P(-1,1)*Metric(3,5))/2. + (Epsilon(1,2,4,-1)*P(-1,2)*Metric(3,5))/2. + (Epsilon(1,2,3,-1)*P(-1,1)*Metric(4,5))/2. - (Epsilon(1,2,3,-1)*P(-1,2)*Metric(4,5))/2.')
+
+VVVVV4 = Lorentz(name = 'VVVVV4',
+                 spins = [ 3, 3, 3, 3, 3 ],
                  structure = '-(Epsilon(2,3,4,5)*P(1,3)) + Epsilon(2,3,4,5)*P(1,4) - Epsilon(1,3,4,5)*P(2,3) + Epsilon(1,3,4,5)*P(2,4) + Epsilon(1,2,4,5)*P(3,1) - Epsilon(1,2,4,5)*P(3,2) + Epsilon(1,2,3,5)*P(4,1) - Epsilon(1,2,3,5)*P(4,2) + Epsilon(3,4,5,-1)*P(-1,3)*Metric(1,2) - Epsilon(3,4,5,-1)*P(-1,4)*Metric(1,2) + Epsilon(2,4,5,-1)*P(-1,1)*Metric(1,3) + (Epsilon(2,4,5,-1)*P(-1,2)*Metric(1,3))/2. + Epsilon(2,4,5,-1)*P(-1,3)*Metric(1,3) + (Epsilon(2,4,5,-1)*P(-1,4)*Metric(1,3))/2. + Epsilon(2,3,5,-1)*P(-1,1)*Metric(1,4) + (Epsilon(2,3,5,-1)*P(-1,2)*Metric(1,4))/2. + (Epsilon(2,3,5,-1)*P(-1,3)*Metric(1,4))/2. + Epsilon(2,3,5,-1)*P(-1,4)*Metric(1,4) - (Epsilon(2,3,4,-1)*P(-1,3)*Metric(1,5))/2. + (Epsilon(2,3,4,-1)*P(-1,4)*Metric(1,5))/2. + (Epsilon(1,4,5,-1)*P(-1,1)*Metric(2,3))/2. + Epsilon(1,4,5,-1)*P(-1,2)*Metric(2,3) + Epsilon(1,4,5,-1)*P(-1,3)*Metric(2,3) + (Epsilon(1,4,5,-1)*P(-1,4)*Metric(2,3))/2. + (Epsilon(1,3,5,-1)*P(-1,1)*Metric(2,4))/2. + Epsilon(1,3,5,-1)*P(-1,2)*Metric(2,4) + (Epsilon(1,3,5,-1)*P(-1,3)*Metric(2,4))/2. + Epsilon(1,3,5,-1)*P(-1,4)*Metric(2,4) - (Epsilon(1,3,4,-1)*P(-1,3)*Metric(2,5))/2. + (Epsilon(1,3,4,-1)*P(-1,4)*Metric(2,5))/2. - Epsilon(1,2,5,-1)*P(-1,1)*Metric(3,4) + Epsilon(1,2,5,-1)*P(-1,2)*Metric(3,4) + (Epsilon(1,2,4,-1)*P(-1,1)*Metric(3,5))/2. - (Epsilon(1,2,4,-1)*P(-1,2)*Metric(3,5))/2. + (Epsilon(1,2,3,-1)*P(-1,1)*Metric(4,5))/2. - (Epsilon(1,2,3,-1)*P(-1,2)*Metric(4,5))/2.')
 
-VVVVV4 = Lorentz(name = 'VVVVV4',
-                 spins = [ 3, 3, 3, 3, 3 ],
-                 structure = 'Epsilon(2,3,4,5)*P(1,2) - Epsilon(2,3,4,5)*P(1,5) + Epsilon(1,3,4,5)*P(2,1) - Epsilon(1,3,4,5)*P(2,5) + Epsilon(1,2,3,4)*P(5,1) - Epsilon(1,2,3,4)*P(5,2) + Epsilon(3,4,5,-1)*P(-1,1)*Metric(1,2) + Epsilon(3,4,5,-1)*P(-1,2)*Metric(1,2) + Epsilon(3,4,5,-1)*P(-1,5)*Metric(1,2) + (Epsilon(2,4,5,-1)*P(-1,2)*Metric(1,3))/2. - (Epsilon(2,4,5,-1)*P(-1,5)*Metric(1,3))/2. - (Epsilon(2,3,5,-1)*P(-1,2)*Metric(1,4))/2. + (Epsilon(2,3,5,-1)*P(-1,5)*Metric(1,4))/2. + Epsilon(2,3,4,-1)*P(-1,1)*Metric(1,5) + Epsilon(2,3,4,-1)*P(-1,2)*Metric(1,5) + Epsilon(2,3,4,-1)*P(-1,5)*Metric(1,5) + (Epsilon(1,4,5,-1)*P(-1,1)*Metric(2,3))/2. - (Epsilon(1,4,5,-1)*P(-1,5)*Metric(2,3))/2. - (Epsilon(1,3,5,-1)*P(-1,1)*Metric(2,4))/2. + (Epsilon(1,3,5,-1)*P(-1,5)*Metric(2,4))/2. + Epsilon(1,3,4,-1)*P(-1,1)*Metric(2,5) + Epsilon(1,3,4,-1)*P(-1,2)*Metric(2,5) + Epsilon(1,3,4,-1)*P(-1,5)*Metric(2,5) - (Epsilon(1,2,4,-1)*P(-1,1)*Metric(3,5))/2. + (Epsilon(1,2,4,-1)*P(-1,2)*Metric(3,5))/2. + (Epsilon(1,2,3,-1)*P(-1,1)*Metric(4,5))/2. - (Epsilon(1,2,3,-1)*P(-1,2)*Metric(4,5))/2.')
-
 VVVVV5 = Lorentz(name = 'VVVVV5',
                  spins = [ 3, 3, 3, 3, 3 ],
                  structure = '-(Epsilon(1,3,4,5)*P(2,4)) + Epsilon(1,3,4,5)*P(2,5) - Epsilon(1,2,4,5)*P(3,4) + Epsilon(1,2,4,5)*P(3,5) + Epsilon(1,2,3,5)*P(4,2) - Epsilon(1,2,3,5)*P(4,3) + Epsilon(1,2,3,4)*P(5,2) - Epsilon(1,2,3,4)*P(5,3) + (Epsilon(3,4,5,-1)*P(-1,4)*Metric(1,2))/2. - (Epsilon(3,4,5,-1)*P(-1,5)*Metric(1,2))/2. + (Epsilon(2,4,5,-1)*P(-1,4)*Metric(1,3))/2. - (Epsilon(2,4,5,-1)*P(-1,5)*Metric(1,3))/2. - (Epsilon(2,3,5,-1)*P(-1,2)*Metric(1,4))/2. + (Epsilon(2,3,5,-1)*P(-1,3)*Metric(1,4))/2. - (Epsilon(2,3,4,-1)*P(-1,2)*Metric(1,5))/2. + (Epsilon(2,3,4,-1)*P(-1,3)*Metric(1,5))/2. - Epsilon(1,4,5,-1)*P(-1,4)*Metric(2,3) + Epsilon(1,4,5,-1)*P(-1,5)*Metric(2,3) - Epsilon(1,3,5,-1)*P(-1,2)*Metric(2,4) - (Epsilon(1,3,5,-1)*P(-1,3)*Metric(2,4))/2. - Epsilon(1,3,5,-1)*P(-1,4)*Metric(2,4) - (Epsilon(1,3,5,-1)*P(-1,5)*Metric(2,4))/2. - Epsilon(1,3,4,-1)*P(-1,2)*Metric(2,5) - (Epsilon(1,3,4,-1)*P(-1,3)*Metric(2,5))/2. - (Epsilon(1,3,4,-1)*P(-1,4)*Metric(2,5))/2. - Epsilon(1,3,4,-1)*P(-1,5)*Metric(2,5) - (Epsilon(1,2,5,-1)*P(-1,2)*Metric(3,4))/2. - Epsilon(1,2,5,-1)*P(-1,3)*Metric(3,4) - Epsilon(1,2,5,-1)*P(-1,4)*Metric(3,4) - (Epsilon(1,2,5,-1)*P(-1,5)*Metric(3,4))/2. - (Epsilon(1,2,4,-1)*P(-1,2)*Metric(3,5))/2. - Epsilon(1,2,4,-1)*P(-1,3)*Metric(3,5) - (Epsilon(1,2,4,-1)*P(-1,4)*Metric(3,5))/2. - Epsilon(1,2,4,-1)*P(-1,5)*Metric(3,5) + Epsilon(1,2,3,-1)*P(-1,2)*Metric(4,5) - Epsilon(1,2,3,-1)*P(-1,3)*Metric(4,5)')

=== modified file 'models/EWdim6/object_library.py'
--- models/EWdim6/object_library.py	2013-01-19 17:33:23 +0000
+++ models/EWdim6/object_library.py	2013-10-25 11:38:22 +0000
@@ -8,7 +8,11 @@
 ##
 
 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."""
@@ -60,20 +64,19 @@
 
 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']
+    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, goldstoneboson=False, **options):
+                 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))
+                antitexname, float(charge))
 
         UFOBaseClass.__init__(self, *args,  **options)
 
@@ -84,14 +87,17 @@
         self.goldstoneboson= goldstoneboson
 
         self.selfconjugate = (name == antiname)
-        if 1: #not line:
+        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
@@ -122,7 +128,7 @@
             return 'dotted'
         else:
             return 'dashed' # not supported yet
-
+        
     def anti(self):
         if self.selfconjugate:
             raise Exception('%s has no anti particle.' % self.name) 
@@ -162,6 +168,37 @@
         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):
@@ -179,20 +216,76 @@
         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 = []
 
@@ -240,6 +333,7 @@
         self.name = name
         self.expansion_order = expansion_order
         self.hierarchy = hierarchy
+        self.perturbative_expansion = perturbative_expansion
 
 all_decays = []
 
@@ -269,3 +363,15 @@
         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)

=== modified file 'models/EWdim6/parameters.py'
--- models/EWdim6/parameters.py	2013-01-23 01:06:16 +0000
+++ models/EWdim6/parameters.py	2013-10-25 11:38:22 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.127
+# This file was automatically created by FeynRules 2.1.0
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Tue 22 Jan 2013 16:20:54
+# Date: Tue 15 Oct 2013 22:07:41
 
 
 
@@ -57,6 +57,30 @@
                   lhablock = 'DIM6',
                   lhacode = [ 5 ])
 
+CphidL2 = Parameter(name = 'CphidL2',
+                    nature = 'external',
+                    type = 'real',
+                    value = 1,
+                    texname = '\\frac{C_{\\text{$\\phi $d}}}{\\Lambda ^2}',
+                    lhablock = 'DIM6',
+                    lhacode = [ 6 ])
+
+CphiWL2 = Parameter(name = 'CphiWL2',
+                    nature = 'external',
+                    type = 'real',
+                    value = 1,
+                    texname = '\\frac{C_{\\text{$\\phi $W}}}{\\Lambda ^2}',
+                    lhablock = 'DIM6',
+                    lhacode = [ 7 ])
+
+CphiBL2 = Parameter(name = 'CphiBL2',
+                    nature = 'external',
+                    type = 'real',
+                    value = 1,
+                    texname = '\\frac{C_{\\text{$\\phi $B}}}{\\Lambda ^2}',
+                    lhablock = 'DIM6',
+                    lhacode = [ 8 ])
+
 aEWM1 = Parameter(name = 'aEWM1',
                   nature = 'external',
                   type = 'real',
@@ -77,7 +101,7 @@
                nature = 'external',
                type = 'real',
                value = 0.1184,
-               texname = '\\text{aS}',
+               texname = '\\alpha _s',
                lhablock = 'SMINPUTS',
                lhacode = [ 3 ])
 
@@ -113,6 +137,14 @@
                   lhablock = 'Wolfenstein',
                   lhacode = [ 4 ])
 
+ymc = Parameter(name = 'ymc',
+                nature = 'external',
+                type = 'real',
+                value = 1.27,
+                texname = '\\text{ymc}',
+                lhablock = 'YUKAWA',
+                lhacode = [ 4 ])
+
 ymb = Parameter(name = 'ymb',
                 nature = 'external',
                 type = 'real',
@@ -124,11 +156,19 @@
 ymt = Parameter(name = 'ymt',
                 nature = 'external',
                 type = 'real',
-                value = 172.,
+                value = 172,
                 texname = '\\text{ymt}',
                 lhablock = 'YUKAWA',
                 lhacode = [ 6 ])
 
+ymm = Parameter(name = 'ymm',
+                nature = 'external',
+                type = 'real',
+                value = 0.10566,
+                texname = '\\text{ymm}',
+                lhablock = 'YUKAWA',
+                lhacode = [ 13 ])
+
 ymtau = Parameter(name = 'ymtau',
                   nature = 'external',
                   type = 'real',
@@ -137,6 +177,22 @@
                   lhablock = 'YUKAWA',
                   lhacode = [ 15 ])
 
+MZ = Parameter(name = 'MZ',
+               nature = 'external',
+               type = 'real',
+               value = 91.1876,
+               texname = '\\text{MZ}',
+               lhablock = 'MASS',
+               lhacode = [ 23 ])
+
+MC = Parameter(name = 'MC',
+               nature = 'external',
+               type = 'real',
+               value = 1.27,
+               texname = '\\text{MC}',
+               lhablock = 'MASS',
+               lhacode = [ 4 ])
+
 MT = Parameter(name = 'MT',
                nature = 'external',
                type = 'real',
@@ -153,14 +209,6 @@
                lhablock = 'MASS',
                lhacode = [ 5 ])
 
-MZ = Parameter(name = 'MZ',
-               nature = 'external',
-               type = 'real',
-               value = 91.1876,
-               texname = '\\text{MZ}',
-               lhablock = 'MASS',
-               lhacode = [ 23 ])
-
 MH = Parameter(name = 'MH',
                nature = 'external',
                type = 'real',
@@ -169,6 +217,14 @@
                lhablock = 'MASS',
                lhacode = [ 25 ])
 
+MM = Parameter(name = 'MM',
+               nature = 'external',
+               type = 'real',
+               value = 0.10566,
+               texname = '\\text{MM}',
+               lhablock = 'MASS',
+               lhacode = [ 13 ])
+
 MTA = Parameter(name = 'MTA',
                 nature = 'external',
                 type = 'real',
@@ -177,13 +233,13 @@
                 lhablock = 'MASS',
                 lhacode = [ 15 ])
 
-WT = Parameter(name = 'WT',
+MP = Parameter(name = 'MP',
                nature = 'external',
                type = 'real',
-               value = 1.50833649,
-               texname = '\\text{WT}',
-               lhablock = 'DECAY',
-               lhacode = [ 6 ])
+               value = 120,
+               texname = '\\text{MP}',
+               lhablock = 'MASS',
+               lhacode = [ 9000006 ])
 
 WZ = Parameter(name = 'WZ',
                nature = 'external',
@@ -201,6 +257,14 @@
                lhablock = 'DECAY',
                lhacode = [ 24 ])
 
+WT = Parameter(name = 'WT',
+               nature = 'external',
+               type = 'real',
+               value = 1.50833649,
+               texname = '\\text{WT}',
+               lhablock = 'DECAY',
+               lhacode = [ 6 ])
+
 WH = Parameter(name = 'WH',
                nature = 'external',
                type = 'real',
@@ -217,6 +281,14 @@
                  lhablock = 'DECAY',
                  lhacode = [ 15 ])
 
+WH1 = Parameter(name = 'WH1',
+                nature = 'external',
+                type = 'real',
+                value = 0.00575308848,
+                texname = '\\text{WH1}',
+                lhablock = 'DECAY',
+                lhacode = [ 9000006 ])
+
 CKM1x1 = Parameter(name = 'CKM1x1',
                    nature = 'internal',
                    type = 'complex',
@@ -275,7 +347,7 @@
                 nature = 'internal',
                 type = 'real',
                 value = '1/aEWM1',
-                texname = '\\text{aEW}')
+                texname = '\\alpha _{\\text{EW}}')
 
 G = Parameter(name = 'G',
               nature = 'internal',
@@ -283,6 +355,12 @@
               value = '2*cmath.sqrt(aS)*cmath.sqrt(cmath.pi)',
               texname = 'G')
 
+vev = Parameter(name = 'vev',
+                nature = 'internal',
+                type = 'real',
+                value = 'cmath.sqrt(1/Gf)/2**0.25',
+                texname = '\\text{vev}')
+
 MW = Parameter(name = 'MW',
                nature = 'internal',
                type = 'real',
@@ -295,12 +373,72 @@
                value = '2*cmath.sqrt(aEW)*cmath.sqrt(cmath.pi)',
                texname = 'e')
 
+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*vev)',
+               texname = 'G_H')
+
+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*vev)',
+                 texname = 'G_h')
+
+lam = Parameter(name = 'lam',
+                nature = 'internal',
+                type = 'real',
+                value = '(4*MH**2 - (CphidL2*MH**2*vev**2)/250000.)/(8.*vev**2*(1 - (3*CphidL2*vev**2)/1.e6 + (CphidL2**2*vev**4)/5.e11))',
+                texname = '\\text{lam}')
+
+yb = Parameter(name = 'yb',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymb*cmath.sqrt(2))/vev',
+               texname = '\\text{yb}')
+
+yc = Parameter(name = 'yc',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymc*cmath.sqrt(2))/vev',
+               texname = '\\text{yc}')
+
+ym = Parameter(name = 'ym',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymm*cmath.sqrt(2))/vev',
+               texname = '\\text{ym}')
+
+yt = Parameter(name = 'yt',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymt*cmath.sqrt(2))/vev',
+               texname = '\\text{yt}')
+
+ytau = Parameter(name = 'ytau',
+                 nature = 'internal',
+                 type = 'real',
+                 value = '(ymtau*cmath.sqrt(2))/vev',
+                 texname = '\\text{ytau}')
+
+muH = Parameter(name = 'muH',
+                nature = 'internal',
+                type = 'real',
+                value = 'cmath.sqrt((-4*lam*vev**2 + (CphidL2*lam*vev**4)/250000.)/(-1 + (CphidL2*vev**2)/1.e6))/2.',
+                texname = '\\mu')
+
 sw2 = Parameter(name = 'sw2',
                 nature = 'internal',
                 type = 'real',
                 value = '1 - MW**2/MZ**2',
                 texname = '\\text{sw2}')
 
+AH = Parameter(name = 'AH',
+               nature = 'internal',
+               type = 'real',
+               value = '(47*ee**2*(1 - (2*MH**4)/(987.*MT**4) - (14*MH**2)/(705.*MT**2) + (213*MH**12)/(2.634632e7*MW**12) + (5*MH**10)/(119756.*MW**10) + (41*MH**8)/(180950.*MW**8) + (87*MH**6)/(65800.*MW**6) + (57*MH**4)/(6580.*MW**4) + (33*MH**2)/(470.*MW**2)))/(72.*cmath.pi**2*vev)',
+               texname = 'A_H')
+
 cw = Parameter(name = 'cw',
                nature = 'internal',
                type = 'real',
@@ -325,39 +463,3 @@
                value = 'ee/sw',
                texname = 'g_w')
 
-v = Parameter(name = 'v',
-              nature = 'internal',
-              type = 'real',
-              value = '(2*MW*sw)/ee',
-              texname = 'v')
-
-lam = Parameter(name = 'lam',
-                nature = 'internal',
-                type = 'real',
-                value = 'MH**2/(2.*v**2)',
-                texname = '\\text{lam}')
-
-yb = Parameter(name = 'yb',
-               nature = 'internal',
-               type = 'real',
-               value = '(ymb*cmath.sqrt(2))/v',
-               texname = '\\text{yb}')
-
-yt = Parameter(name = 'yt',
-               nature = 'internal',
-               type = 'real',
-               value = '(ymt*cmath.sqrt(2))/v',
-               texname = '\\text{yt}')
-
-ytau = Parameter(name = 'ytau',
-                 nature = 'internal',
-                 type = 'real',
-                 value = '(ymtau*cmath.sqrt(2))/v',
-                 texname = '\\text{ytau}')
-
-muH = Parameter(name = 'muH',
-                nature = 'internal',
-                type = 'real',
-                value = 'cmath.sqrt(lam*v**2)',
-                texname = '\\mu')
-

=== modified file 'models/EWdim6/particles.py'
--- models/EWdim6/particles.py	2013-01-23 01:06:16 +0000
+++ models/EWdim6/particles.py	2013-10-25 11:38:22 +0000
@@ -1,12 +1,152 @@
-# This file was automatically created by FeynRules 1.7.127
+# This file was automatically created by FeynRules 2.1.0
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Tue 22 Jan 2013 16:20:54
+# Date: Tue 15 Oct 2013 22:07:41
 
 
 from __future__ import division
 from object_library import all_particles, Particle
 import parameters as Param
 
+import propagators as Prop
+
+a = Particle(pdg_code = 22,
+             name = 'a',
+             antiname = 'a',
+             spin = 3,
+             color = 1,
+             mass = Param.ZERO,
+             width = Param.ZERO,
+             texname = 'a',
+             antitexname = 'a',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0,
+             Y = 0)
+
+Z = Particle(pdg_code = 23,
+             name = 'Z',
+             antiname = 'Z',
+             spin = 3,
+             color = 1,
+             mass = Param.MZ,
+             width = Param.WZ,
+             texname = 'Z',
+             antitexname = 'Z',
+             charge = 0,
+             GhostNumber = 0,
+             LeptonNumber = 0,
+             Y = 0)
+
+W__plus__ = Particle(pdg_code = 24,
+                     name = 'W+',
+                     antiname = 'W-',
+                     spin = 3,
+                     color = 1,
+                     mass = Param.MW,
+                     width = Param.WW,
+                     texname = 'W+',
+                     antitexname = 'W-',
+                     charge = 1,
+                     GhostNumber = 0,
+                     LeptonNumber = 0,
+                     Y = 0)
+
+W__minus__ = W__plus__.anti()
+
+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,
+             Y = 0)
+
+ghA = Particle(pdg_code = 9000001,
+               name = 'ghA',
+               antiname = 'ghA~',
+               spin = -1,
+               color = 1,
+               mass = Param.ZERO,
+               width = Param.ZERO,
+               texname = 'ghA',
+               antitexname = 'ghA~',
+               charge = 0,
+               GhostNumber = 1,
+               LeptonNumber = 0,
+               Y = 0)
+
+ghA__tilde__ = ghA.anti()
+
+ghZ = Particle(pdg_code = 9000002,
+               name = 'ghZ',
+               antiname = 'ghZ~',
+               spin = -1,
+               color = 1,
+               mass = Param.MZ,
+               width = Param.ZERO,
+               texname = 'ghZ',
+               antitexname = 'ghZ~',
+               charge = 0,
+               GhostNumber = 1,
+               LeptonNumber = 0,
+               Y = 0)
+
+ghZ__tilde__ = ghZ.anti()
+
+ghWp = Particle(pdg_code = 9000003,
+                name = 'ghWp',
+                antiname = 'ghWp~',
+                spin = -1,
+                color = 1,
+                mass = Param.MW,
+                width = Param.ZERO,
+                texname = 'ghWp',
+                antitexname = 'ghWp~',
+                charge = 1,
+                GhostNumber = 1,
+                LeptonNumber = 0,
+                Y = 0)
+
+ghWp__tilde__ = ghWp.anti()
+
+ghWm = Particle(pdg_code = 9000004,
+                name = 'ghWm',
+                antiname = 'ghWm~',
+                spin = -1,
+                color = 1,
+                mass = Param.MW,
+                width = Param.ZERO,
+                texname = 'ghWm',
+                antitexname = 'ghWm~',
+                charge = -1,
+                GhostNumber = 1,
+                LeptonNumber = 0,
+                Y = 0)
+
+ghWm__tilde__ = ghWm.anti()
+
+ghG = Particle(pdg_code = 9000005,
+               name = 'ghG',
+               antiname = 'ghG~',
+               spin = -1,
+               color = 8,
+               mass = Param.ZERO,
+               width = Param.ZERO,
+               texname = 'ghG',
+               antitexname = 'ghG~',
+               charge = 0,
+               GhostNumber = 1,
+               LeptonNumber = 0,
+               Y = 0)
+
+ghG__tilde__ = ghG.anti()
+
 ve = Particle(pdg_code = 12,
               name = 've',
               antiname = 've~',
@@ -18,7 +158,8 @@
               antitexname = 've~',
               charge = 0,
               GhostNumber = 0,
-              LeptonNumber = 1)
+              LeptonNumber = 1,
+              Y = 0)
 
 ve__tilde__ = ve.anti()
 
@@ -33,7 +174,8 @@
               antitexname = 'vm~',
               charge = 0,
               GhostNumber = 0,
-              LeptonNumber = 1)
+              LeptonNumber = 1,
+              Y = 0)
 
 vm__tilde__ = vm.anti()
 
@@ -48,7 +190,8 @@
               antitexname = 'vt~',
               charge = 0,
               GhostNumber = 0,
-              LeptonNumber = 1)
+              LeptonNumber = 1,
+              Y = 0)
 
 vt__tilde__ = vt.anti()
 
@@ -63,7 +206,8 @@
              antitexname = 'u~',
              charge = 2/3,
              GhostNumber = 0,
-             LeptonNumber = 0)
+             LeptonNumber = 0,
+             Y = 0)
 
 u__tilde__ = u.anti()
 
@@ -72,13 +216,14 @@
              antiname = 'c~',
              spin = 2,
              color = 3,
-             mass = Param.ZERO,
+             mass = Param.MC,
              width = Param.ZERO,
              texname = 'c',
              antitexname = 'c~',
              charge = 2/3,
              GhostNumber = 0,
-             LeptonNumber = 0)
+             LeptonNumber = 0,
+             Y = 0)
 
 c__tilde__ = c.anti()
 
@@ -93,7 +238,8 @@
              antitexname = 't~',
              charge = 2/3,
              GhostNumber = 0,
-             LeptonNumber = 0)
+             LeptonNumber = 0,
+             Y = 0)
 
 t__tilde__ = t.anti()
 
@@ -108,7 +254,8 @@
              antitexname = 'd~',
              charge = -1/3,
              GhostNumber = 0,
-             LeptonNumber = 0)
+             LeptonNumber = 0,
+             Y = 0)
 
 d__tilde__ = d.anti()
 
@@ -123,7 +270,8 @@
              antitexname = 's~',
              charge = -1/3,
              GhostNumber = 0,
-             LeptonNumber = 0)
+             LeptonNumber = 0,
+             Y = 0)
 
 s__tilde__ = s.anti()
 
@@ -138,139 +286,11 @@
              antitexname = 'b~',
              charge = -1/3,
              GhostNumber = 0,
-             LeptonNumber = 0)
+             LeptonNumber = 0,
+             Y = 0)
 
 b__tilde__ = b.anti()
 
-ghA = Particle(pdg_code = 9000001,
-               name = 'ghA',
-               antiname = 'ghA~',
-               spin = -1,
-               color = 1,
-               mass = Param.ZERO,
-               width = Param.ZERO,
-               texname = 'ghA',
-               antitexname = 'ghA~',
-               charge = 0,
-               GhostNumber = 1,
-               LeptonNumber = 0)
-
-ghA__tilde__ = ghA.anti()
-
-ghZ = Particle(pdg_code = 9000002,
-               name = 'ghZ',
-               antiname = 'ghZ~',
-               spin = -1,
-               color = 1,
-               mass = Param.MZ,
-               width = Param.WZ,
-               texname = 'ghZ',
-               antitexname = 'ghZ~',
-               charge = 0,
-               GhostNumber = 1,
-               LeptonNumber = 0)
-
-ghZ__tilde__ = ghZ.anti()
-
-ghWp = Particle(pdg_code = 9000003,
-                name = 'ghWp',
-                antiname = 'ghWp~',
-                spin = -1,
-                color = 1,
-                mass = Param.MW,
-                width = Param.WW,
-                texname = 'ghWp',
-                antitexname = 'ghWp~',
-                charge = 1,
-                GhostNumber = 1,
-                LeptonNumber = 0)
-
-ghWp__tilde__ = ghWp.anti()
-
-ghWm = Particle(pdg_code = 9000004,
-                name = 'ghWm',
-                antiname = 'ghWm~',
-                spin = -1,
-                color = 1,
-                mass = Param.MW,
-                width = Param.WW,
-                texname = 'ghWm',
-                antitexname = 'ghWm~',
-                charge = -1,
-                GhostNumber = 1,
-                LeptonNumber = 0)
-
-ghWm__tilde__ = ghWm.anti()
-
-ghG = Particle(pdg_code = 9000005,
-               name = 'ghG',
-               antiname = 'ghG~',
-               spin = -1,
-               color = 8,
-               mass = Param.ZERO,
-               width = Param.ZERO,
-               texname = 'ghG',
-               antitexname = 'ghG~',
-               charge = 0,
-               GhostNumber = 1,
-               LeptonNumber = 0)
-
-ghG__tilde__ = ghG.anti()
-
-A = Particle(pdg_code = 22,
-             name = 'A',
-             antiname = 'A',
-             spin = 3,
-             color = 1,
-             mass = Param.ZERO,
-             width = Param.ZERO,
-             texname = 'A',
-             antitexname = 'A',
-             charge = 0,
-             GhostNumber = 0,
-             LeptonNumber = 0)
-
-Z = Particle(pdg_code = 23,
-             name = 'Z',
-             antiname = 'Z',
-             spin = 3,
-             color = 1,
-             mass = Param.MZ,
-             width = Param.WZ,
-             texname = 'Z',
-             antitexname = 'Z',
-             charge = 0,
-             GhostNumber = 0,
-             LeptonNumber = 0)
-
-W__plus__ = Particle(pdg_code = 24,
-                     name = 'W+',
-                     antiname = 'W-',
-                     spin = 3,
-                     color = 1,
-                     mass = Param.MW,
-                     width = Param.WW,
-                     texname = 'W+',
-                     antitexname = 'W-',
-                     charge = 1,
-                     GhostNumber = 0,
-                     LeptonNumber = 0)
-
-W__minus__ = W__plus__.anti()
-
-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',
@@ -278,41 +298,44 @@
              color = 1,
              mass = Param.MH,
              width = Param.WH,
-             texname = '\\phi',
-             antitexname = '\\phi',
+             texname = 'H',
+             antitexname = 'H',
              charge = 0,
              GhostNumber = 0,
-             LeptonNumber = 0)
-
-phi0 = Particle(pdg_code = 250,
-                name = 'phi0',
-                antiname = 'phi0',
-                spin = 1,
-                color = 1,
-                mass = Param.MZ,
-                width = Param.ZERO,
-                texname = 'phi0',
-                antitexname = 'phi0',
-                GoldstoneBoson = True,
-                charge = 0,
-                GhostNumber = 0,
-                LeptonNumber = 0)
-
-phi__plus__ = Particle(pdg_code = 251,
-                       name = 'phi+',
-                       antiname = 'phi-',
-                       spin = 1,
-                       color = 1,
-                       mass = Param.MW,
-                       width = Param.ZERO,
-                       texname = '\\phi^+',
-                       antitexname = '\\phi^-',
-                       GoldstoneBoson = True,
-                       charge = 1,
-                       GhostNumber = 0,
-                       LeptonNumber = 0)
-
-phi__minus__ = phi__plus__.anti()
+             LeptonNumber = 0,
+             Y = 0)
+
+G0 = Particle(pdg_code = 250,
+              name = 'G0',
+              antiname = 'G0',
+              spin = 1,
+              color = 1,
+              mass = Param.MZ,
+              width = Param.ZERO,
+              texname = 'G0',
+              antitexname = 'G0',
+              goldstone = True,
+              charge = 0,
+              GhostNumber = 0,
+              LeptonNumber = 0,
+              Y = 0)
+
+G__plus__ = Particle(pdg_code = 251,
+                     name = 'G+',
+                     antiname = 'G-',
+                     spin = 1,
+                     color = 1,
+                     mass = Param.MW,
+                     width = Param.ZERO,
+                     texname = 'G+',
+                     antitexname = 'G-',
+                     goldstone = True,
+                     charge = 1,
+                     GhostNumber = 0,
+                     LeptonNumber = 0,
+                     Y = 0)
+
+G__minus__ = G__plus__.anti()
 
 e__minus__ = Particle(pdg_code = 11,
                       name = 'e-',
@@ -325,37 +348,54 @@
                       antitexname = 'e+',
                       charge = -1,
                       GhostNumber = 0,
-                      LeptonNumber = 1)
+                      LeptonNumber = 1,
+                      Y = 0)
 
 e__plus__ = e__minus__.anti()
 
-m__minus__ = Particle(pdg_code = 13,
-                      name = 'm-',
-                      antiname = 'm+',
-                      spin = 2,
-                      color = 1,
-                      mass = Param.ZERO,
-                      width = Param.ZERO,
-                      texname = 'm-',
-                      antitexname = 'm+',
-                      charge = -1,
-                      GhostNumber = 0,
-                      LeptonNumber = 1)
-
-m__plus__ = m__minus__.anti()
-
-tt__minus__ = Particle(pdg_code = 15,
-                       name = 'tt-',
-                       antiname = 'tt+',
+mu__minus__ = Particle(pdg_code = 13,
+                       name = 'mu-',
+                       antiname = 'mu+',
+                       spin = 2,
+                       color = 1,
+                       mass = Param.MM,
+                       width = Param.ZERO,
+                       texname = 'mu-',
+                       antitexname = 'mu+',
+                       charge = -1,
+                       GhostNumber = 0,
+                       LeptonNumber = 1,
+                       Y = 0)
+
+mu__plus__ = mu__minus__.anti()
+
+ta__minus__ = Particle(pdg_code = 15,
+                       name = 'ta-',
+                       antiname = 'ta+',
                        spin = 2,
                        color = 1,
                        mass = Param.MTA,
                        width = Param.WTau,
-                       texname = 'tt-',
-                       antitexname = 'tt+',
+                       texname = 'ta-',
+                       antitexname = 'ta+',
                        charge = -1,
                        GhostNumber = 0,
-                       LeptonNumber = 1)
-
-tt__plus__ = tt__minus__.anti()
+                       LeptonNumber = 1,
+                       Y = 0)
+
+ta__plus__ = ta__minus__.anti()
+
+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,
+              Y = 0)
 

=== added file 'models/EWdim6/propagators.py'
--- models/EWdim6/propagators.py	1970-01-01 00:00:00 +0000
+++ models/EWdim6/propagators.py	2013-10-25 11:38:22 +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/EWdim6/restrict_default.dat'
--- models/EWdim6/restrict_default.dat	1970-01-01 00:00:00 +0000
+++ models/EWdim6/restrict_default.dat	2013-10-25 11:38:22 +0000
@@ -0,0 +1,90 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY MG5                       ####
+######################################################################
+###################################
+## INFORMATION FOR DIM6
+###################################
+BLOCK DIM6 # 
+      1 9.999999e-01 #  cwwwl2
+      2 9.999999e-01 #  cwl2
+      3 9.999999e-01 #  cbl2
+      4 9.999999e-01 #  cpwwwl2
+      5 9.999999e-01 #  cpwl2
+      6 0.000000e+00 #  cphidl2
+      7 0.000000e+00 #  cphiwl2
+      8 0.000000e+00 #  cphibl2
+###################################
+## INFORMATION FOR MASS
+###################################
+BLOCK MASS # 
+      4 0.000000e+00 #  mc
+      5 4.700000e+00 #  mb
+      6 1.720000e+02 #  mt
+      13 0.000000e+00 #  mm
+      15 1.777000e+00 #  mta
+      23 9.118760e+01 #  mz
+      25 1.200000e+02 #  mh
+      9000006 1.200120e+02 #  mp
+      1 1.000000e-105 #  d : 0.0
+      2 1.000000e-105 #  u : 0.0
+      3 1.000000e-105 #  s : 0.0
+      11 1.000000e-105 #  e- : 0.0
+      12 1.000000e-105 #  ve : 0.0
+      14 1.000000e-105 #  vm : 0.0
+      16 1.000000e-105 #  vt : 0.0
+      21 1.000000e-105 #  g : 0.0
+      22 1.000000e-105 #  a : 0.0
+      24 7.982436e+01 #  w+ : cmath.sqrt(mz__exp__2/2. + cmath.sqrt(mz__exp__4/4. - (aew*cmath.pi*mz__exp__2)/(gf*sqrt__2)))
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+BLOCK SMINPUTS # 
+      1 1.279000e+02 #  aewm1
+      2 1.166370e-05 #  gf
+      3 1.184000e-01 #  as
+###################################
+## INFORMATION FOR WOLFENSTEIN
+###################################
+BLOCK WOLFENSTEIN # 
+      1 0.000000e+00 #  lamws
+      2 0.000000e+00 #  aws
+      3 0.000000e+00 #  rhows
+      4 0.000000e+00 #  etaws
+###################################
+## INFORMATION FOR YUKAWA
+###################################
+BLOCK YUKAWA # 
+      4 0.000000e+00 #  ymc
+      5 4.700000e+00 #  ymb
+      6 1.720000e+02 #  ymt
+      13 0.000000e+00 #  ymm
+      15 1.777000e+00 #  ymtau
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY 6 1.508336e+00 #  wt
+DECAY 15 2.270000e-12 #  wtau
+DECAY 23 2.495200e+00 #  wz
+DECAY 24 2.085000e+00 #  ww
+DECAY 25 5.753088e-03 #  wh
+DECAY 9000006 5.753663e-03 #  wh1
+DECAY 1 1.000000e-105 #  d : 0.0
+DECAY 2 1.000000e-105 #  u : 0.0
+DECAY 3 1.000000e-105 #  s : 0.0
+DECAY 4 1.000000e-105 #  c : 0.0
+DECAY 5 1.000000e-105 #  b : 0.0
+DECAY 11 1.000000e-105 #  e- : 0.0
+DECAY 12 1.000000e-105 #  ve : 0.0
+DECAY 13 1.000000e-105 #  mu- : 0.0
+DECAY 14 1.000000e-105 #  vm : 0.0
+DECAY 16 1.000000e-105 #  vt : 0.0
+DECAY 21 1.000000e-105 #  g : 0.0
+DECAY 22 1.000000e-105 #  a : 0.0
+###################################
+## INFORMATION FOR QNUMBERS 9000006
+###################################
+BLOCK QNUMBERS 9000006 #  h1
+      1 0 #  3 times electric charge
+      2 0 #  number of spin states (2s+1)
+      3 0 #  colour rep (1: singlet, 3: triplet, 8: octet)
+      4 0 #  particle/antiparticle distinction (0=own anti)

=== modified file 'models/EWdim6/vertices.py'
--- models/EWdim6/vertices.py	2013-01-23 01:06:16 +0000
+++ models/EWdim6/vertices.py	2013-10-25 11:38:22 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.127
+# This file was automatically created by FeynRules 2.1.0
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Tue 22 Jan 2013 16:20:54
+# Date: Tue 15 Oct 2013 22:07:41
 
 
 from object_library import all_vertices, Vertex
@@ -12,576 +12,606 @@
 V_1 = Vertex(name = 'V_1',
              particles = [ P.H, P.H, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.SSSS1 ],
-             couplings = {(0,0):C.GC_31})
+             lorentz = [ L.SSSS1, L.SSSS2 ],
+             couplings = {(0,0):[ C.GC_16, C.GC_107 ],(0,1):C.GC_2})
 
 V_2 = Vertex(name = 'V_2',
              particles = [ P.H, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.SSS1 ],
-             couplings = {(0,0):C.GC_95})
+             lorentz = [ L.SSS1, L.SSS2 ],
+             couplings = {(0,0):[ C.GC_89, C.GC_116 ],(0,1):C.GC_88})
 
 V_3 = Vertex(name = 'V_3',
-             particles = [ P.A, P.A, P.H, P.H ],
+             particles = [ P.a, P.a, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VVSS3, L.VVSS9 ],
-             couplings = {(0,1):C.GC_83,(0,0):C.GC_82})
+             lorentz = [ L.VVS4 ],
+             couplings = {(0,0):[ C.GC_1, C.GC_118, C.GC_103 ]})
 
 V_4 = Vertex(name = 'V_4',
-             particles = [ P.A, P.A, P.H ],
+             particles = [ P.a, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VVS4, L.VVS9 ],
-             couplings = {(0,1):C.GC_123,(0,0):C.GC_122})
+             lorentz = [ L.VSS1 ],
+             couplings = {(0,0):C.GC_7})
 
 V_5 = Vertex(name = 'V_5',
-             particles = [ P.A, P.H, P.H ],
+             particles = [ P.a, P.a, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VSS1 ],
-             couplings = {(0,0):C.GC_48})
+             lorentz = [ L.VVSS5 ],
+             couplings = {(0,0):C.GC_9})
 
 V_6 = Vertex(name = 'V_6',
-             particles = [ P.A, P.W__minus__, P.W__plus__ ],
-             color = [ '1' ],
-             lorentz = [ L.VVV10, L.VVV2, L.VVV3, L.VVV4, L.VVV7, L.VVV8, L.VVV9 ],
-             couplings = {(0,2):C.GC_113,(0,1):C.GC_105,(0,6):C.GC_57,(0,0):C.GC_55,(0,4):[ C.GC_47, C.GC_114 ],(0,3):C.GC_104,(0,5):C.GC_106})
+             particles = [ P.g, P.g, P.H ],
+             color = [ 'Identity(1,2)' ],
+             lorentz = [ L.VVS4 ],
+             couplings = {(0,0):[ C.GC_13, C.GC_104 ]})
 
 V_7 = Vertex(name = 'V_7',
-             particles = [ P.A, P.Z, P.H, P.H ],
+             particles = [ P.a, P.W__minus__, P.W__plus__ ],
              color = [ '1' ],
-             lorentz = [ L.VVSS1, L.VVSS2, L.VVSS3, L.VVSS7, L.VVSS8, L.VVSS9 ],
-             couplings = {(0,3):C.GC_81,(0,5):C.GC_76,(0,4):C.GC_80,(0,2):C.GC_50,(0,0):C.GC_65,(0,1):C.GC_9})
+             lorentz = [ L.VVV1, L.VVV4, L.VVV7, L.VVV8, L.VVV9 ],
+             couplings = {(0,0):C.GC_112,(0,4):C.GC_53,(0,3):C.GC_55,(0,2):C.GC_6,(0,1):C.GC_130})
 
 V_8 = Vertex(name = 'V_8',
-             particles = [ P.A, P.Z, P.H ],
+             particles = [ P.W__minus__, P.W__plus__, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VVS1, L.VVS3, L.VVS4, L.VVS7, L.VVS8, L.VVS9 ],
-             couplings = {(0,3):C.GC_121,(0,5):C.GC_116,(0,4):C.GC_120,(0,2):C.GC_97,(0,0):C.GC_103,(0,1):C.GC_86})
+             lorentz = [ L.VVSS3, L.VVSS4, L.VVSS5, L.VVSS7 ],
+             couplings = {(0,2):C.GC_46,(0,0):C.GC_47,(0,3):C.GC_49,(0,1):[ C.GC_44, C.GC_111 ]})
 
 V_9 = Vertex(name = 'V_9',
-             particles = [ P.Z, P.H, P.H ],
+             particles = [ P.W__minus__, P.W__plus__, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VSS1 ],
-             couplings = {(0,0):C.GC_8})
+             lorentz = [ L.VVS2, L.VVS3, L.VVS4, L.VVS6 ],
+             couplings = {(0,2):C.GC_92,(0,0):C.GC_93,(0,3):C.GC_94,(0,1):[ C.GC_91, C.GC_117 ]})
 
 V_10 = Vertex(name = 'V_10',
               particles = [ P.W__minus__, P.W__plus__, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.VVV1, L.VVV10, L.VVV3, L.VVV5, L.VVV6, L.VVV7, L.VVV9 ],
-              couplings = {(0,2):C.GC_107,(0,0):C.GC_111,(0,6):C.GC_20,(0,1):C.GC_18,(0,5):[ C.GC_7, C.GC_108 ],(0,3):C.GC_112,(0,4):C.GC_110})
+              lorentz = [ L.VVV2, L.VVV3, L.VVV5, L.VVV6, L.VVV7, L.VVV8, L.VVV9 ],
+              couplings = {(0,1):C.GC_109,(0,0):C.GC_114,(0,6):C.GC_38,(0,5):C.GC_39,(0,4):[ C.GC_73, C.GC_110 ],(0,2):C.GC_115,(0,3):C.GC_113})
 
 V_11 = Vertex(name = 'V_11',
-              particles = [ P.ghG, P.ghG__tilde__, P.G ],
-              color = [ 'f(1,2,3)' ],
-              lorentz = [ L.UUV1 ],
-              couplings = {(0,0):C.GC_4})
+              particles = [ P.Z, P.H, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VSS1 ],
+              couplings = {(0,0):C.GC_74})
 
 V_12 = Vertex(name = 'V_12',
-              particles = [ P.G, P.G, P.G ],
-              color = [ 'f(1,2,3)' ],
-              lorentz = [ L.VVV7 ],
-              couplings = {(0,0):C.GC_4})
+              particles = [ P.a, P.Z, P.H, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVSS1, L.VVSS5, L.VVSS6 ],
+              couplings = {(0,1):C.GC_82,(0,0):C.GC_83,(0,2):C.GC_84})
 
 V_13 = Vertex(name = 'V_13',
-              particles = [ P.G, P.G, P.G, P.G ],
-              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.VVVV1, L.VVVV5, L.VVVV6 ],
-              couplings = {(1,1):C.GC_6,(0,0):C.GC_6,(2,2):C.GC_6})
+              particles = [ P.a, P.Z, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVS1, L.VVS4, L.VVS5 ],
+              couplings = {(0,1):C.GC_124,(0,0):C.GC_125,(0,2):C.GC_126})
 
 V_14 = Vertex(name = 'V_14',
-              particles = [ P.A, P.A, P.W__minus__, P.W__plus__ ],
+              particles = [ P.Z, P.Z, P.H, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVVV2, L.VVVV4, L.VVVV9 ],
-              couplings = {(0,0):C.GC_67,(0,2):C.GC_68,(0,1):[ C.GC_66, C.GC_128 ]})
+              lorentz = [ L.VVSS2, L.VVSS4, L.VVSS5, L.VVSS7 ],
+              couplings = {(0,2):C.GC_87,(0,0):C.GC_19,(0,3):C.GC_86,(0,1):[ C.GC_85, C.GC_133 ]})
 
 V_15 = Vertex(name = 'V_15',
-              particles = [ P.A, P.W__minus__, P.W__plus__, P.Z ],
+              particles = [ P.Z, P.Z, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVVV3, L.VVVV7, L.VVVV8 ],
-              couplings = {(0,0):C.GC_58,(0,2):C.GC_59,(0,1):[ C.GC_49, C.GC_127 ]})
+              lorentz = [ L.VVS2, L.VVS3, L.VVS4, L.VVS6 ],
+              couplings = {(0,2):C.GC_129,(0,0):C.GC_121,(0,3):C.GC_128,(0,1):[ C.GC_127, C.GC_134 ]})
 
 V_16 = Vertex(name = 'V_16',
-              particles = [ P.A, P.W__minus__, P.W__plus__, P.H, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.VVVSS2, L.VVVSS3, L.VVVSS4, L.VVVSS6, L.VVVSS7 ],
-              couplings = {(0,1):C.GC_54,(0,0):C.GC_15,(0,2):C.GC_14,(0,3):C.GC_56,(0,4):C.GC_16})
+              particles = [ P.ghG, P.ghG__tilde__, P.g ],
+              color = [ 'f(1,2,3)' ],
+              lorentz = [ L.UUV1 ],
+              couplings = {(0,0):C.GC_10})
 
 V_17 = Vertex(name = 'V_17',
-              particles = [ P.A, P.W__minus__, P.W__plus__, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.VVVS2, L.VVVS3, L.VVVS4, L.VVVS6, L.VVVS7 ],
-              couplings = {(0,1):C.GC_101,(0,0):C.GC_90,(0,2):C.GC_89,(0,3):C.GC_102,(0,4):C.GC_91})
+              particles = [ P.g, P.g, P.g, P.H ],
+              color = [ 'f(1,2,3)' ],
+              lorentz = [ L.VVVS7 ],
+              couplings = {(0,0):[ C.GC_14, C.GC_105 ]})
 
 V_18 = Vertex(name = 'V_18',
-              particles = [ P.W__minus__, P.W__plus__, P.H, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.VVSS5, L.VVSS6, L.VVSS9 ],
-              couplings = {(0,2):C.GC_13,(0,0):C.GC_11,(0,1):C.GC_32})
+              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.VVVVS3, L.VVVVS4 ],
+              couplings = {(1,1):[ C.GC_15, C.GC_106 ],(0,0):[ C.GC_15, C.GC_106 ],(2,2):[ C.GC_15, C.GC_106 ]})
 
 V_19 = Vertex(name = 'V_19',
-              particles = [ P.W__minus__, P.W__plus__, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.VVS2, L.VVS6, L.VVS9 ],
-              couplings = {(0,2):C.GC_88,(0,0):C.GC_87,(0,1):C.GC_96})
+              particles = [ P.g, P.g, P.g ],
+              color = [ 'f(1,2,3)' ],
+              lorentz = [ L.VVV7 ],
+              couplings = {(0,0):C.GC_10})
 
 V_20 = Vertex(name = 'V_20',
-              particles = [ P.A, P.A, P.A, P.W__minus__, P.W__plus__ ],
-              color = [ '1' ],
-              lorentz = [ L.VVVVV1, L.VVVVV2 ],
-              couplings = {(0,0):C.GC_72,(0,1):C.GC_73})
+              particles = [ P.g, P.g, P.g, P.g ],
+              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.VVVV1, L.VVVV5, L.VVVV6 ],
+              couplings = {(1,1):C.GC_12,(0,0):C.GC_12,(2,2):C.GC_12})
 
 V_21 = Vertex(name = 'V_21',
-              particles = [ P.A, P.A, P.W__minus__, P.W__plus__, P.Z ],
-              color = [ '1' ],
-              lorentz = [ L.VVVVV10, L.VVVVV4 ],
-              couplings = {(0,1):C.GC_69,(0,0):C.GC_70})
+              particles = [ P.b__tilde__, P.b, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):[ C.GC_135, C.GC_136 ]})
 
 V_22 = Vertex(name = 'V_22',
-              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
+              particles = [ P.mu__plus__, P.mu__minus__, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVVV2, L.VVVV4, L.VVVV9 ],
-              couplings = {(0,0):C.GC_21,(0,2):C.GC_24,(0,1):[ C.GC_10, C.GC_109 ]})
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):[ C.GC_139, C.GC_140 ]})
 
 V_23 = Vertex(name = 'V_23',
-              particles = [ P.A, P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
+              particles = [ P.ta__plus__, P.ta__minus__, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVVVV12, L.VVVVV5 ],
-              couplings = {(0,1):C.GC_60,(0,0):C.GC_62})
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):[ C.GC_143, C.GC_144 ]})
 
 V_24 = Vertex(name = 'V_24',
-              particles = [ P.W__minus__, P.W__plus__, P.Z, P.H, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.VVVSS1, L.VVVSS3, L.VVVSS5, L.VVVSS6, L.VVVSS8 ],
-              couplings = {(0,1):C.GC_17,(0,0):C.GC_52,(0,3):C.GC_19,(0,4):C.GC_53,(0,2):C.GC_51})
+              particles = [ P.c__tilde__, P.c, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):[ C.GC_137, C.GC_138 ]})
 
 V_25 = Vertex(name = 'V_25',
-              particles = [ P.W__minus__, P.W__plus__, P.Z, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.VVVS1, L.VVVS3, L.VVVS5, L.VVVS6, L.VVVS8 ],
-              couplings = {(0,1):C.GC_92,(0,0):C.GC_99,(0,3):C.GC_93,(0,4):C.GC_100,(0,2):C.GC_98})
+              particles = [ P.t__tilde__, P.t, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):[ C.GC_141, C.GC_142 ]})
 
 V_26 = Vertex(name = 'V_26',
-              particles = [ P.A, P.A, P.W__minus__, P.W__plus__, P.H, P.H ],
+              particles = [ P.a, P.a, P.W__minus__, P.W__plus__ ],
               color = [ '1' ],
-              lorentz = [ L.VVVVSS1 ],
-              couplings = {(0,0):C.GC_85})
+              lorentz = [ L.VVVV2, L.VVVV4, L.VVVV9 ],
+              couplings = {(0,0):C.GC_57,(0,2):C.GC_58,(0,1):C.GC_8})
 
 V_27 = Vertex(name = 'V_27',
-              particles = [ P.A, P.A, P.W__minus__, P.W__plus__, P.H ],
+              particles = [ P.a, P.W__minus__, P.W__plus__, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.VVVVS1 ],
-              couplings = {(0,0):C.GC_125})
+              lorentz = [ L.VVVV3, L.VVVV7, L.VVVV8 ],
+              couplings = {(0,0):C.GC_40,(0,2):C.GC_41,(0,1):[ C.GC_75, C.GC_132 ]})
 
 V_28 = Vertex(name = 'V_28',
-              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.H, P.H ],
+              particles = [ P.a, P.W__minus__, P.W__plus__, P.H, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVVVSS1 ],
-              couplings = {(0,0):C.GC_23})
+              lorentz = [ L.VVVSS2, L.VVVSS4, L.VVVSS5, L.VVVSS7 ],
+              couplings = {(0,0):C.GC_52,(0,1):C.GC_50,(0,3):C.GC_51,(0,2):C.GC_54})
 
 V_29 = Vertex(name = 'V_29',
-              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.H ],
+              particles = [ P.a, P.W__minus__, P.W__plus__, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVVVS1 ],
-              couplings = {(0,0):C.GC_94})
+              lorentz = [ L.VVVS2, L.VVVS4, L.VVVS5, L.VVVS7 ],
+              couplings = {(0,0):C.GC_97,(0,1):C.GC_95,(0,3):C.GC_96,(0,2):C.GC_98})
 
 V_30 = Vertex(name = 'V_30',
-              particles = [ P.A, P.A, P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
+              particles = [ P.a, P.a, P.a, P.W__minus__, P.W__plus__ ],
               color = [ '1' ],
-              lorentz = [ L.VVVVVV1 ],
-              couplings = {(0,0):C.GC_71})
+              lorentz = [ L.VVVVV1, L.VVVVV2 ],
+              couplings = {(0,0):C.GC_59,(0,1):C.GC_60})
 
 V_31 = Vertex(name = 'V_31',
-              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z ],
+              particles = [ P.a, P.a, P.W__minus__, P.W__plus__, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.VVVV2, L.VVVV4, L.VVVV9 ],
-              couplings = {(0,0):C.GC_22,(0,2):C.GC_25,(0,1):[ C.GC_12, C.GC_126 ]})
+              lorentz = [ L.VVVVV10, L.VVVVV3 ],
+              couplings = {(0,1):C.GC_42,(0,0):C.GC_43})
 
 V_32 = Vertex(name = 'V_32',
-              particles = [ P.A, P.W__minus__, P.W__plus__, P.Z, P.Z ],
+              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
               color = [ '1' ],
-              lorentz = [ L.VVVVV6, L.VVVVV8 ],
-              couplings = {(0,0):C.GC_61,(0,1):C.GC_63})
+              lorentz = [ L.VVVV2, L.VVVV4, L.VVVV9 ],
+              couplings = {(0,0):C.GC_28,(0,2):C.GC_30,(0,1):[ C.GC_45, C.GC_108 ]})
 
 V_33 = Vertex(name = 'V_33',
-              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.Z ],
+              particles = [ P.a, P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
               color = [ '1' ],
-              lorentz = [ L.VVVVV3, L.VVVVV9 ],
-              couplings = {(0,0):C.GC_26,(0,1):C.GC_28})
+              lorentz = [ L.VVVVV12, L.VVVVV5 ],
+              couplings = {(0,1):C.GC_32,(0,0):C.GC_34})
 
 V_34 = Vertex(name = 'V_34',
-              particles = [ P.A, P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.Z ],
+              particles = [ P.a, P.a, P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
               color = [ '1' ],
-              lorentz = [ L.VVVVVV2 ],
-              couplings = {(0,0):C.GC_64})
+              lorentz = [ L.VVVVVV1 ],
+              couplings = {(0,0):C.GC_36})
 
 V_35 = Vertex(name = 'V_35',
-              particles = [ P.Z, P.Z, P.H, P.H ],
+              particles = [ P.W__minus__, P.W__plus__, P.Z, P.H, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVSS4, L.VVSS6, L.VVSS9 ],
-              couplings = {(0,2):C.GC_79,(0,0):C.GC_75,(0,1):C.GC_78})
+              lorentz = [ L.VVVSS1, L.VVVSS3, L.VVVSS6, L.VVVSS7, L.VVVSS8 ],
+              couplings = {(0,1):C.GC_37,(0,0):C.GC_77,(0,3):C.GC_18,(0,4):C.GC_78,(0,2):C.GC_76})
 
 V_36 = Vertex(name = 'V_36',
-              particles = [ P.Z, P.Z, P.H ],
+              particles = [ P.W__minus__, P.W__plus__, P.Z, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVS5, L.VVS6, L.VVS9 ],
-              couplings = {(0,2):C.GC_119,(0,0):C.GC_115,(0,1):C.GC_118})
+              lorentz = [ L.VVVS1, L.VVVS3, L.VVVS6, L.VVVS7, L.VVVS8 ],
+              couplings = {(0,1):C.GC_90,(0,0):C.GC_101,(0,3):C.GC_120,(0,4):C.GC_102,(0,2):C.GC_100})
 
 V_37 = Vertex(name = 'V_37',
-              particles = [ P.A, P.W__minus__, P.W__plus__, P.Z, P.H, P.H ],
+              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.H, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVVVSS2 ],
-              couplings = {(0,0):C.GC_84})
+              lorentz = [ L.VVVVSS1 ],
+              couplings = {(0,0):C.GC_17})
 
 V_38 = Vertex(name = 'V_38',
-              particles = [ P.A, P.W__minus__, P.W__plus__, P.Z, P.H ],
+              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.H ],
               color = [ '1' ],
               lorentz = [ L.VVVVS2 ],
-              couplings = {(0,0):C.GC_124})
+              couplings = {(0,0):C.GC_119})
 
 V_39 = Vertex(name = 'V_39',
-              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z, P.H, P.H ],
+              particles = [ P.a, P.a, P.W__minus__, P.W__plus__, P.H, P.H ],
               color = [ '1' ],
               lorentz = [ L.VVVVSS1 ],
-              couplings = {(0,0):C.GC_77})
+              couplings = {(0,0):C.GC_56})
 
 V_40 = Vertex(name = 'V_40',
-              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z, P.H ],
+              particles = [ P.a, P.a, P.W__minus__, P.W__plus__, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVVVS1 ],
-              couplings = {(0,0):C.GC_117})
+              lorentz = [ L.VVVVS2 ],
+              couplings = {(0,0):C.GC_99})
 
 V_41 = Vertex(name = 'V_41',
-              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z, P.Z ],
+              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.VVVVV11, L.VVVVV7 ],
-              couplings = {(0,1):C.GC_27,(0,0):C.GC_29})
+              lorentz = [ L.VVVV2, L.VVVV4, L.VVVV9 ],
+              couplings = {(0,0):C.GC_29,(0,2):C.GC_31,(0,1):[ C.GC_48, C.GC_131 ]})
 
 V_42 = Vertex(name = 'V_42',
-              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.Z, P.Z ],
+              particles = [ P.a, P.W__minus__, P.W__plus__, P.Z, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.VVVVVV1 ],
-              couplings = {(0,0):C.GC_30})
+              lorentz = [ L.VVVVV6, L.VVVVV8 ],
+              couplings = {(0,0):C.GC_33,(0,1):C.GC_35})
 
 V_43 = Vertex(name = 'V_43',
-              particles = [ P.d__tilde__, P.d, P.A ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_1})
+              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVVVV4, L.VVVVV9 ],
+              couplings = {(0,0):C.GC_23,(0,1):C.GC_25})
 
 V_44 = Vertex(name = 'V_44',
-              particles = [ P.s__tilde__, P.s, P.A ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_1})
+              particles = [ P.a, P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVVVVV2 ],
+              couplings = {(0,0):C.GC_27})
 
 V_45 = Vertex(name = 'V_45',
-              particles = [ P.b__tilde__, P.b, P.A ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_1})
+              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVVVV11, L.VVVVV7 ],
+              couplings = {(0,1):C.GC_24,(0,0):C.GC_26})
 
 V_46 = Vertex(name = 'V_46',
-              particles = [ P.d__tilde__, P.d, P.G ],
-              color = [ 'T(3,2,1)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__, P.Z, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVVVVV1 ],
+              couplings = {(0,0):C.GC_22})
 
 V_47 = Vertex(name = 'V_47',
-              particles = [ P.s__tilde__, P.s, P.G ],
-              color = [ 'T(3,2,1)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              particles = [ P.a, P.W__minus__, P.W__plus__, P.Z, P.H, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVVVSS2 ],
+              couplings = {(0,0):C.GC_21})
 
 V_48 = Vertex(name = 'V_48',
-              particles = [ P.b__tilde__, P.b, P.G ],
-              color = [ 'T(3,2,1)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              particles = [ P.a, P.W__minus__, P.W__plus__, P.Z, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVVVS5 ],
+              couplings = {(0,0):C.GC_123})
 
 V_49 = Vertex(name = 'V_49',
-              particles = [ P.b__tilde__, P.b, P.H ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_129})
+              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z, P.H, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVVVSS1 ],
+              couplings = {(0,0):C.GC_20})
 
 V_50 = Vertex(name = 'V_50',
-              particles = [ P.d__tilde__, P.d, P.Z ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV3 ],
-              couplings = {(0,0):C.GC_43,(0,1):C.GC_45})
+              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVVVS2 ],
+              couplings = {(0,0):C.GC_122})
 
 V_51 = Vertex(name = 'V_51',
-              particles = [ P.s__tilde__, P.s, P.Z ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV3 ],
-              couplings = {(0,0):C.GC_43,(0,1):C.GC_45})
+              particles = [ P.e__plus__, P.e__minus__, P.a ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_5})
 
 V_52 = Vertex(name = 'V_52',
-              particles = [ P.b__tilde__, P.b, P.Z ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV3 ],
-              couplings = {(0,1):C.GC_45,(0,0):C.GC_43})
+              particles = [ P.mu__plus__, P.mu__minus__, P.a ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_5})
 
 V_53 = Vertex(name = 'V_53',
-              particles = [ P.u__tilde__, P.d, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_132})
+              particles = [ P.ta__plus__, P.ta__minus__, P.a ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_5})
 
 V_54 = Vertex(name = 'V_54',
-              particles = [ P.c__tilde__, P.d, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
+              particles = [ P.ve__tilde__, P.e__minus__, P.W__plus__ ],
+              color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_135})
+              couplings = {(0,0):C.GC_61})
 
 V_55 = Vertex(name = 'V_55',
-              particles = [ P.t__tilde__, P.d, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
+              particles = [ P.vm__tilde__, P.mu__minus__, P.W__plus__ ],
+              color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_138})
+              couplings = {(0,0):C.GC_61})
 
 V_56 = Vertex(name = 'V_56',
-              particles = [ P.u__tilde__, P.s, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
+              particles = [ P.vt__tilde__, P.ta__minus__, P.W__plus__ ],
+              color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_133})
+              couplings = {(0,0):C.GC_61})
 
 V_57 = Vertex(name = 'V_57',
-              particles = [ P.c__tilde__, P.s, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_136})
+              particles = [ P.e__plus__, P.e__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_71,(0,1):C.GC_80})
 
 V_58 = Vertex(name = 'V_58',
-              particles = [ P.t__tilde__, P.s, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_139})
+              particles = [ P.mu__plus__, P.mu__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,1):C.GC_80,(0,0):C.GC_71})
 
 V_59 = Vertex(name = 'V_59',
-              particles = [ P.u__tilde__, P.b, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_134})
+              particles = [ P.ta__plus__, P.ta__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_71,(0,1):C.GC_80})
 
 V_60 = Vertex(name = 'V_60',
-              particles = [ P.c__tilde__, P.b, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
+              particles = [ P.e__plus__, P.ve, P.W__minus__ ],
+              color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_137})
+              couplings = {(0,0):C.GC_61})
 
 V_61 = Vertex(name = 'V_61',
-              particles = [ P.t__tilde__, P.b, P.W__plus__ ],
-              color = [ 'Identity(1,2)' ],
+              particles = [ P.mu__plus__, P.vm, P.W__minus__ ],
+              color = [ '1' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_140})
+              couplings = {(0,0):C.GC_61})
 
 V_62 = Vertex(name = 'V_62',
-              particles = [ P.e__plus__, P.e__minus__, P.A ],
+              particles = [ P.ta__plus__, P.vt, P.W__minus__ ],
               color = [ '1' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_3})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_61})
 
 V_63 = Vertex(name = 'V_63',
-              particles = [ P.m__plus__, P.m__minus__, P.A ],
+              particles = [ P.ve__tilde__, P.ve, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_3})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_81})
 
 V_64 = Vertex(name = 'V_64',
-              particles = [ P.tt__plus__, P.tt__minus__, P.A ],
+              particles = [ P.vm__tilde__, P.vm, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_3})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_81})
 
 V_65 = Vertex(name = 'V_65',
-              particles = [ P.tt__plus__, P.tt__minus__, P.H ],
+              particles = [ P.vt__tilde__, P.vt, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_131})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_81})
 
 V_66 = Vertex(name = 'V_66',
-              particles = [ P.e__plus__, P.e__minus__, P.Z ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2, L.FFV4 ],
-              couplings = {(0,0):C.GC_43,(0,1):C.GC_46})
+              particles = [ P.u__tilde__, P.u, P.a ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_4})
 
 V_67 = Vertex(name = 'V_67',
-              particles = [ P.m__plus__, P.m__minus__, P.Z ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2, L.FFV4 ],
-              couplings = {(0,0):C.GC_43,(0,1):C.GC_46})
+              particles = [ P.c__tilde__, P.c, P.a ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_4})
 
 V_68 = Vertex(name = 'V_68',
-              particles = [ P.tt__plus__, P.tt__minus__, P.Z ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2, L.FFV4 ],
-              couplings = {(0,0):C.GC_43,(0,1):C.GC_46})
+              particles = [ P.t__tilde__, P.t, P.a ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_4})
 
 V_69 = Vertex(name = 'V_69',
-              particles = [ P.ve__tilde__, P.e__minus__, P.W__plus__ ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_33})
+              particles = [ P.u__tilde__, P.u, P.g ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_11})
 
 V_70 = Vertex(name = 'V_70',
-              particles = [ P.vm__tilde__, P.m__minus__, P.W__plus__ ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_33})
+              particles = [ P.c__tilde__, P.c, P.g ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_11})
 
 V_71 = Vertex(name = 'V_71',
-              particles = [ P.vt__tilde__, P.tt__minus__, P.W__plus__ ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_33})
+              particles = [ P.t__tilde__, P.t, P.g ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_11})
 
 V_72 = Vertex(name = 'V_72',
               particles = [ P.d__tilde__, P.u, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_34})
+              couplings = {(0,0):C.GC_62})
 
 V_73 = Vertex(name = 'V_73',
               particles = [ P.s__tilde__, P.u, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_35})
+              couplings = {(0,0):C.GC_63})
 
 V_74 = Vertex(name = 'V_74',
               particles = [ P.b__tilde__, P.u, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_36})
+              couplings = {(0,0):C.GC_64})
 
 V_75 = Vertex(name = 'V_75',
               particles = [ P.d__tilde__, P.c, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_37})
+              couplings = {(0,0):C.GC_65})
 
 V_76 = Vertex(name = 'V_76',
               particles = [ P.s__tilde__, P.c, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_38})
+              couplings = {(0,0):C.GC_66})
 
 V_77 = Vertex(name = 'V_77',
               particles = [ P.b__tilde__, P.c, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_39})
+              couplings = {(0,0):C.GC_67})
 
 V_78 = Vertex(name = 'V_78',
               particles = [ P.d__tilde__, P.t, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_40})
+              couplings = {(0,0):C.GC_68})
 
 V_79 = Vertex(name = 'V_79',
               particles = [ P.s__tilde__, P.t, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_41})
+              couplings = {(0,0):C.GC_69})
 
 V_80 = Vertex(name = 'V_80',
               particles = [ P.b__tilde__, P.t, P.W__minus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_42})
+              couplings = {(0,0):C.GC_70})
 
 V_81 = Vertex(name = 'V_81',
-              particles = [ P.u__tilde__, P.u, P.A ],
+              particles = [ P.u__tilde__, P.u, P.Z ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_2})
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_72,(0,1):C.GC_79})
 
 V_82 = Vertex(name = 'V_82',
-              particles = [ P.c__tilde__, P.c, P.A ],
+              particles = [ P.c__tilde__, P.c, P.Z ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_2})
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_72,(0,1):C.GC_79})
 
 V_83 = Vertex(name = 'V_83',
-              particles = [ P.t__tilde__, P.t, P.A ],
+              particles = [ P.t__tilde__, P.t, P.Z ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_2})
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_72,(0,1):C.GC_79})
 
 V_84 = Vertex(name = 'V_84',
-              particles = [ P.u__tilde__, P.u, P.G ],
-              color = [ 'T(3,2,1)' ],
+              particles = [ P.d__tilde__, P.d, P.a ],
+              color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              couplings = {(0,0):C.GC_3})
 
 V_85 = Vertex(name = 'V_85',
-              particles = [ P.c__tilde__, P.c, P.G ],
-              color = [ 'T(3,2,1)' ],
+              particles = [ P.s__tilde__, P.s, P.a ],
+              color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              couplings = {(0,0):C.GC_3})
 
 V_86 = Vertex(name = 'V_86',
-              particles = [ P.t__tilde__, P.t, P.G ],
-              color = [ 'T(3,2,1)' ],
+              particles = [ P.b__tilde__, P.b, P.a ],
+              color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV1 ],
-              couplings = {(0,0):C.GC_5})
+              couplings = {(0,0):C.GC_3})
 
 V_87 = Vertex(name = 'V_87',
-              particles = [ P.t__tilde__, P.t, P.H ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_130})
+              particles = [ P.d__tilde__, P.d, P.g ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_11})
 
 V_88 = Vertex(name = 'V_88',
-              particles = [ P.u__tilde__, P.u, P.Z ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV5 ],
-              couplings = {(0,0):C.GC_44,(0,1):C.GC_45})
+              particles = [ P.s__tilde__, P.s, P.g ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_11})
 
 V_89 = Vertex(name = 'V_89',
-              particles = [ P.c__tilde__, P.c, P.Z ],
-              color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV5 ],
-              couplings = {(0,0):C.GC_44,(0,1):C.GC_45})
+              particles = [ P.b__tilde__, P.b, P.g ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_11})
 
 V_90 = Vertex(name = 'V_90',
-              particles = [ P.t__tilde__, P.t, P.Z ],
+              particles = [ P.u__tilde__, P.d, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
-              lorentz = [ L.FFV2, L.FFV5 ],
-              couplings = {(0,0):C.GC_44,(0,1):C.GC_45})
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_145})
 
 V_91 = Vertex(name = 'V_91',
-              particles = [ P.e__plus__, P.ve, P.W__minus__ ],
-              color = [ '1' ],
+              particles = [ P.c__tilde__, P.d, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_33})
+              couplings = {(0,0):C.GC_148})
 
 V_92 = Vertex(name = 'V_92',
-              particles = [ P.m__plus__, P.vm, P.W__minus__ ],
-              color = [ '1' ],
+              particles = [ P.t__tilde__, P.d, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_33})
+              couplings = {(0,0):C.GC_151})
 
 V_93 = Vertex(name = 'V_93',
-              particles = [ P.tt__plus__, P.vt, P.W__minus__ ],
-              color = [ '1' ],
+              particles = [ P.u__tilde__, P.s, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_33})
+              couplings = {(0,0):C.GC_146})
 
 V_94 = Vertex(name = 'V_94',
-              particles = [ P.ve__tilde__, P.ve, P.Z ],
-              color = [ '1' ],
+              particles = [ P.c__tilde__, P.s, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_74})
+              couplings = {(0,0):C.GC_149})
 
 V_95 = Vertex(name = 'V_95',
-              particles = [ P.vm__tilde__, P.vm, P.Z ],
-              color = [ '1' ],
+              particles = [ P.t__tilde__, P.s, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_74})
+              couplings = {(0,0):C.GC_152})
 
 V_96 = Vertex(name = 'V_96',
-              particles = [ P.vt__tilde__, P.vt, P.Z ],
-              color = [ '1' ],
-              lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_74})
+              particles = [ P.u__tilde__, P.b, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_147})
+
+V_97 = Vertex(name = 'V_97',
+              particles = [ P.c__tilde__, P.b, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_150})
+
+V_98 = Vertex(name = 'V_98',
+              particles = [ P.t__tilde__, P.b, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_153})
+
+V_99 = Vertex(name = 'V_99',
+              particles = [ P.d__tilde__, P.d, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,0):C.GC_71,(0,1):C.GC_79})
+
+V_100 = Vertex(name = 'V_100',
+               particles = [ P.s__tilde__, P.s, P.Z ],
+               color = [ 'Identity(1,2)' ],
+               lorentz = [ L.FFV2, L.FFV3 ],
+               couplings = {(0,0):C.GC_71,(0,1):C.GC_79})
+
+V_101 = Vertex(name = 'V_101',
+               particles = [ P.b__tilde__, P.b, P.Z ],
+               color = [ 'Identity(1,2)' ],
+               lorentz = [ L.FFV2, L.FFV3 ],
+               couplings = {(0,0):C.GC_71,(0,1):C.GC_79})
 

=== modified file 'models/EWdim6/write_param_card.py'
--- models/EWdim6/write_param_card.py	2013-01-19 17:33:23 +0000
+++ models/EWdim6/write_param_card.py	2013-10-25 11:38:22 +0000
@@ -1,9 +1,10 @@
-
-__date__ = "02 Aug 2012"
+from __future__ import division
+__date__ = "10 Dec 2012"
 __author__ = '[e-mail]'
 
 from function_library import *
 
+
 class ParamCardWriter(object):
     
     header = \

=== modified file 'models/__init__.py'
--- models/__init__.py	2012-09-06 18:27:13 +0000
+++ models/__init__.py	2013-10-25 11:38:22 +0000
@@ -17,7 +17,7 @@
 import os
 import sys
 
-def load_model(name):
+def load_model(name, decay=False):
     
     # avoid final '/' in the path
     if name.endswith('/'):
@@ -35,5 +35,14 @@
 
     sys.path.insert(0, os.sep.join(path_split[:-1]))
     __import__(path_split[-1])
+    output = sys.modules[path_split[-1]]
+    if decay:
+        dec_name = '%s.decays' % path_split[-1]
+        __import__(dec_name)
+        output.all_decays = sys.modules[dec_name].all_decays
+    
     sys.path.pop(0)
+    
+    
+    
     return sys.modules[path_split[-1]]

=== modified file 'models/check_param_card.py'
--- models/check_param_card.py	2013-08-16 03:30:25 +0000
+++ models/check_param_card.py	2013-10-25 11:38:22 +0000
@@ -182,13 +182,16 @@
         data = data.lower()
         data = data.split()
         self.name = data[1] # the first part of data is model
-        
         if len(data) == 3:
             if data[2].startswith('q='):
                 #the last part should be of the form Q=
                 self.scale = float(data[2][2:])
             elif self.name == 'qnumbers':
                 self.name += ' %s' % data[2]
+        elif len(data) == 4 and data[2] == 'q=':
+            #the last part should be of the form Q=
+            self.scale = float(data[3])                
+            
         return self
     
     def keys(self):
@@ -202,15 +205,15 @@
         text = """###################################""" + \
                """\n## INFORMATION FOR %s""" % self.name.upper() +\
                """\n###################################\n"""
-        
+
         #special case for decay chain
         if self.name == 'decay':
             for param in self:
-                id = param.lhacode[0]
+                pid = param.lhacode[0]
                 param.set_block('decay')
                 text += str(param)+ '\n'
-                if self.decay_table.has_key(id):
-                    text += str(self.decay_table[id])+'\n'
+                if self.decay_table.has_key(pid):
+                    text += str(self.decay_table[pid])+'\n'
             return text
         elif self.name.startswith('decay'):
             text = '' # avoid block definition
@@ -295,7 +298,7 @@
                 param.set_block(cur_block.name)
                 param.load_str(line)
                 cur_block.append(param)
-                    
+                  
         return self
     
     def write(self, outpath):
@@ -303,7 +306,6 @@
   
         # order the block in a smart way
         blocks = self.order_block()
-        
         text = self.header
         text += ''.join([str(block) for block in blocks])
 
@@ -354,6 +356,7 @@
             self.order.append(object)
         
         
+        
     def has_block(self, name):
         return self.has_key(name)
     
@@ -1149,8 +1152,12 @@
         restrictpath = os.path.join(restrictpath, os.pardir, os.pardir, 'Source', 
                                                  'MODEL', 'param_card_rule.dat')
         if not os.path.exists(restrictpath):
-            return True
-        
+            restrictpath = os.path.dirname(path)
+            restrictpath = os.path.join(restrictpath, os.pardir, 'Source', 
+                                                 'MODEL', 'param_card_rule.dat')
+            if not os.path.exists(restrictpath):
+                return True
+    
     cardrule = ParamCardRule()
     cardrule.load_rule(restrictpath)
     cardrule.check_param_card(path, modify=False)

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2013-08-16 07:25:03 +0000
+++ models/import_ufo.py	2013-10-25 11:38:22 +0000
@@ -164,7 +164,7 @@
         raise MadGraph5Error, 'This model is modified on disk. To reload it you need to quit/relaunch mg5' 
 
     # Load basic information
-    ufo_model = ufomodels.load_model(model_path)
+    ufo_model = ufomodels.load_model(model_path, decay)
     ufo2mg5_converter = UFOMG5Converter(ufo_model)
     model = ufo2mg5_converter.load_model()
     
@@ -183,7 +183,7 @@
         for ufo_part in ufo_model.all_particles:
             name =  ufo_part.name
             if ufo2mg5_converter.use_lower_part_names:
-               name = name.lower() 
+                name = name.lower() 
             p = model['particles'].find_name(name)
             if hasattr(ufo_part, 'partial_widths'):
                 p.partial_widths = ufo_part.partial_widths

=== modified file 'models/nmssm/__init__.py'
--- models/nmssm/__init__.py	2012-08-03 14:46:49 +0000
+++ models/nmssm/__init__.py	2013-10-25 11:38:22 +0000
@@ -6,6 +6,7 @@
 import vertices
 import coupling_orders
 import write_param_card
+import propagators
 
 
 all_particles = particles.all_particles
@@ -15,6 +16,7 @@
 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
@@ -23,8 +25,22 @@
 else:
    all_decays = decays.all_decays
 
-
-gauge = [0]
+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, 1]
 
 
 __author__ = "Benjamin Fuks"

=== modified file 'models/nmssm/coupling_orders.py'
--- models/nmssm/coupling_orders.py	2012-08-03 14:46:49 +0000
+++ models/nmssm/coupling_orders.py	2013-10-25 11:38:22 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.53
-# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
-# Date: Wed 1 Aug 2012 00:45:03
+# This file was automatically created by FeynRules 1.7.214
+# Mathematica version: 9.0 for Mac OS X x86 (64-bit) (January 24, 2013)
+# Date: Thu 22 Aug 2013 18:22:08
 
 
 from object_library import all_orders, CouplingOrder

=== modified file 'models/nmssm/couplings.py'
--- models/nmssm/couplings.py	2012-08-03 14:46:49 +0000
+++ models/nmssm/couplings.py	2013-10-25 11:38:22 +0000
@@ -1,11 +1,11 @@
-# This file was automatically created by FeynRules 1.7.53
-# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
-# Date: Wed 1 Aug 2012 00:44:44
+# This file was automatically created by FeynRules 1.7.214
+# Mathematica version: 9.0 for Mac OS X x86 (64-bit) (January 24, 2013)
+# Date: Thu 22 Aug 2013 18:21:54
 
 
 from object_library import all_couplings, Coupling
 
-from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec, cot
 
 
 
@@ -38,7 +38,7 @@
                 order = {'QCD':1})
 
 GC_8 = Coupling(name = 'GC_8',
-                value = 'G',
+                value = 'G/2.',
                 order = {'QCD':1})
 
 GC_9 = Coupling(name = 'GC_9',
@@ -46,387 +46,387 @@
                 order = {'QCD':2})
 
 GC_10 = Coupling(name = 'GC_10',
-                 value = '(2*ee**2*complex(0,1)*I12x11)/9.',
+                 value = '(2*ee**2*complex(0,1)*I15a11)/9.',
                  order = {'QED':2})
 
 GC_11 = Coupling(name = 'GC_11',
-                 value = '(-2*ee*complex(0,1)*G*I12x11)/3.',
+                 value = '(-2*ee*complex(0,1)*G*I15a11)/3.',
                  order = {'QCD':1,'QED':1})
 
 GC_12 = Coupling(name = 'GC_12',
-                 value = 'complex(0,1)*G**2*I12x11',
+                 value = 'complex(0,1)*G**2*I15a11',
                  order = {'QCD':2})
 
 GC_13 = Coupling(name = 'GC_13',
-                 value = '(2*ee**2*complex(0,1)*I12x22)/9.',
+                 value = '(2*ee**2*complex(0,1)*I15a22)/9.',
                  order = {'QED':2})
 
 GC_14 = Coupling(name = 'GC_14',
-                 value = '(-2*ee*complex(0,1)*G*I12x22)/3.',
+                 value = '(-2*ee*complex(0,1)*G*I15a22)/3.',
                  order = {'QCD':1,'QED':1})
 
 GC_15 = Coupling(name = 'GC_15',
-                 value = 'complex(0,1)*G**2*I12x22',
+                 value = 'complex(0,1)*G**2*I15a22',