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

[Johan Alwall]

- New SM and HEFT with CKM matrix parameterized through Wolfenstein parameters
- Added coupling hierarchy and maximum coupling expansion according to the new UFO format for all models
- Added support for new "coupling order": WEIGHTED which corresponds to the sum of couplings weighted by their hierarchies
- Added automatic detection of leading coupling orders for processes for any model, based on the coupling hierarchy, so e.g. in HEFT, p p > h j j will give only QCD+HEFT diagrams with only one HEFT coupling in each diagram.

[lp:~maddevelopers/mg5amcnlo/new_sm_model_with_Wolfenstein]

166. By Johan Alwall on 2011-07-22

Read hierarchy and expansion_orders only if present in the UFO model (otherwise use default)

[Olivier Mattelaer (olivier-mattelaer)]

Hi, very few comments in fact.

few comments:

1) Maybe change the comment in
base_objects.Model.get_order_hierarchy
That this is used for v4 model only.

2) in base_objects.check_expansion_orders
I've made some basic rewritting of the function.

3) in find_optimal_process_orders(process_definition):

I'm worried about this comment:
193 + 2) Pick out the legs in the multiprocess according to the
194 + highest hierarchy represented (so don't mix particles from
195 + different hierarchy classes in the same multiparticles!)

What does it mean? can I do this:
define spinhalf = e+ e- u u~
generate spinhalf spinhalf > spinhalf spinhalf
?

4) again in find_optimal_process_orders

This function is very long (300 lines).
Some refactoring might be done to simplify the structure.

In particular they are two level:
1) The part which is only model dependent
line 1436 - 1469 might be factorize out.

5) at line 1485:
        # Now remove the two lowest orders to get maximum
        max_order_now = sorted(max_order_now)[2:]
could you explain why? this is not clear to me

review: Needs Information

[lp:~maddevelopers/mg5amcnlo/new_sm_model_with_Wolfenstein]

167. By Olivier Mattelaer on 2011-07-22

minor rewritting of function

[Olivier Mattelaer (olivier-mattelaer)]

I want to add that also we need to rethink the drawing.
(the part with the coupling)
Since for heft, this is not beautifull at all
(much too long to have QCD/QED/HIG/HIW/WEIGHTED)

for
p p > t t~ h
this is very limit
but for
p p > t t~ g h
this is so bad (for the small diagram)

I'll think about smtg...

[Johan Alwall (johan-alwall)]

Thanks Olivier. I have addressed all your comments below:

> 1) Maybe change the comment in
> base_objects.Model.get_order_hierarchy
> That this is used for v4 model only.

Done.

> 3) in find_optimal_process_orders(process_definition):
>
> I'm worried about this comment:
> 193     + 2) Pick out the legs in the multiprocess according to the
> 194     + highest hierarchy represented (so don't mix particles from
> 195     + different hierarchy classes in the same multiparticles!)
>
> What does it mean? can I do this:
> define spinhalf = e+ e- u u~
> generate spinhalf spinhalf > spinhalf spinhalf
> ?

Exactly. We want to find the minimal coupling orders which give ANY
processes (e.g., in p p > j j, we don't want u d~ > c s~).

> 4) again in find_optimal_process_orders
>
> This function is very long (300 lines).
> Some refactoring might be done to simplify the structure.

Done.

> 5) at line 1485:
>        # Now remove the two lowest orders to get maximum
>        max_order_now = sorted(max_order_now)[2:]
> could you explain why? this is not clear to me

Nvertices = Nlegs-2

> Since for heft, this is not beautifull at all
> (much too long to have QCD/QED/HIG/HIW/WEIGHTED)

Ok I removed the WEIGHTED order in the drawing (but leave it in the
text-only diagrams).

Thanks for the review!
Johan

[lp:~maddevelopers/mg5amcnlo/new_sm_model_with_Wolfenstein]

168. By Johan Alwall on 2011-07-22

Refactored find_optimal_process_orders

169. By Johan Alwall on 2011-07-22

Remove WEIGHTED order in diagram drawing

170. By Johan Alwall on 2011-07-22

Use sorted coupling orders in all Process nice_string output

171. By Johan Alwall on 2011-07-22

Fixed coupling hierarchy of HEFT model - HIG and HIW should be 2, not 1

172. By Johan Alwall on 2011-07-22

Fixed test for HEFT order hierarchy

[Olivier Mattelaer (olivier-mattelaer)]

Perfect !!!!

review: Approve

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2011-05-17 21:34:11 +0000
+++ madgraph/core/base_objects.py	2011-07-22 20:26:18 +0000
@@ -667,8 +667,10 @@
         self['ref_dict_to0'] = {}
         self['ref_dict_to1'] = {}
         self['got_majoranas'] = None
+        self['order_hierarchy'] = {}
         self['conserved_charge'] = set()
         self['coupling_orders'] = None
+        self['expansion_order'] = None
         self['version_tag'] = None # position of the directory (for security)
 
     def filter(self, name, value):
@@ -758,6 +760,15 @@
             if self['interactions']:
                 self['coupling_orders'] = self.get_coupling_orders()
 
+        if (name == 'order_hierarchy') and not self[name]:
+            if self['interactions']:
+                self['order_hierarchy'] = self.get_order_hierarchy()    
+
+        if (name == 'expansion_order') and self[name] == None:
+            if self['interactions']:
+                self['expansion_order'] = \
+                   dict([(order, -1) for order in self.get('coupling_orders')])
+
         return Model.__bases__[0].get(self, name) # call the mother routine
 
     def set(self, name, value):
@@ -781,6 +792,8 @@
             self['ref_dict_to0'] = {}
             self['got_majoranas'] = None
             self['coupling_orders'] = None
+            self['order_hierarchy'] = {}
+            self['expansion_order'] = None
 
         Model.__bases__[0].set(self, name, value) # call the mother routine
 
@@ -817,6 +830,64 @@
         return set(sum([i.get('orders').keys() for i in \
                         self.get('interactions')], []))
 
+    def get_order_hierarchy(self):
+        """Set a default order hierarchy for the model if not set by the UFO."""
+        # Set coupling hierachy
+        hierarchy = dict([(order, 1) for order in self.get('coupling_orders')])
+        # Special case for only QCD and QED couplings, unless already set
+        if self.get('coupling_orders') == set(['QCD', 'QED']):
+            hierarchy['QED'] = 2
+        return hierarchy
+    
+    def get_particles_hierarchy(self):
+        """Returns the order hierarchies of the model and the
+        particles which have interactions in at least this hierarchy
+        (used in find_optimal_process_orders in MultiProcess diagram
+        generation):
+
+        Check the coupling hierarchy of the model. Assign all
+        particles to the different coupling hierarchies so that a
+        particle is considered to be in the highest hierarchy (i.e.,
+        with lowest value) where it has an interaction.
+        """
+        
+        # Find coupling orders in model
+        coupling_orders = self.get('coupling_orders')
+        # Loop through the different coupling hierarchy values, so we
+        # start with the most dominant and proceed to the least dominant
+        hierarchy = sorted(list(set([self.get('order_hierarchy')[k] for \
+                                     k in coupling_orders])))
+
+        # orders is a rising list of the lists of orders with a given hierarchy
+        orders = []
+        for value in hierarchy:
+            orders.append([ k for (k, v) in \
+                            self.get('order_hierarchy').items() if \
+                            v == value ])
+
+        # Extract the interaction that correspond to the different
+        # coupling hierarchies, and the corresponding particles
+        interactions = []
+        particles = []
+        for iorder, order in enumerate(orders):
+            sum_orders = sum(orders[:iorder+1], [])
+            sum_interactions = sum(interactions[:iorder], [])
+            sum_particles = sum([list(p) for p in particles[:iorder]], [])
+            # Append all interactions that have only orders with at least
+            # this hierarchy
+            interactions.append([i for i in self.get('interactions') if \
+                                 not i in sum_interactions and \
+                                 not any([k not in sum_orders for k in \
+                                          i.get('orders').keys()])])
+            # Append the corresponding particles, excluding the
+            # particles that have already been added
+            particles.append(set(sum([[p.get_pdg_code() for p in \
+                                      inter.get('particles') if \
+                                       p.get_pdg_code() not in sum_particles] \
+                                      for inter in interactions[-1]], [])))
+
+        return particles, hierarchy
+
     def check_majoranas(self):
         """Return True if there is fermion flow violation, False otherwise"""
 
@@ -1323,22 +1394,27 @@
                 mystr = mystr + 'id:' + str(vert['id']) + '),'
             mystr = mystr[:-1] + ')'
             mystr += " (%s)" % ",".join(["%s=%d" % (key, self['orders'][key]) \
-                                        for key in self['orders'].keys()])
+                                     for key in sorted(self['orders'].keys())])
             return mystr
         else:
             return '()'
 
     def calculate_orders(self, model):
-        """Calculate the actual coupling orders of this diagram"""
+        """Calculate the actual coupling orders of this diagram. Note
+        that the special order WEIGTHED corresponds to the sum of
+        hierarchys for the couplings."""
 
         coupling_orders = dict([(c, 0) for c in model.get('coupling_orders')])
+        weight = 0
         for vertex in self['vertices']:
             if vertex.get('id') == 0: continue
             couplings = model.get('interaction_dict')[vertex.get('id')].\
                         get('orders')
             for coupling in couplings:
                 coupling_orders[coupling] += couplings[coupling]
-
+            weight += sum([model.get('order_hierarchy')[c]*n for \
+                              (c,n) in couplings.items()])
+        coupling_orders['WEIGHTED'] = weight
         self.set('orders', coupling_orders)
 
     def renumber_legs(self, perm_map, leg_list):
@@ -1574,7 +1650,7 @@
 
         if self['orders']:
             mystr = mystr + " ".join([key + '=' + repr(self['orders'][key]) \
-                       for key in self['orders']]) + ' '
+                       for key in sorted(self['orders'])]) + ' '
 
         # Remove last space
         mystr = mystr[:-1]
@@ -1583,7 +1659,7 @@
             mystr += " @%d" % self.get('id')
             if self.get('overall_orders'):
                 mystr += " " + " ".join([key + '=' + repr(self['orders'][key]) \
-                       for key in self['orders']]) + ' '
+                       for key in sorted(self['orders'])]) + ' '
         
         if not self.get('decay_chains'):
             return mystr
@@ -1636,7 +1712,7 @@
 
         if self['orders']:
             mystr = mystr + " ".join([key + '=' + repr(self['orders'][key]) \
-                       for key in self['orders']]) + ' '
+                       for key in sorted(self['orders'])]) + ' '
 
         # Remove last space
         mystr = mystr[:-1]
@@ -1645,7 +1721,7 @@
             mystr += " @%d" % self.get('id')
             if self.get('overall_orders'):
                 mystr += " " + " ".join([key + '=' + repr(self['orders'][key]) \
-                       for key in self['orders']]) + ' '
+                       for key in sorted(self['orders'])]) + ' '
         
         if not self.get('decay_chains'):
             return mystr
@@ -1864,10 +1940,24 @@
                                     identical_indices[leg.get('id')] + 1
             else:
                 identical_indices[leg.get('id')] = 1
-        return reduce(lambda x, y: x * y,
-                      [ math.factorial(val) for val in \
+        return reduce(lambda x, y: x * y, [ math.factorial(val) for val in \
                         identical_indices.values() ], 1)
 
+    def check_expansion_orders(self):
+        """Ensure that maximum expansion orders from the model are
+        properly taken into account in the process"""
+
+        # Ensure that expansion orders are taken into account
+        expansion_orders = self.get('model').get('expansion_order')
+        orders = self.get('orders')
+        
+        tmp = [(k,v) for (k,v) in expansion_orders.items() if 0 < v < 99]
+        for (k,v) in tmp:  
+            if k in orders:
+                orders[k] = min(orders[k], v)
+            else:
+                orders[k] = v
+
     def __eq__(self, other):
         """Overloading the equality operator, so that only comparison
         of process id and legs is being done, using compare_for_sort."""
@@ -1940,6 +2030,76 @@
 
         return super(ProcessDefinition, self).get_sorted_keys()
 
+    def get_minimum_WEIGHTED(self):
+        """Retrieve the minimum starting guess for WEIGHTED order, to
+        use in find_optimal_process_orders in MultiProcess diagram
+        generation (as well as particles and hierarchy). The algorithm:
+
+        1) Pick out the legs in the multiprocess according to the
+        highest hierarchy represented (so don't mix particles from
+        different hierarchy classes in the same multiparticles!)
+
+        2) Find the starting maximum WEIGHTED order as the sum of the
+        highest n-2 weighted orders
+
+        3) Pick out required s-channel particle hierarchies, and use
+        the highest of the maximum WEIGHTED order from the legs and
+        the minimum WEIGHTED order extracted from 2*s-channel
+        hierarchys plus the n-2-2*(number of s-channels) lowest
+        leg weighted orders.
+        """
+
+        model = self.get('model')
+        
+        # Extract hierarchy and particles corresponding to the
+        # different hierarchy levels from the model
+        particles, hierarchy = model.get_particles_hierarchy()
+
+        # Find legs corresponding to the different orders
+        # making sure we look at lowest hierarchy first for each leg
+        max_order_now = []
+        new_legs =  copy.copy(self.get('legs'))
+        for parts, value in zip(particles, hierarchy):
+            ileg = 0
+            while ileg < len(new_legs):
+                if any([id in parts for id in new_legs[ileg].get('ids')]):
+                    max_order_now.append(value)
+                    new_legs.pop(ileg)
+                else:
+                    ileg += 1
+
+        # Now remove the two lowest orders to get maximum (since the
+        # number of interactions is n-2)
+        max_order_now = sorted(max_order_now)[2:]
+
+        # Find s-channel propagators corresponding to the different orders
+        max_order_prop = []
+        for idlist in self.get('required_s_channels'):
+            max_order_prop.append([0,0])
+            for id in idlist:
+                for parts, value in zip(particles, hierarchy):
+                    if id in parts:
+                        max_order_prop[-1][0] += 2*value
+                        max_order_prop[-1][1] += 1
+                        break
+
+        if max_order_prop:
+            if len(max_order_prop) >1:
+                max_order_prop = min(*max_order_prop, key=lambda x:x[0])
+            else:
+                max_order_prop = max_order_prop[0]
+
+            # Use either the max_order from the external legs or
+            # the maximum order from the s-channel propagators, plus
+            # the appropriate lowest orders from max_order_now
+            max_order_now = max(sum(max_order_now),
+                                max_order_prop[0] + \
+                                sum(max_order_now[:-2 * max_order_prop[1]]))
+        else:
+            max_order_now = sum(max_order_now)            
+
+        return max_order_now, particles, hierarchy
+
     def nice_string(self, indent=0):
         """Returns a nicely formated string about current process
         content"""
@@ -1983,7 +2143,7 @@
 
         if self['orders']:
             mystr = mystr + " ".join([key + '=' + repr(self['orders'][key]) \
-                       for key in self['orders']]) + ' '
+                       for key in sorted(self['orders'])]) + ' '
 
         # Remove last space
         mystr = mystr[:-1]
