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

[Olivier Mattelaer]

1.5.8 (xx/xx/13) OM: Fix critical bug introduce in 1.5.0. ALOHA was wrongly written
                      HELAS routine for expression containing expression square.
                      (like P(-1,1)**2). None of the default model of MG5 (like sm/mssm)
                      have such type of expression. More information in bug report #1132996
                      (Thanks Gezim)
                  OM+JA: install Delphes install now Delphes3 [install Delphes2 is available]
                  OM: Add one command in MadEvent interface: add_time_of_flight
                      This command modify the lhe events file by adding the time of
                      flight information in the lhe events.
                  OM: Fix bug in pythia8 output for process using decay chains syntax.
                      See bug #1099790.
                  CDe+OM: Update Dim6 model
                  OM: Fix a bug preventing model customized via the "customize_model"
                      command to be able to use the automatic width computation.
                  OM: Fix a bug in model restriction when a width was equals to one.
                      In such case, the width is not fixed to this value anymore.
                  OM: correct bug #1107603 (problem with condor cluster for submission
                      associated to a large number of jobs). Thanks Sanjay
                  JA: Fix one part of the problem in bug #1123974: take into
                      account invariant mass cuts mmXX above the peak range in
                      s-channel resonances in the phase space integration,
                      to make sure such channels find events even for narrow
                      invariant mass cut ranges. Please note the discussion in
                      that bug report for other types of channels however.
                  JA: Fixed bug #1139303: matrix elements for identical
                      decay chain processes with different propagators (such as
                      p p > w+, w+ > e+ ve and p p > w-, w- > vm~ mu-)
                      are now no longer combined, to ensure that resonances are
                      correctly represented in event file.
                  OM: Support lhapdf set which contains photon (See bug #1131995)
                  RF+JA: Reuse last two PDF calls also for LHAPDF PDFs, clarify code
                      for reuse of PDFs in pdg2pdf.f and pdg2pdf_lhapdf.f
                  OM: Update the default delphes card to the latest version. This
                      default card is automatically overwritten by the default Delphes
                      card when running "install Delphes".
                  JA: Make sure cuts are only checked once per event - this can save
                      a lot of time for multiparton events.
                  OM: Fix Bug #1142042 (crash in gridpack)

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

I think this is more than time to release this version.
This is even more True since the bug fix in ALOHA.
Even if this bug is not THAT critical (most of the model are not impacted),
I would like to have this bug fix release asap.

I also give a tutorial tomorrow and they need to use the model modification (for EWDIM6) present in this version. Of course those changes are not needed for my tutorial, but it will be good to have those fix.

I just review your changes in this branch, and those are fine with me :-)

Thanks,

Olivier

review: Approve

[Johan Alwall (johan-alwall)]

Hello Olivier,

> OM: Fix a bug in model restriction when a width was equals to one.
> In such case, the width is not fixed to this value anymore.

Regarding the model restrictions, I just realized that at some point a very serious bug has been introduced. If two particles have identical masses and widths, both masses and widths should be identified (whereas, if only widths are identical but not masses, we could discuss that they should not since this can only be a coincidence). This used to be the case for the default restriction card of the mssm, but it doesn't work anymore.

In fact, this is the reason why there was a problem with huge numbers of matrix elements for an MSSM decay process. So this is a very serious bug for mssm. I'm pretty sure I haven't reviewed such a change, so I don't know when it was introduced.

I'll continue looking at the code now.

Cheers,
Johan

review: Needs Fixing

[Johan Alwall (johan-alwall)]

> OM: Fix a bug in model restriction when a width was equals to one.
> In such case, the width is not fixed to this value anymore.

In fact I don't understand what you mean. Did you change the behavior so that the width is no longer fixed if it's set to 1 in the restriction card? That would make sense, since 1 is not a "special value" for masses and widths, so it doesn't make sense to fix it in this case (but if two values are both 1, they still need to be identified of course).

Cheers,
Johan

review: Abstain

[Johan Alwall (johan-alwall)]

Sorry, don't know how it became "Abstain", I meant "needs information".

review: Needs Information

[Johan Alwall (johan-alwall)]

Hello again Olivier,

I forgot to say, thanks a lot for all the fixes in this version! Great job as always!

Just some further comments. (Please take note about the critical comment above about identifying masses and widths, I am not repeating it here):

+ def help_add_time_of_flight(self):
401 + logger.info("syntax: add_secondary_vertex [run_name|path_to_file]")
402 + logger.info('-- Add in the unweighted_events.lhe the information')
403 + logger.info(' related to secondary vertex.')

It seems there is a naming confusion, you probably changed name from secondary_vertex to time_of_flight at some point.

However, I don't like the way it's done. To begin with, this should only be added for particles that have a decay length > (say) some fraction of a mm or perhaps a micrometer to be safe, since otherwise it's not detectable anyway. Also, this should not be a command but rather a setting: "set add_time_of_flight True". It should then be done automatically on the unweighted_events.lhe file before running plots or Pythia. We can also imagine the threshold to be set using the set command, although I don't think that really matters (if the user wants this, there is probably some particle with a considerable decay length, and usually all other particles will have very short decay lengths anyway).

317 === modified file 'aloha/aloha_lib.py'
...
324 + print type(expression)
...
332 + #if fct_tag == 'pow':
333 + # expr = args[0]**args[1]
334 + # argument = [expr]
335 + # fct_tag = ''

I think these lines should be removed ;-)

369 === modified file 'madgraph/core/diagram_generation.py'
...
386 + "This error usually means that you forgot parentheses in presence of

Should be "this warning".

433 @@ -896,11 +920,18 @@
...
444 + restrict_file = None
445 + if os.path.exists(pjoin(ufo_path, 'restrict_default.dat')):
446 + restrict_file = pjoin(ufo_path, 'restrict_default.dat')
447 + model = import_ufo.import_model(modelname, decay=True,
448 + restrict_file=restrict_file)

I'm not so clear about this change. What happens if some other restriction is used? The modelname will be (say) sm-lepton_masses, but if restrict_file is set to restrict_default, will that take precedence?

=== modified file 'madgraph/interface/madgraph_interface.py'
...
578 +
579 + if args[0] == 'Delphes':
580 + data = open(pjoin(MG5DIR, 'Delphes','data','DetectorCard.dat')).read()
581 + data = data.replace('data/', 'DELPHESDIR/data/')
582 + out = open(pjoin('Template', 'Cards', 'delphes_card_default.dat'), 'w')
583 + out.write(data)
584 +

What happened to the trigger card?

Note that this will NOT work with Delphes 3, where the card is called examples/delphes_card_CMS.tcl (and there is no trigger_card). I would suggest that you implement the copy for Delphes 3, as well as the change from run_delphes to run_delphes3 in that case, already now, so we don't forget it later.

=== modified file 'madgraph/iolibs/export_c...

review: Needs Fixing

[lp:~maddevelopers/mg5amcnlo/1.5.8]

258. By Olivier Mattelaer on 2013-02-28

merge with delphes3 branch

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

Thanks a lot for this review.
I skip all the points that you have raised and which didn't require discussion.

> However, I don't like the way it's done. To begin with, this should only be added for particles that have a decay length > (say) some fraction of a mm or perhaps a micrometer to be safe, since otherwise it's not detectable anyway. Also, this should not be a command but rather a setting: "set add_time_of_flight True". It should then be done automatically on the unweighted_events.lhe file before running plots or Pythia. We can also imagine the threshold to be set using the set command, although I don't think that really matters (if the user wants this, there is probably some particle with a considerable decay length, and usually all other particles will have very short decay lengths anyway).

In fact, I don't really care about this function, the only point to have add is
1) this is times to times ask to have it.
2) One user had a lot of trouble to implement a simple code for doing this and was sending me mail after mail. So I figure that it will
be faster for me to implement a simple command that answering all his question.

This is why, I didn't put too much effort to fully interface it with the rest of the code and things like that.
But if you want to do it, feel free to do so.

The idea of having a command allows to be able to run it on external lhe files (assuming that this is the same model).
(and that it was faster to implement)

> 433 @@ -896,11 +920,18 @@
> ...
> 444 + restrict_file = None
> 445 + if os.path.exists(pjoin(ufo_path, 'restrict_default.dat')):
> 446 + restrict_file = pjoin(ufo_path, 'restrict_default.dat')
> 447 + model = import_ufo.import_model(modelname, decay=True,
> 448 + restrict_file=restrict_file)
>
> I'm not so clear about this change. What happens if some other restriction is used? The modelname will be (say) sm-lepton_masses, but if restrict_file is set to restrict_default, will that take precedence?

In such case, they shouldn't have conflicts, but it happens that the name of the model is simply sm while a restriction is suppose to be used.
This is the point of those lines. This happens for examples when you are using the customize_model options.

> === modified file 'madgraph/interface/madgraph_interface.py'
> ...
> 578 +
> 579 + if args[0] == 'Delphes':
> 580 + data = open(pjoin(MG5DIR, 'Delphes','data','DetectorCard.dat')).read()
> 581 + data = data.replace('data/', 'DELPHESDIR/data/')
> 582 + out = open(pjoin('Template', 'Cards', 'delphes_card_default.dat'), 'w')
> 583 + out.write(data)
> 584 +
>
> What happened to the trigger card?

Since this one is not modified and that Delphes2 is not develop anymore, I don't think that this is a problem.

> Note that this will NOT work with Delphes 3, where the card is called examples/delphes_card_CMS.tcl (and there is no trigger_card). I would suggest that you implement the copy for Delphes 3, as well as the change from run_delphes to run_delphes3 in that case, already now, ...

[Olivier Mattelaer (olivier-mattelaer)]

Sorry i forget to answer this part:

> > OM: Fix a bug in model restriction when a width was equals to one.
> > In such case, the width is not fixed to this value anymore.
>
> In fact I don't understand what you mean. Did you change the behavior so that
> the width is no longer fixed if it's set to 1 in the restriction card? That
> would make sense, since 1 is not a "special value" for masses and widths, so
> it doesn't make sense to fix it in this case (but if two values are both 1,
> they still need to be identified of course).

Yes this is exactly what I meant.
I didn't look yet at the restriction problem that you point. I'm doing that now.

Cheers,

Olivier

[lp:~maddevelopers/mg5amcnlo/1.5.8]

259. By Olivier Mattelaer on 2013-02-28

Make the modification asked by Johan review.

260. By Olivier Mattelaer on 2013-02-28

1) All the Delphes 3 Card in the list of recognized input file.
2) re-allow merging of parameter for the mssm model.

[Olivier Mattelaer (olivier-mattelaer)]

pushed :-)

[Johan Alwall (johan-alwall)]

Hello Olivier,

What does this mean? Why is there a special case for mssm? Does this have to do with the masses and widths that were not properly merged? This behavior should always be the same, no matter the model name. Also, I don't understand what "keep_external" means - can you please explain?

Thanks!

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py 2013-02-27 19:46:53 +0000
+++ madgraph/interface/madgraph_interface.py 2013-02-28 23:52:38 +0000
@@ -3661,7 +3661,12 @@
         logger.info('Loading the resulting model')
         # Applying the restriction
         self._curr_model = import_ufo.RestrictModel(self._curr_model)
- self._curr_model.restrict_model(param_card)
+ model_name = self._curr_model.get('name')
+ if model_name == 'mssm':
+ keep_external=True
+ else:
+ keep_external=False
+ self._curr_model.restrict_model(param_card,keep_external=keep_external)

         if args:
             name = args[0].split('=',1)[1]

review: Needs Information

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

This is due to slha1/slha2 convention and translator.
We cann't modify the param_card due to that.

Cheers,

Olivier

On Feb 28, 2013, at 9:49 PM, Johan Alwall <email address hidden> wrote:

> Review: Needs Information
>
> Hello Olivier,
>
> What does this mean? Why is there a special case for mssm? Does this have to do with the masses and widths that were not properly merged? This behavior should always be the same, no matter the model name. Also, I don't understand what "keep_external" means - can you please explain?
>
> Thanks!
>
> === modified file 'madgraph/interface/madgraph_interface.py'
> --- madgraph/interface/madgraph_interface.py 2013-02-27 19:46:53 +0000
> +++ madgraph/interface/madgraph_interface.py 2013-02-28 23:52:38 +0000
> @@ -3661,7 +3661,12 @@
> logger.info('Loading the resulting model')
> # Applying the restriction
> self._curr_model = import_ufo.RestrictModel(self._curr_model)
> - self._curr_model.restrict_model(param_card)
> + model_name = self._curr_model.get('name')
> + if model_name == 'mssm':
> + keep_external=True
> + else:
> + keep_external=False
> + self._curr_model.restrict_model(param_card,keep_external=keep_external)
>
> if args:
> name = args[0].split('=',1)[1]
>
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.5.8/+merge/150437
> You proposed lp:~maddevelopers/madgraph5/1.5.8 for merging.

[Johan Alwall (johan-alwall)]

Hello Olivier,

> This is due to slha1/slha2 convention and translator.
> We cann't modify the param_card due to that.

I don't agree. We know which parameters are identified, fixed or removed, so just write a warning (or an error, if you prefer) when the param_card is converted if the user has done something against the model. To reduce the model simplification because of the SLHAI/II conversion is not the right solution.

Cheers,
Johan

review: Needs Fixing

[Johan Alwall (johan-alwall)]

Olivier,

Thanks a lot by the way for fixing the mssm issue. Now it's working again (but please see my comment above - this is no different than using a standard SM card for sm_no_masses, which also shouldn't crash but simply generate a warning).

Can you also please update the UpdateNotes? As I noted above, the comment about
 OM: Fix a bug in model restriction when a width was equals to one.
     In such case, the width is not fixed to this value anymore.
is completely unclear and needs to be rewritten. Also please add the fixed bug in the mssm restriction to this item.

Another issue: You have made a number of bug fixes and other changes to the core code without any unit tests. Could you please include unit tests? You definitely need one for the lhe reader, and for the Pythia 8 output. You also need acceptance tests for add_time_of_flight and customize_model, as well as the model restriction stuff. And perhaps for Delphes, although that's less of a priority. Sorry to nag about tests, just following your example! ;-)

Finally, I understand your argument for having add_time_of_flight as a command instead of an option. However, you still absolutely need to include a minimum width to add the time_of_flight, and perhaps make clear in the UpdateNotes that the correct way to do generation including this is
generate_events --laststep=parton ; add_time_of_flight ; pythia --laststep=delphes (or whatever)

Cheers,
Johan

review: Needs Fixing

[Johan Alwall (johan-alwall)]

Hey Olivier,

I'm very confused - where did the revision where I merged with the check_cuts_once branch go? I don't see the revision message or number anymore, although the actual changes to the code are there... If you miss to pull before you commit a revision, please do uncommit until you can pull, and then commit your changes. That way we minimize confusion.

Cheers,
Johan

[lp:~maddevelopers/mg5amcnlo/1.5.8]

261. By Olivier Mattelaer on 2013-03-01

remove pointless print

262. By Olivier Mattelaer on 2013-03-03

Fix Bug #1142042

263. By Johan Alwall on 2013-03-04

Merged with branch 1.5.8_fix_combine: Fix bug #1139303 by ensuring that processes with different propagators are split into different matrix elements even if the MEs are in fact identical also for decay chains. Also fixed order of FS particles in process definition for combination of decay chain matrix element.

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

Looks like I don't receive email notification for this thread. (Don't ask me why).
So could you try to answer to this also via a direct email.

So I just see now your latest email here.
Will do this as soon as possible.

Can I assume that I have your green light as soon as this is done?

Cheers,

Olivier

[Olivier Mattelaer (olivier-mattelaer)]

I Johan,

> I'm very confused - where did the revision where I merged with the check_cuts_once branch go? I don't see the revision message or number anymore, although the actual changes to the code are there... If you miss to pull before you commit a revision, please do uncommit until you can pull, and then commit your changes. That way we minimize confusion.

I suppose that this was due to the branch with the Delphes merge.
I should have made a merge with the trunk at a point on that branch and that's why your branch disappear ( I suppose)

Cheers,

Olivier

On Mar 1, 2013, at 4:10 AM, Johan Alwall <email address hidden> wrote:

> Hey Olivier,
>
> I'm very confused - where did the revision where I merged with the check_cuts_once branch go? I don't see the revision message or number anymore, although the actual changes to the code are there... If you miss to pull before you commit a revision, please do uncommit until you can pull, and then commit your changes. That way we minimize confusion.
>
> Cheers,
> Johan
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.5.8/+merge/150437
> You proposed lp:~maddevelopers/madgraph5/1.5.8 for merging.

[Johan Alwall (johan-alwall)]

Hello Olivier,

Almost done! Just fix the points below, then I'll be happy. :-)

1. Regarding madevent_interface.py:

Please include the threshold for add_time_of_flight. This is necessary to avoid ridiculous (and potentially malformed) event files. Also please include the mention about how to run it in the UpdateNotes (as I suggested earlier).

2. Regarding the UpdateNotes:

The following bugs (and the corresponding fixes) are not mentioned. Please include *everything* that's done in the UpdateNotes, since this makes it much easier to track potential newly introduced bugs and features in the future!

Bug #1101291: Decay set an auto didn't work with generate_events -f
Bug #1131871: Compiler Error for SUSY decay to leptonic final states

You also still haven't fixed the formulation about the width=1 entry.
Finally: The model name is not Dim6; please write the full model name to avoid confusion.

Thanks!
Johan

review: Needs Fixing

[lp:~maddevelopers/mg5amcnlo/1.5.8]

264. By Olivier Mattelaer on 2013-03-04

adding a threshold for the add_time_of_flight + tests

265. By Olivier Mattelaer on 2013-03-04

adding unit test for the lhe parser.
Some acceptance test are in place vie that add_time_of_flight

[Johan Alwall (johan-alwall)]

Hello Olivier,

Thanks a lot for adding the tests! I just have a question: Looking at your test for the .lhe parser, I don't understand the following:
> + nb_event = 0
> + for event in input:
> + nb_event +=1
> + new = lhe_parser.Event(text=str(event))
> + for part1,part2 in zip(event, new):
> + self.assertEqual(part1, part2)
> + self.assertEqual(new, event, '%s \n !=\n %s' % (new, event))
> + self.assertEqual(nb_event, 3)

Doesn't this just check that the parser parses the same values both times it reads? I don't see that you are checking that the values are in fact correct.

Cheers,
Johan

review: Needs Information

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

> Doesn't this just check that the parser parses the same values both times it reads?

A bit more than that since the first time we parse the input and the second the string which is the output of the str(event).
So we test that writing routine is coherent with the reading routine.

> I don't see that you are checking that the values are in fact correct.

Not sure to see which type to check you want.

Cheers,

Olivier

On Mar 4, 2013, at 5:48 AM, Johan Alwall <email address hidden> wrote:

> Review: Needs Information
>
> Hello Olivier,
>
> Thanks a lot for adding the tests! I just have a question: Looking at your test for the .lhe parser, I don't understand the following:
>> + nb_event = 0
>> + for event in input:
>> + nb_event +=1
>> + new = lhe_parser.Event(text=str(event))
>> + for part1,part2 in zip(event, new):
>> + self.assertEqual(part1, part2)
>> + self.assertEqual(new, event, '%s \n !=\n %s' % (new, event))
>> + self.assertEqual(nb_event, 3)
>
> Doesn't this just check that the parser parses the same values both times it reads? I don't see that you are checking that the values are in fact correct.
>
> Cheers,
> Johan
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.5.8/+merge/150437
> You proposed lp:~maddevelopers/madgraph5/1.5.8 for merging.

[Johan Alwall (johan-alwall)]

Hi Olivier,

> > Doesn't this just check that the parser parses the same values both times it
> reads?
>
> A bit more than that since the first time we parse the input and the second
> the string which is the output of the str(event).
> So we test that writing routine is coherent with the reading routine.
>
> > I don't see that you are checking that the values are in fact correct.
>
> Not sure to see which type to check you want.

I would prefer if you write explicitly the result string and check against that, so it's obvious from the test that all parts are being read, processed and output correctly. For example, if the comments are not being read at all, this test won't show it.

Cheers,
Johan

review: Needs Fixing

[lp:~maddevelopers/mg5amcnlo/1.5.8]

266. By Johan Alwall on 2013-03-04

Fixed grammar in UpdateNotes

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

> I would prefer if you write explicitly the result string and check against that, so it's obvious from the test that all parts are being read, processed and output correctly. For example, if the comments are not being read at all, this test won't show it.

Ok I did it. (and indeed they were a small error on the comment)
In general, I prefer to limit the comparison of large text, mainly because
1) they can fail much too often
2) If the text is long, most of the time we simply copy the new result (so the test is weak, since we may miss unwanted changes)
But combining both kind of test is probably the best.

Concerning the cpp, this is still not working.
(it says no matrix element generated).

Cheers,

Olivier

On Mar 4, 2013, at 6:16 AM, Johan Alwall <email address hidden> wrote:

> Review: Needs Fixing
>
> Hi Olivier,
>
>>> Doesn't this just check that the parser parses the same values both times it
>> reads?
>>
>> A bit more than that since the first time we parse the input and the second
>> the string which is the output of the str(event).
>> So we test that writing routine is coherent with the reading routine.
>>
>>> I don't see that you are checking that the values are in fact correct.
>>
>> Not sure to see which type to check you want.
>
> I would prefer if you write explicitly the result string and check against that, so it's obvious from the test that all parts are being read, processed and output correctly. For example, if the comments are not being read at all, this test won't show it.
>
> Cheers,
> Johan
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.5.8/+merge/150437
> You proposed lp:~maddevelopers/madgraph5/1.5.8 for merging.

[lp:~maddevelopers/mg5amcnlo/1.5.8]

267. By Olivier Mattelaer on 2013-03-04

add string comparison for lhe parser (and fix the missing end of line for the comment)

[Valentin Hirschi (valentin-hirschi)]

Hi Johan, Olivier,

I don't know the details of the nature of the checks for the lhe parser but
it seems like having a two-fold test is indeed the best option.
A) "Direct" tests targeting specific parts of the lhe parsing, so that when
they fail the problem is easy to pin-point.
B) Incusive test which compare the "whole" read information with the target
so that one is sure not to miss anything.

Tests B) are usually inconvenient because of their typical
over-sensitivity, as underlined by Olivier.
I had developed the IO tests framework (see
https://cp3.irmp.ucl.ac.be/projects/madgraph/wiki/DevelopmentPage/CodeTesting)
specifically for this. And I believe that my implementation (thanks to the
useful comments of Olivier) allows to update the tests of kind B) quickly
and with very little chance of overlooking something so that the test
remains useful.

I therefore suggest to maybe use this framework for implementing the tests
of kind B) of the lhe parser (unless I missed the point, in which case I
apologize for the bother.)

Cheers,

On Mon, Mar 4, 2013 at 1:58 PM, Olivier Mattelaer <
<email address hidden>> wrote:

> Hi Johan,
>
> > I would prefer if you write explicitly the result string and check
> against that, so it's obvious from the test that all parts are being read,
> processed and output correctly. For example, if the comments are not being
> read at all, this test won't show it.
>
> Ok I did it. (and indeed they were a small error on the comment)
> In general, I prefer to limit the comparison of large text, mainly because
> 1) they can fail much too often
> 2) If the text is long, most of the time we simply copy the new result (so
> the test is weak, since we may miss unwanted changes)
> But combining both kind of test is probably the best.
>
> Concerning the cpp, this is still not working.
> (it says no matrix element generated).
>
> Cheers,
>
> Olivier
>
>
> On Mar 4, 2013, at 6:16 AM, Johan Alwall <email address hidden> wrote:
>
> > Review: Needs Fixing
> >
> > Hi Olivier,
> >
> >>> Doesn't this just check that the parser parses the same values both
> times it
> >> reads?
> >>
> >> A bit more than that since the first time we parse the input and the
> second
> >> the string which is the output of the str(event).
> >> So we test that writing routine is coherent with the reading routine.
> >>
> >>> I don't see that you are checking that the values are in fact correct.
> >>
> >> Not sure to see which type to check you want.
> >
> > I would prefer if you write explicitly the result string and check
> against that, so it's obvious from the test that all parts are being read,
> processed and output correctly. For example, if the comments are not being
> read at all, this test won't show it.
> >
> > Cheers,
> > Johan
> > --
> > https://code.launchpad.net/~maddevelopers/madgraph5/1.5.8/+merge/150437
> > You proposed lp:~maddevelopers/madgraph5/1.5.8 for merging.
>
>
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.5.8/+merge/150437
> Your team MadDevelopers is subscribed to branch
> lp:~maddevelopers/madgraph5/1.5.8.
>

--
Valentin

[Johan Alwall (johan-alwall)]

Hello Olivier,

Thanks a lot for the clearer test. In fact, this was very important, since it immediately shows a problem:

+ target = """<event>
+ 4 0 +1.7208000e-01 1.00890300e+02 7.95774700e-02 1.27947900e-01
+ -1 -1 0 0 0 501 +0.0000000e+00 +0.0000000e+00 +1.1943355e+01 1.19433546e+01 0.00000000e+00 0.0000e+00 1.0000e+00
+ 2 -1 0 0 501 0 +0.0000000e+00 +0.0000000e+00 -1.0679326e+03 1.06793262e+03 0.00000000e+00 0.0000e+00 -1.0000e+00
+ 24 1 1 2 0 0 +6.0417155e+00 +4.2744556e+01 -7.9238049e+02 7.97619997e+02 8.04190073e+01 3.4933e-25 -1.0000e+00
+ 23 1 1 2 0 0 -6.0417155e+00 -4.2744556e+01 -2.6360878e+02 2.82255979e+02 9.11880035e+01 1.8975e-26 1.0000e+00
+
+</event>

There is an empty line before the </event>. This is *not* part of the LHE accord. So that line should not be there.

Cheers,
Johan

review: Needs Fixing

[Johan Alwall (johan-alwall)]

Hello Valentin, Olivier,

Indeed IOTest looks like the best solution for this test. Thanks a lot for the reminder Valentin!

Johan

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

An Empty line should ALWAYS be allowed!
(even if this might not be optimal for the size of the file)

Cheers,

Olivier

On Mar 4, 2013, at 7:08 AM, Johan Alwall <email address hidden> wrote:

> Review: Needs Fixing
>
> Hello Olivier,
>
> Thanks a lot for the clearer test. In fact, this was very important, since it immediately shows a problem:
>
> + target = """<event>
> + 4 0 +1.7208000e-01 1.00890300e+02 7.95774700e-02 1.27947900e-01
> + -1 -1 0 0 0 501 +0.0000000e+00 +0.0000000e+00 +1.1943355e+01 1.19433546e+01 0.00000000e+00 0.0000e+00 1.0000e+00
> + 2 -1 0 0 501 0 +0.0000000e+00 +0.0000000e+00 -1.0679326e+03 1.06793262e+03 0.00000000e+00 0.0000e+00 -1.0000e+00
> + 24 1 1 2 0 0 +6.0417155e+00 +4.2744556e+01 -7.9238049e+02 7.97619997e+02 8.04190073e+01 3.4933e-25 -1.0000e+00
> + 23 1 1 2 0 0 -6.0417155e+00 -4.2744556e+01 -2.6360878e+02 2.82255979e+02 9.11880035e+01 1.8975e-26 1.0000e+00
> +
> +</event>
>
> There is an empty line before the </event>. This is *not* part of the LHE accord. So that line should not be there.
>
> Cheers,
> Johan
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.5.8/+merge/150437
> You proposed lp:~maddevelopers/madgraph5/1.5.8 for merging.

[lp:~maddevelopers/mg5amcnlo/1.5.8]

268. By Olivier Mattelaer on 2013-03-04

remove the empty line in the lhe file

269. By Olivier Mattelaer on 2013-03-04

add unittest for the Cpp modifications

[Johan Alwall (johan-alwall)]

Hi Olivier,

> An Empty line should ALWAYS be allowed!
> (even if this might not be optimal for the size of the file)

Hey, don't shoot the pianist! Remember that we have dozens of lhe file
readers in as many programs, so you can't expect all of them to work on
*anything* outside of the standard. I'm pretty sure an empty line is not
among the things described in the standard to be allowed. So it needs to go.

Cheers,
Johan

[Olivier Mattelaer (olivier-mattelaer)]

I pushed it right after sending the message (This is not efficient so why keep those ;-) )

Cheers,

Olivier
On Mar 4, 2013, at 8:10 AM, Johan Alwall <email address hidden> wrote:

> Hi Olivier,
>
>> An Empty line should ALWAYS be allowed!
>> (even if this might not be optimal for the size of the file)
>
> Hey, don't shoot the pianist! Remember that we have dozens of lhe file
> readers in as many programs, so you can't expect all of them to work on
> *anything* outside of the standard. I'm pretty sure an empty line is not
> among the things described in the standard to be allowed. So it needs to go.
>
> Cheers,
> Johan
>
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.5.8/+merge/150437
> You proposed lp:~maddevelopers/madgraph5/1.5.8 for merging.

[lp:~maddevelopers/mg5amcnlo/1.5.8]

270. By Johan Alwall on 2013-03-04

Changed delphes card in Delphes 2 version to latest Delphes version in UpdateNotes. Sorry about that.

[Johan Alwall (johan-alwall)]

Thanks a lot for this version Olivier, there are really a lot of fixes done, and it is now well-tested. Great job!

Cheers,
Johan

review: Approve

[Olivier Mattelaer (olivier-mattelaer)]

Thanks Johan,
I'll make the release tomorrow then.

Could you finalize the merge for 2.0.0? (In fact we need it urgently)

Cheers,

Olivier

On Mar 4, 2013, at 5:38 PM, Johan Alwall <email address hidden> wrote:

> Review: Approve
>
> Thanks a lot for this version Olivier, there are really a lot of fixes done, and it is now well-tested. Great job!
>
> Cheers,
> Johan
> --
> https://code.launchpad.net/~maddevelopers/madgraph5/1.5.8/+merge/150437
> You proposed lp:~maddevelopers/madgraph5/1.5.8 for merging.

