Merge lp:~madteam/mg5amcnlo/extended_drawing into lp:~madteam/mg5amcnlo/trunk

[Olivier Mattelaer]

new way for drawing gravitino, chargino, neutralino,...

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2011-01-26 13:23:54 +0000
+++ madgraph/core/base_objects.py	2011-02-25 13:52:35 +0000
@@ -263,7 +263,7 @@
             if not isinstance(value, str):
                 raise self.PhysicsObjectError, \
                     "Line type %s is not a string" % repr(value)
-            if value not in ['dashed', 'straight', 'wavy', 'curly', 'double']:
+            if value not in ['dashed', 'straight', 'wavy', 'curly', 'double','swavy','scurly']:
                 raise self.PhysicsObjectError, \
                    "Line type %s is unknown" % value
 

=== modified file 'madgraph/core/drawing.py'
--- madgraph/core/drawing.py	2010-12-01 09:33:43 +0000
+++ madgraph/core/drawing.py	2011-02-25 13:52:35 +0000
@@ -1809,8 +1809,11 @@
         # Find the type line of the particle [straight, wavy, ...]
         line_type = line.get_info('line')
         # Call the routine associate to this type [self.draw_straight, ...]
-        getattr(self, 'draw_' + line_type)(line)
-
+        if hasattr(self, 'draw_' + line_type):
+            getattr(self, 'draw_' + line_type)(line)
+        else:
+            self.draw_straight(line)
+            
         # Finalize the line representation with adding the name of the particle
         name = line.get_name()
         self.associate_name(line, name)

=== modified file 'madgraph/iolibs/drawing_eps.py'
--- madgraph/iolibs/drawing_eps.py	2010-12-09 15:12:32 +0000
+++ madgraph/iolibs/drawing_eps.py	2011-02-25 13:52:35 +0000
@@ -40,7 +40,7 @@
 from __future__ import division
 
 import os
-
+import math
 import madgraph.core.drawing as draw
 import madgraph.core.base_objects as base_objects
 
@@ -166,15 +166,15 @@
                          line.end.pos_x, line.end.pos_y, 'Fhiggs')
 
 
-    def draw_wavy(self, line):
+    def draw_wavy(self, line, opt=0, type='d'):
         """ADD the EPS code for this photon line."""
 
         #add the code in the correct format
         self.text += self.line_format(line.start.pos_x, line.start.pos_y,
-                         line.end.pos_x, line.end.pos_y, '0 Fphotond')
-
-
-    def draw_curly(self, line):
+                         line.end.pos_x, line.end.pos_y, '%d Fphoton%s' % (opt,type))
+
+
+    def draw_curly(self, line, type=''):
         """ADD the EPS code for this gluon line."""
 
         # Due to the asymmetry in the way to draw the gluon (everything is draw
@@ -185,13 +185,45 @@
                                 line.start.pos_y > line.end.pos_y):
             self.text += self.line_format(line.start.pos_x,
                         line.start.pos_y, line.end.pos_x,
-                        line.end.pos_y, '0 Fgluon')
+                        line.end.pos_y, '0 Fgluon%s' % type)
         else:
             self.text += self.line_format(line.end.pos_x,
                         line.end.pos_y, line.start.pos_x,
-                        line.start.pos_y, '0 Fgluon')
-
-
+                        line.start.pos_y, '0 Fgluon%s' % type)
+    
+    def draw_scurly(self, line):
+        """ADD the EPS code for this gluino line."""
+        self.draw_curly(line, type='r'
+                        )
+        self.draw_straight(line)
+        
+    def draw_swavy(self, line):
+        """ADD the EPS code for this neutralino line."""
+        self.draw_wavy(line, type='r')
+        self.draw_straight(line)  
+             
+    def draw_double(self, line, type='r'):
+        """ADD the EPS code for this neutralino line."""
+        
+        
+        length = math.sqrt((line.end.pos_y - line.start.pos_y)**2 + (line.end.pos_x - line.start.pos_x) **2)
+        c1 = (line.end.pos_x - line.start.pos_x)/length
+        c2 = (line.end.pos_y - line.start.pos_y)/length
+        
+        gap = 0.013
+        start2_x = line.start.pos_x + gap * c1  
+        start2_y = line.start.pos_y + gap * c2
+        stop1_x = line.end.pos_x - gap * c1
+        stop1_y = line.end.pos_y - gap * c2
+        
+        
+        self.text += self.line_format(line.start.pos_x, line.start.pos_y,
+                         stop1_x, stop1_y, '0 Fphoton%s' % (type))
+        #add the code in the correct format
+        self.text += self.line_format(start2_x, start2_y,
+                         line.end.pos_x, line.end.pos_y, '0 Fphoton%s' % (type))
+        
+        
     def put_diagram_number(self, number=0):
         """ADD the comment 'diagram [number]' just below the diagram."""
 