@@ -1992,7 +2152,7 @@
             mystr += " @%d" % self.get('id')
             if self.get('overall_orders'):
                 mystr += " " + " ".join([key + '=' + repr(self['orders'][key]) \
-                       for key in self['orders']]) + ' '
+                       for key in sorted(self['orders'])]) + ' '
         
         if not self.get('decay_chains'):
             return mystr

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2011-06-01 21:18:40 +0000
+++ madgraph/core/diagram_generation.py	2011-07-22 20:26:18 +0000
@@ -686,7 +686,9 @@
         """Return False if the coupling orders for any coupling is <
         0, otherwise return the new coupling orders with the vertex
         orders subtracted. If coupling_orders is not given, return
-        None (which counts as success)"""
+        None (which counts as success).
+        WEIGHTED is a special order, which corresponds to the sum of
+        order hierarchys for the couplings."""
 
         if not coupling_orders:
             return None
@@ -702,13 +704,20 @@
                 # constraint
                 if coupling in present_couplings:
                     # Reduce the number of couplings that are left
-                    present_couplings[coupling] = \
-                             present_couplings[coupling] - \
+                    present_couplings[coupling] -= \
                              inter.get('orders')[coupling]
                     if present_couplings[coupling] < 0:
                         # We have too many couplings of this type
                         return False
-
+            # Now check for WEIGHTED, i.e. the sum of coupling hierarchy values
+            if 'WEIGHTED' in present_couplings:
+                weight = sum([model.get('order_hierarchy')[c]*n for \
+                              (c,n) in inter.get('orders').items()])
+                present_couplings['WEIGHTED'] -= weight
+                if present_couplings['WEIGHTED'] < 0:
+                        # Total coupling weight too large
+                        return False
+                
         return present_couplings
 
     def combine_legs(self, list_legs, ref_dict_to1, max_multi_to1):
@@ -1199,8 +1208,10 @@
 
         # Set automatic coupling orders
         process_definition.set('orders', MultiProcess.\
-                               find_maximal_non_qcd_order(process_definition))
-        
+                               find_optimal_process_orders(process_definition))
+        # Check for maximum orders from the model
+        process_definition.check_expansion_orders()
+
         processes = base_objects.ProcessList()
         amplitudes = AmplitudeList()
 
@@ -1363,25 +1374,40 @@
         return amplitudes
             
     @staticmethod
-    def find_maximal_non_qcd_order(process_definition):
-        """Find the maximal QCD order for this set of processes.
+    def find_optimal_process_orders(process_definition):
+        """Find the minimal WEIGHTED order for this set of processes.
+
         The algorithm:
 
-        1) Check that there is only one non-QCD coupling in model.
+        1) Check the coupling hierarchy of the model. Assign all
+        particles to the different coupling hierarchies so that a
+        particle is considered to be in the highest hierarchy (i.e.,
+        with lowest value) where it has an interaction.
         
-        2) Find number of non-QCD-charged legs. This is the starting
-        non-QCD order. If non-QCD required s-channel particles are
-        specified, use the maximum of non-QCD legs and 2*number of
-        non-QCD s-channel particles as starting non-QCD order.
-
-        3) Run process generation with the maximal non-QCD order with
-        all gluons removed from the final state, until we find a
-        process which passes. Return that order.
-
-        4) If no processes pass with the given order, increase order
-        by one and repeat from 3) until we order #final - 1.
-
-        5) If no processes found, return non-QCD order = #final.
+        2) Pick out the legs in the multiprocess according to the
+        highest hierarchy represented (so don't mix particles from
+        different hierarchy classes in the same multiparticles!)
+
+        3) Find the starting maximum WEIGHTED order as the sum of the
+        highest n-2 weighted orders
+
+        4) Pick out required s-channel particle hierarchies, and use
+        the highest of the maximum WEIGHTED order from the legs and
+        the minimum WEIGHTED order extracted from 2*s-channel
+        hierarchys plus the n-2-2*(number of s-channels) lowest
+        leg weighted orders.
+
+        5) Run process generation with the WEIGHTED order determined
+        in 3)-4) - # final state gluons, with all gluons removed from
+        the final state
+
+        6) If no process is found, increase WEIGHTED order by 1 and go
+        back to 5), until we find a process which passes. Return that
+        order.
+
+        7) Continue 5)-6) until we reach (n-2)*(highest hierarchy)-1.
+        If still no process has passed, return
+        WEIGHTED = (n-2)*(highest hierarchy)
         """
 
         assert isinstance(process_definition, base_objects.ProcessDefinition), \
@@ -1396,72 +1422,38 @@
                process_definition.get('overall_orders'):
             return process_definition.get('orders')
 
-        temp_process_definition = copy.copy(process_definition)
-
-        model = process_definition['model']
+        logger.info("Checking for minimal orders which gives processes.")
+        logger.info("Please specify coupling orders to bypass this step.")
+
+        # Calculate minimum starting guess for WEIGHTED order
+        max_order_now, particles, hierarchy = \
+                                       process_definition.get_minimum_WEIGHTED()
+        coupling = 'WEIGHTED'
+
+        model = process_definition.get('model')
         
+        # Extract the initial and final leg ids
         isids = [leg['ids'] for leg in \
                  filter(lambda leg: leg['state'] == False, process_definition['legs'])]
         fsids = [leg['ids'] for leg in \
                  filter(lambda leg: leg['state'] == True, process_definition['legs'])]
 
-        # Find coupling orders in model
-        orders = list(set(sum([i.get('orders').keys() for i in \
-                               model.get('interactions')], [])))
-        non_QCD_orders = [order for order in  orders if order != 'QCD']
-        if len(non_QCD_orders) != 1 or len(orders)-len(non_QCD_orders) != 1:
-            # Too many or few orders
-            logger.info("Automatic coupling order check not possible " + \
-                        "for this model.")
-            logger.info("Please specify coupling orders by hand.")
-            return {}
-
-        coupling = non_QCD_orders[0]
-        
-        logger.info("Checking for minimal non-QCD order which gives processes.")
-        logger.info("Please specify coupling orders to bypass this step.")
-
-        # Find number of non-QCD-charged legs
-        max_order_now = 0
-        for l in process_definition.get('legs'):
-            if any([model.get_particle(id).get('color') > 1 for id in \
-                    l.get('ids')]):
-                continue
-            max_order_now += 1
-
-        # Check for non-QCD-charged s-channel propagators
-        max_order_prop = []
-        for idlist in process_definition.get('required_s_channels'):
-            max_order_prop.append(0)
-            for id in idlist:
-                if model.get_particle(id).get('color') > 1:
-                    continue
-                max_order_prop[-1] += 2
-
-        if max_order_prop:
-            if len(max_order_prop) >1:
-                max_order_prop = min(*max_order_prop)
-            else:
-                max_order_prop = max_order_prop[0]
-
-            max_order_now = max(max_order_now, max_order_prop)
-
-        # Generate all combinations for the initial state
-        
-        while max_order_now < len(fsids):
-
-            logger.info("Trying coupling order %s=%d" % (coupling,
-                                                         max_order_now))
+        # Run diagram generation with increasing max_order_now until
+        # we manage to get diagrams
+        while max_order_now < len(fsids)*max(hierarchy):
+
+            logger.info("Trying coupling order WEIGHTED=%d" % max_order_now)
+
             oldloglevel = logger.getEffectiveLevel()
             logger.setLevel(logging.WARNING)
 
             # failed_procs are processes that have already failed
             # based on crossing symmetry
             failed_procs = []
-
+            
+            # Generate all combinations for the initial state        
             for prod in apply(itertools.product, isids):
-                islegs = [\
-                        base_objects.Leg({'id':id, 'state': False}) \
+                islegs = [ base_objects.Leg({'id':id, 'state': False}) \
                         for id in prod]
 
                 # Generate all combinations for the final state, and make
@@ -1477,8 +1469,12 @@
 
                     red_fsidlist.append(tuple(sorted(prod)));
 
-                    # Remove gluons from final state
-                    prod = [id for id in prod if id != 21]
+                    # Remove gluons from final state if QCD is among
+                    # the highest coupling hierarchy
+                    nglue = 0
+                    if 21 in particles[0]:
+                        nglue = len([id for id in prod if id == 21])
+                        prod = [id for id in prod if id != 21]
 
                     # Generate leg list for process
                     leg_list = [copy.copy(leg) for leg in islegs]
@@ -1489,13 +1485,15 @@
 
                     legs = base_objects.LegList(leg_list)
 
-                    # Set coupling order
-                    coupling_orders_now = {coupling: max_order_now}
+                    # Set summed coupling order according to max_order_now
+                    # subtracting the removed gluons
+                    coupling_orders_now = {coupling: max_order_now - \
+                                           nglue}
 
                     # Setup process
                     process = base_objects.Process({\
                               'legs':legs,
-                              'model':process_definition.get('model'),
+                              'model':model,
                               'id': process_definition.get('id'),
                               'orders': coupling_orders_now,
                               'required_s_channels': \
@@ -1509,6 +1507,9 @@
                               'overall_orders': \
                                  process_definition.get('overall_orders')})
 
+                    # Check for couplings with given expansion orders
+                    process.check_expansion_orders()
+
                     # Check for crossed processes
                     sorted_legs = sorted(legs.get_outgoing_id_list(model))
                     # Check if crossed process has already failed
@@ -1533,8 +1534,8 @@
             max_order_now += 1
             logger.setLevel(oldloglevel)
 
-        # If no valid processes found with nfinal-1 couplings, return nfinal
-        return {coupling: len(fsids)}        
+        # If no valid processes found with nfinal-1 couplings, return maximal
+        return {coupling: len(fsids)*max(hierarchy)}
 
     @staticmethod
     def cross_amplitude(amplitude, process, org_perm, new_perm):

=== modified file 'madgraph/iolibs/drawing_eps.py'
--- madgraph/iolibs/drawing_eps.py	2011-06-15 18:49:22 +0000
+++ madgraph/iolibs/drawing_eps.py	2011-07-22 20:26:18 +0000
@@ -239,7 +239,8 @@
                                                             #zero.
 
         mystr = " (%s)" % ", ".join(["%s=%d" % (key, self.diagram.diagram['orders'][key]) \
-                                        for key in self.diagram.diagram['orders'].keys()])
+                      for key in sorted(self.diagram.diagram['orders'].keys()) \
+                      if key != 'WEIGHTED'])
         
         x = 0.6
         y = -0.17

=== modified file 'madgraph/iolibs/import_v4.py'
--- madgraph/iolibs/import_v4.py	2011-05-08 07:27:55 +0000
+++ madgraph/iolibs/import_v4.py	2011-07-22 20:26:18 +0000
@@ -70,7 +70,7 @@
                                   model['particles']))
     
     model.set('name', os.path.split(model_path)[-1])  
-    
+
     # save in a pickle files to fasten future usage
     save_load_object.save_to_file(os.path.join(model_path, 'model.pkl'), model)
     

=== modified file 'models/2HDM/__init__.py'
--- models/2HDM/__init__.py	2011-04-11 23:28:30 +0000
+++ models/2HDM/__init__.py	2011-07-22 20:26:18 +0000
@@ -4,6 +4,7 @@
 import lorentz
 import parameters
 import vertices
+import coupling_orders
 import write_param_card
 
 
@@ -12,9 +13,10 @@
 all_couplings = couplings.all_couplings
 all_lorentz = lorentz.all_lorentz
 all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
 
 
-__author__ = "C. Duhr, M. Herquet"
-__version__ = "1.0"
-__email__ = "[e-mail], [e-mail]"
+__author__ = "N. Christensen, C. Duhr"
+__version__ = "1.3"
+__email__ = "[e-mail], [e-mail]"

=== added file 'models/2HDM/coupling_orders.py'
--- models/2HDM/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/2HDM/coupling_orders.py	2011-07-22 20:26:18 +0000
@@ -0,0 +1,15 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 19 Jul 2011 18:23:49
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = -1,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = -1,
+                    hierarchy = 2)

=== modified file 'models/2HDM/object_library.py'
--- models/2HDM/object_library.py	2011-04-11 23:28:30 +0000
+++ models/2HDM/object_library.py	2011-07-22 20:26:18 +0000
@@ -228,5 +228,18 @@
 
         return eval(self.expr)
 
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+
 
         

=== modified file 'models/4Gen/__init__.py'
--- models/4Gen/__init__.py	2011-04-10 15:43:51 +0000
+++ models/4Gen/__init__.py	2011-07-22 20:26:18 +0000
@@ -4,6 +4,7 @@
 import lorentz
 import parameters
 import vertices
+import coupling_orders
 import write_param_card
 
 
@@ -12,9 +13,10 @@
 all_couplings = couplings.all_couplings
 all_lorentz = lorentz.all_lorentz
 all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
 
 
-__author__ = "C. Duhr"
-__version__ = "1.1"
-__email__ = "[e-mail]"
+__author__ = "N. Christensen, C. Duhr"
+__version__ = "1.3"
+__email__ = "[e-mail], [e-mail]"

=== added file 'models/4Gen/coupling_orders.py'
--- models/4Gen/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/4Gen/coupling_orders.py	2011-07-22 20:26:18 +0000
@@ -0,0 +1,15 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 19 Jul 2011 18:23:49
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = -1,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = -1,
+                    hierarchy = 2)

=== modified file 'models/4Gen/object_library.py'
--- models/4Gen/object_library.py	2011-04-10 15:43:51 +0000
+++ models/4Gen/object_library.py	2011-07-22 20:26:18 +0000
@@ -228,5 +228,18 @@
 
         return eval(self.expr)
 
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+
 
         

=== modified file 'models/RS/__init__.py'
--- models/RS/__init__.py	2011-04-10 15:43:51 +0000
+++ models/RS/__init__.py	2011-07-22 20:26:18 +0000
@@ -4,6 +4,7 @@
 import lorentz
 import parameters
 import vertices
+import coupling_orders
 import write_param_card
 
 
@@ -12,9 +13,10 @@
 all_couplings = couplings.all_couplings
 all_lorentz = lorentz.all_lorentz
 all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
 
 
-__author__ = "Priscila de Aquino"
-__version__ = "2.0"
-__email__ = "[e-mail]"
+__author__ = "N. Christensen, C. Duhr"
+__version__ = "1.3"
+__email__ = "[e-mail], [e-mail]"

=== added file 'models/RS/coupling_orders.py'
--- models/RS/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/RS/coupling_orders.py	2011-07-22 20:26:18 +0000
@@ -0,0 +1,15 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 19 Jul 2011 18:23:49
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = -1,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = -1,
+                    hierarchy = 2)

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

=== modified file 'models/SMScalars/__init__.py'
--- models/SMScalars/__init__.py	2011-04-10 15:43:51 +0000
+++ models/SMScalars/__init__.py	2011-07-22 20:26:18 +0000
@@ -4,6 +4,7 @@
 import lorentz
 import parameters
 import vertices
+import coupling_orders
 import write_param_card
 
 
@@ -12,9 +13,10 @@
 all_couplings = couplings.all_couplings
 all_lorentz = lorentz.all_lorentz
 all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
 
 
-__author__ = "C. Duhr"
-__version__ = "1.0"
-__email__ = "[e-mail]"
+__author__ = "N. Christensen, C. Duhr"
+__version__ = "1.3"
+__email__ = "[e-mail], [e-mail]"

=== added file 'models/SMScalars/coupling_orders.py'
--- models/SMScalars/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/SMScalars/coupling_orders.py	2011-07-22 20:26:18 +0000
@@ -0,0 +1,15 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 19 Jul 2011 18:23:49
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = -1,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = -1,
+                    hierarchy = 2)

=== modified file 'models/SMScalars/object_library.py'
--- models/SMScalars/object_library.py	2011-04-10 15:43:51 +0000
+++ models/SMScalars/object_library.py	2011-07-22 20:26:18 +0000
@@ -228,5 +228,18 @@
 
         return eval(self.expr)
 
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+
 
         

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

=== removed file 'models/heft/Higgs_Effective_Couplings_UFO.log'
--- models/heft/Higgs_Effective_Couplings_UFO.log	2011-05-28 20:11:29 +0000
+++ models/heft/Higgs_Effective_Couplings_UFO.log	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-# This file was automatically created by FeynRules $Revision: 623 $
-# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Sat 28 May 2011 18:07:33
-
-
-# 
-# This is the logfile for the model Higgs_Effective_Couplings
-
-# Authors: N. Christensen, C. Duhr
-# Model version: 1.3
-# Checking the Lagrangians
-   * All Lagrangians are ok.
-#
-# Particle definitions
-#
-
-   * No particles removed. All particles correspond to GenInt setup.
-
-# Automatically assigned PDG numbers
-   * Assigned PDG number 9000001 to particle ghA
-   * Assigned PDG number 9000002 to particle ghZ
-   * Assigned PDG number 9000003 to particle ghWp
-   * Assigned PDG number 9000004 to particle ghWm
-   * Assigned PDG number 9000005 to particle ghG
-   * Assigned PDG number 9000006 to particle h1
-
-
-# Compulsory PDG codes:
-   * Class SM leptons complete.
-   * Class SM neutrinos complete.
-   * Class SM quarks complete.
-   * Class SM gauge bosons complete.
-#
-# Parameter definitions
-#
-
-   * All parameters are ok.
-
-
-# Vertices
-   * Calling FeynmanRules for 1 Lagrangians.
-   * Number of classes vertices: 36
-   * Number of flavored vertices: 74
-   * Saved vertices in InterfaceRun[ 1 ].
-   * Removing all ghosts and Goldstone bosons form the output.
-   * Checked QNumber conservation.
-      - Quantum number GhostNumber conserved in all vertices.
-      - Quantum number LeptonNumber conserved in all vertices.
-      - Quantum number Q conserved in all vertices.
-   * particles.py written.
-   * parameters.py written.
-#
-# Vertex definitions
-#
-
-   * 73 vertices written.
-   * vertices.py written.
-#
-# Lorentz structure definitions
-#
-
-   * 22 lorentz structures written.
-   * lorentz.py written.
-#
-# Coupling definitions
-#
-
-   * 50 couplings written.
-   * couplings.py written.

