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

[Johan Alwall]

- Fixed problem in generation of configs.inc with 8 or more final state particles
- Added the corresponding tests.

[Olivier Mattelaer (olivier-mattelaer)]

Thanks Johan!!

I didn't understand everything but it seems ok.
I suppose this should be release as 0.6.0.1
If you agree then go ahead for the release. (Otherwise I'll do tomorow)

review: Approve

=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2010-12-17 01:47:59 +0000
+++ madgraph/core/helas_objects.py	2010-12-23 16:04:09 +0000
@@ -890,7 +890,8 @@
         """Returns two lists of vertices corresponding to the s- and
         t-channels that can be traced from this wavefunction, ordered
         from the outermost s-channel and in/down towards the highest
-        number initial state leg."""
+        number initial state leg. mother_leg corresponds to self but with
+        correct leg number = min(final state mothers)."""
 
         schannels = base_objects.VertexList()
         tchannels = base_objects.VertexList()
@@ -916,15 +917,7 @@
             # leg of a decay process. Add vertex and continue stepping
             # down towards external initial state
             legs = base_objects.LegList()
-
-            if ninitial == 1 or init_mothers[0].get('number_external') == 2 \
-                   or init_mothers[0].get('leg_state') == True:
-                # This is an s-channel or a leg on its way towards the
-                # final vertex
-                mothers = final_mothers + init_mothers
-            else:
-                # This is a t-channel leg going up towards leg number 1
-                mothers = init_mothers + final_mothers
+            mothers = final_mothers + init_mothers
 
             for mother in mothers:
                 legs.append(base_objects.Leg({
@@ -934,19 +927,20 @@
                     'from_group': False
                     }))
 
-            if ninitial == 1 or init_mothers[0].get('number_external') == 2 \
-                   or init_mothers[0].get('leg_state') == True:
-                # For decay processes or if this is an s-channel leg
-                # or we are going towards external leg 2, mother leg
-                # is one of the mothers
+            if init_mothers[0].get('number_external') == 1 and \
+                   not init_mothers[0].get('leg_state') and \
+                   ninitial > 1:
+                # If this is t-channel going towards external leg 1,
+                # mother_leg is resulting wf
+                legs.append(mother_leg)
+            else:
+                # For decay processes or if init_mother is an s-channel leg
+                # or we are going towards external leg 2, mother_leg
+                # is one of the mothers (placed next-to-last)
                 legs.insert(-1, mother_leg)
-                # Also need to switch direction of the resulting s-channel
+                # Need to switch direction of the resulting s-channel
                 legs[-1].set('id', init_mothers[0].get_anti_pdg_code())
-            else:
-                # If the mother is going
-                # towards external leg 1, mother leg is resulting wf
-                legs.append(mother_leg)
-
+                
             # Renumber resulting leg according to minimum leg number
             legs[-1].set('number', min([l.get('number') for l in legs[:-1]]))
 
@@ -954,30 +948,32 @@
                 'id': self.get('interaction_id'),
                 'legs': legs})
 
-            # Add s- and t-channels from further down
+            # Add s- and t-channels from init_mother
             new_mother_leg = legs[-1]
-            if init_mothers[0].get('number_external') == 1:
-                # If we are going towards external leg 1, mother of
-                # next vertex is legs[0]
-                new_mother_leg = legs[0]
+            if init_mothers[0].get('number_external') == 1 and \
+                   not init_mothers[0].get('leg_state') and \
+                   ninitial > 1:
+                # Mother of next vertex is init_mothers[0]
+                # (next-to-last in legs)
+                new_mother_leg = legs[-2]
 
             mother_s, tchannels = \
                       init_mothers[0].get_s_and_t_channels(ninitial,
                                                            new_mother_leg)
-            schannels.extend(mother_s)
-
             if ninitial == 1 or init_mothers[0].get('leg_state') == True:
-                # This leg is s-channel
+                # This vertex is s-channel
                 schannels.append(vertex)
             elif init_mothers[0].get('number_external') == 1:
-                # If we are going towards external leg 1, add to
-                # t-channels, at end
+                # If init_mothers is going towards external leg 1, add
+                # to t-channels, at end
                 tchannels.append(vertex)
             else:
-                # If we are going towards external leg 2, add to
+                # If init_mothers is going towards external leg 2, add to
                 # t-channels, at start
                 tchannels.insert(0, vertex)
 
+            schannels.extend(mother_s)
+
         elif len(init_mothers) == 2:
             # This is a t-channel junction. Start with the leg going
             # towards external particle 1, and then do external
@@ -1019,6 +1015,7 @@
             schannels.extend(mother_s)
             tchannels.extend(mother_t)
 
+
         return schannels, tchannels
 
     def get_conjugate_index(self):

=== added file 'tests/input_files/test_8fs.pkl'
--- tests/input_files/test_8fs.pkl	1970-01-01 00:00:00 +0000
+++ tests/input_files/test_8fs.pkl	2010-12-23 16:04:09 +0000
@@ -0,0 +1,2051 @@
+(lp0
+ccopy_reg
+_reconstructor
+p1
+(cmadgraph.core.helas_objects
+HelasDiagram
+p2
+c__builtin__
+dict
+p3
+(dp4
+S'wavefunctions'
+p5
+g1
+(cmadgraph.core.helas_objects
+HelasWavefunctionList
+p6
+c__builtin__
+list
+p7
+(lp8
+tp9
+Rp10
+sS'amplitudes'
+p11
+g1
+(cmadgraph.core.helas_objects
+HelasAmplitudeList
+p12
+g7
+(lp13
+g1
+(cmadgraph.core.helas_objects
+HelasAmplitude
+p14
+g3
+(dp15
+S'inter_color'
+p16
+g1
+(cmadgraph.core.color_algebra
+ColorString
+p17
+g7
+(lp18
+cmadgraph.core.color_algebra
+T
+p19
+(I1
+I0
+tp20
+Rp21
+atp22
+Rp23
+(dp24
+S'coeff'
+p25
+cfractions
+Fraction
+p26
+(S'1'
+p27
+tp28
+Rp29
+sS'is_imaginary'
+p30
+I00
+sS'Nc_power'
+p31
+I0
+sbsS'coupling'
+p32
+S'GC_1'
+p33
+sS'mothers'
+p34
+g1
+(g6
+g7
+(lp35
+g1
+(cmadgraph.core.helas_objects
+HelasWavefunction
+p36
+g3
+(dp37
+S'number_external'
+p38
+I6
+sS'fermionflow'
+p39
+I1
+sS'coupl_key'
+p40
+(I0
+I0
+tp41
+sS'number'
+p42
+I59
+sS'onshell'
+p43
+I00
+sS'antiparticle'
+p44
+g1
+(cmadgraph.core.base_objects
+Particle
+p45
+g3
+(dp46
+S'texname'
+p47
+S'b'
+p48
+sS'is_part'
+p49
+I01
+sS'name'
+p50
+S'b'
+p51
+sS'self_antipart'
+p52
+I00
+sS'color'
+p53
+I3
+sS'width'
+p54
+S'ZERO'
+p55
+sS'charge'
+p56
+F-0.33333333333333331
+sS'mass'
+p57
+S'MB'
+p58
+sS'antiname'
+p59
+S'b~'
+p60
+sS'line'
+p61
+S'straight'
+p62
+sS'propagating'
+p63
+I01
+sS'spin'
+p64
+I2
+sS'antitexname'
+p65
+g48
+sS'pdg_code'
+p66
+I5
+stp67
+Rp68
+sS'lorentz'
+p69
+S'FFV1'
+p70
+sS'leg_state'
+p71
+I01
+sS'orders'
+p72
+(dp73
+S'QCD'
+p74
+I1
+ssg16
+g1
+(g17
+g7
+(lp75
+g19
+(I2
+I1
+I0
+tp76
+Rp77
+atp78
+Rp79
+(dp80
+g25
+g26
+(g27
+tp81
+Rp82
+sg30
+I00
+sg31
+I0
+sbsg32
+S'GC_5'
+p83
+sS'particle'
+p84
+g1
+(g45
+g3
+(dp85
+g47
+g48
+sg63
+I01
+sg50
+g51
+sg52
+I00
+sg53
+I3
+sg54
+g55
+sg56
+F-0.33333333333333331
+sg57
+g58
+sg59
+g60
+sg61
+g62
+sg49
+I00
+sg64
+I2
+sg65
+g48
+sg66
+I5
+stp86
+Rp87
+sg34
+g1
+(g6
+g7
+(lp88
+g1
+(g36
+g3
+(dp89
+g38
+I6
+sg39
+I1
+sg40
+g41
+sg42
+I45
+sg43
+I00
+sg44
+g68
+sg69
+g70
+sg71
+I01
+sg72
+g73
+sg16
+g79
+sg32
+g83
+sg84
+g87
+sg34
+g1
+(g6
+g7
+(lp90
+g1
+(g36
+g3
+(dp91
+g38
+I6
+sg39
+I1
+sg40
+(I0
+I0
+tp92
+sg42
+I6
+sg43
+I00
+sg44
+g68
+sg69
+S''
+p93
+sg71
+I01
+sg72
+(dp94
+sg16
+Nsg32
+S'none'
+p95
+sg84
+g87
+sg34
+g1
+(g6
+g7
+(lp96
+tp97
+Rp98
+sS'decay'
+p99
+I00
+sS'state'
+p100
+S'incoming'
+p101
+sS'is_part'
+p102
+I00
+sS'pdg_codes'
+p103
+(lp104
+sS'interaction_id'
+p105
+I0
+stp106
+Rp107
+ag1
+(g36
+g3
+(dp108
+g38
+I8
+sg39
+I1
+sg40
+g92
+sg42
+I8
+sg43
+I00
+sg44
+g1
+(g45
+g3
+(dp109
+g47
+S'G'
+p110
+sg49
+I01
+sg50
+S'g'
+p111
+sg52
+I01
+sg53
+I8
+sg54
+g55
+sg56
+F0.0
+sg57
+g55
+sg59
+S'g'
+p112
+sg61
+S'curly'
+p113
+sg63
+I01
+sg64
+I3
+sg65
+g110
+sg66
+I21
+stp114
+Rp115
+sg69
+g93
+sg71
+I01
+sg72
+(dp116
+sg16
+Nsg32
+g95
+sg84
+g115
+sg34
+g1
+(g6
+g7
+(lp117
+tp118
+Rp119
+sg99
+I00
+sg100
+S'final'
+p120
+sg102
+I01
+sg103
+(lp121
+sg105
+I0
+stp122
+Rp123
+atp124
+Rp125
+sg99
+I00
+sg100
+g101
+sg102
+I00
+sg103
+(lp126
+I-5
+aI5
+aI21
+asg105
+I25
+stp127
+Rp128
+ag1
+(g36
+g3
+(dp129
+g38
+I7
+sg39
+I1
+sg40
+g92
+sg42
+I7
+sg43
+I00
+sg44
+g115
+sg69
+g93
+sg71
+I01
+sg72
+(dp130
+sg16
+Nsg32
+g95
+sg84
+g115
+sg34
+g1
+(g6
+g7
+(lp131
+tp132
+Rp133
+sg99
+I00
+sg100
+g120
+sg102
+I01
+sg103
+(lp134
+sg105
+I0
+stp135
+Rp136
+atp137
+Rp138
+sg99
+I00
+sg100
+g101
+sg102
+I00
+sg103
+(lp139
+I-5
+aI5
+aI21
+asg105
+I25
+stp140
+Rp141
+ag1
+(g36
+g3
+(dp142
+g38
+I5
+sg39
+I1
+sg40
+g92
+sg42
+I5
+sg43
+I00
+sg44
+g87
+sg69
+g93
+sg71
+I01
+sg72
+(dp143
+sg16
+Nsg32
+g95
+sg84
+g68
+sg34
+g1
+(g6
+g7
+(lp144
+tp145
+Rp146
+sg99
+I00
+sg100
+S'outgoing'
+p147
+sg102
+I01
+sg103
+(lp148
+sg105
+I0
+stp149
+Rp150
+ag1
+(g36
+g3
+(dp151
+g38
+I1
+sg39
+I1
+sg40
+(I0
+I0
+tp152
+sg42
+I129
+sg43
+I00
+sg44
+g1
+(g45
+g3
+(dp153
+g47
+S'A'
+p154
+sg49
+I01
+sg50
+S'a'
+p155
+sg52
+I01
+sg53
+I1
+sg54
+g55
+sg56
+F0.0
+sg57
+g55
+sg59
+S'a'
+p156
+sg61
+S'wavy'
+p157
+sg63
+I01
+sg64
+I3
+sg65
+g154
+sg66
+I22
+stp158
+Rp159
+sg69
+g70
+sg71
+I01
+sg72
+(dp160
+S'QED'
+p161
+I1
+ssg16
+g1
+(g17
+g7
+(lp162
+g19
+(I1
+I0
+tp163
+Rp164
+atp165
+Rp166
+(dp167
+g25
+g26
+(g27
+tp168
+Rp169
+sg30
+I00
+sg31
+I0
+sbsg32
+g33
+sg84
+g159
+sg34
+g1
+(g6
+g7
+(lp170
+g1
+(g36
+g3
+(dp171
+g38
+I1
+sg39
+I1
+sg40
+(I0
+I0
+tp172
+sg42
+I71
+sg43
+I00
+sg44
+g1
+(g45
+g3
+(dp173
+g47
+S'd'
+p174
+sg49
+I01
+sg50
+S'd'
+p175
+sg52
+I00
+sg53
+I3
+sg54
+g55
+sg56
+F-0.33333333333333331
+sg57
+g55
+sg59
+S'd~'
+p176
+sg61
+g62
+sg63
+I01
+sg64
+I2
+sg65
+g174
+sg66
+I1
+stp177
+Rp178
+sg69
+S'FFV2'
+p179
+sg71
+I01
+sg72
+(dp180
+g161
+I1
+ssg16
+g1
+(g17
+g7
+(lp181
+g19
+(I1
+I0
+tp182
+Rp183
+atp184
+Rp185
+(dp186
+g25
+g26
+(g27
+tp187
+Rp188
+sg30
+I00
+sg31
+I0
+sbsg32
+S'GC_11'
+p189
+sg84
+g1
+(g45
+g3
+(dp190
+g47
+g174
+sg63
+I01
+sg50
+g175
+sg52
+I00
+sg53
+I3
+sg54
+g55
+sg56
+F-0.33333333333333331
+sg57
+g55
+sg59
+g176
+sg61
+g62
+sg49
+I00
+sg64
+I2
+sg65
+g174
+sg66
+I1
+stp191
+Rp192
+sg34
+g1
+(g6
+g7
+(lp193
+g1
+(g36
+g3
+(dp194
+g38
+I1
+sg39
+I1
+sg40
+(I0
+I0
+tp195
+sg42
+I9
+sg43
+I00
+sg44
+g1
+(g45
+g3
+(dp196
+g47
+S'u'
+p197
+sg49
+I01
+sg50
+S'u'
+p198
+sg52
+I00
+sg53
+I3
+sg54
+g55
+sg56
+F0.66666666666666663
+sg57
+g55
+sg59
+S'u~'
+p199
+sg61
+g62
+sg63
+I01
+sg64
+I2
+sg65
+g197
+sg66
+I2
+stp200
+Rp201
+sg69
+g70
+sg71
+I01
+sg72
+g73
+sg16
+g1
+(g17
+g7
+(lp202
+g19
+(I2
+I1
+I0
+tp203
+Rp204
+atp205
+Rp206
+(dp207
+g25
+g26
+(g27
+tp208
+Rp209
+sg30
+I00
+sg31
+I0
+sbsg32
+g83
+sg84
+g1
+(g45
+g3
+(dp210
+g47
+g197
+sg63
+I01
+sg50
+g198
+sg52
+I00
+sg53
+I3
+sg54
+g55
+sg56
+F0.66666666666666663
+sg57
+g55
+sg59
+g199
+sg61
+g62
+sg49
+I00
+sg64
+I2
+sg65
+g197
+sg66
+I2
+stp211
+Rp212
+sg34
+g1
+(g6
+g7
+(lp213
+g1
+(g36
+g3
+(dp214
+g38
+I1
+sg39
+I1
+sg40
+g92
+sg42
+I1
+sg43
+I00
+sg44
+g201
+sg69
+g93
+sg71
+I00
+sg72
+(dp215
+sg16
+Nsg32
+g95
+sg84
+g212
+sg34
+g1
+(g6
+g7
+(lp216
+tp217
+Rp218
+sg99
+I00
+sg100
+g101
+sg102
+I01
+sg103
+(lp219
+sg105
+I0
+stp220
+Rp221
+ag1
+(g36
+g3
+(dp222
+g38
+I2
+sg39
+I1
+sg40
+g92
+sg42
+I2
+sg43
+I00
+sg44
+g115
+sg69
+g93
+sg71
+I00
+sg72
+(dp223
+sg16
+Nsg32
+g95
+sg84
+g115
+sg34
+g1
+(g6
+g7
+(lp224
+tp225
+Rp226
+sg99
+I00
+sg100
+S'initial'
+p227
+sg102
+I01
+sg103
+(lp228
+sg105
+I0
+stp229
+Rp230
+atp231
+Rp232
+sg99
+I00
+sg100
+g101
+sg102
+I00
+sg103
+(lp233
+I-2
+aI2
+aI21
+asg105
+I36
+stp234
+Rp235
+ag1
+(g36
+g3
+(dp236
+g38
+I4
+sg39
+I1
+sg40
+g92
+sg42
+I4
+sg43
+I00
+sg44
+g1
+(g45
+g3
+(dp237
+g47
+S'W+'
+p238
+sg63
+I01
+sg50
+S'w+'
+p239
+sg52
+I00
+sg53
+I1
+sg54
+S'WW'
+p240
+sg56
+F1.0
+sg57
+S'MW'
+p241
+sg59
+S'w-'
+p242
+sg61
+g157
+sg49
+I00
+sg64
+I3
+sg65
+g238
+sg66
+I24
+stp243
+Rp244
+sg69
+g93
+sg71
+I01
+sg72
+(dp245
+sg16
+Nsg32
+g95
+sg84
+g1
+(g45
+g3
+(dp246
+g47
+g238
+sg49
+I01
+sg50
+g239
+sg52
+I00
+sg53
+I1
+sg54
+g240
+sg56
+F1.0
+sg57
+g241
+sg59
+g242
+sg61
+g157
+sg63
+I01
+sg64
+I3
+sg65
+g238
+sg66
+I24
+stp247
+Rp248
+sg34
+g1
+(g6
+g7
+(lp249
+tp250
+Rp251
+sg99
+I00
+sg100
+g120
+sg102
+I01
+sg103
+(lp252
+sg105
+I0
+stp253
+Rp254
+atp255
+Rp256
+sg99
+I00
+sg100
+g101
+sg102
+I00
+sg103
+(lp257
+I-2
+aI1
+aI24
+asg105
+I33
+stp258
+Rp259
+ag1
+(g36
+g3
+(dp260
+g38
+I3
+sg39
+I1
+sg40
+g92
+sg42
+I3
+sg43
+I00
+sg44
+g192
+sg69
+g93
+sg71
+I01
+sg72
+(dp261
+sg16
+Nsg32
+g95
+sg84
+g178
+sg34
+g1
+(g6
+g7
+(lp262
+tp263
+Rp264
+sg99
+I00
+sg100
+g147
+sg102
+I01
+sg103
+(lp265
+sg105
+I0
+stp266
+Rp267
+atp268
+Rp269
+sg99
+I00
+sg100
+S'intermediate'
+p270
+sg102
+I01
+sg103
+(lp271
+I-1
+aI1
+aI22
+asg105
+I14
+stp272
+Rp273
+atp274
+Rp275
+sg40
+(I0
+I0
+tp276
+sg42
+I547
+sg103
+(lp277
+I-5
+aI5
+aI22
+asg69
+g70
+sg105
+I16
+sS'color_indices'
+p278
+(lp279
+I0
+aI0
+aI0
+aI0
+aI0
+aI0
+asg72
+g160
+sS'fermionfactor'
+p280
+I-1
+stp281
+Rp282
+atp283
+Rp284
+sg42
+I324
+stp285
+Rp286
+ag1
+(g2
+g3
+(dp287
+g5
+g1
+(g6
+g7
+(lp288
+tp289
+Rp290
+sg11
+g1
+(g12
+g7
+(lp291
+g1
+(g14
+g3
+(dp292
+g16
+g79
+sg32
+g83
+sg34
+g1
+(g6
+g7
+(lp293
+g107
+ag1
+(g36
+g3
+(dp294
+g38
+I2
+sg39
+I1
+sg40
+g41
+sg42
+I179
+sg43
+I00
+sg44
+g87
+sg69
+g70
+sg71
+I00
+sg72
+g73
+sg16
+g79
+sg32
+g83
+sg84
+g68
+sg34
+g1
+(g6
+g7
+(lp295
+g150
+ag1
+(g36
+g3
+(dp296
+g38
+I2
+sg39
+I1
+sg40
+(I0
+I0
+tp297
+sg42
+I178
+sg43
+I00
+sg44
+g115
+sg69
+S'VVV1'
+p298
+sg71
+I00
+sg72
+(dp299
+g74
+I1
+ssg16
+g1
+(g17
+g7
+(lp300
+cmadgraph.core.color_algebra
+f
+p301
+(I0
+I1
+I2
+tp302
+Rp303
+atp304
+Rp305
+(dp306
+g25
+g26
+(g27
+tp307
+Rp308
+sg30
+I00
+sg31
+I0
+sbsg32
+S'GC_4'
+p309
+sg84
+g115
+sg34
+g1
+(g6
+g7
+(lp310
+g230
+ag123
+atp311
+Rp312
+sg99
+I00
+sg100
+g270
+sg102
+I01
+sg103
+(lp313
+I21
+aI21
+aI21
+asg105
+I2
+stp314
+Rp315
+atp316
+Rp317
+sg99
+I00
+sg100
+g147
+sg102
+I01
+sg103
+(lp318
+I-5
+aI5
+aI21
+asg105
+I25
+stp319
+Rp320
+ag1
+(g36
+g3
+(dp321
+g38
+I1
+sg39
+I1
+sg40
+(I0
+I0
+tp322
+sg42
+I239
+sg43
+I00
+sg44
+g115
+sg69
+g70
+sg71
+I00
+sg72
+g73
+sg16
+g1
+(g17
+g7
+(lp323
+g19
+(I2
+I1
+I0
+tp324
+Rp325
+atp326
+Rp327
+(dp328
+g25
+g26
+(g27
+tp329
+Rp330
+sg30
+I00
+sg31
+I0
+sbsg32
+g83
+sg84
+g115
+sg34
+g1
+(g6
+g7
+(lp331
+g1
+(g36
+g3
+(dp332
+g38
+I1
+sg39
+I1
+sg40
+g322
+sg42
+I206
+sg43
+I00
+sg44
+g178
+sg69
+g70
+sg71
+I00
+sg72
+g73
+sg16
+g327
+sg32
+g83
+sg84
+g192
+sg34
+g1
+(g6
+g7
+(lp333
+g1
+(g36
+g3
+(dp334
+g38
+I1
+sg39
+I1
+sg40
+g172
+sg42
+I201
+sg43
+I00
+sg44
+g178
+sg69
+g179
+sg71
+I00
+sg72
+g180
+sg16
+g185
+sg32
+g189
+sg84
+g192
+sg34
+g1
+(g6
+g7
+(lp335
+g221
+ag254
+atp336
+Rp337
+sg99
+I00
+sg100
+g101
+sg102
+I00
+sg103
+(lp338
+I-2
+aI1
+aI24
+asg105
+I33
+stp339
+Rp340
+ag136
+atp341
+Rp342
+sg99
+I00
+sg100
+g101
+sg102
+I00
+sg103
+(lp343
+I-1
+aI1
+aI21
+asg105
+I23
+stp344
+Rp345
+ag267
+atp346
+Rp347
+sg99
+I00
+sg100
+g270
+sg102
+I01
+sg103
+(lp348
+I-1
+aI1
+aI21
+asg105
+I23
+stp349
+Rp350
+atp351
+Rp352
+sg40
+g41
+sg42
+I1573
+sg103
+(lp353
+I-5
+aI5
+aI21
+asg69
+g70
+sg105
+I25
+sg278
+(lp354
+I0
+aI0
+aI0
+aI0
+aI0
+aI0
+asg72
+g73
+sg280
+I-1
+stp355
+Rp356
+atp357
+Rp358
+sg42
+I955
+stp359
+Rp360
+ag1
+(g2
+g3
+(dp361
+g5
+g1
+(g6
+g7
+(lp362
+tp363
+Rp364
+sg11
+g1
+(g12
+g7
+(lp365
+g1
+(g14
+g3
+(dp366
+g16
+g305
+sg32
+g309
+sg34
+g1
+(g6
+g7
+(lp367
+g1
+(g36
+g3
+(dp368
+g38
+I5
+sg39
+I1
+sg40
+g297
+sg42
+I21
+sg43
+I00
+sg44
+g115
+sg69
+g298
+sg71
+I01
+sg72
+g299
+sg16
+g305
+sg32
+g309
+sg84
+g115
+sg34
+g1
+(g6
+g7
+(lp369
+g1
+(g36
+g3
+(dp370
+g38
+I5
+sg39
+I1
+sg40
+g41
+sg42
+I18
+sg43
+I00
+sg44
+g115
+sg69
+g70
+sg71
+I01
+sg72
+g73
+sg16
+g79
+sg32
+g83
+sg84
+g115
+sg34
+g1
+(g6
+g7
+(lp371
+g107
+ag150
+atp372
+Rp373
+sg99
+I00
+sg100
+g270
+sg102
+I01
+sg103
+(lp374
+I-5
+aI5
+aI21
+asg105
+I25
+stp375
+Rp376
+ag123
+atp377
+Rp378
+sg99
+I00
+sg100
+g270
+sg102
+I01
+sg103
+(lp379
+I21
+aI21
+aI21
+asg105
+I2
+stp380
+Rp381
+ag136
+ag1
+(g36
+g3
+(dp382
+g38
+I1
+sg39
+I1
+sg40
+g322
+sg42
+I298
+sg43
+I00
+sg44
+g115
+sg69
+g70
+sg71
+I01
+sg72
+g73
+sg16
+g327
+sg32
+g83
+sg84
+g115
+sg34
+g1
+(g6
+g7
+(lp383
+g1
+(g36
+g3
+(dp384
+g38
+I1
+sg39
+I1
+sg40
+g322
+sg42
+I290
+sg43
+I00
+sg44
+g178
+sg69
+g70
+sg71
+I01
+sg72
+g73
+sg16
+g327
+sg32
+g83
+sg84
+g192
+sg34
+g1
+(g6
+g7
+(lp385
+g340
+ag230
+atp386
+Rp387
+sg99
+I00
+sg100
+g101
+sg102
+I00
+sg103
+(lp388
+I-1
+aI1
+aI21
+asg105
+I23
+stp389
+Rp390
+ag267
+atp391
+Rp392
+sg99
+I00
+sg100
+g270
+sg102
+I01
+sg103
+(lp393
+I-1
+aI1
+aI21
+asg105
+I23
+stp394
+Rp395
+atp396
+Rp397
+sg40
+g297
+sg42
+I1880
+sg103
+(lp398
+I21
+aI21
+aI21
+asg69
+g298
+sg105
+I2
+sg278
+(lp399
+I0
+aI0
+aI0
+aI0
+aI0
+aI0
+asg72
+g299
+sg280
+I-1
+stp400
+Rp401
+atp402
+Rp403
+sg42
+I1124
+stp404
+Rp405
+ag1
+(g2
+g3
+(dp406
+g5
+g1
+(g6
+g7
+(lp407
+tp408
+Rp409
+sg11
+g1
+(g12
+g7
+(lp410
+g1
+(g14
+g3
+(dp411
+g16
+g327
+sg32
+g83
+sg34
+g1
+(g6
+g7
+(lp412
+g1
+(g36
+g3
+(dp413
+g38
+I1
+sg39
+I1
+sg40
+g322
+sg42
+I238
+sg43
+I00
+sg44
+g178
+sg69
+g70
+sg71
+I00
+sg72
+g73
+sg16
+g327
+sg32
+g83
+sg84
+g192
+sg34
+g1
+(g6
+g7
+(lp414
+g345
+ag123
+atp415
+Rp416
+sg99
+I00
+sg100
+g101
+sg102
+I00
+sg103
+(lp417
+I-1
+aI1
+aI21
+asg105
+I23
+stp418
+Rp419
+ag267
+ag1
+(g36
+g3
+(dp420
+g38
+I2
+sg39
+I1
+sg40
+g297
+sg42
+I292
+sg43
+I00
+sg44
+g115
+sg69
+g298
+sg71
+I00
+sg72
+g299
+sg16
+g305
+sg32
+g309
+sg84
+g115
+sg34
+g1
+(g6
+g7
+(lp421
+g230
+ag376
+atp422
+Rp423
+sg99
+I00
+sg100
+g270
+sg102
+I01
+sg103
+(lp424
+I21
+aI21
+aI21
+asg105
+I2
+stp425
+Rp426
+atp427
+Rp428
+sg40
+g322
+sg42
+I1910
+sg103
+(lp429
+I-1
+aI1
+aI21
+asg69
+g70
+sg105
+I23
+sg278
+(lp430
+I0
+aI0
+aI0
+aI0
+aI0
+aI0
+asg72
+g73
+sg280
+I-1
+stp431
+Rp432
+atp433
+Rp434
+sg42
+I1140
+stp435
+Rp436
+a.
\ No newline at end of file

=== modified file 'tests/unit_tests/iolibs/test_export_v4.py'
--- tests/unit_tests/iolibs/test_export_v4.py	2010-12-17 01:47:59 +0000
+++ tests/unit_tests/iolibs/test_export_v4.py	2010-12-23 16:04:09 +0000
@@ -19,6 +19,10 @@
 import copy
 import fractions
 import os 
+import sys
+
+root_path = os.path.split(os.path.dirname(os.path.realpath( __file__ )))[0]
+sys.path.append(os.path.join(root_path, os.path.pardir, os.path.pardir))
 
 import tests.unit_tests as unittest
 
@@ -26,6 +30,7 @@
 import madgraph.iolibs.export_v4 as export_v4
 import madgraph.iolibs.file_writers as writers
 import madgraph.iolibs.helas_call_writers as helas_call_writers
+import madgraph.iolibs.save_load_object as save_load_object        
 import madgraph.core.base_objects as base_objects
 import madgraph.core.helas_objects as helas_objects
 import madgraph.core.diagram_generation as diagram_generation
@@ -36,6 +41,9 @@
 import tests.unit_tests.iolibs.test_helas_call_writers as \
                                             test_helas_call_writers
 
+_file_path = os.path.dirname(os.path.realpath(__file__))
+_input_file_path = os.path.join(_file_path, os.path.pardir, os.path.pardir,
+                                'input_files')
 #===============================================================================
 # IOImportV4Test
 #===============================================================================
@@ -4466,7 +4474,7 @@
             self.assertEqual(result[i], goal_string[i])
 
     def test_configs_ug_ttxz(self):
-        """Test config.inc which previously failed.
+        """Test configs.inc which previously failed.
         """
 
         mypartlist = base_objects.ParticleList()
@@ -4800,6 +4808,247 @@
       POW(-3,10) = 1
 """)
         
+    def test_configs_long_decay(self):
+        """Test configs.inc which previously failed.
+        """
+
+        mypartlist = base_objects.ParticleList()
+        myinterlist = base_objects.InteractionList()
+
+        # b and t quarks
+        mypartlist.append(base_objects.Particle({'name':'b',
+                      'antiname':'b~',
+                      'spin':2,
+                      'color':3,
+                      'mass':'zero',
+                      'width':'zero',
+                      'texname':'b',
+                      'antitexname':'\bar b',
+                      'line':'straight',
+                      'charge':-1. / 3.,
+                      'pdg_code':5,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        b = mypartlist[len(mypartlist) - 1]
+        antib = copy.copy(b)
+        antib.set('is_part', False)
+
+        mypartlist.append(base_objects.Particle({'name':'t',
+                      'antiname':'t~',
+                      'spin':2,
+                      'color':3,
+                      'mass':'MT',
+                      'width':'WT',
+                      'texname':'y',
+                      'antitexname':'\bar t',
+                      'line':'straight',
+                      'charge':2. / 3.,
+                      'pdg_code':6,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':False}))
+        t = mypartlist[len(mypartlist) - 1]
+        antit = copy.copy(t)
+        antit.set('is_part', False)
+
+        # A w
+        mypartlist.append(base_objects.Particle({'name':'w+',
+                      'antiname':'w+',
+                      'spin':3,
+                      'mass':'wmass',
+                      'width':'wwidth',
+                      'texname':'\gamma',
+                      'antitexname':'\gamma',
+                      'line':'wavy',
+                      'charge':1.,
+                      'pdg_code':24,
+                      'propagating':True,
+                      'is_part':True,
+                      'self_antipart':True}))
+        wplus = mypartlist[len(mypartlist) - 1]
+        wminus = copy.copy(wplus)
+        wplus.set('is_part', False)
+
+        # A gluon
+        mypartlist.append(base_objects.Particle({'name': 'g',
+                                                 'antiname': 'g',
+                                                 'spin': 3,
+                                                 'color': 8,
+                                                 'charge': 0.00,
+                                                 'mass': 'ZERO',
+                                                 'width': 'ZERO',
+                                                 'pdg_code': 21,
+                                                 'texname': '_',
+                                                 'antitexname': '_',
+                                                 'line': 'curly',
+                                                 'propagating': True,
+                                                 'is_part': True,
+                                                 'self_antipart': True}))
+
+        g = mypartlist[len(mypartlist) - 1]
+
+        # t b w couplings
+        myinterlist.append(base_objects.Interaction({
+                      'id': 1,
+                      'particles': base_objects.ParticleList(\
+                                            [t, \
+                                             antib, \
+                                             wminus]),
+                      'color': [color.ColorString([color.T(0, 1)])],
+                      'lorentz':['L1'],
+                      'couplings':{(0,0):'GC_23'},
+                      'orders':{'QED':1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                      'id': 2,
+                      'particles': base_objects.ParticleList(\
+                                            [antit, \
+                                             b, \
+                                             wplus]),
+                      'color': [color.ColorString([color.T(0, 1)])],
+                      'lorentz':['L1'],
+                      'couplings':{(0,0):'GC_23'},
+                      'orders':{'QED':1}}))
+
+        # Gluon couplings to quarks
+        myinterlist.append(base_objects.Interaction({
+                      'id': 3,
+                      'particles': base_objects.ParticleList(\
+                                            [antib, \
+                                             b, \
+                                             g]),
+                      'color': [color.ColorString([color.T(2, 1, 0)])],
+                      'lorentz':[''],
+                      'couplings':{(0, 0):'GG'},
+                      'orders':{'QCD':1}}))
+
+        myinterlist.append(base_objects.Interaction({
+                      'id': 4,
+                      'particles': base_objects.ParticleList(\
+                                            [antit, \
+                                             t, \
+                                             g]),
+                      'color': [color.ColorString([color.T(2, 1, 0)])],
+                      'lorentz':[''],
+                      'couplings':{(0, 0):'GG'},
+                      'orders':{'QCD':1}}))
+
+        mymodel = base_objects.Model()
+        mymodel.set('particles', mypartlist)
+        mymodel.set('interactions', myinterlist)
+
+        myleglist = base_objects.LegList()
+
+        myleglist.append(base_objects.Leg({'id':6,
+                                         'state':False}))
+        myleglist.append(base_objects.Leg({'id':21}))
+        myleglist.append(base_objects.Leg({'id':5}))
+        myleglist.append(base_objects.Leg({'id':24}))
+        myleglist.append(base_objects.Leg({'id':21}))
+        
+        myproc = base_objects.Process({'legs':myleglist,
+                                       'model':mymodel})
+        myamplitude = diagram_generation.Amplitude({'process': myproc})
+
+        me = helas_objects.HelasMatrixElement(myamplitude,
+                                              gen_color=False)
+
+        myfortranmodel = helas_call_writers.FortranHelasCallWriter(mymodel)
+        writer = writers.FortranWriter(self.give_pos('test'))
+
+        # Test configs file
+        nconfig, s_and_t_channels = export_v4.write_configs_file(writer,
+                                     me,
+                                     myfortranmodel)
+        writer.close()
+
+        self.assertFileContains('test',
+"""C     Diagram 1, Amplitude 1
+      DATA MAPCONFIG(1)/1/
+      DATA (IFOREST(I,-1,1),I=1,2)/3,2/
+      DATA SPROP(-1,1)/5/
+      DATA (IFOREST(I,-2,1),I=1,2)/4,-1/
+      DATA SPROP(-2,1)/6/
+      DATA (IFOREST(I,-3,1),I=1,2)/5,-2/
+      DATA SPROP(-3,1)/6/
+C     Diagram 2, Amplitude 2
+      DATA MAPCONFIG(2)/2/
+      DATA (IFOREST(I,-1,2),I=1,2)/3,2/
+      DATA SPROP(-1,2)/5/
+      DATA (IFOREST(I,-2,2),I=1,2)/5,-1/
+      DATA SPROP(-2,2)/5/
+      DATA (IFOREST(I,-3,2),I=1,2)/4,-2/
+      DATA SPROP(-3,2)/6/
+C     Diagram 3, Amplitude 3
+      DATA MAPCONFIG(3)/3/
+      DATA (IFOREST(I,-1,3),I=1,2)/4,3/
+      DATA SPROP(-1,3)/6/
+      DATA (IFOREST(I,-2,3),I=1,2)/-1,2/
+      DATA SPROP(-2,3)/6/
+      DATA (IFOREST(I,-3,3),I=1,2)/5,-2/
+      DATA SPROP(-3,3)/6/
+C     Diagram 4, Amplitude 4
+      DATA MAPCONFIG(4)/4/
+      DATA (IFOREST(I,-1,4),I=1,2)/4,3/
+      DATA SPROP(-1,4)/6/
+      DATA (IFOREST(I,-2,4),I=1,2)/5,-1/
+      DATA SPROP(-2,4)/6/
+      DATA (IFOREST(I,-3,4),I=1,2)/-2,2/
+      DATA SPROP(-3,4)/6/
+C     Diagram 5, Amplitude 5
+      DATA MAPCONFIG(5)/5/
+      DATA (IFOREST(I,-1,5),I=1,2)/5,3/
+      DATA SPROP(-1,5)/5/
+      DATA (IFOREST(I,-2,5),I=1,2)/-1,2/
+      DATA SPROP(-2,5)/5/
+      DATA (IFOREST(I,-3,5),I=1,2)/4,-2/
+      DATA SPROP(-3,5)/6/
+C     Diagram 6, Amplitude 6
+      DATA MAPCONFIG(6)/6/
+      DATA (IFOREST(I,-1,6),I=1,2)/5,3/
+      DATA SPROP(-1,6)/5/
+      DATA (IFOREST(I,-2,6),I=1,2)/4,-1/
+      DATA SPROP(-2,6)/6/
+      DATA (IFOREST(I,-3,6),I=1,2)/-2,2/
+      DATA SPROP(-3,6)/6/
+C     Number of configs
+      DATA MAPCONFIG(0)/6/
+""")
+
+    def test_configs_8fs(self):
+        """Test configs.inc for 8fs process which previously failed.
+        """
+
+        diagrams = save_load_object.load_from_file(\
+                                              os.path.join(_input_file_path,
+                                                           'test_8fs.pkl'))
+
+        goal_schannels = [[[8, 6, -1], [7, -1, -2], [-2, 5, -3],
+                           [-3, 3, -4], [4, -4, -5]],
+                          [],
+                          [[6, 5, -1], [8, -1, -2], [7, -2, -3], [-3, 3, -4]],
+                          [[6, 5, -1]]]
+        goal_tchannels = [[[1, -5, -6]],
+                          [[1, 4, -1], [-1, 7, -2], [-2, 3, -3],
+                           [-3, 6, -4], [-4, 5, -5], [-5, 8, -6]],
+                          [[1, 4, -5], [-5, -4, -6]],
+                          [[1, 4, -2], [-2, 7, -3], [-3, 8, -4],
+                           [-4, 3, -5], [-5, -1, -6]]]
+                          
+
+        for (idiag, diagram) in enumerate(diagrams):
+
+            schannels, tchannels = diagram.get('amplitudes')[0].\
+                                         get_s_and_t_channels(2)
+
+            self.assertEqual([[l.get('number') for l in v.get('legs')] for v \
+                              in schannels],
+                             goal_schannels[idiag])
+            self.assertEqual([[l.get('number') for l in v.get('legs')] for v \
+                              in tchannels],
+                             goal_tchannels[idiag]) 
+
 class AlohaFortranWriterTest(unittest.TestCase):
     """ A basic test to see if the Aloha Fortran Writter is working """
     
@@ -4851,3 +5100,47 @@
         for i in range(len(split_sol)):
             self.assertEqual(split_sol[i]+'\n', textfile.readline())
 
+if __name__ == '__main__':
+        """Write out pkl file with helas diagram for test_configs_8fs
+        """
+
+        import models.import_ufo
+        mymodel = models.import_ufo.import_model('sm')
+        
+        myleglist = base_objects.LegList()
+
+        myleglist.append(base_objects.Leg({'id':2,
+                                         'state':False}))
+        myleglist.append(base_objects.Leg({'id':21,
+                                         'state':False}))
+        myleglist.append(base_objects.Leg({'id':1}))
+        myleglist.append(base_objects.Leg({'id':24}))
+        myleglist.append(base_objects.Leg({'id':5}))
+        myleglist.append(base_objects.Leg({'id':-5}))
+        myleglist.append(base_objects.Leg({'id':21}))
+        myleglist.append(base_objects.Leg({'id':21}))
+
+        myproc = base_objects.Process({'legs':myleglist,
+                                       'model':mymodel})
+        myamplitude = diagram_generation.Amplitude({'process': myproc})
+
+        me = helas_objects.HelasMatrixElement(myamplitude,
+                                              gen_color=False)
+
+        import madgraph.iolibs.drawing_eps as draw
+        filename = os.path.join('diagrams_' + \
+                                myamplitude.get('process').shell_string() + ".eps")
+        plot = draw.MultiEpsDiagramDrawer(myamplitude.get('diagrams'),
+                                          filename,
+                                          model=mymodel,
+                                                amplitude='',
+                                          legend=myamplitude.get('process').input_string())
+
+        plot.draw()  
+
+
+
+        me = save_load_object.save_to_file(\
+                       os.path.join(_input_file_path, 'test_8fs.pkl'),
+                       [me.get('diagrams')[323], me.get('diagrams')[954],
+                        me.get('diagrams')[1123], me.get('diagrams')[1139]])