=== modified file 'madgraph/iolibs/template_files/drawing_eps_header.inc'
--- madgraph/iolibs/template_files/drawing_eps_header.inc	2010-08-06 09:18:24 +0000
+++ madgraph/iolibs/template_files/drawing_eps_header.inc	2011-02-25 13:52:35 +0000
@@ -30,7 +30,7 @@
 def /Fx2 exch def /Fy1 exch def /Fx1 exch def
 Fx2 Fx1 sub Fy2 Fy1 sub Fbasis /Fttype 1
 Ftype 2 mod 2 mul abs sub def Ftype 0 ge
-{/Fddist Fdist Fr div def /Fn Fddist round
+{/Fddist Fdist Fr div 2 div def /Fn Fddist round
 def Ftype 1 gt {/Fn Fn Fddist Fn sub Fsign
 add def} if} {/Fn Fdist Fr div 2 div round 2
 mul def} ifelse Fx1 Fy1 moveto 0 1 Fnopoints
@@ -70,18 +70,25 @@
 
 /Fphoton
 {{ Fx1 Fx2 Fx1 sub Fi mul Fnopoints div Fn
+div Fxt Fi 360 mul Fnopoints div Frmod sin
+mul Fttype mul 2 div add add Fy1 Fy2 Fy1 sub
+Fi mul Fnopoints div Fn div Fyt Fi 360 mul
+Fnopoints div Frmod sin mul Fttype mul 2 div
+add add } Fstraight } def
+
+/Fphotonr
+{{ Fx1 Fx2 Fx1 sub Fi mul Fnopoints div Fn
 div Fxt Fi 180 mul Fnopoints div Frmod sin
-mul Fttype mul 2 div add add Fy1 Fy2 Fy1 sub
+mul Fttype mul 1 div add add Fy1 Fy2 Fy1 sub
 Fi mul Fnopoints div Fn div Fyt Fi 180 mul
-Fnopoints div Frmod sin mul Fttype mul 2 div
+Fnopoints div Frmod sin mul Fttype mul 1 div
 add add } Fstraight } def
 
-
 /Fphotond
 {{ Fx1 Fx2 Fx1 sub Fi mul Fnopoints div Fn
-div Fxt Fi 180 mul Fnopoints div Frmod sin
+div Fxt Fi 360 mul Fnopoints div Frmod sin
 mul Fttype mul 2 div add add Fy1 Fy2 Fy1 sub
-Fi mul Fnopoints div Fn div Fyt Fi 180 mul
+Fi mul Fnopoints div Fn div Fyt Fi 360 mul
 Fnopoints div Frmod sin mul Fttype mul 2 div
 add add } Fstraight Fx1
 Fx2 add 2 div Fy1 Fy2 add 2 div Farrow} def
@@ -108,6 +115,17 @@
 180 mul Fnopoints div sin mul add add add }
 Fstraight } def
 