=== modified file 'models/heft/__init__.py'
--- models/heft/__init__.py	2011-04-10 15:43:51 +0000
+++ models/heft/__init__.py	2011-07-22 20:26:18 +0000
@@ -4,6 +4,7 @@
 import lorentz
 import parameters
 import vertices
+import coupling_orders
 import write_param_card
 
 
@@ -12,6 +13,7 @@
 all_couplings = couplings.all_couplings
 all_lorentz = lorentz.all_lorentz
 all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
 
 

=== added file 'models/heft/coupling_orders.py'
--- models/heft/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/heft/coupling_orders.py	2011-07-22 20:26:18 +0000
@@ -0,0 +1,24 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Wed 20 Jul 2011 12:58:03
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = 99,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = 99,
+                    hierarchy = 2)
+
+HIG = CouplingOrder(name = 'HIG',
+                    expansion_order = 1,
+                    hierarchy = 2)
+
+HIW = CouplingOrder(name = 'HIW',
+                    expansion_order = 1,
+                    hierarchy = 2)
+

=== modified file 'models/heft/couplings.py'
--- models/heft/couplings.py	2011-05-28 20:11:29 +0000
+++ models/heft/couplings.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 623 $
+# This file was automatically created by FeynRules $Revision: 634 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Sat 28 May 2011 18:07:45
+# Date: Wed 20 Jul 2011 12:58:03
 
 
 from object_library import all_couplings, Coupling