=== modified file 'Template/Cards/delphes_card_ATLAS.dat'
--- Template/Cards/delphes_card_ATLAS.dat	2010-10-30 03:26:37 +0000
+++ Template/Cards/delphes_card_ATLAS.dat	2013-03-04 23:37:19 +0000
@@ -1,135 +1,499 @@
-DETECTOR CARD      # DO NOT REMOVE THIS IS A TAG!
-
-# Detector extension, in pseudorapidity units
-CEN_max_tracker    2.5                // Maximum tracker coverage          
-CEN_max_calo_cen   3.2                // central calorimeter coverage
-CEN_max_calo_fwd   4.9                // forward calorimeter pseudorapidity coverage
-CEN_max_mu         2.7                // muon chambers pseudorapidity coverage
-  
-# Energy resolution for electron/photon
-# \sigma/E = C + N/E + S/\sqrt{E}, E in GeV
-ELG_Scen          0.10                // S term for central ECAL  #http://arxiv.org/pdf/physics/0608012v1
-ELG_Ncen          0.0                 // N term for central ECAL  #http://arxiv.org/pdf/physics/0608012v1
-ELG_Ccen          0.0017              // C term for central ECAL  #http://arxiv.org/pdf/physics/0608012v1
-ELG_Sfwd          0.30407             // S term for forward FCAL  #http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
-ELG_Nfwd          1.1533              // N term for central FCAL  #http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
-ELG_Cfwd          0.0313              // C term for forward FCAL  #http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
-ELG_Szdc          0.70              // S term for ZDC
-ELG_Nzdc          0.0               // N term for ZDC
-ELG_Czdc          0.08              // C term for ZDC
-
-
-# Energy resolution for hadrons in ecal/hcal/hf
-# \sigma/E = C + N/E + S/\sqrt{E}, E in GeV
-HAD_Shcal         0.58               // S term for central HCAL    #http://arxiv.org/pdf/hep-ex/0004009v1
-HAD_Nhcal         1.7                // N term for central HCAL    #http://arxiv.org/pdf/hep-ex/0004009v1
-HAD_Chcal         0.025              // C term for central HCAL    #http://arxiv.org/pdf/hep-ex/0004009v1
-HAD_Shf           0.9681             // S term for FCAL            #http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
-HAD_Nhf           0.                 // N term for FCAL            #http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
-HAD_Chf           0.0524             // C term for FCAL            #http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
-HAD_Szdc          1.38              // S term for ZDC
-HAD_Nzdc          0.                // N term for ZDC
-HAD_Czdc          0.13              // C term for ZDC
-
-# Time resolution for ZDC/RP220/RP420
-ZDC_T_resolution   0                // in s
-RP220_T_resolution 0                // in s
-RP420_T_resolution 0                // in s
-
-# Muon smearing
-MU_SmearPt        0.01		    // transverse momentum Pt in GeV
-
-# Tracking efficiencies
-TRACK_ptmin       0.9               // minimal pt needed to reach the calorimeter in GeV
-TRACK_eff          90               // efficiency associated to the tracking (%)
-
-# Calorimetric towers
-TOWER_number         38
-TOWER_eta_edges 0.0 0.10 0.20 0.30 0.40 0.50 0.60 0.70 0.80 0.90 1.00 1.10 1.20 1.30 1.40 1.50 1.60 1.70 1.80 1.90 2.0 2.10 2.20 2.30 2.40 2.50 2.60 2.80 3.00 3.20 3.30 3.50 3.70 3.90 4.10 4.30 4.50 4.70 4.90 
-## list of the edges of each tower in eta for eta>0 assuming a symmetric detector in eta<0
-### the list starts with the lower edge of the most central tower
-### the list ends with the higher edged of the most forward tower
-### there should be NTOWER+1 values
-TOWER_dphi  10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 20 20 20 10 20 20 20 20 20 20 20 20
-### list of the tower size in phi (in degrees), assuming that all towers are similar in phi for a given eta value
-### the list starts with the phi-size of the most central tower (eta=0)
-### the list ends with the phi-size of the most forward tower
-### there should be NTOWER values
-##
-#
-
-# Thresholds for reconstructed objetcs, Pt in GeV
-PTCUT_elec       10.0
-PTCUT_muon       10.0
-PTCUT_jet        20.0
-PTCUT_gamma      10.0
-PTCUT_taujet     10.0
-
-# Thresholds for reconstructed objects in ZDC, E in GeV
-ZDC_gamma_E      20
-ZDC_n_E          50
-
-# Charged lepton isolation. Pt and Et in GeV
-ISOL_PT          2.0      //minimal pt of tracks for isolation criteria
-ISOL_Cone        0.5      //Cone  for isolation criteria
-ISOL_Calo_ET     1E99     //minimal tower transverse energy for isolation criteria. 1E99 means "off"
-ISOL_Calo_Cone   0.4      //Cone for calorimetric isolation
-ISOL_Calo_Grid   3        //Grid size (N x N) for calorimetric isolation
-
-# General jet variable
-JET_coneradius   0.7            // generic jet radius ; not for tau's !!!
-JET_jetalgo      1              // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
-JET_seed         1.0            // minimum seed to start jet reconstruction, in GeV
-JET_Eflow        0              // Perfect energy assumed in the tracker coverage
-
-# Tagging definition
-BTAG_b           50		// b-tag efficiency (%)
-BTAG_mistag_c    10		// mistagging (%)
-BTAG_mistag_l    1		// mistagging (%)
-
-# FLAGS
-FLAG_bfield      1                       // 1 to run the bfield propagation else 0
-FLAG_vfd         1                       // 1 to run the very forward detectors else 0
-FLAG_RP          1                       // 1 to run the very forward detectors else 0
-FLAG_trigger     1                       // 1 to run the trigger selection else 0
-FLAG_frog        0                       // 1 to run the FROG event display
-FLAG_lhco        0                       //1 to run the LHCO
-
-# In case BField propagation allowed
-TRACK_radius      115                   // radius of the BField coverage, in cm #chapter 1 you gave me
-TRACK_length      351                   // length of the BField coverage, in cm #also
-TRACK_bfield_x    0                     // X component of the BField, in T
-TRACK_bfield_y    0                     // Y component of the BField, in T
-TRACK_bfield_z    2.0                   // Z component of the BField, in T #also
-
-# Very forward detector extension, in pseudorapidity
-# if allowed (WARNING: not expected for ATLAS!)
-VFD_min_calo_vfd  5.2                   // very forward calorimeter (if any) like CASTOR
-VFD_max_calo_vfd  6.6
-VFD_min_zdc       8.3			// zero-degree neutral calorimeter
-VFD_s_zdc         140                   // distance of the Zero Degree Calorimeter, from the IP, in [m]
-
-RP_220_s          220                   // distance of the RP to the IP, in meters
-RP_220_x          0.002                 // distance of the RP to the beam, in meters
-RP_420_s          420                   // distance of the RP to the IP, in meters
-RP_420_x          0.004                 // distance of the RP to the beam, in meters
-RP_beam1Card      DELPHESDIR/data/LHCB1IR1.tfs
-RP_beam2Card      DELPHESDIR/data/LHCB2IR1.tfs
-RP_IP_name        IP1
-RP_offsetEl_x     0.097                 // horizontal separation between both beam, in meters
-RP_offsetEl_y     0                     // vertical separation between both beam, in meters
-RP_offsetEl_s     120                   // distance of beam separation point, from IP
-RP_cross_x        0                     // IP offset in horizontal plane, in micrometers
-RP_cross_y        +500                  // IP offset in vertical plane, in micrometers
-RP_cross_ang_x    142.5                 // half-crossing angle in horizontal plane, in microrad
-RP_cross_ang_y    0                     // half-crossing angle in vertical plane, in microrad
-
-
-# In case FROG event display allowed
-NEvents_Frog      100
-# Number of events to process
-NEvents           -1                    // -1 means 'all'
-
-# input PDG tables
-PdgTableFilename  DELPHESDIR/data/particle.tbl     // table with particle pid,mass,charge,...
+#######################################
+# Order of execution of various modules
+#######################################
+
+set ExecutionPath {
+  ParticlePropagator
+
+  ChargedHadronTrackingEfficiency
+  ElectronTrackingEfficiency
+  MuonTrackingEfficiency
+
+  ChargedHadronMomentumSmearing
+  ElectronEnergySmearing
+  MuonMomentumSmearing
+
+  TrackMerger
+  Calorimeter
+  EFlowMerger
+
+  PhotonEfficiency
+  PhotonIsolation
+  
+  ElectronEfficiency
+  ElectronIsolation
+  
+  MuonEfficiency
+  MuonIsolation
+  
+  MissingET
+  
+  FastJetFinder
+  BTagging
+  TauTagging
+  
+  UniqueObjectFinder
+  
+  ScalarHT
+  
+  TreeWriter
+}
+
+#################################
+# Propagate particles in cylinder
+#################################
+
+module ParticlePropagator ParticlePropagator {
+  set InputArray Delphes/stableParticles
+
+  set OutputArray stableParticles
+  set ChargedHadronOutputArray chargedHadrons
+  set ElectronOutputArray electrons
+  set MuonOutputArray muons
+
+  # radius of the magnetic field coverage, in m
+  set Radius 1.15
+  # half-length of the magnetic field coverage, in m
+  set HalfLength 3.51
+
+  # magnetic field
+  set Bz 2.0
+}
+
+####################################
+# Charged hadron tracking efficiency
+####################################
+
+module Efficiency ChargedHadronTrackingEfficiency {
+  set InputArray ParticlePropagator/chargedHadrons
+  set OutputArray chargedHadrons
+
+  # add EfficiencyFormula {efficiency formula as a function of eta and pt}
+
+  # tracking efficiency formula for charged hadrons
+  set EfficiencyFormula {                                                    (pt <= 0.1)   * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.70) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0)                  * (0.95) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.60) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0)                  * (0.85) + \
+                         (abs(eta) > 2.5)                                                  * (0.00)}
+}
+
+##############################
+# Electron tracking efficiency
+##############################
+
+module Efficiency ElectronTrackingEfficiency {
+  set InputArray ParticlePropagator/electrons
+  set OutputArray electrons
+
+  # set EfficiencyFormula {efficiency formula as a function of eta and pt}
+              
+  # tracking efficiency formula for electrons
+  set EfficiencyFormula {                                                    (pt <= 0.1)   * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.73) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0   && pt <= 1.0e2) * (0.95) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0e2)                * (0.99) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.50) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0   && pt <= 1.0e2) * (0.83) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2)                * (0.90) + \
+                         (abs(eta) > 2.5)                                                  * (0.00)}
+}
+
+##############################
+# Muon tracking efficiency
+##############################
+
+module Efficiency MuonTrackingEfficiency {
+  set InputArray ParticlePropagator/muons
+  set OutputArray muons
+
+  # set EfficiencyFormula {efficiency formula as a function of eta and pt}
+              
+  # tracking efficiency formula for muons
+  set EfficiencyFormula {                                                    (pt <= 0.1)   * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.75) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0)                  * (0.99) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.70) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0)                  * (0.98) + \
+                         (abs(eta) > 2.5)                                                  * (0.00)}
+}
+
+########################################
+# Momentum resolution for charged tracks
+########################################
+
+module MomentumSmearing ChargedHadronMomentumSmearing {
+  set InputArray ChargedHadronTrackingEfficiency/chargedHadrons
+  set OutputArray chargedHadrons
+
+  # set ResolutionFormula {resolution formula as a function of eta and pt}
+
+  # resolution formula for charged hadrons
+  set ResolutionFormula {                  (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.02) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0   && pt <= 1.0e1) * (0.01) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.03) + \
+                                           (abs(eta) <= 1.5) * (pt > 2.0e2)                * (0.05) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.03) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0   && pt <= 1.0e1) * (0.02) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.04) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 2.0e2)                * (0.05)}
+}
+
+#################################
+# Energy resolution for electrons
+#################################
+
+module EnergySmearing ElectronEnergySmearing {
+  set InputArray ElectronTrackingEfficiency/electrons
+  set OutputArray electrons
+
+  # set ResolutionFormula {resolution formula as a function of eta and energy}
+
+  set ResolutionFormula {                  (abs(eta) <= 2.5) * (energy > 0.1   && energy <= 2.5e1) * (energy*0.015) + \
+                                           (abs(eta) <= 2.5) * (energy > 2.5e1)                    * sqrt(energy^2*0.005^2 + energy*0.05^2 + 0.25^2) + \
+                         (abs(eta) > 2.5 && abs(eta) <= 3.0)                                       * sqrt(energy^2*0.005^2 + energy*0.05^2 + 0.25^2) + \
+                         (abs(eta) > 3.0 && abs(eta) <= 5.0)                                       * sqrt(energy^2*0.107^2 + energy*2.08^2)}
+
+}
+
+###############################
+# Momentum resolution for muons
+###############################
+
+module MomentumSmearing MuonMomentumSmearing {
+  set InputArray MuonTrackingEfficiency/muons
+  set OutputArray muons
+
+  # set ResolutionFormula {resolution formula as a function of eta and pt}
+
+  # resolution formula for muons
+  set ResolutionFormula {                  (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.03) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0   && pt <= 1.0e1) * (0.02) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.03) + \
+                                           (abs(eta) <= 1.5) * (pt > 2.0e2)                * (0.05) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.04) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0   && pt <= 1.0e1) * (0.03) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.04) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 2.0e2)                * (0.05)}
+}
+
+##############
+# Track merger
+##############
+
+module Merger TrackMerger {
+# add InputArray InputArray
+  add InputArray ChargedHadronMomentumSmearing/chargedHadrons
+  add InputArray ElectronEnergySmearing/electrons
+  set OutputArray tracks
+}
+
+#############
+# Calorimeter
+#############
+
+module Calorimeter Calorimeter {
+  set ParticleInputArray ParticlePropagator/stableParticles
+  set TrackInputArray TrackMerger/tracks
+
+  set TowerOutputArray towers
+  set PhotonOutputArray photons
+
+  set EFlowTrackOutputArray eflowTracks
+  set EFlowTowerOutputArray eflowTowers
+
+  set pi [expr {acos(-1)}]
+  
+  # lists of the edges of each tower in eta and phi
+  # each list starts with the lower edge of the first tower
+  # the list ends with the higher edged of the last tower
+
+  # 10 degrees towers
+  set PhiBins {}
+  for {set i -18} {$i <= 18} {incr i} { 
+    add PhiBins [expr {$i * $pi/18.0}]
+  }
+  foreach eta {-3.2 -2.5 -2.4 -2.3 -2.2 -2.1 -2 -1.9 -1.8 -1.7 -1.6 -1.5 -1.4 -1.3 -1.2 -1.1 -1 -0.9 -0.8 -0.7 -0.6 -0.5 -0.4 -0.3 -0.2 -0.1 0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2 2.1 2.2 2.3 2.4 2.5 2.6 3.3} { 
+    add EtaPhiBins $eta $PhiBins
+  }
+ 
+  # 20 degrees towers
+  set PhiBins {}
+  for {set i -9} {$i <= 9} {incr i} { 
+    add PhiBins [expr {$i * $pi/9.0}]
+  }  
+  foreach eta {-4.9 -4.7 -4.5 -4.3 -4.1 -3.9 -3.7 -3.5 -3.3 -3 -2.8 -2.6 2.8 3 3.2 3.3 3.5 3.7 3.9 4.1 4.3 4.5 4.7 4.9} { 
+    add EtaPhiBins $eta $PhiBins
+  }
+
+  # default energy fractions {abs(PDG code)} {Fecal Fhcal}
+  add EnergyFraction {0} {0.0 1.0}
+  # energy fractions for e, gamma and pi0
+  add EnergyFraction {11} {1.0 0.0}
+  add EnergyFraction {22} {1.0 0.0}
+  add EnergyFraction {111} {1.0 0.0}
+  # energy fractions for muon and neutrinos
+  add EnergyFraction {12} {0.0 0.0}
+  add EnergyFraction {13} {0.0 0.0}
+  add EnergyFraction {14} {0.0 0.0}
+  add EnergyFraction {16} {0.0 0.0}
+  # energy fractions for K0short and Lambda
+  add EnergyFraction {310} {0.3 0.7}
+  add EnergyFraction {3122} {0.3 0.7}
+  
+  # set ECalResolutionFormula {resolution formula as a function of eta and energy}
+  # http://arxiv.org/pdf/physics/0608012v1 jinst8_08_s08003
+  # http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
+  set ECalResolutionFormula {                  (abs(eta) <= 3.2) * sqrt(energy^2*0.0017^2 + energy*0.101^2) + \
+                             (abs(eta) > 3.2 && abs(eta) <= 4.9) * sqrt(energy^2*0.0350^2 + energy*2.085^2)}
+
+  # set HCalResolutionFormula {resolution formula as a function of eta and energy}
+  # http://arxiv.org/pdf/hep-ex/0004009v1
+  # http://villaolmo.mib.infn.it/ICATPP9th_2005/Calorimetry/Schram.p.pdf
+  set HCalResolutionFormula {                  (abs(eta) <= 1.7) * sqrt(energy^2*0.0302^2 + energy*0.5205^2 + 1.59^2) + \
+                             (abs(eta) > 1.7 && abs(eta) <= 3.2) * sqrt(energy^2*0.0500^2 + energy*0.706^2) + \
+                             (abs(eta) > 3.2 && abs(eta) <= 4.9) * sqrt(energy^2*0.9420^2 + energy*0.075^2)}
+}
+
+####################
+# Energy flow merger
+####################
+
+module Merger EFlowMerger {
+# add InputArray InputArray
+  add InputArray Calorimeter/eflowTracks
+  add InputArray Calorimeter/eflowTowers
+  add InputArray MuonMomentumSmearing/muons
+  set OutputArray eflow
+}
+
+###################
+# Photon efficiency
+###################
+
+module Efficiency PhotonEfficiency {
+  set InputArray Calorimeter/photons
+  set OutputArray photons
+
+  # set EfficiencyFormula {efficiency formula as a function of eta and pt}
+
+  # efficiency formula for photons
+  set EfficiencyFormula {                                      (pt <= 10.0) * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 10.0)  * (0.95) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0)  * (0.85) + \
+                         (abs(eta) > 2.5)                                   * (0.00)}
+}
+
+##################
+# Photon isolation
+##################
+
+module Isolation PhotonIsolation {
+  set CandidateInputArray PhotonEfficiency/photons
+  set IsolationInputArray EFlowMerger/eflow
+  
+  set OutputArray photons
+
+  set DeltaRMax 0.5
+
+  set PTMin 0.5
+
+  set PTRatioMax 0.1
+}
+
+#####################
+# Electron efficiency
+#####################
+
+module Efficiency ElectronEfficiency {
+  set InputArray ElectronEnergySmearing/electrons
+  set OutputArray electrons
+
+  # set EfficiencyFormula {efficiency formula as a function of eta and pt}
+
+  # efficiency formula for electrons
+  set EfficiencyFormula {                                      (pt <= 10.0) * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 10.0)  * (0.95) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0)  * (0.85) + \
+                         (abs(eta) > 2.5)                                   * (0.00)}
+}
+
+####################
+# Electron isolation
+####################
+
+module Isolation ElectronIsolation {
+  set CandidateInputArray ElectronEfficiency/electrons
+  set IsolationInputArray EFlowMerger/eflow
+  
+  set OutputArray electrons
+
+  set DeltaRMax 0.5
+
+  set PTMin 0.5
+
+  set PTRatioMax 0.1
+}
+
+#################
+# Muon efficiency
+#################
+
+module Efficiency MuonEfficiency {
+  set InputArray MuonMomentumSmearing/muons
+  set OutputArray muons
+
+  # set EfficiencyFormula {efficiency as a function of eta and pt}
+
+  # efficiency formula for muons
+  set EfficiencyFormula {                                      (pt <= 10.0) * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 10.0)  * (0.95) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.7) * (pt > 10.0)  * (0.85) + \
+                         (abs(eta) > 2.7)                                   * (0.00)}
+}
+
+################
+# Muon isolation
+################
+
+module Isolation MuonIsolation {
+  set CandidateInputArray MuonEfficiency/muons
+  set IsolationInputArray EFlowMerger/eflow
+  
+  set OutputArray muons
+
+  set DeltaRMax 0.5
+
+  set PTMin 0.5
+
+  set PTRatioMax 0.1
+}
+
+###################
+# Missing ET merger
+###################
+
+module Merger MissingET {
+# add InputArray InputArray
+  add InputArray EFlowMerger/eflow
+  set MomentumOutputArray momentum
+}
+
+##################
+# Scalar HT merger
+##################
+
+module Merger ScalarHT {
+# add InputArray InputArray
+  add InputArray UniqueObjectFinder/jets
+  add InputArray UniqueObjectFinder/electrons
+  add InputArray UniqueObjectFinder/photons
+  add InputArray MuonIsolation/muons
+  set EnergyOutputArray energy
+}
+
+############
+# Jet finder
+############
+
+module FastJetFinder FastJetFinder {
+#  set InputArray Calorimeter/towers
+  set InputArray EFlowMerger/eflow
+  
+  set OutputArray jets
+
+  # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
+  set JetAlgorithm 6
+  set ParameterR 0.7
+
+  set ConeRadius 0.5
+  set SeedThreshold 1.0
+  set ConeAreaFraction 1.0
+  set AdjacencyCut 2.0
+  set OverlapThreshold 0.75
+
+  set MaxIterations 100
+  set MaxPairSize 2
+  set Iratch 1
+  
+  set JetPTMin 20.0
+}
+
+###########
+# b-tagging
+###########
+
+module BTagging BTagging {
+  set PartonInputArray Delphes/partons
+  set JetInputArray FastJetFinder/jets
+
+  set DeltaR 0.5
+
+  set PartonPTMin 1.0
+
+  set PartonEtaMax 2.5
+
+  # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
+  # PDG code = the highest PDG code of a quark or gluon inside DeltaR cone around jet axis
+  # gluon's PDG code has the lowest priority
+
+  # default efficiency formula (misidentification rate)
+  add EfficiencyFormula {0} {0.001}
+  # efficiency formula for c-jets (misidentification rate)
+  add EfficiencyFormula {4} {0.1}
+  # efficiency formula for b-jets
+  add EfficiencyFormula {5} {0.4}
+}
+
+module TauTagging TauTagging {
+  set ParticleInputArray Delphes/allParticles
+  set PartonInputArray Delphes/partons
+  set JetInputArray FastJetFinder/jets
+
+  set DeltaR 0.5
+
+  set TauPTMin 1.0
+
+  set TauEtaMax 2.5
+
+  # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
+
+  # default efficiency formula (misidentification rate)
+  add EfficiencyFormula {0} {0.001}
+  # efficiency formula for tau-jets
+  add EfficiencyFormula {15} {0.4}
+}
+
+#####################################################
+# Find uniquely identified photons/electrons/tau/jets
+#####################################################
+
+module UniqueObjectFinder UniqueObjectFinder {
+# earlier arrays take precedence over later ones
+# add InputArray InputArray OutputArray
+  add InputArray PhotonIsolation/photons photons
+  add InputArray ElectronIsolation/electrons electrons
+  add InputArray FastJetFinder/jets jets
+}
+
+##################
+# ROOT tree writer
+##################
+
+module TreeWriter TreeWriter {
+# add Branch InputArray BranchName BranchClass
+  add Branch Delphes/allParticles Particle GenParticle
+  add Branch TrackMerger/tracks Track Track
+  add Branch Calorimeter/towers Tower Tower
+  add Branch Calorimeter/eflowTracks EFlowTrack Track
+  add Branch Calorimeter/eflowTowers EFlowTower Tower
+  add Branch MuonMomentumSmearing/muons EFlowMuon Muon
+  add Branch UniqueObjectFinder/jets Jet Jet
+  add Branch UniqueObjectFinder/electrons Electron Electron
+  add Branch UniqueObjectFinder/photons Photon Photon
+  add Branch MuonIsolation/muons Muon Muon
+  add Branch MissingET/momentum MissingET MissingET
+  add Branch ScalarHT/energy ScalarHT ScalarHT
+}
 

