Merge lp:~olivier-mattelaer/mg5amcnlo/new_drawing_option into lp:~madteam/mg5amcnlo/trunk

[Olivier Mattelaer]

[Olivier Mattelaer (olivier-mattelaer)]

This contains two more options for the drawing class

1) introduces a maximal size for external particles (which will then finish inside the graph)
2) possibility to control angles for external particles by asking a minimal x-distance for external particles. this limit didn't act on particles on x=1

This modification introduces a new class to deal properly with Drawing options.

[Johan Alwall (johan-alwall)]

Very nice, this does allow a considerable tuning, with mostly really great results. I have a couple of comments/questions:

* What exactly does "arbitrary unit" mean in the DrawOption doc line and cmd_interface help? Isn't this in units of levels? Better to just leave out "(arbitrary unit)", since it is not actually arbitrary in the program.

* It would also be (even) clearer if you use [False] (in the doc line) for the defaults which are False, rather than 0.

* I do the following in the cmd_interface:
import v4 ../../MG_ME/Models/sm_FR
generate u~ u~ > Z u~ u~ g
draw . external=1.5

With these options, I would expect no external lines to be allowed to be drawn on a horizontal edge closer than 1.5 levels from the vertex, but when I look at e.g. diagram 1 (pure t-channel), it has the outermost final state particles ending on the horizontal edges of the box, which doesn't look very nice. Is this a bug, or do I just misunderstand the meaning of the options?

Also fix the failing test ;-)

Thanks a lot,
Johan

review: Needs Fixing

[Michel Herquet (herquet)]

Hi Olivier, I didn't review it very carefully but I like the result! While merging, please try to stick as much as possible to existing files in trunk (i.e., only do minimal modifications on those, not the contrary). Otherwise, as Johan said, please fix the tests... Great job!

review: Approve

[Olivier Mattelaer (olivier-mattelaer)]

Thanks both of you for this review.

I'll fix all the points pointed by Johan. Thanks so much for those.

Michel, Johan, do I keep the current default value, or do you want max_size to be put to a value around 2?

Thanks a lot for the review,

Olivier

[lp:~olivier-mattelaer/mg5amcnlo/new_drawing_option]

30. By Olivier Mattelaer on 2010-01-26