+/Fgluonr
+{2 sub { Fx1 Fx2 Fx1 sub Fi mul Fnopoints div
+Fn div Fxt 0 Fi 120 mul Fnopoints div cos sub
+mul Fttype mul Fxl Fi 120 mul Fnopoints div
+sin mul add add add Fy1 Fy2 Fy1 sub Fi mul
+Fnopoints div Fn div Fyt 0 Fi 120 mul
+Fnopoints div cos sub mul Fttype mul Fyl Fi
+120 mul Fnopoints div sin mul add add add }
+Fstraight } def
+
+
 /Fgluonl
 {exch 2 sub exch { Fxc Fth cos Frr mul Fxt 1
 Fi 180 mul Fnopoints div cos sub mul Fttype

=== modified file 'models/mssm/object_library.py'
--- models/mssm/object_library.py	2010-12-05 05:38:08 +0000
+++ models/mssm/object_library.py	2011-02-25 13:52:35 +0000
@@ -65,15 +65,15 @@
 class Particle(FRBaseClass):
     """A standard Particle"""
 
-    require_args=['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'line', 'charge']
+    require_args=['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'charge']
 
-    require_args_all = ['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'line', 'charge', 'propagating', 'goldstoneboson']
+    require_args_all = ['pdg_code', 'name', 'antiname', 'spin', 'color', 'mass', 'width', 'texname', 'antitexname', 'charge', 'line', 'propagating', 'goldstoneboson']
 
     def __init__(self, pdg_code, name, antiname, spin, color, mass, width, texname,
-                 antitexname, line, charge , propagating=True, goldstoneboson=False, **options):
+                 antitexname, charge , line=None, propagating=True, goldstoneboson=False, **options):
 
         args= (pdg_code, name, antiname, spin, color, mass, width, texname,
-                 antitexname, line, float(charge))
+                 antitexname, float(charge))
 
         FRBaseClass.__init__(self, *args,  **options)
 
@@ -84,6 +84,44 @@
         self.goldstoneboson= goldstoneboson
 
         self.selfconjugate = (name == antiname)
+        if not line:
+            self.line = self.find_line_type()
+        else:
+            self.line = line
+
+
+
+
+    def find_line_type(self):
+        """ find how we draw a line if not defined
+        valid output: dashed/straight/wavy/curly/double/swavy/scurly
+        """
+        
+        spin = self.spin
+        color = self.color
+        
+        #use default
+        if spin == 1:
+            return 'dashed'
+        elif spin == 2:
+            if not self.selfconjugate:
+                return 'straight'
+            elif color == 1:
+                return 'swavy'
+            else:
+                return 'scurly'
+        elif spin == 3:
+            if color == 1:
+                return 'wavy'
+            
+            else:
+                return 'curly'
+        elif spin == 5:
+            return 'double'
+        elif spin == -1:
+            return 'dotted'
+        else:
+            return 'dashed' # not supported yet
 
     def anti(self):
         if self.selfconjugate:
@@ -98,7 +136,7 @@
             newcolor = -self.color
                 
         return Particle(-self.pdg_code, self.antiname, self.name, self.spin, newcolor, self.mass, self.width,
-                        self.antitexname, self.texname, self.line, -self.charge, self.propagating, self.goldstoneboson, **outdic)
+                        self.antitexname, self.texname, -self.charge, self.line, self.propagating, self.goldstoneboson, **outdic)
 
 
 

=== modified file 'models/mssm/particles.py'
--- models/mssm/particles.py	2010-12-20 23:00:11 +0000
+++ models/mssm/particles.py	2011-02-25 13:52:35 +0000
@@ -15,7 +15,6 @@
               width = 'ZERO',
               texname = 've',
               antitexname = 've',
-              line = 'straight',
               charge = 0,
               GhostNumber = 0)
 
@@ -30,8 +29,7 @@
               width = 'ZERO',
               texname = 'vm',
               antitexname = 'vm',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 vm__tilde__ = vm.anti()
@@ -45,8 +43,7 @@
               width = 'ZERO',
               texname = 'vt',
               antitexname = 'vt',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 vt__tilde__ = vt.anti()
@@ -60,8 +57,7 @@
                       width = 'ZERO',
                       texname = 'e-',
                       antitexname = 'e-',
-                      line = 'straight',
-                      charge = -1,
+             charge = -1,
                       GhostNumber = 0)
 
 e__plus__ = e__minus__.anti()