=== modified file 'Template/Cards/delphes_card_CMS.dat'
--- Template/Cards/delphes_card_CMS.dat	2010-10-30 03:26:37 +0000
+++ Template/Cards/delphes_card_CMS.dat	2013-03-04 23:37:19 +0000
@@ -1,135 +1,512 @@
-DETECTOR CARD      # DO NOT REMOVE THIS IS A TAG!
-
-# Detector extension, in pseudorapidity units
-CEN_max_tracker    2.5                // Maximum tracker coverage          
-CEN_max_calo_cen   3.0                // central calorimeter coverage
-CEN_max_calo_fwd   5.0                // forward calorimeter pseudorapidity coverage
-CEN_max_mu         2.4                // muon chambers pseudorapidity coverage
-  
-# Energy resolution for electron/photon
-# \sigma/E = C + N/E + S/\sqrt{E}, E in GeV
-ELG_Scen          0.05              // S term for central ECAL
-ELG_Ncen          0.25              // N term for central ECAL
-ELG_Ccen          0.005             // C term for central ECAL
-ELG_Sfwd          2.084             // S term for FCAL
-ELG_Nfwd          0.0               // N term for FCAL
-ELG_Cfwd          0.107             // C term for FCAL
-ELG_Szdc          0.70              // S term for ZDC
-ELG_Nzdc          0.0               // N term for ZDC
-ELG_Czdc          0.08              // C term for ZDC
-
-
-# Energy resolution for hadrons in ecal/hcal/hf
-# \sigma/E = C + N/E + S/\sqrt{E}, E in GeV
-HAD_Shcal         1.5               // S term for central HCAL 
-HAD_Nhcal         0.                // N term for central HCAL
-HAD_Chcal         0.05              // C term for central HCAL
-HAD_Shf           2.7               // S term for FCAL
-HAD_Nhf           0.                // N term for FCAL
-HAD_Chf           0.13              // C term for FCAL
-HAD_Szdc          1.38              // S term for ZDC
-HAD_Nzdc          0.                // N term for ZDC
-HAD_Czdc          0.13              // C term for ZDC
-
-# Time resolution for ZDC/RP220/RP420
-ZDC_T_resolution   0                // in s
-RP220_T_resolution 0                // in s
-RP420_T_resolution 0                // in s
-
-# Muon smearing
-MU_SmearPt        0.01		    // transverse momentum Pt in GeV
-
-# Tracking efficiencies
-TRACK_ptmin       0.9               // minimal pt needed to reach the calorimeter in GeV
-TRACK_eff          90               // efficiency associated to the tracking (%)
-
-# Calorimetric towers
-TOWER_number         40
-TOWER_eta_edges 0. 0.087 0.174 0.261 0.348 0.435 0.522 0.609 0.696 0.783 0.870 0.957 1.044 1.131 1.218 1.305 1.392 1.479 1.566 1.653 1.740 1.830 1.930 2.043 2.172 2.322 2.500 2.650 2.868 2.950 3.125 3.300 3.475 3.650 3.825 4.000 4.175 4.350 4.525 4.700 5.000
-## list of the edges of each tower in eta for eta>0 assuming a symmetric detector in eta<0
-### the list starts with the lower edge of the most central tower
-### the list ends with the higher edged of the most forward tower
-### there should be NTOWER+1 values
-TOWER_dphi 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 20 20
-### list of the tower size in phi (in degrees), assuming that all towers are similar in phi for a given eta value
-### the list starts with the phi-size of the most central tower (eta=0)
-### the list ends with the phi-size of the most forward tower
-### there should be NTOWER values
-##
-#
-
-# Thresholds for reconstructed objetcs, Pt in GeV
-PTCUT_elec       10.0
-PTCUT_muon       10.0
-PTCUT_jet        20.0
-PTCUT_gamma      10.0
-PTCUT_taujet     10.0
-
-# Thresholds for reconstructed objects in ZDC, E in GeV
-ZDC_gamma_E      20
-ZDC_n_E          50
-
-# Charged lepton isolation. Pt and Et in GeV
-ISOL_PT          2.0      //minimal pt of tracks for isolation criteria
-ISOL_Cone        0.5      //Cone  for isolation criteria
-ISOL_Calo_ET     1E99     //minimal tower transverse energy for isolation criteria. 1E99 means "off"
-ISOL_Calo_Cone   0.4      //Cone for calorimetric isolation
-ISOL_Calo_Grid   3        //Grid size (N x N) for calorimetric isolation
-
-# General jet variable
-JET_coneradius   0.7            // generic jet radius ; not for tau's !!!
-JET_jetalgo      1              // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
-JET_seed         1.0            // minimum seed to start jet reconstruction, in GeV
-JET_Eflow        0              // Perfect energy assumed in the tracker coverage
-
-# Tagging definition
-BTAG_b           40		// b-tag efficiency (%)
-BTAG_mistag_c    10		// mistagging (%)
-BTAG_mistag_l    1		// mistagging (%)
-
-# FLAGS
-FLAG_bfield      1                       //1 to run the bfield propagation else 0
-FLAG_vfd         1                       //1 to run the very forward detectors else 0
-FLAG_RP          1                       //1 to run the very forward detectors else 0
-FLAG_trigger     1                       //1 to run the trigger selection else 0
-FLAG_frog        0                       //1 to run the FROG event display
-FLAG_lhco        0                       //1 to run the LHCO
-
-# In case BField propagation allowed
-TRACK_radius      129                   //radius of the BField coverage, in cm
-TRACK_length      300                   //length of the BField coverage, in cm
-TRACK_bfield_x    0                     //X component of the BField, in T
-TRACK_bfield_y    0                     //Y component of the BField, in T
-TRACK_bfield_z    3.8                   //Z component of the BField, in T
-
-# Very forward detector extension, in pseudorapidity
-# if allowed
-VFD_min_calo_vfd  5.2                   // very forward calorimeter (if any) like CASTOR
-VFD_max_calo_vfd  6.6
-VFD_min_zdc       8.3			// zero-degree neutral calorimeter
-VFD_s_zdc         140                   // distance of the Zero Degree Calorimeter, from the IP, in [m]
-
-RP_220_s          220                   // distance of the RP to the IP, in meters
-RP_220_x          0.002                 // distance of the RP to the beam, in meters
-RP_420_s          420                   // distance of the RP to the IP, in meters
-RP_420_x          0.004                 // distance of the RP to the beam, in meters
-RP_beam1Card      DELPHESDIR/data/LHCB1IR5_v6.500.tfs
-RP_beam2Card      DELPHESDIR/data/LHCB2IR5_v6.500.tfs
-RP_IP_name        IP5
-RP_offsetEl_x     0.097                 // horizontal separation between both beam, in meters
-RP_offsetEl_y     0                     // vertical separation between both beam, in meters
-RP_offsetEl_s     120                   // distance of beam separation point, from IP
-RP_cross_x        -500                  // IP offset in horizontal plane, in micrometers
-RP_cross_y        0                     // IP offset in vertical plane, in micrometers
-RP_cross_ang_x    142.5                 // half-crossing angle in horizontal plane, in microrad
-RP_cross_ang_y    0                     // half-crossing angle in vertical plane, in microrad
-
-
-# In case FROG event display allowed
-NEvents_Frog      100
-# Number of events to process
-NEvents           -1                    // -1 means 'all'
-
-# input PDG tables
-PdgTableFilename  DELPHESDIR/data/particle.tbl     // table with particle pid,mass,charge,...
+#######################################
+# Order of execution of various modules
+#######################################
+
+set ExecutionPath {
+  ParticlePropagator
+
+  ChargedHadronTrackingEfficiency
+  ElectronTrackingEfficiency
+  MuonTrackingEfficiency
+
+  ChargedHadronMomentumSmearing
+  ElectronEnergySmearing
+  MuonMomentumSmearing
+
+  TrackMerger
+  Calorimeter
+  EFlowMerger
+
+  PhotonEfficiency
+  PhotonIsolation
+  
+  ElectronEfficiency
+  ElectronIsolation
+  
+  MuonEfficiency
+  MuonIsolation
+  
+  MissingET
+  
+  FastJetFinder
+  BTagging
+  TauTagging
+  
+  UniqueObjectFinder
+  
+  ScalarHT
+  
+  TreeWriter
+}
+
+#################################
+# Propagate particles in cylinder
+#################################
+
+module ParticlePropagator ParticlePropagator {
+  set InputArray Delphes/stableParticles
+
+  set OutputArray stableParticles
+  set ChargedHadronOutputArray chargedHadrons
+  set ElectronOutputArray electrons
+  set MuonOutputArray muons
+
+  # radius of the magnetic field coverage, in m
+  set Radius 1.29
+  # half-length of the magnetic field coverage, in m
+  set HalfLength 3.00
+
+  # magnetic field
+  set Bz 3.8
+}
+
+####################################
+# Charged hadron tracking efficiency
+####################################
+
+module Efficiency ChargedHadronTrackingEfficiency {
+  set InputArray ParticlePropagator/chargedHadrons
+  set OutputArray chargedHadrons
+
+  # add EfficiencyFormula {efficiency formula as a function of eta and pt}
+
+  # tracking efficiency formula for charged hadrons
+  set EfficiencyFormula {                                                    (pt <= 0.1)   * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.70) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0)                  * (0.95) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.60) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0)                  * (0.85) + \
+                         (abs(eta) > 2.5)                                                  * (0.00)}
+}
+
+##############################
+# Electron tracking efficiency
+##############################
+
+module Efficiency ElectronTrackingEfficiency {
+  set InputArray ParticlePropagator/electrons
+  set OutputArray electrons
+
+  # set EfficiencyFormula {efficiency formula as a function of eta and pt}
+              
+  # tracking efficiency formula for electrons
+  set EfficiencyFormula {                                                    (pt <= 0.1)   * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.73) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0   && pt <= 1.0e2) * (0.95) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0e2)                * (0.99) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.50) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0   && pt <= 1.0e2) * (0.83) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e2)                * (0.90) + \
+                         (abs(eta) > 2.5)                                                  * (0.00)}
+}
+
+##############################
+# Muon tracking efficiency
+##############################
+
+module Efficiency MuonTrackingEfficiency {
+  set InputArray ParticlePropagator/muons
+  set OutputArray muons
+
+  # set EfficiencyFormula {efficiency formula as a function of eta and pt}
+              
+  # tracking efficiency formula for muons
+  set EfficiencyFormula {                                                    (pt <= 0.1)   * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.75) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0)                  * (0.99) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.70) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0)                  * (0.98) + \
+                         (abs(eta) > 2.5)                                                  * (0.00)}
+}
+
+########################################
+# Momentum resolution for charged tracks
+########################################
+
+module MomentumSmearing ChargedHadronMomentumSmearing {
+  set InputArray ChargedHadronTrackingEfficiency/chargedHadrons
+  set OutputArray chargedHadrons
+
+  # set ResolutionFormula {resolution formula as a function of eta and pt}
+
+  # resolution formula for charged hadrons
+  set ResolutionFormula {                  (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.02) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0   && pt <= 1.0e1) * (0.01) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.03) + \
+                                           (abs(eta) <= 1.5) * (pt > 2.0e2)                * (0.05) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.03) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0   && pt <= 1.0e1) * (0.02) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.04) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 2.0e2)                * (0.05)}
+}
+
+#################################
+# Energy resolution for electrons
+#################################
+
+module EnergySmearing ElectronEnergySmearing {
+  set InputArray ElectronTrackingEfficiency/electrons
+  set OutputArray electrons
+
+  # set ResolutionFormula {resolution formula as a function of eta and energy}
+
+  set ResolutionFormula {                  (abs(eta) <= 2.5) * (energy > 0.1   && energy <= 2.5e1) * (energy*0.015) + \
+                                           (abs(eta) <= 2.5) * (energy > 2.5e1)                    * sqrt(energy^2*0.005^2 + energy*0.05^2 + 0.25^2) + \
+                         (abs(eta) > 2.5 && abs(eta) <= 3.0)                                       * sqrt(energy^2*0.005^2 + energy*0.05^2 + 0.25^2) + \
+                         (abs(eta) > 3.0 && abs(eta) <= 5.0)                                       * sqrt(energy^2*0.107^2 + energy*2.08^2)}
+
+}
+
+###############################
+# Momentum resolution for muons
+###############################
+
+module MomentumSmearing MuonMomentumSmearing {
+  set InputArray MuonTrackingEfficiency/muons
+  set OutputArray muons
+
+  # set ResolutionFormula {resolution formula as a function of eta and pt}
+
+  # resolution formula for muons
+  set ResolutionFormula {                  (abs(eta) <= 1.5) * (pt > 0.1   && pt <= 1.0)   * (0.03) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0   && pt <= 1.0e1) * (0.02) + \
+                                           (abs(eta) <= 1.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.03) + \
+                                           (abs(eta) <= 1.5) * (pt > 2.0e2)                * (0.05) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 0.1   && pt <= 1.0)   * (0.04) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0   && pt <= 1.0e1) * (0.03) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 1.0e1 && pt <= 2.0e2) * (0.04) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 2.0e2)                * (0.05)}
+}
+
+##############
+# Track merger
+##############
+
+module Merger TrackMerger {
+# add InputArray InputArray
+  add InputArray ChargedHadronMomentumSmearing/chargedHadrons
+  add InputArray ElectronEnergySmearing/electrons
+  set OutputArray tracks
+}
+
+#############
+# Calorimeter
+#############
+
+module Calorimeter Calorimeter {
+  set ParticleInputArray ParticlePropagator/stableParticles
+  set TrackInputArray TrackMerger/tracks
+
+  set TowerOutputArray towers
+  set PhotonOutputArray photons
+
+  set EFlowTrackOutputArray eflowTracks
+  set EFlowTowerOutputArray eflowTowers
+
+  set pi [expr {acos(-1)}]
+  
+  # lists of the edges of each tower in eta and phi
+  # each list starts with the lower edge of the first tower
+  # the list ends with the higher edged of the last tower
+
+  # 5 degrees towers
+  set PhiBins {}
+  for {set i -36} {$i <= 36} {incr i} { 
+    add PhiBins [expr {$i * $pi/36.0}]
+  }
+  foreach eta {-1.566 -1.479 -1.392 -1.305 -1.218 -1.131 -1.044 -0.957 -0.87 -0.783 -0.696 -0.609 -0.522 -0.435 -0.348 -0.261 -0.174 -0.087 0 0.087 0.174 0.261 0.348 0.435 0.522 0.609 0.696 0.783 0.87 0.957 1.044 1.131 1.218 1.305 1.392 1.479 1.566 1.653} { 
+    add EtaPhiBins $eta $PhiBins
+  }
+
+  # 10 degrees towers
+  set PhiBins {}
+  for {set i -18} {$i <= 18} {incr i} { 
+    add PhiBins [expr {$i * $pi/18.0}]
+  }
+  foreach eta {-4.35 -4.175 -4 -3.825 -3.65 -3.475 -3.3 -3.125 -2.95 -2.868 -2.65 -2.5 -2.322 -2.172 -2.043 -1.93 -1.83 -1.74 -1.653 1.74 1.83 1.93 2.043 2.172 2.322 2.5 2.65 2.868 2.95 3.125 3.3 3.475 3.65 3.825 4 4.175 4.35 4.525} { 
+    add EtaPhiBins $eta $PhiBins
+  }
+ 
+  # 20 degrees towers
+  set PhiBins {}
+  for {set i -9} {$i <= 9} {incr i} { 
+    add PhiBins [expr {$i * $pi/9.0}]
+  }  
+  foreach eta {-5 -4.7 -4.525 4.7 5} { 
+    add EtaPhiBins $eta $PhiBins
+  }
+
+  # default energy fractions {abs(PDG code)} {Fecal Fhcal}
+  add EnergyFraction {0} {0.0 1.0}
+  # energy fractions for e, gamma and pi0
+  add EnergyFraction {11} {1.0 0.0}
+  add EnergyFraction {22} {1.0 0.0}
+  add EnergyFraction {111} {1.0 0.0}
+  # energy fractions for muon and neutrinos
+  add EnergyFraction {12} {0.0 0.0}
+  add EnergyFraction {13} {0.0 0.0}
+  add EnergyFraction {14} {0.0 0.0}
+  add EnergyFraction {16} {0.0 0.0}
+  # energy fractions for K0short and Lambda
+  add EnergyFraction {310} {0.3 0.7}
+  add EnergyFraction {3122} {0.3 0.7}
+  
+  # set ECalResolutionFormula {resolution formula as a function of eta and energy}
+  set ECalResolutionFormula {                  (abs(eta) <= 3.0) * sqrt(energy^2*0.005^2 + energy*0.05^2 + 0.25^2) + \
+                             (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.107^2 + energy*2.08^2)}
+
+  # set HCalResolutionFormula {resolution formula as a function of eta and energy}
+  set HCalResolutionFormula {                  (abs(eta) <= 3.0) * sqrt(energy^2*0.050^2 + energy*1.50^2) + \
+                             (abs(eta) > 3.0 && abs(eta) <= 5.0) * sqrt(energy^2*0.130^2 + energy*2.70^2)}
+}
+
+####################
+# Energy flow merger
+####################
+
+module Merger EFlowMerger {
+# add InputArray InputArray
+  add InputArray Calorimeter/eflowTracks
+  add InputArray Calorimeter/eflowTowers
+  add InputArray MuonMomentumSmearing/muons
+  set OutputArray eflow
+}
+
+###################
+# Photon efficiency
+###################
+
+module Efficiency PhotonEfficiency {
+  set InputArray Calorimeter/photons
+  set OutputArray photons
+
+  # set EfficiencyFormula {efficiency formula as a function of eta and pt}
+
+  # efficiency formula for photons
+  set EfficiencyFormula {                                      (pt <= 10.0) * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 10.0)  * (0.95) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0)  * (0.85) + \
+                         (abs(eta) > 2.5)                                   * (0.00)}
+}
+
+##################
+# Photon isolation
+##################
+
+module Isolation PhotonIsolation {
+  set CandidateInputArray PhotonEfficiency/photons
+  set IsolationInputArray EFlowMerger/eflow
+  
+  set OutputArray photons
+
+  set DeltaRMax 0.5
+
+  set PTMin 0.5
+
+  set PTRatioMax 0.1
+}
+
+#####################
+# Electron efficiency
+#####################
+
+module Efficiency ElectronEfficiency {
+  set InputArray ElectronEnergySmearing/electrons
+  set OutputArray electrons
+
+  # set EfficiencyFormula {efficiency formula as a function of eta and pt}
+
+  # efficiency formula for electrons
+  set EfficiencyFormula {                                      (pt <= 10.0) * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 10.0)  * (0.95) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.5) * (pt > 10.0)  * (0.85) + \
+                         (abs(eta) > 2.5)                                   * (0.00)}
+}
+
+####################
+# Electron isolation
+####################
+
+module Isolation ElectronIsolation {
+  set CandidateInputArray ElectronEfficiency/electrons
+  set IsolationInputArray EFlowMerger/eflow
+  
+  set OutputArray electrons
+
+  set DeltaRMax 0.5
+
+  set PTMin 0.5
+
+  set PTRatioMax 0.1
+}
+
+#################
+# Muon efficiency
+#################
+
+module Efficiency MuonEfficiency {
+  set InputArray MuonMomentumSmearing/muons
+  set OutputArray muons
+
+  # set EfficiencyFormula {efficiency as a function of eta and pt}
+
+  # efficiency formula for muons
+  set EfficiencyFormula {                                      (pt <= 10.0) * (0.00) + \
+                                           (abs(eta) <= 1.5) * (pt > 10.0)  * (0.95) + \
+                         (abs(eta) > 1.5 && abs(eta) <= 2.4) * (pt > 10.0)  * (0.85) + \
+                         (abs(eta) > 2.4)                                   * (0.00)}
+}
+
+################
+# Muon isolation
+################
+
+module Isolation MuonIsolation {
+  set CandidateInputArray MuonEfficiency/muons
+  set IsolationInputArray EFlowMerger/eflow
+  
+  set OutputArray muons
+
+  set DeltaRMax 0.5
+
+  set PTMin 0.5
+
+  set PTRatioMax 0.1
+}
+
+###################
+# Missing ET merger
+###################
+
+module Merger MissingET {
+# add InputArray InputArray
+  add InputArray EFlowMerger/eflow
+  set MomentumOutputArray momentum
+}
+
+##################
+# Scalar HT merger
+##################
+
+module Merger ScalarHT {
+# add InputArray InputArray
+  add InputArray UniqueObjectFinder/jets
+  add InputArray UniqueObjectFinder/electrons
+  add InputArray UniqueObjectFinder/photons
+  add InputArray MuonIsolation/muons
+  set EnergyOutputArray energy
+}
+
+############
+# Jet finder
+############
+
+module FastJetFinder FastJetFinder {
+#  set InputArray Calorimeter/towers
+  set InputArray EFlowMerger/eflow
+  
+  set OutputArray jets
+
+  # algorithm: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
+  set JetAlgorithm 6
+  set ParameterR 0.7
+
+  set ConeRadius 0.5
+  set SeedThreshold 1.0
+  set ConeAreaFraction 1.0
+  set AdjacencyCut 2.0
+  set OverlapThreshold 0.75
+
+  set MaxIterations 100
+  set MaxPairSize 2
+  set Iratch 1
+  
+  set JetPTMin 20.0
+}
+
+###########
+# b-tagging
+###########
+
+module BTagging BTagging {
+  set PartonInputArray Delphes/partons
+  set JetInputArray FastJetFinder/jets
+
+  set DeltaR 0.5
+
+  set PartonPTMin 1.0
+
+  set PartonEtaMax 2.5
+
+  # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
+  # PDG code = the highest PDG code of a quark or gluon inside DeltaR cone around jet axis
+  # gluon's PDG code has the lowest priority
+
+  # https://twiki.cern.ch/twiki/bin/view/CMSPublic/PhysicsResultsBTV
+  # default efficiency formula (misidentification rate)
+  add EfficiencyFormula {0} {0.001}
+
+  # efficiency formula for c-jets (misidentification rate)
+  add EfficiencyFormula {4} {                                      (pt <= 15.0) * (0.000) + \
+                                                (abs(eta) <= 1.2) * (pt > 15.0) * (0.2*tanh(pt*0.03 - 0.4)) + \
+                              (abs(eta) > 1.2 && abs(eta) <= 2.5) * (pt > 15.0) * (0.1*tanh(pt*0.03 - 0.4)) + \
+                              (abs(eta) > 2.5)                                  * (0.000)}  
+  
+  # efficiency formula for b-jets
+  add EfficiencyFormula {5} {                                      (pt <= 15.0) * (0.000) + \
+                                                (abs(eta) <= 1.2) * (pt > 15.0) * (0.5*tanh(pt*0.03 - 0.4)) + \
+                              (abs(eta) > 1.2 && abs(eta) <= 2.5) * (pt > 15.0) * (0.4*tanh(pt*0.03 - 0.4)) + \
+                              (abs(eta) > 2.5)                                  * (0.000)}
+}
+
+module TauTagging TauTagging {
+  set ParticleInputArray Delphes/allParticles
+  set PartonInputArray Delphes/partons
+  set JetInputArray FastJetFinder/jets
+
+  set DeltaR 0.5
+
+  set TauPTMin 1.0
+
+  set TauEtaMax 2.5
+
+  # add EfficiencyFormula {abs(PDG code)} {efficiency formula as a function of eta and pt}
+
+  # default efficiency formula (misidentification rate)
+  add EfficiencyFormula {0} {0.001}
+  # efficiency formula for tau-jets
+  add EfficiencyFormula {15} {0.4}
+}
+
+#####################################################
+# Find uniquely identified photons/electrons/tau/jets
+#####################################################
+
+module UniqueObjectFinder UniqueObjectFinder {
+# earlier arrays take precedence over later ones
+# add InputArray InputArray OutputArray
+  add InputArray PhotonIsolation/photons photons
+  add InputArray ElectronIsolation/electrons electrons
+  add InputArray FastJetFinder/jets jets
+}
+
+##################
+# ROOT tree writer
+##################
+
+module TreeWriter TreeWriter {
+# add Branch InputArray BranchName BranchClass
+  add Branch Delphes/allParticles Particle GenParticle
+  add Branch TrackMerger/tracks Track Track
+  add Branch Calorimeter/towers Tower Tower
+  add Branch Calorimeter/eflowTracks EFlowTrack Track
+  add Branch Calorimeter/eflowTowers EFlowTower Tower
+  add Branch MuonMomentumSmearing/muons EFlowMuon Muon
+  add Branch UniqueObjectFinder/jets Jet Jet
+  add Branch UniqueObjectFinder/electrons Electron Electron
+  add Branch UniqueObjectFinder/photons Photon Photon
+  add Branch MuonIsolation/muons Muon Muon
+  add Branch MissingET/momentum MissingET MissingET
+  add Branch ScalarHT/energy ScalarHT ScalarHT
+}
 

=== modified file 'Template/Cards/delphes_card_default.dat'
--- Template/Cards/delphes_card_default.dat	2010-10-30 03:26:37 +0000
+++ Template/Cards/delphes_card_default.dat	2013-03-04 23:37:19 +0000
@@ -1,47 +1,54 @@
-DETECTOR CARD      # DO NOT REMOVE THIS IS A TAG!
+DETECTOR CARD      // DO NOT REMOVE THIS IS A TAG!
+# any line containing a dash symbol (#) will be completely ignored, whatever the position of this symbol
 
 # Detector extension, in pseudorapidity units
-CEN_max_tracker    2.5                // Maximum tracker coverage          
-CEN_max_calo_cen   3.0                // central calorimeter coverage
-CEN_max_calo_fwd   5.0                // forward calorimeter pseudorapidity coverage
-CEN_max_mu         2.4                // muon chambers pseudorapidity coverage
+CEN_max_tracker    2.5              // Maximum tracker coverage          
+CEN_max_calo_cen   1.7              // central calorimeter coverage
+CEN_max_calo_ec    3.0              // calorimeter endcap coverage
+CEN_max_calo_fwd   5.0              // forward calorimeter pseudorapidity coverage
+CEN_max_mu         2.4              // muon chambers pseudorapidity coverage
   
-# Energy resolution for electron/photon
+# Energy resolution for electron/photon in central/endcap/fwd/zdc calos
 # \sigma/E = C + N/E + S/\sqrt{E}, E in GeV
 ELG_Scen          0.05              // S term for central ECAL
-ELG_Ncen          0.25              // N term for central ECAL
-ELG_Ccen          0.005             // C term for central ECAL
+ELG_Ncen          0.25              // N term 
+ELG_Ccen          0.005             // C term 
+ELG_Sec           0.05              // S term for ECAL endcap
+ELG_Nec           0.25              // N term
+ELG_Cec           0.005             // C term
 ELG_Sfwd          2.084             // S term for FCAL
-ELG_Nfwd          0.0               // N term for FCAL
-ELG_Cfwd          0.107             // C term for FCAL
+ELG_Nfwd          0.0               // N term 
+ELG_Cfwd          0.107             // C term 
 ELG_Szdc          0.70              // S term for ZDC
-ELG_Nzdc          0.0               // N term for ZDC
-ELG_Czdc          0.08              // C term for ZDC
-
-
-# Energy resolution for hadrons in ecal/hcal/hf
+ELG_Nzdc          0.0               // N term
+ELG_Czdc          0.08              // C term
+
+# Energy resolution for hadrons in central/endcap/fwd/zdc calos
 # \sigma/E = C + N/E + S/\sqrt{E}, E in GeV
-HAD_Shcal         1.5               // S term for central HCAL 
-HAD_Nhcal         0.                // N term for central HCAL
-HAD_Chcal         0.05              // C term for central HCAL
-HAD_Shf           2.7               // S term for FCAL
-HAD_Nhf           0.                // N term for FCAL
-HAD_Chf           0.13              // C term for FCAL
+HAD_Scen          1.5               // S term for central HCAL 
+HAD_Ncen          0.                // N term
+HAD_Ccen          0.05              // C term
+HAD_Sec           1.5               // S term for HCAL endcap
+HAD_Nec           0.                // N term
+HAD_Cec           0.05              // C term
+HAD_Sfwd          2.7               // S term for FCAL
+HAD_Nfwd          0.                // N term
+HAD_Cfwd          0.13              // C term
 HAD_Szdc          1.38              // S term for ZDC
-HAD_Nzdc          0.                // N term for ZDC
-HAD_Czdc          0.13              // C term for ZDC
+HAD_Nzdc          0.                // N term
+HAD_Czdc          0.13              // C term
 
 # Time resolution for ZDC/RP220/RP420
-ZDC_T_resolution   0                // in s
-RP220_T_resolution 0                // in s
-RP420_T_resolution 0                // in s
+ZDC_T_resolution   0		    // in s
+RP220_T_resolution 0		    // in s
+RP420_T_resolution 0		    // in s
 
 # Muon smearing
 MU_SmearPt        0.01		    // transverse momentum Pt in GeV
 
 # Tracking efficiencies
-TRACK_ptmin       0.9               // minimal pt needed to reach the calorimeter in GeV
-TRACK_eff          90               // efficiency associated to the tracking (%)
+TRACK_ptmin       0.0               // minimal pt needed to reach the calorimeter in GeV
+TRACK_eff         100               // efficiency associated to the tracking (%)
 
 # Calorimetric towers
 TOWER_number         40
@@ -58,7 +65,7 @@
 ##
 #
 
-# Thresholds for reconstructed objetcs, Pt in GeV
+# Thresholds for reconstructed objects, Pt in GeV
 PTCUT_elec       10.0
 PTCUT_muon       10.0
 PTCUT_jet        20.0
@@ -70,34 +77,43 @@
 ZDC_n_E          50
 
 # Charged lepton isolation. Pt and Et in GeV
-ISOL_PT          2.0      //minimal pt of tracks for isolation criteria
-ISOL_Cone        0.5      //Cone  for isolation criteria
-ISOL_Calo_ET     1E99     //minimal tower transverse energy for isolation criteria. 1E99 means "off"
-ISOL_Calo_Cone   0.4      //Cone for calorimetric isolation
-ISOL_Calo_Grid   3        //Grid size (N x N) for calorimetric isolation
+ISOL_trk_PT      2.0      //minimal pt of tracks for isolation criteria
+ISOL_trk_Cone    0.5      //Cone  for isolation criteria
+ISOL_calo_Cone   0.5      //Cone  for isolation criteria
+ISOL_calo_ET     0        //minimal tower transverse energy for isolation criteria.
+ISOL_calo_Grid   3        //Grid size (N x N) for calorimetric isolation
 
 # General jet variable
 JET_coneradius   0.7            // generic jet radius ; not for tau's !!!
-JET_jetalgo      1              // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
+JET_jetalgo      2              // Jet algorithms: 1 CDFJetClu, 2 MidPoint, 3 SIScone, 4 kt, 5 Cambridge/Aachen, 6 antikt
 JET_seed         1.0            // minimum seed to start jet reconstruction, in GeV
 JET_Eflow        0              // Perfect energy assumed in the tracker coverage
 
-# Tagging definition
-BTAG_b           40		// b-tag efficiency (%)
-BTAG_mistag_c    10		// mistagging (%)
-BTAG_mistag_l    1		// mistagging (%)
+# b-(mis)tagging efficiencies 
+# pt dependence for b-tagging and mistag
+# see http://root.cern.ch/root/html/TFormula.html for syntax
+# e.g. BTAG_func_b     0.4*(1-exp(-x))
+# in case of no explicit dependence, on x (=PT) or y (=eta), you MUST add "+0*x" and/or "+0*y"
+# e.g. BTAG_func_g     0.01 + 0*x + 0*y
+# put 'x' for pt ; range: [0, 9E6 GeV/c]
+# put 'y' for eta ; range [-CEN_max_tracker ; CEN_max_tracker ]
+# e.g. (x<300)?(0.2+0*x+0*y):(0.6+0*x+y*0)
+BTAG_func_b	 0.4+0*x+0*y	        // formula for Pt dependence of the b-tag efficiency (b-jets)
+BTAG_func_c      0.1+0*x+0*y            // formula for Pt dependence of the mistag efficiency (c-jets)
+BTAG_func_g      0.01+0*x+0*y           // (gluon-jets)
+BTAG_func_l      0.01+0*x+0*y		// (light-jets)
 
 # FLAGS
 FLAG_bfield      1                       //1 to run the bfield propagation else 0
 FLAG_vfd         1                       //1 to run the very forward detectors else 0
 FLAG_RP          1                       //1 to run the very forward detectors else 0
 FLAG_trigger     1                       //1 to run the trigger selection else 0
-FLAG_frog        0                       //1 to run the FROG event display
+FLAG_frog        1                       //1 to run the FROG event display
 FLAG_lhco        0                       //1 to run the LHCO
 
 # In case BField propagation allowed
 TRACK_radius      129                   //radius of the BField coverage, in cm
-TRACK_length      300                   //length of the BField coverage, in cm
+TRACK_length      300                   //half-length of the BField coverage, in cm
 TRACK_bfield_x    0                     //X component of the BField, in T
 TRACK_bfield_y    0                     //Y component of the BField, in T
 TRACK_bfield_z    3.8                   //Z component of the BField, in T
@@ -109,26 +125,26 @@
 VFD_min_zdc       8.3			// zero-degree neutral calorimeter
 VFD_s_zdc         140                   // distance of the Zero Degree Calorimeter, from the IP, in [m]
 
+#Hector parameters
 RP_220_s          220                   // distance of the RP to the IP, in meters
 RP_220_x          0.002                 // distance of the RP to the beam, in meters
 RP_420_s          420                   // distance of the RP to the IP, in meters
 RP_420_x          0.004                 // distance of the RP to the beam, in meters
-RP_beam1Card      DELPHESDIR/data/LHCB1IR5_v6.500.tfs
-RP_beam2Card      DELPHESDIR/data/LHCB2IR5_v6.500.tfs
-RP_IP_name        IP5
-RP_offsetEl_x     0.097                 // horizontal separation between both beam, in meters
+RP_beam1Card      DELPHESDIR/data/LHCB1IR5_v6.500.tfs // beam optics file, beam 1
+RP_beam2Card      DELPHESDIR/data/LHCB2IR5_v6.500.tfs // beam optics file, beam 2
+RP_IP_name        IP5			// tag for IP in Hector ; 'IP1' for ATLAS
+RP_offsetEl_x     0.097			// horizontal separation between both beam, in meters 
 RP_offsetEl_y     0                     // vertical separation between both beam, in meters
-RP_offsetEl_s     120                   // distance of beam separation point, from IP
-RP_cross_x        -500                  // IP offset in horizontal plane, in micrometers
-RP_cross_y        0                     // IP offset in vertical plane, in micrometers
-RP_cross_ang_x    142.5                 // half-crossing angle in horizontal plane, in microrad
-RP_cross_ang_y    0                     // half-crossing angle in vertical plane, in microrad
-
+RP_offsetEl_s     120			// distance of beam separation point, from IP
+RP_cross_x	  -500			// IP offset in horizontal plane, in micrometers
+RP_cross_y	  0			// IP offset in vertical plane, in micrometers
+RP_cross_ang_x    142.5			// half-crossing angle in horizontal plane, in microrad
+RP_cross_ang_y    0			// half-crossing angle in vertical plane, in microrad
 
 # In case FROG event display allowed
 NEvents_Frog      100
-# Number of events to process
-NEvents           -1                    // -1 means 'all'
+# Number of events to process 
+NEvents           -1                   // -1 means 'all'
 
 # input PDG tables
 PdgTableFilename  DELPHESDIR/data/particle.tbl     // table with particle pid,mass,charge,...

=== added file 'Template/Cards/delphes_trigger_ATLAS.dat'
--- Template/Cards/delphes_trigger_ATLAS.dat	1970-01-01 00:00:00 +0000
+++ Template/Cards/delphes_trigger_ATLAS.dat	2013-03-04 23:37:19 +0000
@@ -0,0 +1,16 @@
+#TRIGGER CARD      # DO NOT REMOVE THIS IS A TAG!
+
+# list of trigger algorithms
+# trigger_name	>> algorithm                   #comments
+Inclusive Isol electron  >> IElec1_PT:  '25'                            
+di-electron Isol         >> IELEC1_PT:  '15'   &&   IELEC2_PT:   '15'    
+Inclusive Photon         >> GAMMA1_PT:  '60'                            
+di-Photon                >> GAMMA1_PT:  '20'   &&   GAMMA2_PT:   '20'    
+Inclusive Isol muon      >> IMuon1_PT:  '20'                            
+di-muon                  >> MUON1_PT:   '10'   &&   MUON2_PT:    '10'    
+Taujet and ETmis         >> TAU1_PT:    '35'   &&   ETMIS_PT:    '45'
+Jet and ETmis            >> JET1_PT:    '70'   &&   ETMIS_PT:    '70'
+Inclusive 1 jet          >> JET1_PT:    '400'
+Inclusive 3 jets         >> JET1_PT:    '165'  &&   JET2_PT:     '165'    &&     JET3_PT:    '165'
+Inclusive 4 jets         >> JET1_PT:    '110'  &&   JET2_PT:     '110'    &&     JET3_PT:    '110'   &&     JET4_PT:    '110'
+

=== removed file 'Template/Cards/delphes_trigger_ATLAS.dat'
--- Template/Cards/delphes_trigger_ATLAS.dat	2010-10-30 03:26:37 +0000
+++ Template/Cards/delphes_trigger_ATLAS.dat	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#TRIGGER CARD      # DO NOT REMOVE THIS IS A TAG!
-
-# list of trigger algorithms
-# trigger_name	>> algorithm                   #comments
-Inclusive Isol electron  >> IElec1_PT:  '25'                            
-di-electron Isol         >> IELEC1_PT:  '15'   &&   IELEC2_PT:   '15'    
-Inclusive Photon         >> GAMMA1_PT:  '60'                            
-di-Photon                >> GAMMA1_PT:  '20'   &&   GAMMA2_PT:   '20'    
-Inclusive Isol muon      >> IMuon1_PT:  '20'                            
-di-muon                  >> MUON1_PT:   '10'   &&   MUON2_PT:    '10'    
-Taujet and ETmis         >> TAU1_PT:    '35'   &&   ETMIS_PT:    '45'
-Jet and ETmis            >> JET1_PT:    '70'   &&   ETMIS_PT:    '70'
-Inclusive 1 jet          >> JET1_PT:    '400'
-Inclusive 3 jets         >> JET1_PT:    '165'  &&   JET2_PT:     '165'    &&     JET3_PT:    '165'
-Inclusive 4 jets         >> JET1_PT:    '110'  &&   JET2_PT:     '110'    &&     JET3_PT:    '110'   &&     JET4_PT:    '110'
-

=== added file 'Template/Cards/delphes_trigger_CMS.dat'
--- Template/Cards/delphes_trigger_CMS.dat	1970-01-01 00:00:00 +0000
+++ Template/Cards/delphes_trigger_CMS.dat	2013-03-04 23:37:19 +0000
@@ -0,0 +1,20 @@
+#TRIGGER CARD      # DO NOT REMOVE THIS IS A TAG!
+
+# list of trigger algorithms
+# trigger_name	>> algorithm                   #comments
+Inclusive electron  >> ELEC1_PT:   '29'                            
+di-electron         >> ELEC1_PT:   '17'   &&   ELEC2_PT:   '17'    
+Inclusive Photon    >> GAMMA1_PT:  '80'                            
+di-Photon           >> GAMMA1_PT:  '40'   &&   GAMMA2_PT:  '25'    
+Inclusive muon      >> MUON1_PT:   '19'                            
+di-muon             >> MUON1_PT:   '7'    &&   MUON2_PT:   '7'    
+Taujet and ETmis    >> TAU1_PT:    '86'   &&   ETMIS_PT:   '65'
+di-Taujets          >> TAU1_PT:    '59'   &&   TAU2_PT:    '59' 
+Jet and ETmis       >> JET1_PT:    '180'  &&   ETMIS_PT:   '123'
+Taujet and electron >> TAU1_PT:    '45'   &&   ELEC1_PT:   '19'
+Taujet and muon     >> TAU1_PT:    '40'   &&   ELEC1_PT:   '15'
+Inclusive b-jet     >> Bjet1_PT:   '237'                            
+Inclusive 1 jet     >> JET1_PT:    '657'
+Inclusive 3 jets    >> JET1_PT:    '247'  &&   JET2_PT:    '247'    &&     JET3_PT:    '247' 
+Inclusive 4 jets    >> JET1_PT:    '113'  &&   JET2_PT:    '113'    &&     JET3_PT:    '113'   &&     JET4_PT:    '113'
+

=== removed file 'Template/Cards/delphes_trigger_CMS.dat'
--- Template/Cards/delphes_trigger_CMS.dat	2010-10-30 03:26:37 +0000
+++ Template/Cards/delphes_trigger_CMS.dat	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#TRIGGER CARD      # DO NOT REMOVE THIS IS A TAG!
-
-# list of trigger algorithms
-# trigger_name	>> algorithm                   #comments
-Inclusive electron  >> ELEC1_PT:   '29'                            
-di-electron         >> ELEC1_PT:   '17'   &&   ELEC2_PT:   '17'    
-Inclusive Photon    >> GAMMA1_PT:  '80'                            
-di-Photon           >> GAMMA1_PT:  '40'   &&   GAMMA2_PT:  '25'    
-Inclusive muon      >> MUON1_PT:   '19'                            
-di-muon             >> MUON1_PT:   '7'    &&   MUON2_PT:   '7'    
-Taujet and ETmis    >> TAU1_PT:    '86'   &&   ETMIS_PT:   '65'
-di-Taujets          >> TAU1_PT:    '59'   &&   TAU2_PT:    '59' 
-Jet and ETmis       >> JET1_PT:    '180'  &&   ETMIS_PT:   '123'
-Taujet and electron >> TAU1_PT:    '45'   &&   ELEC1_PT:   '19'
-Taujet and muon     >> TAU1_PT:    '40'   &&   ELEC1_PT:   '15'
-Inclusive b-jet     >> Bjet1_PT:   '237'                            
-Inclusive 1 jet     >> JET1_PT:    '657'
-Inclusive 3 jets    >> JET1_PT:    '247'  &&   JET2_PT:    '247'    &&     JET3_PT:    '247' 
-Inclusive 4 jets    >> JET1_PT:    '113'  &&   JET2_PT:    '113'    &&     JET3_PT:    '113'   &&     JET4_PT:    '113'
-

=== added file 'Template/Cards/delphes_trigger_default.dat'
--- Template/Cards/delphes_trigger_default.dat	1970-01-01 00:00:00 +0000
+++ Template/Cards/delphes_trigger_default.dat	2013-03-04 23:37:19 +0000
@@ -0,0 +1,20 @@
+#TRIGGER CARD      # DO NOT REMOVE THIS IS A TAG!
+
+# list of trigger algorithms
+# trigger_name	>> algorithm                   #comments
+Inclusive electron  >> ELEC1_PT:   '29'                            
+di-electron         >> ELEC1_PT:   '17'   &&   ELEC2_PT:   '17'    
+Inclusive Photon    >> GAMMA1_PT:  '80'                            
+di-Photon           >> GAMMA1_PT:  '40'   &&   GAMMA2_PT:  '25'    
+Inclusive muon      >> MUON1_PT:   '19'                            
+di-muon             >> MUON1_PT:   '7'    &&   MUON2_PT:   '7'    
+Taujet and ETmis    >> TAU1_PT:    '86'   &&   ETMIS_PT:   '65'
+di-Taujets          >> TAU1_PT:    '59'   &&   TAU2_PT:    '59' 
+Jet and ETmis       >> JET1_PT:    '180'  &&   ETMIS_PT:   '123'
+Taujet and electron >> TAU1_PT:    '45'   &&   ELEC1_PT:   '19'
+Taujet and muon     >> TAU1_PT:    '40'   &&   ELEC1_PT:   '15'
+Inclusive b-jet     >> Bjet1_PT:   '237'                            
+Inclusive 1 jet     >> JET1_PT:    '657'
+Inclusive 3 jets    >> JET1_PT:    '247'  &&   JET2_PT:    '247'    &&     JET3_PT:    '247' 
+Inclusive 4 jets    >> JET1_PT:    '113'  &&   JET2_PT:    '113'    &&     JET3_PT:    '113'   &&     JET4_PT:    '113'
+