@@ -166,46 +166,58 @@
                  order = {'QED':1})
 
 GC_40 = Coupling(name = 'GC_40',
+                 value = '-((complex(0,1)*yc)/cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_41 = Coupling(name = 'GC_41',
+                 value = '-((complex(0,1)*ye)/cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_42 = Coupling(name = 'GC_42',
+                 value = '-((complex(0,1)*ym)/cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_43 = Coupling(name = 'GC_43',
                  value = '-((complex(0,1)*yt)/cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_41 = Coupling(name = 'GC_41',
+GC_44 = Coupling(name = 'GC_44',
                  value = '-((complex(0,1)*ytau)/cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_42 = Coupling(name = 'GC_42',
+GC_45 = Coupling(name = 'GC_45',
                  value = '(ee*complex(0,1)*complexconjugate(CKM11))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_43 = Coupling(name = 'GC_43',
+GC_46 = Coupling(name = 'GC_46',
                  value = '(ee*complex(0,1)*complexconjugate(CKM12))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_44 = Coupling(name = 'GC_44',
+GC_47 = Coupling(name = 'GC_47',
                  value = '(ee*complex(0,1)*complexconjugate(CKM13))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_45 = Coupling(name = 'GC_45',
+GC_48 = Coupling(name = 'GC_48',
                  value = '(ee*complex(0,1)*complexconjugate(CKM21))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_46 = Coupling(name = 'GC_46',
+GC_49 = Coupling(name = 'GC_49',
                  value = '(ee*complex(0,1)*complexconjugate(CKM22))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_47 = Coupling(name = 'GC_47',
+GC_50 = Coupling(name = 'GC_50',
                  value = '(ee*complex(0,1)*complexconjugate(CKM23))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_48 = Coupling(name = 'GC_48',
+GC_51 = Coupling(name = 'GC_51',
                  value = '(ee*complex(0,1)*complexconjugate(CKM31))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_49 = Coupling(name = 'GC_49',
+GC_52 = Coupling(name = 'GC_52',
                  value = '(ee*complex(0,1)*complexconjugate(CKM32))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
-GC_50 = Coupling(name = 'GC_50',
+GC_53 = Coupling(name = 'GC_53',
                  value = '(ee*complex(0,1)*complexconjugate(CKM33))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 

=== modified file 'models/heft/lorentz.py'
--- models/heft/lorentz.py	2011-05-28 20:11:29 +0000
+++ models/heft/lorentz.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 623 $
+# This file was automatically created by FeynRules $Revision: 634 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Sat 28 May 2011 18:07:45
+# Date: Wed 20 Jul 2011 12:58:03
 
 
 from object_library import all_lorentz, Lorentz

=== modified file 'models/heft/object_library.py'
--- models/heft/object_library.py	2011-05-28 20:11:29 +0000
+++ models/heft/object_library.py	2011-07-22 20:26:18 +0000
@@ -230,9 +230,9 @@
 
 all_orders = []
 
-class Order(object):
+class CouplingOrder(object):
 
-    def __init__(self, name, expansion_order, hierarchy):
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
         
         global all_orders
         all_orders.append(self)

=== modified file 'models/heft/parameters.py'
--- models/heft/parameters.py	2011-05-28 20:11:29 +0000
+++ models/heft/parameters.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 623 $
+# This file was automatically created by FeynRules $Revision: 634 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Sat 28 May 2011 18:07:45
+# Date: Wed 20 Jul 2011 12:58:03
 
 
 
@@ -44,7 +44,7 @@
 lamWS = Parameter(name = 'lamWS',
                   nature = 'external',
                   type = 'real',
-                  value = 0,
+                  value = 0.2253,
                   texname = '\\text{lamWS}',
                   lhablock = 'Wolfenstein',
                   lhacode = [ 1 ])
@@ -52,7 +52,7 @@
 AWS = Parameter(name = 'AWS',
                 nature = 'external',
                 type = 'real',
-                value = 0,
+                value = 0.808,
                 texname = '\\text{AWS}',
                 lhablock = 'Wolfenstein',
                 lhacode = [ 2 ])
@@ -60,7 +60,7 @@
 rhoWS = Parameter(name = 'rhoWS',
                   nature = 'external',
                   type = 'real',
-                  value = 0,
+                  value = 0.132,
                   texname = '\\text{rhoWS}',
                   lhablock = 'Wolfenstein',
                   lhacode = [ 3 ])
@@ -68,15 +68,23 @@
 etaWS = Parameter(name = 'etaWS',
                   nature = 'external',
                   type = 'real',
-                  value = 0,
+                  value = 0.341,
                   texname = '\\text{etaWS}',
                   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',
-                value = 4.7,
+                value = 4.2,
                 texname = '\\text{ymb}',
                 lhablock = 'YUKAWA',
                 lhacode = [ 5 ])
@@ -84,11 +92,27 @@
 ymt = Parameter(name = 'ymt',
                 nature = 'external',
                 type = 'real',
-                value = 172.,
+                value = 164.5,
                 texname = '\\text{ymt}',
                 lhablock = 'YUKAWA',
                 lhacode = [ 6 ])
 
+yme = Parameter(name = 'yme',
+                nature = 'external',
+                type = 'real',
+                value = 0.0005110000000000001,
+                texname = '\\text{yme}',
+                lhablock = 'YUKAWA',
+                lhacode = [ 11 ])
+
+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',
@@ -97,18 +121,18 @@
                   lhablock = 'YUKAWA',
                   lhacode = [ 15 ])
 
-MTA = Parameter(name = 'MTA',
-                nature = 'external',
-                type = 'real',
-                value = 1.777,
-                texname = '\\text{MTA}',
-                lhablock = 'MASS',
-                lhacode = [ 15 ])
+MC = Parameter(name = 'MC',
+               nature = 'external',
+               type = 'real',
+               value = 1.42,
+               texname = '\\text{MC}',
+               lhablock = 'MASS',
+               lhacode = [ 4 ])
 
 MT = Parameter(name = 'MT',
                nature = 'external',
                type = 'real',
-               value = 172,
+               value = 172.,
                texname = '\\text{MT}',
                lhablock = 'MASS',
                lhacode = [ 6 ])
@@ -132,11 +156,35 @@
 MH = Parameter(name = 'MH',
                nature = 'external',
                type = 'real',
-               value = 120,
+               value = 120.,
                texname = '\\text{MH}',
                lhablock = 'MASS',
                lhacode = [ 25 ])
 
+Me = Parameter(name = 'Me',
+               nature = 'external',
+               type = 'real',
+               value = 0.0005110000000000001,
+               texname = '\\text{Me}',
+               lhablock = 'MASS',
+               lhacode = [ 11 ])
+
+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',
+                value = 1.777,
+                texname = '\\text{MTA}',
+                lhablock = 'MASS',
+                lhacode = [ 15 ])
+
 MP = Parameter(name = 'MP',
                nature = 'external',
                type = 'real',
@@ -148,7 +196,7 @@
 WT = Parameter(name = 'WT',
                nature = 'external',
                type = 'real',
-               value = 1.4611,
+               value = 1.50833649,
                texname = '\\text{WT}',
                lhablock = 'DECAY',
                lhacode = [ 6 ])
@@ -177,6 +225,14 @@
                lhablock = 'DECAY',
                lhacode = [ 25 ])
 
+WTau = Parameter(name = 'WTau',
+                 nature = 'external',
+                 type = 'real',
+                 value = 2.27e-12,
+                 texname = '\\text{WTau}',
+                 lhablock = 'DECAY',
+                 lhacode = [ 15 ])
+
 WH1 = Parameter(name = 'WH1',
                 nature = 'external',
                 type = 'real',
@@ -200,7 +256,7 @@
 CKM13 = Parameter(name = 'CKM13',
                   nature = 'internal',
                   type = 'complex',
-                  value = 'AWS*lamWS*(-(etaWS*complex(0,1)) + rhoWS)',
+                  value = 'AWS*lamWS**3*(-(etaWS*complex(0,1)) + rhoWS)',
                   texname = '\\text{CKM13}')
 
 CKM21 = Parameter(name = 'CKM21',
@@ -329,6 +385,24 @@
                value = '(ymb*cmath.sqrt(2))/v',
                texname = '\\text{yb}')
 
+yc = Parameter(name = 'yc',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymc*cmath.sqrt(2))/v',
+               texname = '\\text{yc}')
+
+ye = Parameter(name = 'ye',
+               nature = 'internal',
+               type = 'real',
+               value = '(yme*cmath.sqrt(2))/v',
+               texname = '\\text{ye}')
+
+ym = Parameter(name = 'ym',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymm*cmath.sqrt(2))/v',
+               texname = '\\text{ym}')
+
 yt = Parameter(name = 'yt',
                nature = 'internal',
                type = 'real',

=== modified file 'models/heft/particles.py'
--- models/heft/particles.py	2011-05-28 20:11:29 +0000
+++ models/heft/particles.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 623 $
+# This file was automatically created by FeynRules $Revision: 634 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Sat 28 May 2011 18:07:45
+# Date: Wed 20 Jul 2011 12:58:03
 
 
 from __future__ import division
@@ -52,51 +52,6 @@
 
 vt__tilde__ = vt.anti()
 
-e__minus__ = Particle(pdg_code = 11,
-                      name = 'e-',
-                      antiname = 'e+',
-                      spin = 2,
-                      color = 1,
-                      mass = Param.ZERO,
-                      width = Param.ZERO,
-                      texname = 'e-',
-                      antitexname = 'e-',
-                      charge = -1,
-                      LeptonNumber = 1,
-                      GhostNumber = 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,
-                      LeptonNumber = 1,
-                      GhostNumber = 0)
-
-m__plus__ = m__minus__.anti()
-
-tt__minus__ = Particle(pdg_code = 15,
-                       name = 'tt-',
-                       antiname = 'tt+',
-                       spin = 2,
-                       color = 1,
-                       mass = Param.MTA,
-                       width = Param.ZERO,
-                       texname = 'tt-',
-                       antitexname = 'tt-',
-                       charge = -1,
-                       LeptonNumber = 1,
-                       GhostNumber = 0)
-
-tt__plus__ = tt__minus__.anti()
-
 u = Particle(pdg_code = 2,
              name = 'u',
              antiname = 'u~',
@@ -117,7 +72,7 @@
              antiname = 'c~',
              spin = 2,
              color = 3,
-             mass = Param.ZERO,
+             mass = Param.MC,
              width = Param.ZERO,
              texname = 'c',
              antitexname = 'c',
@@ -254,6 +209,51 @@
              LeptonNumber = 0,
              GhostNumber = 0)
 
+e__minus__ = Particle(pdg_code = 11,
+                      name = 'e-',
+                      antiname = 'e+',
+                      spin = 2,
+                      color = 1,
+                      mass = Param.Me,
+                      width = Param.ZERO,
+                      texname = 'e-',
+                      antitexname = 'e-',
+                      charge = -1,
+                      LeptonNumber = 1,
+                      GhostNumber = 0)
+
+e__plus__ = e__minus__.anti()
+
+m__minus__ = Particle(pdg_code = 13,
+                      name = 'm-',
+                      antiname = 'm+',
+                      spin = 2,
+                      color = 1,
+                      mass = Param.MM,
+                      width = Param.ZERO,
+                      texname = 'm-',
+                      antitexname = 'm-',
+                      charge = -1,
+                      LeptonNumber = 1,
+                      GhostNumber = 0)
+
+m__plus__ = m__minus__.anti()
+
+tt__minus__ = Particle(pdg_code = 15,
+                       name = 'tt-',
+                       antiname = 'tt+',
+                       spin = 2,
+                       color = 1,
+                       mass = Param.MTA,
+                       width = Param.WTau,
+                       texname = 'tt-',
+                       antitexname = 'tt-',
+                       charge = -1,
+                       LeptonNumber = 1,
+                       GhostNumber = 0)
+
+tt__plus__ = tt__minus__.anti()
+
 h1 = Particle(pdg_code = 9000006,
               name = 'h1',
               antiname = 'h1',

=== added file 'models/heft/restrict_ckm.dat'
--- models/heft/restrict_ckm.dat	1970-01-01 00:00:00 +0000
+++ models/heft/restrict_ckm.dat	2011-07-22 20:26:18 +0000
@@ -0,0 +1,53 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
+######################################################################
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block MASS 
+    4 0.000000e+00 # MC 
+    5 4.700000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 1.777000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.200000e+02 # MH 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
+
+###################################
+## INFORMATION FOR WOLFENSTEIN
+###################################
+Block Wolfenstein 
+    1 2.253000e-01 # lamWS 
+    2 8.080000e-01 # AWS 
+    3 1.320000e-01 # rhoWS 
+    4 3.410000e-01 # etaWS 
+
+###################################
+## INFORMATION FOR YUKAWA
+###################################
+Block YUKAWA 
+    4 0.000000e+00 # ymc 
+    5 4.200000e+00 # ymb 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
+   15 1.777000e+00 # ymtau 

=== modified file 'models/heft/restrict_default.dat'
--- models/heft/restrict_default.dat	2011-06-02 00:11:53 +0000
+++ models/heft/restrict_default.dat	2011-07-22 20:26:18 +0000
@@ -14,21 +14,23 @@
 ## INFORMATION FOR MASS
 ###################################
 Block MASS 
+    4 0.000000e+00 # MC 
     5 4.700000e+00 # MB 
-    6 1.720000e+02 # MT 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
    15 1.777000e+00 # MTA 
    23 9.118800e+01 # MZ 
    25 1.200000e+02 # MH 
-  9000006 1.200000e+02 # MP 
 
 ###################################
 ## INFORMATION FOR DECAY
 ###################################
-DECAY   6 1.439478E+00
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
 DECAY  23 2.441404e+00 
 DECAY  24 2.047600e+00 
 DECAY  25 5.753088e-03 
-DECAY 9000006 5.753088e-03 
 
 ###################################
 ## INFORMATION FOR WOLFENSTEIN
@@ -43,15 +45,9 @@
 ## INFORMATION FOR YUKAWA
 ###################################
 Block YUKAWA 
+    4 0.000000e+00 # ymc 
     5 4.200000e+00 # ymb 
     6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
    15 1.777000e+00 # ymtau 
-#===========================================================
-# QUANTUM NUMBERS OF NEW STATE(S) (NON SM PDG CODE)
-#===========================================================
-
-Block QNUMBERS 9000006  # h1 
-        1 0  # 3 times electric charge
-        2 3  # number of spin states (2S+1)
-        3 1  # colour rep (1: singlet, 3: triplet, 8: octet)
-        4 0  # Particle/Antiparticle distinction (0=own anti)

=== added file 'models/heft/restrict_no_b_mass.dat'
--- models/heft/restrict_no_b_mass.dat	1970-01-01 00:00:00 +0000
+++ models/heft/restrict_no_b_mass.dat	2011-07-22 20:26:18 +0000
@@ -0,0 +1,53 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
+######################################################################
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block MASS 
+    4 0.000000e+00 # MC 
+    5 0.000000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 1.777000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.200000e+02 # MH 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
+
+###################################
+## 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 0.000000e+00 # ymb 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
+   15 1.777000e+00 # ymtau 

=== added file 'models/heft/restrict_no_masses.dat'
--- models/heft/restrict_no_masses.dat	1970-01-01 00:00:00 +0000
+++ models/heft/restrict_no_masses.dat	2011-07-22 20:26:18 +0000
@@ -0,0 +1,53 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
+######################################################################
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block MASS 
+    4 0.000000e+00 # MC 
+    5 0.000000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 0.000000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.200000e+02 # MH 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
+
+###################################
+## 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 0.000000e+00 # ymb 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
+   15 0.000000e+00 # ymtau 

=== added file 'models/heft/restrict_no_tau_mass.dat'
--- models/heft/restrict_no_tau_mass.dat	1970-01-01 00:00:00 +0000
+++ models/heft/restrict_no_tau_mass.dat	2011-07-22 20:26:18 +0000
@@ -0,0 +1,53 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
+######################################################################
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block MASS 
+    4 0.000000e+00 # MC 
+    5 4.700000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 0.000000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.200000e+02 # MH 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
+
+###################################
+## 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.200000e+00 # ymb 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
+   15 0.000000e+00 # ymtau 

=== added file 'models/heft/restrict_zeromass_ckm.dat'
--- models/heft/restrict_zeromass_ckm.dat	1970-01-01 00:00:00 +0000
+++ models/heft/restrict_zeromass_ckm.dat	2011-07-22 20:26:18 +0000
@@ -0,0 +1,53 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
+######################################################################
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block MASS 
+    4 0.000000e+00 # MC 
+    5 0.000000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 0.000000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.200000e+02 # MH 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
+
+###################################
+## INFORMATION FOR WOLFENSTEIN
+###################################
+Block Wolfenstein 
+    1 2.253000e-01 # lamWS 
+    2 8.080000e-01 # AWS 
+    3 1.320000e-01 # rhoWS 
+    4 3.410000e-01 # etaWS 
+
+###################################
+## INFORMATION FOR YUKAWA
+###################################
+Block YUKAWA 
+    4 0.000000e+00 # ymc 
+    5 0.000000e+00 # ymb 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
+   15 0.000000e+00 # ymtau 

=== modified file 'models/heft/vertices.py'
--- models/heft/vertices.py	2011-05-28 20:11:29 +0000
+++ models/heft/vertices.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 623 $
+# This file was automatically created by FeynRules $Revision: 634 $
 # Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
-# Date: Sat 28 May 2011 18:07:45
+# Date: Wed 20 Jul 2011 12:58:03
 
 
 from object_library import all_vertices, Vertex
@@ -46,23 +46,23 @@
              couplings = {(1,1):C.GC_7,(0,0):C.GC_7,(2,2):C.GC_7})
 
 V_7 = Vertex(name = 'V_7',
+             particles = [ P.G, P.G, P.G, P.h1 ],
+             color = [ 'f(1,2,3)' ],
+             lorentz = [ L.VVVS1 ],
+             couplings = {(0,0):C.GC_12})
+
+V_8 = Vertex(name = 'V_8',
              particles = [ P.G, P.G, P.G, P.H ],
              color = [ 'f(1,2,3)' ],
              lorentz = [ L.VVVS2 ],
              couplings = {(0,0):C.GC_9})
 
-V_8 = Vertex(name = 'V_8',
+V_9 = Vertex(name = 'V_9',
              particles = [ P.G, P.G, P.G, P.G, P.H ],
              color = [ 'f(-1,1,2)*f(3,4,-1)', 'f(-1,1,3)*f(2,4,-1)', 'f(-1,1,4)*f(2,3,-1)' ],
              lorentz = [ L.VVVVS1, L.VVVVS2, L.VVVVS3 ],
              couplings = {(1,1):C.GC_10,(0,0):C.GC_10,(2,2):C.GC_10})
 
-V_9 = Vertex(name = 'V_9',
-             particles = [ P.G, P.G, P.G, P.h1 ],
-             color = [ 'f(1,2,3)' ],
-             lorentz = [ L.VVVS1 ],
-             couplings = {(0,0):C.GC_12})
-
 V_10 = Vertex(name = 'V_10',
               particles = [ P.A, P.W__minus__, P.W__plus__ ],
               color = [ '1' ],
@@ -277,55 +277,55 @@
               particles = [ P.u__tilde__, P.d, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_42})
+              couplings = {(0,0):C.GC_45})
 
 V_46 = Vertex(name = 'V_46',
               particles = [ P.c__tilde__, P.d, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_45})
+              couplings = {(0,0):C.GC_48})
 
 V_47 = Vertex(name = 'V_47',
               particles = [ P.t__tilde__, P.d, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_48})
+              couplings = {(0,0):C.GC_51})
 
 V_48 = Vertex(name = 'V_48',
               particles = [ P.u__tilde__, P.s, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_43})
+              couplings = {(0,0):C.GC_46})
 
 V_49 = Vertex(name = 'V_49',
               particles = [ P.c__tilde__, P.s, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_46})
+              couplings = {(0,0):C.GC_49})
 
 V_50 = Vertex(name = 'V_50',
               particles = [ P.t__tilde__, P.s, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_49})
+              couplings = {(0,0):C.GC_52})
 
 V_51 = Vertex(name = 'V_51',
               particles = [ P.u__tilde__, P.b, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_44})
+              couplings = {(0,0):C.GC_47})
 
 V_52 = Vertex(name = 'V_52',
               particles = [ P.c__tilde__, P.b, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_47})
+              couplings = {(0,0):C.GC_50})
 
 V_53 = Vertex(name = 'V_53',
               particles = [ P.t__tilde__, P.b, P.W__plus__ ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2 ],
-              couplings = {(0,0):C.GC_50})
+              couplings = {(0,0):C.GC_53})
 
 V_54 = Vertex(name = 'V_54',
               particles = [ P.u__tilde__, P.u, P.G ],
@@ -346,102 +346,120 @@
               couplings = {(0,0):C.GC_6})
 
 V_57 = Vertex(name = 'V_57',
-              particles = [ P.tt__plus__, P.tt__minus__, P.H ],
+              particles = [ P.e__plus__, P.e__minus__, P.H ],
               color = [ '1' ],
               lorentz = [ L.FFS1 ],
               couplings = {(0,0):C.GC_41})
 
 V_58 = Vertex(name = 'V_58',
+              particles = [ P.m__plus__, P.m__minus__, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_42})
+
+V_59 = Vertex(name = 'V_59',
+              particles = [ P.tt__plus__, P.tt__minus__, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_44})
+
+V_60 = Vertex(name = 'V_60',
+              particles = [ P.c__tilde__, P.c, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_40})
+
+V_61 = Vertex(name = 'V_61',
               particles = [ P.t__tilde__, P.t, P.H ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFS1 ],
-              couplings = {(0,0):C.GC_40})
+              couplings = {(0,0):C.GC_43})
 
-V_59 = Vertex(name = 'V_59',
+V_62 = Vertex(name = 'V_62',
               particles = [ P.e__plus__, P.e__minus__, P.Z ],
               color = [ '1' ],
               lorentz = [ L.FFV2, L.FFV4 ],
               couplings = {(0,0):C.GC_27,(0,1):C.GC_30})
 
-V_60 = Vertex(name = 'V_60',
+V_63 = Vertex(name = 'V_63',
               particles = [ P.m__plus__, P.m__minus__, P.Z ],
               color = [ '1' ],
               lorentz = [ L.FFV2, L.FFV4 ],
               couplings = {(0,0):C.GC_27,(0,1):C.GC_30})
 
-V_61 = Vertex(name = 'V_61',
+V_64 = Vertex(name = 'V_64',
               particles = [ P.tt__plus__, P.tt__minus__, P.Z ],
               color = [ '1' ],
               lorentz = [ L.FFV2, L.FFV4 ],
               couplings = {(0,0):C.GC_27,(0,1):C.GC_30})
 
-V_62 = Vertex(name = 'V_62',
+V_65 = Vertex(name = 'V_65',
               particles = [ P.e__plus__, P.ve, P.W__minus__ ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
               couplings = {(0,0):C.GC_17})
 
-V_63 = Vertex(name = 'V_63',
+V_66 = Vertex(name = 'V_66',
               particles = [ P.m__plus__, P.vm, P.W__minus__ ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
               couplings = {(0,0):C.GC_17})
 
-V_64 = Vertex(name = 'V_64',
+V_67 = Vertex(name = 'V_67',
               particles = [ P.tt__plus__, P.vt, P.W__minus__ ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
               couplings = {(0,0):C.GC_17})
 
-V_65 = Vertex(name = 'V_65',
+V_68 = Vertex(name = 'V_68',
               particles = [ P.ve__tilde__, P.e__minus__, P.W__plus__ ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
               couplings = {(0,0):C.GC_17})
 
-V_66 = Vertex(name = 'V_66',
+V_69 = Vertex(name = 'V_69',
               particles = [ P.vm__tilde__, P.m__minus__, P.W__plus__ ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
               couplings = {(0,0):C.GC_17})
 
-V_67 = Vertex(name = 'V_67',
+V_70 = Vertex(name = 'V_70',
               particles = [ P.vt__tilde__, P.tt__minus__, P.W__plus__ ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
               couplings = {(0,0):C.GC_17})
 
-V_68 = Vertex(name = 'V_68',
+V_71 = Vertex(name = 'V_71',
               particles = [ P.u__tilde__, P.u, P.Z ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2, L.FFV5 ],
               couplings = {(0,0):C.GC_28,(0,1):C.GC_29})
 
-V_69 = Vertex(name = 'V_69',
+V_72 = Vertex(name = 'V_72',
               particles = [ P.c__tilde__, P.c, P.Z ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2, L.FFV5 ],
               couplings = {(0,0):C.GC_28,(0,1):C.GC_29})
 
-V_70 = Vertex(name = 'V_70',
+V_73 = Vertex(name = 'V_73',
               particles = [ P.t__tilde__, P.t, P.Z ],
               color = [ 'Identity(1,2)' ],
               lorentz = [ L.FFV2, L.FFV5 ],
               couplings = {(0,0):C.GC_28,(0,1):C.GC_29})
 
-V_71 = Vertex(name = 'V_71',
+V_74 = Vertex(name = 'V_74',
               particles = [ P.ve__tilde__, P.ve, P.Z ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
               couplings = {(0,0):C.GC_34})
 
-V_72 = Vertex(name = 'V_72',
+V_75 = Vertex(name = 'V_75',
               particles = [ P.vm__tilde__, P.vm, P.Z ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],
               couplings = {(0,0):C.GC_34})
 
-V_73 = Vertex(name = 'V_73',
+V_76 = Vertex(name = 'V_76',
               particles = [ P.vt__tilde__, P.vt, P.Z ],
               color = [ '1' ],
               lorentz = [ L.FFV2 ],

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2011-05-08 07:27:55 +0000
+++ models/import_ufo.py	2011-07-22 20:26:18 +0000
@@ -202,6 +202,33 @@
             self.add_interaction(interaction_info)
         
         self.model.set('conserved_charge', self.conservecharge)
+
+        # If we deal with a Loop model here, the order hierarchy MUST be 
+        # defined in the file coupling_orders.py and we import it from 
+        # there.
+
+        hierarchy={}
+        try:
+            all_orders = self.ufomodel.all_orders
+            for order in all_orders:
+                hierarchy[order.name]=order.hierarchy
+        except AttributeError:
+            pass
+        else:
+            self.model.set('order_hierarchy', hierarchy)            
+        
+        # Also set expansion_order, i.e., maximum coupling order per process
+
+        expansion_order={}
+        try:
+            all_orders = self.ufomodel.all_orders
+            for order in all_orders:
+                expansion_order[order.name]=order.expansion_order
+        except AttributeError:
+            pass
+        else:
+            self.model.set('expansion_order', expansion_order)
+
         return self.model
         
     

=== modified file 'models/mssm/__init__.py'
--- models/mssm/__init__.py	2011-03-09 11:08:59 +0000
+++ models/mssm/__init__.py	2011-07-22 20:26:18 +0000
@@ -4,6 +4,7 @@
 import lorentz
 import parameters
 import vertices
+import coupling_orders
 import write_param_card
 
 
@@ -12,9 +13,10 @@
 all_couplings = couplings.all_couplings
 all_lorentz = lorentz.all_lorentz
 all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
 
 
-__author__ = "Benjamin Fuks"
-__version__ = "1.3.0"
-__email__ = "[e-mail]"
+__author__ = "N. Christensen, C. Duhr"
+__version__ = "1.3"
+__email__ = "[e-mail], [e-mail]"

=== added file 'models/mssm/coupling_orders.py'
--- models/mssm/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/mssm/coupling_orders.py	2011-07-22 20:26:18 +0000
@@ -0,0 +1,15 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 19 Jul 2011 18:23:49
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = -1,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = -1,
+                    hierarchy = 2)

=== modified file 'models/mssm/object_library.py'
--- models/mssm/object_library.py	2011-03-09 13:58:28 +0000
+++ models/mssm/object_library.py	2011-07-22 20:26:18 +0000
@@ -228,5 +228,18 @@
 
         return eval(self.expr)
 
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+
 
         

=== modified file 'models/nmssm/__init__.py'
--- models/nmssm/__init__.py	2011-04-12 16:11:45 +0000
+++ models/nmssm/__init__.py	2011-07-22 20:26:18 +0000
@@ -4,6 +4,7 @@
 import lorentz
 import parameters
 import vertices
+import coupling_orders
 import write_param_card
 
 
@@ -12,9 +13,10 @@
 all_couplings = couplings.all_couplings
 all_lorentz = lorentz.all_lorentz
 all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
 
 
-__author__ = "Benjamin Fuks"
-__version__ = "1.0.0"
-__email__ = "[e-mail]"
+__author__ = "N. Christensen, C. Duhr"
+__version__ = "1.3"
+__email__ = "[e-mail], [e-mail]"

=== added file 'models/nmssm/coupling_orders.py'
--- models/nmssm/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/nmssm/coupling_orders.py	2011-07-22 20:26:18 +0000
@@ -0,0 +1,15 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 19 Jul 2011 18:23:49
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = -1,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = -1,
+                    hierarchy = 2)

=== modified file 'models/nmssm/object_library.py'
--- models/nmssm/object_library.py	2011-04-12 16:11:45 +0000
+++ models/nmssm/object_library.py	2011-07-22 20:26:18 +0000
@@ -228,5 +228,18 @@
 
         return eval(self.expr)
 
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+
 
         

=== modified file 'models/sextet_diquarks/__init__.py'
--- models/sextet_diquarks/__init__.py	2010-10-02 11:13:28 +0000
+++ models/sextet_diquarks/__init__.py	2011-07-22 20:26:18 +0000
@@ -4,6 +4,7 @@
 import lorentz
 import parameters
 import vertices
+import coupling_orders
 import write_param_card
 
 
@@ -12,4 +13,10 @@
 all_couplings = couplings.all_couplings
 all_lorentz = lorentz.all_lorentz
 all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
+
+
+__author__ = "N. Christensen, C. Duhr"
+__version__ = "1.3"
+__email__ = "[e-mail], [e-mail]"

=== added file 'models/sextet_diquarks/coupling_orders.py'
--- models/sextet_diquarks/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/sextet_diquarks/coupling_orders.py	2011-07-22 20:26:18 +0000
@@ -0,0 +1,15 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 19 Jul 2011 18:23:49
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = -1,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = -1,
+                    hierarchy = 2)

=== modified file 'models/sextet_diquarks/object_library.py'
--- models/sextet_diquarks/object_library.py	2010-10-20 18:43:22 +0000
+++ models/sextet_diquarks/object_library.py	2011-07-22 20:26:18 +0000
@@ -10,7 +10,7 @@
 import cmath
 
 
-class FRBaseClass(object):
+class UFOBaseClass(object):
     """The class from which all FeynRules classes are derived."""
 
     require_args = []
@@ -62,20 +62,20 @@
 
     
 
-class Particle(FRBaseClass):
+class Particle(UFOBaseClass):
     """A standard Particle"""
 
-    require_args=['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'line', 'charge']
+    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', 'line', 'charge', 'propagating', 'goldstoneboson']
+    require_args_all = ['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'charge', 'line', 'propagating', 'goldstoneboson']
 
     def __init__(self, pdg_code, name, antiname, spin, color, mass, width, texname,
-                 antitexname, line, charge , propagating=True, goldstoneboson=False, **options):
+                 antitexname, charge , line=None, propagating=True, goldstoneboson=False, **options):
 
         args= (pdg_code, name, antiname, spin, color, mass, width, texname,
-                 antitexname, line, float(charge))
+                 antitexname, float(charge))
 
-        FRBaseClass.__init__(self, *args,  **options)
+        UFOBaseClass.__init__(self, *args,  **options)
 
         global all_particles
         all_particles.append(self)
@@ -84,6 +84,44 @@
         self.goldstoneboson= goldstoneboson
 
         self.selfconjugate = (name == antiname)
+        if 1: #not line:
+            self.line = self.find_line_type()
+        else:
+            self.line = line
+
+
+
+
+    def find_line_type(self):
+        """ find how we draw a line if not defined
+        valid output: dashed/straight/wavy/curly/double/swavy/scurly
+        """
+        
+        spin = self.spin
+        color = self.color
+        
+        #use default
+        if spin == 1:
+            return 'dashed'
+        elif spin == 2:
+            if not self.selfconjugate:
+                return 'straight'
+            elif color == 1:
+                return 'swavy'
+            else:
+                return 'scurly'
+        elif spin == 3:
+            if color == 1:
+                return 'wavy'
+            
+            else:
+                return 'curly'
+        elif spin == 5:
+            return 'double'
+        elif spin == -1:
+            return 'dotted'
+        else:
+            return 'dashed' # not supported yet
 
     def anti(self):
         if self.selfconjugate:
@@ -98,13 +136,13 @@
             newcolor = -self.color
                 
         return Particle(-self.pdg_code, self.antiname, self.name, self.spin, newcolor, self.mass, self.width,
-                        self.antitexname, self.texname, self.line, -self.charge, self.propagating, self.goldstoneboson, **outdic)
+                        self.antitexname, self.texname, -self.charge, self.line, self.propagating, self.goldstoneboson, **outdic)
 
 
 
 all_parameters = []
 
-class Parameter(FRBaseClass):
+class Parameter(UFOBaseClass):
 
     require_args=['name', 'nature', 'type', 'value', 'texname']
 
@@ -112,7 +150,7 @@
 
         args = (name,nature,type,value,texname)
 
-        FRBaseClass.__init__(self, *args)
+        UFOBaseClass.__init__(self, *args)
 
         args=(name,nature,type,value,texname)
 
@@ -126,7 +164,7 @@
 
 all_vertices = []
 
-class Vertex(FRBaseClass):
+class Vertex(UFOBaseClass):
 
     require_args=['name', 'particles', 'color', 'lorentz', 'couplings']
 
@@ -134,7 +172,7 @@
  
         args = (name, particles, color, lorentz, couplings)
 
-        FRBaseClass.__init__(self, *args, **opt)
+        UFOBaseClass.__init__(self, *args, **opt)
 
         args=(particles,color,lorentz,couplings)
 
@@ -143,14 +181,14 @@
 
 all_couplings = []
 
-class Coupling(FRBaseClass):
+class Coupling(UFOBaseClass):
 
     require_args=['name', 'value', 'order']
 
     def __init__(self, name, value, order, **opt):
 
         args =(name, value, order)	
-        FRBaseClass.__init__(self, *args, **opt)
+        UFOBaseClass.__init__(self, *args, **opt)
         global all_couplings
         all_couplings.append(self)
   
@@ -158,13 +196,13 @@
 
 all_lorentz = []
 
-class Lorentz(FRBaseClass):
+class Lorentz(UFOBaseClass):
 
     require_args=['name','spins','structure']
     
     def __init__(self, name, spins, structure='external', **opt):
         args = (name, spins, structure)
-        FRBaseClass.__init__(self, *args, **opt)
+        UFOBaseClass.__init__(self, *args, **opt)
 
         global all_lorentz
         all_lorentz.append(self)
@@ -190,5 +228,18 @@
 
         return eval(self.expr)
 
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+
 
         

=== added file 'models/sm/SM_Full_CKM_UFO.log'
--- models/sm/SM_Full_CKM_UFO.log	1970-01-01 00:00:00 +0000
+++ models/sm/SM_Full_CKM_UFO.log	2011-07-22 20:26:18 +0000
@@ -0,0 +1,67 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Wed 6 Jul 2011 14:07:30
+
+
+# 
+# This is the logfile for the model Standard Model
+
+# Authors: N. Christensen, C. Duhr
+# Model version: 1.3
+# Checking the Lagrangians
+   * All Lagrangians are ok.
+#
+# Particle definitions
+#
+
+   * No particles removed. All particles correspond to GenInt setup.
+
+# Automatically assigned PDG numbers
+   * Assigned PDG number 9000001 to particle ghA
+   * Assigned PDG number 9000002 to particle ghZ
+   * Assigned PDG number 9000003 to particle ghWp
+   * Assigned PDG number 9000004 to particle ghWm
+   * Assigned PDG number 9000005 to particle ghG
+
+
+# Compulsory PDG codes:
+   * Class SM leptons complete.
+   * Class SM neutrinos complete.
+   * Class SM quarks complete.
+   * Class SM gauge bosons complete.
+#
+# Parameter definitions
+#
+
+   * All parameters are ok.
+
+
+# Vertices
+   * Calling FeynmanRules for 1 Lagrangians.
+   * Number of classes vertices: 30
+   * Number of flavored vertices: 71
+   * 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.
+   * particles.py written.
+   * parameters.py written.
+#
+# Vertex definitions
+#
+
+   * 71 vertices written.
+   * vertices.py written.
+#
+# Lorentz structure definitions
+#
+
+   * 16 lorentz structures written.
+   * lorentz.py written.
+#
+# Coupling definitions
+#
+
+   * 47 couplings written.
+   * couplings.py written.

=== modified file 'models/sm/__init__.py'
--- models/sm/__init__.py	2011-03-18 18:04:05 +0000
+++ models/sm/__init__.py	2011-07-22 20:26:18 +0000
@@ -4,6 +4,7 @@
 import lorentz
 import parameters
 import vertices
+import coupling_orders
 import write_param_card
 
 
@@ -12,9 +13,10 @@
 all_couplings = couplings.all_couplings
 all_lorentz = lorentz.all_lorentz
 all_parameters = parameters.all_parameters
+all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
 
 
 __author__ = "N. Christensen, C. Duhr"
-__version__ = "1.2"
+__version__ = "1.3"
 __email__ = "[e-mail], [e-mail]"

=== added file 'models/sm/coupling_orders.py'
--- models/sm/coupling_orders.py	1970-01-01 00:00:00 +0000
+++ models/sm/coupling_orders.py	2011-07-22 20:26:18 +0000
@@ -0,0 +1,15 @@
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 19 Jul 2011 18:23:49
+
+
+from object_library import all_orders, CouplingOrder
+
+
+QCD = CouplingOrder(name = 'QCD',
+                    expansion_order = -1,
+                    hierarchy = 1)
+
+QED = CouplingOrder(name = 'QED',
+                    expansion_order = -1,
+                    hierarchy = 2)

=== modified file 'models/sm/couplings.py'
--- models/sm/couplings.py	2011-03-18 18:04:05 +0000
+++ models/sm/couplings.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 535 $
-# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-# Date: Fri 18 Mar 2011 18:40:51
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Wed 6 Jul 2011 14:07:37
 
 
 from object_library import all_couplings, Coupling
@@ -22,534 +22,178 @@
                 order = {'QED':1})
 
 GC_4 = Coupling(name = 'GC_4',
-                value = 'ee*complex(0,1)',
-                order = {'QED':1})
+                value = '-G',
+                order = {'QCD':1})
 
 GC_5 = Coupling(name = 'GC_5',
-                value = '2*ee**2*complex(0,1)',
-                order = {'QED':2})
+                value = 'complex(0,1)*G',
+                order = {'QCD':1})
 
 GC_6 = Coupling(name = 'GC_6',
-                value = '-ee**2/(2.*cw)',
-                order = {'QED':2})
+                value = 'complex(0,1)*G**2',
+                order = {'QCD':2})
 
 GC_7 = Coupling(name = 'GC_7',
-                value = '(ee**2*complex(0,1))/(2.*cw)',
-                order = {'QED':2})
+                value = 'cw*complex(0,1)*gw',
+                order = {'QED':1})
 
 GC_8 = Coupling(name = 'GC_8',
-                value = 'ee**2/(2.*cw)',
+                value = '-(complex(0,1)*gw**2)',
                 order = {'QED':2})
 
 GC_9 = Coupling(name = 'GC_9',
-                value = '-G',
-                order = {'QCD':1})
+                value = 'cw**2*complex(0,1)*gw**2',
+                order = {'QED':2})
 
 GC_10 = Coupling(name = 'GC_10',
-                 value = 'complex(0,1)*G',
-                 order = {'QCD':1})
+                 value = '(ee**2*complex(0,1))/(2.*sw**2)',
+                 order = {'QED':2})
 
 GC_11 = Coupling(name = 'GC_11',
-                 value = 'complex(0,1)*G**2',
-                 order = {'QCD':2})
+                 value = '(ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_12 = Coupling(name = 'GC_12',
-                 value = 'cw*complex(0,1)*gw',
+                 value = '(CKM11*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_13 = Coupling(name = 'GC_13',
-                 value = '-(complex(0,1)*gw**2)',
-                 order = {'QED':2})
+                 value = '(CKM12*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_14 = Coupling(name = 'GC_14',
-                 value = 'cw**2*complex(0,1)*gw**2',
-                 order = {'QED':2})
+                 value = '(CKM13*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_15 = Coupling(name = 'GC_15',
-                 value = '-2*complex(0,1)*lam',
-                 order = {'QED':2})
+                 value = '(CKM21*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_16 = Coupling(name = 'GC_16',
-                 value = '-4*complex(0,1)*lam',
-                 order = {'QED':2})
+                 value = '(CKM22*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_17 = Coupling(name = 'GC_17',
-                 value = '-6*complex(0,1)*lam',
-                 order = {'QED':2})
+                 value = '(CKM23*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_18 = Coupling(name = 'GC_18',
-                 value = '-(ee*MW)',
+                 value = '(CKM31*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_19 = Coupling(name = 'GC_19',
-                 value = 'ee*MW',
+                 value = '(CKM32*ee*complex(0,1))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_20 = Coupling(name = 'GC_20',
-                 value = '(ee**2*complex(0,1))/(2.*sw**2)',
-                 order = {'QED':2})
+                 value = '(CKM33*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_21 = Coupling(name = 'GC_21',
-                 value = '-(ee*complex(0,1))/(2.*sw)',
+                 value = '-(cw*ee*complex(0,1))/(2.*sw)',
                  order = {'QED':1})
 
 GC_22 = Coupling(name = 'GC_22',
-                 value = '(ee*complex(0,1))/(2.*sw)',
+                 value = '(cw*ee*complex(0,1))/(2.*sw)',
                  order = {'QED':1})
 
 GC_23 = Coupling(name = 'GC_23',
-                 value = 'ee/(2.*sw)',
+                 value = '-(ee*complex(0,1)*sw)/(6.*cw)',
                  order = {'QED':1})
 
 GC_24 = Coupling(name = 'GC_24',
-                 value = '(ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(ee*complex(0,1)*sw)/(2.*cw)',
                  order = {'QED':1})
 
 GC_25 = Coupling(name = 'GC_25',
-                 value = '(CKM11*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = 'complex(0,1)*gw*sw',
                  order = {'QED':1})
 
 GC_26 = Coupling(name = 'GC_26',
-                 value = '(CKM12*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = '-2*cw*complex(0,1)*gw**2*sw',
+                 order = {'QED':2})
 
 GC_27 = Coupling(name = 'GC_27',
-                 value = '(CKM13*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 value = 'complex(0,1)*gw**2*sw**2',
+                 order = {'QED':2})
 
 GC_28 = Coupling(name = 'GC_28',
-                 value = '(CKM21*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(cw*ee*complex(0,1))/(2.*sw) + (ee*complex(0,1)*sw)/(2.*cw)',
                  order = {'QED':1})
 
 GC_29 = Coupling(name = 'GC_29',
-                 value = '(CKM22*ee*complex(0,1))/(sw*cmath.sqrt(2))',
-                 order = {'QED':1})
+                 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_30 = Coupling(name = 'GC_30',
-                 value = '(CKM23*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '-6*complex(0,1)*lam*v',
                  order = {'QED':1})
 
 GC_31 = Coupling(name = 'GC_31',
-                 value = '(CKM31*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '(ee**2*complex(0,1)*v)/(2.*sw**2)',
                  order = {'QED':1})
 
 GC_32 = Coupling(name = 'GC_32',
-                 value = '(CKM32*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 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})
 
 GC_33 = Coupling(name = 'GC_33',
-                 value = '(CKM33*ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 value = '-((complex(0,1)*yb)/cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_34 = Coupling(name = 'GC_34',
-                 value = '-(cw*ee*complex(0,1))/(2.*sw)',
+                 value = '-((complex(0,1)*yc)/cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_35 = Coupling(name = 'GC_35',
-                 value = '(cw*ee*complex(0,1))/(2.*sw)',
+                 value = '-((complex(0,1)*ye)/cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_36 = Coupling(name = 'GC_36',
-                 value = '-((cw*ee*complex(0,1))/sw)',
+                 value = '-((complex(0,1)*ym)/cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_37 = Coupling(name = 'GC_37',
-                 value = '(cw*ee*complex(0,1))/sw',
+                 value = '-((complex(0,1)*yt)/cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_38 = Coupling(name = 'GC_38',
-                 value = '-ee**2/(2.*sw)',
-                 order = {'QED':2})
+                 value = '-((complex(0,1)*ytau)/cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_39 = Coupling(name = 'GC_39',
-                 value = '-(ee**2*complex(0,1))/(2.*sw)',
-                 order = {'QED':2})
+                 value = '(ee*complex(0,1)*complexconjugate(CKM11))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_40 = Coupling(name = 'GC_40',
-                 value = 'ee**2/(2.*sw)',
-                 order = {'QED':2})
+                 value = '(ee*complex(0,1)*complexconjugate(CKM12))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 
 GC_41 = Coupling(name = 'GC_41',
-                 value = '-(ee*MW)/(2.*sw)',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM13))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_42 = Coupling(name = 'GC_42',
-                 value = '-(ee*complex(0,1)*MW)/(2.*sw)',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM21))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_43 = Coupling(name = 'GC_43',
-                 value = '(ee*MW)/(2.*sw)',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM22))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_44 = Coupling(name = 'GC_44',
-                 value = '-(ee*MZ)/(2.*sw)',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM23))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_45 = Coupling(name = 'GC_45',
-                 value = '(ee*MZ)/(2.*sw)',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM31))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_46 = Coupling(name = 'GC_46',
-                 value = '-(ee*complex(0,1)*MZ)/(2.*cw*sw)',
+                 value = '(ee*complex(0,1)*complexconjugate(CKM32))/(sw*cmath.sqrt(2))',
                  order = {'QED':1})
 
 GC_47 = Coupling(name = 'GC_47',
-                 value = '-(ee*complex(0,1)*sw)/(6.*cw)',
-                 order = {'QED':1})
-
-GC_48 = Coupling(name = 'GC_48',
-                 value = '(ee*complex(0,1)*sw)/(2.*cw)',
-                 order = {'QED':1})
-
-GC_49 = Coupling(name = 'GC_49',
-                 value = 'complex(0,1)*gw*sw',
-                 order = {'QED':1})
-
-GC_50 = Coupling(name = 'GC_50',
-                 value = '-2*cw*complex(0,1)*gw**2*sw',
-                 order = {'QED':2})
-
-GC_51 = Coupling(name = 'GC_51',
-                 value = 'complex(0,1)*gw**2*sw**2',
-                 order = {'QED':2})
-
-GC_52 = Coupling(name = 'GC_52',
-                 value = '-(cw*ee*complex(0,1))/(2.*sw) + (ee*complex(0,1)*sw)/(2.*cw)',
-                 order = {'QED':1})
-
-GC_53 = Coupling(name = 'GC_53',
-                 value = '(cw*ee*complex(0,1))/(2.*sw) + (ee*complex(0,1)*sw)/(2.*cw)',
-                 order = {'QED':1})
-
-GC_54 = Coupling(name = 'GC_54',
-                 value = '(cw*ee)/(2.*sw) + (ee*sw)/(2.*cw)',
-                 order = {'QED':1})
-
-GC_55 = Coupling(name = 'GC_55',
-                 value = '(cw*ee**2*complex(0,1))/sw - (ee**2*complex(0,1)*sw)/cw',
-                 order = {'QED':2})
-
-GC_56 = Coupling(name = 'GC_56',
-                 value = '(cw*ee*MW)/(2.*sw) - (ee*MW*sw)/(2.*cw)',
-                 order = {'QED':1})
-
-GC_57 = Coupling(name = 'GC_57',
-                 value = '-(cw*ee*MW)/(2.*sw) + (ee*MW*sw)/(2.*cw)',
-                 order = {'QED':1})
-
-GC_58 = Coupling(name = 'GC_58',
-                 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_59 = Coupling(name = 'GC_59',
-                 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_60 = Coupling(name = 'GC_60',
-                 value = '-(ee**2*v)/(2.*cw)',
-                 order = {'QED':1})
-
-GC_61 = Coupling(name = 'GC_61',
-                 value = '(ee**2*v)/(2.*cw)',
-                 order = {'QED':1})
-
-GC_62 = Coupling(name = 'GC_62',
-                 value = '-2*complex(0,1)*lam*v',
-                 order = {'QED':1})
-
-GC_63 = Coupling(name = 'GC_63',
-                 value = '-6*complex(0,1)*lam*v',
-                 order = {'QED':1})
-
-GC_64 = Coupling(name = 'GC_64',
-                 value = '(ee**2*complex(0,1)*v)/(2.*sw**2)',
-                 order = {'QED':1})
-
-GC_65 = Coupling(name = 'GC_65',
-                 value = '-(ee**2*v)/(2.*sw)',
-                 order = {'QED':1})
-
-GC_66 = Coupling(name = 'GC_66',
-                 value = '(ee**2*v)/(2.*sw)',
-                 order = {'QED':1})
-
-GC_67 = Coupling(name = 'GC_67',
-                 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})
-
-GC_68 = Coupling(name = 'GC_68',
-                 value = '-((complex(0,1)*yb)/cmath.sqrt(2))',
-                 order = {'QED':1})
-
-GC_69 = Coupling(name = 'GC_69',
-                 value = 'yb/cmath.sqrt(2)',
-                 order = {'QED':1})
-
-GC_70 = Coupling(name = 'GC_70',
-                 value = '-(CKM13*yb)',
-                 order = {'QED':1})
-
-GC_71 = Coupling(name = 'GC_71',
-                 value = '-(CKM23*yb)',
-                 order = {'QED':1})
-
-GC_72 = Coupling(name = 'GC_72',
-                 value = '-(CKM33*yb)',
-                 order = {'QED':1})
-
-GC_73 = Coupling(name = 'GC_73',
-                 value = '-(yc/cmath.sqrt(2))',
-                 order = {'QED':1})
-
-GC_74 = Coupling(name = 'GC_74',
-                 value = '-((complex(0,1)*yc)/cmath.sqrt(2))',
-                 order = {'QED':1})
-
-GC_75 = Coupling(name = 'GC_75',
-                 value = 'CKM21*yc',
-                 order = {'QED':1})
-
-GC_76 = Coupling(name = 'GC_76',
-                 value = 'CKM22*yc',
-                 order = {'QED':1})
-
-GC_77 = Coupling(name = 'GC_77',
-                 value = 'CKM23*yc',
-                 order = {'QED':1})
-
-GC_78 = Coupling(name = 'GC_78',
-                 value = '-((complex(0,1)*ydo)/cmath.sqrt(2))',
-                 order = {'QED':1})
-
-GC_79 = Coupling(name = 'GC_79',
-                 value = 'ydo/cmath.sqrt(2)',
-                 order = {'QED':1})
-
-GC_80 = Coupling(name = 'GC_80',
-                 value = '-(CKM11*ydo)',
-                 order = {'QED':1})
-
-GC_81 = Coupling(name = 'GC_81',
-                 value = '-(CKM21*ydo)',
-                 order = {'QED':1})
-
-GC_82 = Coupling(name = 'GC_82',
-                 value = '-(CKM31*ydo)',
-                 order = {'QED':1})
-
-GC_83 = Coupling(name = 'GC_83',
-                 value = '-ye',
-                 order = {'QED':1})
-
-GC_84 = Coupling(name = 'GC_84',
-                 value = 'ye',
-                 order = {'QED':1})
-
-GC_85 = Coupling(name = 'GC_85',
-                 value = '-((complex(0,1)*ye)/cmath.sqrt(2))',
-                 order = {'QED':1})
-
-GC_86 = Coupling(name = 'GC_86',
-                 value = 'ye/cmath.sqrt(2)',
-                 order = {'QED':1})
-
-GC_87 = Coupling(name = 'GC_87',
-                 value = '-ym',
-                 order = {'QED':1})
-
-GC_88 = Coupling(name = 'GC_88',
-                 value = 'ym',
-                 order = {'QED':1})
-
-GC_89 = Coupling(name = 'GC_89',
-                 value = '-((complex(0,1)*ym)/cmath.sqrt(2))',
-                 order = {'QED':1})
-
-GC_90 = Coupling(name = 'GC_90',
-                 value = 'ym/cmath.sqrt(2)',
-                 order = {'QED':1})
-
-GC_91 = Coupling(name = 'GC_91',
-                 value = '-((complex(0,1)*ys)/cmath.sqrt(2))',
-                 order = {'QED':1})
-
-GC_92 = Coupling(name = 'GC_92',
-                 value = 'ys/cmath.sqrt(2)',
-                 order = {'QED':1})
-
-GC_93 = Coupling(name = 'GC_93',
-                 value = '-(CKM12*ys)',
-                 order = {'QED':1})
-
-GC_94 = Coupling(name = 'GC_94',
-                 value = '-(CKM22*ys)',
-                 order = {'QED':1})
-
-GC_95 = Coupling(name = 'GC_95',
-                 value = '-(CKM32*ys)',
-                 order = {'QED':1})
-
-GC_96 = Coupling(name = 'GC_96',
-                 value = '-(yt/cmath.sqrt(2))',
-                 order = {'QED':1})
-
-GC_97 = Coupling(name = 'GC_97',
-                 value = '-((complex(0,1)*yt)/cmath.sqrt(2))',
-                 order = {'QED':1})
-
-GC_98 = Coupling(name = 'GC_98',
-                 value = 'CKM31*yt',
-                 order = {'QED':1})
-
-GC_99 = Coupling(name = 'GC_99',
-                 value = 'CKM32*yt',
-                 order = {'QED':1})
-
-GC_100 = Coupling(name = 'GC_100',
-                  value = 'CKM33*yt',
-                  order = {'QED':1})
-
-GC_101 = Coupling(name = 'GC_101',
-                  value = '-ytau',
-                  order = {'QED':1})
-
-GC_102 = Coupling(name = 'GC_102',
-                  value = 'ytau',
-                  order = {'QED':1})
-
-GC_103 = Coupling(name = 'GC_103',
-                  value = '-((complex(0,1)*ytau)/cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_104 = Coupling(name = 'GC_104',
-                  value = 'ytau/cmath.sqrt(2)',
-                  order = {'QED':1})
-
-GC_105 = Coupling(name = 'GC_105',
-                  value = '-(yup/cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_106 = Coupling(name = 'GC_106',
-                  value = '-((complex(0,1)*yup)/cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_107 = Coupling(name = 'GC_107',
-                  value = 'CKM11*yup',
-                  order = {'QED':1})
-
-GC_108 = Coupling(name = 'GC_108',
-                  value = 'CKM12*yup',
-                  order = {'QED':1})
-
-GC_109 = Coupling(name = 'GC_109',
-                  value = 'CKM13*yup',
-                  order = {'QED':1})
-
-GC_110 = Coupling(name = 'GC_110',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM11))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_111 = Coupling(name = 'GC_111',
-                  value = 'ydo*complexconjugate(CKM11)',
-                  order = {'QED':1})
-
-GC_112 = Coupling(name = 'GC_112',
-                  value = '-(yup*complexconjugate(CKM11))',
-                  order = {'QED':1})
-
-GC_113 = Coupling(name = 'GC_113',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM12))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_114 = Coupling(name = 'GC_114',
-                  value = 'ys*complexconjugate(CKM12)',
-                  order = {'QED':1})
-
-GC_115 = Coupling(name = 'GC_115',
-                  value = '-(yup*complexconjugate(CKM12))',
-                  order = {'QED':1})
-
-GC_116 = Coupling(name = 'GC_116',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM13))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_117 = Coupling(name = 'GC_117',
-                  value = 'yb*complexconjugate(CKM13)',
-                  order = {'QED':1})
-
-GC_118 = Coupling(name = 'GC_118',
-                  value = '-(yup*complexconjugate(CKM13))',
-                  order = {'QED':1})
-
-GC_119 = Coupling(name = 'GC_119',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM21))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_120 = Coupling(name = 'GC_120',
-                  value = '-(yc*complexconjugate(CKM21))',
-                  order = {'QED':1})
-
-GC_121 = Coupling(name = 'GC_121',
-                  value = 'ydo*complexconjugate(CKM21)',
-                  order = {'QED':1})
-
-GC_122 = Coupling(name = 'GC_122',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM22))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_123 = Coupling(name = 'GC_123',
-                  value = '-(yc*complexconjugate(CKM22))',
-                  order = {'QED':1})
-
-GC_124 = Coupling(name = 'GC_124',
-                  value = 'ys*complexconjugate(CKM22)',
-                  order = {'QED':1})
-
-GC_125 = Coupling(name = 'GC_125',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM23))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_126 = Coupling(name = 'GC_126',
-                  value = 'yb*complexconjugate(CKM23)',
-                  order = {'QED':1})
-
-GC_127 = Coupling(name = 'GC_127',
-                  value = '-(yc*complexconjugate(CKM23))',
-                  order = {'QED':1})
-
-GC_128 = Coupling(name = 'GC_128',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM31))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_129 = Coupling(name = 'GC_129',
-                  value = 'ydo*complexconjugate(CKM31)',
-                  order = {'QED':1})
-
-GC_130 = Coupling(name = 'GC_130',
-                  value = '-(yt*complexconjugate(CKM31))',
-                  order = {'QED':1})
-
-GC_131 = Coupling(name = 'GC_131',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM32))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_132 = Coupling(name = 'GC_132',
-                  value = 'ys*complexconjugate(CKM32)',
-                  order = {'QED':1})
-
-GC_133 = Coupling(name = 'GC_133',
-                  value = '-(yt*complexconjugate(CKM32))',
-                  order = {'QED':1})
-
-GC_134 = Coupling(name = 'GC_134',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM33))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_135 = Coupling(name = 'GC_135',
-                  value = 'yb*complexconjugate(CKM33)',
-                  order = {'QED':1})
-
-GC_136 = Coupling(name = 'GC_136',
-                  value = '-(yt*complexconjugate(CKM33))',
-                  order = {'QED':1})
+                 value = '(ee*complex(0,1)*complexconjugate(CKM33))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
 

