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

[Olivier Mattelaer]

- limit process-size to 80 character. (avoid fortran problem)
- load automaticaly the SM if the model is not define in the define command.
(needed if a proc_card_v5 start with define)

[Johan Alwall (johan-alwall)]

Hello Olivier,

This looks nice, except I have one question: With the "uid" an attribute of the process, can you guarantee that this is unique across different processes? I would have expected to have it as a static variable (since the whole problem is combining different processes with different excluded particles but the same initial and final state).

review: Needs Information

[Olivier Mattelaer (olivier-mattelaer)]

Indeed, another possibility whould be to use a global.
Here I choose to initialize the uid before the export. (with assign_uid)
Then I'm sure that the uid is indeed unique.

I always prefer to minimize the use of global variable. But indeed this might be a more elegant solution.

def assign_uid(self):
80 + """ assign a unique identification to all process of the Amplitude
81 + present in the AmplitudeList"""
82 +
83 + for i, amp in enumerate(self):
84 + amp['process'].set('uid', i)

[Johan Alwall (johan-alwall)]

Ah, that is a nice solution, sorry I missed that. Thanks for the clarification!

Johan

=== 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-03-09 23:08:48 +0000
@@ -1385,6 +1385,7 @@
         self['model'] = Model()
         # Optional number to identify the process
         self['id'] = 0
+        self['uid'] = 0 # should be a uniq id number
         # Required s-channels are given as a list of id lists. Only
         # diagrams with all s-channels in any of the lists are
         # allowed. This enables generating e.g. Z/gamma as s-channel
@@ -1412,7 +1413,7 @@
             if not isinstance(value, Model):
                 raise self.PhysicsObjectError, \
                         "%s is not a valid Model object" % str(value)
-        if name == 'id':
+        if name in ['id', 'uid']:
             if not isinstance(value, int):
                 raise self.PhysicsObjectError, \
                     "Process id %s is not an integer" % repr(value)
@@ -1637,7 +1638,7 @@
         # Remove last space
         return mystr[:-1]
 
-    def shell_string(self):
+    def shell_string(self, schannel=True, forbid=True):
         """Returns process as string with '~' -> 'x', '>' -> '_',
         '+' -> 'p' and '-' -> 'm', including process number,
         intermediate s-channels and forbidden particles"""
@@ -1655,7 +1656,7 @@
                 mystr = mystr + '_'
                 # Add required s-channels
                 if self['required_s_channels'] and \