=== removed file 'Template/Cards/delphes_trigger_default.dat'
--- Template/Cards/delphes_trigger_default.dat	2012-02-17 21:52:21 +0000
+++ Template/Cards/delphes_trigger_default.dat	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#TRIGGER CARD      # DO NOT REMOVE THIS IS A TAG!
-
-# list of trigger algorithms
-# trigger_name	>> algorithm                   #comments
-Inclusive electron  >> ELEC1_PT:   '29'                            
-di-electron         >> ELEC1_PT:   '17'   &&   ELEC2_PT:   '17'    
-Inclusive Photon    >> GAMMA1_PT:  '80'                            
-di-Photon           >> GAMMA1_PT:  '40'   &&   GAMMA2_PT:  '25'    
-Inclusive muon      >> MUON1_PT:   '19'                            
-di-muon             >> MUON1_PT:   '7'    &&   MUON2_PT:   '7'    
-Taujet and ETmis    >> TAU1_PT:    '86'   &&   ETMIS_PT:   '65'
-di-Taujets          >> TAU1_PT:    '59'   &&   TAU2_PT:    '59' 
-Jet and ETmis       >> JET1_PT:    '180'  &&   ETMIS_PT:   '123'
-Taujet and electron >> TAU1_PT:    '45'   &&   ELEC1_PT:   '19'
-Taujet and muon     >> TAU1_PT:    '40'   &&   ELEC1_PT:   '15'
-Inclusive b-jet     >> Bjet1_PT:   '237'                            
-Inclusive 1 jet     >> JET1_PT:    '657'
-Inclusive 3 jets    >> JET1_PT:    '247'  &&   JET2_PT:    '247'    &&     JET3_PT:    '247' 
-Inclusive 4 jets    >> JET1_PT:    '113'  &&   JET2_PT:    '113'    &&     JET3_PT:    '113'   &&     JET4_PT:    '113'
-

=== modified file 'Template/Source/PDF/pdf_lhapdf.f'
--- Template/Source/PDF/pdf_lhapdf.f	2010-10-30 03:26:37 +0000
+++ Template/Source/PDF/pdf_lhapdf.f	2013-03-04 23:37:19 +0000
@@ -9,6 +9,8 @@
       DOUBLE  PRECISION x,q,pdf(-7:7)
       DOUBLE  PRECISION f(-6:6)
       INTEGER IH,I
+      double precision  photon
+      LOGICAL has_photon
 C
 C     Include
 C
@@ -16,8 +18,13 @@
 C      
       if(abs(ih).eq.1) then
          pdf(-7)=0d0
-         pdf(7)=0d0
-         call evolvePDF(x, q, f)
+         if(has_photon())then
+             call evolvePDFphoton(x, q, f, photon)
+             pdf(7)= photon
+         else
+             pdf(7) = 0d0
+             call evolvePDF(x, q, f)
+         endif
          do i=-6,6
             pdf(i)=f(i)/x
          enddo

=== modified file 'Template/Source/PDF/pdg2pdf.f'
--- Template/Source/PDF/pdg2pdf.f	2012-11-11 08:52:35 +0000
+++ Template/Source/PDF/pdg2pdf.f	2013-03-04 23:37:19 +0000
@@ -16,11 +16,28 @@
       double precision Ctq3df,Ctq4Fn,Ctq5Pdf,Ctq6Pdf,Ctq5L
       integer mode,Irt,i,j
       double precision xlast(2),xmulast(2),pdflast(-7:7,2),q2max
+      character*7 pdlabellast(2)
       double precision epa_electron,epa_proton
-      integer ipart,ireuse,iporg
-      save xlast,xmulast,pdflast
-      data xlast/2*0d0/
-      data pdflast/30*0d0/
+      integer ipart,ireuse,iporg,ihlast(2)
+      save xlast,xmulast,pdflast,pdlabellast,ihlast
+      data xlast/2*-99d9/
+      data xmulast/2*-99d9/
+      data pdflast/30*-99d9/
+      data pdlabellast/2*'abcdefg'/
+      data ihlast/2*-99/
+
+c     Make sure we have a reasonable Bjorken x. Note that even though
+c     x=0 is not reasonable, we prefer to simply return pdg2pdf=0
+c     instead of stopping the code, as this might accidentally happen.
+      if (x.eq.0d0) then
+         pdg2pdf=0d0
+         return
+      elseif (x.lt.0d0 .or. x.gt.1d0) then
+         write (*,*) 'PDF not supported for Bjorken x ', x
+         open(unit=26,file='../../../error',status='unknown')
+         write(26,*) 'Error: PDF not supported for Bjorken x ',x
+         stop 1
+      endif
 
       ipart=ipdg
       if(iabs(ipart).eq.21) ipart=0
@@ -38,35 +55,53 @@
       ireuse = 0
       do i=1,2
 c     Check if result can be reused since any of last two calls
-         if (x.eq.xlast(i).and.xmu.eq.xmulast(i)) then
+         if (x.eq.xlast(i) .and. xmu.eq.xmulast(i) .and.
+     $        pdlabel.eq.pdlabellast(i) .and. ih.eq.ihlast(i)) then
             ireuse = i
          endif
       enddo
 
-c     If both x non-zero and not ireuse, then zero x
-      if (ireuse.eq.0.and.xlast(1).ne.0d0.and.xlast(2).ne.0d0)then
+c     Reuse previous result, if possible
+      if (ireuse.gt.0.and.pdflast(iporg,ireuse).ne.-99d9) then
+         pdg2pdf=pdflast(iporg,ireuse)
+         return 
+      endif
+
+c     Bjorken x and/or facrorization scale and/or PDF set are not
+c     identical to the saved values: this means a new event and we
+c     should reset everything to compute new PDF values. Also, determine
+c     if we should fill ireuse=1 or ireuse=2.
+      if (ireuse.eq.0.and.xlast(1).ne.-99d9.and.xlast(2).ne.-99d9)then
          do i=1,2
-            xlast(i)=0d0
-            xmulast(i)=0d0
+            xlast(i)=-99d9
+            xmulast(i)=-99d9
             do j=-7,7
-               pdflast(j,i)=0d0
+               pdflast(j,i)=-99d9
             enddo
+            pdlabellast(i)='abcdefg'
+            ihlast(i)=-99
          enddo
+c     everything has been reset. Now set ireuse=1 to fill the first
+c     arrays of saved values below
          ireuse=1
-      else if(ireuse.eq.0.and.xlast(1).ne.0d0)then
+      else if(ireuse.eq.0.and.xlast(1).ne.-99d9)then
+c     This is first call after everything has been reset, so the first
+c     arrays are already filled with the saved values (hence
+c     xlast(1).ne.-99d9). Fill the second arrays of saved values (done
+c     below) by setting ireuse=2
          ireuse=2
       else if(ireuse.eq.0)then
+c     Special: only used for the very first call to this function:
+c     xlast(i) are initialized as data statements to be equal to -99d9
          ireuse=1
       endif
 
-c     Reuse previous result, if possible
-      if (ireuse.gt.0.and.pdflast(iporg,ireuse).ne.0d0) then
-         pdg2pdf=pdflast(iporg,ireuse)
-         return 
-      endif
-
+c     Give the current values to the arrays that should be
+c     saved. 'pdflast' is filled below.
       xlast(ireuse)=x
       xmulast(ireuse)=xmu
+      pdlabellast(ireuse)=pdlabel
+      ihlast(ireuse)=ih
 
       if(iabs(ipart).eq.7.and.ih.gt.1) then
          q2max=xmu*xmu

=== modified file 'Template/Source/PDF/pdg2pdf_lhapdf.f'
--- Template/Source/PDF/pdg2pdf_lhapdf.f	2011-11-22 13:37:54 +0000
+++ Template/Source/PDF/pdg2pdf_lhapdf.f	2013-03-04 23:37:19 +0000
@@ -7,36 +7,112 @@
 c     Arguments
 c
       DOUBLE  PRECISION x,xmu
-      INTEGER IH,ipdg,ipart
+      INTEGER IH,ipdg
 C
 C     Include
 C
       include 'pdf.inc'
 C      
-      double precision Ctq3df,Ctq4Fn,Ctq5Pdf,Ctq6Pdf,Ctq5L
-      integer mode,Irt,ihlast
-      double precision xlast,xmulast,pdflast(-7:7)
-      save ihlast,xlast,xmulast,pdflast
+      integer i,j,ihlast(2),ipart,iporg,ireuse,imemlast(2),iset,imem
+      double precision xlast(2),xmulast(2),pdflast(-7:7,2)
+      save ihlast,xlast,xmulast,pdflast,imemlast
+      data ihlast/2*-99/
+      data xlast/2*-99d9/
+      data xmulast/2*-99d9/
+      data pdflast/30*-99d9/
+      data imemlast/2*-99/
+
+c     Make sure we have a reasonable Bjorken x. Note that even though
+c     x=0 is not reasonable, we prefer to simply return pdg2pdf=0
+c     instead of stopping the code, as this might accidentally happen.
+      if (x.eq.0d0) then
+         pdg2pdf=0d0
+         return
+      elseif (x.lt.0d0 .or. x.gt.1d0) then
+         write (*,*) 'PDF not supported for Bjorken x ', x
+         open(unit=26,file='../../../error',status='unknown')
+         write(26,*) 'Error: PDF not supported for Bjorken x ',x
+         stop 1
+      endif
 
       ipart=ipdg
       if(ipart.eq.21) ipart=0
       if(iabs(ipart).eq.22) ipart=7
+      iporg=ipart
 
 c     This will be called for any PDG code, but we only support up to 7
       if(iabs(ipart).gt.7)then
-         pdg2pdf=0d0
+         write(*,*) 'PDF not supported for pdg ',ipdg
+         open(unit=26,file='../../../error',status='unknown')
+         write(26,*) 'Error: PDF not supported for pdg ',ipdg
+         stop 1
+      endif
+
+c     Determine the iset used in lhapdf
+      call getnset(iset)
+      if (iset.ne.1) then
+         write (*,*) 'PDF not supported for Bjorken x ', x
+         open(unit=26,file='../../../error',status='unknown')
+         write(26,*) 'Error: PDF not supported for Bjorken x ',x
+         stop 1
+      endif
+
+c     Determine the member of the set (function of lhapdf)
+      call getnmem(iset,imem)
+
+      ireuse = 0
+      do i=1,2
+c     Check if result can be reused since any of last two calls
+         if (x.eq.xlast(i) .and. xmu.eq.xmulast(i) .and.
+     $        imem.eq.imemlast(i) .and. ih.eq.ihlast(i)) then
+            ireuse = i
+         endif
+      enddo
+
+c     Reuse previous result, if possible
+      if (ireuse.gt.0.and.pdflast(iporg,ireuse).ne.-99d9) then
+         pdg2pdf=pdflast(iporg,ireuse)
          return 
       endif
 
-      if(ih.eq.ihlast.and.x.eq.xlast.and.xmu.eq.xmulast)then
-         pdg2pdf=pdflast(ipart);
-      else
-         call pftopdglha(ih,x,xmu,pdflast)
-         ihlast=ih
-         xlast=x
-         xmulast=xmu
-         pdg2pdf=pdflast(ipart);
+c     Bjorken x and/or facrorization scale and/or PDF set are not
+c     identical to the saved values: this means a new event and we
+c     should reset everything to compute new PDF values. Also, determine
+c     if we should fill ireuse=1 or ireuse=2.
+      if (ireuse.eq.0.and.xlast(1).ne.-99d9.and.xlast(2).ne.-99d9)then
+         do i=1,2
+            xlast(i)=-99d9
+            xmulast(i)=-99d9
+            do j=-7,7
+               pdflast(j,i)=-99d9
+            enddo
+            imemlast(i)=-99
+            ihlast(i)=-99
+         enddo
+c     everything has been reset. Now set ireuse=1 to fill the first
+c     arrays of saved values below
+         ireuse=1
+      else if(ireuse.eq.0.and.xlast(1).ne.-99d9)then
+c     This is first call after everything has been reset, so the first
+c     arrays are already filled with the saved values (hence
+c     xlast(1).ne.-99d9). Fill the second arrays of saved values (done
+c     below) by setting ireuse=2
+         ireuse=2
+      else if(ireuse.eq.0)then
+c     Special: only used for the very first call to this function:
+c     xlast(i) are initialized as data statements to be equal to -99d9
+         ireuse=1
       endif
 
+c     Call lhapdf and give the current values to the arrays that should
+c     be saved
+      call pftopdglha(ih,x,xmu,pdflast(-7,ireuse))
+      xlast(ireuse)=x
+      xmulast(ireuse)=xmu
+      ihlast(ireuse)=ih
+      imemlast(ireuse)=imem
+c
+      pdg2pdf=pdflast(ipart,ireuse);
+      return
       end
 

=== modified file 'Template/SubProcesses/cuts.f'
--- Template/SubProcesses/cuts.f	2012-11-07 06:36:14 +0000
+++ Template/SubProcesses/cuts.f	2013-03-04 23:37:19 +0000
@@ -111,6 +111,12 @@
       LOGICAL  IS_A_NU(NEXTERNAL),IS_HEAVY(NEXTERNAL)
       COMMON /TO_SPECISA/IS_A_J,IS_A_A,IS_A_L,IS_A_B,IS_A_NU,IS_HEAVY,
      . IS_A_ONIUM
+C
+C     Keep track of whether cuts already calculated for this event
+C
+      LOGICAL CUTSDONE,CUTSPASSED
+      COMMON/TO_CUTSDONE/CUTSDONE,CUTSPASSED
+      DATA CUTSDONE,CUTSPASSED/.FALSE.,.FALSE./
 
 C $B$ MW_NEW_DEF $E$ !this is a tag for MadWeight
 
@@ -221,7 +227,15 @@
             enddo
          enddo
          
+      ENDIF ! IF FIRSTTIME
+
+      IF (CUTSDONE) THEN
+         PASSCUTS=CUTSPASSED
+         RETURN
       ENDIF
+      CUTSDONE=.TRUE.
+      CUTSPASSED=.FALSE.
+
 c
 c     Make sure have reasonable 4-momenta
 c
@@ -239,6 +253,7 @@
             endif
          enddo
       enddo
+      
 c
 c     Limit S_hat
 c
@@ -784,6 +799,7 @@
       if(debug) write (*,*) ' EVENT PASSED THE CUTS       '
       if(debug) write (*,*) '============================='
 
+      CUTSPASSED=.TRUE.
 
       RETURN
       END

=== modified file 'Template/SubProcesses/myamp.f'
--- Template/SubProcesses/myamp.f	2012-11-10 07:06:45 +0000
+++ Template/SubProcesses/myamp.f	2013-03-04 23:37:19 +0000
@@ -466,7 +466,9 @@
                      spole(j)=prmass(i,iconfig)*prmass(i,iconfig)/stot
                      swidth(j) = prwidth(i,iconfig)*prmass(i,iconfig)/stot
                   endif
-               else if(iden_part(i).eq.0 .or. lbw(nbw).eq.1) then
+               else if((prmass(i,iconfig)+5d0*prwidth(i,iconfig)).ge.xm(i)
+     $                  .and. iden_part(i).eq.0 .or. lbw(nbw).eq.1) then
+c              JA 02/13 Only allow BW if xm below M+5*Gamma
                   write(*,*) 'Setting BW',i,nbw,prmass(i,iconfig)
                   spole(-i)=prmass(i,iconfig)*prmass(i,iconfig)/stot
                   swidth(-i) = prwidth(i,iconfig)*prmass(i,iconfig)/stot

=== added file 'Template/bin/internal/run_delphes3'
--- Template/bin/internal/run_delphes3	1970-01-01 00:00:00 +0000
+++ Template/bin/internal/run_delphes3	2013-03-04 23:37:19 +0000
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+#  This runs Delphes 3 on the pythia_events.hep
+#
+#  Usage: run_delphes3 [delphes3dir [para/serial [run_name]]]
+#  where delphes3dir is the path to the delphes3 executable
+
+delphesdir=$1
+run=$2
+tag=$3
+cross=$4 
+
+main=`pwd`
+
+if [ ! -e ../Cards/delphes_card.dat ]; then
+  echo "No delphes_card.dat found. Quitting..."
+  exit
+fi
+
+if [ ! -e $delphesdir/DelphesSTDHEP ]; then
+  echo "No Delphes executable found at $delphesdir/DelphesSTDHEP. Quitting..."
+  exit
+fi
+
+echo $$ >> ../myprocid
+
+# Set delphes path in delphes_card.dat
+
+$delphesdir/DelphesSTDHEP ../Cards/delphes_card.dat delphes.root pythia_events.hep
+$delphesdir/root2lhco delphes.root delphes_events.lhco
+
+if [ -e delphes_events.lhco ]; then
+# write the delphes banner
+    sed -e "s/^/#/g" ${run}/${run}_${tag}_banner.txt > ${run}/${tag}_delphes_events.lhco
+    echo "##  Integrated weight (pb)  : ${cross}" >> ${run}/${tag}_delphes_events.lhco
+    cat delphes_events.lhco >> ${run}/${tag}_delphes_events.lhco
+    rm -f delphes_events.lhco
+fi

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2013-01-15 18:59:13 +0000
+++ UpdateNotes.txt	2013-03-04 23:37:19 +0000
@@ -1,5 +1,51 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+1.5.8 (xx/xx/13)  OM: Fix critical bug introduce in 1.5.0. ALOHA was wrongly written
+                      HELAS routine for expression containing expression square. 
+                      (like P(-1,1)**2). None of the default model of MG5 (like sm/mssm)
+                      have such type of expression. More information in bug report #1132996
+                      (Thanks Gezim) 		
+                  OM+JA: install Delphes now installs Delphes 3 
+                      [added command install Delphes2 to install Delphes 2]
+                  OM: Add command in MadEvent interface: add_time_of_flight
+                      This command modifies the lhe events file by adding the time of 
+                      flight information in the lhe events. To run this you need to do
+                      $> ./bin/madevent
+                      MGME> generate_events --laststep=parton -f 
+                      MGME> add_time_of_flight
+		      MGME> pythia    [if needed]
+                  OM: Fix bug in pythia8 output for process using decay chains syntax.
+                      See bug #1099790.
+                  CDe+OM: Update EWdim6 model
+                  OM: Fix a bug preventing model customized via the "customize_model"
+                      command to use the automatic width computation.
+                  OM: Change model restriction behavior: a value of 1 for a width is 
+                      not treated as a restriction rule.
+                  OM: Fix incomplete restriction of the MSSM model leading to inefficient
+                      process merging (and larger-than-necessary files) for the MSSM.
+                  OM: Correct bug #1107603 (problem with condor cluster for submission 
+                      associated to a large number of jobs). Thanks Sanjay.
+                  JA: Fix one part of the problem in bug #1123974: take into 
+                      account invariant mass cuts mmXX above the peak range in 
+                      s-channel resonances in the phase space integration,
+                      to make sure such channels find events even for narrow
+                      invariant mass cut ranges. Please note the discussion in 
+                      that bug report for other types of channels however.
+                  JA: Fixed bug #1139303: matrix elements for identical 
+                      decay chain processes with different propagators (such as 
+                      p p > w+, w+ > e+ ve and p p > w-,  w- > vm~ mu-) 
+                      are now no longer combined, to ensure that resonances are
+                      correctly represented in event file.
+                  OM: Support lhapdf set which contains photon (See bug #1131995).
+                  RF+JA: Reuse last two PDF calls also for LHAPDF PDFs, clarify code
+                      for reuse of PDFs in pdg2pdf.f and pdg2pdf_lhapdf.f
+                  OM: Update the default delphes card to latest Delphes version. This 
+                      default card is automatically overwritten by the default Delphes
+                      card when running "install Delphes".
+                  JA: Make sure cuts are only checked once per event - this can save
+                      a lot of time for multiparton event generation.
+                  OM: Fix Bug #1142042 (crash in gridpack).
+
 1.5.7 (15/01/13)  OM+JA: Fixed crash linked to model_v4 for processes containing wwww or
                       zzww interactions. (See bug #1095603. Thanks to Tim Lu) 
                   OM: Fix a bug affecting 2>1 process when the final states particles is 

=== modified file 'aloha/aloha_lib.py'
--- aloha/aloha_lib.py	2012-11-16 07:00:46 +0000
+++ aloha/aloha_lib.py	2013-03-04 23:37:19 +0000
@@ -134,7 +134,7 @@
                 argument.append(expression)
         if str(fct_tag)+str(argument) in self.inverted_fct:
             return self.inverted_fct[str(fct_tag)+str(argument)]
-        else:
+        else: 
             self.fct_expr[tag] = (fct_tag, argument) 
             self.reduced_expr2[tag] = (fct_tag, argument)
             self.add_tag((tag,))

=== modified file 'aloha/aloha_parsers.py'
--- aloha/aloha_parsers.py	2012-09-28 07:37:00 +0000
+++ aloha/aloha_parsers.py	2013-03-04 23:37:19 +0000
@@ -208,7 +208,11 @@
     def p_expression_power(self, p):
         'expression : expression POWER expression'
         
-        if p[1] in self.aloha_object:
+        obj = p[1]
+        if '(' in p[1]:
+            obj = p[1].split('(',1)[0]
+        
+        if obj in self.aloha_object:
             p[0] = ''.join(p[1:])
         else:
              new = aloha_lib.KERNEL.add_function_expression('pow', eval(p[1]), eval(p[3]))

=== modified file 'aloha/aloha_writers.py'
--- aloha/aloha_writers.py	2012-11-06 19:34:27 +0000
+++ aloha/aloha_writers.py	2013-03-04 23:37:19 +0000
@@ -446,6 +446,7 @@
                    'log': 'log(dble(%s))',
                    'asin': 'asin(dble(%s))',
                    'acos': 'acos(dble(%s))',
+                   '':'(%s)'
                    }
             
         if fct in self.fct_format:

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2013-01-15 18:59:13 +0000
+++ madgraph/VERSION	2013-03-04 23:37:19 +0000
@@ -1,3 +1,3 @@
-version = 1.5.7
+version = 1.5.8.beta
 date = 2013-01-15
 

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2013-01-11 23:40:35 +0000
+++ madgraph/core/base_objects.py	2013-03-04 23:37:19 +0000
@@ -1772,11 +1772,13 @@
         self['overall_orders'] = {}
         # Decay chain processes associated with this process
         self['decay_chains'] = ProcessList()
+        # Legs with decay chains substituted in
+        self['legs_with_decays'] = LegList()
 
     def filter(self, name, value):
         """Filter for valid process property values."""
 
-        if name == 'legs':
+        if name in ['legs', 'legs_with_decays'] :
             if not isinstance(value, LegList):
                 raise self.PhysicsObjectError, \
                         "%s is not a valid LegList object" % str(value)
@@ -1862,13 +1864,21 @@
 
         return super(Process, self).set(name, value) # call the mother routine
 
+    def get(self, name):
+        """Special get for legs_with_decays"""
+        
+        if name == 'legs_with_decays':
+            self.get_legs_with_decays()
+
+        return super(Process, self).get(name) # call the mother routine
+
     def get_sorted_keys(self):
         """Return process property names as a nicely sorted list."""
 
         return ['legs', 'orders', 'overall_orders', 'model', 'id',
                 'required_s_channels', 'forbidden_onsh_s_channels',
-                'forbidden_s_channels',
-                'forbidden_particles', 'is_decay_chain', 'decay_chains']
+                'forbidden_s_channels', 'forbidden_particles',
+                'is_decay_chain', 'decay_chains', 'legs_with_decays']
 
     def nice_string(self, indent=0):
         """Returns a nicely formated string about current process
@@ -1880,7 +1890,7 @@
             mypart = self['model'].get('particle_dict')[leg['id']]
             if prevleg and prevleg['state'] == False \
                    and leg['state'] == True:
-                # Separate initial and final legs by ">"
+                # Separate initial and final legs by >
                 mystr = mystr + '> '
                 # Add required s-channels
                 if self['required_s_channels'] and \
@@ -2152,9 +2162,10 @@
     def get_legs_with_decays(self):
         """Return process with all decay chains substituted in."""
 
+        if self['legs_with_decays']:
+            return self['legs_with_decays']
+
         legs = copy.deepcopy(self.get('legs'))
-        if self.get('is_decay_chain'):
-            legs.pop(0)
         org_decay_chains = copy.copy(self.get('decay_chains'))
         sorted_decay_chains = []
         # Sort decay chains according to leg order
@@ -2172,13 +2183,18 @@
                       legs[ileg].get('id') != decay.get('legs')[0].get('id'):
                 ileg = ileg + 1
             decay_legs = decay.get_legs_with_decays()
-            legs = legs[:ileg] + decay_legs + legs[ileg+1:]
-            ileg = ileg + len(decay_legs)
+            legs = legs[:ileg] + decay_legs[1:] + legs[ileg+1:]
+            ileg = ileg + len(decay_legs) - 1
+
+        # Replace legs with copies
+        legs = [copy.copy(l) for l in legs]
 
         for ileg, leg in enumerate(legs):
             leg.set('number', ileg + 1)
             
-        return LegList(legs)
+        self['legs_with_decays'] = LegList(legs)
+
+        return self['legs_with_decays']
 
     def list_for_sort(self):
         """Output a list that can be compared to other processes as:
@@ -2290,6 +2306,7 @@
         self['legs'] = MultiLegList()
         # Decay chain processes associated with this process
         self['decay_chains'] = ProcessDefinitionList()
+        if 'legs_with_decays' in self: del self['legs_with_decays']
 
     def filter(self, name, value):
         """Filter for valid process property values."""
@@ -2311,7 +2328,10 @@
     def get_sorted_keys(self):
         """Return process property names as a nicely sorted list."""
 
-        return super(ProcessDefinition, self).get_sorted_keys()
+        keys = super(ProcessDefinition, self).get_sorted_keys()
+        keys.remove('legs_with_decays')                                  
+
+        return keys
 
     def get_minimum_WEIGHTED(self):
         """Retrieve the minimum starting guess for WEIGHTED order, to

=== modified file 'madgraph/core/diagram_generation.py'
--- madgraph/core/diagram_generation.py	2012-12-06 05:57:21 +0000
+++ madgraph/core/diagram_generation.py	2013-03-04 23:37:19 +0000
@@ -1038,9 +1038,15 @@
                         decay_ids.remove(l.get('id'))
             
             if decay_ids:
-                logger.warning("Warning: " + \
-                 "Decay without corresponding particle in core process found. " + \
-                 "Please check your process definition carefully.")
+                model = amp.get('process').get('model')
+                names = [model.get_particle(id).get('name') for id in decay_ids]
+                
+                logger.warning(
+                 "$RED Decay without corresponding particle in core process found.\n" + \
+                 "Decay information for particle(s) %s is discarded.\n" % ','.join(names) + \
+                 "Please check your process definition carefully. \n" + \
+                 "This warning usually means that you forgot parentheses in presence of subdecay.\n" + \
+                 "Example of correct syntax: p p > t t~, ( t > w+ b, w+ > l+ vl)")
 
                 # Remove unused decays from the process list
                 for dc in reversed(self['decay_chains']):

=== modified file 'madgraph/core/helas_objects.py'
--- madgraph/core/helas_objects.py	2013-01-13 10:50:01 +0000
+++ madgraph/core/helas_objects.py	2013-03-04 23:37:19 +0000
@@ -202,6 +202,7 @@
         # We should not get here
         assert(False)
         
+
 #===============================================================================
 # HelasWavefunction
 #===============================================================================
@@ -2814,6 +2815,10 @@
           to decay matrix element.
         """
 
+        # First need to reset all legs_with_decays
+        for proc in self.get('processes'):
+            proc.set('legs_with_decays', base_objects.LegList())
+
         # We need to keep track of how the
         # wavefunction numbers change
         replace_dict = {}
@@ -4085,6 +4090,8 @@
         matrix_elements = HelasMatrixElementList()
         # Store matrix element tags in me_tags, for precise comparison
         me_tags = []
+        # Store external id permutations
+        permutations = []
         
         # List of list of ids for the initial state legs in all decay
         # processes
@@ -4217,11 +4224,7 @@
                     # If an identical matrix element is already in the list,
                     # then simply add this process to the list of
                     # processes for that matrix element
-                    other_processes = matrix_elements[\
-                    me_tags.index(me_tag)].get('processes')
-                    logger.info("Combining process with %s" % \
-                      other_processes[0].nice_string().replace('Process: ', ''))
-                    other_processes.extend(matrix_element.get('processes'))
+                    me_index = me_tags.index(me_tag)
                 except ValueError:
                     # Otherwise, if the matrix element has any diagrams,
                     # add this matrix element.
@@ -4229,8 +4232,17 @@
                            matrix_element.get('diagrams'):
                         matrix_elements.append(matrix_element)
                         me_tags.append(me_tag)
-
-
+                        permutations.append(me_tag[-1][0].\
+                                            get_external_numbers())
+                else: # try
+                    other_processes = matrix_elements[me_index].get('processes')
+                    logger.info("Combining process with %s" % \
+                      other_processes[0].nice_string().replace('Process: ', ''))
+                    for proc in matrix_element.get('processes'):
+                        other_processes.append(HelasMultiProcess.\
+                              reorder_process(proc,
+                                   permutations[me_index],
+                                   me_tag[-1][0].get_external_numbers()))
 
         return matrix_elements
 
@@ -4366,9 +4378,53 @@
             amplitude = amplitudes.pop(0)
             if isinstance(amplitude, diagram_generation.DecayChainAmplitude):
                 # Might get multiple matrix elements from this amplitude
-                matrix_element_list = HelasDecayChainProcess(amplitude).\
-                                      combine_decay_chain_processes()
-            else:
+                tmp_matrix_element_list = HelasDecayChainProcess(amplitude).\
+                                          combine_decay_chain_processes()
+                # Use IdentifyMETag to check if matrix elements present
+                matrix_element_list = []
+                for matrix_element in tmp_matrix_element_list:
+                    assert isinstance(matrix_element, HelasMatrixElement), \
+                              "Not a HelasMatrixElement: %s" % matrix_element
+
+                    # If the matrix element has no diagrams,
+                    # remove this matrix element.
+                    if not matrix_element.get('processes') or \
+                           not matrix_element.get('diagrams'):
+                        continue
+
+                    # Create IdentifyMETag
+                    amplitude_tag = IdentifyMETag.create_tag(\
+                                    matrix_element.get_base_amplitude())
+                    try:
+                        me_index = amplitude_tags.index(amplitude_tag)
+                    except ValueError:
+                        # Create matrix element for this amplitude
+                        matrix_element_list.append(matrix_element)
+                        if combine_matrix_elements:
+                            amplitude_tags.append(amplitude_tag)
+                            identified_matrix_elements.append(matrix_element)
+                            permutations.append(amplitude_tag[-1][0].\
+                                                get_external_numbers())
+                    else: # try
+                        # Identical matrix element found
+                        other_processes = identified_matrix_elements[me_index].\
+                                          get('processes')
+                        # Reorder each of the processes
+                        # Since decay chain, only reorder legs_with_decays
+                        for proc in matrix_element.get('processes'):
+                            other_processes.append(cls.reorder_process(\
+                                    proc,
+                                    permutations[me_index],
+                                    amplitude_tag[-1][0].get_external_numbers()))
+                        logger.info("Combined %s with %s" % \
+                                    (matrix_element.get('processes')[0].\
+                                     nice_string().\
+                                     replace('Process: ', 'process '),
+                                     other_processes[0].nice_string().\
+                                     replace('Process: ', 'process ')))
+                        # Go on to next matrix element
+                        continue
+            else: # not DecayChainAmplitude
                 # Create tag identifying the matrix element using
                 # IdentifyMETag. If two amplitudes have the same tag,
                 # they have the same matrix element
@@ -4391,6 +4447,8 @@
                             identified_matrix_elements.append(me)
                             permutations.append(amplitude_tag[-1][0].\
                                                 get_external_numbers())
+                    else:
+                        matrix_element_list = []
                 else:
                     # Identical matrix element found
                     other_processes = identified_matrix_elements[me_index].\
@@ -4412,39 +4470,6 @@
                 assert isinstance(matrix_element, HelasMatrixElement), \
                           "Not a HelasMatrixElement: %s" % matrix_element
 
-                # If the matrix element has no diagrams,
-                # remove this matrix element.
-                if not matrix_element.get('processes') or \
-                       not matrix_element.get('diagrams'):
-                    continue
-
-                # Check if identical matrix element already present
-                if matrix_element in matrix_elements:
-                    me = matrix_elements[matrix_elements.index(matrix_element)]
-                    me_procs = me.get('processes')
-                    procs = matrix_element.get('processes')
-                    if me_procs[0].get_ninitial() > 1 or \
-                            procs[0].get_initial_ids() == \
-                            me_procs[0].get_initial_ids():
-                        logger.info("Combining process %s with %s" % \
-                                (procs[0].nice_string().\
-                                     replace('Process: ', ''),
-                                 me_procs[0].nice_string().\
-                                     replace('Process: ', '')))
-                        for proc in procs:
-                            if proc not in me_procs:
-                                me_procs.append(proc)
-                            else:
-                                raise InvalidCmd,("Duplicate process %s found."\
-                                           +" Please check your processes.") % \
-                                    proc.nice_string().replace('Process: ', '')
-                        # Remove this matrix element from the lists
-                        if combine_matrix_elements and amplitude_tags:
-                            amplitude_tags.pop(-1)
-                            identified_matrix_elements.pop(-1)
-                            permutations.pop(-1)
-                        continue
-
                 # Otherwise, add this matrix element to list
                 matrix_elements.append(matrix_element)
 
