Merge lp:~madteam/mg5amcnlo/new_color_stuffs into lp:~maddevelopers/mg5amcnlo/combine_v0_6_0

[Johan Alwall]

Overhaul of the color modules:
- Added support for color sextets and Epsilon^{ijk}
- Changed ordering of particles in color calculation, to agree with UFO standard (ordering according to interaction order)
- Moved resulting particle in wavefunction to first in the color calculation, giving more reasonable naming of wavefunctions (VVVV_1 instead of VVVV_4 for 4-gluon vertices)

[lp:~madteam/mg5amcnlo/new_color_stuffs]

98. By Johan Alwall <alwall@alwall-laptop> on 2010-11-29

Updated triplet coupling to reflect factor 1/sqrt(2) between Epsilon and K3. Need test though

[Olivier Mattelaer (olivier-mattelaer)]

Excellent!!

Did you run an extensive parralel test, since those changes are quite deep in the code.
Otherwise I've some very minor comment/question:

1) madgraph/core/helas_objects.py
line 770
is the comment:
# take the last index in case of identical particles
still makes sense?

2) madgraph/core/helas_objects.py
line 814 + 1537.

why not:
 mothers = self.get('mothers')
    if not mothers:
         return vertices
 for mother in mothers

3) madgraph/core/helas_objects.py
line: 1255
Add comment to explain what are the effect and the usefullness of my_pdg_code.
Should it have a default value (potentially to None or 0)?

4) madgraph/core/helas_objects.py
line: 1814
not beautifull indentation (not 4 spaces).
+ should specify the reason of the zero in
mothers.sort_by_pdg_codes(self.get('pdg_codes'), 0)
either by putting my_pdg_code=0 or by removing it
(and assign my_pdg_code a default value --my favourite options--)

5) This part can certainly be optimised in a better way. (That's not crucial)
@@ -246,32 +249,31 @@
1036 elif colors == [-3, 3]:
1037 # triplet-triplet-singlet coupling
1038 myinter.set('color', [color.ColorString(\
1039 - [color.T(1, 0)])])
1040 + [color.T(ind[1], ind[0])])])

Could you explain to me why you need to change this?

6)
+++ madgraph/various/process_checks.py 2010-11-29 00:15:14 +0000
1079 @@ -221,6 +221,9 @@
1080 # Add this process to tested_processes
1081 sorted_ids.append(ids)
1082
1083 + # Skip adding antiprocess below, since might be relevant too
1084 + return False
1085 +

Shouldn't we remove the code after the return False?

7) models/import_ufo
line 256:
Shouldn't we remove those lines? (or explain why they are commented)
        # Compute how change indices to match MG5 convention
        #info = [(i+1,part.color) for i,part in enumerate(interaction_info.particles)
        # if part.color!=1]
        #order = sorted(info, lambda p1, p2:p1[1] - p2[1])

        #new_indices={}
 #for i,(j, pcolor) in enumerate(order):
        # new_indices[j]=i

8) madgraph/core/color_algebra.py
line: 321

Basic verification that everything is normal, should be done in principle only in debug mode:
(except if you worried about wrong model input)
then I would suggest to replace
+ if len(args...

review: Needs Information

[Johan Alwall (johan-alwall)]

Many thanks for an excellent review. Please see the following for
answers to the comments.

> Did you run an extensive parralel test, since those changes are quite deep in the code.

I ran a number of parallel tests, but we should run the complete list
before merging combine_v0_6_0 to trunk.

> 1) madgraph/core/helas_objects.py
> 2) madgraph/core/helas_objects.py
> 3) madgraph/core/helas_objects.py
All fixed.

> 4) madgraph/core/helas_objects.py
> line: 1814
It is 4 spaces, just that the line continuation is lined up at 3
spaces (to simplify reading the if statement).
> (and assign my_pdg_code a default value --my favourite options--)
Done.

> 5) This part can certainly be optimised in a better way. (That's not crucial)
> @@ -246,32 +249,31 @@
> 1036                     elif colors == [-3, 3]:
> 1037                         # triplet-triplet-singlet coupling
> 1038                         myinter.set('color', [color.ColorString(\
> 1039    -                        [color.T(1, 0)])])
> 1040    +                        [color.T(ind[1], ind[0])])])
For e.g. u~ n1 su1, it is not indices 1,0, but ind[1], ind[0].
> Could you explain to me why you need to change this?
I changed the color indices to conform with the actual order of
particles in the interaction (in accordance with the convention in UFO
model files).

> 6)
> 7) models/import_ufo
> 8) madgraph/core/color_algebra.py
> 9) Same comment for Epsilon_Bar/K6/... definition
All done!

[lp:~madteam/mg5amcnlo/new_color_stuffs]

99. By Johan Alwall on 2010-12-15

Fixes according to review. Many thanks Olivier.

[Olivier Mattelaer (olivier-mattelaer)]

Perfect!!!!!

Thanks

Olivier

review: Approve

=== modified file '.project'
--- .project	2010-05-20 12:24:23 +0000
+++ .project	2010-12-15 07:31:31 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>correct_tuto_bug</name>
+	<name>MG-new_color_stuff</name>
 	<comment></comment>
 	<projects>
 	</projects>

=== added file '.pydevproject'
--- .pydevproject	1970-01-01 00:00:00 +0000
+++ .pydevproject	2010-12-15 07:31:31 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/MG-new_color_stuff</path>
+</pydev_pathproperty>
+</pydev_project>

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2010-12-09 20:01:53 +0000
+++ madgraph/core/base_objects.py	2010-12-15 07:31:31 +0000
@@ -312,7 +312,7 @@
     def get_color(self):
         """Return the color code with a correct minus sign"""
 
-        if not self['is_part'] and self['color'] in [3, 6]:
+        if not self['is_part'] and abs(self['color']) in [3, 6]:
             return - self['color']
         else:
             return self['color']
@@ -321,7 +321,7 @@
         """Return the color code of the antiparticle with a correct minus sign
         """
 
-        if self['is_part'] and self['color'] in [3, 6]:
+        if self['is_part'] and self['color'] not in [1, 8]:
             return - self['color']
         else:
             return self['color']

=== modified file 'madgraph/core/color_algebra.py'
--- madgraph/core/color_algebra.py	2010-08-13 08:25:50 +0000
+++ madgraph/core/color_algebra.py	2010-12-15 07:31:31 +0000
@@ -60,6 +60,7 @@
         reversed. Can be overwritten for specific color objects like T,..."""
 
         self.reverse()
+        return self
 
     def replace_indices(self, repl_dict):
         """Replace current indices following the rules listed in the replacement
@@ -216,6 +217,7 @@
                                                    col_obj[:-2] + \
                                                    array.array('i', [ij1[0],
                                                                ij2[1]])))])])
+
             # T(a,x,b,i,j)T(c,x,d,k,l) = 1/2(T(a,d,i,l)T(c,b,k,j)    
             #                          -1/Nc T(a,b,i,j)T(c,d,k,l))
             for i1, index1 in enumerate(self[:-2]):
@@ -252,6 +254,7 @@
         l2 = self[-2:]
         l2.reverse()
         self[:] = l1 + l2
+        return self
 
 #===============================================================================
 # f
@@ -305,6 +308,263 @@
         return ColorFactor([col_str1, col_str2])
 
 #===============================================================================
+# Epsilon and EpsilonBar, the totally antisymmetric tensors of three triplet
+# (antitriplet) indices
+#===============================================================================
+class Epsilon(ColorObject):
+    """Epsilon_ijk color object for three triplets"""
+
+    def __init__(self, *args):
+        """Ensure e_ijk objects have strictly 3 indices"""
+
+        super(Epsilon, self).__init__()
+        assert len(args) == 3, "Epsilon objects must have three indices!"
+
+    def pair_simplify(self, col_obj):
+        """Implement e_ijk ae_ilm = T(j,l)T(k,m) - T(j,m)T(k,l) and
+        e_ijk T(l,k) = e_ikl"""
+
+        # e_ijk ae_ilm = T(j,l)T(k,m) - T(j,m)T(k,l)
+        if isinstance(col_obj, EpsilonBar):
+
+            incommon = False
+            eps_indices = self[:]
+            aeps_indices = col_obj[:]
+            for i in self:
+                if i in col_obj:
+                    incommon = True
+                    com_index_eps = self.index(i)
+                    com_index_aeps = col_obj.index(i)
+
+            if incommon:
+                eps_indices = self[com_index_eps:] + self[:com_index_eps]
+                aeps_indices = col_obj[com_index_aeps:] + col_obj[:com_index_aeps]
+                col_str1 = ColorString([T(eps_indices[1], aeps_indices[1]),
+                                       T(eps_indices[2], aeps_indices[2])])
+                col_str2 = ColorString([T(eps_indices[1], aeps_indices[2]),
+                                       T(eps_indices[2], aeps_indices[1])])
+
+                col_str2.coeff = fractions.Fraction(-1, 1)
+
+                return ColorFactor([col_str1, col_str2])
+
+        # e_ijk T(l,k) = e_ikl
+        if isinstance(col_obj, T) and len(col_obj) == 2 and col_obj[1] in self:
+
+            com_index = self.index(col_obj[1])
+            new_self = copy.copy(self)
+            new_self[com_index] = col_obj[0]
+
+            return ColorFactor([ColorString([new_self])])
+
+
+    def complex_conjugate(self):
+        """Complex conjugation. Overwritten here because complex conjugation
+        interchange triplets and antitriplets."""
+
+        return EpsilonBar(*self)
+
+
+class EpsilonBar(ColorObject):
+    """Epsilon_ijk color object for three antitriplets"""
+
+    def __init__(self, *args):
+        """Ensure e_ijk objects have strictly 3 indices"""
+
+        super(EpsilonBar, self).__init__()
+        assert len(args) == 3, "EpsilonBar objects must have three indices!"
+
+    def pair_simplify(self, col_obj):
+        """Implement ebar_ijk T(k,l) = e_ikl"""
+
+        # ebar_ijk T(k,l) = ebar_ijl
+        if isinstance(col_obj, T) and len(col_obj) == 2 and col_obj[0] in self:
+
+            com_index = self.index(col_obj[0])
+            new_self = copy.copy(self)
+            new_self[com_index] = col_obj[1]
+
+            return ColorFactor([ColorString([new_self])])
+
+
+    def complex_conjugate(self):
+        """Complex conjugation. Overwritten here because complex conjugation
+        interchange triplets and antitriplets."""
+
+        return Epsilon(*self)
+
+
+#===============================================================================
+# Color sextet objects: K6, K6Bar, T6
+#                       Note that delta3 = T, delta6 = T6, delta8 = 1/2 Tr
+#===============================================================================
+
+class K6(ColorObject):
+    """K6, the symmetry clebsch coefficient, mapping into the symmetric
+    tensor."""
+
+    def __init__(self, *args):
+        """Ensure sextet color objects have strictly 3 indices"""
+
+        super(K6, self).__init__()
+        assert len(args) == 3, "sextet color objects must have three indices!"
+
+    def pair_simplify(self, col_obj):
+        """Implement the replacement rules
+        K6(m,i,j)K6Bar(m,k,l) = 1/2(delta3(l,i)delta3(k,j)
+                                  + delta3(k,i)delta3(l,j))
+                            = 1/2(T(l,i)T(k,j) + T(k,i)T(l,j))
+        K6(m,i,j)K6Bar(n,j,i) = delta6(m,n)
+        K6(m,i,j)K6Bar(n,i,j) = delta6(m,n)
+        delta3(i,j)K6(m,i,k) = K6(m,j,k)
+        delta3(i,k)K6(m,j,i) = K6(m,j,k)."""
+
+        if isinstance(col_obj, K6Bar):
+
+            m = self[0]
+            n = col_obj[0]
+
+            ij1 = self[-2:]
+            ij2 = col_obj[-2:]
+
+            # K6(m,i,j)K6Bar(m,k,l) = 1/2(T(l,i)T(k,j)
+            #                           + T(k,i)T(l,j)
+            if m == n:
+                col_str1 = ColorString([T(ij2[1], ij1[0]),
+                                        T(ij2[0], ij1[1])])
+                col_str2 = ColorString([T(ij2[0], ij1[0]),
+                                        T(ij2[1], ij1[1])])
+                col_str1.coeff = fractions.Fraction(1, 2)
+                col_str2.coeff = fractions.Fraction(1, 2)
+
+                return ColorFactor([col_str1, col_str2])
+
+            # K6(m,i,j)K6Bar(n,j,i) = delta6(m,n)
+            if ij1[1] == ij2[0] and ij1[0] == ij2[1]:
+                return ColorFactor([ColorString([T6(m, n)])])
+
+            # K6(m,i,j)K6Bar(n,i,j) = delta6(m,n)
+            if ij1[0] == ij2[0] and ij1[1] == ij2[1]:
+                return ColorFactor([ColorString([T6(m, n)])])
+
+        if isinstance(col_obj, T) and len(col_obj) == 2:
+            # delta3(i,j)K6(m,i,k) = K6(m,j,k)
+            # delta3(i,k)K6(m,j,i) = K6(m,j,k)
+            if col_obj[0] in self[-2:]:
+                index1 = self[-2:].index(col_obj[0])
+                return ColorFactor([ColorString([K6(self[0],
+                                                    self[2-index1],
+                                                    col_obj[1])])])
+
+    def complex_conjugate(self):
+        """Complex conjugation. By default, the ordering of color index is
+        reversed. Can be overwritten for specific color objects like T,..."""
+
+        return K6Bar(*self)
+
+
+class K6Bar(ColorObject):
+    """K6Bar, the barred symmetry clebsch coefficient, mapping into the symmetric
+    tensor."""
+
+    def __init__(self, *args):
+        """Ensure sextet color objects have strictly 3 indices"""
+
+        super(K6Bar, self).__init__()
+        assert len(args) == 3, "sextet color objects must have three indices!"
+
+    def pair_simplify(self, col_obj):
+        """Implement the replacement rules
+        delta3(i,j)K6Bar(m,j,k) = K6Bar(m,i,k)
+        delta3(k,j)K6Bar(m,i,j) = K6Bar(m,i,k)."""
+        
+        if isinstance(col_obj, T) and len(col_obj) == 2:
+            # delta3(i,j)K6Bar(m,j,k) = K6Bar(m,i,k)
+            # delta3(k,j)K6Bar(m,i,j) = K6Bar(m,i,k)
+            if col_obj[1] in self[-2:]:
+                index1 = self[-2:].index(col_obj[1])
+                return ColorFactor([ColorString([K6Bar(self[0],
+                                                    self[2-index1],
+                                                    col_obj[0])])])
+
+    def complex_conjugate(self):
+        """Complex conjugation. By default, the ordering of color index is
+        reversed. Can be overwritten for specific color objects like T,..."""
+
+        return K6(*self)
+
+class T6(ColorObject):
+    """The T6 sextet trace color object."""
+
+    new_index = 10000
+
+    def __init__(self, *args):
+        """Check for exactly three indices"""
+
+        super(T6, self).__init__()
+        assert len(args) >= 2 and len(args) <= 3, \
+               "T6 objects must have two or three indices!"
+
+    def simplify(self):
+        """Implement delta6(i,i) = 1/2 Nc(Nc+1),
+        T6(a,i,j) = 2(K6(i,ii,jj)T(a,jj,kk)K6Bar(j,kk,ii))"""
+
+        # delta6(i,i) = Nc
+        if len(self) == 2 and self[0] == self[1]:
+            col_str1 = ColorString()
+            col_str1.Nc_power = 2
+            col_str1.coeff = fractions.Fraction(1, 2)
+            col_str2 = ColorString()
+            col_str2.Nc_power = 1
+            col_str2.coeff = fractions.Fraction(1, 2)
+            return ColorFactor([col_str1, col_str2])
+
+        if len(self) == 2:
+            return
+
+        # Set new indices according to the Mathematica template
+        ii = T6.new_index
+        jj = ii + 1
+        kk = jj + 1
+        T6.new_index += 3
+        # Create the resulting color objects
+        col_string = ColorString([K6(self[1], ii, jj),
+                                  T(self[0], jj, kk),
+                                  K6Bar(self[2], kk, ii)])
+        col_string.coeff = fractions.Fraction(2, 1)
+        return ColorFactor([col_string])
+
+    def pair_simplify(self, col_obj):
+        """Implement the replacement rules
+        delta6(i,j)delta6(j,k) = delta6(i,k)
+        delta6(m,n)K6(n,i,j) = K6(m,i,j)
+        delta6(m,n)K6Bar(m,i,j) = K6Bar(n,i,j)."""
+
+        if len(self) == 3:
+            return
+
+        if isinstance(col_obj, T6) and len(col_obj) == 2:
+            #delta6(i,j)delta6(j,k) = delta6(i,k)
+            if col_obj[0] == self[1]:
+                return ColorFactor([ColorString([T6(self[0],
+                                                        col_obj[1])])])
+
+        if isinstance(col_obj, K6):
+            # delta6(m,n)K6(n,i,j) = K6(m,i,j)
+            if col_obj[0] == self[1]:
+                return ColorFactor([ColorString([K6(self[0],
+                                                    col_obj[1],
+                                                    col_obj[2])])])
+                
+
+        if isinstance(col_obj, K6Bar):        
+            # delta6(m,n)K6Bar(m,i,j) = K6Bar(n,i,j)."""
+            if col_obj[0] == self[0]:
+                return ColorFactor([ColorString([K6Bar(self[1],
+                                                    col_obj[1],
+                                                    col_obj[2])])])
+
+#===============================================================================
 # ColorString
 #===============================================================================
 class ColorString(list):
@@ -371,7 +631,7 @@
         """Simplify the current ColorString by applying simplify rules on
         each element and building a new ColorFactor to return if necessary"""
 
-        # First, try sto simplify element by element
+        # First, try to simplify element by element
         for i1, col_obj1 in enumerate(self):
             res = col_obj1.simplify()
             # If a simplification possibility is found...
@@ -388,6 +648,7 @@
                     # remains the same for comparison
                     first_col_str.sort()
                     res_col_factor.append(first_col_str)
+
                 return res_col_factor
 
         # Second, try to simplify pairs
@@ -419,9 +680,10 @@
     def complex_conjugate(self):
         """Returns the complex conjugate of the current color string"""
 
-        compl_conj_str = copy.copy(self)
-        for col_obj in compl_conj_str:
-            col_obj.complex_conjugate()
+        compl_conj_str = ColorString([], self.coeff, self.is_imaginary,
+                                     self.Nc_power)
+        for col_obj in self:
+            compl_conj_str.append(col_obj.complex_conjugate())
         if compl_conj_str.is_imaginary:
             compl_conj_str.coeff = -compl_conj_str.coeff
 