@@ -75,8 +71,7 @@
                        width = 'ZERO',
                        texname = 'mu-',
                        antitexname = 'mu-',
-                       line = 'straight',
-                       charge = -1,
+             charge = -1,
                        GhostNumber = 0)
 
 mu__plus__ = mu__minus__.anti()
@@ -90,8 +85,7 @@
                         width = 'ZERO',
                         texname = 'tau-',
                         antitexname = 'tau-',
-                        line = 'straight',
-                        charge = -1,
+             charge = -1,
                         GhostNumber = 0)
 
 tau__plus__ = tau__minus__.anti()
@@ -105,7 +99,6 @@
              width = 'ZERO',
              texname = 'u',
              antitexname = 'u',
-             line = 'straight',
              charge = 2/3,
              GhostNumber = 0)
 
@@ -120,7 +113,6 @@
              width = 'ZERO',
              texname = 'c',
              antitexname = 'c',
-             line = 'straight',
              charge = 2/3,
              GhostNumber = 0)
 
@@ -135,7 +127,6 @@
              width = 'WT',
              texname = 't',
              antitexname = 't',
-             line = 'straight',
              charge = 2/3,
              GhostNumber = 0)
 
@@ -150,7 +141,6 @@
              width = 'ZERO',
              texname = 'd',
              antitexname = 'd',
-             line = 'straight',
              charge = -1/3,
              GhostNumber = 0)
 
@@ -165,7 +155,6 @@
              width = 'ZERO',
              texname = 's',
              antitexname = 's',
-             line = 'straight',
              charge = -1/3,
              GhostNumber = 0)
 
@@ -180,7 +169,6 @@
              width = 'ZERO',
              texname = 'b',
              antitexname = 'b',
-             line = 'straight',
              charge = -1/3,
              GhostNumber = 0)
 
@@ -195,8 +183,7 @@
               width = 'Wneu1',
               texname = 'n1',
               antitexname = 'n1',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 n2 = Particle(pdg_code = 1000023,
@@ -208,8 +195,7 @@
               width = 'Wneu2',
               texname = 'n2',
               antitexname = 'n2',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 n3 = Particle(pdg_code = 1000025,
@@ -221,8 +207,7 @@
               width = 'Wneu3',
               texname = 'n3',
               antitexname = 'n3',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 n4 = Particle(pdg_code = 1000035,
@@ -234,8 +219,7 @@
               width = 'Wneu4',
               texname = 'n4',
               antitexname = 'n4',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 x1__plus__ = Particle(pdg_code = 1000024,
@@ -247,8 +231,7 @@
                       width = 'Wch1',
                       texname = 'x1+',
                       antitexname = 'x1+',
-                      line = 'straight',
-                      charge = 1,
+             charge = 1,
                       GhostNumber = 0)
 
 x1__minus__ = x1__plus__.anti()
@@ -262,8 +245,7 @@
                       width = 'Wch2',
                       texname = 'x2+',
                       antitexname = 'x2+',
-                      line = 'straight',
-                      charge = 1,
+             charge = 1,
                       GhostNumber = 0)
 
 x2__minus__ = x2__plus__.anti()
@@ -277,8 +259,7 @@
               width = 'Wglu',
               texname = 'go',
               antitexname = 'go',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 sv1 = Particle(pdg_code = 1000012,
@@ -290,8 +271,7 @@
                width = 'Wsn1',
                texname = 'sv1',
                antitexname = 'sv1',
-               line = 'dashed',
-               charge = 0,
+             charge = 0,
                GhostNumber = 0)
 
 sv1__tilde__ = sv1.anti()
@@ -305,8 +285,7 @@
                width = 'Wsn2',
                texname = 'sv2',
                antitexname = 'sv2',
-               line = 'dashed',
-               charge = 0,
+             charge = 0,
                GhostNumber = 0)
 
 sv2__tilde__ = sv2.anti()
@@ -320,8 +299,7 @@
                width = 'Wsn3',
                texname = 'sv3',
                antitexname = 'sv3',
-               line = 'dashed',
-               charge = 0,
+             charge = 0,
                GhostNumber = 0)
 
 sv3__tilde__ = sv3.anti()