=== modified file 'models/sm/lorentz.py'
--- models/sm/lorentz.py	2011-03-18 18:04:05 +0000
+++ models/sm/lorentz.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 535 $
-# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-# Date: Fri 18 Mar 2011 18:40:51
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Wed 6 Jul 2011 14:07:37
 
 
 from object_library import all_lorentz, Lorentz
@@ -9,10 +9,6 @@
 
 
 
-UUS1 = Lorentz(name = 'UUS1',
-               spins = [ -1, -1, 1 ],
-               structure = '1')
-
 UUV1 = Lorentz(name = 'UUV1',
                spins = [ -1, -1, 3 ],
                structure = 'P(3,2) + P(3,3)')
@@ -23,20 +19,8 @@
 
 FFS1 = Lorentz(name = 'FFS1',
                spins = [ 2, 2, 1 ],
-               structure = 'Gamma5(2,1)')
-
-FFS2 = Lorentz(name = 'FFS2',
-               spins = [ 2, 2, 1 ],
                structure = 'Identity(2,1)')
 
-FFS3 = Lorentz(name = 'FFS3',
-               spins = [ 2, 2, 1 ],
-               structure = 'ProjM(2,1)')
-
-FFS4 = Lorentz(name = 'FFS4',
-               spins = [ 2, 2, 1 ],
-               structure = 'ProjP(2,1)')
-
 FFV1 = Lorentz(name = 'FFV1',
                spins = [ 2, 2, 3 ],
                structure = 'Gamma(3,2,1)')