@@ -551,6 +813,17 @@
                self.is_imaginary == col_str.is_imaginary and \
                self.to_canonical() == col_str.to_canonical()
 
+    def near_equivalent(self, col_str):
+        """Check if two color strings are equivalent looking only at
+        the color objects (used in color flow string calculation)"""
+
+        if len(self.to_canonical()) != len(col_str.to_canonical()):
+            return False
+
+        return all([co1[0] == co2[0] and sorted(co1[1]) == sorted(co2[1]) \
+                        for (co1,co2) in zip(self.to_canonical()[0],
+                                             col_str.to_canonical()[0])])
+
 #===============================================================================
 # ColorFactor
 #===============================================================================

=== modified file 'madgraph/core/color_amp.py'
--- madgraph/core/color_amp.py	2010-08-13 08:25:50 +0000
+++ madgraph/core/color_amp.py	2010-12-15 07:31:31 +0000
@@ -106,10 +106,13 @@
         # can be negative for anti particles
 
         color_num_pairs = []
+        pdg_codes = []
 
         for index, leg in enumerate(vertex.get('legs')):
             curr_num = leg.get('number')
-            curr_color = model.get('particle_dict')[leg.get('id')].get_color()
+            curr_part = model.get('particle_dict')[leg.get('id')]
+            curr_color = curr_part.get_color()
+            curr_pdg = curr_part.get_pdg_code()
 
             # If this is the next-to-last vertex and the last vertex is
             # the special identity id=0, start by applying the replacement rule
@@ -123,8 +126,8 @@
             # before an id=0 vertex, replace last index by a new summed index.
             if index == len(vertex.get('legs')) - 1 and \
                 vertex != diagram.get('vertices')[-1]:
-                curr_color = \
-                    model.get('particle_dict')[leg.get('id')].get_anti_color()
+                curr_color = curr_part.get_anti_color()
+                curr_pdg = curr_part.get_anti_pdg_code()
                 if not id0_rep:
                     repl_dict[curr_num] = min_index
                     min_index = min_index - 1
@@ -135,14 +138,32 @@
             except KeyError:
                 pass
 
-            # Discard color singlets
-            if curr_color != 1:
-                color_num_pairs.append((curr_color, curr_num))
-
-        # Order the color/number pairs according to increasing color (assumed
-        # to be the ordering choose in interactions.py). For identical colors,
-        # keep the normal leg ordering.
-        color_num_pairs = sorted(color_num_pairs, lambda p1, p2:p1[0] - p2[0])
+            color_num_pairs.append((curr_color, curr_num))
+            pdg_codes.append(curr_pdg)
+
+        if vertex != diagram.get('vertices')[-1]:
+            # Put the resulting wavefunction first, to make
+            # wavefunction call more natural
+            last_color_num = color_num_pairs.pop(-1)
+            color_num_pairs.insert(0, last_color_num)
+            last_pdg = pdg_codes.pop(-1)
+            pdg_codes.insert(0, last_pdg)
+
+        # Order the legs according to the interaction particles
+        interaction_pdgs = [p.get_pdg_code() for p in \
+                            model.get_interaction(vertex.get('id')).\
+                            get('particles')]
+
+        sorted_color_num_pairs = []
+        for i, pdg in enumerate(interaction_pdgs):
+            index = pdg_codes.index(pdg)
+            pdg_codes.pop(index)
+            sorted_color_num_pairs.append(color_num_pairs.pop(index))
+
+        if color_num_pairs:
+            raise base_objects.PhysicsObject.PhysicsObjectError
+
+        color_num_pairs = sorted_color_num_pairs
 
         # Create a list of associated leg number following the same order
         list_numbers = [p[1] for p in color_num_pairs]
@@ -199,6 +220,7 @@
                     new_col_str_chain.product(mod_col_str)
                     new_res_dict[tuple(list(ind_chain) + [i])] = \
                         new_col_str_chain
+
         return (min_index, new_res_dict)
 
 
@@ -210,7 +232,6 @@
 
         # loop over possible color chains
         for col_chain, col_str in colorize_dict.items():
-
             # Create a canonical immutable representation of the the string
             canonical_rep, rep_dict = col_str.to_canonical()
 
@@ -345,10 +366,34 @@
 
         # Add one T per external octet
         for indices in octet_indices:
-            my_cf[0].append(color_algebra.T(indices[0],
-                                            indices[1],
-                                            indices[2]))
-
+            if indices[0] == -6:
+                # Add a K6 which contracts the antisextet index to a
+                # pair of antitriplets
+                my_cf[0].append(color_algebra.K6(indices[1],
+                                                 indices[2],
+                                                 indices[3]))
+                # ... and then contract the pair of antitriplets to a
+                # single triplet
+                my_cf[0].append(color_algebra.Epsilon(indices[2],
+                                                      indices[3],
+                                                      indices[4]))
+            if indices[0] == 6:
+                # Add a K6Bar which contracts the sextet index to a
+                # pair of triplets
+                my_cf[0].append(color_algebra.K6Bar(indices[1],
+                                                    indices[2],
+                                                    indices[3]))
+                # ... and then contract the pair of triplets to a
+                # single antitriplet
+                my_cf[0].append(color_algebra.EpsilonBar(indices[2],
+                                                         indices[3],
+                                                         indices[4]))
+            if indices[0] == 8:
+                # Add a T which contracts the octet to a
+                # triplet-antitriplet pair
+                my_cf[0].append(color_algebra.T(indices[1],
+                                                indices[2],
+                                                indices[3]))
         # Simplify the whole thing
         my_cf = my_cf.full_simplify()
 
@@ -359,19 +404,22 @@
         res_cs = [cs for cs in my_cf if cs.Nc_power == max_coeff]
 
         # If more than one string at leading N...
-        if len(res_cs) > 1:
+        if len(res_cs) > 1 and any([not cs.near_equivalent(res_cs[0]) \
+                                    for cs in res_cs]):
             raise ColorBasis.ColorBasisError, \
              "More than one color string with leading N coeff: %s" % str(res_cs)
 
         res_cs = res_cs[0]
 
         # If the result string does not contain only T's with two indices
+        # and Epsilon/EpsilonBar objects
         for col_obj in res_cs:
-            if col_obj.__class__.__name__ != 'T':
+            if not isinstance(col_obj, color_algebra.T) and \
+                   not col_obj.__class__.__name__.startswith('Epsilon'):
                 raise ColorBasis.ColorBasisError, \
-                  "Color flow decomposition %s contains non T elements" % \
+                  "Color flow decomposition %s contains non T/Epsilon elements" % \
                                                                     str(res_cs)
-            if len(col_obj) != 2:
+            if isinstance(col_obj, color_algebra.T) and len(col_obj) != 2:
                 raise ColorBasis.ColorBasisError, \
                   "Color flow decomposition %s contains T's w/o 2 indices" % \
                                                                     str(res_cs)
@@ -390,6 +438,7 @@
         # Offsets used to introduce fake quark indices for gluons
         offset1 = 1000
         offset2 = 2000
+        offset3 = 3000
 
         res = []
 
@@ -407,31 +456,51 @@
                 res_dict[leg_num] = [0, 0]
 
                 # Raise an error if external legs contain non supported repr
-                if leg_repr not in [1, 3, -3, 8]:
+                if leg_repr not in [1, 3, -3, 6, -6, 8]:
                     raise ColorBasis.ColorBasisError, \
         "Particle ID=%i has an unsupported color representation" % leg_repr
 
                 # Build the fake indices replacements for octets
                 if leg_repr == 8:
-                    fake_repl.append((leg_num,
+                    fake_repl.append((leg_repr, leg_num,
                                       offset1 + leg_num,
                                       offset2 + leg_num))
+                # Build the fake indices for sextets
+                elif leg_repr in [-6, 6]:
+                    fake_repl.append((leg_repr, leg_num,
+                                      offset1 + leg_num,
+                                      offset2 + leg_num,
+                                      offset3 + leg_num))
 
             # Get the actual color flow
             col_str_flow = self.get_color_flow_string(col_str, fake_repl)
 
             # Offset for color flow
-            offset = 501
+            offset = 500
 
             for col_obj in col_str_flow:
+                if isinstance(col_obj, color_algebra.T):
+                    # For T, all color indices should be the same
+                    offset = offset + 1
                 for i, index in enumerate(col_obj):
+                    if isinstance(col_obj, color_algebra.Epsilon):
+                        # Epsilon contracts with antitriplets,
+                        i = 0
+                        # ...and requires all different color indices
+                        offset = offset+1
+                    elif isinstance(col_obj, color_algebra.EpsilonBar):
+                        # EpsilonBar contracts with antitriplets
+                        i = 1
+                        # ...and requires all different color indices
+                        offset = offset+1
                     if index < offset1:
                         res_dict[index][i] = offset
                     elif index > offset1 and index < offset2:
-                        res_dict[index - offset1][0] = offset
-                    elif index > offset2:
-                        res_dict[index - offset2][1] = offset
-                offset = offset + 1
+                        res_dict[index - offset1][i] = offset
+                    elif index > offset2 and index < offset3:
+                        res_dict[index - offset2][i] = offset
+                    elif index > offset3:
+                        res_dict[index - offset3][i] = offset
 
             # Reverse ordering for initial state to stick to the (weird)
             # les houches convention

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2010-11-04 14:34:26 +0000
+++ madgraph/core/diagram_generation.py	2010-12-15 07:31:31 +0000
@@ -338,6 +338,7 @@
         # If all legs can be combined in one single vertex, add this
         # vertex to res and continue.
         # Special treatment for decay chain legs
+
         if curr_leglist.can_combine_to_0(ref_dict_to0, is_decay_proc):
             # Extract the interaction id associated to the vertex 
             vertex_ids = ref_dict_to0[tuple(sorted([leg.get('id') for \

=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2010-11-24 20:10:07 +0000
+++ madgraph/core/helas_objects.py	2010-12-15 07:31:31 +0000
@@ -12,7 +12,7 @@
 # For more information, please visit: http://madgraph.phys.ucl.ac.be
 #
 ################################################################################
-from madgraph.core import base_objects
+
 """Definitions of objects used to generate language-independent Helas
 calls: HelasWavefunction, HelasAmplitude, HelasDiagram for the
 generation of wavefunctions and amplitudes, HelasMatrixElement and
@@ -412,13 +412,14 @@
         """For octet Majorana fermions, need an extra minus sign in
         the FVI (and FSI?) wavefunction in UFO models."""
 
+        # Add minus sign to coupling of color octet Majorana
+        # particles to g for FVI vertex
         if self.get('color') == 8 and \
                self.get_spin_state_number() == -2 and \
                self.get('self_antipart') and \
                [m.get('color') for m in self.get('mothers')] == [8, 8]:
             self.set('coupling', '-' + self.get('coupling'))
         
-
     def set_state_and_particle(self, model):
         """Set incoming/outgoing state according to mother states and
         Lorentz structure of the interaction, and set PDG code
@@ -769,11 +770,8 @@
             return 0
         
         wf_indices = self.get('pdg_codes')
-        # take the last index in case of identical particles
-        wf_indices.reverse() 
-        wf_index = len(wf_indices) - wf_indices.index(self.get_anti_pdg_code()) - 1
-        wf_indices.reverse() # restore the ordering
-        #wf_index = self.get('pdg_codes').index(self.get_anti_pdg_code())
+        # Take the first index in case of identical particles
+        wf_index = wf_indices.index(self.get_anti_pdg_code())
         # If fermion, then we need to correct for I/O status
         spin_state = self.get_spin_state_number()
         if spin_state % 2 == 0:
@@ -812,14 +810,17 @@
 
         vertices = base_objects.VertexList()
 
-        if not self.get('mothers'):
+        mothers = self.get('mothers')
+
+        if not mothers:
             return vertices
 
         # Add vertices for all mothers
-        for mother in self.get('mothers'):
+        for mother in mothers:
             # This is where recursion happens
-            vertices.extend(mother.get_base_vertices(wf_dict, vx_list,
-                                                     optimization))
+            vertices.extend(mother.get_base_vertices(\
+                                                wf_dict, vx_list,optimization))
+
         # Generate last vertex
         legs = base_objects.LegList()
 
@@ -837,7 +838,7 @@
             if optimization != 0:
                 wf_dict[self.get('number')] = lastleg
 
-        for mother in self.get('mothers'):
+        for mother in mothers:
             try:
                 leg = wf_dict[mother.get('number')]
             except KeyError:
@@ -1219,6 +1220,44 @@
 
         return res
 
+    def sort_by_pdg_codes(self, pdg_codes, my_pdg_code = 0):
+        """Sort this HelasWavefunctionList according to the cyclic
+        order of the pdg codes given. my_pdg_code is the pdg code of
+        the daughter wavefunction (or 0 if daughter is amplitude)."""
+
+        pdg_codes = copy.copy(pdg_codes)
+
+        # Remove the argument wavefunction code from pdg_codes
+
+        my_index = -1
+        if my_pdg_code:
+            # Find the last index instead of the first, to work with UFO models
+            my_index = pdg_codes.index(my_pdg_code)
+            pdg_codes.pop(my_index)
+        
+        mothers = copy.copy(self)
+
+        # Sort according to interaction pdg codes
+
+        mother_codes = [ wf.get_pdg_code() for wf \
+                         in mothers ]
+
+        if pdg_codes == mother_codes:
+            # Already sorted - skip sort below
+            return mothers, my_index
+
+        sorted_mothers = []
+        for i, code in enumerate(pdg_codes):
+            index = mother_codes.index(code)
+            mother_codes.pop(index)
+            mother = mothers.pop(index)
+            sorted_mothers.append(mother)
+
+        if mothers:
+            raise base_objects.PhysicsObject.PhysicsObjectError
+
+        return sorted_mothers, my_index
+
     @staticmethod
     def extract_wavefunctions(mothers):
         """Recursively extract the wavefunctions from mothers of mothers"""
@@ -1537,9 +1576,11 @@
         for mother in self.get('mothers'):
             vertices.extend(mother.get_base_vertices(wf_dict, vx_list,
                                                      optimization))
+        mothers = self.get('mothers')
+
         # Generate last vertex
         legs = base_objects.LegList()
-        for mother in self.get('mothers'):
+        for mother in mothers:
             try:
                 leg = wf_dict[mother.get('number')]
             except KeyError:
@@ -1725,9 +1766,32 @@
         else:
             return ()
 
+    def set_coupling_color_factor(self):
+        """Check if there is a mismatch between order of fermions
+        w.r.t. color"""
+        mothers = self.get('mothers')
+
+        # Sort mothers according to pdg codes if fermions with indentical
+        # color but not identical pdg code. Needed for antisymmetric
+        # color eps^{ijk}.
+        for imo in range(len(mothers)-1):
+            if mothers[imo].get('color') != 1 and \
+               mothers[imo].is_fermion() and \
+               mothers[imo].get('color') == mothers[imo+1].get('color') and \
+               mothers[imo].get('spin') == mothers[imo+1].get('spin') and \
+               mothers[imo].get('pdg_code') != mothers[imo+1].get('pdg_code'):
+                mothers, my_index = \
+                         mothers.sort_by_pdg_codes(self.get('pdg_codes'))
+                break
+
+        if mothers != self.get('mothers'):
+            # We have mismatch between fermion order for color and lorentz
+            self.set('coupling', '-'+self.get('coupling'))
+
     # Comparison between different amplitudes, to allow check for
     # identical processes. Note that we are then not interested in
     # interaction id, but in all other properties.
+
     def __eq__(self, other):
         """Comparison between different amplitudes, to allow check for
         identical processes.
@@ -2237,6 +2301,7 @@
         # Sort all mothers according to the order wanted in Helas calls
         for wf in self.get_all_wavefunctions():
             wf.set('mothers', HelasMatrixElement.sorted_mothers(wf))
+
         for amp in self.get_all_amplitudes():
             amp.set('mothers', HelasMatrixElement.sorted_mothers(amp))
             amp.set('color_indices', amp.get_color_indices())
@@ -3317,45 +3382,30 @@
         if not arg.get('interaction_id'):
             return arg.get('mothers')
 
-        pdg_codes = copy.copy(arg.get('pdg_codes'))
-
-        # Remove the argument wavefunction code from pdg_codes
-
+        sorted_mothers = copy.copy(arg.get('mothers'))
+        my_pdg_code = 0
+        my_spin = 0
         if isinstance(arg, HelasWavefunction):
+            my_pdg_code = arg.get_anti_pdg_code()
             my_spin = arg.get_spin_state_number()
-            # Find the last index instead of the first, to work with UFO models
-            pdg_codes.reverse()
-            my_index = len(pdg_codes) - pdg_codes.index(arg.get_anti_pdg_code()) - 1
-            pdg_codes.reverse()
-            pdg_codes.pop(my_index)
-        
-        mothers = copy.copy(arg.get('mothers'))
-
-        # First sort according to interaction pdg codes
-
-        mother_codes = [ wf.get_pdg_code() for wf \
-                         in mothers ]
-
-        sorted_mothers = []
+
+        sorted_mothers, my_index = arg.get('mothers').sort_by_pdg_codes(\
+            arg.get('pdg_codes'), my_pdg_code)
+
         same_spin_mothers = []
-        same_spin_index = -1
-        for i, code in enumerate(pdg_codes):
-            index = mother_codes.index(code)
-            mother_codes.pop(index)
-            mother = mothers.pop(index)
-            if isinstance(arg, HelasWavefunction) and \
-               my_spin % 2 == 1 and \
-               mother.get_spin_state_number() == my_spin:
-                # For bosons with same spin as this wf, need special treatment
-                if same_spin_index < 0:
-                    # Remember starting index for same spin states
-                    same_spin_index = i
-                same_spin_mothers.append(mother)
-            else:
-                sorted_mothers.append(mother)
-
-        if mothers:
-            raise base_objects.PhysicsObject.PhysicsObjectError
+        if isinstance(arg, HelasWavefunction) and \
+               my_spin % 2 == 1:
+            # For bosons with same spin as this wf, need special treatment
+            same_spin_index = -1
+            i=0
+            while i < len(sorted_mothers):
+                if sorted_mothers[i].get_spin_state_number() == my_spin:
+                    if same_spin_index < 0:
+                        # Remember starting index for same spin states
+                        same_spin_index = i
+                    same_spin_mothers.append(sorted_mothers.pop(i))
+                else:
+                    i += 1
 
         # Make cyclic reordering of mothers with same spin as this wf
         if same_spin_mothers:
@@ -3404,7 +3454,7 @@
         # Put back partner into sorted_mothers
         if partner:
             sorted_mothers.insert(partner_index, partner)
-        
+
         # Next sort according to spin_state_number
         return HelasWavefunctionList(sorted_mothers)
 
@@ -3796,7 +3846,6 @@
                         new_amp = matrix_element.get_base_amplitude()
                         matrix_element.set('base_amplitude', new_amp)
                         colorize_obj = col_basis.create_color_dict_list(new_amp)
-
                         try:
                             # If the color configuration of the ME has
                             # already been considered before, recycle

=== modified file 'madgraph/interface/cmd_interface.py'
--- madgraph/interface/cmd_interface.py	2010-12-10 11:24:36 +0000
+++ madgraph/interface/cmd_interface.py	2010-12-15 07:31:31 +0000
@@ -504,16 +504,15 @@
 
         logger.info("syntax: check " + "|".join(self._check_opts) + " [param_card] process_definition")
         logger.info("-- check a process or set of processes. Options:")
-        logger.info("full: Checks that the model and MG5 are working properly")
-        logger.info("   by generating the all permutations of the process and")
-        logger.info("   checking that the result of calculating the resulting")
-        logger.info("   matrix elements give the same result. For processes with")
-        logger.info("   gauge bosons, check gauge invariance.")
-        logger.info("quick: A faster version of the above checks.")
-        logger.info("   Only checks a subset of permutations.")
-        logger.info("gauge: Only check that processes with massless gauge bosons")
+        logger.info("full: Perform all three checks described below:")
+        logger.info("   permutation, gauge and lorentz_invariance.")
+        logger.info("permutation: Check that the model and MG5 are working")
+        logger.info("   properly by generating permutations of the process and")
+        logger.info("   checking that the resulting matrix elements give the")
+        logger.info("   same value.")
+        logger.info("gauge: Check that processes with massless gauge bosons")
         logger.info("   are gauge invariant")
-        logger.info("lorentz_invariance: Only check that the amplitude is lorentz")
+        logger.info("lorentz_invariance: Check that the amplitude is lorentz")
         logger.info("   invariant by comparing the amplitiude in different frames")        
         logger.info("If param_card is given, that param_card is used instead")
         logger.info("   of the default values for the model.")
@@ -1374,7 +1373,7 @@
     _add_opts = ['process']
     _save_opts = ['model', 'processes']
     _tutorial_opts = ['start', 'stop']
-    _check_opts = ['full', 'quick', 'gauge', 'lorentz_invariance']
+    _check_opts = ['full', 'permutation', 'gauge', 'lorentz_invariance']
     _import_formats = ['model_v4', 'model', 'proc_v4', 'command']
     _v4_export_formats = ['madevent', 'standalone','matrix'] 
     _export_formats = _v4_export_formats + ['standalone_cpp',
@@ -1753,7 +1752,7 @@
         lorentz_result =[]
         nb_processes = 0
         
-        if args[0] in  ['quick', 'full']:
+        if args[0] in  ['permutation', 'full']:
             comparisons = process_checks.check_processes(myprocdef,
                                                         param_card = param_card,
                                                         quick = True)
@@ -1775,18 +1774,23 @@
                     % (nb_processes,
                       (cpu_time2 - cpu_time1)))
 
+        text = ""
+
         if gauge_result:
-            logger.info('gauge results:')
-            logger.info(process_checks.output_gauge(gauge_result))
+            text += 'Gauge results:\n'
+            text += process_checks.output_gauge(gauge_result) + '\n'
 
         if lorentz_result:
-            logger.info('lorentz invariance results:')
-            logger.info(process_checks.output_lorentz_inv(lorentz_result))
+            text += 'Lorentz invariance results:\n'
+            text += process_checks.output_lorentz_inv(lorentz_result) + '\n'
 
         if comparisons:
-            logger.info(process_checks.output_comparisons(comparisons[0]))
+            text += 'Process permutation results:\n'
+            text += process_checks.output_comparisons(comparisons[0]) + '\n'
             self._comparisons = comparisons
 
+        logger.info(text)
+        pydoc.pager(text)
         # Restore diagram logger
         diag_logger.setLevel(old_level)
 

=== modified file 'madgraph/iolibs/helas_call_writers.py'
--- madgraph/iolibs/helas_call_writers.py	2010-12-07 22:16:53 +0000
+++ madgraph/iolibs/helas_call_writers.py	2010-12-15 07:31:31 +0000
@@ -254,11 +254,11 @@
 
         # SM gluon 4-vertex components
 
-        key = ((3, 3, 3, 3, 4), 'gggg1')
+        key = ((3, 3, 3, 3, 1), 'gggg3')
         call = lambda wf: \
                "CALL JGGGXX(W(1,%d),W(1,%d),W(1,%d),%s,W(1,%d))" % \
-               (wf.get('mothers')[0].get('number'),
-                wf.get('mothers')[1].get('number'),
+               (wf.get('mothers')[1].get('number'),
+                wf.get('mothers')[0].get('number'),
                 wf.get('mothers')[2].get('number'),
                 wf.get('coupling'),
                 wf.get('number'))
@@ -273,11 +273,11 @@
                 amp.get('coupling'),
                 amp.get('number'))
         self.add_amplitude(key, call)
-        key = ((3, 3, 3, 3, 4), 'gggg2')
+        key = ((3, 3, 3, 3, 1), 'gggg2')
         call = lambda wf: \
                "CALL JGGGXX(W(1,%d),W(1,%d),W(1,%d),%s,W(1,%d))" % \
-               (wf.get('mothers')[2].get('number'),
-                wf.get('mothers')[0].get('number'),
+               (wf.get('mothers')[0].get('number'),
+                wf.get('mothers')[2].get('number'),
                 wf.get('mothers')[1].get('number'),
                 wf.get('coupling'),
                 wf.get('number'))
@@ -292,11 +292,11 @@
                 amp.get('coupling'),
                 amp.get('number'))
         self.add_amplitude(key, call)
-        key = ((3, 3, 3, 3, 4), 'gggg3')
+        key = ((3, 3, 3, 3, 1), 'gggg1')
         call = lambda wf: \
                "CALL JGGGXX(W(1,%d),W(1,%d),W(1,%d),%s,W(1,%d))" % \
-               (wf.get('mothers')[1].get('number'),
-                wf.get('mothers')[2].get('number'),
+               (wf.get('mothers')[2].get('number'),
+                wf.get('mothers')[1].get('number'),
                 wf.get('mothers')[0].get('number'),
                 wf.get('coupling'),
                 wf.get('number'))

=== modified file 'madgraph/iolibs/import_v4.py'
--- madgraph/iolibs/import_v4.py	2010-12-07 22:16:53 +0000
+++ madgraph/iolibs/import_v4.py	2010-12-15 07:31:31 +0000
@@ -107,6 +107,7 @@
 
     color_equiv = {'s': 1,
                    't': 3,
+                   '6': 6,
                    'o': 8}
 
     line_equiv = {'d': 'dashed',
@@ -233,10 +234,12 @@
                 # Give color structure
                 # Order particles according to color
                 # Don't consider singlets
-                color_parts = sorted(part_list, lambda p1, p2:\
-                                            p1.get_color() - p2.get_color())
-                colors = [part.get_color() for part in color_parts \
-                                                        if part.get_color() !=1]
+                color_parts = sorted(enumerate(part_list), lambda p1, p2:\
+                                     p1[1].get_color() - p2[1].get_color())
+                color_ind = [(i, part.get_color()) for i, part in \
+                             color_parts if part.get_color() !=1]
+                colors = [c for i,c in color_ind]
+                ind = [i for i,c in color_ind]
 
                 # Set color empty by default
                 myinter.set('color', [])
@@ -246,32 +249,31 @@
                 elif colors == [-3, 3]:
                     # triplet-triplet-singlet coupling
                     myinter.set('color', [color.ColorString(\
-                        [color.T(1, 0)])])
+                        [color.T(ind[1], ind[0])])])
                 elif colors == [8, 8]:
                     # octet-octet-singlet coupling
                     my_cs = color.ColorString(\
-                        [color.Tr(0, 1)])
+                        [color.Tr(ind[0], ind[1])])
                     my_cs.coeff = fractions.Fraction(2)
                     myinter.set('color', [my_cs])
                 elif colors == [-3, 3, 8]:
                     # triplet-triplet-octet coupling
                     myinter.set('color', [color.ColorString(\
-                        [color.T(2, 1, 0)])])
+                        [color.T(ind[2], ind[1], ind[0])])])
                 elif colors == [8, 8, 8]:
                     # Triple glue coupling
                     my_color_string = color.ColorString(\
-                        [color.f(0, 1, 2)])
+                        [color.f(ind[0], ind[1], ind[2])])
                     my_color_string.is_imaginary = True
                     myinter.set('color', [my_color_string])
                 elif colors == [-3, 3, 8, 8]:
                     my_cs1 = color.ColorString(\
-                        [color.T(2, 3, 1, 0)])
+                        [color.T(ind[2], ind[3], ind[1], ind[0])])
                     my_cs2 = color.ColorString(\
-                        [color.T(3, 2, 1, 0)])
+                        [color.T(ind[3], ind[2], ind[1], ind[0])])
                     myinter.set('color', [my_cs1, my_cs2])
-
                 elif colors == [8, 8, 8, 8]:
-                    # 4-glue / glue-glue-gluino-gluino coupling
+                    # 4-glue coupling
                     cs1 = color.ColorString([color.f(0, 1, -1),
                                                    color.f(2, 3, -1)])
                     #cs1.coeff = fractions.Fraction(-1)

=== modified file 'madgraph/various/process_checks.py'
--- madgraph/various/process_checks.py	2010-12-09 16:34:19 +0000
+++ madgraph/various/process_checks.py	2010-12-15 07:31:31 +0000
@@ -223,18 +223,7 @@
     # Add this process to tested_processes
     sorted_ids.append(ids)
 
-    # Add also antiprocess, since these are identical
-    if id_anti_id_dict:
-        anti_ids = sorted([id_anti_id_dict[id] \
-                           for id in ids[:-1]]) + [process.get('id')]
-    else:
-        anti_ids = sorted([model.get_particle(id).get_anti_pdg_code() \
-                           for id in ids[:-1]]) + [process.get('id')]
-    anti_ids = array.array('i', anti_ids)
-
-    if anti_ids != ids:
-        sorted_ids.append(anti_ids)
-
+    # Skip adding antiprocess below, since might be relevant too
     return False
 
 #===============================================================================
@@ -382,6 +371,8 @@
                                               full_model,
                                               quick)
 
+        if "used_lorentz" not in stored_quantities:
+            stored_quantities["used_lorentz"] = []
         return results, stored_quantities["used_lorentz"]
 
     elif isinstance(processes, base_objects.Process):
@@ -426,12 +417,11 @@
         if res:
             comparison_results.append(res)
 
+    if "used_lorentz" not in stored_quantities:
+        stored_quantities["used_lorentz"] = []
     return comparison_results, stored_quantities["used_lorentz"]
 
 
-
-
-
 def check_process(process, stored_quantities, helas_writer, full_model, quick):
     """Check the helas calls for a process by generating the process
     using all different permutations of the process legs (or, if
@@ -1075,8 +1065,12 @@
         res_str += "\nFailed processes: %s" % ', '.join(failed_proc_list)
     if no_check_proc:
         res_str += "\nNot checked processes: %s" % ', '.join(no_check_proc_list)
+<<<<<<< TREE
     
     if output == 'text':
         return res_str        
     else: 
-        return fail_proc
\ No newline at end of file
+        return fail_proc=======
+    return res_str        
+        
+>>>>>>> MERGE-SOURCE

=== modified file 'models/import_ufo.py'
--- models/import_ufo.py	2010-11-11 00:31:20 +0000
+++ models/import_ufo.py	2010-12-15 07:31:31 +0000
@@ -240,6 +240,10 @@
                     output.append(self._pat_id.sub('color.T(\g<second>,\g<first>)', term))
                 elif particle.color == 3:
                     output.append(self._pat_id.sub('color.T(\g<first>,\g<second>)', term))
+                elif particle.color == -6 :
+                    output.append(self._pat_id.sub('color.T6(\g<second>,\g<first>)', term))
+                elif particle.color == 6:
+                    output.append(self._pat_id.sub('color.T6(\g<first>,\g<second>)', term))
                 elif particle.color == 8:
                     output.append(self._pat_id.sub('color.Tr(\g<first>,\g<second>)', term))
                     factor *= 2
@@ -255,25 +259,20 @@
         p = re.compile(r'''\'\w(?P<number>\d+)\'''')
         data_string = p.sub('-\g<number>', data_string)
          
-        # Compute how change indices to match MG5 convention
-        info = [(i+1,part.color) for i,part in enumerate(interaction_info.particles) 
-                 if part.color!=1]
-        order = sorted(info, lambda p1, p2:p1[1] - p2[1])
-        new_indices={}
-        for i,(j, pcolor) in enumerate(order):
-            new_indices[j]=i
+        # Shift indices by -1
+        new_indices = {}
+        new_indices = dict([(j,i) for (i,j) in \
+                           enumerate(range(1,
+                                    len(interaction_info.particles)+1))])
+
                         
-#            p = re.compile(r'''(?P<prefix>[^-@])(?P<nb>%s)(?P<postfix>\D)''' % j)
-#            data_string = p.sub('\g<prefix>@%s\g<postfix>' % i, data_string)
-#        data_string = data_string.replace('@','')                    
-
         output = data_string.split('*')
         output = color.ColorString([eval(data) \
-                                              for data in output if data !='1'])
+                                    for data in output if data !='1'])
         output.coeff = fractions.Fraction(factor)
         for col_obj in output:
             col_obj.replace_indices(new_indices)
-        
+
         return output
       
 class OrganizeModelExpression:

=== added directory 'models/sextet_diquarks'
=== added file 'models/sextet_diquarks/__init__.py'
--- models/sextet_diquarks/__init__.py	1970-01-01 00:00:00 +0000
+++ models/sextet_diquarks/__init__.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,15 @@
+
+import particles
+import couplings
+import lorentz
+import parameters
+import vertices
+import write_param_card
+
+
+all_particles = particles.all_particles
+all_vertices = vertices.all_vertices
+all_couplings = couplings.all_couplings
+all_lorentz = lorentz.all_lorentz
+all_parameters = parameters.all_parameters
+all_functions = function_library.all_functions

=== added file 'models/sextet_diquarks/couplings.py'
--- models/sextet_diquarks/couplings.py	1970-01-01 00:00:00 +0000
+++ models/sextet_diquarks/couplings.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,131 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:37:56
+
+
+from object_library import all_couplings, Coupling
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+
+
+GC_1 = Coupling(name = 'GC_1',
+                value = '-(ee*complex(0,1))/3.',
+                order = {'QED':1})
+
+GC_2 = Coupling(name = 'GC_2',
+                value = '(2*ee*complex(0,1))/3.',
+                order = {'QED':1})
+
+GC_3 = Coupling(name = 'GC_3',
+                value = '-(ee*complex(0,1))',
+                order = {'QED':1})
+
+GC_4 = Coupling(name = 'GC_4',
+                value = '-G',
+                order = {'QCD':1})
+
+GC_5 = Coupling(name = 'GC_5',
+                value = '-(complex(0,1)*G)',
+                order = {'QCD':1})
+
+GC_6 = Coupling(name = 'GC_6',
+                value = 'complex(0,1)*G',
+                order = {'QCD':1})
+
+GC_7 = Coupling(name = 'GC_7',
+                value = 'complex(0,1)*G**2',
+                order = {'QCD':2})
+
+GC_8 = Coupling(name = 'GC_8',
+                value = 'cw*complex(0,1)*gw',
+                order = {'QED':1})
+
+GC_9 = Coupling(name = 'GC_9',
+                value = '-(complex(0,1)*gw**2)',
+                order = {'QED':2})
+
+GC_10 = Coupling(name = 'GC_10',
+                 value = 'cw**2*complex(0,1)*gw**2',
+                 order = {'QED':2})
+
+GC_11 = Coupling(name = 'GC_11',
+                 value = '-6*complex(0,1)*lam',
+                 order = {'QED':2})
+
+GC_12 = Coupling(name = 'GC_12',
+                 value = '(ee**2*complex(0,1))/(2.*sw**2)',
+                 order = {'QED':2})
+
+GC_13 = Coupling(name = 'GC_13',
+                 value = '(ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_14 = Coupling(name = 'GC_14',
+                 value = '-(cw*ee*complex(0,1))/(2.*sw)',
+                 order = {'QED':1})
+
+GC_15 = Coupling(name = 'GC_15',
+                 value = '(cw*ee*complex(0,1))/(2.*sw)',
+                 order = {'QED':1})
+
+GC_16 = Coupling(name = 'GC_16',
+                 value = '-(ee*complex(0,1)*sw)/(6.*cw)',
+                 order = {'QED':1})
+
+GC_17 = Coupling(name = 'GC_17',
+                 value = '(ee*complex(0,1)*sw)/(2.*cw)',
+                 order = {'QED':1})
+
+GC_18 = Coupling(name = 'GC_18',
+                 value = 'complex(0,1)*gw*sw',
+                 order = {'QED':1})
+
+GC_19 = Coupling(name = 'GC_19',
+                 value = '-2*cw*complex(0,1)*gw**2*sw',
+                 order = {'QED':2})
+
+GC_20 = Coupling(name = 'GC_20',
+                 value = 'complex(0,1)*gw**2*sw**2',
+                 order = {'QED':2})
+
+GC_21 = Coupling(name = 'GC_21',
+                 value = '(cw*ee*complex(0,1))/(2.*sw) + (ee*complex(0,1)*sw)/(2.*cw)',
+                 order = {'QED':1})
+
+GC_22 = Coupling(name = 'GC_22',
+                 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_23 = Coupling(name = 'GC_23',
+                 value = 'complex(0,1)*ttsix',
+                 order = {'QED':1})
+
+GC_24 = Coupling(name = 'GC_24',
+                 value = 'complex(0,1)*uusix',
+                 order = {'QED':1})
+
+GC_25 = Coupling(name = 'GC_25',
+                 value = '-6*complex(0,1)*lam*v',
+                 order = {'QED':1})
+
+GC_26 = Coupling(name = 'GC_26',
+                 value = '(ee**2*complex(0,1)*v)/(2.*sw**2)',
+                 order = {'QED':1})
+
+GC_27 = Coupling(name = 'GC_27',
+                 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_28 = Coupling(name = 'GC_28',
+                 value = '-((complex(0,1)*yb)/cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_29 = Coupling(name = 'GC_29',
+                 value = '-((complex(0,1)*yt)/cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_30 = Coupling(name = 'GC_30',
+                 value = '-((complex(0,1)*ytau)/cmath.sqrt(2))',
+                 order = {'QED':1})
+

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

=== added file 'models/sextet_diquarks/lorentz.py'
--- models/sextet_diquarks/lorentz.py	1970-01-01 00:00:00 +0000
+++ models/sextet_diquarks/lorentz.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,79 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:37:56
+
+
+from object_library import all_lorentz, Lorentz
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+
+
+SSS1 = Lorentz(name = 'SSS1',
+               spins = [ 1, 1, 1 ],
+               structure = '1')
+
+FFS1 = Lorentz(name = 'FFS1',
+               spins = [ 2, 2, 1 ],
+               structure = 'Identity(1,2)')
+
+FFV1 = Lorentz(name = 'FFV1',
+               spins = [ 2, 2, 3 ],
+               structure = 'Gamma(3,2,1)')
+
+FFV2 = Lorentz(name = 'FFV2',
+               spins = [ 2, 2, 3 ],
+               structure = 'Gamma(3,2,-1)*ProjM(-1,1)')
+
+FFV3 = Lorentz(name = 'FFV3',
+               spins = [ 2, 2, 3 ],
+               structure = 'Gamma(3,2,-1)*ProjM(-1,1) - 2*Gamma(3,2,-1)*ProjP(-1,1)')
+
+FFV4 = Lorentz(name = 'FFV4',
+               spins = [ 2, 2, 3 ],
+               structure = 'Gamma(3,2,-1)*ProjM(-1,1) + 2*Gamma(3,2,-1)*ProjP(-1,1)')
+
+FFV5 = Lorentz(name = 'FFV5',
+               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)')
+
+VVV1 = Lorentz(name = 'VVV1',
+               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)')
+
+VVVV1 = Lorentz(name = 'VVVV1',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) - Metric(1,3)*Metric(2,4)')
+
+VVVV2 = Lorentz(name = 'VVVV2',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) + Metric(1,3)*Metric(2,4) - 2*Metric(1,2)*Metric(3,4)')
+
+VVVV3 = Lorentz(name = 'VVVV3',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) - Metric(1,2)*Metric(3,4)')
+
+VVVV4 = Lorentz(name = 'VVVV4',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,3)*Metric(2,4) - Metric(1,2)*Metric(3,4)')
+
+VVVV5 = Lorentz(name = 'VVVV5',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) - (Metric(1,3)*Metric(2,4))/2. - (Metric(1,2)*Metric(3,4))/2.')
+

=== added file 'models/sextet_diquarks/object_library.py'
--- models/sextet_diquarks/object_library.py	1970-01-01 00:00:00 +0000
+++ models/sextet_diquarks/object_library.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,194 @@
+##
+##
+## 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', 'line', 'charge']
+
+    require_args_all = ['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'line', 'charge', 'propagating', 'goldstoneboson']
+
+    def __init__(self, pdg_code, name, antiname, spin, color, mass, width, texname,
+                 antitexname, line, charge , propagating=True, goldstoneboson=False, **options):
+
+        args= (pdg_code, name, antiname, spin, color, mass, width, texname,
+                 antitexname, line, float(charge))
+
+        FRBaseClass.__init__(self, *args,  **options)
+
+        global all_particles
+        all_particles.append(self)
+
+        self.propagating = propagating
+        self.goldstoneboson= goldstoneboson
+
+        self.selfconjugate = (name == antiname)
+
+    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.line, -self.charge, 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)
+
+
+        

=== added file 'models/sextet_diquarks/parameters.py'
--- models/sextet_diquarks/parameters.py	1970-01-01 00:00:00 +0000
+++ models/sextet_diquarks/parameters.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,253 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:37:56
+
+
+
+from object_library import all_parameters, Parameter
+
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+aEWM1 = Parameter(name = 'aEWM1',
+                  nature = 'external',
+                  type = 'real',
+                  value = 132.50698,
+                  texname = '\\text{aEWM1}',
+                  lhablock = 'SMINPUTS',
+                  lhacode = [ 1 ])
+
+Gf = Parameter(name = 'Gf',
+               nature = 'external',
+               type = 'real',
+               value = 0.0000116639,
+               texname = 'G_f',
+               lhablock = 'SMINPUTS',
+               lhacode = [ 2 ])
+
+aS = Parameter(name = 'aS',
+               nature = 'external',
+               type = 'real',
+               value = 0.118,
+               texname = '\\text{aS}',
+               lhablock = 'SMINPUTS',
+               lhacode = [ 3 ])
+
+ymb = Parameter(name = 'ymb',
+                nature = 'external',
+                type = 'real',
+                value = 4.2,
+                texname = '\\text{ymb}',
+                lhablock = 'YUKAWA',
+                lhacode = [ 5 ])
+
+ymt = Parameter(name = 'ymt',
+                nature = 'external',
+                type = 'real',
+                value = 164.5,
+                texname = '\\text{ymt}',
+                lhablock = 'YUKAWA',
+                lhacode = [ 6 ])
+
+ymtau = Parameter(name = 'ymtau',
+                  nature = 'external',
+                  type = 'real',
+                  value = 1.777,
+                  texname = '\\text{ymtau}',
+                  lhablock = 'YUKAWA',
+                  lhacode = [ 15 ])
+
+uusix = Parameter(name = 'uusix',
+                  nature = 'external',
+                  type = 'real',
+                  value = 0.1,
+                  texname = '\\text{uusix}',
+                  lhablock = 'FRBlock',
+                  lhacode = [ 1 ])
+
+ttsix = Parameter(name = 'ttsix',
+                  nature = 'external',
+                  type = 'real',
+                  value = 1,
+                  texname = '\\text{ttsix}',
+                  lhablock = 'FRBlock',
+                  lhacode = [ 2 ])
+
+MTA = Parameter(name = 'MTA',
+                nature = 'external',
+                type = 'real',
+                value = 1.777,
+                texname = '\\text{MTA}',
+                lhablock = 'MASS',
+                lhacode = [ 15 ])
+
+MT = Parameter(name = 'MT',
+               nature = 'external',
+               type = 'real',
+               value = 174.3,
+               texname = '\\text{MT}',
+               lhablock = 'MASS',
+               lhacode = [ 6 ])
+
+MB = Parameter(name = 'MB',
+               nature = 'external',
+               type = 'real',
+               value = 4.7,
+               texname = '\\text{MB}',
+               lhablock = 'MASS',
+               lhacode = [ 5 ])
+
+MZ = Parameter(name = 'MZ',
+               nature = 'external',
+               type = 'real',
+               value = 91.188,
+               texname = '\\text{MZ}',
+               lhablock = 'MASS',
+               lhacode = [ 23 ])
+
+MH = Parameter(name = 'MH',
+               nature = 'external',
+               type = 'real',
+               value = 120.,
+               texname = '\\text{MH}',
+               lhablock = 'MASS',
+               lhacode = [ 25 ])
+
+MSIX = Parameter(name = 'MSIX',
+                 nature = 'external',
+                 type = 'real',
+                 value = 500,
+                 texname = '\\text{MSIX}',
+                 lhablock = 'MASS',
+                 lhacode = [ 9000006 ])
+
+WT = Parameter(name = 'WT',
+               nature = 'external',
+               type = 'real',
+               value = 1.50833649,
+               texname = '\\text{WT}',
+               lhablock = 'DECAY',
+               lhacode = [ 6 ])
+
+WZ = Parameter(name = 'WZ',
+               nature = 'external',
+               type = 'real',
+               value = 2.44140351,
+               texname = '\\text{WZ}',
+               lhablock = 'DECAY',
+               lhacode = [ 23 ])
+
+WW = Parameter(name = 'WW',
+               nature = 'external',
+               type = 'real',
+               value = 2.04759951,
+               texname = '\\text{WW}',
+               lhablock = 'DECAY',
+               lhacode = [ 24 ])
+
+WH = Parameter(name = 'WH',
+               nature = 'external',
+               type = 'real',
+               value = 0.00575308848,
+               texname = '\\text{WH}',
+               lhablock = 'DECAY',
+               lhacode = [ 25 ])
+
+WSIX = Parameter(name = 'WSIX',
+                 nature = 'external',
+                 type = 'real',
+                 value = 3,
+                 texname = '\\text{WSIX}',
+                 lhablock = 'DECAY',
+                 lhacode = [ 9000006 ])
+
+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',
+               value = 'cmath.sqrt(MZ**2/2. + cmath.sqrt(MZ**4/4. - (aEW*cmath.pi*MZ**2)/(Gf*cmath.sqrt(2))))',
+               texname = 'M_W')
+
+ee = Parameter(name = 'ee',
+               nature = 'internal',
+               type = 'real',
+               value = '2*cmath.sqrt(aEW)*cmath.sqrt(cmath.pi)',
+               texname = 'e')
+
+sw2 = Parameter(name = 'sw2',
+                nature = 'internal',
+                type = 'real',
+                value = '1 - MW**2/MZ**2',
+                texname = '\\text{sw2}')
+
+cw = Parameter(name = 'cw',
+               nature = 'internal',
+               type = 'real',
+               value = 'cmath.sqrt(1 - sw2)',
+               texname = 'c_w')
+
+sw = Parameter(name = 'sw',
+               nature = 'internal',
+               type = 'real',
+               value = 'cmath.sqrt(sw2)',
+               texname = 's_w')
+
+g1 = Parameter(name = 'g1',
+               nature = 'internal',
+               type = 'real',
+               value = 'ee/cw',
+               texname = 'g_1')
+
+gw = Parameter(name = 'gw',
+               nature = 'internal',
+               type = 'real',
+               value = 'ee/sw',
+               texname = 'g_w')
+
+v = Parameter(name = 'v',
+              nature = 'internal',
+              type = 'real',
+              value = '(2*MW*sw)/ee',
+              texname = 'v')
+
+lam = Parameter(name = 'lam',
+                nature = 'internal',
+                type = 'real',
+                value = 'MH**2/(2.*v**2)',
+                texname = '\\text{lam}')
+
+yb = Parameter(name = 'yb',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymb*cmath.sqrt(2))/v',
+               texname = '\\text{yb}')
+
+yt = Parameter(name = 'yt',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymt*cmath.sqrt(2))/v',
+               texname = '\\text{yt}')
+
+ytau = Parameter(name = 'ytau',
+                 nature = 'internal',
+                 type = 'real',
+                 value = '(ymtau*cmath.sqrt(2))/v',
+                 texname = '\\text{ytau}')
+
+muH = Parameter(name = 'muH',
+                nature = 'internal',
+                type = 'real',
+                value = 'cmath.sqrt(lam*v**2)',
+                texname = '\\mu ')
+

=== added file 'models/sextet_diquarks/particles.py'
--- models/sextet_diquarks/particles.py	1970-01-01 00:00:00 +0000
+++ models/sextet_diquarks/particles.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,400 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:37:56
+
+
+from __future__ import division
+from object_library import all_particles, Particle
+
+ve = Particle(pdg_code = 12,
+              name = 've',
+              antiname = 've~',
+              spin = 2,
+              color = 1,
+              mass = 'ZERO',
+              width = 'ZERO',
+              texname = 've',
+              antitexname = 've',
+              line = 'straight',
+              charge = 0,
+              LeptonNumber = 1,
+              GhostNumber = 0)
+
+ve__tilde__ = ve.anti()
+
+vm = Particle(pdg_code = 14,
+              name = 'vm',
+              antiname = 'vm~',
+              spin = 2,
+              color = 1,
+              mass = 'ZERO',
+              width = 'ZERO',
+              texname = 'vm',
+              antitexname = 'vm',
+              line = 'straight',
+              charge = 0,
+              LeptonNumber = 1,
+              GhostNumber = 0)
+
+vm__tilde__ = vm.anti()
+
+vt = Particle(pdg_code = 16,
+              name = 'vt',
+              antiname = 'vt~',
+              spin = 2,
+              color = 1,
+              mass = 'ZERO',
+              width = 'ZERO',
+              texname = 'vt',
+              antitexname = 'vt',
+              line = 'straight',
+              charge = 0,
+              LeptonNumber = 1,
+              GhostNumber = 0)
+
+vt__tilde__ = vt.anti()
+
+e__minus__ = Particle(pdg_code = 11,
+                      name = 'e-',
+                      antiname = 'e+',
+                      spin = 2,
+                      color = 1,
+                      mass = 'ZERO',
+                      width = 'ZERO',
+                      texname = 'e-',
+                      antitexname = 'e-',
+                      line = 'straight',
+                      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 = 'ZERO',
+                      width = 'ZERO',
+                      texname = 'm-',
+                      antitexname = 'm-',
+                      line = 'straight',
+                      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 = 'MTA',
+                       width = 'ZERO',
+                       texname = 'tt-',
+                       antitexname = 'tt-',
+                       line = 'straight',
+                       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 = 'ZERO',
+             width = 'ZERO',
+             texname = 'u',
+             antitexname = 'u',
+             line = 'straight',
+             charge = 2/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+u__tilde__ = u.anti()
+
+c = Particle(pdg_code = 4,
+             name = 'c',
+             antiname = 'c~',
+             spin = 2,
+             color = 3,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 'c',
+             antitexname = 'c',
+             line = 'straight',
+             charge = 2/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+c__tilde__ = c.anti()
+
+t = Particle(pdg_code = 6,
+             name = 't',
+             antiname = 't~',
+             spin = 2,
+             color = 3,
+             mass = 'MT',
+             width = 'WT',
+             texname = 't',
+             antitexname = 't',
+             line = 'straight',
+             charge = 2/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+t__tilde__ = t.anti()
+
+d = Particle(pdg_code = 1,
+             name = 'd',
+             antiname = 'd~',
+             spin = 2,
+             color = 3,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 'd',
+             antitexname = 'd',
+             line = 'straight',
+             charge = -1/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+d__tilde__ = d.anti()
+
+s = Particle(pdg_code = 3,
+             name = 's',
+             antiname = 's~',
+             spin = 2,
+             color = 3,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 's',
+             antitexname = 's',
+             line = 'straight',
+             charge = -1/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+s__tilde__ = s.anti()
+
+b = Particle(pdg_code = 5,
+             name = 'b',
+             antiname = 'b~',
+             spin = 2,
+             color = 3,
+             mass = 'MB',
+             width = 'ZERO',
+             texname = 'b',
+             antitexname = 'b',
+             line = 'straight',
+             charge = -1/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+b__tilde__ = b.anti()
+
+ghA = Particle(pdg_code = 9000001,
+               name = 'ghA',
+               antiname = 'ghA~',
+               spin = -1,
+               color = 1,
+               mass = 'ZERO',
+               width = 'WghA',
+               texname = 'ghA',
+               antitexname = 'ghA',
+               line = 'dotted',
+               charge = 0,
+               LeptonNumber = 0,
+               GhostNumber = 1)
+
+ghA__tilde__ = ghA.anti()
+
+ghZ = Particle(pdg_code = 9000002,
+               name = 'ghZ',
+               antiname = 'ghZ~',
+               spin = -1,
+               color = 1,
+               mass = 'MZ',
+               width = 'WghZ',
+               texname = 'ghZ',
+               antitexname = 'ghZ',
+               line = 'dotted',
+               charge = 0,
+               LeptonNumber = 0,
+               GhostNumber = 1)
+
+ghZ__tilde__ = ghZ.anti()
+
+ghWp = Particle(pdg_code = 9000003,
+                name = 'ghWp',
+                antiname = 'ghWp~',
+                spin = -1,
+                color = 1,
+                mass = 'MW',
+                width = 'WghWp',
+                texname = 'ghWp',
+                antitexname = 'ghWp',
+                line = 'dotted',
+                charge = 1,
+                LeptonNumber = 0,
+                GhostNumber = 1)
+
+ghWp__tilde__ = ghWp.anti()
+
+ghWm = Particle(pdg_code = 9000004,
+                name = 'ghWm',
+                antiname = 'ghWm~',
+                spin = -1,
+                color = 1,
+                mass = 'MW',
+                width = 'WghWm',
+                texname = 'ghWm',
+                antitexname = 'ghWm',
+                line = 'dotted',
+                charge = -1,
+                LeptonNumber = 0,
+                GhostNumber = 1)
+
+ghWm__tilde__ = ghWm.anti()
+
+ghG = Particle(pdg_code = 9000005,
+               name = 'ghG',
+               antiname = 'ghG~',
+               spin = -1,
+               color = 8,
+               mass = 'ZERO',
+               width = 'WghG',
+               texname = 'ghG',
+               antitexname = 'ghG',
+               line = 'dotted',
+               charge = 0,
+               LeptonNumber = 0,
+               GhostNumber = 1)
+
+ghG__tilde__ = ghG.anti()
+
+A = Particle(pdg_code = 22,
+             name = 'A',
+             antiname = 'A',
+             spin = 3,
+             color = 1,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 'A',
+             antitexname = 'A',
+             line = 'wavy',
+             charge = 0,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+Z = Particle(pdg_code = 23,
+             name = 'Z',
+             antiname = 'Z',
+             spin = 3,
+             color = 1,
+             mass = 'MZ',
+             width = 'WZ',
+             texname = 'Z',
+             antitexname = 'Z',
+             line = 'wavy',
+             charge = 0,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+W__plus__ = Particle(pdg_code = 24,
+                     name = 'W+',
+                     antiname = 'W-',
+                     spin = 3,
+                     color = 1,
+                     mass = 'MW',
+                     width = 'WW',
+                     texname = 'W+',
+                     antitexname = 'W+',
+                     line = 'wavy',
+                     charge = 1,
+                     LeptonNumber = 0,
+                     GhostNumber = 0)
+
+W__minus__ = W__plus__.anti()
+
+G = Particle(pdg_code = 21,
+             name = 'G',
+             antiname = 'G',
+             spin = 3,
+             color = 8,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 'G',
+             antitexname = 'G',
+             line = 'curly',
+             charge = 0,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+H = Particle(pdg_code = 25,
+             name = 'H',
+             antiname = 'H',
+             spin = 1,
+             color = 1,
+             mass = 'MH',
+             width = 'WH',
+             texname = '\\phi',
+             antitexname = '\\phi',
+             line = 'dashed',
+             charge = 0,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+phi0 = Particle(pdg_code = 250,
+                name = 'phi0',
+                antiname = 'phi0',
+                spin = 1,
+                color = 1,
+                mass = 'MZ',
+                width = 'Wphi',
+                texname = 'phi0',
+                antitexname = 'phi0',
+                line = 'dashed',
+                GoldstoneBoson = True,
+                charge = 0,
+                LeptonNumber = 0,
+                GhostNumber = 0)
+
+phi__plus__ = Particle(pdg_code = 251,
+                       name = 'phi+',
+                       antiname = 'phi-',
+                       spin = 1,
+                       color = 1,
+                       mass = 'MW',
+                       width = 'Wphi2',
+                       texname = '\\phi^+',
+                       antitexname = '\\phi^+',
+                       line = 'dashed',
+                       GoldstoneBoson = True,
+                       charge = 1,
+                       LeptonNumber = 0,
+                       GhostNumber = 0)
+
+phi__minus__ = phi__plus__.anti()
+
+six = Particle(pdg_code = 9000006,
+               name = 'six',
+               antiname = 'six~',
+               spin = 1,
+               color = 6,
+               mass = 'MSIX',
+               width = 'WSIX',
+               texname = 'six',
+               antitexname = 'six',
+               line = 'dashed',
+               charge = 4/3,
+               LeptonNumber = 0,
+               GhostNumber = 0)
+
+six__tilde__ = six.anti()
+

=== added file 'models/sextet_diquarks/vertices.py'
--- models/sextet_diquarks/vertices.py	1970-01-01 00:00:00 +0000
+++ models/sextet_diquarks/vertices.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,383 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:37:56
+
+
+from object_library import all_vertices, Vertex
+import particles as P
+import couplings as C
+import lorentz as L
+
+
+V_1 = Vertex(name = 'V_1',
+             particles = [ P.H, P.H, P.H, P.H ],
+             color = [ '1' ],
+             lorentz = [ L.SSSS1 ],
+             couplings = {(0,0):C.GC_11})
+
+V_2 = Vertex(name = 'V_2',
+             particles = [ P.H, P.H, P.H ],
+             color = [ '1' ],
+             lorentz = [ L.SSS1 ],
+             couplings = {(0,0):C.GC_25})
+
+V_3 = Vertex(name = 'V_3',
+             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.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_7,(0,0):C.GC_7,(2,2):C.GC_7})
+
+V_5 = Vertex(name = 'V_5',
+             particles = [ P.t, P.t, P.six__tilde__ ],
+             color = [ 'K6Bar(3,1,2)' ],
+             lorentz = [ L.FFS1 ],
+             couplings = {(0,0):C.GC_23})
+
+V_6 = Vertex(name = 'V_6',
+             particles = [ P.u, P.u, P.six__tilde__ ],
+             color = [ 'K6Bar(3,1,2)' ],
+             lorentz = [ L.FFS1 ],
+             couplings = {(0,0):C.GC_24})
+
+V_7 = Vertex(name = 'V_7',
+             particles = [ P.t__tilde__, P.t__tilde__, P.six ],
+             color = [ 'K6(3,1,2)' ],
+             lorentz = [ L.FFS1 ],
+             couplings = {(0,0):C.GC_23})
+
+V_8 = Vertex(name = 'V_8',
+             particles = [ P.u__tilde__, P.u__tilde__, P.six ],
+             color = [ 'K6(3,1,2)' ],
+             lorentz = [ L.FFS1 ],
+             couplings = {(0,0):C.GC_24})
+
+V_9 = Vertex(name = 'V_9',
+             particles = [ P.G, P.six__tilde__, P.six ],
+             color = [ 'T6(1,3,2)' ],
+             lorentz = [ L.VSS1 ],
+             couplings = {(0,0):C.GC_5})
+
+V_10 = Vertex(name = 'V_10',
+              particles = [ P.G, P.G, P.six__tilde__, P.six ],
+              color = [ 'T6(1,-1,3)*T6(2,4,-1)', 'T6(1,4,-1)*T6(2,-1,3)' ],
+              lorentz = [ L.VVSS1 ],
+              couplings = {(0,0):C.GC_7,(1,0):C.GC_7})
+
+V_11 = Vertex(name = 'V_11',
+              particles = [ P.A, P.W__minus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.VVV1 ],
+              couplings = {(0,0):C.GC_18})
+
+V_12 = Vertex(name = 'V_12',
+              particles = [ P.W__minus__, P.W__plus__, P.H, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVSS1 ],
+              couplings = {(0,0):C.GC_12})
+
+V_13 = Vertex(name = 'V_13',
+              particles = [ P.W__minus__, P.W__plus__, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVS1 ],
+              couplings = {(0,0):C.GC_26})
+
+V_14 = Vertex(name = 'V_14',
+              particles = [ P.A, P.A, P.W__minus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.VVVV2 ],
+              couplings = {(0,0):C.GC_20})
+
+V_15 = Vertex(name = 'V_15',
+              particles = [ P.W__minus__, P.W__plus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVV1 ],
+              couplings = {(0,0):C.GC_8})
+
+V_16 = Vertex(name = 'V_16',
+              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.VVVV2 ],
+              couplings = {(0,0):C.GC_9})
+
+V_17 = Vertex(name = 'V_17',
+              particles = [ P.A, P.W__minus__, P.W__plus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVVV5 ],
+              couplings = {(0,0):C.GC_19})
+
+V_18 = Vertex(name = 'V_18',
+              particles = [ P.Z, P.Z, P.H, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVSS1 ],
+              couplings = {(0,0):C.GC_22})
+
+V_19 = Vertex(name = 'V_19',
+              particles = [ P.Z, P.Z, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVS1 ],
+              couplings = {(0,0):C.GC_27})
+
+V_20 = Vertex(name = 'V_20',
+              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVVV2 ],
+              couplings = {(0,0):C.GC_10})
+
+V_21 = Vertex(name = 'V_21',
+              particles = [ P.d__tilde__, P.d, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_1})
+
+V_22 = Vertex(name = 'V_22',
+              particles = [ P.s__tilde__, P.s, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_1})
+
+V_23 = Vertex(name = 'V_23',
+              particles = [ P.b__tilde__, P.b, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_1})
+
+V_24 = Vertex(name = 'V_24',
+              particles = [ P.e__plus__, P.e__minus__, P.A ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
+
+V_25 = Vertex(name = 'V_25',
+              particles = [ P.m__plus__, P.m__minus__, P.A ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
+
+V_26 = Vertex(name = 'V_26',
+              particles = [ P.tt__plus__, P.tt__minus__, P.A ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
+
+V_27 = Vertex(name = 'V_27',
+              particles = [ P.u__tilde__, P.u, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
+
+V_28 = Vertex(name = 'V_28',
+              particles = [ P.c__tilde__, P.c, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
+
+V_29 = Vertex(name = 'V_29',
+              particles = [ P.t__tilde__, P.t, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
+
+V_30 = Vertex(name = 'V_30',
+              particles = [ P.d__tilde__, P.d, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_31 = Vertex(name = 'V_31',
+              particles = [ P.s__tilde__, P.s, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_32 = Vertex(name = 'V_32',
+              particles = [ P.b__tilde__, P.b, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_33 = Vertex(name = 'V_33',
+              particles = [ P.b__tilde__, P.b, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_28})
+
+V_34 = Vertex(name = 'V_34',
+              particles = [ P.d__tilde__, P.d, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,0):C.GC_14,(0,1):C.GC_16})
+
+V_35 = Vertex(name = 'V_35',
+              particles = [ P.s__tilde__, P.s, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,0):C.GC_14,(0,1):C.GC_16})
+
+V_36 = Vertex(name = 'V_36',
+              particles = [ P.b__tilde__, P.b, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,0):C.GC_14,(0,1):C.GC_16})
+
+V_37 = Vertex(name = 'V_37',
+              particles = [ P.d__tilde__, P.u, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_38 = Vertex(name = 'V_38',
+              particles = [ P.s__tilde__, P.c, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_39 = Vertex(name = 'V_39',
+              particles = [ P.b__tilde__, P.t, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_40 = Vertex(name = 'V_40',
+              particles = [ P.u__tilde__, P.d, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_41 = Vertex(name = 'V_41',
+              particles = [ P.c__tilde__, P.s, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_42 = Vertex(name = 'V_42',
+              particles = [ P.t__tilde__, P.b, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_43 = Vertex(name = 'V_43',
+              particles = [ P.u__tilde__, P.u, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_44 = Vertex(name = 'V_44',
+              particles = [ P.c__tilde__, P.c, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_45 = Vertex(name = 'V_45',
+              particles = [ P.t__tilde__, P.t, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_46 = Vertex(name = 'V_46',
+              particles = [ P.tt__plus__, P.tt__minus__, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_30})
+
+V_47 = Vertex(name = 'V_47',
+              particles = [ P.t__tilde__, P.t, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_29})
+
+V_48 = Vertex(name = 'V_48',
+              particles = [ P.e__plus__, P.e__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_14,(0,1):C.GC_17})
+
+V_49 = Vertex(name = 'V_49',
+              particles = [ P.m__plus__, P.m__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_14,(0,1):C.GC_17})
+
+V_50 = Vertex(name = 'V_50',
+              particles = [ P.tt__plus__, P.tt__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_14,(0,1):C.GC_17})
+
+V_51 = Vertex(name = 'V_51',
+              particles = [ P.e__plus__, P.ve, P.W__minus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_52 = Vertex(name = 'V_52',
+              particles = [ P.m__plus__, P.vm, P.W__minus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_53 = Vertex(name = 'V_53',
+              particles = [ P.tt__plus__, P.vt, P.W__minus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_54 = Vertex(name = 'V_54',
+              particles = [ P.ve__tilde__, P.e__minus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_55 = Vertex(name = 'V_55',
+              particles = [ P.vm__tilde__, P.m__minus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_56 = Vertex(name = 'V_56',
+              particles = [ P.vt__tilde__, P.tt__minus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_13})
+
+V_57 = Vertex(name = 'V_57',
+              particles = [ P.u__tilde__, P.u, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_15,(0,1):C.GC_16})
+
+V_58 = Vertex(name = 'V_58',
+              particles = [ P.c__tilde__, P.c, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_15,(0,1):C.GC_16})
+
+V_59 = Vertex(name = 'V_59',
+              particles = [ P.t__tilde__, P.t, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_15,(0,1):C.GC_16})
+
+V_60 = Vertex(name = 'V_60',
+              particles = [ P.ve__tilde__, P.ve, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_21})
+
+V_61 = Vertex(name = 'V_61',
+              particles = [ P.vm__tilde__, P.vm, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_21})
+
+V_62 = Vertex(name = 'V_62',
+              particles = [ P.vt__tilde__, P.vt, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_21})
+

=== added file 'models/sextet_diquarks/write_param_card.py'
--- models/sextet_diquarks/write_param_card.py	1970-01-01 00:00:00 +0000
+++ models/sextet_diquarks/write_param_card.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,65 @@
+
+__date__ = "3 june 2010"
+__author__ = '[e-mail]'
+
+class ParamCardWriter(object):
+    
+    header = \
+    """######################################################################\n""" + \
+    """## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################\n""" + \
+    """######################################################################\n"""   
+    
+    def __init__(self, filename, list_of_parameters=None):
+        """write a valid param_card.dat"""
+        
+        if not list_of_parameters:
+            from parameters import all_parameters
+            list_of_parameters = [param for param in all_parameters if \
+                                                       param.nature=='external']
+        
+        self.fsock = open(filename, 'w')
+        self.fsock.write(self.header)
+        
+        self.write_card(list_of_parameters)
+    
+    
+    def write_card(self, all_ext_param):
+        """ """
+        
+      
+        
+        # list all lhablock
+        all_lhablock = set([param.lhablock for param in all_ext_param])
+        
+        # ordonate lhablock alphabeticaly
+        list(all_lhablock).sort()
+        
+        for lhablock in all_lhablock:
+            self.write_block(lhablock)
+            [self.write_param(param, lhablock) for param in all_ext_param if \
+                                                     param.lhablock == lhablock]
+    def write_block(self, name):
+        """ write a comment for a block"""
+        
+        self.fsock.writelines(
+        """\n###################################""" + \
+        """\n## INFORMATION FOR %s""" % name.upper() +\
+        """\n###################################\n"""
+         )
+        if name!='DECAY':
+            self.fsock.write("""Block %s \n""" % name)
+
+    def write_param(self, param, lhablock):
+        
+        lhacode=' '.join(['%3s' % key for key in param.lhacode])
+        if lhablock != 'DECAY':
+            text = """  %s %e # %s \n""" % (lhacode, param.value, param.name ) 
+        else:
+            text = '''DECAY %s %e \n''' % (lhacode, param.value)
+        self.fsock.write(text) 
+            
+            
+if '__main__' == __name__:
+    ParamCardWriter('./param_card.dat')
+    print 'done'
+    

=== added directory 'models/triplet_diquarks'
=== added file 'models/triplet_diquarks/Epsijk_SM_UFO.log'
--- models/triplet_diquarks/Epsijk_SM_UFO.log	1970-01-01 00:00:00 +0000
+++ models/triplet_diquarks/Epsijk_SM_UFO.log	2010-12-15 07:31:31 +0000
@@ -0,0 +1,65 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:36:28
+
+
+# 
+# This is the logfile for the model Epsijk_SM
+
+# Authors: N. Christensen, C. Duhr
+# Model version: 1.1
+# 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 trip
+
+
+# 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: 34
+   * Number of flavored vertices: 60
+   * Saved vertices in InterfaceRun[ 1 ].
+   * Checked QNumber conservation.
+   * particles.py written.
+   * parameters.py written.
+#
+# Vertex definitions
+#
+
+   * 60 vertices written.
+   * vertices.py written.
+#
+# Lorentz structure definitions
+#
+
+   * 17 lorentz structures written.
+   * lorentz.py written.
+#
+# Coupling definitions
+#
+
+   * 29 couplings written.
+   * couplings.py written.

=== added file 'models/triplet_diquarks/__init__.py'
--- models/triplet_diquarks/__init__.py	1970-01-01 00:00:00 +0000
+++ models/triplet_diquarks/__init__.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,15 @@
+
+import particles
+import couplings
+import lorentz
+import parameters
+import vertices
+import write_param_card
+
+
+all_particles = particles.all_particles
+all_vertices = vertices.all_vertices
+all_couplings = couplings.all_couplings
+all_lorentz = lorentz.all_lorentz
+all_parameters = parameters.all_parameters
+all_functions = function_library.all_functions

=== added file 'models/triplet_diquarks/couplings.py'
--- models/triplet_diquarks/couplings.py	1970-01-01 00:00:00 +0000
+++ models/triplet_diquarks/couplings.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,127 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:36:34
+
+
+from object_library import all_couplings, Coupling
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+
+
+GC_1 = Coupling(name = 'GC_1',
+                value = '-(ee*complex(0,1))/3.',
+                order = {'QED':1})
+
+GC_2 = Coupling(name = 'GC_2',
+                value = '(2*ee*complex(0,1))/3.',
+                order = {'QED':1})
+
+GC_3 = Coupling(name = 'GC_3',
+                value = '-(ee*complex(0,1))',
+                order = {'QED':1})
+
+GC_4 = Coupling(name = 'GC_4',
+                value = '-G',
+                order = {'QCD':1})
+
+GC_5 = Coupling(name = 'GC_5',
+                value = '-(complex(0,1)*G)',
+                order = {'QCD':1})
+
+GC_6 = Coupling(name = 'GC_6',
+                value = 'complex(0,1)*G',
+                order = {'QCD':1})
+
+GC_7 = Coupling(name = 'GC_7',
+                value = 'complex(0,1)*G**2',
+                order = {'QCD':2})
+
+GC_8 = Coupling(name = 'GC_8',
+                value = 'cw*complex(0,1)*gw',
+                order = {'QED':1})
+
+GC_9 = Coupling(name = 'GC_9',
+                value = '-(complex(0,1)*gw**2)',
+                order = {'QED':2})
+
+GC_10 = Coupling(name = 'GC_10',
+                 value = 'cw**2*complex(0,1)*gw**2',
+                 order = {'QED':2})
+
+GC_11 = Coupling(name = 'GC_11',
+                 value = '-6*complex(0,1)*lam',
+                 order = {'QED':2})
+
+GC_12 = Coupling(name = 'GC_12',
+                 value = 'complex(0,1)*1/cmath.sqrt(2)*qqtrip',
+                 order = {'QED':1})
+
+GC_13 = Coupling(name = 'GC_13',
+                 value = '(ee**2*complex(0,1))/(2.*sw**2)',
+                 order = {'QED':2})
+
+GC_14 = Coupling(name = 'GC_14',
+                 value = '(ee*complex(0,1))/(sw*cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_15 = Coupling(name = 'GC_15',
+                 value = '-(cw*ee*complex(0,1))/(2.*sw)',
+                 order = {'QED':1})
+
+GC_16 = Coupling(name = 'GC_16',
+                 value = '(cw*ee*complex(0,1))/(2.*sw)',
+                 order = {'QED':1})
+
+GC_17 = Coupling(name = 'GC_17',
+                 value = '-(ee*complex(0,1)*sw)/(6.*cw)',
+                 order = {'QED':1})
+
+GC_18 = Coupling(name = 'GC_18',
+                 value = '(ee*complex(0,1)*sw)/(2.*cw)',
+                 order = {'QED':1})
+
+GC_19 = Coupling(name = 'GC_19',
+                 value = 'complex(0,1)*gw*sw',
+                 order = {'QED':1})
+
+GC_20 = Coupling(name = 'GC_20',
+                 value = '-2*cw*complex(0,1)*gw**2*sw',
+                 order = {'QED':2})
+
+GC_21 = Coupling(name = 'GC_21',
+                 value = 'complex(0,1)*gw**2*sw**2',
+                 order = {'QED':2})
+
+GC_22 = Coupling(name = 'GC_22',
+                 value = '(cw*ee*complex(0,1))/(2.*sw) + (ee*complex(0,1)*sw)/(2.*cw)',
+                 order = {'QED':1})
+
+GC_23 = Coupling(name = 'GC_23',
+                 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_24 = Coupling(name = 'GC_24',
+                 value = '-6*complex(0,1)*lam*v',
+                 order = {'QED':1})
+
+GC_25 = Coupling(name = 'GC_25',
+                 value = '(ee**2*complex(0,1)*v)/(2.*sw**2)',
+                 order = {'QED':1})
+
+GC_26 = Coupling(name = 'GC_26',
+                 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_27 = Coupling(name = 'GC_27',
+                 value = '-((complex(0,1)*yb)/cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_28 = Coupling(name = 'GC_28',
+                 value = '-((complex(0,1)*yt)/cmath.sqrt(2))',
+                 order = {'QED':1})
+
+GC_29 = Coupling(name = 'GC_29',
+                 value = '-((complex(0,1)*ytau)/cmath.sqrt(2))',
+                 order = {'QED':1})
+

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

=== added file 'models/triplet_diquarks/lorentz.py'
--- models/triplet_diquarks/lorentz.py	1970-01-01 00:00:00 +0000
+++ models/triplet_diquarks/lorentz.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,79 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:36:34
+
+
+from object_library import all_lorentz, Lorentz
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+
+
+SSS1 = Lorentz(name = 'SSS1',
+               spins = [ 1, 1, 1 ],
+               structure = '1')
+
+FFS1 = Lorentz(name = 'FFS1',
+               spins = [ 2, 2, 1 ],
+               structure = 'Identity(1,2)')
+
+FFV1 = Lorentz(name = 'FFV1',
+               spins = [ 2, 2, 3 ],
+               structure = 'Gamma(3,2,1)')
+
+FFV2 = Lorentz(name = 'FFV2',
+               spins = [ 2, 2, 3 ],
+               structure = 'Gamma(3,2,-1)*ProjM(-1,1)')
+
+FFV3 = Lorentz(name = 'FFV3',
+               spins = [ 2, 2, 3 ],
+               structure = 'Gamma(3,2,-1)*ProjM(-1,1) - 2*Gamma(3,2,-1)*ProjP(-1,1)')
+
+FFV4 = Lorentz(name = 'FFV4',
+               spins = [ 2, 2, 3 ],
+               structure = 'Gamma(3,2,-1)*ProjM(-1,1) + 2*Gamma(3,2,-1)*ProjP(-1,1)')
+
+FFV5 = Lorentz(name = 'FFV5',
+               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)')
+
+VVV1 = Lorentz(name = 'VVV1',
+               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)')
+
+VVVV1 = Lorentz(name = 'VVVV1',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) - Metric(1,3)*Metric(2,4)')
+
+VVVV2 = Lorentz(name = 'VVVV2',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) + Metric(1,3)*Metric(2,4) - 2*Metric(1,2)*Metric(3,4)')
+
+VVVV3 = Lorentz(name = 'VVVV3',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) - Metric(1,2)*Metric(3,4)')
+
+VVVV4 = Lorentz(name = 'VVVV4',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,3)*Metric(2,4) - Metric(1,2)*Metric(3,4)')
+
+VVVV5 = Lorentz(name = 'VVVV5',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) - (Metric(1,3)*Metric(2,4))/2. - (Metric(1,2)*Metric(3,4))/2.')
+

=== added file 'models/triplet_diquarks/object_library.py'
--- models/triplet_diquarks/object_library.py	1970-01-01 00:00:00 +0000
+++ models/triplet_diquarks/object_library.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,194 @@
+##
+##
+## 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', 'line', 'charge']
+
+    require_args_all = ['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'line', 'charge', 'propagating', 'goldstoneboson']
+
+    def __init__(self, pdg_code, name, antiname, spin, color, mass, width, texname,
+                 antitexname, line, charge , propagating=True, goldstoneboson=False, **options):
+
+        args= (pdg_code, name, antiname, spin, color, mass, width, texname,
+                 antitexname, line, float(charge))
+
+        FRBaseClass.__init__(self, *args,  **options)
+
+        global all_particles
+        all_particles.append(self)
+
+        self.propagating = propagating
+        self.goldstoneboson= goldstoneboson
+
+        self.selfconjugate = (name == antiname)
+
+    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.line, -self.charge, 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)
+
+
+        

=== added file 'models/triplet_diquarks/parameters.py'
--- models/triplet_diquarks/parameters.py	1970-01-01 00:00:00 +0000
+++ models/triplet_diquarks/parameters.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,245 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:36:34
+
+
+
+from object_library import all_parameters, Parameter
+
+
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+
+aEWM1 = Parameter(name = 'aEWM1',
+                  nature = 'external',
+                  type = 'real',
+                  value = 132.50698,
+                  texname = '\\text{aEWM1}',
+                  lhablock = 'SMINPUTS',
+                  lhacode = [ 1 ])
+
+Gf = Parameter(name = 'Gf',
+               nature = 'external',
+               type = 'real',
+               value = 0.0000116639,
+               texname = 'G_f',
+               lhablock = 'SMINPUTS',
+               lhacode = [ 2 ])
+
+aS = Parameter(name = 'aS',
+               nature = 'external',
+               type = 'real',
+               value = 0.118,
+               texname = '\\text{aS}',
+               lhablock = 'SMINPUTS',
+               lhacode = [ 3 ])
+
+ymb = Parameter(name = 'ymb',
+                nature = 'external',
+                type = 'real',
+                value = 4.2,
+                texname = '\\text{ymb}',
+                lhablock = 'YUKAWA',
+                lhacode = [ 5 ])
+
+ymt = Parameter(name = 'ymt',
+                nature = 'external',
+                type = 'real',
+                value = 164.5,
+                texname = '\\text{ymt}',
+                lhablock = 'YUKAWA',
+                lhacode = [ 6 ])
+
+ymtau = Parameter(name = 'ymtau',
+                  nature = 'external',
+                  type = 'real',
+                  value = 1.777,
+                  texname = '\\text{ymtau}',
+                  lhablock = 'YUKAWA',
+                  lhacode = [ 15 ])
+
+qqtrip = Parameter(name = 'qqtrip',
+                   nature = 'external',
+                   type = 'real',
+                   value = 0.1,
+                   texname = '\\text{qqtrip}',
+                   lhablock = 'FRBlock',
+                   lhacode = [ 1 ])
+
+MTA = Parameter(name = 'MTA',
+                nature = 'external',
+                type = 'real',
+                value = 1.777,
+                texname = '\\text{MTA}',
+                lhablock = 'MASS',
+                lhacode = [ 15 ])
+
+MT = Parameter(name = 'MT',
+               nature = 'external',
+               type = 'real',
+               value = 174.3,
+               texname = '\\text{MT}',
+               lhablock = 'MASS',
+               lhacode = [ 6 ])
+
+MB = Parameter(name = 'MB',
+               nature = 'external',
+               type = 'real',
+               value = 4.7,
+               texname = '\\text{MB}',
+               lhablock = 'MASS',
+               lhacode = [ 5 ])
+
+MZ = Parameter(name = 'MZ',
+               nature = 'external',
+               type = 'real',
+               value = 91.188,
+               texname = '\\text{MZ}',
+               lhablock = 'MASS',
+               lhacode = [ 23 ])
+
+MH = Parameter(name = 'MH',
+               nature = 'external',
+               type = 'real',
+               value = 120.,
+               texname = '\\text{MH}',
+               lhablock = 'MASS',
+               lhacode = [ 25 ])
+
+MSIX = Parameter(name = 'MSIX',
+                 nature = 'external',
+                 type = 'real',
+                 value = 500,
+                 texname = '\\text{MSIX}',
+                 lhablock = 'MASS',
+                 lhacode = [ 9000006 ])
+
+WT = Parameter(name = 'WT',
+               nature = 'external',
+               type = 'real',
+               value = 1.50833649,
+               texname = '\\text{WT}',
+               lhablock = 'DECAY',
+               lhacode = [ 6 ])
+
+WZ = Parameter(name = 'WZ',
+               nature = 'external',
+               type = 'real',
+               value = 2.44140351,
+               texname = '\\text{WZ}',
+               lhablock = 'DECAY',
+               lhacode = [ 23 ])
+
+WW = Parameter(name = 'WW',
+               nature = 'external',
+               type = 'real',
+               value = 2.04759951,
+               texname = '\\text{WW}',
+               lhablock = 'DECAY',
+               lhacode = [ 24 ])
+
+WH = Parameter(name = 'WH',
+               nature = 'external',
+               type = 'real',
+               value = 0.00575308848,
+               texname = '\\text{WH}',
+               lhablock = 'DECAY',
+               lhacode = [ 25 ])
+
+WSIX = Parameter(name = 'WSIX',
+                 nature = 'external',
+                 type = 'real',
+                 value = 3,
+                 texname = '\\text{WSIX}',
+                 lhablock = 'DECAY',
+                 lhacode = [ 9000006 ])
+
+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',
+               value = 'cmath.sqrt(MZ**2/2. + cmath.sqrt(MZ**4/4. - (aEW*cmath.pi*MZ**2)/(Gf*cmath.sqrt(2))))',
+               texname = 'M_W')
+
+ee = Parameter(name = 'ee',
+               nature = 'internal',
+               type = 'real',
+               value = '2*cmath.sqrt(aEW)*cmath.sqrt(cmath.pi)',
+               texname = 'e')
+
+sw2 = Parameter(name = 'sw2',
+                nature = 'internal',
+                type = 'real',
+                value = '1 - MW**2/MZ**2',
+                texname = '\\text{sw2}')
+
+cw = Parameter(name = 'cw',
+               nature = 'internal',
+               type = 'real',
+               value = 'cmath.sqrt(1 - sw2)',
+               texname = 'c_w')
+
+sw = Parameter(name = 'sw',
+               nature = 'internal',
+               type = 'real',
+               value = 'cmath.sqrt(sw2)',
+               texname = 's_w')
+
+g1 = Parameter(name = 'g1',
+               nature = 'internal',
+               type = 'real',
+               value = 'ee/cw',
+               texname = 'g_1')
+
+gw = Parameter(name = 'gw',
+               nature = 'internal',
+               type = 'real',
+               value = 'ee/sw',
+               texname = 'g_w')
+
+v = Parameter(name = 'v',
+              nature = 'internal',
+              type = 'real',
+              value = '(2*MW*sw)/ee',
+              texname = 'v')
+
+lam = Parameter(name = 'lam',
+                nature = 'internal',
+                type = 'real',
+                value = 'MH**2/(2.*v**2)',
+                texname = '\\text{lam}')
+
+yb = Parameter(name = 'yb',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymb*cmath.sqrt(2))/v',
+               texname = '\\text{yb}')
+
+yt = Parameter(name = 'yt',
+               nature = 'internal',
+               type = 'real',
+               value = '(ymt*cmath.sqrt(2))/v',
+               texname = '\\text{yt}')
+
+ytau = Parameter(name = 'ytau',
+                 nature = 'internal',
+                 type = 'real',
+                 value = '(ymtau*cmath.sqrt(2))/v',
+                 texname = '\\text{ytau}')
+
+muH = Parameter(name = 'muH',
+                nature = 'internal',
+                type = 'real',
+                value = 'cmath.sqrt(lam*v**2)',
+                texname = '\\mu ')
+

=== added file 'models/triplet_diquarks/particles.py'
--- models/triplet_diquarks/particles.py	1970-01-01 00:00:00 +0000
+++ models/triplet_diquarks/particles.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,400 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:36:34
+
+
+from __future__ import division
+from object_library import all_particles, Particle
+
+ve = Particle(pdg_code = 12,
+              name = 've',
+              antiname = 've~',
+              spin = 2,
+              color = 1,
+              mass = 'ZERO',
+              width = 'ZERO',
+              texname = 've',
+              antitexname = 've',
+              line = 'straight',
+              charge = 0,
+              LeptonNumber = 1,
+              GhostNumber = 0)
+
+ve__tilde__ = ve.anti()
+
+vm = Particle(pdg_code = 14,
+              name = 'vm',
+              antiname = 'vm~',
+              spin = 2,
+              color = 1,
+              mass = 'ZERO',
+              width = 'ZERO',
+              texname = 'vm',
+              antitexname = 'vm',
+              line = 'straight',
+              charge = 0,
+              LeptonNumber = 1,
+              GhostNumber = 0)
+
+vm__tilde__ = vm.anti()
+
+vt = Particle(pdg_code = 16,
+              name = 'vt',
+              antiname = 'vt~',
+              spin = 2,
+              color = 1,
+              mass = 'ZERO',
+              width = 'ZERO',
+              texname = 'vt',
+              antitexname = 'vt',
+              line = 'straight',
+              charge = 0,
+              LeptonNumber = 1,
+              GhostNumber = 0)
+
+vt__tilde__ = vt.anti()
+
+e__minus__ = Particle(pdg_code = 11,
+                      name = 'e-',
+                      antiname = 'e+',
+                      spin = 2,
+                      color = 1,
+                      mass = 'ZERO',
+                      width = 'ZERO',
+                      texname = 'e-',
+                      antitexname = 'e-',
+                      line = 'straight',
+                      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 = 'ZERO',
+                      width = 'ZERO',
+                      texname = 'm-',
+                      antitexname = 'm-',
+                      line = 'straight',
+                      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 = 'MTA',
+                       width = 'ZERO',
+                       texname = 'tt-',
+                       antitexname = 'tt-',
+                       line = 'straight',
+                       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 = 'ZERO',
+             width = 'ZERO',
+             texname = 'u',
+             antitexname = 'u',
+             line = 'straight',
+             charge = 2/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+u__tilde__ = u.anti()
+
+c = Particle(pdg_code = 4,
+             name = 'c',
+             antiname = 'c~',
+             spin = 2,
+             color = 3,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 'c',
+             antitexname = 'c',
+             line = 'straight',
+             charge = 2/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+c__tilde__ = c.anti()
+
+t = Particle(pdg_code = 6,
+             name = 't',
+             antiname = 't~',
+             spin = 2,
+             color = 3,
+             mass = 'MT',
+             width = 'WT',
+             texname = 't',
+             antitexname = 't',
+             line = 'straight',
+             charge = 2/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+t__tilde__ = t.anti()
+
+d = Particle(pdg_code = 1,
+             name = 'd',
+             antiname = 'd~',
+             spin = 2,
+             color = 3,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 'd',
+             antitexname = 'd',
+             line = 'straight',
+             charge = -1/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+d__tilde__ = d.anti()
+
+s = Particle(pdg_code = 3,
+             name = 's',
+             antiname = 's~',
+             spin = 2,
+             color = 3,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 's',
+             antitexname = 's',
+             line = 'straight',
+             charge = -1/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+s__tilde__ = s.anti()
+
+b = Particle(pdg_code = 5,
+             name = 'b',
+             antiname = 'b~',
+             spin = 2,
+             color = 3,
+             mass = 'MB',
+             width = 'ZERO',
+             texname = 'b',
+             antitexname = 'b',
+             line = 'straight',
+             charge = -1/3,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+b__tilde__ = b.anti()
+
+ghA = Particle(pdg_code = 9000001,
+               name = 'ghA',
+               antiname = 'ghA~',
+               spin = -1,
+               color = 1,
+               mass = 'ZERO',
+               width = 'WghA',
+               texname = 'ghA',
+               antitexname = 'ghA',
+               line = 'dotted',
+               charge = 0,
+               LeptonNumber = 0,
+               GhostNumber = 1)
+
+ghA__tilde__ = ghA.anti()
+
+ghZ = Particle(pdg_code = 9000002,
+               name = 'ghZ',
+               antiname = 'ghZ~',
+               spin = -1,
+               color = 1,
+               mass = 'MZ',
+               width = 'WghZ',
+               texname = 'ghZ',
+               antitexname = 'ghZ',
+               line = 'dotted',
+               charge = 0,
+               LeptonNumber = 0,
+               GhostNumber = 1)
+
+ghZ__tilde__ = ghZ.anti()
+
+ghWp = Particle(pdg_code = 9000003,
+                name = 'ghWp',
+                antiname = 'ghWp~',
+                spin = -1,
+                color = 1,
+                mass = 'MW',
+                width = 'WghWp',
+                texname = 'ghWp',
+                antitexname = 'ghWp',
+                line = 'dotted',
+                charge = 1,
+                LeptonNumber = 0,
+                GhostNumber = 1)
+
+ghWp__tilde__ = ghWp.anti()
+
+ghWm = Particle(pdg_code = 9000004,
+                name = 'ghWm',
+                antiname = 'ghWm~',
+                spin = -1,
+                color = 1,
+                mass = 'MW',
+                width = 'WghWm',
+                texname = 'ghWm',
+                antitexname = 'ghWm',
+                line = 'dotted',
+                charge = -1,
+                LeptonNumber = 0,
+                GhostNumber = 1)
+
+ghWm__tilde__ = ghWm.anti()
+
+ghG = Particle(pdg_code = 9000005,
+               name = 'ghG',
+               antiname = 'ghG~',
+               spin = -1,
+               color = 8,
+               mass = 'ZERO',
+               width = 'WghG',
+               texname = 'ghG',
+               antitexname = 'ghG',
+               line = 'dotted',
+               charge = 0,
+               LeptonNumber = 0,
+               GhostNumber = 1)
+
+ghG__tilde__ = ghG.anti()
+
+A = Particle(pdg_code = 22,
+             name = 'A',
+             antiname = 'A',
+             spin = 3,
+             color = 1,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 'A',
+             antitexname = 'A',
+             line = 'wavy',
+             charge = 0,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+Z = Particle(pdg_code = 23,
+             name = 'Z',
+             antiname = 'Z',
+             spin = 3,
+             color = 1,
+             mass = 'MZ',
+             width = 'WZ',
+             texname = 'Z',
+             antitexname = 'Z',
+             line = 'wavy',
+             charge = 0,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+W__plus__ = Particle(pdg_code = 24,
+                     name = 'W+',
+                     antiname = 'W-',
+                     spin = 3,
+                     color = 1,
+                     mass = 'MW',
+                     width = 'WW',
+                     texname = 'W+',
+                     antitexname = 'W+',
+                     line = 'wavy',
+                     charge = 1,
+                     LeptonNumber = 0,
+                     GhostNumber = 0)
+
+W__minus__ = W__plus__.anti()
+
+G = Particle(pdg_code = 21,
+             name = 'G',
+             antiname = 'G',
+             spin = 3,
+             color = 8,
+             mass = 'ZERO',
+             width = 'ZERO',
+             texname = 'G',
+             antitexname = 'G',
+             line = 'curly',
+             charge = 0,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+H = Particle(pdg_code = 25,
+             name = 'H',
+             antiname = 'H',
+             spin = 1,
+             color = 1,
+             mass = 'MH',
+             width = 'WH',
+             texname = '\\phi',
+             antitexname = '\\phi',
+             line = 'dashed',
+             charge = 0,
+             LeptonNumber = 0,
+             GhostNumber = 0)
+
+phi0 = Particle(pdg_code = 250,
+                name = 'phi0',
+                antiname = 'phi0',
+                spin = 1,
+                color = 1,
+                mass = 'MZ',
+                width = 'Wphi',
+                texname = 'phi0',
+                antitexname = 'phi0',
+                line = 'dashed',
+                GoldstoneBoson = True,
+                charge = 0,
+                LeptonNumber = 0,
+                GhostNumber = 0)
+
+phi__plus__ = Particle(pdg_code = 251,
+                       name = 'phi+',
+                       antiname = 'phi-',
+                       spin = 1,
+                       color = 1,
+                       mass = 'MW',
+                       width = 'Wphi2',
+                       texname = '\\phi^+',
+                       antitexname = '\\phi^+',
+                       line = 'dashed',
+                       GoldstoneBoson = True,
+                       charge = 1,
+                       LeptonNumber = 0,
+                       GhostNumber = 0)
+
+phi__minus__ = phi__plus__.anti()
+
+trip = Particle(pdg_code = 9000006,
+                name = 'trip',
+                antiname = 'trip~',
+                spin = 1,
+                color = 3,
+                mass = 'MSIX',
+                width = 'WSIX',
+                texname = 'trip',
+                antitexname = 'trip',
+                line = 'dashed',
+                charge = -4/3,
+                LeptonNumber = 0,
+                GhostNumber = 0)
+
+trip__tilde__ = trip.anti()
+

=== added file 'models/triplet_diquarks/vertices.py'
--- models/triplet_diquarks/vertices.py	1970-01-01 00:00:00 +0000
+++ models/triplet_diquarks/vertices.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,371 @@
+# This file was automatically created by FeynRules $Revision: 347 $
+# Mathematica version: 7.0 for Mac OS X x86 (64-bit) (November 11, 2008)
+# Date: Wed 20 Oct 2010 11:36:34
+
+
+from object_library import all_vertices, Vertex
+import particles as P
+import couplings as C
+import lorentz as L
+
+
+V_1 = Vertex(name = 'V_1',
+             particles = [ P.H, P.H, P.H, P.H ],
+             color = [ '1' ],
+             lorentz = [ L.SSSS1 ],
+             couplings = {(0,0):C.GC_11})
+
+V_2 = Vertex(name = 'V_2',
+             particles = [ P.H, P.H, P.H ],
+             color = [ '1' ],
+             lorentz = [ L.SSS1 ],
+             couplings = {(0,0):C.GC_24})
+
+V_3 = Vertex(name = 'V_3',
+             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.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_7,(0,0):C.GC_7,(2,2):C.GC_7})
+
+V_5 = Vertex(name = 'V_5',
+             particles = [ P.G, P.trip__tilde__, P.trip ],
+             color = [ 'T(1,3,2)' ],
+             lorentz = [ L.VSS1 ],
+             couplings = {(0,0):C.GC_5})
+
+V_6 = Vertex(name = 'V_6',
+             particles = [ P.u__tilde__, P.t__tilde__, P.trip__tilde__ ],
+             color = [ 'EpsilonBar(1,2,3)' ],
+             lorentz = [ L.FFS1 ],
+             couplings = {(0,0):C.GC_12})
+
+V_7 = Vertex(name = 'V_7',
+             particles = [ P.G, P.G, P.trip__tilde__, P.trip ],
+             color = [ 'T(1,-1,3)*T(2,4,-1)', 'T(1,4,-1)*T(2,-1,3)' ],
+             lorentz = [ L.VVSS1 ],
+             couplings = {(0,0):C.GC_7,(1,0):C.GC_7})
+
+V_8 = Vertex(name = 'V_8',
+             particles = [ P.u, P.t, P.trip ],
+             color = [ 'Epsilon(1,2,3)' ],
+             lorentz = [ L.FFS1 ],
+             couplings = {(0,0):C.GC_12})
+
+V_9 = Vertex(name = 'V_9',
+             particles = [ P.A, P.W__minus__, P.W__plus__ ],
+             color = [ '1' ],
+             lorentz = [ L.VVV1 ],
+             couplings = {(0,0):C.GC_19})
+
+V_10 = Vertex(name = 'V_10',
+              particles = [ P.W__minus__, P.W__plus__, P.H, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVSS1 ],
+              couplings = {(0,0):C.GC_13})
+
+V_11 = Vertex(name = 'V_11',
+              particles = [ P.W__minus__, P.W__plus__, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVS1 ],
+              couplings = {(0,0):C.GC_25})
+
+V_12 = Vertex(name = 'V_12',
+              particles = [ P.A, P.A, P.W__minus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.VVVV2 ],
+              couplings = {(0,0):C.GC_21})
+
+V_13 = Vertex(name = 'V_13',
+              particles = [ P.W__minus__, P.W__plus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVV1 ],
+              couplings = {(0,0):C.GC_8})
+
+V_14 = Vertex(name = 'V_14',
+              particles = [ P.W__minus__, P.W__minus__, P.W__plus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.VVVV2 ],
+              couplings = {(0,0):C.GC_9})
+
+V_15 = Vertex(name = 'V_15',
+              particles = [ P.A, P.W__minus__, P.W__plus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVVV5 ],
+              couplings = {(0,0):C.GC_20})
+
+V_16 = Vertex(name = 'V_16',
+              particles = [ P.Z, P.Z, P.H, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVSS1 ],
+              couplings = {(0,0):C.GC_23})
+
+V_17 = Vertex(name = 'V_17',
+              particles = [ P.Z, P.Z, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.VVS1 ],
+              couplings = {(0,0):C.GC_26})
+
+V_18 = Vertex(name = 'V_18',
+              particles = [ P.W__minus__, P.W__plus__, P.Z, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.VVVV2 ],
+              couplings = {(0,0):C.GC_10})
+
+V_19 = Vertex(name = 'V_19',
+              particles = [ P.d__tilde__, P.d, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_1})
+
+V_20 = Vertex(name = 'V_20',
+              particles = [ P.s__tilde__, P.s, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_1})
+
+V_21 = Vertex(name = 'V_21',
+              particles = [ P.b__tilde__, P.b, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_1})
+
+V_22 = Vertex(name = 'V_22',
+              particles = [ P.e__plus__, P.e__minus__, P.A ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
+
+V_23 = Vertex(name = 'V_23',
+              particles = [ P.m__plus__, P.m__minus__, P.A ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
+
+V_24 = Vertex(name = 'V_24',
+              particles = [ P.tt__plus__, P.tt__minus__, P.A ],
+              color = [ '1' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_3})
+
+V_25 = Vertex(name = 'V_25',
+              particles = [ P.u__tilde__, P.u, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
+
+V_26 = Vertex(name = 'V_26',
+              particles = [ P.c__tilde__, P.c, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
+
+V_27 = Vertex(name = 'V_27',
+              particles = [ P.t__tilde__, P.t, P.A ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_2})
+
+V_28 = Vertex(name = 'V_28',
+              particles = [ P.d__tilde__, P.d, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_29 = Vertex(name = 'V_29',
+              particles = [ P.s__tilde__, P.s, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_30 = Vertex(name = 'V_30',
+              particles = [ P.b__tilde__, P.b, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_31 = Vertex(name = 'V_31',
+              particles = [ P.b__tilde__, P.b, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_27})
+
+V_32 = Vertex(name = 'V_32',
+              particles = [ P.d__tilde__, P.d, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,0):C.GC_15,(0,1):C.GC_17})
+
+V_33 = Vertex(name = 'V_33',
+              particles = [ P.s__tilde__, P.s, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,0):C.GC_15,(0,1):C.GC_17})
+
+V_34 = Vertex(name = 'V_34',
+              particles = [ P.b__tilde__, P.b, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV3 ],
+              couplings = {(0,0):C.GC_15,(0,1):C.GC_17})
+
+V_35 = Vertex(name = 'V_35',
+              particles = [ P.d__tilde__, P.u, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_36 = Vertex(name = 'V_36',
+              particles = [ P.s__tilde__, P.c, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_37 = Vertex(name = 'V_37',
+              particles = [ P.b__tilde__, P.t, P.W__minus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_38 = Vertex(name = 'V_38',
+              particles = [ P.u__tilde__, P.d, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_39 = Vertex(name = 'V_39',
+              particles = [ P.c__tilde__, P.s, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_40 = Vertex(name = 'V_40',
+              particles = [ P.t__tilde__, P.b, P.W__plus__ ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_41 = Vertex(name = 'V_41',
+              particles = [ P.u__tilde__, P.u, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_42 = Vertex(name = 'V_42',
+              particles = [ P.c__tilde__, P.c, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_43 = Vertex(name = 'V_43',
+              particles = [ P.t__tilde__, P.t, P.G ],
+              color = [ 'T(3,2,1)' ],
+              lorentz = [ L.FFV1 ],
+              couplings = {(0,0):C.GC_6})
+
+V_44 = Vertex(name = 'V_44',
+              particles = [ P.tt__plus__, P.tt__minus__, P.H ],
+              color = [ '1' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_29})
+
+V_45 = Vertex(name = 'V_45',
+              particles = [ P.t__tilde__, P.t, P.H ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFS1 ],
+              couplings = {(0,0):C.GC_28})
+
+V_46 = Vertex(name = 'V_46',
+              particles = [ P.e__plus__, P.e__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_15,(0,1):C.GC_18})
+
+V_47 = Vertex(name = 'V_47',
+              particles = [ P.m__plus__, P.m__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_15,(0,1):C.GC_18})
+
+V_48 = Vertex(name = 'V_48',
+              particles = [ P.tt__plus__, P.tt__minus__, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2, L.FFV4 ],
+              couplings = {(0,0):C.GC_15,(0,1):C.GC_18})
+
+V_49 = Vertex(name = 'V_49',
+              particles = [ P.e__plus__, P.ve, P.W__minus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_50 = Vertex(name = 'V_50',
+              particles = [ P.m__plus__, P.vm, P.W__minus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_51 = Vertex(name = 'V_51',
+              particles = [ P.tt__plus__, P.vt, P.W__minus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_52 = Vertex(name = 'V_52',
+              particles = [ P.ve__tilde__, P.e__minus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_53 = Vertex(name = 'V_53',
+              particles = [ P.vm__tilde__, P.m__minus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_54 = Vertex(name = 'V_54',
+              particles = [ P.vt__tilde__, P.tt__minus__, P.W__plus__ ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_14})
+
+V_55 = Vertex(name = 'V_55',
+              particles = [ P.u__tilde__, P.u, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_16,(0,1):C.GC_17})
+
+V_56 = Vertex(name = 'V_56',
+              particles = [ P.c__tilde__, P.c, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_16,(0,1):C.GC_17})
+
+V_57 = Vertex(name = 'V_57',
+              particles = [ P.t__tilde__, P.t, P.Z ],
+              color = [ 'Identity(1,2)' ],
+              lorentz = [ L.FFV2, L.FFV5 ],
+              couplings = {(0,0):C.GC_16,(0,1):C.GC_17})
+
+V_58 = Vertex(name = 'V_58',
+              particles = [ P.ve__tilde__, P.ve, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_22})
+
+V_59 = Vertex(name = 'V_59',
+              particles = [ P.vm__tilde__, P.vm, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_22})
+
+V_60 = Vertex(name = 'V_60',
+              particles = [ P.vt__tilde__, P.vt, P.Z ],
+              color = [ '1' ],
+              lorentz = [ L.FFV2 ],
+              couplings = {(0,0):C.GC_22})
+

=== added file 'models/triplet_diquarks/write_param_card.py'
--- models/triplet_diquarks/write_param_card.py	1970-01-01 00:00:00 +0000
+++ models/triplet_diquarks/write_param_card.py	2010-12-15 07:31:31 +0000
@@ -0,0 +1,65 @@
+
+__date__ = "3 june 2010"
+__author__ = '[e-mail]'
+
+class ParamCardWriter(object):
+    
+    header = \
+    """######################################################################\n""" + \
+    """## PARAM_CARD AUTOMATICALY GENERATED BY THE UFO  #####################\n""" + \
+    """######################################################################\n"""   
+    
+    def __init__(self, filename, list_of_parameters=None):
+        """write a valid param_card.dat"""
+        
+        if not list_of_parameters:
+            from parameters import all_parameters
+            list_of_parameters = [param for param in all_parameters if \
+                                                       param.nature=='external']
+        
+        self.fsock = open(filename, 'w')
+        self.fsock.write(self.header)
+        
+        self.write_card(list_of_parameters)
+    
+    
+    def write_card(self, all_ext_param):
+        """ """
+        
+      
+        
+        # list all lhablock
+        all_lhablock = set([param.lhablock for param in all_ext_param])
+        
+        # ordonate lhablock alphabeticaly
+        list(all_lhablock).sort()
+        
+        for lhablock in all_lhablock:
+            self.write_block(lhablock)
+            [self.write_param(param, lhablock) for param in all_ext_param if \
+                                                     param.lhablock == lhablock]
+    def write_block(self, name):
+        """ write a comment for a block"""
+        
+        self.fsock.writelines(
+        """\n###################################""" + \
+        """\n## INFORMATION FOR %s""" % name.upper() +\
+        """\n###################################\n"""
+         )
+        if name!='DECAY':
+            self.fsock.write("""Block %s \n""" % name)
+
+    def write_param(self, param, lhablock):
+        
+        lhacode=' '.join(['%3s' % key for key in param.lhacode])
+        if lhablock != 'DECAY':
+            text = """  %s %e # %s \n""" % (lhacode, param.value, param.name ) 
+        else:
+            text = '''DECAY %s %e \n''' % (lhacode, param.value)
+        self.fsock.write(text) 
+            
+            
+if '__main__' == __name__:
+    ParamCardWriter('./param_card.dat')
+    print 'done'
+    

=== modified file 'tests/acceptance_tests/test_cmd.py'
--- tests/acceptance_tests/test_cmd.py	2010-12-07 22:44:51 +0000
+++ tests/acceptance_tests/test_cmd.py	2010-12-15 07:31:31 +0000
@@ -446,6 +446,61 @@
                                                     'P0_epem_epem',
                                                     'madevent')))
         
+    def test_madevent_triplet_diquarks(self):
+        """Test MadEvent output of triplet diquarks"""
+
+        if os.path.isdir(self.out_dir):
+            shutil.rmdir(self.out_dir)
+
+        self.do('import model triplet_diquarks')
+        self.do('generate u t > trip~ > u t g')
+        self.do('output %s ' % self.out_dir)
+
+        devnull = open(os.devnull,'w')
+        # Check that the Source directory compiles
+        status = subprocess.call(['make'],
+                                 stdout=devnull, stderr=devnull, 
+                                 cwd=os.path.join(self.out_dir, 'Source'))
+        self.assertEqual(status, 0)
+        self.assertTrue(os.path.exists(os.path.join(self.out_dir,
+                                               'lib', 'libdhelas3.a')))
+        self.assertTrue(os.path.exists(os.path.join(self.out_dir,
+                                               'lib', 'libmodel.a')))
+        self.assertTrue(os.path.exists(os.path.join(self.out_dir,
+                                               'lib', 'libgeneric.a')))
+        self.assertTrue(os.path.exists(os.path.join(self.out_dir,
+                                               'lib', 'libcernlib.a')))
+        self.assertTrue(os.path.exists(os.path.join(self.out_dir,
+                                               'lib', 'libdsample.a')))
+        self.assertTrue(os.path.exists(os.path.join(self.out_dir,
+                                               'lib', 'libpdf.a')))
+        # Check that gensym compiles
+        status = subprocess.call(['make', 'gensym'],
+                                 stdout=devnull, stderr=devnull, 
+                                 cwd=os.path.join(self.out_dir, 'SubProcesses',
+                                                  'P0_ut_tripx_utg'))
+        self.assertEqual(status, 0)
+        self.assertTrue(os.path.exists(os.path.join(self.out_dir,
+                                                    'SubProcesses',
+                                                    'P0_ut_tripx_utg',
+                                                    'gensym')))
+        # Check that gensym runs
+        status = subprocess.call('./gensym', 
+                                 stdout=devnull, stderr=devnull,
+                                 cwd=os.path.join(self.out_dir, 'SubProcesses',
+                                                  'P0_ut_tripx_utg'), shell=True)
+        self.assertEqual(status, 0)
+        # Check that madevent compiles
+        status = subprocess.call(['make', 'madevent'],
+                                 stdout=devnull, stderr=devnull, 
+                                 cwd=os.path.join(self.out_dir, 'SubProcesses',
+                                                  'P0_ut_tripx_utg'))
+        self.assertEqual(status, 0)
+        self.assertTrue(os.path.exists(os.path.join(self.out_dir,
+                                                    'SubProcesses',
+                                                    'P0_ut_tripx_utg',
+                                                    'madevent')))
+        
     def test_ufo_standard_sm(self):
         """ check that we can use standard MG4 name """
         self.do('import model sm')

=== modified file 'tests/parallel_tests/me_comparator.py'
--- tests/parallel_tests/me_comparator.py	2010-10-28 00:17:50 +0000
+++ tests/parallel_tests/me_comparator.py	2010-12-15 07:31:31 +0000
@@ -41,6 +41,8 @@
 
 import madgraph.interface.cmd_interface as cmd_interface
 
+from madgraph import MadGraph5Error
+
 class MERunner(object):
     """Base class to containing default function to setup, run and access results
     produced with a specific ME generator. 
@@ -107,11 +109,17 @@
 
         self.setup_flag = False
 
+        self.check_path(mg4_path)
+
         # Create a copy of Template
+<<<<<<< TREE
         if not os.path.isdir(os.path.join(mg4_path, "Template")) or \
                not os.path.isdir(os.path.join(mg4_path, "HELAS")):
             raise IOError, "Path %s is not a valid MG4 path" % str(mg4_path)
 
+=======
+
+>>>>>>> MERGE-SOURCE
         self.mg4_path = os.path.abspath(mg4_path)
 
         if not temp_dir:
@@ -142,6 +150,13 @@
         logging.info("Temporary standalone directory %s successfully created" % \
                      temp_dir)
 
+    def check_path(self, mg4_path):
+        """Check the path for necessary directories"""
+
+        if not os.path.isdir(os.path.join(mg4_path, "Template")) or \
+               not os.path.isdir(os.path.join(mg4_path, "HELAS")):
+            raise IOError, "Path %s is not a valid MG4 path" % str(mg4_path)
+
     def cleanup(self):
         """Clean up temporary directories"""
 
@@ -319,6 +334,13 @@
 
         self.mg5_path = os.path.abspath(mg5_path)
 
+    def check_path(self, mg4_path):
+        """Check the path for necessary directories"""
+
+        if not os.path.isdir(os.path.join(mg4_path, "Template")) or \
+               not os.path.isdir(os.path.join(mg4_path, "HELAS")):
+            raise IOError, "Path %s is not a valid MG4 path" % str(mg4_path)
+
     def run(self, proc_list, model, orders={}, energy=1000):
         """Execute MG5 on the list of processes mentioned in proc_list, using
         the specified model, the specified maximal coupling orders and a certain
@@ -350,7 +372,7 @@
             try:
                 cmd.run_cmd(line)
             except MadGraph5Error:
-                pass
+                raise Exception
         # Get the ME value
         for i, proc in enumerate(proc_list):
             self.res_list.append(self.get_me_value(proc, i))
@@ -377,6 +399,12 @@
     name = 'UFO-ALOHA-MG5'
     type = 'ufo'
     
+    def check_path(self, mg4_path):
+        """Check the path for necessary directories"""
+
+        if not os.path.isdir(os.path.join(mg4_path, "Template")):
+            raise IOError, "Path %s is not a valid MG4 path" % str(mg4_path)
+
     def format_mg5_proc_card(self, proc_list, model, orders):
         """Create a proc_card.dat string following v5 conventions."""
 

=== modified file 'tests/parallel_tests/sample_script.py'
--- tests/parallel_tests/sample_script.py	2010-12-07 22:44:51 +0000
+++ tests/parallel_tests/sample_script.py	2010-12-15 07:31:31 +0000
@@ -46,6 +46,7 @@
     logging.getLogger('tutorial').setLevel(logging.ERROR)
         
     logging.basicConfig(level=logging.INFO)
+<<<<<<< TREE
 #    my_proc_list = me_comparator.create_proc_list_enhanced(
 ##        ['w+', 'w-', 'z'],
 ##        initial=2, final_1=2)
@@ -57,6 +58,18 @@
     #                                              final=2)
     #my_proc_list = me_comparator.create_proc_list(['g', 'h', 'h3'], initial=2,
     #                                               final=4)
+=======
+    #my_proc_list = me_comparator.create_proc_list(['u', 'u~'], initial=2,
+    #                                              final=2)
+    #my_proc_list = me_comparator.create_proc_list_enhanced(
+    #    ['u', 'u~', 'd', 'd~', 'g'],['six', 'six~'],['g'],
+    #    initial=2, final_1=1, final_2 = 1)
+
+    my_proc_list = ['u u > ul ul', 'u u~ > go go', 'g g > go go',
+                    'g g > go go g']
+
+    my_proc_list = ['g g > g g g']
+>>>>>>> MERGE-SOURCE
 
     my_proc_list = ['h > g g g g']
     # Create a MERunner object for MG4
@@ -81,20 +94,37 @@
 
     # Create and setup a comparator
     my_comp = me_comparator.MEComparator()
+<<<<<<< TREE
     my_comp.set_me_runners(my_mg5, my_mg5_ufo, my_mg4, my_mg4_2)
+=======
+    my_comp.set_me_runners(my_mg4, my_mg5, my_mg5_ufo)
+>>>>>>> MERGE-SOURCE
 
     # Run the actual comparison
     my_comp.run_comparison(my_proc_list,
+<<<<<<< TREE
                        model=['heft_fix', 'heft', 'heft', 'heft_fix'], orders={'QED':0, 'QCD':3, 'HIG':1, 'HIW':1}, energy=2000)
+=======
+                           model='sm',
+                           orders={'QED':4, 'QCD':4}, energy=2000)
+>>>>>>> MERGE-SOURCE
 
     # Do some cleanup
     #my_comp.cleanup()
+    filename='sm_results.log'
 
     filename = "heft_results.log"
 
     # Print the output
-    my_comp.output_result(filename=filename)
-    pydoc.pager(file(filename,'r').read())
+<<<<<<< TREE
+    my_comp.output_result(filename=filename)
+    pydoc.pager(file(filename,'r').read())
+=======
+    my_comp.output_result(filename=filename)
+
+    
+    pydoc.pager(file(filename,'r').read())
+>>>>>>> MERGE-SOURCE
 
     # Print a list of non zero processes
     #print my_comp.get_non_zero_processes()

=== modified file 'tests/unit_tests/core/test_color_algebra.py'
--- tests/unit_tests/core/test_color_algebra.py	2010-07-18 08:25:21 +0000
+++ tests/unit_tests/core/test_color_algebra.py	2010-12-15 07:31:31 +0000
@@ -180,7 +180,112 @@
         self.assertEqual(my_d.simplify(),
                          color.ColorFactor([col_str1, col_str2]))
 
-
+    def test_epsilon_object(self):
+        """Test the epsilon object"""
+
+        # Espilon should have exactly 3 indices!
+        self.assertRaises(AssertionError,
+                         color.Epsilon,
+                         1, 2)
+
+        my_epsilon1 = color.Epsilon(2, 3, 1)
+        my_epsilon2 = color.Epsilon(5, 1, 4)
+        my_epsilon2 = my_epsilon2.complex_conjugate()
+
+        my_goal_str1 = color.ColorString([color.T(2, 4), color.T(3, 5)])
+        my_goal_str2 = color.ColorString([color.T(2, 5), color.T(3, 4)])
+        my_goal_str2.coeff = fractions.Fraction(-1
+                                              )
+        self.assertEqual(my_epsilon1.pair_simplify(my_epsilon2),
+                         color.ColorFactor([my_goal_str1, my_goal_str2]))
+
+    def test_delta3_pair_simplify(self):
+        """Test delta3 simplify"""
+
+        self.assertEqual(color.K6(1,101,103).pair_simplify(color.T(101,102)),
+                         color.ColorFactor([color.ColorString([color.K6(1,103,102)])]))
+        self.assertEqual(color.K6(1,103,102).pair_simplify(color.T(102,101)),
+                         color.ColorFactor([color.ColorString([color.K6(1,103,101)])]))
+        self.assertEqual(color.K6Bar(1,101,103).pair_simplify(color.T(102,101)),
+                         color.ColorFactor([color.ColorString([color.K6Bar(1,103,102)])]))
+        self.assertEqual(color.K6Bar(1,103,101).pair_simplify(color.T(102,101)),
+                         color.ColorFactor([color.ColorString([color.K6Bar(1,103,102)])]))
+
+    def test_delta6_simplify(self):
+        """Test delta6 simplify"""
+
+        # delta6(i,i) = 1
+        col_str1 = color.ColorString()
+        col_str1.Nc_power = 2
+        col_str1.coeff = fractions.Fraction(1, 2)
+        col_str2 = color.ColorString()
+        col_str2.Nc_power = 1
+        col_str2.coeff = fractions.Fraction(1, 2)
+        self.assertEqual(color.T6(1, 1).simplify(),
+                         color.ColorFactor([col_str1, col_str2]))
+
+    def test_K6_objects(self):
+        """Test K6 product simplifications"""
+
+        #K6(m,i,j)K6Bar(m,k,l) = 1/2(T(l,i)T(k,j)
+        #                          + T(k,i)T(l,j)
+
+        my_K6 = color.K6(1,101,102)
+        my_K6Bar = color.K6Bar(1,103,104)
+
+        col_str1 = color.ColorString([color.T(104,101),
+                                      color.T(103,102)])
+        col_str2 = color.ColorString([color.T(103,101),
+                                      color.T(104,102)])
+        col_str1.coeff = fractions.Fraction(1, 2)
+        col_str2.coeff = fractions.Fraction(1, 2)
+
+        self.assertEqual(my_K6.pair_simplify(my_K6Bar),
+                         color.ColorFactor([col_str1, col_str2]))
+
+        #K6(m,i,j)K6Bar(n,j,i) = delta6(m,n)
+
+        my_K6 = color.K6(1,101,102)
+        my_K6Bar = color.K6Bar(2,102,101)
+
+        self.assertEqual(my_K6.pair_simplify(my_K6Bar),
+                         color.ColorFactor([\
+                         color.ColorString([color.T6(1,2)])]))
+
+        #K6(m,i,j)K6Bar(n,i,j) = delta6(m,n).
+        my_K6 = color.K6(1,101,102)
+        my_K6Bar = color.K6Bar(2,101,102)
+
+        self.assertEqual(my_K6.pair_simplify(my_K6Bar),
+                         color.ColorFactor([\
+                         color.ColorString([color.T6(1,2)])]))
+
+
+    def test_T6_simplify(self):
+        """Test T6 simplify"""
+
+        # T6(a,i,j) = 2(K6(i,ii,jj)T(a,jj,kk)K6Bar(j,kk,ii))
+
+        my_T6 = color.T6(1,101,102)
+
+        color.T6.new_index = 10000
+
+        k6 = color.K6(101, 10000, 10001)
+        t = color.T(1, 10001, 10002)
+        k6b = color.K6Bar(102, 10002, 10000)
+        col_string = color.ColorString([k6, t, k6b])
+        col_string.coeff = fractions.Fraction(2, 1)
+        self.assertEqual(my_T6.simplify(), color.ColorFactor([col_string]))
+
+        my_T6 = color.T6(1,101,102)
+
+        k6 = color.K6(101, 10003, 10004)
+        t = color.T(1, 10004, 10005)
+        k6b = color.K6Bar(102, 10005, 10003)
+        col_string = color.ColorString([k6, t, k6b])
+        col_string.coeff = fractions.Fraction(2, 1)
+        self.assertEqual(my_T6.simplify(), color.ColorFactor([col_string]))
+        
 class ColorStringTest(unittest.TestCase):
     """Test class for the ColorString objects"""
 
@@ -369,3 +474,113 @@
         '(2 I Tr(1,4,3,5,2))+(-2 I Tr(1,5,4,3,2))')
 
 
+    def test_sextet_products(self):
+        """Test non trivial product of sextet operators"""
+
+        # T6[2, 101, 102] T6[2, 102, 103] = (-1 + Nc) (2 + Nc) delta6[101, 103])/Nc
+
+        my_color_factor = color.ColorFactor([\
+                    color.ColorString([color.T6(2, 101, 102),
+                                       color.T6(2, 102, 103)])])
+
+        col_str1 = color.ColorString([color.T6(101,103)])
+        col_str1.Nc_power = 1
+        col_str2 = copy.copy(col_str1)
+        col_str2.Nc_power = 0
+        col_str3 = copy.copy(col_str1)
+        col_str3.Nc_power = -1
+        col_str3.coeff = fractions.Fraction(-2, 1)
+
+        self.assertEqual(my_color_factor.full_simplify(),
+                         color.ColorFactor([col_str1, col_str2, col_str3]))
+
+        # T6[2, 101, 102] T6[3, 102, 101] = 1/2 (2 + Nc) delta8[2, 3]
+
+        my_color_factor = color.ColorFactor([\
+                    color.ColorString([color.T6(2, 101, 102),
+                                       color.T6(3, 102, 101)])])
+
+        col_str1 = color.ColorString([color.Tr(2,3)])
+        col_str1.Nc_power = 1
+        col_str1.coeff = fractions.Fraction(1)
+        col_str2 = copy.copy(col_str1)
+        col_str2.Nc_power = 0
+        col_str2.coeff = fractions.Fraction(2)
+
+        self.assertEqual(my_color_factor.full_simplify(),
+                         color.ColorFactor([col_str1, col_str2]))
+
+        
+        # K6[1, 101, 102] T[2, 102, 103] T[2, 103, 104] K6Bar[1, 104, 101]
+        #                 = 1/4 (-1 + Nc) (1 + Nc)^2
+        #                 = 1/4 (-1 - Nc + Nc^2 + Nc^3)
+
+        my_color_factor = color.ColorFactor([\
+                    color.ColorString([color.K6(1, 101, 102),
+                                       color.T(2, 102, 103),
+                                       color.T(2, 103, 104),
+                                       color.K6Bar(1, 104, 101)])])
+
+        col_str1 = color.ColorString()
+        col_str1.Nc_power = 3
+        col_str1.coeff = fractions.Fraction(1, 4)
+        col_str2 = color.ColorString()
+        col_str2.Nc_power = 2
+        col_str2.coeff = fractions.Fraction(1, 4)
+        col_str3 = color.ColorString()
+        col_str3.Nc_power = 1
+        col_str3.coeff = fractions.Fraction(-1, 4)
+        col_str4 = color.ColorString()
+        col_str4.Nc_power = 0
+        col_str4.coeff = fractions.Fraction(-1, 4)
+
+        self.assertEqual(my_color_factor.full_simplify(),
+                         color.ColorFactor([col_str1, col_str3,
+                                            col_str2, col_str4]))
+
+        # T6[2, 101, 102] T6[2, 102, 103] K6[103, 99, 98] K6Bar[101, 98, 99]
+        #                 = 1/2 (-1 + Nc) (1 + Nc) (2 + Nc)
+        #                 = 1/2 (Nc^3 + 2 Nc^2 - Nc - 2)
+
+        my_color_factor = color.ColorFactor([\
+                    color.ColorString([color.T6(2, 101, 102),
+                                       color.T6(2, 102, 103),
+                                       color.K6(103,99, 98),
+                                       color.K6Bar(101, 98, 99)])])
+
+        col_str1 = color.ColorString()
+        col_str1.Nc_power = 3
+        col_str1.coeff = fractions.Fraction(1, 2)
+        col_str2 = color.ColorString()
+        col_str2.Nc_power = 2
+        col_str2.coeff = fractions.Fraction(1, 1)
+        col_str3 = color.ColorString()
+        col_str3.Nc_power = 1
+        col_str3.coeff = fractions.Fraction(-1, 2)
+        col_str4 = color.ColorString()
+        col_str4.Nc_power = 0
+        col_str4.coeff = fractions.Fraction(-1, 1)
+
+        self.assertEqual(my_color_factor.full_simplify(),
+                         color.ColorFactor([col_str2, col_str1, 
+                                            col_str3, col_str4]))
+
+        # K6[103, 99, 98] T[80, 98, 100] K6Bar[103, 100, 97] T[80, 99, 97]
+        #                 = -(1/4) + Nc^2/4
+
+        my_color_factor = color.ColorFactor([\
+                    color.ColorString([color.K6(103, 99, 98),
+                                       color.T(80, 98, 100),
+                                       color.K6Bar(103, 100, 97),
+                                       color.T(80, 99, 97)])])
+
+        col_str1 = color.ColorString()
+        col_str1.Nc_power = 2
+        col_str1.coeff = fractions.Fraction(1, 4)
+        col_str2 = color.ColorString()
+        col_str2.Nc_power = 0
+        col_str2.coeff = fractions.Fraction(-1, 4)
+
+        self.assertEqual(my_color_factor.full_simplify(),
+                         color.ColorFactor([col_str1, col_str2]))
+

=== modified file 'tests/unit_tests/core/test_color_amp.py'
--- tests/unit_tests/core/test_color_amp.py	2010-07-17 23:55:50 +0000
+++ tests/unit_tests/core/test_color_amp.py	2010-12-15 07:31:31 +0000
@@ -212,8 +212,8 @@
         col_dict = my_col_basis.colorize(myamplitude['diagrams'][0],
                                      self.mymodel)
 
-        goal_dict = {(0, 0):color.ColorString([color.T(-1000, 2, 1),
-                                               color.f(3, 4, -1000)])}
+        goal_dict = {(0, 0):color.ColorString([color.T(-1000, 1, 2),
+                                               color.f(-1000, 3, 4)])}
 
         self.assertEqual(col_dict, goal_dict)
 
@@ -221,8 +221,8 @@
         col_dict = my_col_basis.colorize(myamplitude['diagrams'][1],
                                      self.mymodel)
 
-        goal_dict = {(0, 0):color.ColorString([color.T(3, -1000, 1),
-                                               color.T(4, 2, -1000)])}
+        goal_dict = {(0, 0):color.ColorString([color.T(3, 1, -1000),
+                                               color.T(4, -1000, 2)])}
 
         self.assertEqual(col_dict, goal_dict)
 
@@ -230,8 +230,8 @@
         col_dict = my_col_basis.colorize(myamplitude['diagrams'][2],
                                      self.mymodel)
 
-        goal_dict = {(0, 0):color.ColorString([color.T(4, -1000, 1),
-                                               color.T(3, 2, -1000)])}
+        goal_dict = {(0, 0):color.ColorString([color.T(4, 1, -1000),
+                                               color.T(3,-1000, 2)])}
 
         self.assertEqual(col_dict, goal_dict)
 
@@ -262,9 +262,8 @@
         # First diagram with two 3-gluon vertices
         col_dict = my_col_basis.colorize(myamplitude['diagrams'][0],
                                      self.mymodel)
-
-        goal_dict = {(0, 0, 0):color.ColorString([color.T(-1000, 1, 2),
-                                               color.f(3, 4, -1001),
+        goal_dict = {(0, 0, 0):color.ColorString([color.T(-1000, 2, 1),
+                                               color.f(-1001, 3, 4),
                                                color.f(-1000, -1001, 5)])}
 
         self.assertEqual(col_dict, goal_dict)
@@ -273,15 +272,15 @@
         col_dict = my_col_basis.colorize(myamplitude['diagrams'][3],
                                      self.mymodel)
 
-        goal_dict = {(0, 0):color.ColorString([color.T(-1000, 1, 2),
-                                               color.f(-1001, 3, 5),
-                                               color.f(-1001, 4, -1000)]),
-                     (0, 1):color.ColorString([color.T(-1000, 1, 2),
-                                               color.f(-1002, 3, -1000),
-                                               color.f(-1002, 4, 5)]),
-                     (0, 2):color.ColorString([color.T(-1000, 1, 2),
-                                               color.f(-1003, 3, 4),
-                                               color.f(-1003, 5, -1000)])}
+        goal_dict = {(0, 0):color.ColorString([color.T(-1000, 2, 1),
+                                               color.f(-1001, -1000, 4),
+                                               color.f(-1001, 3, 5)]),
+                     (0, 1):color.ColorString([color.T(-1000, 2, 1),
+                                               color.f(-1002, -1000, 5),
+                                               color.f(-1002, 3, 4)]),
+                     (0, 2):color.ColorString([color.T(-1000, 2, 1),
+                                               color.f(-1003, -1000, 3),
+                                               color.f(-1003, 4, 5)])}
 
         self.assertEqual(col_dict, goal_dict)
 
@@ -316,12 +315,12 @@
         # Test the color flow decomposition
         self.assertEqual(new_col_basis.color_flow_decomposition(
                                         {1:3, 2:-3, 3:1, 4:8, 5:8, 6:8}, 2),
-        [{1: [504, 0], 2: [0, 501], 3: [0, 0], 4: [502, 501], 5: [503, 502], 6: [504, 503]},
-         {1: [503, 0], 2: [0, 501], 3: [0, 0], 4: [502, 501], 5: [503, 504], 6: [504, 502]},