-                       self['required_s_channels'][0]:
+                       self['required_s_channels'][0] and schannel:
                     mystr += "_or_".join(["".join([self['model'].\
                                        get('particle_dict')[req_id].get_name() \
                                                 for req_id in id_list]) \
@@ -1668,7 +1669,7 @@
             prevleg = leg
 
         # Check for forbidden particles
-        if self['forbidden_particles']:
+        if self['forbidden_particles'] and forbid:
             mystr = mystr + '_no_'
             for forb_id in self['forbidden_particles']:
                 forbpart = self['model'].get('particle_dict')[forb_id]
@@ -1684,7 +1685,19 @@
         mystr = mystr.replace(' ', '')
 
         for decay in self.get('decay_chains'):
-            mystr = mystr + "_" + decay.shell_string()
+            mystr = mystr + "_" + decay.shell_string(schannel,forbid)
+
+        # Too long name are problematic so restrict them to a maximal of 80 char
+        if len(mystr) > 76:
+            if schannel and forbid:
+                return self.shell_string(True, False)+ '-%s' % self['uid']
+            elif schannel:
+                return self.shell_string(False, False)+'-%s' % self['uid']
+            else:
+                return mystr[:76]+'-%s' % self['uid']
+            
+            
+            
 
         return mystr
 

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2010-12-19 03:57:07 +0000
+++ madgraph/core/diagram_generation.py	2011-03-09 23:08:48 +0000
@@ -623,7 +623,14 @@
         """Test if object obj is a valid Amplitude for the list."""
 
         return isinstance(obj, Amplitude)
-
+    
+    def assign_uid(self):
+        """ assign a unique identification to all process of the Amplitude 
+            present in the AmplitudeList"""
+        
+        for i, amp in enumerate(self):
+            amp['process'].set('uid', i)
+        
 #===============================================================================
 # DecayChainAmplitude
 #===============================================================================

=== modified file 'madgraph/interface/cmd_interface.py'
--- madgraph/interface/cmd_interface.py	2011-01-27 12:30:18 +0000
+++ madgraph/interface/cmd_interface.py	2011-03-09 23:08:48 +0000
@@ -637,7 +637,8 @@
             raise self.InvalidCmd('\"define\" command requires symbols \"=\" at the second position')
         
         if not self._curr_model:
-            raise self.InvalidCmd("No particle list currently active, please import a model first")
+            logger.info('No model currently active. Try with the Standard Model')
+            self.do_import('model sm')
 
         if self._curr_model['particles'].find_name(args[0]):
             raise MadGraph5Error("label %s is a particle name in this model\n\
@@ -1422,6 +1423,9 @@
                                                     amp.nice_string_processes()
                         logger.warning(warning)
 
+                # assign a unique id to all amplitude
+                self._curr_amps.assign_uid()
+
                 # Reset _done_export, since we have new process
                 self._done_export = False
 
@@ -1788,6 +1792,8 @@
         # Generate processes
         myproc = diagram_generation.MultiProcess(myprocdef)
         self._curr_amps = myproc.get('amplitudes')
+        # assign a unique id to all amplitude
+        self._curr_amps.assign_uid()
         cpu_time2 = time.time()
 
         nprocs = len(self._curr_amps)

=== modified file 'tests/unit_tests/core/test_base_objects.py'
--- tests/unit_tests/core/test_base_objects.py	2011-01-17 15:12:08 +0000
+++ tests/unit_tests/core/test_base_objects.py	2011-03-09 23:08:48 +0000
@@ -1405,6 +1405,7 @@
                        'orders':{'QCD':5, 'QED':1},
                        'model':self.mymodel,
                        'id': 1,
+                       'uid':0,
                        'required_s_channels':[],
                        'forbidden_s_channels':[],
                        'forbidden_particles':[],
@@ -1524,7 +1525,32 @@
         goal_str = "2_cc_cxcc"
 
         self.assertEqual(goal_str, self.myprocess.shell_string())
-
+    
+    def test_long_shell_string(self):
+        """Test Process nice_string representation"""
+
+        goal_str = '1_cc_ccc_c_cccc_c_cccc_c_cccc_c_cccc_c_cccc_c_cccc-4'
+
+        decay = copy.copy(self.myprocess)
+        decay.set('legs', copy.deepcopy(decay.get('legs')))
+        decay.get('legs')[1].set('state', True)
+        decay.set('is_decay_chain', True)
+        decay.set('orders', {})
+        decay.set('forbidden_particles',[3])
+        decay2 = copy.copy(decay)
+        decay3 = copy.copy(decay)
+        decay4 = copy.copy(decay)
+        decay5 = copy.copy(decay)
+        decay6 = copy.copy(decay)
+        self.myprocess.set('uid',4)
+        self.myprocess.set('decay_chains', base_objects.ProcessList([decay]))
+        decay.set('decay_chains', base_objects.ProcessList([decay2]))
+        decay2.set('decay_chains', base_objects.ProcessList([decay3]))
+        decay3.set('decay_chains', base_objects.ProcessList([decay4]))
+        decay4.set('decay_chains', base_objects.ProcessList([decay5]))
+        decay5.set('decay_chains', base_objects.ProcessList([decay6]))
+        self.assertEqual(goal_str, self.myprocess.shell_string())
+        
 #===============================================================================
 # ProcessDefinitionTest
 #===============================================================================
@@ -1557,6 +1583,7 @@
                        'orders':{'QCD':5, 'QED':1},
                        'model':self.mymodel,
                        'id':3,
+                       'uid':0,
                        'required_s_channels':[],
                        'forbidden_s_channels':[],
                        'forbidden_particles':[],