@@ -4500,9 +4525,13 @@
         between org_perm and proc_perm"""
 
         leglist = base_objects.LegList(\
-                  [copy.copy(process.get('legs')[i]) for i in \
+                  [copy.copy(process.get('legs_with_decays')[i]) for i in \
                    diagram_generation.DiagramTag.reorder_permutation(\
                        proc_perm, org_perm)])
         new_proc = copy.copy(process)
-        new_proc.set('legs', leglist)
+        new_proc.set('legs_with_decays', leglist)
+
+        if not new_proc.get('decay_chains'):
+            new_proc.set('legs', leglist)
+
         return new_proc

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2013-01-12 16:41:27 +0000
+++ madgraph/interface/madevent_interface.py	2013-03-04 23:37:19 +0000
@@ -382,6 +382,14 @@
         self.run_options_help([('-f', 'Use default for all questions.'),
                                ('--laststep=', 'argument might be parton/pythia/pgs/delphes and indicate the last level to be run.')])
 
+    
+    def help_add_time_of_flight(self):
+        logger.info("syntax: add_time_of_flight [run_name|path_to_file] [--treshold=]")
+        logger.info('-- Add in the lhe files the information')
+        logger.info('   of how long it takes to a particle to decay.')
+        logger.info('   threshold option allows to change the minimal value required to')
+        logger.info('   a non zero value for the particle (default:1e-12s)')
+
     def help_calculate_decay_widths(self):
         
         if self.ninitial != 1:
@@ -791,6 +799,43 @@
                     
         return run
 
+    def check_add_time_of_flight(self, args):
+        """check that the argument are correct"""
+        
+        
+        if len(args) >2:
+            self.help_time_of_flight()
+            raise self.InvalidCmd('Too many arguments')
+        
+        # check if the threshold is define. and keep it's value
+        if args and args[-1].startswith('--threshold='):
+            try:
+                threshold = float(args[-1].split('=')[1])
+            except ValueError:
+                raise self.InvalidCmd('threshold options require a number.')
+            args.remove(args[-1])
+        else:
+            threshold = 1e-12
+            
+        if len(args) == 1 and  os.path.exists(args[0]): 
+                event_path = args[0]
+        else:
+            if len(args) and self.run_name != args[0]:
+                self.set_run_name(args.pop(0))
+            elif not self.run_name:            
+                self.help_add_secondary_vertex()
+                raise self.InvalidCmd('Need a run_name to process')            
+            event_path = pjoin(self.me_dir, 'Events', self.run_name, 'unweighted_events.lhe.gz')
+            if not os.path.exists(event_path):
+                event_path = event_path[:-3]
+                if not os.path.exists(event_path):    
+                    raise self.InvalidCmd('No unweighted events associate to this run.')
+
+
+        
+        #reformat the data
+        args[:] = [event_path, threshold]
+
     def check_calculate_decay_widths(self, args):
         """check that the argument for calculate_decay_widths are valid"""
         
@@ -896,11 +941,18 @@
         except:
             raise self.ConfigurationError, '''Can\'t load MG5.
             The variable mg5_path should not be correctly configure.'''
-            
+        
+        ufo_path = pjoin(self.me_dir,'bin','internal', 'ufomodel')
         # Import model
         if not MADEVENT:
             modelname = self.find_model_name()
-            model = import_ufo.import_model(modelname, decay=True)
+            restrict_file = None
+            if os.path.exists(pjoin(ufo_path, 'restrict_default.dat')):
+                restrict_file = pjoin(ufo_path, 'restrict_default.dat')
+            model = import_ufo.import_model(modelname, decay=True, 
+                        restrict_file=restrict_file)
+            
+            
         else:
             model = import_ufo.import_model(pjoin(self.me_dir,'bin','internal', 'ufomodel'),
                                         decay=True)
@@ -1256,6 +1308,24 @@
 class CompleteForCmd(CheckValidForCmd):
     """ The Series of help routine for the MadGraphCmd"""
     
+    
+    def complete_add_time_of_flight(self, text, line, begidx, endidx):
+        "Complete command"
+       
+        args = self.split_arg(line[0:begidx], error=False)
+
+        if len(args) == 1:
+            #return valid run_name
+            data = glob.glob(pjoin(self.me_dir, 'Events', '*','unweighted_events.lhe.gz'))
+            data = [n.rsplit('/',2)[1] for n in data]
+            return  self.list_completion(text, data + ['--threshold='], line)
+        elif args[-1].endswith(os.path.sep):
+            return self.path_completion(text,
+                                        os.path.join('.',*[a for a in args \
+                                                    if a.endswith(os.path.sep)]))
+        else:
+            return self.list_completion(text, ['--threshold='], line)
+    
     def complete_banner_run(self, text, line, begidx, endidx):
        "Complete the banner run command"
        try:
@@ -1587,7 +1657,7 @@
                          'nb_core': None,
                          'cluster_temp_path':None}
     
-    helporder = ['Main Command', 'Documented commands', 'Require MG5 directory',
+    helporder = ['Main commands', 'Documented commands', 'Require MG5 directory',
                    'Advanced commands']
     
     ############################################################################
@@ -1822,6 +1892,59 @@
         return self.options
 
     ############################################################################
+    def do_add_time_of_flight(self, line):
+
+        args = self.split_arg(line)
+        #check the validity of the arguments and reformat args
+        self.check_add_time_of_flight(args)
+        
+        event_path, threshold = args
+        #gunzip the file
+        if event_path.endswith('.gz'):
+            need_zip = True
+            subprocess.call(['gunzip', event_path])
+            event_path = event_path[:-3]
+        else:
+            need_zip = False
+            
+        import random
+        try:
+            import madgraph.various.lhe_parser as lhe_parser
+        except:
+            import internal.lhe_parser as lhe_parser
+    
+        lhe = lhe_parser.EventFile(event_path)
+        output = open('%s_2vertex.lhe' % event_path, 'w')
+        #write the banner to the output file
+        output.write(lhe.banner)
+
+        # get the associate param_card
+        begin_param = lhe.banner.find('<slha>')
+        end_param = lhe.banner.find('</slha>')
+        param_card = lhe.banner[begin_param+6:end_param].split('\n')
+        param_card = check_param_card.ParamCard(param_card)
+
+        cst = 6.58211915e-25
+        # Loop over all events
+        for event in lhe:
+            for particle in event:
+                id = particle.pid
+                width = param_card['decay'].get((abs(id),)).value
+                if width:
+                    vtim = random.expovariate(width/cst)
+                    if vtim > threshold:
+                        particle.vtim = vtim
+            #write this modify event
+            output.write(str(event))
+        output.write('</LesHouchesEvents>\n')
+        output.close()
+        
+        files.mv('%s_2vertex.lhe' % event_path, event_path)
+        
+        if need_zip:
+            subprocess.call(['gzip', event_path])
+        
+    ############################################################################
     def do_banner_run(self, line): 
         """Make a run from the banner file"""
         
@@ -2685,7 +2808,7 @@
             self.ask_edit_cards(['param'], [], plot=False)
         
         model = args['model']
-        
+
         data = model.set_parameters_and_couplings(pjoin(self.me_dir,'Cards', 
                                                               'param_card.dat'))
         
@@ -3353,6 +3476,9 @@
     def do_delphes(self, line):
         """ run delphes and make associate root file/plot """
  
+        
+ 
+ 
         args = self.split_arg(line)
         # Check argument's validity
         if '--no_default' in args:
@@ -3362,6 +3488,15 @@
             no_default = False
         self.check_delphes(args) 
         self.update_status('prepare delphes run', level=None)
+        
+        delphes_dir = self.options['delphes_path']
+        if os.path.exists(pjoin(delphes_dir, 'data')):
+            delphes3 = False
+            prog = '../bin/internal/run_delphes'
+        else:
+            delphes3 = True
+            prog =  '../bin/internal/run_delphes3'
+        
                 
         # Check that the delphes_card exists. If not copy the default and
         # ask for edition of the card.
@@ -3373,36 +3508,38 @@
             files.cp(pjoin(self.me_dir, 'Cards', 'delphes_card_default.dat'),
                      pjoin(self.me_dir, 'Cards', 'delphes_card.dat'))
             logger.info('No delphes card found. Take the default one.')
-        if not os.path.exists(pjoin(self.me_dir, 'Cards', 'delphes_trigger.dat')):    
+        if not delphes3 and not os.path.exists(pjoin(self.me_dir, 'Cards', 'delphes_trigger.dat')):    
             files.cp(pjoin(self.me_dir, 'Cards', 'delphes_trigger_default.dat'),
                      pjoin(self.me_dir, 'Cards', 'delphes_trigger.dat'))
         if not (no_default or self.force):
-            self.ask_edit_cards(['delphes', 'trigger'], args)
-            
+            if delphes3:
+                self.ask_edit_cards(['delphes'], args)
+            else:
+                self.ask_edit_cards(['delphes', 'trigger'], args)
+                
         self.update_status('Running Delphes', level=None)  
         # Wait that the gunzip of the files is finished (if any)
         if hasattr(self, 'control_thread') and self.control_thread[0]:
             self.monitor(mode=2)        
 
 
- 
-        delphes_dir = self.options['delphes_path']
         tag = self.run_tag
         self.banner.add(pjoin(self.me_dir, 'Cards','delphes_card.dat'))
-        self.banner.add(pjoin(self.me_dir, 'Cards','delphes_trigger.dat'))
+        if not delphes3:
+            self.banner.add(pjoin(self.me_dir, 'Cards','delphes_trigger.dat'))
         self.banner.write(pjoin(self.me_dir, 'Events', self.run_name, '%s_%s_banner.txt' % (self.run_name, tag)))
         
         cross = self.results[self.run_name].get_current_info()['cross']
                     
         if self.cluster_mode == 1:
             delphes_log = pjoin(self.me_dir, 'Events', self.run_name, "%s_delphes.log" % tag)
-            self.cluster.launch_and_wait('../bin/internal/run_delphes', 
+            self.cluster.launch_and_wait(prog, 
                         argument= [delphes_dir, self.run_name, tag, str(cross)],
                         stdout=delphes_log, stderr=subprocess.STDOUT,
                         cwd=pjoin(self.me_dir,'Events'))
         else:
             delphes_log = open(pjoin(self.me_dir, 'Events', self.run_name, "%s_delphes.log" % tag),'w')
-            misc.call(['../bin/internal/run_delphes', delphes_dir, 
+            misc.call([prog, delphes_dir, 
                                 self.run_name, tag, str(cross)],
                                 stdout= delphes_log, stderr=subprocess.STDOUT,
                                 cwd=pjoin(self.me_dir,'Events'))
@@ -3588,7 +3725,7 @@
                 logger.info(error)
                 if not self.force:
                     ans = self.ask('Cluster Error detected. Do you want to clean the queue?',
-                             default = 'y', answers=['y','n'])
+                             default = 'y', choices=['y','n'])
                 else:
                     ans = 'y'
                 if ans:
@@ -3999,11 +4136,12 @@
                      pjoin(self.me_dir,'Events','xsecs.tree'))
                 
             # Generate the matching plots
+            devnull = open(os.devnull, 'w')
             misc.call([self.dirbin+'/create_matching_plots.sh', 
                        self.run_name, tag, madir],
-                            stdout = os.open(os.devnull, os.O_RDWR),
+                            stdout = devnull,
                             cwd=pjoin(self.me_dir,'Events'))
-
+            devnull.close()
             #Clean output
             misc.call(['gzip','-f','events.tree'], 
                                                 cwd=pjoin(self.me_dir,'Events'))          
@@ -4162,10 +4300,14 @@
             cards.append('pgs_card.dat')
         elif mode == 'delphes':
             self.add_card_to_run('delphes')
-            self.add_card_to_run('trigger')
+            delphes3 = True
+            if os.path.exists(pjoin(self.options['delphes_path'], 'data')):
+                delphes3 = False
+                self.add_card_to_run('trigger')
             cards.append('delphes_card.dat')
 
         if self.force:
+            self.check_param_card(pjoin(self.me_dir,'Cards','param_card.dat' ))
             return
 
         def get_question(mode):
@@ -4185,11 +4327,12 @@
                 possible_answer.append('pgs')            
             elif mode == 'delphes':
                 question += '  5 / delphes : delphes_card.dat\n'
-                question += '  6 / trigger : delphes_trigger.dat\n'
                 possible_answer.append(5)
                 possible_answer.append('delphes')
-                possible_answer.append(6)
-                possible_answer.append('trigger')
+                if not delphes3:
+                    question += '  6 / trigger : delphes_trigger.dat\n'
+                    possible_answer.append(6)
+                    possible_answer.append('trigger')
             if self.options['madanalysis_path']:
                 question += '  9 / plot    : plot_card.dat\n'
                 possible_answer.append(9)
@@ -4263,7 +4406,7 @@
     1 / pythia  : Pythia 
     2 / pgs     : Pythia + PGS\n"""
         if '3' in available_mode:
-            question += """  3 / delphes  : Pythia + Delphes.\n"""
+            question += """    3 / delphes  : Pythia + Delphes.\n"""
 
         if not self.force:
             if not mode:
@@ -4295,7 +4438,11 @@
             cards.append('pgs_card.dat')
         if mode == 'delphes':
             self.add_card_to_run('delphes')
-            self.add_card_to_run('trigger')
+            delphes3 = True
+            if os.path.exists(pjoin(self.options['delphes_path'], 'data')):
+                delphes3 = False
+                self.add_card_to_run('trigger')
+
             cards.append('delphes_card.dat')
         
         if self.force:
@@ -4314,13 +4461,15 @@
             card[2] = 'pgs'           
         if mode == 'delphes':
             question += '  2 / delphes : delphes_card.dat\n'
-            question += '  3 / trigger : delphes_trigger.dat\n'
             possible_answer.append(2)
             possible_answer.append('delphes')
-            possible_answer.append(3)
-            possible_answer.append('trigger')
             card[2] = 'delphes'
-            card[3] = 'trigger'
+            if not delphes3:
+                question += '  3 / trigger : delphes_trigger.dat\n'
+                possible_answer.append(3)
+                possible_answer.append('trigger')
+                card[3] = 'trigger'
+
         if self.options['madanalysis_path']:
             question += '  9 / plot : plot_card.dat\n'
             possible_answer.append(9)
@@ -4458,10 +4607,12 @@
         """
         
         text = open(path).read()
-        text = re.findall('(<MGVersion>|CEN_max_tracker|#TRIGGER CARD|parameter set name|muon eta coverage|MSTP|MSTU|Begin Minpts|gridpack|ebeam1|BLOCK|DECAY)', text, re.I)
+        text = re.findall('(<MGVersion>|CEN_max_tracker|ParticlePropagator|#TRIGGER CARD|parameter set name|muon eta coverage|MSTP|MSTU|Begin Minpts|gridpack|ebeam1|BLOCK|DECAY)', text, re.I)
         text = [t.lower() for t in text]
         if '<mgversion>' in text:
             return 'banner'
+        elif 'particlepropagator' in text:
+            return 'delphes_card.dat'
         elif 'cen_max_tracker' in text:
             return 'delphes_card.dat'
         elif '#trigger card' in text:
@@ -4653,7 +4804,7 @@
         self.total_jobs = 0
         subproc = [P for P in os.listdir(pjoin(self.me_dir,'SubProcesses')) if 
                    P.startswith('P') and os.path.isdir(pjoin(self.me_dir,'SubProcesses', P))]
-        devnull = os.open(os.devnull, os.O_RDWR)
+        devnull = open(os.devnull, 'w')
         for nb_proc,subdir in enumerate(subproc):
             subdir = subdir.strip()
             Pdir = pjoin(self.me_dir, 'SubProcesses',subdir)

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2013-01-13 10:35:41 +0000
+++ madgraph/interface/madgraph_interface.py	2013-03-04 23:37:19 +0000
@@ -1763,7 +1763,7 @@
     _check_opts = ['full', 'permutation', 'gauge', 'lorentz_invariance']
     _import_formats = ['model_v4', 'model', 'proc_v4', 'command', 'banner']
     _install_opts = ['pythia-pgs', 'Delphes', 'MadAnalysis', 'ExRootAnalysis', 
-                     'update']
+                     'update', 'Delphes2']
     _v4_export_formats = ['madevent', 'standalone', 'matrix'] 
     _export_formats = _v4_export_formats + ['standalone_cpp', 'pythia8', 'aloha']
     _set_options = ['group_subprocesses',
@@ -3053,9 +3053,12 @@
             split = line.split()   
             path[split[0]] = split[1]
         
-        name = {'td_mac': 'td', 'td_linux':'td', 'Delphes':'Delphes', 
+        if args[0] == 'Delphes':
+            args[0] = 'Delphes3'
+        
+        name = {'td_mac': 'td', 'td_linux':'td', 'Delphes3':'Delphes',
                 'pythia-pgs':'pythia-pgs', 'ExRootAnalysis': 'ExRootAnalysis',
-                'MadAnalysis':'MadAnalysis'}
+                'MadAnalysis':'MadAnalysis', 'Delphes2': 'Delphes'}
         name = name[args[0]]
         
         try:
@@ -3075,6 +3078,7 @@
         if returncode:
             raise MadGraph5Error, 'Fail to download correctly the File. Stop'
         
+        
         # Check that the directory has the correct name
         if not os.path.exists(pjoin(MG5DIR, name)):
             created_name = [n for n in os.listdir(MG5DIR) if n.startswith(name) 
@@ -3160,6 +3164,16 @@
                 if sys.platform == "darwin":
                     logger.warning('''You can download this program at the following link: 
                     http://www.macupdate.com/app/mac/9980/gpl-ghostscript''')
+            
+        if args[0] == 'Delphes2':
+            data = open(pjoin(MG5DIR, 'Delphes','data','DetectorCard.dat')).read()
+            data = data.replace('data/', 'DELPHESDIR/data/')
+            out = open(pjoin(MG5DIR, 'Template', 'Cards', 'delphes_card_default.dat'), 'w')
+            out.write(data)
+        if args[0] == 'Delphes3':
+            files.cp(pjoin(MG5DIR, 'Delphes','examples','delphes_card_CMS.tcl'),
+                     pjoin(MG5DIR,'Template', 'Cards', 'delphes_card_default.dat'))  
+        
 
     def install_update(self, args, wget):
         """ check if the current version of mg5 is up-to-date. 
@@ -3647,7 +3661,12 @@
         logger.info('Loading the resulting model')
         # Applying the restriction 
         self._curr_model = import_ufo.RestrictModel(self._curr_model)
-        self._curr_model.restrict_model(param_card)
+        model_name = self._curr_model.get('name')
+        if model_name == 'mssm':
+            keep_external=True
+        else:
+            keep_external=False
+        self._curr_model.restrict_model(param_card,keep_external=keep_external)
         
         if args:
             name = args[0].split('=',1)[1]

=== modified file 'madgraph/iolibs/export_cpp.py'
--- madgraph/iolibs/export_cpp.py	2012-08-02 16:39:09 +0000
+++ madgraph/iolibs/export_cpp.py	2013-03-04 23:37:19 +0000
@@ -1291,12 +1291,22 @@
             final_id_list = []
             final_mirror_id_list = []
             for (i, me) in beam_processes:
-                final_id_list.extend([tuple([l.get('id') for l in \
-                                             proc.get('legs') if l.get('state')]) \
-                                      for proc in me.get('processes') \
+                valid_proc = [proc for proc in me.get('processes') \
                                       if beam_parts == \
                                       (proc.get('legs')[0].get('id'),
-                                       proc.get('legs')[1].get('id'))])
+                                       proc.get('legs')[1].get('id'))]
+                for proc in valid_proc:
+                    # decaying id
+                    decay_id = [d.get('legs')[0].get('id') for d in proc.get('decay_chains')]
+                    curr_final_id = [l.get('id') for l in proc.get('legs') 
+                              if l.get('state') and l.get('id') not in decay_id]
+                    # extend with the decay final state
+                    curr_final_id += [l.get('id') for dec in \
+                                     proc.get('decay_chains') for l in \
+                                     dec.get('legs')   if l.get('state')]
+                    final_id_list.append(tuple(curr_final_id))
+
+
             for (i, me) in beam_mirror_processes:
                 final_mirror_id_list.extend([tuple([l.get('id') for l in \
                                              proc.get('legs') if l.get('state')]) \
@@ -1390,12 +1400,24 @@
                                                  
 
         for ime, me in enumerate(self.matrix_elements):
-
+            id_list = []
+            for proc in me.get('processes'):
+                # decaying id
+                decay_id = [d.get('legs')[0].get('id') for d in proc.get('decay_chains')]
+                curr_id = [l.get('id') for l in proc.get('legs') 
+                              if l.get('state') and l.get('id') not in decay_id]
+                # extend with the decay final state
+                curr_id += [l.get('id') for dec in proc.get('decay_chains') 
+                             for l in dec.get('legs')   if l.get('state')]
+                curr_id = [l.get('id') for l in \
+                             proc.get('legs') if not l.get('state')] + curr_id
+                id_list.append(tuple(curr_id))
+                
             res_lines.append("if(%s){" % \
                                  "||".join(["&&".join(["id%d == %d" % \
-                                            (i+1, l.get('id')) for (i, l) in \
-                                            enumerate(p.get('legs'))])\
-                                           for p in me.get('processes')]))
+                                            (i+1, id) for (i, id) in \
+                                            enumerate(p)])\
+                                           for p in id_list]))
             if ime > 0:
                 res_lines[-1] = "else " + res_lines[-1]
 

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2012-11-07 06:36:14 +0000
+++ madgraph/iolibs/export_v4.py	2013-03-04 23:37:19 +0000
@@ -1130,6 +1130,8 @@
                 
         #madevent file
         cp(_file_path+'/__init__.py', self.dir_path+'/bin/internal/__init__.py')