@@ -57,10 +41,6 @@
                spins = [ 2, 2, 3 ],
                structure = 'Gamma(3,2,-1)*ProjM(-1,1) + 4*Gamma(3,2,-1)*ProjP(-1,1)')
 
-VSS1 = Lorentz(name = 'VSS1',
-               spins = [ 3, 1, 1 ],
-               structure = 'P(1,2) - P(1,3)')
-
 VVS1 = Lorentz(name = 'VVS1',
                spins = [ 3, 3, 1 ],
                structure = 'Metric(1,2)')
@@ -69,10 +49,6 @@
                spins = [ 3, 3, 3 ],
                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)')
 
-SSSS1 = Lorentz(name = 'SSSS1',
-                spins = [ 1, 1, 1, 1 ],
-                structure = '1')
-
 VVSS1 = Lorentz(name = 'VVSS1',
                 spins = [ 3, 3, 1, 1 ],
                 structure = 'Metric(1,2)')

=== modified file 'models/sm/object_library.py'
--- models/sm/object_library.py	2011-03-18 18:04:05 +0000
+++ models/sm/object_library.py	2011-07-22 20:26:18 +0000
@@ -228,5 +228,18 @@
 
         return eval(self.expr)
 
+all_orders = []
+
+class CouplingOrder(object):
+
+    def __init__(self, name, expansion_order, hierarchy, perturbative_expansion = 0):
+        
+        global all_orders
+        all_orders.append(self)
+
+        self.name = name
+        self.expansion_order = expansion_order
+        self.hierarchy = hierarchy
+
 
         

=== modified file 'models/sm/parameters.py'
--- models/sm/parameters.py	2011-04-02 05:34:20 +0000
+++ models/sm/parameters.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 535 $
-# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-# Date: Fri 18 Mar 2011 18:40:51
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Wed 6 Jul 2011 14:07:37
 
 
 
@@ -17,18 +17,10 @@
                  texname = '0')
 
 # User-defined parameters.
-cabi = Parameter(name = 'cabi',
-                 nature = 'external',
-                 type = 'real',
-                 value = 0.227736,
-                 texname = '\\theta _c',
-                 lhablock = 'CKMBLOCK',
-                 lhacode = [ 1 ])
-
 aEWM1 = Parameter(name = 'aEWM1',
                   nature = 'external',
                   type = 'real',
-                  value = 127.9,
+                  value = 132.50698,
                   texname = '\\text{aEWM1}',
                   lhablock = 'SMINPUTS',
                   lhacode = [ 1 ])
@@ -36,7 +28,7 @@
 Gf = Parameter(name = 'Gf',
                nature = 'external',
                type = 'real',
-               value = 0.000011663900000000002,
+               value = 0.0000116639,
                texname = 'G_f',
                lhablock = 'SMINPUTS',
                lhacode = [ 2 ])
@@ -44,15 +36,47 @@
 aS = Parameter(name = 'aS',
                nature = 'external',
                type = 'real',
-               value = 0.1172,
+               value = 0.118,
                texname = '\\text{aS}',
                lhablock = 'SMINPUTS',
                lhacode = [ 3 ])
 
+lamWS = Parameter(name = 'lamWS',
+                  nature = 'external',
+                  type = 'real',
+                  value = 0.2253,
+                  texname = '\\text{lamWS}',
+                  lhablock = 'Wolfenstein',
+                  lhacode = [ 1 ])
+
+AWS = Parameter(name = 'AWS',
+                nature = 'external',
+                type = 'real',
+                value = 0.808,
+                texname = '\\text{AWS}',
+                lhablock = 'Wolfenstein',
+                lhacode = [ 2 ])
+
+rhoWS = Parameter(name = 'rhoWS',
+                  nature = 'external',
+                  type = 'real',
+                  value = 0.132,
+                  texname = '\\text{rhoWS}',
+                  lhablock = 'Wolfenstein',
+                  lhacode = [ 3 ])
+
+etaWS = Parameter(name = 'etaWS',
+                  nature = 'external',
+                  type = 'real',
+                  value = 0.341,
+                  texname = '\\text{etaWS}',
+                  lhablock = 'Wolfenstein',
+                  lhacode = [ 4 ])
+
 ymc = Parameter(name = 'ymc',
                 nature = 'external',
                 type = 'real',
-                value = 1.42,
+                value = 1.27,
                 texname = '\\text{ymc}',
                 lhablock = 'YUKAWA',
                 lhacode = [ 4 ])