-> correct the failing test
-> correct external for non integer value when particle finish at (x=1,y=1) below external
-> correct the doc line as suggested (did I understand you correctly Johan?

[Johan Alwall (johan-alwall)]

Hi Olivier,

The tests for this version is suddenly extremely slow (84 s on my
computer). Did you add some very large test?

Johan

On Tue, Jan 26, 2010 at 11:42 PM, Olivier Mattelaer
<email address hidden> wrote:
> Thanks both of you for this review.
>
> I'll fix all the points pointed by Johan. Thanks so much for those.
>
> Michel, Johan, do I keep the current default value, or do you want max_size to be put to a value around 2?
>
> Thanks a lot for the review,
>
> Olivier
>
>
> --
> https://code.launchpad.net/~olivier-mattelaer/madgraph5/new_drawing_option/+merge/18065
> You are reviewing the proposed merge of lp:~olivier-mattelaer/madgraph5/new_drawing_option into lp:madgraph5.
>

[Johan Alwall (johan-alwall)]

It seems that the slow tests are:
Test that the DrawingEPS returns valid result
test_schedular (tests.unit_tests.iolibs.test_drawing.TestDrawingS_EPS)
Would it be possible to reduce these to take an acceptable amount of time (max. 1 s per test)?

More comments:
The diagrams now look considerably better, really really nice. Just one option which doesn't quite work:
When I run
import v4 ../../MG_ME/Models/sm_FR
generate u~ u~ > e+ e- u~ u~ g
draw . external=1.5
Then in diagram 9 (e.g.), the lowermost external particle ends as expected, but the uppermost ends 2.5 levels from its creation vertex.

Please also add max_size to the tab completion of draw.

Thanks a lot,
Johan

> Hi Olivier,
>
> The tests for this version is suddenly extremely slow (84 s on my
> computer). Did you add some very large test?
>
> Johan
>
> On Tue, Jan 26, 2010 at 11:42 PM, Olivier Mattelaer
> <email address hidden> wrote:
> > Thanks both of you for this review.
> >
> > I'll fix all the points pointed by Johan. Thanks so much for those.
> >
> > Michel, Johan, do I keep the current default value, or do you want max_size
> to be put to a value around 2?
> >
> > Thanks a lot for the review,
> >
> > Olivier
> >
> >
> > --
> > https://code.launchpad.net/~olivier-
> mattelaer/madgraph5/new_drawing_option/+merge/18065
> > You are reviewing the proposed merge of lp:~olivier-
> mattelaer/madgraph5/new_drawing_option into lp:madgraph5.
> >

review: Needs Fixing

[lp:~olivier-mattelaer/mg5amcnlo/new_drawing_option]

31. By Olivier Mattelaer on 2010-01-27

debug problem for y=1
add max_size in auto_completion

32. By Olivier Mattelaer on 2010-01-27

optimize the test to have one faster and almost as complete

33. By Olivier Mattelaer on 2010-01-27

faster ( ~1s) and more secure test suite.

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

Thanks to have found this bug. It's solve, the max_size is added.

I also resolve the time-problem for the test.

I think that it's still not perfect. especially your graph line the two upper line are going too close one of the other. I have an idea to solve this (make the require distance growing from one place external particles to the next one. What do you think?

Thanks again for your advice,

Olivier

[Johan Alwall (johan-alwall)]

Hi Olivier,

Now things look really nice! I actually especially like max_size=1.5, external=0. Only one, very minor detail (in case you are not too tired yet): The particle labels tend to overlap, e.g. (with the same process as before) diagram 9, the e+e- are written on top of each other. I think this can be fixed just by changing the distance from the line to the text, or alternatively by always writing the label below-right of the line. If you have time, you can play around a bit with this. I have to say, the diagrams now are already quite at a par with those from MG4.

Just a question about the non-propagating contraction: Now, you're not checking for identical diagrams and combining those, right? At least I don't get them combined.

Thanks a lot,
Johan

[lp:~olivier-mattelaer/mg5amcnlo/new_drawing_option]

34. By Olivier Mattelaer on 2010-01-27

add a new (semi-hidden) option. authorizing to change external during the processing of the diagram

change the routine for the positioning of the name associated to each line.

[Olivier Mattelaer (olivier-mattelaer)]

> Hi Olivier,
>
> Now things look really nice! I actually especially like max_size=1.5,
> external=0.

Ok I've put this in default.

> Only one, very minor detail (in case you are not too tired yet):
> The particle labels tend to overlap, e.g. (with the same process as before)
> diagram 9, the e+e- are written on top of each other. I think this can be
> fixed just by changing the distance from the line to the text, or
> alternatively by always writing the label below-right of the line. If you have
> time, you can play around a bit with this. I have to say, the diagrams now are
> already quite at a par with those from MG4.

I have choose to put the name above. The name positioning is quite ok now but it's not perfect for some line. (some tag are not correctly center on the line) Do you think it's pointless enough, or should I correct this?

>
> Just a question about the non-propagating contraction: Now, you're not
> checking for identical diagrams and combining those, right? At least I don't
> get them combined.

No I don't check identical diagram (for the moment at least).

> Thanks a lot,
> Johan

I also add a new option add_gap (she is not on the help of drawing module for the moment depending if you will consider this helpfull or not) which increase external for the second-third... external particles put in the same border. This improve a bit diagram but not that much.

Thanks to you,

Olivier

[Johan Alwall (johan-alwall)]

Now everything looks fantastic. Thanks a lot for your work!

Johan

review: Approve

[lp:~olivier-mattelaer/mg5amcnlo/new_drawing_option]

35. By Olivier Mattelaer on 2010-01-29

include fonction to know if two diagram are identical or not.
Not use for the moment in the drawing scheme.

[Olivier Mattelaer (olivier-mattelaer)]

Thanks a lot for all your advice on this.

=== modified file '.pydevproject'
--- .pydevproject	2010-01-25 07:35:29 +0000
+++ .pydevproject	2010-01-29 06:42:18 +0000
@@ -5,6 +5,6 @@
 <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>/debug-drawing</path>
+<path>/newdrawing</path>
 </pydev_pathproperty>
 </pydev_project>

=== modified file 'madgraph/interface/cmd_interface.py'
--- madgraph/interface/cmd_interface.py	2010-01-22 08:10:11 +0000
+++ madgraph/interface/cmd_interface.py	2010-01-29 06:42:18 +0000
@@ -39,8 +39,10 @@
 import madgraph.core.diagram_generation as diagram_generation
 
 import madgraph.core.helas_objects as helas_objects
+import madgraph.iolibs.drawing as draw_lib
 import madgraph.iolibs.drawing_eps as draw
 
+
 #===============================================================================
 # MadGraphCmd
 #===============================================================================
@@ -318,8 +320,10 @@
 
         #option
         if len(self.split_arg(line[0:begidx])) >= 2:
-            return self.list_completion(text,
-                            ['external=', 'horizontal=', 'non_propagating='])
+            option=['external=', 'horizontal=', 'add_gap=','max_size=', \
+                                'contract_non_propagating=']
+            return self.list_completion(text, option)
+        
     # Display
     def do_display(self, line):
         """Display current internal status"""
@@ -665,19 +669,16 @@
             print "%s is not a valid directory for export file" % args[1]
 
         start = time.time()
-        opt = {"external": 0, "horizontal": 0}
+        option = draw_lib.DrawOption()
         if len(args) > 1:
             for data in args[1:]:
                 try:
                     key, value = data.split('=')
                 except:
-                    print 'invalid option %s. Please try again' % data
+                    print "invalid syntax: '%s'. Please try again" % data
                     self.help_draw()
                     return False
-                if value in ['False', '0', 0, False]:
-                    opt[key] = False
-                else:
-                    opt[key] = True
+                option.set(key,value)
 
         for amp in self.__curr_amps:
             filename = os.path.join(args[0], 'diagrams_' + \
@@ -689,7 +690,7 @@
 
             logging.info("Drawing " + \
                          amp.get('process').nice_string())
-            plot.draw(**opt)
+            plot.draw(opt=option)
             print "Wrote file " + filename
 
         stop = time.time()
@@ -736,15 +737,18 @@
         file will be FILEPATH/matrix_\"process_string\".f"""
 
     def help_draw(self):
-        print "syntax: draw FILEPATH [option=0|1]"
+        print "syntax: draw FILEPATH [option=value]"
         print "-- draw the diagrams in eps format"
         print "   Files will be FILEPATH/diagrams_\"process_string\".eps"
         print "   Example: draw plot_dir "
         print "   Possible option: "
-        print "        horizontal [0]: force S-channel to be horizontal"
+        print "        horizontal [False]: force S-channel to be horizontal"
         print "        external [0]: authorizes external particles to end"
-        print "             at top or bottom of diagram"
-        print "        non_propagating [1]:contracts non propagating lines"
+        print "             at top or bottom of diagram. If bigger than zero"
+        print "             this tune the length of those line."
+        print "        max_size [0]: this forbids external line bigger than "
+        print "             max_size."
+        print "        contract_non_propagating [True]:contracts non propagating lines"
         print "   Example: draw plot_dir external=1 horizontal=1"
 
     def help_shell(self):

=== modified file 'madgraph/iolibs/drawing.py'
--- madgraph/iolibs/drawing.py	2010-01-25 07:35:29 +0000
+++ madgraph/iolibs/drawing.py	2010-01-29 06:42:18 +0000
@@ -12,7 +12,6 @@
 # For more information, please visit: http://madgraph.phys.ucl.ac.be
 #
 ################################################################################
-
 """All the routines to choose the position to each vertex and the 
 direction for particles. All those class are not related to any output class.
 
@@ -43,7 +42,7 @@
 
 from __future__ import division
 
-#import math
+import math
 
 import madgraph.core.base_objects as base_objects
 
@@ -176,7 +175,14 @@
         else:
             # particle is self anti particle
             return self.model.get_particle(-1 * pid).get(name)
-
+        
+    def get_length(self):
+        """ return the length of the line """
+        
+        return math.sqrt((self.end.pos_x-self.start.pos_x)**2 +\
+                         (self.end.pos_y-self.start.pos_y)**2)
+        
+        
     def is_fermion(self):
         """Returns True if the particle is a fermion."""
 
@@ -554,6 +560,40 @@
         else:
             return False
 
+    def has_the_same_line_content(self,other):
+        """Check if the line associate to the two vertex are equivalent. 
+        This means that they have the same number of particles with the same pid
+        and that the external particles have the same number.
+        
+        This is a backup function, this is not use for the moment."""
+
+        # Check the number of line
+        if len(self.line)!=len(other.line):
+            return False
+
+        # Store the information of the pid content of the vertex other
+        other_line_pid = [line.get('pid') for line in other.line]
+        # Sort the information of the number content for external particle
+        other_line_number = [line.get('number') for line in other.line if \
+                                                            line.is_external()]
+        
+        # Now look at the self vertex and destroy the information store in the
+        #two above variable. If an error raise, this means that the content is 
+        #not the same. 
+        for s_line in self.line:
+            try:
+                other_line_pid.remove(s_line.get('pid'))
+            except ValueError:
+                return False
+            if s_line.is_external():
+                try:
+                    other_line_number.remove(s_line.get('number'))
+                except ValueError:
+                    return False
+        
+        # The lines have all their equivalent, so returns True 
+        return True
+
     def get_uid(self):
         """Provide a unique id for the vertex"""
 
@@ -610,52 +650,58 @@
     class FeynamDiagramError(Exception):
         """Class for internal error."""
 
-    def __init__(self, diagram, model, drawing_mode=1):
+    def __init__(self, diagram, model, opt=None):
         """Store the information concerning this diagram. This routines didn't
         perform any action at all.
         diagram: The diagram object to draw
         model: The model associate to the diagram
-        drawing_mode: If 0, the external lines are authorizes to end only 
-                   at the end of the diagram (in x=1 axis) -like v4 version-
-              If 1, the external lines can ends in lower and upper
-                   axis (y=0 and y=1)."""
+        opt: A DrawingOpt instance with all options for drawing the diagram."""
 
         # Check if input are what we are expecting 
         if isinstance(diagram, base_objects.Diagram):
             self.diagram = diagram
         else:
-            raise self.FeynamDiagramError('first arg should derivates' + \
+            raise self.FeynamDiagramError('first argument should derivates' + \
                                           ' from Diagram object')
 
         if isinstance(model, base_objects.Model):
             self.model = model
         else:
-            raise self.FeynamDiagramError('second arg should derivates' + \
+            raise self.FeynamDiagramError('second argument should derivates' + \
                                           ' from Model object')
-
-        self.drawing_mode = drawing_mode # See method's comment for details
-
+        if opt is None:
+            self.opt = DrawOption()
+        elif(isinstance(opt,DrawOption)):
+            self.opt = opt
+        else:
+             raise self.FeynamDiagramError('third argument should derivates' + \
+                                          ' from DrawOption object')
 
         # Initialize other value to void.
         self.vertexList = [] # List of vertex associate to the diagram 
         self.initial_vertex = [] # vertex associate to initial particles
         self.lineList = []  # List of line present in the diagram
+        self.max_level = 0
+        
+        #internal parameter
         self._treated_legs = [] # List of leg, in the same order as lineList
-        self.max_level = 0
+        self._ext_distance_up = self.opt.external
+        self._ext_distance_down = self.opt.external
+        
 
-    def main(self, contract=True):
+    def main(self):
         """This routine will compute all the vertex position and line 
-        orientation needed to draw the diagram.
+        orientation needed to draw the diagram."""
         
-        'contract' defines if we contract to one point the non propagating line.
-        """
         # Define all the vertex/line 
         # Define self.vertexList,self.lineList
-        self.load_diagram(contract=contract)
+        self.load_diagram(contract=self.opt.contract_non_propagating)
         # Define the level of each vertex
         self.define_level()
         # Define position for each vertex
         self.find_initial_vertex_position()
+        # Adjust some 'not beautifull' position
+        self.adjust_position()
         # Flip the particle orientation such that fermion-flow is correct
         self.solve_line_direction()
 
@@ -984,7 +1030,7 @@
             if  vertex.is_external() and  vertex.pos_y not in [0, 1]:
                 # Move external vertex from one level to avoid external 
                 #particles finishing inside the square. 
-                #vertex.def_level(level)
+                vertex.def_level(vertex.level + 1)
                 vertex_at_level.append(vertex)
                 continue
 
@@ -1061,8 +1107,7 @@
             self.find_vertex_position_at_level(vertex_at_level, level + 1)
 
 
-    def assign_pos(self, vertex_at_level, level, min=0, max=1, \
-                                                                     mode=''):
+    def assign_pos(self, vertex_at_level, level, min=0, max=1):
         """Assign the position to each vertex of vertex_at_level.
         
         The x-coordinate will the ratio of the current level with the maximum
@@ -1080,10 +1125,13 @@
         (resp. max) and the first vertex is also equal but if min=0 (resp.
         max=1) then this distance counts half.
         
-        if mode = 0, the external lines are authorizes to end only 
+        the option self.opt.external is used
+        if    equals 0, the external lines are authorizes to end only 
                    at the end of the diagram (in x=1 axis) so this will forbid
                    to put any vertex at y=0-1 (except if x=1)
-        if mode =1, no restriction occurs.
+        if bigger than 0, minimal distance in before putting a external line
+                  on the border of the diagram.
+        
         
         The computation of y is done in this way
         first compute the distance [dist] between two vertex and assign the point.
@@ -1099,35 +1147,47 @@
                'assigned level %s is bigger than max_level %s' % \
                (level, self.max_level)
 
-        # If mode not define use the one define at __init__ time. 
-        if mode == '':
-            mode = self.drawing_mode
+        
         # At final level we should authorize min=0 and max=1 position    
         if level == self.max_level:
-            mode = 1
+            ext_dist_up = 1
+            ext_dist_down = 1
+        else:
+            # else follow option
+            ext_dist_up = self._ext_distance_up
+            ext_dist_down = self._ext_distance_down 
         # Set default gap in dist unity
         begin_gap, end_gap = 1, 1
         # Check the special case when min is 0 -> border
         if min == 0:
-            if mode and vertex_at_level[0].is_external():
-                    # Assign position at the border    
-                    vertex_at_level[0].def_position(level / self.max_level, 0)
+            if ext_dist_down and vertex_at_level[0].is_external():
+                line = vertex_at_level[0].line[0]
+                if line.end.level - line.start.level >= ext_dist_down:
+                    # Assign position at the border and update option
+                    self.define_vertex_at_border(vertex_at_level[0],level, 0)    
                     # Remove the vertex to avoid that it will pass to next level
                     del vertex_at_level[0]
+                    # 
                     if not vertex_at_level:
                         return []
+                else:
+                    begin_gap = 0.5
             else:
                 begin_gap = 0.5
 
         # Check the special case when max is 1 -> border    
         if max == 1:
-            if mode and vertex_at_level[-1].is_external():
-                # Assign position at the border 
-                vertex_at_level[-1].def_position(level / self.max_level, 1)
-                # Remove the vertex to avoid that it will pass to next level
-                del vertex_at_level[-1]
-                if not vertex_at_level:
+            if ext_dist_up and vertex_at_level[-1].is_external():
+                line = vertex_at_level[-1].line[0]
+                if line.end.level - line.start.level >= ext_dist_up:
+                    # Assign position at the border 
+                    self.define_vertex_at_border(vertex_at_level[-1],level, 1)
+                    # Remove the vertex to avoid that it will pass to next level
+                    del vertex_at_level[-1]
+                    if not vertex_at_level:
                         return []
+                else:
+                    end_gap = 0.5
             else:
                 end_gap = 0.5
 
@@ -1141,6 +1201,33 @@
 
         return vertex_at_level
 
+    def define_vertex_at_border(self, vertex, level, pos_y):
+        """Define the position of the vertex considering the distance required
+        in the Drawing Options. Update the option if needed."""
+        
+        # find the minimal x distance and update this distance for the future
+        if pos_y == 1:
+            dist = self._ext_distance_up
+            self._ext_distance_up += self.opt.add_gap
+        else:
+            dist = self._ext_distance_down
+            self._ext_distance_down += self.opt.add_gap
+        
+        # Find the position and switch integer and not integer case
+        if dist % 1:
+            # Check that we have to move forward the line
+            if level < self.max_level: 
+                pos_x = (level - 1 + (dist % 1)) / self.max_level
+            elif (1-vertex.line[0].start.pos_x) * self.max_level > dist:
+                pos_x = (level - 1 + (dist % 1)) / self.max_level
+            else:
+                pos_x = 1
+        else:
+            pos_x = level / self.max_level
+
+        vertex.def_position(pos_x, pos_y)
+         
+
     def remove_t_channel(self):
         """Removes all T-channel in a diagram and convert those in S-channel.
         This occur for 1>X diagram where T-channel are wrongly define."""
@@ -1212,6 +1299,38 @@
                 return
 
 
+    def adjust_position(self):
+        """Modify the position of some particles in order to improve the final
+        diagram look. This routines use one option
+        1) max_size which forbids external particles to be longer than max_size.
+            This is in level unit. If a line is too long we contract it to 
+            max_size preserving the orientation.
+        2) external indicating the minimal x-gap for an external line. This 
+            constraints is already take into account in previous stage. But that
+            stage cann't do non integer gap. So this routines correct this."""
+        
+        finalsize = self.opt.max_size
+        
+        # Check if we need to do something
+        if not finalsize:
+            return 
+
+        # Select all external line
+        for line in self.lineList:
+            if line.is_external():
+                # Check the size of final particles to restrict to the max_size
+                #constraints.
+                if line.get('state') == 'initial' or not line.is_external():
+                    continue 
+                size = line.get_length() * self.max_level
+                if size > finalsize:
+                    ratio = finalsize / size
+                    new_x = line.start.pos_x + ratio * (line.end.pos_x - 
+                                                               line.start.pos_x) 
+                    new_y = line.start.pos_y + ratio * (line.end.pos_y - 
+                                                               line.start.pos_y)                         
+                    line.end.def_position(new_x, new_y)
+
     def _debug_load_diagram(self):
         """Return a string to check to conversion of format for the diagram. 
         
@@ -1299,6 +1418,44 @@
                     return True
         return False
 
+    def __eq__(self,other):
+        """Check if two diagrams are equivalent. (same structure-same particle)
+        
+        This function is not used for the moment. The initial purpose was the
+        avoid duplication of identical diagram in the output (these could happen
+        if we contract non propagating line). But the number of such comparaison
+        rise as the number of diagram square such that the total time needed for
+        this feature was consider as too (time-)expansive."""
+        
+        # Check basic globals (this is done to fastenize the check
+        if self.max_level != other.max_level:
+            return False
+        elif len(self.lineList) != len(other.lineList):
+            return False
+        
+        # Then compare vertex by vertex. As we didn't want to use order 
+        #information, we first select two vertex with the same position and then
+        #compare then.
+        other_pos = [(vertex.pos_x,vertex.pos_y) for vertex in other.vertexList]
+        for vertex_self in self.vertexList:
+            try:
+                i = other_pos.index((vertex_self.pos_x,vertex_self.pos_y))
+            except:
+                # This vertex doesn't have equivalent => They are different.
+                return False
+            else:
+                vertex_other = other.vertexList[i]
+ 
+            # So now we have the 'vertex_self' and 'vertex_other' which are 
+            #vertex at the same position. Now we check if they have the same 
+            #line content.
+            if not vertex_self.has_the_same_line_content(vertex_other):
+                return False
+ 
+        # All the vertex and the associate line are equivalent. So the two 
+        #diagrams are consider as identical.
+        return True
+
 
 #===============================================================================
 # FeynmanDiagramHorizontal
@@ -1455,7 +1612,8 @@
     class DrawDiagramError(Exception):
         """Standard error for error occuring to create output of a Diagram."""
 
-    def __init__(self, diagram='', file='', model='', amplitude=''):
+    def __init__(self, diagram=None, file=None, model=None, amplitude=None, \
+                                                                    opt=None):
         """Define basic variables and store some global information.
         All argument are optional:
         diagram : is the object to  'diagram' should inherit from either 
@@ -1465,7 +1623,8 @@
             inherit from base_objects.Diagram (for conversion).
         amplitude: amplitude associates to the diagram. NOT USE for the moment.
             In future you could pass the amplitude associate to the object in 
-            order to adjust fermion flow in case of Majorana fermion."""
+            order to adjust fermion flow in case of Majorana fermion.
+        opt: should be a valid DrawOption object."""
 
         # Check the parameter value
         #No need to test Diagram class, it will be tested before using it anyway
@@ -1480,12 +1639,18 @@
         # A Test of the Amplitude should be added when this one will be 
         #use.
 
+        # Check the option
+        if opt and not isinstance(opt, DrawOption):
+            raise self.DrawDiagramError('The Option to draw the diagram are in' + \
+                                        'a invalid format')
+
         # Store the parameter in the object variable
         self.diagram = diagram
         self.filename = file
         self.model = model         # use for automatic conversion of graph
         self.amplitude = amplitude # will be use for conversion of graph
-
+        self.opt = opt
+        
         # Set variable for storing text        
         self.text = ''
         # Do we have to write a file? -> store in self.file
@@ -1495,20 +1660,13 @@
         else:
             self.file = False
 
-    def draw(self, **opt):
+    def draw(self, opt=None):
         """Main routine to draw a single diagram.
-        opt is the option for the conversion of the base_objects.Diagram in one 
-        of the Diagram object. This is the list of recognize options:
-            external [True] : authorizes external particles to finish on 
-                horizontal limit of the square
-            horizontal [True]: if on true use FeynmanDiagramHorizontal to 
-                convert the diagram. otherwise use FeynmanDiagram (Horizontal 
-                forces S-channel to be horizontal)
-            non_propagating [True] : removes the non propagating particles 
-                present in the diagram."""
+        opt is DrawOption object use for the conversion of the 
+        base_objects.Diagram in one of the Diagram object."""
 
         # Check if we need to upgrade the diagram.
-        self.convert_diagram(**opt)
+        self.convert_diagram(opt=opt)
         # Initialize some variable before starting to draw the diagram
         # This is just for frameworks capabilities (default: open file in 
         #write mode if a filename was provide.
@@ -1520,12 +1678,17 @@
         self.conclude()
 
 
-    def convert_diagram(self, diagram='', model='', amplitude='', **opt):
+    def convert_diagram(self, diagram=None, model=None, amplitude=None, \
+                                                                    opt=None):
         """If diagram is a basic diagram (inherit from base_objects.Diagram)
         convert him to a FeynmanDiagram one. 'opt' keeps track of possible 
         option of drawing. 'amplitude' is not use for the moment. But, later,
         if defined will authorize to adjust the fermion-flow of Majorana 
-        particles. This is the list of recognize options:
+        particles. opt is a DrawOption object containing all option on the way
+        to draw the diagram (see this class for more details)
+        
+        
+        This is the list of recognize options:
             external [True] : authorizes external particles to finish on 
                 horizontal limit of the square
             horizontal [True]: if on true use FeynmanDiagramHorizontal to 
@@ -1534,7 +1697,7 @@
             non_propagating [True] : removes the non propagating particles 
                 present in the diagram."""
 
-        if diagram == '':
+        if diagram is None:
             diagram = self.diagram
 
         #if already a valid diagram. nothing to do
@@ -1542,7 +1705,7 @@
             return
 
         # assign default for model and check validity (if not default)
-        if model == '':
+        if model is None:
             model = self.model
         elif not isinstance(model, base_objects.Model):
             raise self.DrawDiagramError('No valid model provide to convert ' + \
@@ -1550,25 +1713,26 @@
 
         # Test on Amplitude should be enter here, when we will use this 
         #information
-
-
-        # Put default values for options
-        authorize_options = ['external', 'horizontal', 'non_propagating']
-        for key in authorize_options:
-            if key not in opt:
-                opt[key] = True
+        if opt is None:
+            if self.opt:
+                opt = self.opt
+            else:
+                opt = DrawOption()
+        elif not isinstance(opt, DrawOption):
+            raise self.DrawDiagramError('The Option to draw the diagram are' + \
+                                        ' in a invalid format')
 
         # Upgrade diagram to FeynmanDiagram or FeynmanDiagramHorizontal 
         #following option choice
-        if opt['horizontal']:
+        if opt.horizontal:
             diagram = FeynmanDiagramHorizontal(diagram, model, \
-                                                drawing_mode=opt['external'])
+                                                opt=opt)
         else:
             diagram = FeynmanDiagram(diagram, model, \
-                                              drawing_mode=opt['external'])
+                                              opt=opt)
 
         # Find the position of all vertex and all line orientation
-        diagram.main(contract=opt['non_propagating'])
+        diagram.main()
 
         # Store-return information
         self.diagram = diagram
@@ -1651,3 +1815,63 @@
         call only for external particles and the number is the MadGraph number 
         associate to the particle. The default routine doesn't do anything"""
         pass
+    
+class DrawOption(object):
+    """Dealing with the different option of the drawing method.
+     This is the list of recognize attributes:
+           horizontal [False]: force S-channel to be horizontal
+           external [0]: authorizes external particles to end
+                     at top or bottom of diagram. If bigger than zero
+                     this tune the length of those line.
+           add_gap [0]: make external rising after each positioning.
+           max_size [0]: this forbids external line bigger than 
+                     max_size.
+           non_propagating [True]:contracts non propagating lines"""    
+
+    class DrawingOptionError(Exception):
+        """Error raising if an invalid entry is set in a option."""
+
+    def __init__(self, opt={}):
+        """Fullfill option with standard value."""
+        
+        #define default
+        self.external = 0
+        self.add_gap = 0
+        self.horizontal = False
+        self.max_size = 1.5
+        self.contract_non_propagating = True
+
+        for key, value in opt.items():
+            self.set(key,value)
+
+    def set(self, key, value):
+        """Check and attribute the given value."""
+        
+        if key in ['horizontal', 'contract_non_propagating']:
+            value = self.pass_to_logical(value)
+            setattr(self, key, value)
+        elif(key in ['external', 'max_size','add_gap']):
+            try:
+                value = self.pass_to_number(value)
+            except:
+                raise self.DrawingOptionError('%s is not a numerical when %s \
+                                requires one' %(value, key))
+            setattr(self, key, value)
+                
+        else:
+            raise self.DrawingOptionError('%s is not a valid property for  \
+                                        drawing object' % key)
+            
+    def pass_to_logical(self, value):
+        """convert the value in a logical"""
+        
+        if value in [0, False, '0', 'False', 'false']:
+            return False
+        else:
+            return True
+         
+    def pass_to_number(self, value):
+        """Convert the value in a number"""
+        
+        return float(value)
+        
\ No newline at end of file

=== modified file 'madgraph/iolibs/drawing_eps.py'
--- madgraph/iolibs/drawing_eps.py	2010-01-22 05:30:10 +0000
+++ madgraph/iolibs/drawing_eps.py	2010-01-29 06:42:18 +0000
@@ -208,12 +208,9 @@
         # Move slightly the position to avoid overlapping
         if x == 0:
             x = -0.04
-        elif x == 1:
-            x = 1.04
-        if y == 0:
-            y = -0.06
-        elif y == 1:
-            y = 1.04
+        else:
+            x += 0.04
+            y = line._has_ordinate(x)
 
         # Re-scale x,y in order to pass in EPS coordinate
         x, y = self.rescale(x, y)
@@ -224,33 +221,35 @@
     def associate_name(self, line, name):
         """ADD the EPS code associate to the name of the particle. Place it near
         to the center of the line.
-
-         The position of the name follows the V4 routine.
-         """
+        """
 
         # Put alias for vertex positions
         x1, y1 = line.start.pos_x, line.start.pos_y
         x2, y2 = line.end.pos_x, line.end.pos_y
 
-        d = math.sqrt((x1 - x2) ** 2 + (y1 - y2) ** 2)
+        d = line.get_length()
         if d == 0:
             raise self.DrawDiagramError('Line can not have 0 length')
 
-        # Compute gap
-        dx = (x1 - x2) / d
-        dy = (y1 - y2) / d
-
-        # Correct sign to avoid intersection between the name and the current 
-        #line
-        if dy < 0:
-            dx, dy = -1 * dx, -1 * dy
-        elif dy == 0:
-            dx = 1.5
-
+        
+        # compute gap from middle point
+        if abs(x1 - x2) < 1e-3:
+            dx= 0.015
+            dy= - 0.01
+        elif abs(y1 - y2) < 1e-3:
+            dx = - 0.01
+            dy = 0.025
+        elif ((x1 < x2) == (y1 < y2) ):
+            dx = -0.03 * len(name)
+            dy =  0.02  * len(name) #d * 0.12
+        else:
+            dx =  0.01 #0.05
+            dy =  0.02 #d * 0.12 
+            
         # Assign position
-        x_pos = (x1 + x2) / 2 + 0.04 * dy
-        y_pos = (y1 + y2) / 2 - 0.055 * dx
-
+        x_pos = (x1 + x2) / 2 + dx
+        y_pos = (y1 + y2) / 2 + dy
+        
         # Pass in EPS coordinate
         x_pos, y_pos = self.rescale(x_pos, y_pos)
         #write EPS code
@@ -287,8 +286,8 @@
     nb_line = 3
     nb_col = 2
 
-    def __init__(self, diagramlist='', file='diagram.eps', \
-                  model='', amplitude=''):
+    def __init__(self, diagramlist=None, file='diagram.eps', \
+                  model=None, amplitude=None):
         """Define basic variable and store some global information
         all argument are optional
         diagramlist : are the list of object to draw. item should inherit 
@@ -301,13 +300,22 @@
             order to adjust fermion flow in case of Majorana fermion."""
 
         #use standard initialization but without any diagram
-        super(MultiEpsDiagramDrawer, self).__init__('', file , model, amplitude)
+        super(MultiEpsDiagramDrawer, self).__init__(None, file , model, amplitude)
 
         #additional information
         self.block_nb = 0  # keep track of the number of diagram already written
         self.npage = 1 + len(diagramlist) // (self.nb_col * self.nb_line)
-        self.diagramlist = diagramlist
-
+        
+        if diagramlist:
+            if isinstance(diagramlist, base_objects.DiagramList):
+                self.diagramlist = diagramlist
+            else:
+                raise self.DrawDiagramError('diagramlist Argument should be a' +
+                    ' DiagramList object') 
+        else:
+            self.diagramlist = None
+            
+            
     def rescale(self, x, y):
         """All coordinates belongs to [0,1]. So that in order to have a visible
         graph we need to re-scale the graph. This method distort the square in
@@ -343,18 +351,12 @@
         self.block_nb += 1
 
 
-    def draw(self, diagramlist='', **opt):
+    def draw(self, diagramlist='', opt=None):
         """Creates the representation in EPS format associate to a specific 
         diagram. 'opt' keeps track of possible option of drawing. Those option
         are used if we need to convert diagram to Drawing Object.
-        This is the list of recognize options:
-            external [True] : authorizes external particles to finish on 
-                horizontal limit of the square
-            horizontal [True]: if on true use FeynmanDiagramHorizontal to 
-                convert the diagram. otherwise use FeynmanDiagram (Horizontal 
-                forces S-channel to be horizontal)
-            non_propagating [True] : removes the non propagating particles 
-                present in the diagram."""
+        opt is an DrawOption object containing all the possible option on how
+        draw a diagram."""
 
         if diagramlist == '':
             diagramlist = self.diagramlist
@@ -365,7 +367,7 @@
         # Loop on all diagram
         for diagram in diagramlist:
             # Check if they need to be convert in correct format
-            diagram = self.convert_diagram(diagram, self.model, **opt)
+            diagram = self.convert_diagram(diagram, self.model,'', opt)
             # Write the code associate to this diagram
             self.draw_diagram(diagram)
 
@@ -388,3 +390,5 @@
         self.text += '/Helvetica findfont 10 scalefont setfont\n'
         self.text += ' 240         770  moveto\n'
         self.text += ' (Diagrams by MadGraph) show\n'
+
+

=== modified file 'tests/input_files/test_draw.obj'
--- tests/input_files/test_draw.obj	2010-01-25 07:35:29 +0000
+++ tests/input_files/test_draw.obj	2010-01-29 06:42:18 +0000
@@ -1386,10 +1386,10 @@
 Rp413
 stp414
 Rp415
-ssS'g g > g g'
+ssS'u~ u~ > e+ e- u~ u~ g'
 p416
 (dp417
-I1
+I8
 g3
 (g4
 g5
@@ -1415,7 +1415,7 @@
 g18
 g19
 sg20
-I21
+I2
 sg21
 I01
 sg22
@@ -1427,13 +1427,13 @@
 g5
 (dp425
 g18
-g19
+g26
 sg20
-I21
+I-2
 sg21
 I01
 sg22
-I2
+I5
 stp426
 Rp427
 ag3
@@ -1441,7 +1441,7 @@
 g5
 (dp428
 g18
-g26
+g19
 sg20
 I21
 sg21
@@ -1453,7 +1453,7 @@
 atp431
 Rp432
 sg20
-I7
+I2
 stp433
 Rp434
 ag3
@@ -1470,13 +1470,13 @@
 g5
 (dp437
 g18
-g26
+g19
 sg20
-I21
+I2
 sg21
 I01
 sg22
-I3
+I2
 stp438
 Rp439
 ag3
@@ -1490,7 +1490,7 @@
 sg21
 I01
 sg22
-I4
+I7
 stp441
 Rp442
 ag3
@@ -1498,19 +1498,19 @@
 g5
 (dp443
 g18
-g26
+g19
 sg20
-I21
+I2
 sg21
 I01
 sg22
-I3
+I2
 stp444
 Rp445
 atp446
 Rp447
 sg20
-I7
+I2
 stp448
 Rp449
 ag3
@@ -1522,1224 +1522,1264 @@
 (g14
 g9
 (lp451
+g3
+(g16
+g5
+(dp452
+g18
+g26
+sg20
+I-11
+sg21
+I01
+sg22
+I3
+stp453
+Rp454
+ag3
+(g16
+g5
+(dp455
+g18
+g26
+sg20
+I11
+sg21
+I01
+sg22
+I4
+stp456
+Rp457
+ag3
+(g16
+g5
+(dp458
+g18
+g26
+sg20
+I22
+sg21
+I01
+sg22
+I3
+stp459
+Rp460
+atp461
+Rp462
+sg20
+I15
+stp463
+Rp464
+ag3
+(g11
+g5
+(dp465
+g13
+g3
+(g14
+g9
+(lp466
 g430
 ag445
-atp452
-Rp453
-sg20
-I0
-stp454
-Rp455
-atp456
-Rp457
-stp458
-Rp459
-sI2
-g3
-(g4
-g5
-(dp460
-g7
-g3
-(g8
-g9
-(lp461
-g3
-(g11
-g5
-(dp462
-g13
-g3
-(g14
-g9
-(lp463
-g424
-ag439
 ag3
 (g16
 g5
-(dp464
+(dp467
 g18
-g19
+g26
 sg20
-I21
+I2
 sg21
 I01
 sg22
 I1
-stp465
-Rp466
-atp467
-Rp468
+stp468
+Rp469
+atp470
+Rp471
 sg20
-I7
-stp469
-Rp470
+I2
+stp472
+Rp473
 ag3
 (g11
 g5
-(dp471
+(dp474
 g13
 g3
 (g14
 g9
-(lp472
-g427
-ag442
-ag3
-(g16
-g5
-(dp473
-g18
-g19
-sg20
-I21
+(lp475
+g460
+ag3
+(g16
+g5
+(dp476
+g18
+g26
+sg20
+I-2
+sg21
+I00
+sg22
+I6
+stp477
+Rp478
+ag3
+(g16
+g5
+(dp479
+g18
+g26
+sg20
+I-2
 sg21
 I01
 sg22
-I2
-stp474
-Rp475
-atp476
-Rp477
-sg20
-I7
-stp478
-Rp479
-ag3
-(g11
-g5
-(dp480
-g13
-g3
-(g14
-g9
-(lp481
-g466
-ag475
+I3
+stp480
+Rp481
 atp482
 Rp483
 sg20
-I0
+I10
 stp484
 Rp485
-atp486
-Rp487
-stp488
+ag3
+(g11
+g5
+(dp486
+g13
+g3
+(g14
+g9
+(lp487
+g469
+ag481
+atp488
 Rp489
-ssS't h > t g W+ W-'
-p490
-(dp491
+sg20
 I0
+stp490
+Rp491
+atp492
+Rp493
+stp494
+Rp495
+sI1
 g3
 (g4
 g5
-(dp492
-g7
-g3
-(g8
-g9
-(lp493
-g3
-(g11
-g5
-(dp494
-g13
-g3
-(g14
-g9
-(lp495
-g3
-(g16
-g5
 (dp496
-g18
-g19
-sg20
-I-6
-sg21
-I01
-sg22
-I1
-stp497
-Rp498
-ag3
-(g16
-g5
-(dp499
-g18
-g19
-sg20
-I25
-sg21
-I01
-sg22
-I2
-stp500
-Rp501
-ag3
-(g16
-g5
-(dp502
-g18
-g26
-sg20
-I-6
-sg21
-I01
-sg22
-I1
-stp503
+g7
+g3
+(g8
+g9
+(lp497
+g3
+(g11
+g5
+(dp498
+g13
+g3
+(g14
+g9
+(lp499
+g424
+ag427
+ag3
+(g16
+g5
+(dp500
+g18
+g19
+sg20
+I22
+sg21
+I01
+sg22
+I1
+stp501
+Rp502
+atp503
 Rp504
-atp505
+sg20
+I10
+stp505
 Rp506
-sg20
-I44
-stp507
-Rp508
 ag3
 (g11
 g5
+(dp507
+g13
+g3
+(g14
+g9
+(lp508
+g439
+ag442
+ag3
+(g16
+g5
 (dp509
-g13
-g3
-(g14
-g9
-(lp510
-g3
-(g16
-g5
-(dp511
 g18
-g26
+g19
 sg20
-I6
+I2
 sg21
 I01
 sg22
-I3
-stp512
+I2
+stp510
+Rp511
+atp512
 Rp513
-ag3
-(g16
-g5
-(dp514
-g18
-g26
-sg20
-I21
-sg21
-I01
-sg22
-I4
-stp515
-Rp516
-ag3
-(g16
-g5
-(dp517
-g18
-g26
-sg20
-I6
-sg21
-I01
+sg20
+I2
+stp514
+Rp515
+ag3
+(g11
+g5
+(dp516
+g13
+g3
+(g14
+g9
+(lp517
+g502
+ag3
+(g16
+g5
+(dp518
+g18
+g26
+sg20
+I-11
+sg21
+I00
 sg22
 I3
-stp518
-Rp519
-atp520
-Rp521
+stp519
+Rp520
+ag3
+(g16
+g5
+(dp521
+g18
+g19
 sg20
-I6
+I-11
+sg21
+I01
+sg22
+I1
 stp522
 Rp523
+atp524
+Rp525
+sg20
+I15
+stp526
+Rp527
 ag3
 (g11
 g5
-(dp524
+(dp528
 g13
 g3
 (g14
 g9
-(lp525
-g504
+(lp529
+g511
 ag3
 (g16
 g5
-(dp526
+(dp530
 g18
 g26
 sg20
-I24
+I-2
 sg21
 I00
 sg22
-I5
-stp527
-Rp528
+I6
+stp531
+Rp532
 ag3
 (g16
 g5
-(dp529
+(dp533
 g18
-g26
+g19
 sg20
-I-5
+I23
 sg21
 I01
 sg22
-I1
-stp530
-Rp531
-atp532
-Rp533
-sg20
-I35
+I2
 stp534
 Rp535
+atp536
+Rp537
+sg20
+I19
+stp538
+Rp539
 ag3
 (g11
 g5
-(dp536
+(dp540
 g13
 g3
 (g14
 g9
-(lp537
-g519
+(lp541
+g523
+ag535
 ag3
 (g16
 g5
-(dp538
+(dp542
 g18
 g26
 sg20
-I-24
+I11
 sg21
 I00
 sg22
-I6
-stp539
-Rp540
-ag3
-(g16
-g5
-(dp541
-g18
-g26
-sg20
-I5
-sg21
-I01
-sg22
-I3
-stp542
-Rp543
-atp544
-Rp545
-sg20
-I32
-stp546
-Rp547
-ag3
-(g11
-g5
-(dp548
-g13
-g3
-(g14
-g9
-(lp549
-g531
-ag543
-atp550
-Rp551
-sg20
-I0
-stp552
-Rp553
-atp554
-Rp555
-stp556
-Rp557
-sI1
+I4
+stp543
+Rp544
+atp545
+Rp546
+sg20
+I24
+stp547
+Rp548
+atp549
+Rp550
+stp551
+Rp552
+ssS'g g > g g'
+p553
+(dp554
+I1
 g3
 (g4
 g5
-(dp558
+(dp555
 g7
 g3
 (g8
 g9
-(lp559
+(lp556
 g3
 (g11
 g5
-(dp560
+(dp557
 g13
 g3
 (g14
 g9
-(lp561
-g498
-ag501
+(lp558
+g3
+(g16
+g5
+(dp559
+g18
+g19
+sg20
+I21
+sg21
+I01
+sg22
+I1
+stp560
+Rp561
 ag3
 (g16
 g5
 (dp562
 g18
-g26
+g19
 sg20
-I-6
+I21
 sg21
 I01
 sg22
-I1
+I2
 stp563
 Rp564
-atp565
-Rp566
-sg20
-I44
-stp567
-Rp568
+ag3
+(g16
+g5
+(dp565
+g18
+g26
+sg20
+I21
+sg21
+I01
+sg22
+I1
+stp566
+Rp567
+atp568
+Rp569
+sg20
+I7
+stp570
+Rp571
 ag3
 (g11
 g5
-(dp569
+(dp572
 g13
 g3
 (g14
 g9
-(lp570
-g513
-ag516
-ag3
+(lp573
+g3
 (g16
 g5
-(dp571
+(dp574
 g18
 g26
 sg20
-I6
+I21
 sg21
 I01
 sg22
 I3
-stp572
-Rp573
-atp574
-Rp575
+stp575
+Rp576
+ag3
+(g16
+g5
+(dp577
+g18
+g26
 sg20
-I6
-stp576
-Rp577
+I21
+sg21
+I01
+sg22
+I4
+stp578
+Rp579
 ag3
-(g11
-g5
-(dp578
-g13
-g3
-(g14
-g9
-(lp579
-g3
 (g16
 g5
 (dp580
 g18
 g26
 sg20
-I24
+I21
 sg21
 I01
 sg22
-I5
+I3
 stp581
 Rp582
-ag3
-(g16
-g5
-(dp583
-g18
-g26
-sg20
-I-24
-sg21
-I01
-sg22
-I6
-stp584
-Rp585
-ag3
-(g16
-g5
-(dp586
-g18
-g26
-sg20
-I22
-sg21
-I01
-sg22
-I5
-stp587
-Rp588
+atp583
+Rp584
+sg20
+I7
+stp585
+Rp586
+ag3
+(g11
+g5
+(dp587
+g13
+g3
+(g14
+g9
+(lp588
+g567
+ag582
 atp589
 Rp590
 sg20
-I45
+I0
 stp591
 Rp592
-ag3
-(g11
-g5
-(dp593
-g13
-g3
-(g14
-g9
-(lp594
-g564
-ag573
-ag588
-atp595
+atp593
+Rp594
+stp595
 Rp596
-sg20
-I14
-stp597
-Rp598
-atp599
-Rp600
-stp601
-Rp602
 sI2
 g3
 (g4
 g5
-(dp603
+(dp597
 g7
 g3
 (g8
 g9
-(lp604
-g568
-ag577
-ag3
+(lp598
+g3
 (g11
 g5
-(dp605
+(dp599
 g13
 g3
 (g14
 g9
-(lp606
-g582
-ag585
+(lp600
+g561
+ag576
 ag3
 (g16
 g5
-(dp607
+(dp601
 g18
-g26
+g19
 sg20
-I23
+I21
 sg21
 I01
 sg22
-I5
-stp608
-Rp609
-atp610
-Rp611
+I1
+stp602
+Rp603
+atp604
+Rp605
 sg20
-I46
-stp612
-Rp613
+I7
+stp606
+Rp607
 ag3
 (g11
 g5
-(dp614
+(dp608
 g13
 g3
 (g14
 g9
-(lp615
+(lp609
 g564
-ag573
-ag609
-atp616
-Rp617
-sg20
-I23
-stp618
-Rp619
-atp620
-Rp621
-stp622
-Rp623
-sI3
-g3
-(g4
+ag579
+ag3
+(g16
 g5
-(dp624
-g7
-g3
-(g8
-g9
-(lp625
-g568
-ag577
+(dp610
+g18
+g19
+sg20
+I21
+sg21
+I01
+sg22
+I2
+stp611
+Rp612
+atp613
+Rp614
+sg20
+I7
+stp615
+Rp616
 ag3
 (g11
 g5
-(dp626
+(dp617
 g13
 g3
 (g14
 g9
-(lp627
-g582
-ag585
-ag3
-(g16
-g5
+(lp618
+g603
+ag612
+atp619
+Rp620
+sg20
+I0
+stp621
+Rp622
+atp623
+Rp624
+stp625
+Rp626
+ssS't h > t g W+ W-'
+p627
 (dp628
-g18
-g26
-sg20
-I25
-sg21
-I01
-sg22
-I5
-stp629
-Rp630
-atp631
-Rp632
-sg20
-I47
-stp633
-Rp634
-ag3
+I0
+g3
+(g4
+g5
+(dp629
+g7
+g3
+(g8
+g9
+(lp630
+g3
 (g11
 g5
-(dp635
+(dp631
 g13
 g3
 (g14
 g9
-(lp636
-g564
-ag573
-ag630
-atp637
+(lp632
+g3
+(g16
+g5
+(dp633
+g18
+g19
+sg20
+I-6
+sg21
+I01
+sg22
+I1
+stp634
+Rp635
+ag3
+(g16
+g5
+(dp636
+g18
+g19
+sg20
+I25
+sg21
+I01
+sg22
+I2
+stp637
 Rp638
+ag3
+(g16
+g5
+(dp639
+g18
+g26
+sg20
+I-6
+sg21
+I01
+sg22
+I1
+stp640
+Rp641
+atp642
+Rp643
 sg20
 I44
-stp639
-Rp640
-atp641
-Rp642
-stp643
-Rp644
-sI4
-g3
-(g4
-g5
-(dp645
-g7
-g3
-(g8
-g9
-(lp646
-g3
+stp644
+Rp645
+ag3
 (g11
 g5
-(dp647
+(dp646
 g13
 g3
 (g14
 g9
-(lp648
-g498
-ag501
+(lp647
+g3
+(g16
+g5
+(dp648
+g18
+g26
+sg20
+I6
+sg21
+I01
+sg22
+I3
+stp649
+Rp650
 ag3
 (g16
 g5
-(dp649
+(dp651
 g18
 g26
 sg20
-I-6
+I21
 sg21
 I01
 sg22
-I1
-stp650
-Rp651
-atp652
+I4
+stp652
 Rp653
-sg20
-I44
-stp654
-Rp655
-ag3
-(g11
-g5
-(dp656
-g13
-g3
-(g14
-g9
-(lp657
-g513
-ag585
 ag3
 (g16
 g5
-(dp658
+(dp654
 g18
 g26
 sg20
-I5
+I6
 sg21
 I01
 sg22
 I3
+stp655
+Rp656
+atp657
+Rp658
+sg20
+I6
 stp659
 Rp660
-atp661
-Rp662
-sg20
-I32
-stp663
-Rp664
 ag3
 (g11
 g5
-(dp665
+(dp661
 g13
 g3
 (g14
 g9
-(lp666
-g651
+(lp662
+g641
 ag3
 (g16
 g5
-(dp667
+(dp663
 g18
 g26
 sg20
-I21
+I24
 sg21
 I00
 sg22
-I4
-stp668
-Rp669
+I5
+stp664
+Rp665
 ag3
 (g16
 g5
-(dp670
+(dp666
 g18
 g26
 sg20
-I-6
+I-5
 sg21
 I01
 sg22
 I1
+stp667
+Rp668
+atp669
+Rp670
+sg20
+I35
 stp671
 Rp672
-atp673
-Rp674
-sg20
-I6
-stp675
-Rp676
 ag3
 (g11
 g5
-(dp677
+(dp673
 g13
 g3
 (g14
 g9
-(lp678
-g660
+(lp674
+g656
 ag3
 (g16
 g5
-(dp679
+(dp675
 g18
 g26
 sg20
-I24
+I-24
 sg21
 I00
 sg22
+I6
+stp676
+Rp677
+ag3
+(g16
+g5
+(dp678
+g18
+g26
+sg20
 I5
-stp680
-Rp681
-ag3
-(g16
-g5
-(dp682
-g18
-g26
-sg20
-I6
 sg21
 I01
 sg22
 I3
+stp679
+Rp680
+atp681
+Rp682
+sg20
+I32
 stp683
 Rp684
-atp685
-Rp686
-sg20
-I35
-stp687
+ag3
+(g11
+g5
+(dp685
+g13
+g3
+(g14
+g9
+(lp686
+g668
+ag680
+atp687
 Rp688
-ag3
-(g11
-g5
-(dp689
-g13
-g3
-(g14
-g9
-(lp690
-g672
-ag684
+sg20
+I0
+stp689
+Rp690
 atp691
 Rp692
-sg20
-I0
 stp693
 Rp694
-atp695
-Rp696
-stp697
-Rp698
-sI5
+sI1
 g3
 (g4
 g5
+(dp695
+g7
+g3
+(g8
+g9
+(lp696
+g3
+(g11
+g5
+(dp697
+g13
+g3
+(g14
+g9
+(lp698
+g635
+ag638
+ag3
+(g16
+g5
 (dp699
-g7
-g3
-(g8
-g9
-(lp700
-g655
-ag664
-ag3
-(g11
-g5
-(dp701
-g13
-g3
-(g14
-g9
-(lp702
-g651
-ag681
-ag3
-(g16
-g5
-(dp703
 g18
 g26
 sg20
-I-5
+I-6
 sg21
 I01
 sg22
 I1
+stp700
+Rp701
+atp702
+Rp703
+sg20
+I44
 stp704
 Rp705
-atp706
-Rp707
-sg20
-I35
-stp708
-Rp709
 ag3
 (g11
 g5
-(dp710
+(dp706
 g13
 g3
 (g14
 g9
-(lp711
-g660
-ag669
+(lp707
+g650
+ag653
 ag3
 (g16
 g5
-(dp712
+(dp708
 g18
 g26
 sg20
-I5
+I6
 sg21
 I01
 sg22
 I3
+stp709
+Rp710
+atp711
+Rp712
+sg20
+I6
 stp713
 Rp714
-atp715
-Rp716
-sg20
-I5
-stp717
-Rp718
 ag3
 (g11
 g5
-(dp719
+(dp715
 g13
 g3
 (g14
 g9
-(lp720
-g705
-ag714
-atp721
+(lp716
+g3
+(g16
+g5
+(dp717
+g18
+g26
+sg20
+I24
+sg21
+I01
+sg22
+I5
+stp718
+Rp719
+ag3
+(g16
+g5
+(dp720
+g18
+g26
+sg20
+I-24
+sg21
+I01
+sg22
+I6
+stp721
 Rp722
-sg20
-I0
-stp723
-Rp724
-atp725
-Rp726
-stp727
-Rp728
-sI6
-g3
-(g4
-g5
-(dp729
-g7
-g3
-(g8
-g9
-(lp730
-g3
-(g11
-g5
-(dp731
-g13
-g3
-(g14
-g9
-(lp732
-g498
-ag501
 ag3
 (g16
 g5
-(dp733
+(dp723
 g18
 g26
 sg20
-I-6
+I22
 sg21
 I01
 sg22
-I1
+I5
+stp724
+Rp725
+atp726
+Rp727
+sg20
+I45
+stp728
+Rp729
+ag3
+(g11
+g5
+(dp730
+g13
+g3
+(g14
+g9
+(lp731
+g701
+ag710
+ag725
+atp732
+Rp733
+sg20
+I14
 stp734
 Rp735
 atp736
 Rp737
-sg20
-I44
 stp738
 Rp739
-ag3
-(g11
+sI2
+g3
+(g4
 g5
 (dp740
-g13
+g7
 g3
-(g14
+(g8
 g9
 (lp741
-g582
-ag585
+g705
+ag714
 ag3
-(g16
+(g11
 g5
 (dp742
+g13
+g3
+(g14
+g9
+(lp743
+g719
+ag722
+ag3
+(g16
+g5
+(dp744
 g18
 g26
 sg20
-I22
+I23
 sg21
 I01
 sg22
 I5
-stp743
-Rp744
-atp745
+stp745
 Rp746
-sg20
-I45
-stp747
+atp747
 Rp748
+sg20
+I46
+stp749
+Rp750
 ag3
 (g11
 g5
-(dp749
-g13
-g3
-(g14
-g9
-(lp750
-g735
-ag3
-(g16
-g5
 (dp751
-g18
-g26
-sg20
-I21
-sg21
-I00
-sg22
-I4
-stp752
-Rp753
-ag3
-(g16
-g5
-(dp754
-g18
-g26
-sg20
-I-6
-sg21
-I01
-sg22
-I1
+g13
+g3
+(g14
+g9
+(lp752
+g701
+ag710
+ag746
+atp753
+Rp754
+sg20
+I23
 stp755
 Rp756
 atp757
 Rp758
-sg20
-I6
 stp759
 Rp760
-ag3
-(g11
+sI3
+g3
+(g4
 g5
 (dp761
-g13
+g7
 g3
-(g14
+(g8
 g9
 (lp762
-g3
-(g16
+g705
+ag714
+ag3
+(g11
 g5
 (dp763
-g18
-g26
-sg20
-I6
-sg21
-I00
-sg22
-I3
-stp764
-Rp765
-ag744
+g13
+g3
+(g14
+g9
+(lp764
+g719
+ag722
 ag3
 (g16
 g5
-(dp766
+(dp765
 g18
 g26
 sg20
-I6
+I25
 sg21
 I01
 sg22
-I3
-stp767
-Rp768
-atp769
-Rp770
+I5
+stp766
+Rp767
+atp768
+Rp769
 sg20
-I14
-stp771
-Rp772
+I47
+stp770
+Rp771
 ag3
 (g11
 g5
-(dp773
+(dp772
 g13
 g3
 (g14
 g9
-(lp774
-g756
-ag768
-atp775
-Rp776
+(lp773
+g701
+ag710
+ag767
+atp774
+Rp775
 sg20
-I0
-stp777
-Rp778
-atp779
-Rp780
-stp781
-Rp782
-sI7
+I44
+stp776
+Rp777
+atp778
+Rp779
+stp780
+Rp781
+sI4
 g3
 (g4
 g5
-(dp783
+(dp782
 g7
 g3
 (g8
 g9
-(lp784
-g739
-ag3
+(lp783
+g3
 (g11
 g5
-(dp785
+(dp784
 g13
 g3
 (g14
 g9
-(lp786
-g582
-ag585
+(lp785
+g635
+ag638
 ag3
 (g16
 g5
-(dp787
+(dp786
 g18
 g26
 sg20
-I23
+I-6
 sg21
 I01
 sg22
+I1
+stp787
+Rp788
+atp789
+Rp790
+sg20
+I44
+stp791
+Rp792
+ag3
+(g11
+g5
+(dp793
+g13
+g3
+(g14
+g9
+(lp794
+g650
+ag722
+ag3
+(g16
+g5
+(dp795
+g18
+g26
+sg20
 I5
-stp788
-Rp789
-atp790
-Rp791
-sg20
-I46
-stp792
-Rp793
-ag3
-(g11
-g5
-(dp794
-g13
-g3
-(g14
-g9
-(lp795
-g735
-ag753
-ag3
-(g16
-g5
-(dp796
-g18
-g26
-sg20
-I-6
-sg21
-I01
-sg22
-I1
-stp797
-Rp798
-atp799
-Rp800
-sg20
-I6
-stp801
-Rp802
-ag3
-(g11
-g5
-(dp803
-g13
-g3
-(g14
-g9
-(lp804
-g765
-ag789
-ag3
-(g16
-g5
-(dp805
-g18
-g26
-sg20
-I6
 sg21
 I01
 sg22
 I3
-stp806
-Rp807
-atp808
+stp796
+Rp797
+atp798
+Rp799
+sg20
+I32
+stp800
+Rp801
+ag3
+(g11
+g5
+(dp802
+g13
+g3
+(g14
+g9
+(lp803
+g788
+ag3
+(g16
+g5
+(dp804
+g18
+g26
+sg20
+I21
+sg21
+I00
+sg22
+I4
+stp805
+Rp806
+ag3
+(g16
+g5
+(dp807
+g18
+g26
+sg20
+I-6
+sg21
+I01
+sg22
+I1
+stp808
 Rp809
-sg20
-I23
-stp810
+atp810
 Rp811
+sg20
+I6
+stp812
+Rp813
 ag3
 (g11
 g5
-(dp812
+(dp814
 g13
 g3
 (g14
 g9
-(lp813
-g798
-ag807
-atp814
-Rp815
-sg20
-I0
-stp816
-Rp817
-atp818
-Rp819
+(lp815
+g797
+ag3
+(g16
+g5
+(dp816
+g18
+g26
+sg20
+I24
+sg21
+I00
+sg22
+I5
+stp817
+Rp818
+ag3
+(g16
+g5
+(dp819
+g18
+g26
+sg20
+I6
+sg21
+I01
+sg22
+I3
 stp820
 Rp821
-ssS'g g > g g g g'
-p822
-(dp823
-I0
-g3
-(g4
-g5
-(dp824
-g7
-g3
-(g8
-g9
-(lp825
-g3
+atp822
+Rp823
+sg20
+I35
+stp824
+Rp825
+ag3
 (g11
 g5
 (dp826
@@ -2748,91 +2788,72 @@
 (g14
 g9
 (lp827
-g3
-(g16
-g5
-(dp828
-g18
-g19
-sg20
-I21
-sg21
-I01
-sg22
-I1
-stp829
-Rp830
-ag3
-(g16
-g5
-(dp831
-g18
-g19
-sg20
-I21
-sg21
-I01
-sg22
-I2
-stp832
+g809
+ag821
+atp828
+Rp829
+sg20
+I0
+stp830
+Rp831
+atp832
 Rp833
+stp834
+Rp835
+sI5
+g3
+(g4
+g5
+(dp836
+g7
+g3
+(g8
+g9
+(lp837
+g792
+ag801
+ag3
+(g11
+g5
+(dp838
+g13
+g3
+(g14
+g9
+(lp839
+g788
+ag818
 ag3
 (g16
 g5
-(dp834
+(dp840
 g18
 g26
 sg20
-I21
+I-5
 sg21
 I01
 sg22
 I1
-stp835
-Rp836
-atp837
-Rp838
+stp841
+Rp842
+atp843
+Rp844
 sg20
-I7
-stp839
-Rp840
+I35
+stp845
+Rp846
 ag3
 (g11
 g5
-(dp841
+(dp847
 g13
 g3
 (g14
 g9
-(lp842
-g3
-(g16
-g5
-(dp843
-g18
-g26
-sg20
-I21
-sg21
-I01
-sg22
-I3
-stp844
-Rp845
-ag3
-(g16
-g5
-(dp846
-g18
-g26
-sg20
-I21
-sg21
-I01
-sg22
-I4
-stp847
-Rp848
+(lp848
+g797
+ag806
 ag3
 (g16
 g5
@@ -2840,7 +2861,7 @@
 g18
 g26
 sg20
-I21
+I5
 sg21
 I01
 sg22
@@ -2850,7 +2871,7 @@
 atp852
 Rp853
 sg20
-I7
+I5
 stp854
 Rp855
 ag3
@@ -2862,111 +2883,100 @@
 (g14
 g9
 (lp857
-g836
+g842
 ag851
-ag3
-(g16
-g5
-(dp858
-g18
-g26
-sg20
-I21
-sg21
-I00
-sg22
-I5
-stp859
-Rp860
-ag3
-(g16
-g5
-(dp861
-g18
-g26
-sg20
-I21
-sg21
-I00
-sg22
-I6
-stp862
+atp858
+Rp859
+sg20
+I0
+stp860
+Rp861
+atp862
 Rp863
-atp864
+stp864
 Rp865
-sg20
-I8
-stp866
-Rp867
-atp868
-Rp869
-stp870
-Rp871
-sI192
+sI6
 g3
 (g4
 g5
-(dp872
+(dp866
 g7
 g3
 (g8
 g9
-(lp873
+(lp867
 g3
 (g11
 g5
-(dp874
+(dp868
 g13
 g3
 (g14
 g9
-(lp875
-g830
-ag845
-ag848
+(lp869
+g635
+ag638
 ag3
 (g16
 g5
-(dp876
+(dp870
 g18
-g19
+g26
 sg20
-I21
+I-6
 sg21
 I01
 sg22
 I1
-stp877
-Rp878
-atp879
-Rp880
+stp871
+Rp872
+atp873
+Rp874
 sg20
-I8
-stp881
-Rp882
+I44
+stp875
+Rp876
 ag3
 (g11
 g5
-(dp883
+(dp877
 g13
 g3
 (g14
 g9
-(lp884
-g3
+(lp878
+g719
+ag722
+ag3
 (g16
 g5
-(dp885
+(dp879
 g18
 g26
 sg20
-I21
+I22
 sg21
 I01
 sg22
 I5
-stp886
-Rp887
+stp880
+Rp881
+atp882
+Rp883
+sg20
+I45
+stp884
+Rp885
+ag3
+(g11
+g5
+(dp886
+g13
+g3
+(g14
+g9
+(lp887
+g872
 ag3
 (g16
 g5
@@ -2976,9 +2986,9 @@
 sg20
 I21
 sg21
-I01
+I00
 sg22
-I6
+I4
 stp889
 Rp890
 ag3
@@ -2988,17 +2998,17 @@
 g18
 g26
 sg20
-I21
+I-6
 sg21
 I01
 sg22
-I5
+I1
 stp892
 Rp893
 atp894
 Rp895
 sg20
-I7
+I6
 stp896
 Rp897
 ag3
@@ -3010,73 +3020,73 @@
 (g14
 g9
 (lp899
-g878
-ag3
+g3
 (g16
 g5
 (dp900
 g18
-g19
+g26
 sg20
-I21
+I6
 sg21
 I00
 sg22
-I2
+I3
 stp901
 Rp902
-ag893
-atp903
-Rp904
-sg20
-I7
-stp905
-Rp906
-atp907
-Rp908
-stp909
-Rp910
-sI26
-g3
-(g4
-g5
-(dp911
-g7
-g3
-(g8
-g9
-(lp912
-g3
-(g11
-g5
-(dp913
-g13
-g3
-(g14
-g9
-(lp914
-g830
-ag845
+ag881
 ag3
 (g16
 g5
-(dp915
+(dp903
 g18
-g19
+g26
 sg20
-I21
+I6
 sg21
 I01
 sg22
-I1
-stp916
+I3
+stp904
+Rp905
+atp906
+Rp907
+sg20
+I14
+stp908
+Rp909
+ag3
+(g11
+g5
+(dp910
+g13
+g3
+(g14
+g9
+(lp911
+g893
+ag905
+atp912
+Rp913
+sg20
+I0
+stp914
+Rp915
+atp916
 Rp917
-atp918
+stp918
 Rp919
-sg20
-I7
-stp920
-Rp921
+sI7
+g3
+(g4
+g5
+(dp920
+g7
+g3
+(g8
+g9
+(lp921
+g876
 ag3
 (g11
 g5
@@ -3086,26 +3096,26 @@
 (g14
 g9
 (lp923
-g833
-ag848
+g719
+ag722
 ag3
 (g16
 g5
 (dp924
 g18
-g19
+g26
 sg20
-I21
+I23
 sg21
 I01
 sg22
-I2
+I5
 stp925
 Rp926
 atp927
 Rp928
 sg20
-I7
+I46
 stp929
 Rp930
 ag3
@@ -3117,7 +3127,8 @@
 (g14
 g9
 (lp932
-g917
+g872
+ag890
 ag3
 (g16
 g5
@@ -3125,154 +3136,154 @@
 g18
 g26
 sg20
-I21
+I-6
 sg21
-I00
+I01
 sg22
-I5
+I1
 stp934
 Rp935
-ag3
-(g16
-g5
-(dp936
-g18
-g19
-sg20
-I21
-sg21
-I01
-sg22
-I1
-stp937
-Rp938
-atp939
-Rp940
-sg20
-I7
-stp941
-Rp942
+atp936
+Rp937
+sg20
+I6
+stp938
+Rp939
 ag3
 (g11
 g5
-(dp943
+(dp940
 g13
 g3
 (g14
 g9
-(lp944
-g926
+(lp941
+g902
+ag926
 ag3
 (g16
 g5
-(dp945
+(dp942
 g18
 g26
 sg20
-I21
-sg21
-I00
-sg22
 I6
-stp946
-Rp947
+sg21
+I01
+sg22
+I3
+stp943
+Rp944
+atp945
+Rp946
+sg20
+I23
+stp947
+Rp948
 ag3
-(g16
+(g11
 g5
-(dp948
-g18
-g19
-sg20
-I21
-sg21
-I01
-sg22
-I2
-stp949
-Rp950
+(dp949
+g13
+g3
+(g14
+g9
+(lp950
+g935
+ag944
 atp951
 Rp952
 sg20
-I7
+I0
 stp953
 Rp954
-ag3
-(g11
-g5
-(dp955
-g13
-g3
-(g14
-g9
-(lp956
-g938
-ag950
-atp957
+atp955
+Rp956
+stp957
 Rp958
-sg20
+ssS'g g > g g g g'
+p959
+(dp960
 I0
-stp959
-Rp960
-atp961
-Rp962
-stp963
-Rp964
-sI92
 g3
 (g4
 g5
+(dp961
+g7
+g3
+(g8
+g9
+(lp962
+g3
+(g11
+g5
+(dp963
+g13
+g3
+(g14
+g9
+(lp964
+g3
+(g16
+g5
 (dp965
-g7
-g3
-(g8
-g9
-(lp966
-g3
-(g11
-g5
-(dp967
-g13
-g3
-(g14
-g9
-(lp968
-g830
-ag887
-ag3
-(g16
-g5
-(dp969
-g18
-g19
-sg20
-I21
-sg21
-I01
-sg22
-I1
-stp970
-Rp971
-atp972
+g18
+g19
+sg20
+I21
+sg21
+I01
+sg22
+I1
+stp966
+Rp967
+ag3
+(g16
+g5
+(dp968
+g18
+g19
+sg20
+I21
+sg21
+I01
+sg22
+I2
+stp969
+Rp970
+ag3
+(g16
+g5
+(dp971
+g18
+g26
+sg20
+I21
+sg21
+I01
+sg22
+I1
+stp972
 Rp973
-sg20
-I7
-stp974
+atp974
 Rp975
+sg20
+I7
+stp976
+Rp977
 ag3
 (g11
 g5
-(dp976
-g13
-g3
-(g14
-g9
-(lp977
-g845
-ag890
-ag3
-(g16
-g5
 (dp978
+g13
+g3
+(g14
+g9
+(lp979
+g3
+(g16
+g5
+(dp980
 g18
 g26
 sg20
@@ -3281,148 +3292,117 @@
 I01
 sg22
 I3
-stp979
-Rp980
-atp981
+stp981
 Rp982
+ag3
+(g16
+g5
+(dp983
+g18
+g26
+sg20
+I21
+sg21
+I01
+sg22
+I4
+stp984
+Rp985
+ag3
+(g16
+g5
+(dp986
+g18
+g26
+sg20
+I21
+sg21
+I01
+sg22
+I3
+stp987
+Rp988
+atp989
+Rp990
 sg20
 I7
-stp983
-Rp984
-ag3
-(g11
-g5
-(dp985
-g13
-g3
-(g14
-g9
-(lp986
-g971
-ag3
-(g16
-g5
-(dp987
-g18
-g26
-sg20
-I21
-sg21
-I00
-sg22
-I4
-stp988
-Rp989
-ag3
-(g16
-g5
-(dp990
-g18
-g19
-sg20
-I21
-sg21
-I01
-sg22
-I1
 stp991
 Rp992
-atp993
-Rp994
-sg20
-I7
-stp995
-Rp996
 ag3
 (g11
 g5
-(dp997
+(dp993
 g13
 g3
 (g14
 g9
-(lp998
-g3
-(g16
-g5
-(dp999
-g18
-g19
-sg20
-I21
-sg21
-I00
-sg22
-I2
-stp1000
-Rp1001
-ag980
-ag3
-(g16
-g5
-(dp1002
-g18
-g19
-sg20
-I21
-sg21
-I01
-sg22
-I2
+(lp994
+g973
+ag988
+ag3
+(g16
+g5
+(dp995
+g18
+g26
+sg20
+I21
+sg21
+I00
+sg22
+I5
+stp996
+Rp997
+ag3
+(g16
+g5
+(dp998
+g18
+g26
+sg20
+I21
+sg21
+I00
+sg22
+I6
+stp999
+Rp1000
+atp1001
+Rp1002
+sg20
+I8
 stp1003
 Rp1004
 atp1005
 Rp1006
-sg20
-I7
 stp1007
 Rp1008
-ag3
-(g11
+sI192
+g3
+(g4
 g5
 (dp1009
-g13
+g7
 g3
-(g14
+(g8
 g9
 (lp1010
-g992
-ag1004
-atp1011
-Rp1012
-sg20
-I0
-stp1013
-Rp1014
-atp1015
-Rp1016
-stp1017
-Rp1018
-sI93
-g3
-(g4
-g5
-(dp1019
-g7
-g3
-(g8
-g9
-(lp1020
 g3
 (g11
 g5
-(dp1021
+(dp1011
 g13
 g3
 (g14
 g9
-(lp1022
-g830
-ag887
+(lp1012
+g967
+ag982
+ag985
 ag3
 (g16
 g5
-(dp1023
+(dp1013
 g18
 g19
 sg20
@@ -3431,29 +3411,55 @@
 I01
 sg22
 I1
-stp1024
-Rp1025
-atp1026
+stp1014
+Rp1015
+atp1016
+Rp1017
+sg20
+I8
+stp1018
+Rp1019
+ag3
+(g11
+g5
+(dp1020
+g13
+g3
+(g14
+g9
+(lp1021
+g3
+(g16
+g5
+(dp1022
+g18
+g26
+sg20
+I21
+sg21
+I01
+sg22
+I5
+stp1023
+Rp1024
+ag3
+(g16
+g5
+(dp1025
+g18
+g26
+sg20
+I21
+sg21
+I01
+sg22
+I6
+stp1026
 Rp1027
-sg20
-I7
-stp1028
-Rp1029
-ag3
-(g11
-g5
-(dp1030
-g13
-g3
-(g14
-g9
-(lp1031
-g848
-ag890
 ag3
 (g16
 g5
-(dp1032
+(dp1028
 g18
 g26
 sg20
@@ -3461,29 +3467,29 @@
 sg21
 I01
 sg22
-I4
+I5
+stp1029
+Rp1030
+atp1031
+Rp1032
+sg20
+I7
 stp1033
 Rp1034
-atp1035
-Rp1036
-sg20
-I7
-stp1037
-Rp1038
 ag3
 (g11
 g5
-(dp1039
+(dp1035
 g13
 g3
 (g14
 g9
-(lp1040
-g1025
+(lp1036
+g1015
 ag3
 (g16
 g5
-(dp1041
+(dp1037
 g18
 g19
 sg20
@@ -3492,47 +3498,61 @@
 I00
 sg22
 I2
+stp1038
+Rp1039
+ag1030
+atp1040
+Rp1041
+sg20
+I7
 stp1042
 Rp1043
+atp1044
+Rp1045
+stp1046
+Rp1047
+sI26
+g3
+(g4
+g5
+(dp1048
+g7
+g3
+(g8
+g9
+(lp1049
+g3
+(g11
+g5
+(dp1050
+g13
+g3
+(g14
+g9
+(lp1051
+g967
+ag982
 ag3
 (g16
 g5
-(dp1044
+(dp1052
 g18
-g26
+g19
 sg20
 I21
 sg21
-I00
+I01
 sg22
-I3
-stp1045
-Rp1046
-ag1034
-atp1047
-Rp1048
-sg20
-I8
-stp1049
-Rp1050
-atp1051
-Rp1052
+I1
 stp1053
 Rp1054
-ssS'g g > g g g'
-p1055
-(dp1056
-I0
-g3
-(g4
-g5
-(dp1057
-g7
-g3
-(g8
-g9
-(lp1058
-g3
+atp1055
+Rp1056
+sg20
+I7
+stp1057
+Rp1058
+ag3
 (g11
 g5
 (dp1059
@@ -3541,7 +3561,9 @@
 (g14
 g9
 (lp1060
-g3
+g970
+ag985
+ag3
 (g16
 g5
 (dp1061
@@ -3552,13 +3574,43 @@
 sg21
 I01
 sg22
-I1
+I2
 stp1062
 Rp1063
-ag3
-(g16
-g5
-(dp1064
+atp1064
+Rp1065
+sg20
+I7
+stp1066
+Rp1067
+ag3
+(g11
+g5
+(dp1068
+g13
+g3
+(g14
+g9
+(lp1069
+g1054
+ag3
+(g16
+g5
+(dp1070
+g18
+g26
+sg20
+I21
+sg21
+I00
+sg22
+I5
+stp1071
+Rp1072
+ag3
+(g16
+g5
+(dp1073
 g18
 g19
 sg20
@@ -3566,66 +3618,25 @@
 sg21
 I01
 sg22
-I2
-stp1065
-Rp1066
-ag3
-(g16
-g5
-(dp1067
-g18
-g26
-sg20
-I21
-sg21
-I01
-sg22
 I1
-stp1068
-Rp1069
-atp1070
-Rp1071
+stp1074
+Rp1075
+atp1076
+Rp1077
 sg20
 I7
-stp1072
-Rp1073
+stp1078
+Rp1079
 ag3
 (g11
 g5
-(dp1074
+(dp1080
 g13
 g3
 (g14
 g9
-(lp1075
-g3
-(g16
-g5
-(dp1076
-g18
-g26
-sg20
-I21
-sg21
-I01
-sg22
-I3
-stp1077
-Rp1078
-ag3
-(g16
-g5
-(dp1079
-g18
-g26
-sg20
-I21
-sg21
-I01
-sg22
-I4
-stp1080
-Rp1081
+(lp1081
+g1063
 ag3
 (g16
 g5
@@ -3635,106 +3646,152 @@
 sg20
 I21
 sg21
-I01
+I00
 sg22
-I3
+I6
 stp1083
 Rp1084
-atp1085
-Rp1086
+ag3
+(g16
+g5
+(dp1085
+g18
+g19
+sg20
+I21
+sg21
+I01
+sg22
+I2
+stp1086
+Rp1087
+atp1088
+Rp1089
 sg20
 I7
-stp1087
-Rp1088
+stp1090
+Rp1091
 ag3
 (g11
 g5
-(dp1089
+(dp1092
 g13
 g3
 (g14
 g9
-(lp1090
-g1069
-ag1084
-ag3
-(g16
-g5
-(dp1091
-g18
-g26
-sg20
-I21
-sg21
-I00
-sg22
-I5
-stp1092
-Rp1093
+(lp1093
+g1075
+ag1087
 atp1094
 Rp1095
 sg20
-I7
+I0
 stp1096
 Rp1097
 atp1098
 Rp1099
 stp1100
 Rp1101
-ssS'u~ u~ > Z u~ u~ g'
-p1102
-(dp1103
-I26
+sI92
 g3
 (g4
 g5
+(dp1102
+g7
+g3
+(g8
+g9
+(lp1103
+g3
+(g11
+g5
 (dp1104
-g7
+g13
 g3
-(g8
+(g14
 g9
 (lp1105
-g3
-(g11
+g967
+ag1024
+ag3
+(g16
 g5
 (dp1106
-g13
-g3
-(g14
-g9
-(lp1107
-g3
-(g16
-g5
-(dp1108
 g18
 g19
 sg20
-I2
+I21
 sg21
 I01
 sg22
 I1
-stp1109
+stp1107
+Rp1108
+atp1109
 Rp1110
+sg20
+I7
+stp1111
+Rp1112
+ag3
+(g11
+g5
+(dp1113
+g13
+g3
+(g14
+g9
+(lp1114
+g982
+ag1027
 ag3
 (g16
 g5
-(dp1111
+(dp1115
 g18
 g26
 sg20
-I-2
+I21
 sg21
 I01
 sg22
+I3
+stp1116
+Rp1117
+atp1118
+Rp1119
+sg20
+I7
+stp1120
+Rp1121
+ag3
+(g11
+g5
+(dp1122
+g13
+g3
+(g14
+g9
+(lp1123
+g1108
+ag3
+(g16
+g5
+(dp1124
+g18
+g26
+sg20
+I21
+sg21
+I00
+sg22
 I4
-stp1112
-Rp1113
+stp1125
+Rp1126
 ag3
 (g16
 g5
-(dp1114
+(dp1127
 g18
 g19
 sg20
@@ -3743,320 +3800,254 @@
 I01
 sg22
 I1
-stp1115
-Rp1116
-atp1117
-Rp1118
-sg20
-I2
-stp1119
-Rp1120
-ag3
-(g11
-g5
-(dp1121
-g13
-g3
-(g14
-g9
-(lp1122
-g3
-(g16
-g5
-(dp1123
-g18
-g19
-sg20
-I2
-sg21
-I01
-sg22
-I2
-stp1124
-Rp1125
-ag3
-(g16
-g5
-(dp1126
-g18
-g26
-sg20
-I23
-sg21
-I01
-sg22
-I3
-stp1127
-Rp1128
-ag3
-(g16
-g5
-(dp1129
-g18
-g19
-sg20
-I2
-sg21
-I01
-sg22
-I2
-stp1130
+stp1128
+Rp1129
+atp1130
 Rp1131
-atp1132
+sg20
+I7
+stp1132
 Rp1133
-sg20
-I19
-stp1134
-Rp1135
 ag3
 (g11
 g5
+(dp1134
+g13
+g3
+(g14
+g9
+(lp1135
+g3
+(g16
+g5
 (dp1136
-g13
-g3
-(g14
-g9
-(lp1137
-g1116
-ag3
-(g16
-g5
-(dp1138
 g18
-g26
+g19
 sg20
-I-2
+I21
 sg21
 I00
 sg22
-I5
-stp1139
-Rp1140
+I2
+stp1137
+Rp1138
+ag1117
 ag3
 (g16
 g5
-(dp1141
+(dp1139
 g18
 g19
 sg20
-I-2
+I21
 sg21
 I01
 sg22
-I1
-stp1142
+I2
+stp1140
+Rp1141
+atp1142
 Rp1143
-atp1144
+sg20
+I7
+stp1144
 Rp1145
-sg20
-I2
-stp1146
-Rp1147
 ag3
 (g11
 g5
-(dp1148
+(dp1146
 g13
 g3
 (g14
 g9
-(lp1149
-g1131
-ag3
-(g16
-g5
-(dp1150
-g18
-g26
-sg20
-I21
-sg21
-I00
-sg22
-I6
-stp1151
-Rp1152
-ag3
-(g16
-g5
-(dp1153
-g18
-g19
-sg20
-I2
-sg21
-I01
-sg22
-I2
+(lp1147
+g1129
+ag1141
+atp1148
+Rp1149
+sg20
+I0
+stp1150
+Rp1151
+atp1152
+Rp1153
 stp1154
 Rp1155
-atp1156
-Rp1157
-sg20
-I2
-stp1158
-Rp1159
+sI93
+g3
+(g4
+g5
+(dp1156
+g7
+g3
+(g8
+g9
+(lp1157
+g3
+(g11
+g5
+(dp1158
+g13
+g3
+(g14
+g9
+(lp1159
+g967
+ag1024
 ag3
-(g11
+(g16
 g5
 (dp1160
-g13
-g3
-(g14
-g9
-(lp1161
-g1143
-ag1155
-atp1162
-Rp1163
-sg20
-I0
-stp1164
-Rp1165
-atp1166
-Rp1167
-stp1168
-Rp1169
-ssS'g g > g g g g g g'
-p1170
-(dp1171
-I73
-g3
-(g4
-g5
-(dp1172
-g7
-g3
-(g8
-g9
-(lp1173
-g3
+g18
+g19
+sg20
+I21
+sg21
+I01
+sg22
+I1
+stp1161
+Rp1162
+atp1163
+Rp1164
+sg20
+I7
+stp1165
+Rp1166
+ag3
 (g11
 g5
-(dp1174
+(dp1167
 g13
 g3
 (g14
 g9
-(lp1175
-g3
+(lp1168
+g985
+ag1027
+ag3
 (g16
 g5
+(dp1169
+g18
+g26
+sg20
+I21
+sg21
+I01
+sg22
+I4
+stp1170
+Rp1171
+atp1172
+Rp1173
+sg20
+I7
+stp1174
+Rp1175
+ag3
+(g11
+g5
 (dp1176
-g18
-g19
-sg20
-I21
-sg21
-I01
-sg22
-I1
-stp1177
-Rp1178
-ag3
-(g16
-g5
-(dp1179
-g18
-g19
-sg20
-I21
-sg21
-I01
-sg22
-I2
-stp1180
-Rp1181
-ag3
-(g16
-g5
-(dp1182
-g18
-g26
-sg20
-I21
-sg21
-I01
-sg22
-I1
-stp1183
-Rp1184
-atp1185
-Rp1186
-sg20
-I7
-stp1187
-Rp1188
-ag3
-(g11
-g5
-(dp1189
 g13
 g3
 (g14
 g9
-(lp1190
-g3
-(g16
-g5
-(dp1191
+(lp1177
+g1162
+ag3
+(g16
+g5
+(dp1178
+g18
+g19
+sg20
+I21
+sg21
+I00
+sg22
+I2
+stp1179
+Rp1180
+ag3
+(g16
+g5
+(dp1181
 g18
 g26
 sg20
 I21
 sg21
-I01
+I00
 sg22
 I3
-stp1192
-Rp1193
-ag3
-(g16
+stp1182
+Rp1183
+ag1171
+atp1184
+Rp1185
+sg20
+I8
+stp1186
+Rp1187
+atp1188
+Rp1189
+stp1190
+Rp1191
+ssS'g g > g g g'
+p1192
+(dp1193
+I0
+g3
+(g4
 g5
 (dp1194
+g7
+g3
+(g8
+g9
+(lp1195
+g3
+(g11
+g5
+(dp1196
+g13
+g3
+(g14
+g9
+(lp1197
+g3
+(g16
+g5
+(dp1198
 g18
-g26
+g19
 sg20
 I21
 sg21
 I01
 sg22
-I4
-stp1195
-Rp1196
+I1
+stp1199
+Rp1200
 ag3
 (g16
 g5
-(dp1197
+(dp1201
 g18
-g26
+g19
 sg20
 I21
 sg21
 I01
 sg22