+        cp(_file_path+'/various/lhe_parser.py', 
+                                self.dir_path+'/bin/internal/lhe_parser.py')         
         cp(_file_path+'/various/gen_crossxhtml.py', 
                                 self.dir_path+'/bin/internal/gen_crossxhtml.py')                
         cp(_file_path+'/various/banner.py', 
@@ -1666,10 +1668,12 @@
             replace_dict['define_subdiag_lines'] = \
                  """\nINTEGER SUBDIAG(MAXSPROC),IB(2)
                  COMMON/TO_SUB_DIAG/SUBDIAG,IB"""    
+            replace_dict['cutsdone'] = ""
         else:
             replace_dict['passcuts_begin'] = "IF (PASSCUTS(PP)) THEN"
             replace_dict['passcuts_end'] = "ENDIF"
             replace_dict['define_subdiag_lines'] = ""
+            replace_dict['cutsdone'] = "      cutsdone=.false."
 
         file = open(pjoin(_file_path, \
                           'iolibs/template_files/auto_dsig_v4.inc')).read()
@@ -2294,9 +2298,9 @@
             if me.get('has_mirror_process'):
                 mirror_procs = [copy.copy(p) for p in me.get('processes')]
                 for proc in mirror_procs:
-                    legs = copy.copy(proc.get('legs'))
+                    legs = copy.copy(proc.get('legs_with_decays'))
                     legs.insert(0, legs.pop(1))
-                    proc.set("legs", legs)
+                    proc.set("legs_with_decays", legs)
                 lines.append("mirror  %s" % ",".join(p.base_string() for p in \
                                                      mirror_procs))
             else:
@@ -2849,6 +2853,8 @@
         for key in keys:
             for param in self.model['parameters'][key]:
                 lower_name = param.name.lower()
+                if not lower_name:
+                    continue
                 try:
                     lower_dict[lower_name].append(param)
                 except KeyError:
@@ -2900,18 +2906,20 @@
         keys = self.model['parameters'].keys()
         keys.sort(key=len)
         for key in keys:
+            to_add = [o for o in self.model['parameters'][key] if o.name]
+
             if key == ('external',):
-                self.params_ext += self.model['parameters'][key]
+                self.params_ext += to_add
             elif 'aS' in key:
-                self.params_dep += self.model['parameters'][key]
+                self.params_dep += to_add
             else:
-                self.params_indep += self.model['parameters'][key]
+                self.params_indep += to_add
         # same for couplings
         keys = self.model['couplings'].keys()
         keys.sort(key=len)
         for key, coup_list in self.model['couplings'].items():
             if 'aS' in key:
-                self.coups_dep += [c for c in coup_list if
+                self.coups_dep += [c for c in coup_list if 
                                    (not wanted_couplings or c.name in \
                                     wanted_couplings)]
             else:
@@ -3294,6 +3302,8 @@
             colum = [parameter.lhablock.lower()] + \
                     [str(value) for value in parameter.lhacode] + \
                     [parameter.name]
+            if not parameter.name:
+                return ''
             return ' '.join(colum)+'\n'
     
         fsock = self.open('ident_card.dat')

=== modified file 'madgraph/iolibs/template_files/auto_dsig_v4.inc'
--- madgraph/iolibs/template_files/auto_dsig_v4.inc	2012-12-12 03:55:41 +0000
+++ madgraph/iolibs/template_files/auto_dsig_v4.inc	2013-03-04 23:37:19 +0000
@@ -57,6 +57,9 @@
       common/to_configs/mincfig, maxcfig
       INTEGER MAPCONFIG(0:LMAXCONFIGS), ICONFIG
       COMMON/TO_MCONFIGS/MAPCONFIG, ICONFIG
+C     Keep track of whether cuts already calculated for this event
+      LOGICAL cutsdone,cutspassed
+      COMMON/TO_CUTSDONE/cutsdone,cutspassed
 %(define_subdiag_lines)s
       include 'coupl.inc'
       include 'run.inc'
@@ -68,7 +71,7 @@
 C BEGIN CODE
 C ----------
       DSIG%(proc_id)s=0D0
-
+      %(cutsdone)s
       IF(IMODE.EQ.1)THEN
 C       Set up process information from file symfact
         LUN=NEXTUNOPEN()

=== modified file 'madgraph/iolibs/template_files/super_auto_dsig_group_v4.inc'
--- madgraph/iolibs/template_files/super_auto_dsig_group_v4.inc	2012-09-06 10:17:42 +0000
+++ madgraph/iolibs/template_files/super_auto_dsig_group_v4.inc	2013-03-04 23:37:19 +0000
@@ -77,11 +77,16 @@
       DOUBLE PRECISION CM_RAP
       LOGICAL SET_CM_RAP
       COMMON/TO_CM_RAP/SET_CM_RAP,CM_RAP
+C     Keep track of whether cuts already calculated for this event
+      LOGICAL CUTSDONE,CUTSPASSED
+      COMMON/TO_CUTSDONE/CUTSDONE,CUTSPASSED
 C ----------
 C BEGIN CODE
 C ----------
       DSIG=0D0
 
+      CUTSDONE=.FALSE.
+
       IF(IMODE.EQ.1)THEN
 C       Set up process information from file symfact
         LUN=NEXTUNOPEN()

=== modified file 'madgraph/various/cluster.py'
--- madgraph/various/cluster.py	2013-01-10 16:18:49 +0000
+++ madgraph/various/cluster.py	2013-03-04 23:37:19 +0000
@@ -362,23 +362,30 @@
         if not self.submitted_ids:
             return 0, 0, 0, 0
         
-        cmd = "condor_q " + ' '.join(self.submitted_ids) + " -format \'%-2s \\n\' \'ifThenElse(JobStatus==0,\"U\",ifThenElse(JobStatus==1,\"I\",ifThenElse(JobStatus==2,\"R\",ifThenElse(JobStatus==3,\"X\",ifThenElse(JobStatus==4,\"C\",ifThenElse(JobStatus==5,\"H\",ifThenElse(JobStatus==6,\"E\",string(JobStatus))))))))\'"
-        status = misc.Popen([cmd], shell=True, stdout=subprocess.PIPE, 
-                                                         stderr=subprocess.PIPE)
-        error = status.stderr.read()
-        if status.returncode or error:
-            raise ClusterManagmentError, 'condor_q returns error: %s' % error
-            
-            
-        idle, run, fail = 0, 0, 0
-        for line in status.stdout:
-            status = line.strip()
-            if status in ['I','U']:
-                idle += 1
-            elif status == 'R':
-                run += 1
-            elif status != 'C':
-                fail += 1
+        packet = 15000
+        for i in range(1+(len(self.submitted_ids)-1)//packet):
+            start = i * packet
+            stop = (i+1) * packet
+            cmd = "condor_q " + ' '.join(self.submitted_ids[start:stop]) + " -format \'%-2s \\n\' \'ifThenElse(JobStatus==0,\"U\",ifThenElse(JobStatus==1,\"I\",ifThenElse(JobStatus==2,\"R\",ifThenElse(JobStatus==3,\"X\",ifThenElse(JobStatus==4,\"C\",ifThenElse(JobStatus==5,\"H\",ifThenElse(JobStatus==6,\"E\",string(JobStatus))))))))\'"
+            
+                
+            
+            status = misc.Popen([cmd], shell=True, stdout=subprocess.PIPE, 
+                                                             stderr=subprocess.PIPE)
+            error = status.stderr.read()
+            if status.returncode or error:
+                raise ClusterManagmentError, 'condor_q returns error: %s' % error
+                
+                
+            idle, run, fail = 0, 0, 0
+            for line in status.stdout:
+                status = line.strip()
+                if status in ['I','U']:
+                    idle += 1
+                elif status == 'R':
+                    run += 1
+                elif status != 'C':
+                    fail += 1
 
         return idle, run, self.submitted - (idle+run+fail), fail
     

=== added file 'madgraph/various/lhe_parser.py'
--- madgraph/various/lhe_parser.py	1970-01-01 00:00:00 +0000
+++ madgraph/various/lhe_parser.py	2013-03-04 23:37:19 +0000
@@ -0,0 +1,246 @@
+import re
+
+class Particle(object):
+    """ """
+    pattern=re.compile(r'''^\s*
+        (?P<pid>-?\d+)\s+           #PID
+        (?P<status>-?\d+)\s+            #status (1 for output particle)
+        (?P<mother1>-?\d+)\s+       #mother
+        (?P<mother2>-?\d+)\s+       #mother
+        (?P<color1>[+-e.\d]*)\s+    #color1
+        (?P<color2>[+-e.\d]*)\s+    #color2
+        (?P<px>[+-e.\d]*)\s+        #px
+        (?P<py>[+-e.\d]*)\s+        #py
+        (?P<pz>[+-e.\d]*)\s+        #pz
+        (?P<E>[+-e.\d]*)\s+         #E
+        (?P<mass>[+-e.\d]*)\s+      #mass
+        (?P<vtim>[+-e.\d]*)\s+      #displace vertex
+        (?P<helicity>[+-e.\d]*)\s*      #helicity
+        ($|(?P<comment>\#[\d|D]*))  #comment/end of string
+        ''',66) #verbose+ignore case
+    
+    
+    
+    def __init__(self, line=None, event=None):
+        """ """
+        
+        self.event = event
+        self.event_id = len(event) #not yet in the event
+        # LHE information
+        self.pid = 0
+        self.status = 0
+        self.mother1 = None
+        self.mother2 = None
+        self.color1 = 0
+        self.color2 = None
+        self.px = 0
+        self.py = 0 
+        self.pz = 0
+        self.E = 0
+        self.mass = 0
+        self.vtim = 0
+        self.helicity = 9
+        self.comment = ''
+
+        if line:
+            self.parse(line)
+            
+    def parse(self, line):
+        """parse the line"""
+    
+        obj = self.pattern.search(line)
+        if not obj:
+            raise Exception, 'the line\n%s\n is not a valid format for LHE particle' % line
+        for key, value in obj.groupdict().items():
+            if key != 'comment':
+                setattr(self, key, float(value))
+            else:
+                self.comment = value
+        # assign the mother:
+        if self.mother1:
+            try:
+                self.mother1 = self.event[int(self.mother1) -1]
+            except KeyError:
+                raise Exception, 'Wrong Events format: a daughter appears before it\'s mother'
+        if self.mother2:
+            try:
+                self.mother2 = self.event[int(self.mother2) -1]
+            except KeyError:
+                raise Exception, 'Wrong Events format: a daughter appears before it\'s mother'
+    
+    
+    
+    
+    def __str__(self):
+        """string representing the particles"""
+        return " %8d %2d %4d %4d %4d %4d %+13.7e %+13.7e %+13.7e %14.8e %14.8e %10.4e %10.4e" \
+            % (self.pid, 
+               self.status,
+               self.mother1.event_id+1 if self.mother1 else 0,
+               self.mother2.event_id+1 if self.mother2 else 0,
+               self.color1,
+               self.color2,
+               self.px,
+               self.py,
+               self.pz,
+               self.E, 
+               self.mass,
+               self.vtim,
+               self.helicity)
+            
+    def __eq__(self, other):
+        
+        if self.pid == other.pid and \
+           self.status == other.status and \
+           self.mother1 == other.mother1 and \
+           self.mother2 == other.mother2 and \
+           self.color1 == other.color1 and \
+           self.color2 == other.color2 and \
+           self.px == other.px and \
+           self.py == other.py and \
+           self.pz == other.pz and \
+           self.E == other.E and \
+           self.mass == other.mass and \
+           self.vtim == other.vtim and \
+           self.helicity == other.helicity:
+            return True
+        return False
+        
+        
+        
+            
+    def __repr__(self):
+        return 'Particle("%s", event=%s)' % (str(self), self.event)
+        
+class EventFile(file):
+    """ """
+    
+    def __init__(self, path, mode='r', *args, **opt):
+        """open file and read the banner [if in read mode]"""
+        
+        file.__init__(self, path, mode, *args, **opt)
+        self.banner = ''
+        if mode == 'r':
+            line = ''
+            while '</init>' not in line.lower():
+                line  = file.next(self)
+                self.banner += line
+                
+    
+    def next(self):
+        """get next event"""
+        text = ''
+        line = ''
+        mode = 0
+        while '</event>' not in line:
+            line = file.next(self).lower()
+            if '<event>' in line:
+                mode = 1
+            if mode:
+                text += line
+        return Event(text)
+        
+           
+class Event(list):
+    """Class storing a single event information (list of particles + global information)"""
+
+    def __init__(self, text=None):
+        """The initialization of an empty Event (or one associate to a text file)"""
+        list.__init__(self)
+        
+        # First line information
+        self.nexternal = 0
+        self.ievent = 0
+        self.wgt = 0
+        self.aqcd = 0 
+        self.scale = 0
+        self.aqed = 0
+        self.aqcd = 0
+        # Weight information
+        self.rwgt = ''
+        self.comment = ''
+        
+        if text:
+            self.parse(text)
+            
+    def parse(self, text):
+        """Take the input file and create the structured information"""
+        
+        text = re.sub(r'</?event>', '', text) # remove pointless tag
+        status = 'first' 
+        for line in text.split('\n'):
+            line = line.strip()
+            if not line: 
+                continue
+            if line.startswith('#'):
+                self.comment += '%s\n' % line
+                continue
+            if 'first' == status:
+                self.assign_scale_line(line)
+                status = 'part' 
+                continue
+            
+            if '<' in line:
+                status = 'rwgt'
+                
+            if 'part' == status:
+                self.append(Particle(line, event=self))
+            else:
+                self.rwgt += '%s\n' % line
+            
+    def assign_scale_line(self, line):
+        """read the line corresponding to global event line
+        format of the line is:
+        Nexternal IEVENT WEIGHT SCALE AEW AS
+        """
+        inputs = line.split()
+        assert len(inputs) == 6
+        self.nexternal=int(inputs[0])
+        self.ievent=int(inputs[1])
+        self.wgt=float(inputs[2])
+        self.scale=float(inputs[3])
+        self.aqed=float(inputs[4])
+        self.aqcd=float(inputs[5])
+     
+    
+        
+    def __str__(self):
+        """return a correctly formatted LHE event"""
+                
+        out="""<event>
+%(scale)s
+%(particles)s
+%(comments)s%(reweight)s</event>
+""" 
+
+        scale_str = "%2d %6d %+13.7e %14.8e %14.8e %14.8e" % \
+            (self.nexternal,self.ievent,self.wgt,self.scale,self.aqed,self.aqcd)
+
+        return out % {'scale': scale_str, 
+                      'particles': '\n'.join([str(p) for p in self]),
+                      'reweight': self.rwgt,
+                      'comments': self.comment}
+
+        
+
+
+
+if '__main__' == __name__:    
+    lhe = EventFile('unweighted_events.lhe')
+    output = open('output_events.lhe', 'w')
+    #write the banner to the output file
+    output.write(lhe.banner)
+    # Loop over all events
+    for event in lhe:
+        for particle in event:
+            # modify particle attribute: here remove the mass
+            particle.mass = 0
+            particle.vtim = 2 # The one associate to distance travelled by the particle.
+
+        #write this modify event
+        output.write(str(event))
+
+    
+    
+    
+

=== modified file 'models/EWdim6/EWdim6.log'
--- models/EWdim6/EWdim6.log	2012-06-14 15:45:15 +0000
+++ models/EWdim6/EWdim6.log	2013-03-04 23:37:19 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.9
-# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
-# Date: Fri 18 May 2012 14:33:51
+# This file was automatically created by FeynRules 1.7.127
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 22 Jan 2013 16:06:42
 
 
 # 
@@ -35,14 +35,18 @@
 # Parameter definitions
 #
 
-   * All parameters are ok.
+   * Parameter CWWWL2 has no value. Default value 1 assigned.
+   * Parameter CWL2 has no value. Default value 1 assigned.
+   * Parameter CBL2 has no value. Default value 1 assigned.
+   * Parameter CPWWWL2 has no value. Default value 1 assigned.
+   * Parameter CPWL2 has no value. Default value 1 assigned.
 
 
 # Vertices
    * Calling FeynmanRules for 1 Lagrangians.
    * Number of classes vertices: 58
-   * Number of flavored vertices: 102
-   * Saved vertices in InterfaceRun[ 2 ].
+   * Number of flavored vertices: 96
+   * Saved vertices in InterfaceRun[ 1 ].
    * Checked QNumber conservation.
       - Quantum number GhostNumber conserved in all vertices.
       - Quantum number LeptonNumber conserved in all vertices.
@@ -53,19 +57,19 @@
 # Vertex definitions
 #
 
-   * 102 vertices written.
+   * 96 vertices written.
    * vertices.py written.
 #
 # Lorentz structure definitions
 #
 
-   * 78 lorentz structures written.
+   * 81 lorentz structures written.
    * lorentz.py written.
 #
 # Coupling definitions
 #
 
-   * 146 couplings written.
+   * 140 couplings written.
    * couplings.py written.
 #
 # Coupling order definitions
@@ -77,5 +81,11 @@
 # Decay definitions
 #
 
-   * 0 decays written.
+   * 6 decays written.
    * decay.py not written
+#
+# CTCoupling definitions
+#
+
+   * 0 CTcouplings written.
+   * CT_couplings.py written.

=== modified file 'models/EWdim6/__init__.py'
--- models/EWdim6/__init__.py	2012-11-16 23:03:30 +0000
+++ models/EWdim6/__init__.py	2013-03-04 23:37:19 +0000
@@ -6,11 +6,7 @@
 import vertices
 import coupling_orders
 import write_param_card
-try:
-    import build_restrict
-except ImportError, error:
-    print error
-    
+
 
 all_particles = particles.all_particles
 all_vertices = vertices.all_vertices
@@ -19,8 +15,28 @@
 all_parameters = parameters.all_parameters
 all_orders = coupling_orders.all_orders
 all_functions = function_library.all_functions
+
+try:
+    import build_restrict
+except ImportError:
+    pass
+try:
+   import decays
+except ImportError:
+   pass
+else:
+   all_decays = decays.all_decays
+try:
+   import form_factors
+except ImportError:
+   pass
+else:
+   all_form_factors = form_factors.all_form_factors
+
+
 gauge = [0]
 
+
 __author__ = "C. Degrande"
-__version__ = "1.0"
-__email__ = "[e-mail]"
+__date__ = "05.03. 2012"
+__version__= "1.0"

=== modified file 'models/EWdim6/build_restrict.py'
--- models/EWdim6/build_restrict.py	2012-09-07 02:24:48 +0000
+++ models/EWdim6/build_restrict.py	2013-03-04 23:37:19 +0000
@@ -29,16 +29,20 @@
 first_category = build_restrict_lib.Category('sm customization')
 all_categories.append(first_category)
 
+
 first_category.add_options(name='diagonal ckm', # name
                            default=True,          # default
-                           rules=[('CKMBLOCK',[1], 0.0)],
+                           rules=[('WOLFENSTEIN',[1], 0.0),
+                                  ('WOLFENSTEIN',[2], 0.0),
+                                  ('WOLFENSTEIN',[3], 0.0),
+                                  ('WOLFENSTEIN',[4], 0.0)]
                            )
 
-first_category.add_options(name='c mass = 0', # name
-                           default=True,        # default
-                           rules=[('MASS',[4], 0.0),
-                                  ('YUKAWA',[4], 0.0)]
-                           )
+#first_category.add_options(name='c mass = 0', # name
+#                           default=True,        # default
+#                           rules=[('MASS',[4], 0.0),
+#                                  ('YUKAWA',[4], 0.0)]
+#                           )
 
 first_category.add_options(name='b mass = 0',
                            default=False,
@@ -52,17 +56,17 @@
                                   ('YUKAWA',[15], 0.0)]
                            )
 
-first_category.add_options(name='muon mass = 0',
-                           default=True,
-                           rules=[('MASS',[13], 0.0),
-                                  ('YUKAWA',[13], 0.0)]
-                           )
+#first_category.add_options(name='muon mass = 0',
+#                           default=True,
+#                           rules=[('MASS',[13], 0.0),
+#                                  ('YUKAWA',[13], 0.0)]
+#                           )
 
-first_category.add_options(name='electron mass = 0',
-                           default=True,
-                           rules=[('MASS',[11], 0.0),
-                                  ('YUKAWA',[11], 0.0)]
-                           )
+#first_category.add_options(name='electron mass = 0',
+#                           default=True,
+#                           rules=[('MASS',[11], 0.0),
+#                                  ('YUKAWA',[11], 0.0)]
+#                           )
 
 dim6_category = build_restrict_lib.Category('Adding Dim6 Operator')
 all_categories.append(dim6_category)

=== modified file 'models/EWdim6/coupling_orders.py'
--- models/EWdim6/coupling_orders.py	2012-06-14 15:45:15 +0000
+++ models/EWdim6/coupling_orders.py	2013-03-04 23:37:19 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.9
-# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
-# Date: Fri 18 May 2012 14:43:25
+# This file was automatically created by FeynRules 1.7.127
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 22 Jan 2013 16:20:55
 
 
 from object_library import all_orders, CouplingOrder

=== modified file 'models/EWdim6/couplings.py'
--- models/EWdim6/couplings.py	2012-06-14 15:45:15 +0000
+++ models/EWdim6/couplings.py	2013-03-04 23:37:19 +0000
@@ -1,11 +1,11 @@
-# This file was automatically created by FeynRules 1.7.9
-# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
-# Date: Fri 18 May 2012 14:43:25
+# This file was automatically created by FeynRules 1.7.127
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 22 Jan 2013 16:20:55
 
 
 from object_library import all_couplings, Coupling
 
-from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec, cot
 
 
 
@@ -38,11 +38,11 @@
                 order = {'QED':1})
 
 GC_8 = Coupling(name = 'GC_8',
-                value = '(CPWL2*cw*complex(0,1)*gw)/2.e6',
+                value = '(CPWL2*cw*complex(0,1)*gw)/4.e6',
                 order = {'NP':2})
 
 GC_9 = Coupling(name = 'GC_9',
-                value = '-(CPWL2*cw**2*complex(0,1)*g1*gw)/2.e6',
+                value = '-(CPWL2*cw**2*complex(0,1)*g1*gw)/8.e6',
                 order = {'NP':2,'QED':1})
 
 GC_10 = Coupling(name = 'GC_10',
@@ -50,7 +50,7 @@
                  order = {'QED':2})
 
 GC_11 = Coupling(name = 'GC_11',
-                 value = '-(CPWL2*complex(0,1)*gw**2)/2.e6',
+                 value = '(CPWL2*complex(0,1)*gw**2)/4.e6',
                  order = {'NP':2,'QED':1})
 
 GC_12 = Coupling(name = 'GC_12',
@@ -66,7 +66,7 @@
                  order = {'NP':2,'QED':2})
 
 GC_15 = Coupling(name = 'GC_15',
-                 value = '(CPWL2*cw*complex(0,1)*g1*gw**2)/2.e6',
+                 value = '(CPWL2*cw*complex(0,1)*g1*gw**2)/4.e6',
                  order = {'NP':2,'QED':2})
 
 GC_16 = Coupling(name = 'GC_16',
@@ -74,11 +74,11 @@
                  order = {'NP':2,'QED':2})
 
 GC_17 = Coupling(name = 'GC_17',
-                 value = '-(CPWL2*cw*complex(0,1)*gw**3)/2.e6',
+                 value = '-(CPWL2*cw*complex(0,1)*gw**3)/4.e6',
                  order = {'NP':2,'QED':2})
 
 GC_18 = Coupling(name = 'GC_18',
-                 value = '(CPWWWL2*cw*complex(0,1)*gw**3)/2.e6',
+                 value = '(CPWWWL2*cw*complex(0,1)*gw**3)/4.e6',
                  order = {'NP':2})
 
 GC_19 = Coupling(name = 'GC_19',
@@ -90,11 +90,11 @@
                  order = {'NP':2})
 
 GC_21 = Coupling(name = 'GC_21',
-                 value = '-(CPWWWL2*complex(0,1)*gw**4)/1.e6',
+                 value = '-(CPWWWL2*complex(0,1)*gw**4)/2.e6',
                  order = {'NP':2,'QED':1})
 
 GC_22 = Coupling(name = 'GC_22',
-                 value = '(CPWWWL2*cw**2*complex(0,1)*gw**4)/1.e6',
+                 value = '(CPWWWL2*cw**2*complex(0,1)*gw**4)/2.e6',
                  order = {'NP':2,'QED':1})
 
 GC_23 = Coupling(name = 'GC_23',
@@ -198,7 +198,7 @@
                  order = {'QED':1})
 
 GC_48 = Coupling(name = 'GC_48',
-                 value = '(CPWL2*complex(0,1)*gw*sw)/2.e6',
+                 value = '(CPWL2*complex(0,1)*gw*sw)/4.e6',
                  order = {'NP':2})
 
 GC_49 = Coupling(name = 'GC_49',
@@ -206,7 +206,7 @@
                  order = {'QED':2})
 
 GC_50 = Coupling(name = 'GC_50',
-                 value = '-(CPWL2*cw*complex(0,1)*gw**2*sw)/2.e6',
+                 value = '-(CPWL2*cw*complex(0,1)*gw**2*sw)/8.e6',
                  order = {'NP':2,'QED':1})
 
 GC_51 = Coupling(name = 'GC_51',
@@ -214,7 +214,7 @@
                  order = {'NP':2,'QED':2})
 
 GC_52 = Coupling(name = 'GC_52',
-                 value = '-(CPWL2*complex(0,1)*g1*gw**2*sw)/2.e6',
+                 value = '-(CPWL2*complex(0,1)*g1*gw**2*sw)/4.e6',
                  order = {'NP':2,'QED':2})
 
 GC_53 = Coupling(name = 'GC_53',
@@ -222,11 +222,11 @@
                  order = {'NP':2,'QED':2})
 
 GC_54 = Coupling(name = 'GC_54',
-                 value = '-(CPWL2*complex(0,1)*gw**3*sw)/2.e6',
+                 value = '-(CPWL2*complex(0,1)*gw**3*sw)/4.e6',
                  order = {'NP':2,'QED':2})
 
 GC_55 = Coupling(name = 'GC_55',
-                 value = '(CPWWWL2*complex(0,1)*gw**3*sw)/2.e6',
+                 value = '(CPWWWL2*complex(0,1)*gw**3*sw)/4.e6',
                  order = {'NP':2})
 
 GC_56 = Coupling(name = 'GC_56',
@@ -238,7 +238,7 @@
                  order = {'NP':2})
 
 GC_58 = Coupling(name = 'GC_58',
-                 value = '(CPWWWL2*cw*complex(0,1)*gw**4*sw)/1.e6',
+                 value = '(CPWWWL2*cw*complex(0,1)*gw**4*sw)/2.e6',
                  order = {'NP':2,'QED':1})
 
 GC_59 = Coupling(name = 'GC_59',
@@ -266,7 +266,7 @@
                  order = {'NP':2,'QED':3})
 
 GC_65 = Coupling(name = 'GC_65',
-                 value = '-(CPWL2*complex(0,1)*g1*gw*sw**2)/2.e6',
+                 value = '-(CPWL2*complex(0,1)*g1*gw*sw**2)/8.e6',
                  order = {'NP':2,'QED':1})
 
 GC_66 = Coupling(name = 'GC_66',
@@ -274,7 +274,7 @@
                  order = {'QED':2})
 
 GC_67 = Coupling(name = 'GC_67',
-                 value = '(CPWWWL2*complex(0,1)*gw**4*sw**2)/1.e6',
+                 value = '(CPWWWL2*complex(0,1)*gw**4*sw**2)/2.e6',
                  order = {'NP':2,'QED':1})
 
 GC_68 = Coupling(name = 'GC_68',
@@ -306,7 +306,7 @@
                  order = {'QED':1})
 
 GC_75 = Coupling(name = 'GC_75',
-                 value = '-(CPWL2*cw**2*complex(0,1)*gw**2)/2.e6 - (CPWL2*cw*complex(0,1)*g1*gw*sw)/2.e6',
+                 value = '-(CPWL2*cw**2*complex(0,1)*gw**2)/8.e6 - (CPWL2*cw*complex(0,1)*g1*gw*sw)/8.e6',
                  order = {'NP':2,'QED':1})
 
 GC_76 = Coupling(name = 'GC_76',
@@ -334,7 +334,7 @@
                  order = {'NP':2,'QED':1})
 
 GC_82 = Coupling(name = 'GC_82',
-                 value = '(CPWL2*cw*complex(0,1)*g1*gw*sw)/2.e6 - (CPWL2*complex(0,1)*gw**2*sw**2)/2.e6',
+                 value = '(CPWL2*cw*complex(0,1)*g1*gw*sw)/8.e6 - (CPWL2*complex(0,1)*gw**2*sw**2)/8.e6',
                  order = {'NP':2,'QED':1})
 
 GC_83 = Coupling(name = 'GC_83',
@@ -350,11 +350,11 @@
                  order = {'NP':2,'QED':3})
 
 GC_86 = Coupling(name = 'GC_86',
-                 value = '-(CPWL2*cw**2*complex(0,1)*g1*gw*v)/2.e6',
+                 value = '-(CPWL2*cw**2*complex(0,1)*g1*gw*v)/8.e6',
                  order = {'NP':2})
 
 GC_87 = Coupling(name = 'GC_87',
-                 value = '-(CPWL2*complex(0,1)*gw**2*v)/2.e6',
+                 value = '(CPWL2*complex(0,1)*gw**2*v)/4.e6',
                  order = {'NP':2})
 
 GC_88 = Coupling(name = 'GC_88',
@@ -366,7 +366,7 @@
                  order = {'NP':2,'QED':1})
 
 GC_90 = Coupling(name = 'GC_90',
-                 value = '(CPWL2*cw*complex(0,1)*g1*gw**2*v)/2.e6',
+                 value = '(CPWL2*cw*complex(0,1)*g1*gw**2*v)/4.e6',
                  order = {'NP':2,'QED':1})
 
 GC_91 = Coupling(name = 'GC_91',
@@ -374,7 +374,7 @@
                  order = {'NP':2,'QED':1})
 
 GC_92 = Coupling(name = 'GC_92',
-                 value = '-(CPWL2*cw*complex(0,1)*gw**3*v)/2.e6',
+                 value = '-(CPWL2*cw*complex(0,1)*gw**3*v)/4.e6',
                  order = {'NP':2,'QED':1})
 
 GC_93 = Coupling(name = 'GC_93',
@@ -394,7 +394,7 @@
                  order = {'QED':1})
 
 GC_97 = Coupling(name = 'GC_97',
-                 value = '-(CPWL2*cw*complex(0,1)*gw**2*sw*v)/2.e6',
+                 value = '-(CPWL2*cw*complex(0,1)*gw**2*sw*v)/8.e6',
                  order = {'NP':2})
 
 GC_98 = Coupling(name = 'GC_98',
@@ -402,7 +402,7 @@
                  order = {'NP':2,'QED':1})
 
 GC_99 = Coupling(name = 'GC_99',
-                 value = '-(CPWL2*complex(0,1)*g1*gw**2*sw*v)/2.e6',
+                 value = '-(CPWL2*complex(0,1)*g1*gw**2*sw*v)/4.e6',
                  order = {'NP':2,'QED':1})
 
 GC_100 = Coupling(name = 'GC_100',
@@ -410,7 +410,7 @@
                   order = {'NP':2,'QED':1})
 
 GC_101 = Coupling(name = 'GC_101',
-                  value = '-(CPWL2*complex(0,1)*gw**3*sw*v)/2.e6',
+                  value = '-(CPWL2*complex(0,1)*gw**3*sw*v)/4.e6',
                   order = {'NP':2,'QED':1})
 
 GC_102 = Coupling(name = 'GC_102',
@@ -418,7 +418,7 @@
                   order = {'NP':2,'QED':1})
 
 GC_103 = Coupling(name = 'GC_103',
-                  value = '-(CPWL2*complex(0,1)*g1*gw*sw**2*v)/2.e6',
+                  value = '-(CPWL2*complex(0,1)*g1*gw*sw**2*v)/8.e6',
                   order = {'NP':2})
 
 GC_104 = Coupling(name = 'GC_104',
@@ -426,7 +426,7 @@
                   order = {'NP':2})
 
 GC_105 = Coupling(name = 'GC_105',
-                  value = '(CPWL2*cw*complex(0,1)*g1*gw**2*v**2)/4.e6',
+                  value = '(CPWL2*cw*complex(0,1)*g1*gw**2*v**2)/8.e6',
                   order = {'NP':2})
 
 GC_106 = Coupling(name = 'GC_106',
@@ -434,7 +434,7 @@
                   order = {'NP':2})
 
 GC_107 = Coupling(name = 'GC_107',
-                  value = '-(CPWL2*cw*complex(0,1)*gw**3*v**2)/4.e6',
+                  value = '-(CPWL2*cw*complex(0,1)*gw**3*v**2)/8.e6',
                   order = {'NP':2})
 
 GC_108 = Coupling(name = 'GC_108',
@@ -450,7 +450,7 @@
                   order = {'NP':2})
 
 GC_111 = Coupling(name = 'GC_111',
-                  value = '-(CPWL2*complex(0,1)*g1*gw**2*sw*v**2)/4.e6',
+                  value = '-(CPWL2*complex(0,1)*g1*gw**2*sw*v**2)/8.e6',
                   order = {'NP':2})
 
 GC_112 = Coupling(name = 'GC_112',
@@ -458,7 +458,7 @@
                   order = {'NP':2})
 
 GC_113 = Coupling(name = 'GC_113',
-                  value = '-(CPWL2*complex(0,1)*gw**3*sw*v**2)/4.e6',
+                  value = '-(CPWL2*complex(0,1)*gw**3*sw*v**2)/8.e6',
                   order = {'NP':2})
 
 GC_114 = Coupling(name = 'GC_114',
@@ -466,7 +466,7 @@
                   order = {'NP':2})
 
 GC_115 = Coupling(name = 'GC_115',
-                  value = '-(CPWL2*cw**2*complex(0,1)*gw**2*v)/2.e6 - (CPWL2*cw*complex(0,1)*g1*gw*sw*v)/2.e6',
+                  value = '-(CPWL2*cw**2*complex(0,1)*gw**2*v)/8.e6 - (CPWL2*cw*complex(0,1)*g1*gw*sw*v)/8.e6',
                   order = {'NP':2})
 
 GC_116 = Coupling(name = 'GC_116',
@@ -494,7 +494,7 @@
                   order = {'NP':2})
 
 GC_122 = Coupling(name = 'GC_122',
-                  value = '(CPWL2*cw*complex(0,1)*g1*gw*sw*v)/2.e6 - (CPWL2*complex(0,1)*gw**2*sw**2*v)/2.e6',
+                  value = '(CPWL2*cw*complex(0,1)*g1*gw*sw*v)/8.e6 - (CPWL2*complex(0,1)*gw**2*sw**2*v)/8.e6',
                   order = {'NP':2})
 
 GC_123 = Coupling(name = 'GC_123',
@@ -526,70 +526,46 @@
                   order = {'QED':1})
 
 GC_130 = Coupling(name = 'GC_130',
-                  value = '-((complex(0,1)*yc)/cmath.sqrt(2))',
+                  value = '-((complex(0,1)*yt)/cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_131 = Coupling(name = 'GC_131',
-                  value = '-((complex(0,1)*ydo)/cmath.sqrt(2))',
+                  value = '-((complex(0,1)*ytau)/cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_132 = Coupling(name = 'GC_132',
-                  value = '-((complex(0,1)*ye)/cmath.sqrt(2))',
+                  value = '(ee*complex(0,1)*complexconjugate(CKM1x1))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_133 = Coupling(name = 'GC_133',
-                  value = '-((complex(0,1)*ym)/cmath.sqrt(2))',
+                  value = '(ee*complex(0,1)*complexconjugate(CKM1x2))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_134 = Coupling(name = 'GC_134',
-                  value = '-((complex(0,1)*ys)/cmath.sqrt(2))',
+                  value = '(ee*complex(0,1)*complexconjugate(CKM1x3))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_135 = Coupling(name = 'GC_135',
-                  value = '-((complex(0,1)*yt)/cmath.sqrt(2))',
+                  value = '(ee*complex(0,1)*complexconjugate(CKM2x1))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_136 = Coupling(name = 'GC_136',
-                  value = '-((complex(0,1)*ytau)/cmath.sqrt(2))',
+                  value = '(ee*complex(0,1)*complexconjugate(CKM2x2))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_137 = Coupling(name = 'GC_137',
-                  value = '-((complex(0,1)*yup)/cmath.sqrt(2))',
+                  value = '(ee*complex(0,1)*complexconjugate(CKM2x3))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_138 = Coupling(name = 'GC_138',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM1x1))/(sw*cmath.sqrt(2))',
+                  value = '(ee*complex(0,1)*complexconjugate(CKM3x1))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_139 = Coupling(name = 'GC_139',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM1x2))/(sw*cmath.sqrt(2))',
+                  value = '(ee*complex(0,1)*complexconjugate(CKM3x2))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 
 GC_140 = Coupling(name = 'GC_140',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM1x3))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_141 = Coupling(name = 'GC_141',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM2x1))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_142 = Coupling(name = 'GC_142',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM2x2))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_143 = Coupling(name = 'GC_143',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM2x3))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_144 = Coupling(name = 'GC_144',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM3x1))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_145 = Coupling(name = 'GC_145',
-                  value = '(ee*complex(0,1)*complexconjugate(CKM3x2))/(sw*cmath.sqrt(2))',
-                  order = {'QED':1})
-
-GC_146 = Coupling(name = 'GC_146',
                   value = '(ee*complex(0,1)*complexconjugate(CKM3x3))/(sw*cmath.sqrt(2))',
                   order = {'QED':1})
 

=== modified file 'models/EWdim6/function_library.py'
--- models/EWdim6/function_library.py	2012-05-05 16:56:46 +0000
+++ models/EWdim6/function_library.py	2013-03-04 23:37:19 +0000
@@ -49,6 +49,14 @@
              arguments = ('z',),
              expression = 'cmath.asin(1./z)')
 
-
+cot = Function(name = 'cot',
+               arguments = ('z',),
+               expression = '1./cmath.tan(z)')
+
+# Heaviside theta function
+
+theta_function = Function(name = 'theta_function',
+             arguments = ('x','y','z'),
+             expression = 'y if x else z')
 
 

=== modified file 'models/EWdim6/lorentz.py'
--- models/EWdim6/lorentz.py	2012-06-14 15:45:15 +0000
+++ models/EWdim6/lorentz.py	2013-03-04 23:37:19 +0000
@@ -1,233 +1,248 @@
-# This file was automatically created by FeynRules 1.7.9
-# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
-# Date: Fri 18 May 2012 14:43:24
+# This file was automatically created by FeynRules 1.7.127
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 22 Jan 2013 16:20:54
 
 
 from object_library import all_lorentz, Lorentz
 