@@ -60,7 +84,7 @@
 ymb = Parameter(name = 'ymb',
                 nature = 'external',
                 type = 'real',
-                value = 4.7,
+                value = 4.2,
                 texname = '\\text{ymb}',
                 lhablock = 'YUKAWA',
                 lhacode = [ 5 ])
@@ -68,11 +92,27 @@
 ymt = Parameter(name = 'ymt',
                 nature = 'external',
                 type = 'real',
-                value = 174.3,
+                value = 164.5,
                 texname = '\\text{ymt}',
                 lhablock = 'YUKAWA',
                 lhacode = [ 6 ])
 
+yme = Parameter(name = 'yme',
+                nature = 'external',
+                type = 'real',
+                value = 0.0005110000000000001,
+                texname = '\\text{yme}',
+                lhablock = 'YUKAWA',
+                lhacode = [ 11 ])
+
+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',
@@ -81,38 +121,6 @@
                   lhablock = 'YUKAWA',
                   lhacode = [ 15 ])
 
-Me = Parameter(name = 'Me',
-               nature = 'external',
-               type = 'real',
-               value = 0.0005110000000000001,
-               texname = '\\text{Me}',
-               lhablock = 'MASS',
-               lhacode = [ 11 ])
-
-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',
-                value = 1.777,
-                texname = '\\text{MTA}',
-                lhablock = 'MASS',
-                lhacode = [ 15 ])
-
-MU = Parameter(name = 'MU',
-               nature = 'external',
-               type = 'real',
-               value = 0.0025499999999999997,
-               texname = 'M',
-               lhablock = 'MASS',
-               lhacode = [ 2 ])
-
 MC = Parameter(name = 'MC',
                nature = 'external',
                type = 'real',
@@ -124,27 +132,11 @@
 MT = Parameter(name = 'MT',
                nature = 'external',
                type = 'real',
-               value = 174.3,
+               value = 172.,
                texname = '\\text{MT}',
                lhablock = 'MASS',
                lhacode = [ 6 ])
 
-MD = Parameter(name = 'MD',
-               nature = 'external',
-               type = 'real',
-               value = 0.00504,
-               texname = '\\text{MD}',
-               lhablock = 'MASS',
-               lhacode = [ 1 ])
-
-MS = Parameter(name = 'MS',
-               nature = 'external',
-               type = 'real',
-               value = 0.104,
-               texname = '\\text{MS}',
-               lhablock = 'MASS',
-               lhacode = [ 3 ])
-
 MB = Parameter(name = 'MB',
                nature = 'external',
                type = 'real',
@@ -164,18 +156,34 @@
 MH = Parameter(name = 'MH',
                nature = 'external',
                type = 'real',
-               value = 120,
+               value = 120.,
                texname = '\\text{MH}',
                lhablock = 'MASS',
                lhacode = [ 25 ])
 
-WTA = Parameter(name = 'WTA',
-               nature = 'external',
-               type = 'real',
-               value = 0,
-               texname = '\\text{WT}',
-               lhablock = 'DECAY',
-               lhacode = [ 15 ])
+Me = Parameter(name = 'Me',
+               nature = 'external',
+               type = 'real',
+               value = 0.0005110000000000001,
+               texname = '\\text{Me}',
+               lhablock = 'MASS',
+               lhacode = [ 11 ])
+
+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',
+                value = 1.777,
+                texname = '\\text{MTA}',
+                lhablock = 'MASS',
+                lhacode = [ 15 ])
 
 WT = Parameter(name = 'WT',
                nature = 'external',
@@ -209,94 +217,60 @@
                lhablock = 'DECAY',
                lhacode = [ 25 ])
 
-aEW = Parameter(name = 'aEW',
-                nature = 'internal',
-                type = 'real',
-                value = '1/aEWM1',
-                texname = '\\text{aEW}')
-
-G = Parameter(name = 'G',
-              nature = 'internal',
-              type = 'real',
-              value = '2*cmath.sqrt(aS)*cmath.sqrt(cmath.pi)',
-              texname = 'G')
-
-ye = Parameter(name = 'ye',
-               nature = 'internal',
-               type = 'real',
-               value = '0',
-               texname = '\\text{ye}')
-
-ym = Parameter(name = 'ym',
-               nature = 'internal',
-               type = 'real',
-               value = '0',
-               texname = '\\text{ym}')
-
-yup = Parameter(name = 'yup',
-                nature = 'internal',
-                type = 'real',
-                value = '0',
-                texname = '\\text{yup}')
-
-ydo = Parameter(name = 'ydo',
-                nature = 'internal',
-                type = 'real',
-                value = '0',
-                texname = '\\text{ydo}')
-
-ys = Parameter(name = 'ys',
-               nature = 'internal',
-               type = 'real',
-               value = '0',
-               texname = '\\text{ys}')
+WTau = Parameter(name = 'WTau',
+                 nature = 'external',
+                 type = 'real',
+                 value = 2.27e-12,
+                 texname = '\\text{WTau}',
+                 lhablock = 'DECAY',
+                 lhacode = [ 15 ])
 
 CKM11 = Parameter(name = 'CKM11',
                   nature = 'internal',
                   type = 'complex',
-                  value = 'cmath.cos(cabi)',
+                  value = '1 - lamWS**2/2.',
                   texname = '\\text{CKM11}')
 
 CKM12 = Parameter(name = 'CKM12',
                   nature = 'internal',
                   type = 'complex',
-                  value = 'cmath.sin(cabi)',
+                  value = 'lamWS',
                   texname = '\\text{CKM12}')
 
 CKM13 = Parameter(name = 'CKM13',
                   nature = 'internal',
                   type = 'complex',
-                  value = '0',
+                  value = 'AWS*lamWS**3*(-(etaWS*complex(0,1)) + rhoWS)',
                   texname = '\\text{CKM13}')
 
 CKM21 = Parameter(name = 'CKM21',
                   nature = 'internal',
                   type = 'complex',
-                  value = '-cmath.sin(cabi)',
+                  value = '-lamWS',
                   texname = '\\text{CKM21}')
 
 CKM22 = Parameter(name = 'CKM22',
                   nature = 'internal',
                   type = 'complex',
-                  value = 'cmath.cos(cabi)',
+                  value = '1 - lamWS**2/2.',
                   texname = '\\text{CKM22}')
 
 CKM23 = Parameter(name = 'CKM23',
                   nature = 'internal',
                   type = 'complex',
-                  value = '0',
+                  value = 'AWS*lamWS**2',
                   texname = '\\text{CKM23}')
 
 CKM31 = Parameter(name = 'CKM31',
                   nature = 'internal',
                   type = 'complex',
-                  value = '0',
+                  value = 'AWS*lamWS**3*(1 - etaWS*complex(0,1) - rhoWS)',
                   texname = '\\text{CKM31}')
 
 CKM32 = Parameter(name = 'CKM32',
                   nature = 'internal',
                   type = 'complex',
-                  value = '0',
+                  value = '-(AWS*lamWS**2)',
                   texname = '\\text{CKM32}')
 
 CKM33 = Parameter(name = 'CKM33',
@@ -305,6 +279,18 @@
                   value = '1',
                   texname = '\\text{CKM33}')
 
+aEW = Parameter(name = 'aEW',
+                nature = 'internal',
+                type = 'real',
+                value = '1/aEWM1',
+                texname = '\\text{aEW}')
+
+G = Parameter(name = 'G',
+              nature = 'internal',
+              type = 'real',
+              value = '2*cmath.sqrt(aS)*cmath.sqrt(cmath.pi)',
+              texname = 'G')
+
 MW = Parameter(name = 'MW',
                nature = 'internal',
                type = 'real',
@@ -371,6 +357,18 @@
                value = '(ymc*cmath.sqrt(2))/v',
                texname = '\\text{yc}')
 
+ye = Parameter(name = 'ye',
+               nature = 'internal',
+               type = 'real',
+               value = '(yme*cmath.sqrt(2))/v',
+               texname = '\\text{ye}')
+
+ym = Parameter(name = 'ym',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymm*cmath.sqrt(2))/v',
+               texname = '\\text{ym}')
+
 yt = Parameter(name = 'yt',
                nature = 'internal',
                type = 'real',
@@ -387,5 +385,5 @@
                 nature = 'internal',
                 type = 'real',
                 value = 'cmath.sqrt(lam*v**2)',
-                texname = '\\mu ')
+                texname = '\\mu')
 

=== modified file 'models/sm/particles.py'
--- models/sm/particles.py	2011-04-02 05:34:20 +0000
+++ models/sm/particles.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 535 $
-# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-# Date: Fri 18 Mar 2011 18:40:51
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Wed 6 Jul 2011 14:07:37
 
 
 from __future__ import division
@@ -52,57 +52,12 @@
 
 vt__tilde__ = vt.anti()
 