@@ -335,8 +313,7 @@
                         width = 'Wsl1',
                         texname = 'sl1-',
                         antitexname = 'sl1-',
-                        line = 'dashed',
-                        charge = -1,
+             charge = -1,
                         GhostNumber = 0)
 
 sl1__plus__ = sl1__minus__.anti()
@@ -350,8 +327,7 @@
                         width = 'Wsl2',
                         texname = 'sl2-',
                         antitexname = 'sl2-',
-                        line = 'dashed',
-                        charge = -1,
+             charge = -1,
                         GhostNumber = 0)
 
 sl2__plus__ = sl2__minus__.anti()
@@ -365,8 +341,7 @@
                         width = 'Wsl3',
                         texname = 'sl3-',
                         antitexname = 'sl3-',
-                        line = 'dashed',
-                        charge = -1,
+             charge = -1,
                         GhostNumber = 0)
 
 sl3__plus__ = sl3__minus__.anti()
@@ -380,8 +355,7 @@
                         width = 'Wsl4',
                         texname = 'sl4-',
                         antitexname = 'sl4-',
-                        line = 'dashed',
-                        charge = -1,
+             charge = -1,
                         GhostNumber = 0)
 
 sl4__plus__ = sl4__minus__.anti()
@@ -395,8 +369,7 @@
                         width = 'Wsl5',
                         texname = 'sl5-',
                         antitexname = 'sl5-',
-                        line = 'dashed',
-                        charge = -1,
+             charge = -1,
                         GhostNumber = 0)
 
 sl5__plus__ = sl5__minus__.anti()
@@ -410,8 +383,7 @@
                         width = 'Wsl6',
                         texname = 'sl6-',
                         antitexname = 'sl6-',
-                        line = 'dashed',
-                        charge = -1,
+             charge = -1,
                         GhostNumber = 0)
 
 sl6__plus__ = sl6__minus__.anti()
@@ -425,8 +397,7 @@
                width = 'Wusq1',
                texname = 'su1',
                antitexname = 'su1',
-               line = 'dashed',
-               charge = 2/3,
+             charge = 2/3,
                GhostNumber = 0)
 
 su1__tilde__ = su1.anti()
@@ -440,8 +411,7 @@
                width = 'Wusq2',
                texname = 'su2',
                antitexname = 'su2',
-               line = 'dashed',
-               charge = 2/3,
+             charge = 2/3,
                GhostNumber = 0)
 
 su2__tilde__ = su2.anti()
@@ -455,8 +425,7 @@
                width = 'Wusq3',
                texname = 'su3',
                antitexname = 'su3',
-               line = 'dashed',
-               charge = 2/3,
+             charge = 2/3,
                GhostNumber = 0)
 
 su3__tilde__ = su3.anti()
@@ -470,8 +439,7 @@
                width = 'Wusq4',
                texname = 'su4',
                antitexname = 'su4',
-               line = 'dashed',
-               charge = 2/3,
+             charge = 2/3,
                GhostNumber = 0)
 
 su4__tilde__ = su4.anti()
@@ -485,8 +453,7 @@
                width = 'Wusq5',
                texname = 'su5',
                antitexname = 'su5',
-               line = 'dashed',
-               charge = 2/3,
+             charge = 2/3,
                GhostNumber = 0)
 
 su5__tilde__ = su5.anti()
@@ -500,8 +467,7 @@
                width = 'Wusq6',
                texname = 'su6',
                antitexname = 'su6',