-from function_library import complexconjugate, re, im, csc, sec, acsc, asec
-
-
-
-UUV2 = Lorentz(name = 'UUV2',
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec, cot
+try:
+   import form_factors as ForFac 
+except ImportError:
+   pass
+
+
+UUV1 = Lorentz(name = 'UUV1',
                spins = [ -1, -1, 3 ],
                structure = 'P(3,2) + P(3,3)')
 
-SSS2 = Lorentz(name = 'SSS2',
+SSS1 = Lorentz(name = 'SSS1',
                spins = [ 1, 1, 1 ],
                structure = '1')
 
-FFS2 = Lorentz(name = 'FFS2',
+FFS1 = Lorentz(name = 'FFS1',
                spins = [ 2, 2, 1 ],
                structure = 'Identity(2,1)')
 
-FFV6 = Lorentz(name = 'FFV6',
+FFV1 = Lorentz(name = 'FFV1',
                spins = [ 2, 2, 3 ],
                structure = 'Gamma(3,2,1)')
 
-FFV7 = Lorentz(name = 'FFV7',
+FFV2 = Lorentz(name = 'FFV2',
                spins = [ 2, 2, 3 ],
                structure = 'Gamma(3,2,-1)*ProjM(-1,1)')
 
-FFV8 = Lorentz(name = 'FFV8',
+FFV3 = Lorentz(name = 'FFV3',
                spins = [ 2, 2, 3 ],
                structure = 'Gamma(3,2,-1)*ProjM(-1,1) - 2*Gamma(3,2,-1)*ProjP(-1,1)')
 
-FFV9 = Lorentz(name = 'FFV9',
+FFV4 = Lorentz(name = 'FFV4',
                spins = [ 2, 2, 3 ],
                structure = 'Gamma(3,2,-1)*ProjM(-1,1) + 2*Gamma(3,2,-1)*ProjP(-1,1)')
 
-FFV10 = Lorentz(name = 'FFV10',
-                spins = [ 2, 2, 3 ],
-                structure = 'Gamma(3,2,-1)*ProjM(-1,1) + 4*Gamma(3,2,-1)*ProjP(-1,1)')
+FFV5 = Lorentz(name = 'FFV5',
+               spins = [ 2, 2, 3 ],
+               structure = 'Gamma(3,2,-1)*ProjM(-1,1) + 4*Gamma(3,2,-1)*ProjP(-1,1)')
 
 VSS1 = Lorentz(name = 'VSS1',
                spins = [ 3, 1, 1 ],
-               structure = 'Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2) + Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)')
+               structure = '2*Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2) + 2*Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)')
+
+VVS1 = Lorentz(name = 'VVS1',
+               spins = [ 3, 3, 1 ],
+               structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)')
+
+VVS2 = Lorentz(name = 'VVS2',
+               spins = [ 3, 3, 1 ],
+               structure = '2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
+
+VVS3 = Lorentz(name = 'VVS3',
+               spins = [ 3, 3, 1 ],
+               structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)) + 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
+
+VVS4 = Lorentz(name = 'VVS4',
+               spins = [ 3, 3, 1 ],
+               structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)) + Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
 
 VVS5 = Lorentz(name = 'VVS5',
                spins = [ 3, 3, 1 ],
-               structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)')
+               structure = '-2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2) + 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
 
 VVS6 = Lorentz(name = 'VVS6',
                spins = [ 3, 3, 1 ],
-               structure = 'Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
+               structure = 'Metric(1,2)')
 
 VVS7 = Lorentz(name = 'VVS7',
                spins = [ 3, 3, 1 ],
-               structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)')
+               structure = 'P(1,3)*P(2,1) - P(-1,1)*P(-1,3)*Metric(1,2)')
 
 VVS8 = Lorentz(name = 'VVS8',
                spins = [ 3, 3, 1 ],
-               structure = 'Metric(1,2)')
+               structure = 'P(1,2)*P(2,3) - P(-1,2)*P(-1,3)*Metric(1,2)')
 
 VVS9 = Lorentz(name = 'VVS9',
                spins = [ 3, 3, 1 ],
-               structure = 'P(1,3)*P(2,1) - P(-1,1)*P(-1,3)*Metric(1,2)')
-
-VVS10 = Lorentz(name = 'VVS10',
-                spins = [ 3, 3, 1 ],
-                structure = 'P(1,2)*P(2,3) - P(-1,2)*P(-1,3)*Metric(1,2)')
-
-VVS11 = Lorentz(name = 'VVS11',
-                spins = [ 3, 3, 1 ],
-                structure = 'P(1,3)*P(2,1) + P(1,2)*P(2,3) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,2)*P(-1,3)*Metric(1,2)')
+               structure = 'P(1,3)*P(2,1) + P(1,2)*P(2,3) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,2)*P(-1,3)*Metric(1,2)')
+
+VVV1 = Lorentz(name = 'VVV1',
+               spins = [ 3, 3, 3 ],
+               structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2)')
+
+VVV2 = Lorentz(name = 'VVV2',
+               spins = [ 3, 3, 3 ],
+               structure = '2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3)')
+
+VVV3 = Lorentz(name = 'VVV3',
+               spins = [ 3, 3, 3 ],
+               structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3)')
 
 VVV4 = Lorentz(name = 'VVV4',
                spins = [ 3, 3, 3 ],
-               structure = 'Epsilon(1,2,3,-1)*P(-1,1) + Epsilon(1,2,3,-1)*P(-1,2)')
+               structure = 'P(3,1)*Metric(1,2) - P(2,1)*Metric(1,3)')
 
 VVV5 = Lorentz(name = 'VVV5',
                spins = [ 3, 3, 3 ],
-               structure = 'Epsilon(1,2,3,-1)*P(-1,2) + Epsilon(1,2,3,-1)*P(-1,3)')
+               structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(1,2)*Metric(2,3)')
 
 VVV6 = Lorentz(name = 'VVV6',
                spins = [ 3, 3, 3 ],
-               structure = 'Epsilon(1,2,3,-1)*P(-1,1) + Epsilon(1,2,3,-1)*P(-1,2) + Epsilon(1,2,3,-1)*P(-1,3)')
+               structure = 'P(2,3)*Metric(1,3) - P(1,3)*Metric(2,3)')
 
 VVV7 = Lorentz(name = 'VVV7',
                spins = [ 3, 3, 3 ],
-               structure = 'P(3,1)*Metric(1,2) - P(2,1)*Metric(1,3)')
+               structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,3)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,3)*Metric(2,3)')
 
 VVV8 = Lorentz(name = 'VVV8',
                spins = [ 3, 3, 3 ],
-               structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(1,2)*Metric(2,3)')
+               structure = 'P(3,2)*Metric(1,2) - P(2,3)*Metric(1,3) - P(1,2)*Metric(2,3) + P(1,3)*Metric(2,3)')
 
 VVV9 = Lorentz(name = 'VVV9',
                spins = [ 3, 3, 3 ],
-               structure = 'P(2,3)*Metric(1,3) - P(1,3)*Metric(2,3)')
+               structure = '-(P(1,2)*P(2,3)*P(3,1)) + P(1,3)*P(2,1)*P(3,2) + P(-1,2)*P(-1,3)*P(3,1)*Metric(1,2) - P(-1,1)*P(-1,3)*P(3,2)*Metric(1,2) - P(-1,2)*P(-1,3)*P(2,1)*Metric(1,3) + P(-1,1)*P(-1,2)*P(2,3)*Metric(1,3) + P(-1,1)*P(-1,3)*P(1,2)*Metric(2,3) - P(-1,1)*P(-1,2)*P(1,3)*Metric(2,3)')
 
 VVV10 = Lorentz(name = 'VVV10',
                 spins = [ 3, 3, 3 ],
-                structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,3)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,3)*Metric(2,3)')
-
-VVV11 = Lorentz(name = 'VVV11',
-                spins = [ 3, 3, 3 ],
-                structure = 'P(3,2)*Metric(1,2) - P(2,3)*Metric(1,3) - P(1,2)*Metric(2,3) + P(1,3)*Metric(2,3)')
-
-VVV12 = Lorentz(name = 'VVV12',
-                spins = [ 3, 3, 3 ],
-                structure = '-(P(1,2)*P(2,3)*P(3,1)) + P(1,3)*P(2,1)*P(3,2) + P(-1,2)*P(-1,3)*P(3,1)*Metric(1,2) - P(-1,1)*P(-1,3)*P(3,2)*Metric(1,2) - P(-1,2)*P(-1,3)*P(2,1)*Metric(1,3) + P(-1,1)*P(-1,2)*P(2,3)*Metric(1,3) + P(-1,1)*P(-1,3)*P(1,2)*Metric(2,3) - P(-1,1)*P(-1,2)*P(1,3)*Metric(2,3)')
-
-VVV13 = Lorentz(name = 'VVV13',
-                spins = [ 3, 3, 3 ],
-                structure = '2*Epsilon(1,2,3,-2)*P(-2,3)*P(-1,1)*P(-1,2) + 2*Epsilon(1,2,3,-2)*P(-2,2)*P(-1,1)*P(-1,3) + 2*Epsilon(1,2,3,-2)*P(-2,1)*P(-1,2)*P(-1,3) - Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*P(1,2) + Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,3)*P(1,2) - Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,1)*P(1,3) + Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,2)*P(1,3) + Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,2)*P(2,1) - Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,3)*P(2,1) - Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,1)*P(2,3) + Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,2)*P(2,3) + Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)*P(3,1) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)*P(3,1) + Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)*P(3,2) - Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*P(3,2) + (Epsilon(3,-1,-2,-3)*P(-3,3)*P(-2,2)*P(-1,1)*Metric(1,2))/2. - (Epsilon(3,-1,-2,-3)*P(-3,3)*P(-2,1)*P(-1,2)*Metric(1,2))/2. + (Epsilon(3,-1,-2,-3)*P(-3,2)*P(-2,1)*P(-1,3)*Metric(1,2))/2. - (Epsilon(3,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)*Metric(1,2))/2. - (Epsilon(2,-1,-2,-3)*P(-3,2)*P(-2,3)*P(-1,1)*Metric(1,3))/2. - (Epsilon(2,-1,-2,-3)*P(-3,3)*P(-2,1)*P(-1,2)*Metric(1,3))/2. + (Epsilon(2,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2)*Metric(1,3))/2. + (Epsilon(2,-1,-2,-3)*P(-3,2)*P(-2,1)*P(-1,3)*Metric(1,3))/2. + (Epsilon(1,-1,-2,-3)*P(-3,3)*P(-2,2)*P(-1,1)*Metric(2,3))/2. - (Epsilon(1,-1,-2,-3)*P(-3,2)*P(-2,3)*P(-1,1)*Metric(2,3))/2. + (Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2)*Metric(2,3))/2. - (Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)*Metric(2,3))/2.')
-
-SSSS2 = Lorentz(name = 'SSSS2',
+                structure = '4*Epsilon(1,2,3,-2)*P(-2,3)*P(-1,1)*P(-1,2) + 4*Epsilon(1,2,3,-2)*P(-2,2)*P(-1,1)*P(-1,3) + 4*Epsilon(1,2,3,-2)*P(-2,1)*P(-1,2)*P(-1,3) - 2*Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*P(1,2) + 2*Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,3)*P(1,2) - 2*Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,1)*P(1,3) + 2*Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,2)*P(1,3) + 2*Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,2)*P(2,1) - 2*Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,3)*P(2,1) - 2*Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,1)*P(2,3) + 2*Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,2)*P(2,3) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)*P(3,1) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)*P(3,1) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)*P(3,2) - 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*P(3,2) + Epsilon(3,-1,-2,-3)*P(-3,3)*P(-2,2)*P(-1,1)*Metric(1,2) - Epsilon(3,-1,-2,-3)*P(-3,3)*P(-2,1)*P(-1,2)*Metric(1,2) + Epsilon(3,-1,-2,-3)*P(-3,2)*P(-2,1)*P(-1,3)*Metric(1,2) - Epsilon(3,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)*Metric(1,2) - Epsilon(2,-1,-2,-3)*P(-3,2)*P(-2,3)*P(-1,1)*Metric(1,3) - Epsilon(2,-1,-2,-3)*P(-3,3)*P(-2,1)*P(-1,2)*Metric(1,3) + Epsilon(2,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2)*Metric(1,3) + Epsilon(2,-1,-2,-3)*P(-3,2)*P(-2,1)*P(-1,3)*Metric(1,3) + Epsilon(1,-1,-2,-3)*P(-3,3)*P(-2,2)*P(-1,1)*Metric(2,3) - Epsilon(1,-1,-2,-3)*P(-3,2)*P(-2,3)*P(-1,1)*Metric(2,3) + Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,3)*P(-1,2)*Metric(2,3) - Epsilon(1,-1,-2,-3)*P(-3,1)*P(-2,2)*P(-1,3)*Metric(2,3)')
+
+SSSS1 = Lorentz(name = 'SSSS1',
                 spins = [ 1, 1, 1, 1 ],
                 structure = '1')
 