-e__minus__ = Particle(pdg_code = 11,
-                      name = 'e-',
-                      antiname = 'e+',
-                      spin = 2,
-                      color = 1,
-                      mass = Param.Me,
-                      width = Param.ZERO,
-                      texname = 'e-',
-                      antitexname = 'e-',
-                      charge = -1,
-                      LeptonNumber = 1,
-                      GhostNumber = 0)
-
-e__plus__ = e__minus__.anti()
-
-m__minus__ = Particle(pdg_code = 13,
-                      name = 'm-',
-                      antiname = 'm+',
-                      spin = 2,
-                      color = 1,
-                      mass = Param.MM,
-                      width = Param.ZERO,
-                      texname = 'm-',
-                      antitexname = 'm-',
-                      charge = -1,
-                      LeptonNumber = 1,
-                      GhostNumber = 0)
-
-m__plus__ = m__minus__.anti()
-
-tt__minus__ = Particle(pdg_code = 15,
-                       name = 'tt-',
-                       antiname = 'tt+',
-                       spin = 2,
-                       color = 1,
-                       mass = Param.MTA,
-                       width = Param.WTA,
-                       texname = 'tt-',
-                       antitexname = 'tt-',
-                       charge = -1,
-                       LeptonNumber = 1,
-                       GhostNumber = 0)
-
-tt__plus__ = tt__minus__.anti()
-
 u = Particle(pdg_code = 2,
              name = 'u',
              antiname = 'u~',
              spin = 2,
              color = 3,
-             mass = Param.MU,
+             mass = Param.ZERO,
              width = Param.ZERO,
              texname = 'u',
              antitexname = 'u',
@@ -147,7 +102,7 @@
              antiname = 'd~',
              spin = 2,
              color = 3,
-             mass = Param.MD,
+             mass = Param.ZERO,
              width = Param.ZERO,
              texname = 'd',
              antitexname = 'd',
@@ -162,7 +117,7 @@
              antiname = 's~',
              spin = 2,
              color = 3,
-             mass = Param.MS,
+             mass = Param.ZERO,
              width = Param.ZERO,
              texname = 's',
              antitexname = 's',
@@ -359,3 +314,48 @@
 
 phi__minus__ = phi__plus__.anti()
 
+e__minus__ = Particle(pdg_code = 11,
+                      name = 'e-',
+                      antiname = 'e+',
+                      spin = 2,
+                      color = 1,
+                      mass = Param.Me,
+                      width = Param.ZERO,
+                      texname = 'e-',
+                      antitexname = 'e-',
+                      charge = -1,
+                      LeptonNumber = 1,
+                      GhostNumber = 0)
+
+e__plus__ = e__minus__.anti()
+
+m__minus__ = Particle(pdg_code = 13,
+                      name = 'm-',
+                      antiname = 'm+',
+                      spin = 2,
+                      color = 1,
+                      mass = Param.MM,
+                      width = Param.ZERO,
+                      texname = 'm-',
+                      antitexname = 'm-',
+                      charge = -1,
+                      LeptonNumber = 1,
+                      GhostNumber = 0)
+
+m__plus__ = m__minus__.anti()
+
+tt__minus__ = Particle(pdg_code = 15,
+                       name = 'tt-',
+                       antiname = 'tt+',
+                       spin = 2,
+                       color = 1,
+                       mass = Param.MTA,
+                       width = Param.WTau,
+                       texname = 'tt-',
+                       antitexname = 'tt-',
+                       charge = -1,
+                       LeptonNumber = 1,
+                       GhostNumber = 0)
+
+tt__plus__ = tt__minus__.anti()
+

=== added file 'models/sm/restrict_ckm.dat'
--- models/sm/restrict_ckm.dat	1970-01-01 00:00:00 +0000
+++ models/sm/restrict_ckm.dat	2011-07-22 20:26:18 +0000
@@ -0,0 +1,53 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
+######################################################################
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block MASS 
+    4 0.000000e+00 # MC 
+    5 4.700000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 1.777000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.200000e+02 # MH 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
+
+###################################
+## INFORMATION FOR WOLFENSTEIN
+###################################
+Block Wolfenstein 
+    1 2.253000e-01 # lamWS 
+    2 8.080000e-01 # AWS 
+    3 1.320000e-01 # rhoWS 
+    4 3.410000e-01 # etaWS 
+
+###################################
+## INFORMATION FOR YUKAWA
+###################################
+Block YUKAWA 
+    4 0.000000e+00 # ymc 
+    5 4.200000e+00 # ymb 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
+   15 1.777000e+00 # ymtau 

=== modified file 'models/sm/restrict_default.dat'
--- models/sm/restrict_default.dat	2011-05-28 20:11:29 +0000
+++ models/sm/restrict_default.dat	2011-07-22 20:26:18 +0000
@@ -3,49 +3,51 @@
 ######################################################################
 
 ###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
 ## INFORMATION FOR MASS
 ###################################
 Block MASS 
-   11 0.000000e-00 # Me 
-   13 0.000000e-01 # MM 
-   15 1.777000e+00 # MTA 
-    2 0.000000e-03 # MU 
     4 0.000000e+00 # MC 
-    6 1.720000e+02 # MT 
-    1 0.000000e-03 # MD 
-    3 0.000000e-01 # MS 
     5 4.700000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 1.777000e+00 # MTA 
    23 9.118800e+01 # MZ 
    25 1.200000e+02 # MH 
 
 ###################################
-## INFORMATION FOR CKMBLOCK
+## INFORMATION FOR DECAY
 ###################################
-Block CKMBLOCK 
-    1 0.000000e-01 # cabi 
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
 
 ###################################
-## INFORMATION FOR SMINPUTS
+## INFORMATION FOR WOLFENSTEIN
 ###################################
-Block SMINPUTS 
-    1 1.325070e+02 # aEWM1 
-    2 1.166390e-05 # Gf 
-    3 1.18000e-01 # aS 
+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.00000e+00  # ymc 
+    4 0.000000e+00 # ymc 
     5 4.200000e+00 # ymb 
     6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
    15 1.777000e+00 # ymtau 
-
-###################################
-## INFORMATION FOR DECAY
-###################################
-DECAY   6 1.439478E+00 # WT
-DECAY  15 0.000000e+00 # WTA 
-DECAY  23 2.441404e+00 # WZ 
-DECAY  24 2.047600e+00 # WW 
-DECAY  25 5.753088e-03 # WH 

=== modified file 'models/sm/restrict_no_b_mass.dat'
--- models/sm/restrict_no_b_mass.dat	2011-04-18 19:06:57 +0000
+++ models/sm/restrict_no_b_mass.dat	2011-07-22 20:26:18 +0000
@@ -3,48 +3,51 @@
 ######################################################################
 
 ###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
 ## INFORMATION FOR MASS
 ###################################
 Block MASS 
-   11 0.000000e-00 # Me 
-   13 0.000000e-01 # MM 
-   15 1.777000e+00 # MTA 
-    2 0.000000e-03 # MU 
     4 0.000000e+00 # MC 
-    6 1.743000e+02 # MT 
-    1 0.000000e-03 # MD 
-    3 0.000000e-01 # MS 
     5 0.000000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 1.777000e+00 # MTA 
    23 9.118800e+01 # MZ 
    25 1.200000e+02 # MH 
 
 ###################################
-## INFORMATION FOR CKMBLOCK
+## INFORMATION FOR DECAY
 ###################################
-Block CKMBLOCK 
-    1 0.000000e-01 # cabi 
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
 
 ###################################
-## INFORMATION FOR SMINPUTS
+## INFORMATION FOR WOLFENSTEIN
 ###################################
-Block SMINPUTS 
-    1 1.325070e+02 # aEWM1 
-    2 1.166390e-05 # Gf 
-    3 1.18000e-01 # aS 
+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.00000e+00 # ymc 
+    4 0.000000e+00 # ymc 
     5 0.000000e+00 # ymb 
-    6 1.743000e+02 # ymt 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
    15 1.777000e+00 # ymtau 
-
-###################################
-## INFORMATION FOR DECAY
-###################################
-DECAY   6 1.508336e+00 # WT 
-DECAY  23 2.441404e+00 # WZ 
-DECAY  24 2.047600e+00 # WW 
-DECAY  25 5.753088e-03 # WH 

=== modified file 'models/sm/restrict_no_masses.dat'
--- models/sm/restrict_no_masses.dat	2011-03-03 00:29:37 +0000
+++ models/sm/restrict_no_masses.dat	2011-07-22 20:26:18 +0000
@@ -3,48 +3,51 @@
 ######################################################################
 
 ###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
 ## INFORMATION FOR MASS
 ###################################
 Block MASS 
-   11 0.000000e-00 # Me 
-   13 0.000000e-01 # MM 
-   15 0.000000e+00 # MTA 
-    2 0.000000e-03 # MU 
     4 0.000000e+00 # MC 
-    6 1.743000e+02 # MT 
-    1 0.000000e-03 # MD 
-    3 0.000000e-01 # MS 
     5 0.000000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 0.000000e+00 # MTA 
    23 9.118800e+01 # MZ 
    25 1.200000e+02 # MH 
 
 ###################################
-## INFORMATION FOR CKMBLOCK
+## INFORMATION FOR DECAY
 ###################################
-Block CKMBLOCK 
-    1 0.000000e-01 # cabi 
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
 
 ###################################
-## INFORMATION FOR SMINPUTS
+## INFORMATION FOR WOLFENSTEIN
 ###################################
-Block SMINPUTS 
-    1 1.325070e+02 # aEWM1 
-    2 1.166390e-05 # Gf 
-    3 1.18000e-01 # aS 
+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.00000e+00 # ymc 
+    4 0.000000e+00 # ymc 
     5 0.000000e+00 # ymb 
-    6 1.743000e+02 # ymt 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
    15 0.000000e+00 # ymtau 
-
-###################################
-## INFORMATION FOR DECAY
-###################################
-DECAY   6 1.508336e+00 # WT 
-DECAY  23 2.441404e+00 # WZ 
-DECAY  24 2.047600e+00 # WW 
-DECAY  25 5.753088e-03 # WH 

=== modified file 'models/sm/restrict_no_tau_mass.dat'
--- models/sm/restrict_no_tau_mass.dat	2011-04-18 19:06:57 +0000
+++ models/sm/restrict_no_tau_mass.dat	2011-07-22 20:26:18 +0000
@@ -3,48 +3,51 @@
 ######################################################################
 
 ###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
 ## INFORMATION FOR MASS
 ###################################
 Block MASS 
-   11 0.000000e-00 # Me 
-   13 0.000000e-01 # MM 
-   15 0.000000e-01 # MTA 
-    2 0.000000e-03 # MU 
     4 0.000000e+00 # MC 
-    6 1.743000e+02 # MT 
-    1 0.000000e-03 # MD 
-    3 0.000000e-01 # MS 
     5 4.700000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 0.000000e+00 # MTA 
    23 9.118800e+01 # MZ 
    25 1.200000e+02 # MH 
 
 ###################################
-## INFORMATION FOR CKMBLOCK
+## INFORMATION FOR DECAY
 ###################################
-Block CKMBLOCK 
-    1 0.000000e-01 # cabi 
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
 
 ###################################
-## INFORMATION FOR SMINPUTS
+## INFORMATION FOR WOLFENSTEIN
 ###################################
-Block SMINPUTS 
-    1 1.325070e+02 # aEWM1 
-    2 1.166390e-05 # Gf 
-    3 1.18000e-01 # aS 
+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.00000e+00 # ymc 
+    4 0.000000e+00 # ymc 
     5 4.200000e+00 # ymb 
-    6 1.743000e+02 # ymt 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
    15 0.000000e+00 # ymtau 
-
-###################################
-## INFORMATION FOR DECAY
-###################################
-DECAY   6 1.508336e+00 # WT 
-DECAY  23 2.441404e+00 # WZ 
-DECAY  24 2.047600e+00 # WW 
-DECAY  25 5.753088e-03 # WH 

=== added file 'models/sm/restrict_zeromass_ckm.dat'
--- models/sm/restrict_zeromass_ckm.dat	1970-01-01 00:00:00 +0000
+++ models/sm/restrict_zeromass_ckm.dat	2011-07-22 20:26:18 +0000
@@ -0,0 +1,53 @@
+######################################################################
+## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################
+######################################################################
+
+###################################
+## INFORMATION FOR SMINPUTS
+###################################
+Block SMINPUTS 
+    1 1.325070e+02 # aEWM1 
+    2 1.166390e-05 # Gf 
+    3 1.180000e-01 # aS 
+
+###################################
+## INFORMATION FOR MASS
+###################################
+Block MASS 
+    4 0.000000e+00 # MC 
+    5 0.000000e+00 # MB 
+    6 1.730000e+02 # MT 
+   11 0.000000e+00 # Me 
+   13 0.000000e+00 # MM 
+   15 0.000000e+00 # MTA 
+   23 9.118800e+01 # MZ 
+   25 1.200000e+02 # MH 
+
+###################################
+## INFORMATION FOR DECAY
+###################################
+DECAY   6 1.491500E+00
+DECAY  15 0.000000e+00
+DECAY  23 2.441404e+00 
+DECAY  24 2.047600e+00 
+DECAY  25 5.753088e-03 
+
+###################################
+## INFORMATION FOR WOLFENSTEIN
+###################################
+Block Wolfenstein 
+    1 2.253000e-01 # lamWS 
+    2 8.080000e-01 # AWS 
+    3 1.320000e-01 # rhoWS 
+    4 3.410000e-01 # etaWS 
+
+###################################
+## INFORMATION FOR YUKAWA
+###################################
+Block YUKAWA 
+    4 0.000000e+00 # ymc 
+    5 0.000000e+00 # ymb 
+    6 1.645000e+02 # ymt 
+   11 0.000000e+00 # yme 
+   13 0.000000e+00 # ymm 
+   15 0.000000e+00 # ymtau 

=== modified file 'models/sm/vertices.py'
--- models/sm/vertices.py	2011-03-18 18:04:05 +0000
+++ models/sm/vertices.py	2011-07-22 20:26:18 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules $Revision: 535 $
-# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
-# Date: Fri 18 Mar 2011 18:40:51
+# This file was automatically created by FeynRules $Revision: 634 $
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Wed 6 Jul 2011 14:07:37
 
 
 from object_library import all_vertices, Vertex
@@ -10,980 +10,428 @@
 
 
 V_1 = Vertex(name = 'V_1',
-             particles = [ P.H, P.H, P.H, P.H ],
+             particles = [ P.H, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.SSSS1 ],
-             couplings = {(0,0):C.GC_17})
+             lorentz = [ L.SSS1 ],
+             couplings = {(0,0):C.GC_30})
 
 V_2 = Vertex(name = 'V_2',
-             particles = [ P.H, P.H, P.phi0, P.phi0 ],
-             color = [ '1' ],
-             lorentz = [ L.SSSS1 ],
-             couplings = {(0,0):C.GC_15})
+             particles = [ P.ghG, P.ghG__tilde__, P.G ],
+             color = [ 'f(3,1,2)' ],
+             lorentz = [ L.UUV1 ],
+             couplings = {(0,0):C.GC_4})
 
 V_3 = Vertex(name = 'V_3',
-             particles = [ P.phi0, P.phi0, P.phi0, P.phi0 ],
-             color = [ '1' ],
-             lorentz = [ L.SSSS1 ],
-             couplings = {(0,0):C.GC_17})
+             particles = [ P.G, P.G, P.G ],
+             color = [ 'f(1,2,3)' ],
+             lorentz = [ L.VVV1 ],
+             couplings = {(0,0):C.GC_4})
 
 V_4 = Vertex(name = 'V_4',
-             particles = [ P.H, P.H, P.phi__minus__, P.phi__plus__ ],
-             color = [ '1' ],
-             lorentz = [ L.SSSS1 ],
-             couplings = {(0,0):C.GC_15})
+             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.VVVV3, L.VVVV4 ],
+             couplings = {(1,1):C.GC_6,(0,0):C.GC_6,(2,2):C.GC_6})
 
 V_5 = Vertex(name = 'V_5',
-             particles = [ P.phi0, P.phi0, P.phi__minus__, P.phi__plus__ ],
+             particles = [ P.A, P.W__minus__, P.W__plus__ ],
              color = [ '1' ],
-             lorentz = [ L.SSSS1 ],
-             couplings = {(0,0):C.GC_15})
+             lorentz = [ L.VVV1 ],
+             couplings = {(0,0):C.GC_25})
 
 V_6 = Vertex(name = 'V_6',
-             particles = [ P.phi__minus__, P.phi__minus__, P.phi__plus__, P.phi__plus__ ],
+             particles = [ P.W__minus__, P.W__plus__, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.SSSS1 ],
-             couplings = {(0,0):C.GC_16})
+             lorentz = [ L.VVSS1 ],
+             couplings = {(0,0):C.GC_10})
 
 V_7 = Vertex(name = 'V_7',
-             particles = [ P.H, P.H, P.H ],
+             particles = [ P.W__minus__, P.W__plus__, P.H ],
              color = [ '1' ],
-             lorentz = [ L.SSS1 ],
-             couplings = {(0,0):C.GC_63})
+             lorentz = [ L.VVS1 ],
+             couplings = {(0,0):C.GC_31})
 
 V_8 = Vertex(name = 'V_8',
-             particles = [ P.H, P.phi0, P.phi0 ],
+             particles = [ P.A, P.A, P.W__minus__, P.W__plus__ ],
              color = [ '1' ],
-             lorentz = [ L.SSS1 ],
-             couplings = {(0,0):C.GC_62})
+             lorentz = [ L.VVVV2 ],
+             couplings = {(0,0):C.GC_27})
 
 V_9 = Vertex(name = 'V_9',
-             particles = [ P.H, P.phi__minus__, P.phi__plus__ ],
+             particles = [ P.W__minus__, P.W__plus__, P.Z ],
              color = [ '1' ],
-             lorentz = [ L.SSS1 ],
-             couplings = {(0,0):C.GC_62})
+             lorentz = [ L.VVV1 ],
+             couplings = {(0,0):C.GC_7})
 
 V_10 = Vertex(name = 'V_10',
-              particles = [ P.A, P.A, P.phi__minus__, P.phi__plus__ ],
+              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
               color = [ '1' ],
-              lorentz = [ L.VVSS1 ],
-              couplings = {(0,0):C.GC_5})
+              lorentz = [ L.VVVV2 ],
+              couplings = {(0,0):C.GC_8})
 
 V_11 = Vertex(name = 'V_11',
-              particles = [ P.A, P.phi__minus__, P.phi__plus__ ],
+              particles = [ P.A, P.W__minus__, P.W__plus__, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.VSS1 ],
-              couplings = {(0,0):C.GC_3})
+              lorentz = [ L.VVVV5 ],
+              couplings = {(0,0):C.GC_26})
 
 V_12 = Vertex(name = 'V_12',
-              particles = [ P.ghA, P.ghWm__tilde__, P.W__minus__ ],
+              particles = [ P.Z, P.Z, P.H, P.H ],
               color = [ '1' ],
-              lorentz = [ L.UUV1 ],
-              couplings = {(0,0):C.GC_3})
+              lorentz = [ L.VVSS1 ],
+              couplings = {(0,0):C.GC_29})
 
 V_13 = Vertex(name = 'V_13',
-              particles = [ P.ghA, P.ghWp__tilde__, P.W__plus__ ],
+              particles = [ P.Z, P.Z, P.H ],
               color = [ '1' ],
-              lorentz = [ L.UUV1 ],
-              couplings = {(0,0):C.GC_4})
+              lorentz = [ L.VVS1 ],
+              couplings = {(0,0):C.GC_32})
 
 V_14 = Vertex(name = 'V_14',
-              particles = [ P.ghWm, P.ghA__tilde__, P.phi__plus__ ],
+              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.UUS1 ],
-              couplings = {(0,0):C.GC_19})
+              lorentz = [ L.VVVV2 ],
+              couplings = {(0,0):C.GC_9})
 
 V_15 = Vertex(name = 'V_15',
-              particles = [ P.ghWm, P.ghA__tilde__, P.W__plus__ ],
-              color = [ '1' ],
-              lorentz = [ L.UUV1 ],
-              couplings = {(0,0):C.GC_3})
+              particles = [ P.d__tilde__, P.d, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_1})
 
 V_16 = Vertex(name = 'V_16',
-              particles = [ P.ghWm, P.ghWm__tilde__, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.UUS1 ],
-              couplings = {(0,0):C.GC_42})
+              particles = [ P.s__tilde__, P.s, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_1})
 
 V_17 = Vertex(name = 'V_17',
-              particles = [ P.ghWm, P.ghWm__tilde__, P.phi0 ],
-              color = [ '1' ],
-              lorentz = [ L.UUS1 ],
-              couplings = {(0,0):C.GC_41})
+              particles = [ P.b__tilde__, P.b, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_1})
 
 V_18 = Vertex(name = 'V_18',
-              particles = [ P.ghWm, P.ghWm__tilde__, P.A ],
+              particles = [ P.e__plus__, P.e__minus__, P.A ],
               color = [ '1' ],
-              lorentz = [ L.UUV1 ],
-              couplings = {(0,0):C.GC_4})
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
 
 V_19 = Vertex(name = 'V_19',
-              particles = [ P.ghWm, P.ghWm__tilde__, P.Z ],
+              particles = [ P.m__plus__, P.m__minus__, P.A ],
               color = [ '1' ],
-              lorentz = [ L.UUV1 ],
-              couplings = {(0,0):C.GC_37})
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
 
 V_20 = Vertex(name = 'V_20',
-              particles = [ P.ghWm, P.ghZ__tilde__, P.phi__plus__ ],
+              particles = [ P.tt__plus__, P.tt__minus__, P.A ],
               color = [ '1' ],
-              lorentz = [ L.UUS1 ],
-              couplings = {(0,0):C.GC_56})
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
 
 V_21 = Vertex(name = 'V_21',
-              particles = [ P.ghWm, P.ghZ__tilde__, P.W__plus__ ],
-              color = [ '1' ],
-              lorentz = [ L.UUV1 ],
-              couplings = {(0,0):C.GC_36})
+              particles = [ P.u__tilde__, P.u, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
 
 V_22 = Vertex(name = 'V_22',
-              particles = [ P.ghWp, P.ghA__tilde__, P.phi__minus__ ],
-              color = [ '1' ],
-              lorentz = [ L.UUS1 ],
-              couplings = {(0,0):C.GC_18})
+              particles = [ P.c__tilde__, P.c, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
 
 V_23 = Vertex(name = 'V_23',
-              particles = [ P.ghWp, P.ghA__tilde__, P.W__minus__ ],
-              color = [ '1' ],
-              lorentz = [ L.UUV1 ],
-              couplings = {(0,0):C.GC_4})
+              particles = [ P.t__tilde__, P.t, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
 
 V_24 = Vertex(name = 'V_24',
-              particles = [ P.ghWp, P.ghWp__tilde__, P.H ],
-              color = [ '1' ],
-              lorentz = [ L.UUS1 ],
-              couplings = {(0,0):C.GC_42})
+              particles = [ P.d__tilde__, P.d, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_5})
 
 V_25 = Vertex(name = 'V_25',
-              particles = [ P.ghWp, P.ghWp__tilde__, P.phi0 ],
-              color = [ '1' ],
-              lorentz = [ L.UUS1 ],
-              couplings = {(0,0):C.GC_43})
+              particles = [ P.s__tilde__, P.s, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_5})