-               line = 'dashed',
-               charge = 2/3,
+             charge = 2/3,
                GhostNumber = 0)
 
 su6__tilde__ = su6.anti()
@@ -515,8 +481,7 @@
                width = 'Wdsq1',
                texname = 'sd1',
                antitexname = 'sd1',
-               line = 'dashed',
-               charge = -1/3,
+             charge = -1/3,
                GhostNumber = 0)
 
 sd1__tilde__ = sd1.anti()
@@ -530,8 +495,7 @@
                width = 'Wdsq2',
                texname = 'sd2',
                antitexname = 'sd2',
-               line = 'dashed',
-               charge = -1/3,
+             charge = -1/3,
                GhostNumber = 0)
 
 sd2__tilde__ = sd2.anti()
@@ -545,8 +509,7 @@
                width = 'Wdsq3',
                texname = 'sd3',
                antitexname = 'sd3',
-               line = 'dashed',
-               charge = -1/3,
+             charge = -1/3,
                GhostNumber = 0)
 
 sd3__tilde__ = sd3.anti()
@@ -560,8 +523,7 @@
                width = 'Wdsq4',
                texname = 'sd4',
                antitexname = 'sd4',
-               line = 'dashed',
-               charge = -1/3,
+             charge = -1/3,
                GhostNumber = 0)
 
 sd4__tilde__ = sd4.anti()
@@ -575,8 +537,7 @@
                width = 'Wdsq5',
                texname = 'sd5',
                antitexname = 'sd5',
-               line = 'dashed',
-               charge = -1/3,
+             charge = -1/3,
                GhostNumber = 0)
 
 sd5__tilde__ = sd5.anti()
@@ -590,8 +551,7 @@
                width = 'Wdsq6',
                texname = 'sd6',
                antitexname = 'sd6',
-               line = 'dashed',
-               charge = -1/3,
+             charge = -1/3,
                GhostNumber = 0)
 
 sd6__tilde__ = sd6.anti()
@@ -605,8 +565,7 @@
               width = 'Wh01',
               texname = 'h1',
               antitexname = 'h1',
-              line = 'dashed',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 h2 = Particle(pdg_code = 35,
@@ -618,8 +577,7 @@
               width = 'Wh02',
               texname = 'h2',
               antitexname = 'h2',
-              line = 'dashed',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 h3 = Particle(pdg_code = 36,
@@ -631,8 +589,7 @@
               width = 'WA0',
               texname = 'h3',
               antitexname = 'h3',
-              line = 'dashed',
-              charge = 0,
+             charge = 0,
               GhostNumber = 0)
 
 H__plus__ = Particle(pdg_code = 37,
@@ -644,8 +601,7 @@
                      width = 'WH',
                      texname = 'H+',
                      antitexname = 'H+',
-                     line = 'dashed',
-                     charge = 1,
+             charge = 1,
                      GhostNumber = 0)
 
 H__minus__ = H__plus__.anti()
@@ -659,8 +615,7 @@
                 width = 'Wphi',
                 texname = 'phi0',
                 antitexname = 'phi0',
-                line = 'dashed',
-                GoldstoneBoson = True,
+             GoldstoneBoson = True,
                 charge = 0,
                 GhostNumber = 0)
 
@@ -673,8 +628,7 @@
                        width = 'Wphi2',
                        texname = '\\phi^+',
                        antitexname = '\\phi^+',
-                       line = 'dashed',
-                       GoldstoneBoson = True,
+             GoldstoneBoson = True,
                        charge = 1,
                        GhostNumber = 0)
 
@@ -689,7 +643,6 @@
              width = 'ZERO',
              texname = 'a',
              antitexname = 'a',
-             line = 'wavy',
              charge = 0,
              GhostNumber = 0)
 
@@ -702,7 +655,6 @@
              width = 'WZ',
              texname = 'Z',
              antitexname = 'Z',
-             line = 'wavy',
              charge = 0,
              GhostNumber = 0)
 