+VVSS1 = Lorentz(name = 'VVSS1',
+                spins = [ 3, 3, 1, 1 ],
+                structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)) - Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4)')
+
+VVSS2 = Lorentz(name = 'VVSS2',
+                spins = [ 3, 3, 1, 1 ],
+                structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)) - Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2) + 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)')
+
+VVSS3 = Lorentz(name = 'VVSS3',
+                spins = [ 3, 3, 1, 1 ],
+                structure = '-(Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)) - Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1) + Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2) + Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + 3*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4) - 3*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)')
+
+VVSS4 = Lorentz(name = 'VVSS4',
+                spins = [ 3, 3, 1, 1 ],
+                structure = '-2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1) - 2*Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2) + 2*Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2) + 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)')
+
 VVSS5 = Lorentz(name = 'VVSS5',
                 spins = [ 3, 3, 1, 1 ],
-                structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) + Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4)')
+                structure = '2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + 2*Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,3) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4) + 2*Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,4)')
 
 VVSS6 = Lorentz(name = 'VVSS6',
                 spins = [ 3, 3, 1, 1 ],
-                structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)')
+                structure = 'Metric(1,2)')
 
 VVSS7 = Lorentz(name = 'VVSS7',
                 spins = [ 3, 3, 1, 1 ],
-                structure = 'Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) + Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)')
+                structure = 'P(1,3)*P(2,1) + P(1,4)*P(2,1) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,1)*P(-1,4)*Metric(1,2)')
 
 VVSS8 = Lorentz(name = 'VVSS8',
                 spins = [ 3, 3, 1, 1 ],
-                structure = 'Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3) - Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,3) + Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4) - Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4) - Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,4)')
+                structure = 'P(1,2)*P(2,3) + P(1,2)*P(2,4) - P(-1,2)*P(-1,3)*Metric(1,2) - P(-1,2)*P(-1,4)*Metric(1,2)')
 
 VVSS9 = Lorentz(name = 'VVSS9',
                 spins = [ 3, 3, 1, 1 ],
-                structure = 'Metric(1,2)')
-
-VVSS10 = Lorentz(name = 'VVSS10',
-                 spins = [ 3, 3, 1, 1 ],
-                 structure = 'P(1,3)*P(2,1) + P(1,4)*P(2,1) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,1)*P(-1,4)*Metric(1,2)')
-
-VVSS11 = Lorentz(name = 'VVSS11',
-                 spins = [ 3, 3, 1, 1 ],
-                 structure = 'P(1,2)*P(2,3) + P(1,2)*P(2,4) - P(-1,2)*P(-1,3)*Metric(1,2) - P(-1,2)*P(-1,4)*Metric(1,2)')
-
-VVSS12 = Lorentz(name = 'VVSS12',
-                 spins = [ 3, 3, 1, 1 ],
-                 structure = 'P(1,3)*P(2,1) + P(1,4)*P(2,1) + P(1,2)*P(2,3) + P(1,2)*P(2,4) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,2)*P(-1,3)*Metric(1,2) - P(-1,1)*P(-1,4)*Metric(1,2) - P(-1,2)*P(-1,4)*Metric(1,2)')
+                structure = 'P(1,3)*P(2,1) + P(1,4)*P(2,1) + P(1,2)*P(2,3) + P(1,2)*P(2,4) - P(-1,1)*P(-1,3)*Metric(1,2) - P(-1,2)*P(-1,3)*Metric(1,2) - P(-1,1)*P(-1,4)*Metric(1,2) - P(-1,2)*P(-1,4)*Metric(1,2)')
+
+VVVS1 = Lorentz(name = 'VVVS1',
+                spins = [ 3, 3, 3, 1 ],
+                structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,4)')
+
+VVVS2 = Lorentz(name = 'VVVS2',
+                spins = [ 3, 3, 3, 1 ],
+                structure = '2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3) + 2*Epsilon(1,2,3,-1)*P(-1,4)')
+
+VVVS3 = Lorentz(name = 'VVVS3',
+                spins = [ 3, 3, 3, 1 ],
+                structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3) + 6*Epsilon(1,2,3,-1)*P(-1,4)')
 
 VVVS4 = Lorentz(name = 'VVVS4',
                 spins = [ 3, 3, 3, 1 ],
-                structure = 'Epsilon(1,2,3,-1)*P(-1,1) + Epsilon(1,2,3,-1)*P(-1,2) + Epsilon(1,2,3,-1)*P(-1,4)')
+                structure = 'P(3,1)*Metric(1,2) - P(2,1)*Metric(1,3)')
 
 VVVS5 = Lorentz(name = 'VVVS5',
                 spins = [ 3, 3, 3, 1 ],
-                structure = 'Epsilon(1,2,3,-1)*P(-1,2) + Epsilon(1,2,3,-1)*P(-1,3) + Epsilon(1,2,3,-1)*P(-1,4)')
+                structure = 'P(2,3)*Metric(1,3) - P(1,3)*Metric(2,3)')
 
 VVVS6 = Lorentz(name = 'VVVS6',
                 spins = [ 3, 3, 3, 1 ],
-                structure = 'Epsilon(1,2,3,-1)*P(-1,1) + Epsilon(1,2,3,-1)*P(-1,2) + Epsilon(1,2,3,-1)*P(-1,3) + 3*Epsilon(1,2,3,-1)*P(-1,4)')
+                structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,3)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,3)*Metric(2,3)')
 
 VVVS7 = Lorentz(name = 'VVVS7',
                 spins = [ 3, 3, 3, 1 ],
-                structure = 'P(3,1)*Metric(1,2) - P(2,1)*Metric(1,3)')
+                structure = 'P(3,2)*Metric(1,2) - P(3,4)*Metric(1,2) - P(2,3)*Metric(1,3) + P(2,4)*Metric(1,3) - P(1,2)*Metric(2,3) + P(1,3)*Metric(2,3)')
 
 VVVS8 = Lorentz(name = 'VVVS8',
                 spins = [ 3, 3, 3, 1 ],
-                structure = 'P(2,3)*Metric(1,3) - P(1,3)*Metric(2,3)')
-
-VVVS9 = Lorentz(name = 'VVVS9',
-                spins = [ 3, 3, 3, 1 ],
-                structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,3)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,3)*Metric(2,3)')
-
-VVVS10 = Lorentz(name = 'VVVS10',
-                 spins = [ 3, 3, 3, 1 ],
-                 structure = 'P(3,2)*Metric(1,2) - P(3,4)*Metric(1,2) - P(2,3)*Metric(1,3) + P(2,4)*Metric(1,3) - P(1,2)*Metric(2,3) + P(1,3)*Metric(2,3)')
-
-VVVS11 = Lorentz(name = 'VVVS11',
-                 spins = [ 3, 3, 3, 1 ],
-                 structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,4)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,4)*Metric(2,3)')
+                structure = 'P(3,1)*Metric(1,2) - P(3,2)*Metric(1,2) - P(2,1)*Metric(1,3) + P(2,4)*Metric(1,3) + P(1,2)*Metric(2,3) - P(1,4)*Metric(2,3)')
+
+VVVV1 = Lorentz(name = 'VVVV1',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) - Metric(1,3)*Metric(2,4)')
+
+VVVV2 = Lorentz(name = 'VVVV2',
+                spins = [ 3, 3, 3, 3 ],
+                structure = '2*Epsilon(1,2,3,4)*P(-1,1)*P(-1,3) - 2*Epsilon(1,2,3,4)*P(-1,2)*P(-1,3) - 2*Epsilon(1,2,3,4)*P(-1,1)*P(-1,4) + 2*Epsilon(1,2,3,4)*P(-1,2)*P(-1,4) + 2*Epsilon(2,3,4,-1)*P(-1,3)*P(1,2) - 2*Epsilon(2,3,4,-1)*P(-1,4)*P(1,2) + 2*Epsilon(2,3,4,-1)*P(-1,1)*P(1,3) + 2*Epsilon(2,3,4,-1)*P(-1,2)*P(1,3) - 2*Epsilon(2,3,4,-1)*P(-1,1)*P(1,4) - 2*Epsilon(2,3,4,-1)*P(-1,2)*P(1,4) + 2*Epsilon(1,3,4,-1)*P(-1,3)*P(2,1) - 2*Epsilon(1,3,4,-1)*P(-1,4)*P(2,1) + 2*Epsilon(1,3,4,-1)*P(-1,1)*P(2,3) + 2*Epsilon(1,3,4,-1)*P(-1,2)*P(2,3) - 2*Epsilon(1,3,4,-1)*P(-1,1)*P(2,4) - 2*Epsilon(1,3,4,-1)*P(-1,2)*P(2,4) + 2*Epsilon(1,2,4,-1)*P(-1,3)*P(3,1) + 2*Epsilon(1,2,4,-1)*P(-1,4)*P(3,1) - 2*Epsilon(1,2,4,-1)*P(-1,3)*P(3,2) - 2*Epsilon(1,2,4,-1)*P(-1,4)*P(3,2) + 2*Epsilon(1,2,4,-1)*P(-1,1)*P(3,4) - 2*Epsilon(1,2,4,-1)*P(-1,2)*P(3,4) + 2*Epsilon(1,2,3,-1)*P(-1,3)*P(4,1) + 2*Epsilon(1,2,3,-1)*P(-1,4)*P(4,1) - 2*Epsilon(1,2,3,-1)*P(-1,3)*P(4,2) - 2*Epsilon(1,2,3,-1)*P(-1,4)*P(4,2) + 2*Epsilon(1,2,3,-1)*P(-1,1)*P(4,3) - 2*Epsilon(1,2,3,-1)*P(-1,2)*P(4,3) - 2*Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,2) + 2*Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,2) - 2*Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(1,2) + 2*Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,2) - Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,3) - 2*Epsilon(2,4,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,3) + Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,3) + 2*Epsilon(2,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(1,3) - 2*Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,4) - Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,4) + Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,4)*Metric(1,4) + 2*Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,4) - Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(2,3) - 2*Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,3) + 2*Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(2,3) + Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(2,3) - 2*Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,2)*Metric(2,4) - Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,4) + 2*Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,4)*Metric(2,4) + Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,4) - 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*Metric(3,4) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)*Metric(3,4) - 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4)*Metric(3,4) + 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)*Metric(3,4)')
+
+VVVV3 = Lorentz(name = 'VVVV3',
+                spins = [ 3, 3, 3, 3 ],
+                structure = '2*Epsilon(1,2,3,4)*P(-1,1)*P(-1,2) - 2*Epsilon(1,2,3,4)*P(-1,1)*P(-1,3) - 2*Epsilon(1,2,3,4)*P(-1,2)*P(-1,4) + 2*Epsilon(1,2,3,4)*P(-1,3)*P(-1,4) + 2*Epsilon(2,3,4,-1)*P(-1,1)*P(1,2) + 2*Epsilon(2,3,4,-1)*P(-1,4)*P(1,2) - 2*Epsilon(2,3,4,-1)*P(-1,1)*P(1,3) - 2*Epsilon(2,3,4,-1)*P(-1,4)*P(1,3) + 2*Epsilon(2,3,4,-1)*P(-1,2)*P(1,4) - 2*Epsilon(2,3,4,-1)*P(-1,3)*P(1,4) - 2*Epsilon(1,3,4,-1)*P(-1,2)*P(2,1) - 2*Epsilon(1,3,4,-1)*P(-1,3)*P(2,1) - 2*Epsilon(1,3,4,-1)*P(-1,1)*P(2,3) + 2*Epsilon(1,3,4,-1)*P(-1,4)*P(2,3) + 2*Epsilon(1,3,4,-1)*P(-1,2)*P(2,4) + 2*Epsilon(1,3,4,-1)*P(-1,3)*P(2,4) - 2*Epsilon(1,2,4,-1)*P(-1,2)*P(3,1) - 2*Epsilon(1,2,4,-1)*P(-1,3)*P(3,1) - 2*Epsilon(1,2,4,-1)*P(-1,1)*P(3,2) + 2*Epsilon(1,2,4,-1)*P(-1,4)*P(3,2) + 2*Epsilon(1,2,4,-1)*P(-1,2)*P(3,4) + 2*Epsilon(1,2,4,-1)*P(-1,3)*P(3,4) + 2*Epsilon(1,2,3,-1)*P(-1,2)*P(4,1) - 2*Epsilon(1,2,3,-1)*P(-1,3)*P(4,1) + 2*Epsilon(1,2,3,-1)*P(-1,1)*P(4,2) + 2*Epsilon(1,2,3,-1)*P(-1,4)*P(4,2) - 2*Epsilon(1,2,3,-1)*P(-1,1)*P(4,3) - 2*Epsilon(1,2,3,-1)*P(-1,4)*P(4,3) + Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,2) + 2*Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,2) - Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(1,2) - 2*Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,2) + 2*Epsilon(2,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,3) + Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,3) - Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,3) - 2*Epsilon(2,4,-1,-2)*P(-2,4)*P(-1,3)*Metric(1,3) - 2*Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,4) + 2*Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,4) - 2*Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,4) + 2*Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,4)*Metric(1,4) - 2*Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(2,3) + 2*Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,3) - 2*Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(2,3) + 2*Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,3)*Metric(2,3) + 2*Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,2)*Metric(2,4) + Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,4) - Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,4) - 2*Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,4)*Metric(2,4) + 2*Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*Metric(3,4) + Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,3)*Metric(3,4) - 2*Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)*Metric(3,4) - Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,4)*Metric(3,4)')
+
+VVVV4 = Lorentz(name = 'VVVV4',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) + Metric(1,3)*Metric(2,4) - 2*Metric(1,2)*Metric(3,4)')
+
+VVVV5 = Lorentz(name = 'VVVV5',
+                spins = [ 3, 3, 3, 3 ],
+                structure = 'Metric(1,4)*Metric(2,3) - Metric(1,2)*Metric(3,4)')
 
 VVVV6 = Lorentz(name = 'VVVV6',
                 spins = [ 3, 3, 3, 3 ],
-                structure = 'Metric(1,4)*Metric(2,3) - Metric(1,3)*Metric(2,4)')
+                structure = 'Metric(1,3)*Metric(2,4) - Metric(1,2)*Metric(3,4)')
 
 VVVV7 = Lorentz(name = 'VVVV7',
                 spins = [ 3, 3, 3, 3 ],
-                structure = 'Epsilon(1,2,3,4)*P(-1,1)*P(-1,3) - Epsilon(1,2,3,4)*P(-1,2)*P(-1,3) - Epsilon(1,2,3,4)*P(-1,1)*P(-1,4) + Epsilon(1,2,3,4)*P(-1,2)*P(-1,4) + Epsilon(2,3,4,-1)*P(-1,3)*P(1,2) - Epsilon(2,3,4,-1)*P(-1,4)*P(1,2) + Epsilon(2,3,4,-1)*P(-1,1)*P(1,3) + Epsilon(2,3,4,-1)*P(-1,2)*P(1,3) - Epsilon(2,3,4,-1)*P(-1,1)*P(1,4) - Epsilon(2,3,4,-1)*P(-1,2)*P(1,4) + Epsilon(1,3,4,-1)*P(-1,3)*P(2,1) - Epsilon(1,3,4,-1)*P(-1,4)*P(2,1) + Epsilon(1,3,4,-1)*P(-1,1)*P(2,3) + Epsilon(1,3,4,-1)*P(-1,2)*P(2,3) - Epsilon(1,3,4,-1)*P(-1,1)*P(2,4) - Epsilon(1,3,4,-1)*P(-1,2)*P(2,4) + Epsilon(1,2,4,-1)*P(-1,3)*P(3,1) + Epsilon(1,2,4,-1)*P(-1,4)*P(3,1) - Epsilon(1,2,4,-1)*P(-1,3)*P(3,2) - Epsilon(1,2,4,-1)*P(-1,4)*P(3,2) + Epsilon(1,2,4,-1)*P(-1,1)*P(3,4) - Epsilon(1,2,4,-1)*P(-1,2)*P(3,4) + Epsilon(1,2,3,-1)*P(-1,3)*P(4,1) + Epsilon(1,2,3,-1)*P(-1,4)*P(4,1) - Epsilon(1,2,3,-1)*P(-1,3)*P(4,2) - Epsilon(1,2,3,-1)*P(-1,4)*P(4,2) + Epsilon(1,2,3,-1)*P(-1,1)*P(4,3) - Epsilon(1,2,3,-1)*P(-1,2)*P(4,3) - (Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,4)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,2))/2. - (Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(1,3))/2. + (Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,3))/2. + (Epsilon(2,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(1,3))/2. + (Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,4)*Metric(1,3))/2. - (Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,1)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,4)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,4))/2. - (Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,2)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,3)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,3))/2. - (Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,1)*Metric(2,4))/2. - (Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,2)*Metric(2,4))/2. - (Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,3)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,4)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,1)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,2)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,3)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,4)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)*Metric(3,4))/2.')
+                structure = 'Metric(1,4)*Metric(2,3) - (Metric(1,3)*Metric(2,4))/2. - (Metric(1,2)*Metric(3,4))/2.')
 
 VVVV8 = Lorentz(name = 'VVVV8',
                 spins = [ 3, 3, 3, 3 ],
-                structure = 'Epsilon(1,2,3,4)*P(-1,1)*P(-1,2) - Epsilon(1,2,3,4)*P(-1,1)*P(-1,3) - Epsilon(1,2,3,4)*P(-1,2)*P(-1,4) + Epsilon(1,2,3,4)*P(-1,3)*P(-1,4) + Epsilon(2,3,4,-1)*P(-1,1)*P(1,2) + Epsilon(2,3,4,-1)*P(-1,4)*P(1,2) - Epsilon(2,3,4,-1)*P(-1,1)*P(1,3) - Epsilon(2,3,4,-1)*P(-1,4)*P(1,3) + Epsilon(2,3,4,-1)*P(-1,2)*P(1,4) - Epsilon(2,3,4,-1)*P(-1,3)*P(1,4) - Epsilon(1,3,4,-1)*P(-1,2)*P(2,1) - Epsilon(1,3,4,-1)*P(-1,3)*P(2,1) - Epsilon(1,3,4,-1)*P(-1,1)*P(2,3) + Epsilon(1,3,4,-1)*P(-1,4)*P(2,3) + Epsilon(1,3,4,-1)*P(-1,2)*P(2,4) + Epsilon(1,3,4,-1)*P(-1,3)*P(2,4) - Epsilon(1,2,4,-1)*P(-1,2)*P(3,1) - Epsilon(1,2,4,-1)*P(-1,3)*P(3,1) - Epsilon(1,2,4,-1)*P(-1,1)*P(3,2) + Epsilon(1,2,4,-1)*P(-1,4)*P(3,2) + Epsilon(1,2,4,-1)*P(-1,2)*P(3,4) + Epsilon(1,2,4,-1)*P(-1,3)*P(3,4) + Epsilon(1,2,3,-1)*P(-1,2)*P(4,1) - Epsilon(1,2,3,-1)*P(-1,3)*P(4,1) + Epsilon(1,2,3,-1)*P(-1,1)*P(4,2) + Epsilon(1,2,3,-1)*P(-1,4)*P(4,2) - Epsilon(1,2,3,-1)*P(-1,1)*P(4,3) - Epsilon(1,2,3,-1)*P(-1,4)*P(4,3) + (Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,2))/2. - (Epsilon(3,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,2))/2. + (Epsilon(3,4,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,2))/2. + (Epsilon(2,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,3))/2. + (Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,3))/2. - (Epsilon(2,4,-1,-2)*P(-2,4)*P(-1,3)*Metric(1,3))/2. + (Epsilon(2,4,-1,-2)*P(-2,3)*P(-1,4)*Metric(1,3))/2. - (Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,1)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,1)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,2)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,1)*P(-1,3)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,4)*P(-1,3)*Metric(1,4))/2. - (Epsilon(2,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(1,4))/2. + (Epsilon(2,3,-1,-2)*P(-2,3)*P(-1,4)*Metric(1,4))/2. + (Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,1)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,1)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,2)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,1)*P(-1,3)*Metric(2,3))/2. + (Epsilon(1,4,-1,-2)*P(-2,4)*P(-1,3)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,3))/2. - (Epsilon(1,4,-1,-2)*P(-2,3)*P(-1,4)*Metric(2,3))/2. - (Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,1)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,1)*P(-1,2)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,2)*Metric(2,4))/2. + (Epsilon(1,3,-1,-2)*P(-2,4)*P(-1,3)*Metric(2,4))/2. - (Epsilon(1,3,-1,-2)*P(-2,2)*P(-1,4)*Metric(2,4))/2. - (Epsilon(1,3,-1,-2)*P(-2,3)*P(-1,4)*Metric(2,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,1)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,2)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,1)*P(-1,3)*Metric(3,4))/2. + (Epsilon(1,2,-1,-2)*P(-2,4)*P(-1,3)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,2)*P(-1,4)*Metric(3,4))/2. - (Epsilon(1,2,-1,-2)*P(-2,3)*P(-1,4)*Metric(3,4))/2.')
+                structure = 'P(3,2)*P(4,1)*Metric(1,2) - P(3,1)*P(4,2)*Metric(1,2) + P(3,4)*P(4,2)*Metric(1,2) + P(3,1)*P(4,3)*Metric(1,2) + P(2,3)*P(4,1)*Metric(1,3) + P(2,1)*P(4,2)*Metric(1,3) - P(2,1)*P(4,3)*Metric(1,3) + P(2,4)*P(4,3)*Metric(1,3) - P(2,3)*P(3,1)*Metric(1,4) - P(2,1)*P(3,2)*Metric(1,4) - P(2,4)*P(3,2)*Metric(1,4) - P(2,3)*P(3,4)*Metric(1,4) - P(1,2)*P(4,1)*Metric(2,3) - P(1,3)*P(4,1)*Metric(2,3) - P(1,4)*P(4,2)*Metric(2,3) - P(1,4)*P(4,3)*Metric(2,3) + P(-1,1)*P(-1,2)*Metric(1,4)*Metric(2,3) + P(-1,1)*P(-1,3)*Metric(1,4)*Metric(2,3) + P(-1,2)*P(-1,4)*Metric(1,4)*Metric(2,3) + P(-1,3)*P(-1,4)*Metric(1,4)*Metric(2,3) + P(1,2)*P(3,1)*Metric(2,4) + P(1,4)*P(3,2)*Metric(2,4) - P(1,2)*P(3,4)*Metric(2,4) + P(1,3)*P(3,4)*Metric(2,4) - P(-1,1)*P(-1,2)*Metric(1,3)*Metric(2,4) - P(-1,3)*P(-1,4)*Metric(1,3)*Metric(2,4) + P(1,3)*P(2,1)*Metric(3,4) + P(1,4)*P(2,3)*Metric(3,4) + P(1,2)*P(2,4)*Metric(3,4) - P(1,3)*P(2,4)*Metric(3,4) - P(-1,1)*P(-1,3)*Metric(1,2)*Metric(3,4) - P(-1,2)*P(-1,4)*Metric(1,2)*Metric(3,4)')
 
 VVVV9 = Lorentz(name = 'VVVV9',
                 spins = [ 3, 3, 3, 3 ],
-                structure = 'Metric(1,4)*Metric(2,3) + Metric(1,3)*Metric(2,4) - 2*Metric(1,2)*Metric(3,4)')
-
-VVVV10 = Lorentz(name = 'VVVV10',
-                 spins = [ 3, 3, 3, 3 ],
-                 structure = 'Metric(1,4)*Metric(2,3) - Metric(1,2)*Metric(3,4)')
-
-VVVV11 = Lorentz(name = 'VVVV11',
-                 spins = [ 3, 3, 3, 3 ],
-                 structure = 'Metric(1,3)*Metric(2,4) - Metric(1,2)*Metric(3,4)')
-
-VVVV12 = Lorentz(name = 'VVVV12',
-                 spins = [ 3, 3, 3, 3 ],
-                 structure = 'Metric(1,4)*Metric(2,3) - (Metric(1,3)*Metric(2,4))/2. - (Metric(1,2)*Metric(3,4))/2.')
-
-VVVV13 = Lorentz(name = 'VVVV13',
-                 spins = [ 3, 3, 3, 3 ],
-                 structure = 'P(3,2)*P(4,1)*Metric(1,2) - P(3,1)*P(4,2)*Metric(1,2) + P(3,4)*P(4,2)*Metric(1,2) + P(3,1)*P(4,3)*Metric(1,2) + P(2,3)*P(4,1)*Metric(1,3) + P(2,1)*P(4,2)*Metric(1,3) - P(2,1)*P(4,3)*Metric(1,3) + P(2,4)*P(4,3)*Metric(1,3) - P(2,3)*P(3,1)*Metric(1,4) - P(2,1)*P(3,2)*Metric(1,4) - P(2,4)*P(3,2)*Metric(1,4) - P(2,3)*P(3,4)*Metric(1,4) - P(1,2)*P(4,1)*Metric(2,3) - P(1,3)*P(4,1)*Metric(2,3) - P(1,4)*P(4,2)*Metric(2,3) - P(1,4)*P(4,3)*Metric(2,3) + P(-1,1)*P(-1,2)*Metric(1,4)*Metric(2,3) + P(-1,1)*P(-1,3)*Metric(1,4)*Metric(2,3) + P(-1,2)*P(-1,4)*Metric(1,4)*Metric(2,3) + P(-1,3)*P(-1,4)*Metric(1,4)*Metric(2,3) + P(1,2)*P(3,1)*Metric(2,4) + P(1,4)*P(3,2)*Metric(2,4) - P(1,2)*P(3,4)*Metric(2,4) + P(1,3)*P(3,4)*Metric(2,4) - P(-1,1)*P(-1,2)*Metric(1,3)*Metric(2,4) - P(-1,3)*P(-1,4)*Metric(1,3)*Metric(2,4) + P(1,3)*P(2,1)*Metric(3,4) + P(1,4)*P(2,3)*Metric(3,4) + P(1,2)*P(2,4)*Metric(3,4) - P(1,3)*P(2,4)*Metric(3,4) - P(-1,1)*P(-1,3)*Metric(1,2)*Metric(3,4) - P(-1,2)*P(-1,4)*Metric(1,2)*Metric(3,4)')
-
-VVVV14 = Lorentz(name = 'VVVV14',
-                 spins = [ 3, 3, 3, 3 ],
-                 structure = 'P(3,4)*P(4,1)*Metric(1,2) + P(3,4)*P(4,2)*Metric(1,2) + P(3,1)*P(4,3)*Metric(1,2) + P(3,2)*P(4,3)*Metric(1,2) + P(2,3)*P(4,1)*Metric(1,3) - P(2,4)*P(4,1)*Metric(1,3) - P(2,3)*P(4,2)*Metric(1,3) - P(2,1)*P(4,3)*Metric(1,3) - P(2,3)*P(3,1)*Metric(1,4) + P(2,4)*P(3,1)*Metric(1,4) - P(2,4)*P(3,2)*Metric(1,4) - P(2,1)*P(3,4)*Metric(1,4) - P(1,3)*P(4,1)*Metric(2,3) + P(1,3)*P(4,2)*Metric(2,3) - P(1,4)*P(4,2)*Metric(2,3) - P(1,2)*P(4,3)*Metric(2,3) + P(-1,1)*P(-1,3)*Metric(1,4)*Metric(2,3) + P(-1,2)*P(-1,4)*Metric(1,4)*Metric(2,3) - P(1,4)*P(3,1)*Metric(2,4) - P(1,3)*P(3,2)*Metric(2,4) + P(1,4)*P(3,2)*Metric(2,4) - P(1,2)*P(3,4)*Metric(2,4) + P(-1,2)*P(-1,3)*Metric(1,3)*Metric(2,4) + P(-1,1)*P(-1,4)*Metric(1,3)*Metric(2,4) + P(1,3)*P(2,1)*Metric(3,4) + P(1,4)*P(2,1)*Metric(3,4) + P(1,2)*P(2,3)*Metric(3,4) + P(1,2)*P(2,4)*Metric(3,4) - P(-1,1)*P(-1,3)*Metric(1,2)*Metric(3,4) - P(-1,2)*P(-1,3)*Metric(1,2)*Metric(3,4) - P(-1,1)*P(-1,4)*Metric(1,2)*Metric(3,4) - P(-1,2)*P(-1,4)*Metric(1,2)*Metric(3,4)')
+                structure = 'P(3,4)*P(4,1)*Metric(1,2) + P(3,4)*P(4,2)*Metric(1,2) + P(3,1)*P(4,3)*Metric(1,2) + P(3,2)*P(4,3)*Metric(1,2) + P(2,3)*P(4,1)*Metric(1,3) - P(2,4)*P(4,1)*Metric(1,3) - P(2,3)*P(4,2)*Metric(1,3) - P(2,1)*P(4,3)*Metric(1,3) - P(2,3)*P(3,1)*Metric(1,4) + P(2,4)*P(3,1)*Metric(1,4) - P(2,4)*P(3,2)*Metric(1,4) - P(2,1)*P(3,4)*Metric(1,4) - P(1,3)*P(4,1)*Metric(2,3) + P(1,3)*P(4,2)*Metric(2,3) - P(1,4)*P(4,2)*Metric(2,3) - P(1,2)*P(4,3)*Metric(2,3) + P(-1,1)*P(-1,3)*Metric(1,4)*Metric(2,3) + P(-1,2)*P(-1,4)*Metric(1,4)*Metric(2,3) - P(1,4)*P(3,1)*Metric(2,4) - P(1,3)*P(3,2)*Metric(2,4) + P(1,4)*P(3,2)*Metric(2,4) - P(1,2)*P(3,4)*Metric(2,4) + P(-1,2)*P(-1,3)*Metric(1,3)*Metric(2,4) + P(-1,1)*P(-1,4)*Metric(1,3)*Metric(2,4) + P(1,3)*P(2,1)*Metric(3,4) + P(1,4)*P(2,1)*Metric(3,4) + P(1,2)*P(2,3)*Metric(3,4) + P(1,2)*P(2,4)*Metric(3,4) - P(-1,1)*P(-1,3)*Metric(1,2)*Metric(3,4) - P(-1,2)*P(-1,3)*Metric(1,2)*Metric(3,4) - P(-1,1)*P(-1,4)*Metric(1,2)*Metric(3,4) - P(-1,2)*P(-1,4)*Metric(1,2)*Metric(3,4)')
 
 VVVSS1 = Lorentz(name = 'VVVSS1',
                  spins = [ 3, 3, 3, 1, 1 ],
-                 structure = 'Epsilon(1,2,3,-1)*P(-1,1) + Epsilon(1,2,3,-1)*P(-1,2) + Epsilon(1,2,3,-1)*P(-1,4) + Epsilon(1,2,3,-1)*P(-1,5)')
+                 structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,4) + 2*Epsilon(1,2,3,-1)*P(-1,5)')
 
 VVVSS2 = Lorentz(name = 'VVVSS2',
                  spins = [ 3, 3, 3, 1, 1 ],
-                 structure = 'Epsilon(1,2,3,-1)*P(-1,2) + Epsilon(1,2,3,-1)*P(-1,3) + Epsilon(1,2,3,-1)*P(-1,4) + Epsilon(1,2,3,-1)*P(-1,5)')
+                 structure = '2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3) + 2*Epsilon(1,2,3,-1)*P(-1,4) + 2*Epsilon(1,2,3,-1)*P(-1,5)')
 
 VVVSS3 = Lorentz(name = 'VVVSS3',
                  spins = [ 3, 3, 3, 1, 1 ],
-                 structure = 'Epsilon(1,2,3,-1)*P(-1,1) + Epsilon(1,2,3,-1)*P(-1,2) + Epsilon(1,2,3,-1)*P(-1,3) + 3*Epsilon(1,2,3,-1)*P(-1,4) + 3*Epsilon(1,2,3,-1)*P(-1,5)')
+                 structure = '2*Epsilon(1,2,3,-1)*P(-1,1) + 2*Epsilon(1,2,3,-1)*P(-1,2) + 2*Epsilon(1,2,3,-1)*P(-1,3) + 6*Epsilon(1,2,3,-1)*P(-1,4) + 6*Epsilon(1,2,3,-1)*P(-1,5)')
 
 VVVSS4 = Lorentz(name = 'VVVSS4',
                  spins = [ 3, 3, 3, 1, 1 ],

=== modified file 'models/EWdim6/object_library.py'
--- models/EWdim6/object_library.py	2012-06-14 15:45:15 +0000
+++ models/EWdim6/object_library.py	2013-03-04 23:37:19 +0000
@@ -241,19 +241,31 @@
         self.expansion_order = expansion_order
         self.hierarchy = hierarchy
 
-
 all_decays = []
 
-class Decay(object):
-
-    def __init__(self, name, particle, partial_widths):
-        
+class Decay(UFOBaseClass):
+    require_args = ['particle','partial_widths']
+
+    def __init__(self, particle, partial_widths, **opt):
+        args = (particle, partial_widths)
+        UFOBaseClass.__init__(self, *args, **opt)
+
         global all_decays
         all_decays.append(self)
-
-        self.name = name
-        self.particle = particle
-        self.partial_width = partial_widths
-
+    
+        # Add the information directly to the particle
+        particle.partial_widths = partial_widths
+
+all_form_factors = []
+
+class FormFactor(UFOBaseClass):
+    require_args = ['name','type','value']
+
+    def __init__(self, name, type, value, **opt):
+        args = (name, type, value)
+        UFOBaseClass.__init__(self, *args, **opt)
+
+        global all_form_factors
+        all_form_factors.append(self)
 
         

=== modified file 'models/EWdim6/parameters.py'
--- models/EWdim6/parameters.py	2012-06-14 15:45:15 +0000
+++ models/EWdim6/parameters.py	2013-03-04 23:37:19 +0000
@@ -1,13 +1,13 @@
-# This file was automatically created by FeynRules 1.7.9
-# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
-# Date: Fri 18 May 2012 14:43:24
+# This file was automatically created by FeynRules 1.7.127
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 22 Jan 2013 16:20:54
 
 
 
 from object_library import all_parameters, Parameter
 
 
-from function_library import complexconjugate, re, im, csc, sec, acsc, asec
+from function_library import complexconjugate, re, im, csc, sec, acsc, asec, cot
 
 # This is a default parameter object representing 0.
 ZERO = Parameter(name = 'ZERO',
@@ -17,14 +17,6 @@
                  texname = '0')
 
 # User-defined parameters.
-cabi = Parameter(name = 'cabi',
-                 nature = 'external',
-                 type = 'real',
-                 value = 0.227736,
-                 texname = '\\theta _c',
-                 lhablock = 'CKMBLOCK',
-                 lhacode = [ 1 ])
-
 CWWWL2 = Parameter(name = 'CWWWL2',
                    nature = 'external',
                    type = 'real',
@@ -89,37 +81,37 @@
                lhablock = 'SMINPUTS',
                lhacode = [ 3 ])
 
-ymdo = Parameter(name = 'ymdo',
-                 nature = 'external',
-                 type = 'real',
-                 value = 0.00504,
-                 texname = '\\text{ymdo}',
-                 lhablock = 'YUKAWA',
-                 lhacode = [ 1 ])
-
-ymup = Parameter(name = 'ymup',
-                 nature = 'external',
-                 type = 'real',
-                 value = 0.0025499999999999997,
-                 texname = '\\text{ymup}',
-                 lhablock = 'YUKAWA',
-                 lhacode = [ 2 ])
-
-yms = Parameter(name = 'yms',
-                nature = 'external',
-                type = 'real',
-                value = 0.101,
-                texname = '\\text{yms}',
-                lhablock = 'YUKAWA',
-                lhacode = [ 3 ])
-
-ymc = Parameter(name = 'ymc',
-                nature = 'external',
-                type = 'real',
-                value = 1.27,
-                texname = '\\text{ymc}',
-                lhablock = 'YUKAWA',
-                lhacode = [ 4 ])
+lamWS = Parameter(name = 'lamWS',
+                  nature = 'external',
+                  type = 'real',
+                  value = 0,
+                  texname = '\\text{lamWS}',
+                  lhablock = 'Wolfenstein',
+                  lhacode = [ 1 ])
+
+AWS = Parameter(name = 'AWS',
+                nature = 'external',
+                type = 'real',
+                value = 0,
+                texname = '\\text{AWS}',
+                lhablock = 'Wolfenstein',
+                lhacode = [ 2 ])
+
+rhoWS = Parameter(name = 'rhoWS',
+                  nature = 'external',
+                  type = 'real',
+                  value = 0,
+                  texname = '\\text{rhoWS}',
+                  lhablock = 'Wolfenstein',
+                  lhacode = [ 3 ])
+
+etaWS = Parameter(name = 'etaWS',
+                  nature = 'external',
+                  type = 'real',
+                  value = 0,
+                  texname = '\\text{etaWS}',
+                  lhablock = 'Wolfenstein',
+                  lhacode = [ 4 ])
 
 ymb = Parameter(name = 'ymb',
                 nature = 'external',
@@ -137,22 +129,6 @@
                 lhablock = 'YUKAWA',
                 lhacode = [ 6 ])
 
-yme = Parameter(name = 'yme',
-                nature = 'external',
-                type = 'real',
-                value = 0.0005110000000000001,
-                texname = '\\text{yme}',
-                lhablock = 'YUKAWA',
-                lhacode = [ 11 ])
-
-ymm = Parameter(name = 'ymm',
-                nature = 'external',
-                type = 'real',
-                value = 0.10566,
-                texname = '\\text{ymm}',
-                lhablock = 'YUKAWA',
-                lhacode = [ 13 ])
-
 ymtau = Parameter(name = 'ymtau',
                   nature = 'external',
                   type = 'real',
@@ -161,46 +137,6 @@
                   lhablock = 'YUKAWA',
                   lhacode = [ 15 ])
 
-Me = Parameter(name = 'Me',
-               nature = 'external',
-               type = 'real',
-               value = 0.0005110000000000001,
-               texname = '\\text{Me}',
-               lhablock = 'MASS',
-               lhacode = [ 11 ])
-
-MM = Parameter(name = 'MM',
-               nature = 'external',
-               type = 'real',
-               value = 0.10566,
-               texname = '\\text{MM}',
-               lhablock = 'MASS',
-               lhacode = [ 13 ])
-
-MTA = Parameter(name = 'MTA',
-                nature = 'external',
-                type = 'real',
-                value = 1.777,
-                texname = '\\text{MTA}',
-                lhablock = 'MASS',
-                lhacode = [ 15 ])
-
-MU = Parameter(name = 'MU',
-               nature = 'external',
-               type = 'real',
-               value = 0.0025499999999999997,
-               texname = 'M',
-               lhablock = 'MASS',
-               lhacode = [ 2 ])
-
-MC = Parameter(name = 'MC',
-               nature = 'external',
-               type = 'real',
-               value = 1.42,
-               texname = '\\text{MC}',
-               lhablock = 'MASS',
-               lhacode = [ 4 ])
-
 MT = Parameter(name = 'MT',
                nature = 'external',
                type = 'real',
@@ -209,22 +145,6 @@
                lhablock = 'MASS',
                lhacode = [ 6 ])
 
-MD = Parameter(name = 'MD',
-               nature = 'external',
-               type = 'real',
-               value = 0.00504,
-               texname = '\\text{MD}',
-               lhablock = 'MASS',
-               lhacode = [ 1 ])
-
-MS = Parameter(name = 'MS',
-               nature = 'external',
-               type = 'real',
-               value = 0.101,
-               texname = '\\text{MS}',
-               lhablock = 'MASS',
-               lhacode = [ 3 ])
-
 MB = Parameter(name = 'MB',
                nature = 'external',
                type = 'real',
@@ -249,6 +169,14 @@
                lhablock = 'MASS',
                lhacode = [ 25 ])
 
+MTA = Parameter(name = 'MTA',
+                nature = 'external',
+                type = 'real',
+                value = 1.777,
+                texname = '\\text{MTA}',
+                lhablock = 'MASS',
+                lhacode = [ 15 ])
+
 WT = Parameter(name = 'WT',
                nature = 'external',
                type = 'real',
@@ -281,64 +209,60 @@
                lhablock = 'DECAY',
                lhacode = [ 25 ])
 
-aEW = Parameter(name = 'aEW',
-                nature = 'internal',
-                type = 'real',
-                value = '1/aEWM1',
-                texname = '\\text{aEW}')
-
-G = Parameter(name = 'G',
-              nature = 'internal',
-              type = 'real',
-              value = '2*cmath.sqrt(aS)*cmath.sqrt(cmath.pi)',
-              texname = 'G')
+WTau = Parameter(name = 'WTau',
+                 nature = 'external',
+                 type = 'real',
+                 value = 2.27e-12,
+                 texname = '\\text{WTau}',
+                 lhablock = 'DECAY',
+                 lhacode = [ 15 ])
 
 CKM1x1 = Parameter(name = 'CKM1x1',
                    nature = 'internal',
                    type = 'complex',
-                   value = 'cmath.cos(cabi)',
+                   value = '1 - lamWS**2/2.',
                    texname = '\\text{CKM1x1}')
 
 CKM1x2 = Parameter(name = 'CKM1x2',
                    nature = 'internal',
                    type = 'complex',
-                   value = 'cmath.sin(cabi)',
+                   value = 'lamWS',
                    texname = '\\text{CKM1x2}')
 
 CKM1x3 = Parameter(name = 'CKM1x3',
                    nature = 'internal',
                    type = 'complex',
-                   value = '0',
+                   value = 'AWS*lamWS**3*(-(etaWS*complex(0,1)) + rhoWS)',
                    texname = '\\text{CKM1x3}')
 
 CKM2x1 = Parameter(name = 'CKM2x1',
                    nature = 'internal',
                    type = 'complex',
-                   value = '-cmath.sin(cabi)',
+                   value = '-lamWS',
                    texname = '\\text{CKM2x1}')
 
 CKM2x2 = Parameter(name = 'CKM2x2',
                    nature = 'internal',
                    type = 'complex',
-                   value = 'cmath.cos(cabi)',
+                   value = '1 - lamWS**2/2.',
                    texname = '\\text{CKM2x2}')
 
 CKM2x3 = Parameter(name = 'CKM2x3',
                    nature = 'internal',
                    type = 'complex',
-                   value = '0',
+                   value = 'AWS*lamWS**2',
                    texname = '\\text{CKM2x3}')
 
 CKM3x1 = Parameter(name = 'CKM3x1',
                    nature = 'internal',
                    type = 'complex',
-                   value = '0',
+                   value = 'AWS*lamWS**3*(1 - etaWS*complex(0,1) - rhoWS)',
                    texname = '\\text{CKM3x1}')
 
 CKM3x2 = Parameter(name = 'CKM3x2',
                    nature = 'internal',
                    type = 'complex',
-                   value = '0',
+                   value = '-(AWS*lamWS**2)',
                    texname = '\\text{CKM3x2}')
 
 CKM3x3 = Parameter(name = 'CKM3x3',
@@ -347,6 +271,18 @@
                    value = '1',
                    texname = '\\text{CKM3x3}')
 
+aEW = Parameter(name = 'aEW',
+                nature = 'internal',
+                type = 'real',
+                value = '1/aEWM1',
+                texname = '\\text{aEW}')
+
+G = Parameter(name = 'G',
+              nature = 'internal',
+              type = 'real',
+              value = '2*cmath.sqrt(aS)*cmath.sqrt(cmath.pi)',
+              texname = 'G')
+
 MW = Parameter(name = 'MW',
                nature = 'internal',
                type = 'real',
@@ -407,36 +343,6 @@
                value = '(ymb*cmath.sqrt(2))/v',
                texname = '\\text{yb}')
 
-yc = Parameter(name = 'yc',
-               nature = 'internal',
-               type = 'real',
-               value = '(ymc*cmath.sqrt(2))/v',
-               texname = '\\text{yc}')
-
-ydo = Parameter(name = 'ydo',
-                nature = 'internal',
-                type = 'real',
-                value = '(ymdo*cmath.sqrt(2))/v',
-                texname = '\\text{ydo}')
-
-ye = Parameter(name = 'ye',
-               nature = 'internal',
-               type = 'real',
-               value = '(yme*cmath.sqrt(2))/v',
-               texname = '\\text{ye}')
-
-ym = Parameter(name = 'ym',
-               nature = 'internal',
-               type = 'real',
-               value = '(ymm*cmath.sqrt(2))/v',
-               texname = '\\text{ym}')
-
-ys = Parameter(name = 'ys',
-               nature = 'internal',
-               type = 'real',
-               value = '(yms*cmath.sqrt(2))/v',
-               texname = '\\text{ys}')
-
 yt = Parameter(name = 'yt',
                nature = 'internal',
                type = 'real',
@@ -449,12 +355,6 @@
                  value = '(ymtau*cmath.sqrt(2))/v',
                  texname = '\\text{ytau}')
 
-yup = Parameter(name = 'yup',
-                nature = 'internal',
-                type = 'real',
-                value = '(ymup*cmath.sqrt(2))/v',
-                texname = '\\text{yup}')
-
 muH = Parameter(name = 'muH',
                 nature = 'internal',
                 type = 'real',

=== modified file 'models/EWdim6/particles.py'
--- models/EWdim6/particles.py	2012-06-14 15:45:15 +0000
+++ models/EWdim6/particles.py	2013-03-04 23:37:19 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.9
-# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
-# Date: Fri 18 May 2012 14:43:24
+# This file was automatically created by FeynRules 1.7.127
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 22 Jan 2013 16:20:54
 
 
 from __future__ import division
@@ -52,57 +52,12 @@
 
 vt__tilde__ = vt.anti()
 
-e__minus__ = Particle(pdg_code = 11,
-                      name = 'e-',
-                      antiname = 'e+',
-                      spin = 2,
-                      color = 1,
-                      mass = Param.Me,
-                      width = Param.ZERO,
-                      texname = 'e-',
-                      antitexname = 'e+',
-                      charge = -1,
-                      GhostNumber = 0,
-                      LeptonNumber = 1)
-
-e__plus__ = e__minus__.anti()
-
-m__minus__ = Particle(pdg_code = 13,
-                      name = 'm-',
-                      antiname = 'm+',
-                      spin = 2,
-                      color = 1,
-                      mass = Param.MM,
-                      width = Param.ZERO,
-                      texname = 'm-',
-                      antitexname = 'm+',
-                      charge = -1,
-                      GhostNumber = 0,
-                      LeptonNumber = 1)
-
-m__plus__ = m__minus__.anti()
-
-tt__minus__ = Particle(pdg_code = 15,
-                       name = 'tt-',
-                       antiname = 'tt+',
-                       spin = 2,
-                       color = 1,
-                       mass = Param.MTA,
-                       width = Param.ZERO,
-                       texname = 'tt-',
-                       antitexname = 'tt+',
-                       charge = -1,
-                       GhostNumber = 0,
-                       LeptonNumber = 1)
-
-tt__plus__ = tt__minus__.anti()
-
 u = Particle(pdg_code = 2,
              name = 'u',
              antiname = 'u~',
              spin = 2,
              color = 3,
-             mass = Param.MU,
+             mass = Param.ZERO,
              width = Param.ZERO,
              texname = 'u',
              antitexname = 'u~',
@@ -117,7 +72,7 @@
              antiname = 'c~',
              spin = 2,
              color = 3,
-             mass = Param.MC,
+             mass = Param.ZERO,
              width = Param.ZERO,
              texname = 'c',
              antitexname = 'c~',
@@ -147,7 +102,7 @@
              antiname = 'd~',
              spin = 2,
              color = 3,
-             mass = Param.MD,
+             mass = Param.ZERO,
              width = Param.ZERO,
              texname = 'd',
              antitexname = 'd~',
@@ -162,7 +117,7 @@
              antiname = 's~',
              spin = 2,
              color = 3,
-             mass = Param.MS,
+             mass = Param.ZERO,
              width = Param.ZERO,
              texname = 's',
              antitexname = 's~',
@@ -359,3 +314,48 @@
 
 phi__minus__ = phi__plus__.anti()
 
+e__minus__ = Particle(pdg_code = 11,
+                      name = 'e-',
+                      antiname = 'e+',
+                      spin = 2,
+                      color = 1,
+                      mass = Param.ZERO,
+                      width = Param.ZERO,
+                      texname = 'e-',
+                      antitexname = 'e+',
+                      charge = -1,
+                      GhostNumber = 0,
+                      LeptonNumber = 1)
+
+e__plus__ = e__minus__.anti()
+
+m__minus__ = Particle(pdg_code = 13,
+                      name = 'm-',
+                      antiname = 'm+',
+                      spin = 2,
+                      color = 1,
+                      mass = Param.ZERO,
+                      width = Param.ZERO,
+                      texname = 'm-',
+                      antitexname = 'm+',
+                      charge = -1,
+                      GhostNumber = 0,
+                      LeptonNumber = 1)
+
+m__plus__ = m__minus__.anti()
+
+tt__minus__ = Particle(pdg_code = 15,
+                       name = 'tt-',
+                       antiname = 'tt+',
+                       spin = 2,
+                       color = 1,
+                       mass = Param.MTA,
+                       width = Param.WTau,
+                       texname = 'tt-',
+                       antitexname = 'tt+',
+                       charge = -1,
+                       GhostNumber = 0,
+                       LeptonNumber = 1)
+
+tt__plus__ = tt__minus__.anti()
+

=== modified file 'models/EWdim6/vertices.py'
--- models/EWdim6/vertices.py	2012-06-14 15:45:15 +0000
+++ models/EWdim6/vertices.py	2013-03-04 23:37:19 +0000
@@ -1,6 +1,6 @@
-# This file was automatically created by FeynRules 1.7.9
-# Mathematica version: 8.0 for Linux x86 (64-bit) (February 23, 2011)
-# Date: Fri 18 May 2012 14:43:24
+# This file was automatically created by FeynRules 1.7.127
+# Mathematica version: 8.0 for Mac OS X x86 (64-bit) (November 6, 2010)
+# Date: Tue 22 Jan 2013 16:20:54
 
 
 from object_library import all_vertices, Vertex
@@ -12,26 +12,26 @@
 V_1 = Vertex(name = 'V_1',
              particles = [ P.H, P.H, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.SSSS2 ],
+             lorentz = [ L.SSSS1 ],
              couplings = {(0,0):C.GC_31})
 
 V_2 = Vertex(name = 'V_2',
              particles = [ P.H, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.SSS2 ],
+             lorentz = [ L.SSS1 ],
              couplings = {(0,0):C.GC_95})
 
 V_3 = Vertex(name = 'V_3',
              particles = [ P.A, P.A, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VVSS12, L.VVSS6 ],
-             couplings = {(0,0):C.GC_83,(0,1):C.GC_82})
+             lorentz = [ L.VVSS3, L.VVSS9 ],
+             couplings = {(0,1):C.GC_83,(0,0):C.GC_82})
 
 V_4 = Vertex(name = 'V_4',
              particles = [ P.A, P.A, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VVS11, L.VVS7 ],
-             couplings = {(0,0):C.GC_123,(0,1):C.GC_122})
+             lorentz = [ L.VVS4, L.VVS9 ],
+             couplings = {(0,1):C.GC_123,(0,0):C.GC_122})
 
 V_5 = Vertex(name = 'V_5',
              particles = [ P.A, P.H, P.H ],
@@ -42,62 +42,62 @@
 V_6 = Vertex(name = 'V_6',
              particles = [ P.A, P.W__minus__, P.W__plus__ ],
              color = [ '1' ],
-             lorentz = [ L.VVV10, L.VVV11, L.VVV12, L.VVV13, L.VVV5, L.VVV6, L.VVV7 ],
-             couplings = {(0,5):C.GC_113,(0,4):C.GC_105,(0,2):C.GC_57,(0,3):C.GC_55,(0,0):[ C.GC_47, C.GC_114 ],(0,6):C.GC_104,(0,1):C.GC_106})
+             lorentz = [ L.VVV10, L.VVV2, L.VVV3, L.VVV4, L.VVV7, L.VVV8, L.VVV9 ],
+             couplings = {(0,2):C.GC_113,(0,1):C.GC_105,(0,6):C.GC_57,(0,0):C.GC_55,(0,4):[ C.GC_47, C.GC_114 ],(0,3):C.GC_104,(0,5):C.GC_106})
 
 V_7 = Vertex(name = 'V_7',
-             particles = [ P.W__minus__, P.W__plus__, P.Z ],
+             particles = [ P.A, P.Z, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VVV10, L.VVV12, L.VVV13, L.VVV4, L.VVV6, L.VVV8, L.VVV9 ],
-             couplings = {(0,4):C.GC_107,(0,3):C.GC_111,(0,1):C.GC_20,(0,2):C.GC_18,(0,0):[ C.GC_7, C.GC_108 ],(0,5):C.GC_112,(0,6):C.GC_110})
+             lorentz = [ L.VVSS1, L.VVSS2, L.VVSS3, L.VVSS7, L.VVSS8, L.VVSS9 ],
+             couplings = {(0,3):C.GC_81,(0,5):C.GC_76,(0,4):C.GC_80,(0,2):C.GC_50,(0,0):C.GC_65,(0,1):C.GC_9})
 
 V_8 = Vertex(name = 'V_8',
-             particles = [ P.A, P.Z, P.H, P.H ],
+             particles = [ P.A, P.Z, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VVSS10, L.VVSS11, L.VVSS12, L.VVSS5, L.VVSS6, L.VVSS7 ],
-             couplings = {(0,0):C.GC_81,(0,2):C.GC_76,(0,1):C.GC_80,(0,4):C.GC_50,(0,3):C.GC_65,(0,5):C.GC_9})
+             lorentz = [ L.VVS1, L.VVS3, L.VVS4, L.VVS7, L.VVS8, L.VVS9 ],
+             couplings = {(0,3):C.GC_121,(0,5):C.GC_116,(0,4):C.GC_120,(0,2):C.GC_97,(0,0):C.GC_103,(0,1):C.GC_86})
 
 V_9 = Vertex(name = 'V_9',
-             particles = [ P.A, P.Z, P.H ],
+             particles = [ P.Z, P.H, P.H ],
              color = [ '1' ],
-             lorentz = [ L.VVS10, L.VVS11, L.VVS5, L.VVS6, L.VVS7, L.VVS9 ],
-             couplings = {(0,5):C.GC_121,(0,1):C.GC_116,(0,0):C.GC_120,(0,4):C.GC_97,(0,2):C.GC_103,(0,3):C.GC_86})
+             lorentz = [ L.VSS1 ],
+             couplings = {(0,0):C.GC_8})
 
 V_10 = Vertex(name = 'V_10',
-              particles = [ P.Z, P.H, P.H ],
+              particles = [ P.W__minus__, P.W__plus__, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.VSS1 ],
-              couplings = {(0,0):C.GC_8})
+              lorentz = [ L.VVV1, L.VVV10, L.VVV3, L.VVV5, L.VVV6, L.VVV7, L.VVV9 ],
+              couplings = {(0,2):C.GC_107,(0,0):C.GC_111,(0,6):C.GC_20,(0,1):C.GC_18,(0,5):[ C.GC_7, C.GC_108 ],(0,3):C.GC_112,(0,4):C.GC_110})
 
 V_11 = Vertex(name = 'V_11',
               particles = [ P.ghG, P.ghG__tilde__, P.G ],
-              color = [ 'f(3,1,2)' ],
-              lorentz = [ L.UUV2 ],
+              color = [ 'f(1,2,3)' ],
+              lorentz = [ L.UUV1 ],
               couplings = {(0,0):C.GC_4})
 
 V_12 = Vertex(name = 'V_12',
               particles = [ P.G, P.G, P.G ],
               color = [ 'f(1,2,3)' ],
-              lorentz = [ L.VVV10 ],
+              lorentz = [ L.VVV7 ],
               couplings = {(0,0):C.GC_4})
 
 V_13 = Vertex(name = 'V_13',
               particles = [ P.G, P.G, P.G, P.G ],
               color = [ 'f(-1,1,2)*f(3,4,-1)', 'f(-1,1,3)*f(2,4,-1)', 'f(-1,1,4)*f(2,3,-1)' ],
-              lorentz = [ L.VVVV10, L.VVVV11, L.VVVV6 ],
-              couplings = {(1,0):C.GC_6,(0,2):C.GC_6,(2,1):C.GC_6})
+              lorentz = [ L.VVVV1, L.VVVV5, L.VVVV6 ],
+              couplings = {(1,1):C.GC_6,(0,0):C.GC_6,(2,2):C.GC_6})
 
 V_14 = Vertex(name = 'V_14',
               particles = [ P.A, P.A, P.W__minus__, P.W__plus__ ],
               color = [ '1' ],
-              lorentz = [ L.VVVV14, L.VVVV7, L.VVVV9 ],
-              couplings = {(0,1):C.GC_67,(0,0):C.GC_68,(0,2):[ C.GC_66, C.GC_128 ]})
+              lorentz = [ L.VVVV2, L.VVVV4, L.VVVV9 ],
+              couplings = {(0,0):C.GC_67,(0,2):C.GC_68,(0,1):[ C.GC_66, C.GC_128 ]})
 
 V_15 = Vertex(name = 'V_15',
               particles = [ P.A, P.W__minus__, P.W__plus__, P.Z ],
               color = [ '1' ],
-              lorentz = [ L.VVVV12, L.VVVV13, L.VVVV8 ],
-              couplings = {(0,2):C.GC_58,(0,1):C.GC_59,(0,0):[ C.GC_49, C.GC_127 ]})
+              lorentz = [ L.VVVV3, L.VVVV7, L.VVVV8 ],
+              couplings = {(0,0):C.GC_58,(0,2):C.GC_59,(0,1):[ C.GC_49, C.GC_127 ]})
 
 V_16 = Vertex(name = 'V_16',
               particles = [ P.A, P.W__minus__, P.W__plus__, P.H, P.H ],
@@ -108,20 +108,20 @@
 V_17 = Vertex(name = 'V_17',
               particles = [ P.A, P.W__minus__, P.W__plus__, P.H ],
               color = [ '1' ],
-              lorentz = [ L.VVVS10, L.VVVS5, L.VVVS6, L.VVVS7, L.VVVS9 ],
-              couplings = {(0,2):C.GC_101,(0,1):C.GC_90,(0,3):C.GC_89,(0,4):C.GC_102,(0,0):C.GC_91})
+              lorentz = [ L.VVVS2, L.VVVS3, L.VVVS4, L.VVVS6, L.VVVS7 ],
+              couplings = {(0,1):C.GC_101,(0,0):C.GC_90,(0,2):C.GC_89,(0,3):C.GC_102,(0,4):C.GC_91})