@@ -715,8 +667,7 @@
                      width = 'WW',
                      texname = 'W+',
                      antitexname = 'W+',
-                     line = 'wavy',
-                     charge = 1,
+             charge = 1,
                      GhostNumber = 0)
 
 W__minus__ = W__plus__.anti()
@@ -730,7 +681,6 @@
              width = 'ZERO',
              texname = 'g',
              antitexname = 'g',
-             line = 'curly',
              charge = 0,
              GhostNumber = 0)
 
@@ -743,8 +693,7 @@
                width = 'ZERO',
                texname = 'ghG',
                antitexname = 'ghG',
-               line = 'dotted',
-               charge = 0,
+             charge = 0,
                GhostNumber = 1)
 
 ghG__tilde__ = ghG.anti()
@@ -758,8 +707,7 @@
                width = 'WghA',
                texname = 'ghA',
                antitexname = 'ghA',
-               line = 'dotted',
-               charge = 0,
+             charge = 0,
                GhostNumber = 1)
 
 ghA__tilde__ = ghA.anti()
@@ -773,8 +721,7 @@
                width = 'WghZ',
                texname = 'ghZ',
                antitexname = 'ghZ',
-               line = 'dotted',
-               charge = 0,
+             charge = 0,
                GhostNumber = 1)
 
 ghZ__tilde__ = ghZ.anti()
@@ -788,8 +735,7 @@
                 width = 'WghWp',
                 texname = 'ghWp',
                 antitexname = 'ghWp',
-                line = 'dotted',
-                charge = 1,
+             charge = 1,
                 GhostNumber = 1)
 
 ghWp__tilde__ = ghWp.anti()
@@ -803,8 +749,7 @@
                 width = 'WghWm',
                 texname = 'ghWm',
                 antitexname = 'ghWm',
-                line = 'dotted',
-                charge = -1,
+             charge = -1,
                 GhostNumber = 1)
 
 ghWm__tilde__ = ghWm.anti()

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

=== removed file 'models/sm/object_library.py'
--- models/sm/object_library.py	2010-09-01 04:20:15 +0000
+++ models/sm/object_library.py	1970-01-01 00:00:00 +0000
@@ -1,191 +0,0 @@
-##
-##
-## 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 __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, **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)
-
-
-        

=== modified file 'models/sm/particles.py'
--- models/sm/particles.py	2010-09-01 04:20:15 +0000
+++ models/sm/particles.py	2011-02-25 13:52:35 +0000
@@ -15,8 +15,7 @@
               width = 'ZERO',
               texname = 've',
               antitexname = 've',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               LeptonNumber = 1,
               GhostNumber = 0)
 
@@ -31,8 +30,7 @@
               width = 'ZERO',
               texname = 'vm',
               antitexname = 'vm',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               LeptonNumber = 1,
               GhostNumber = 0)
 
@@ -47,8 +45,7 @@
               width = 'ZERO',
               texname = 'vt',
               antitexname = 'vt',
-              line = 'straight',
-              charge = 0,
+             charge = 0,
               LeptonNumber = 1,
               GhostNumber = 0)
 
@@ -63,8 +60,7 @@
                       width = 'ZERO',
                       texname = 'e-',
                       antitexname = 'e-',
-                      line = 'straight',
-                      charge = -1,
+             charge = -1,
                       LeptonNumber = 1,
                       GhostNumber = 0)
 
@@ -79,8 +75,7 @@
                       width = 'ZERO',
                       texname = 'm-',
                       antitexname = 'm-',
-                      line = 'straight',
-                      charge = -1,
+             charge = -1,
                       LeptonNumber = 1,
                       GhostNumber = 0)
 
@@ -95,8 +90,7 @@
                        width = 'ZERO',
                        texname = 'tt-',
                        antitexname = 'tt-',
-                       line = 'straight',
-                       charge = -1,
+             charge = -1,
                        LeptonNumber = 1,
                        GhostNumber = 0)
 
@@ -111,7 +105,6 @@
              width = 'ZERO',
              texname = 'u',
              antitexname = 'u',
-             line = 'straight',
              charge = 2/3,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -127,7 +120,6 @@
              width = 'ZERO',
              texname = 'c',
              antitexname = 'c',
-             line = 'straight',
              charge = 2/3,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -143,7 +135,6 @@
              width = 'WT',
              texname = 't',
              antitexname = 't',
-             line = 'straight',
              charge = 2/3,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -159,7 +150,6 @@
              width = 'ZERO',
              texname = 'd',
              antitexname = 'd',
-             line = 'straight',
              charge = -1/3,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -175,7 +165,6 @@
              width = 'ZERO',
              texname = 's',
              antitexname = 's',
-             line = 'straight',
              charge = -1/3,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -191,7 +180,6 @@
              width = 'ZERO',
              texname = 'b',
              antitexname = 'b',
-             line = 'straight',
              charge = -1/3,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -207,8 +195,7 @@
                width = 'WghA',
                texname = 'ghA',
                antitexname = 'ghA',
-               line = 'dotted',
-               charge = 0,
+             charge = 0,
                LeptonNumber = 0,
                GhostNumber = 1)
 
@@ -223,8 +210,7 @@
                width = 'WghZ',
                texname = 'ghZ',
                antitexname = 'ghZ',
-               line = 'dotted',
-               charge = 0,
+             charge = 0,
                LeptonNumber = 0,
                GhostNumber = 1)
 
@@ -239,8 +225,7 @@
                 width = 'WghWp',
                 texname = 'ghWp',
                 antitexname = 'ghWp',
-                line = 'dotted',
-                charge = 1,
+             charge = 1,
                 LeptonNumber = 0,
                 GhostNumber = 1)
 
@@ -255,8 +240,7 @@
                 width = 'WghWm',
                 texname = 'ghWm',
                 antitexname = 'ghWm',
-                line = 'dotted',
-                charge = -1,
+             charge = -1,
                 LeptonNumber = 0,
                 GhostNumber = 1)
 
@@ -271,8 +255,7 @@
                width = 'WghG',
                texname = 'ghG',
                antitexname = 'ghG',
-               line = 'dotted',
-               charge = 0,
+             charge = 0,
                LeptonNumber = 0,
                GhostNumber = 1)
 
@@ -287,7 +270,6 @@
              width = 'ZERO',
              texname = 'A',
              antitexname = 'A',
-             line = 'wavy',
              charge = 0,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -301,7 +283,6 @@
              width = 'WZ',
              texname = 'Z',
              antitexname = 'Z',
-             line = 'wavy',
              charge = 0,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -315,8 +296,7 @@
                      width = 'WW',
                      texname = 'W+',
                      antitexname = 'W+',
-                     line = 'wavy',
-                     charge = 1,
+             charge = 1,
                      LeptonNumber = 0,
                      GhostNumber = 0)
 
@@ -331,7 +311,6 @@
              width = 'ZERO',
              texname = 'G',
              antitexname = 'G',
-             line = 'curly',
              charge = 0,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -345,7 +324,6 @@
              width = 'WH',
              texname = '\\phi',
              antitexname = '\\phi',
-             line = 'dashed',
              charge = 0,
              LeptonNumber = 0,
              GhostNumber = 0)
@@ -359,8 +337,7 @@
                 width = 'Wphi',
                 texname = 'phi0',
                 antitexname = 'phi0',
-                line = 'dashed',
-                GoldstoneBoson = True,
+             GoldstoneBoson = True,
                 charge = 0,
                 LeptonNumber = 0,
                 GhostNumber = 0)
@@ -374,8 +351,7 @@
                        width = 'Wphi2',
                        texname = '\\phi^+',
                        antitexname = '\\phi^+',
-                       line = 'dashed',
-                       GoldstoneBoson = True,
+             GoldstoneBoson = True,
                        charge = 1,
                        LeptonNumber = 0,
                        GhostNumber = 0)