Merge lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling into lp:~maddevelopers/mg5amcnlo/2.3.4

[Rikkert Frederix]

Allow for multiple scale and PDF reweighting via the run_card.dat for NLO runs. Both for fixed order and matching to parton shower. Input is by putting lists for the following parameters in the run_card.

lhaid
dynamical_scale_choice
reweight_PDF
reweight_scale

Also, instead of just a single factor up and down, also there can be given a list of values using

rw_rscale
rw_fscale

I've linked the python interface of lhapdf6 to the MG5_aMC code and forced this when trying to compute PDF uncertainties from the reweighted event weights. This means that for lhapdf5 (or when 'import lhapdf' did not work for whatever reason) you'll not get automatically the PDF uncertainties printed to the screen. Of course you do still get all the weights in the events or plots. I think this is okay; the automatic computation we had before became unmaintainable, because every time a new PDF set came out, the way of computing the uncertainties needed updating. Better to give no number than a wrong number.

@ Olivier. There is a bit of a dirty trick in common_run_interface (line 534-643) to include the NAME of the pdf set (when using LHAPDF) to the run_card.inc (instead of only the lhaid number). We need the name before going to the fortran code, because there is no way to load multiple PDF sets at once with only the lhaid numbers. This than also leads to an ugly trick in banner.py (line 1474-1475). I couldn't really figure out a way of doing this properly. Maybe you know?

@ Valentin. Please have a look particularly at the changes in the histograms.py file. Getting the correct colours for each of the curves has become a bit of a mess. In any case, the plots quickly become unreadable when including multiple scales and PDFs. Not sure if there is a better way of plotting things. Maybe a separate inset for each of the scales and PDFs? ---Although, maybe this can wait.

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

334. By Rikkert Frederix on 2016-02-19

following Stefano's comments, improved the description in the run_card.dat

[Valentin Hirschi (valentin-hirschi)]

Hi Rik,

This is a nice improvement. Here are my comments on the functionalities:

a) It would be nice to be able to define the list with a python syntax like
    range(10)
    [1,2,3]
    [a for a in range(100) if a%2!=0]
   This can simply be done with an 'eval' statement, and Olivier agreed to do it.
   So I just wrote that here for reference.

b) The default entry and text for the parameter 'reweight_PDF' and 'reweight_scale' is not very clear, especially because in fact they should now read ('consider_PDF_variation' and 'consider_scale_variation') but we cannot afford to change the name.
Also the stressing the fact that it should be a list *of booleans* should help.
So all in all, I simply suggest to change it by stressing 'booleans' and using the keyword 'variations' instead of 'dependence' which I think is clearer for most people (but I might be wrong).

True = reweight_scale ! Reweight to get scale variations using the
             ! rw_rscale and rw_fscale factors. Should be a list of booleans
             ! of length equal to that of the parameter 'dynamical_scale_choice'
             ! specifying which scales to include in the variation.

and similarly for 'reweight_PDF'.

Also, how can one pick several fixed scales? Is there no other way than modifying the code so as to add additional 'fake dynamical' scales which always return a constant one?

c) When using built-in pdfs, if I have a list defined for lhaid and reweight_PDF (with all reweight_PDF set to False) then the code crashes, which is bit annoying.

d) When doing a fixed order analysis, with two PDF sets and only the second of which has the PDF variations computed, then the plotting fails with:

RuntimeError : Error in LHAPDF::PDFSet::uncertainty. Input vector must contain values for all PDF members.
Please report this bug on https://bugs.launchpad.net/madgraph5
More information is found in '/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/PROCNLO_loop_sm_0/run_06_tag_1_debug.log'.
Please attach this file to your report.

d) Otherwise the various runs I did went through fine and I really love the summary printout.
It is very clean. So now that you seem to have streamlined the mapping of the lhaid to the pdfset name, would it be considerable to be able to input the pdfset name instead of its lhaid in the run_card? (just an idea, of course not worth it if not trivial to do).

e) In the context of the PY8 merging systematics branch we talked with Stefan and thought it would be nice to add the 'name' attribute to the XML tag 'weightid' which would dictate the name that this weight will have in the hepmc file (following v3 standards).
We could consider to take the opportunity of this branch to add this here. If you agree, then we should follow the ongoing unofficial convention on how to name the weights of different PDF and scales so that analysis tools like Rivets an other can directly parse it.

Finally, the plots look good, nice work. However, the problem is that I have myself been working quite a lot on histograms.py in the PY8 branch (I used it to automatically generate the DJR plots for different merging scales as part of the systematics study. Btw, I also m...

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

335. By Rikkert Frederix on 2016-02-21

fixed a couple of things following Valentin's suggestions

[Rikkert Frederix (frederix)]

Hi Valentin,

Thanks for the review!

> a) It would be nice to be able to define the list with a python syntax like
> range(10)
> [1,2,3]
> [a for a in range(100) if a%2!=0]
> This can simply be done with an 'eval' statement, and Olivier agreed to do
> it.
> So I just wrote that here for reference.
>

I would be kind of against this. This might be *very* unsafe when allowing users to upload a run_card for on-line running. Also, it's not at all obvious to the user why (s)he is allowed to use python syntax in a run_card. And, in general, these will not be very long lists that something like range(..) will be necessary.

> b) The default entry and text for the parameter 'reweight_PDF' and
> 'reweight_scale' is not very clear, especially because in fact they should now
> read ('consider_PDF_variation' and 'consider_scale_variation') but we cannot
> afford to change the name.
> Also the stressing the fact that it should be a list *of booleans* should
> help.
> So all in all, I simply suggest to change it by stressing 'booleans' and using
> the keyword 'variations' instead of 'dependence' which I think is clearer for
> most people (but I might be wrong).
>
> True = reweight_scale ! Reweight to get scale variations using the
> ! rw_rscale and rw_fscale factors. Should be a list of booleans
> ! of length equal to that of the parameter
> 'dynamical_scale_choice'
> ! specifying which scales to include in the variation.
>
> and similarly for 'reweigh_PDF'.

Done.

>
> Also, how can one pick several fixed scales? Is there no other way than
> modifying the code so as to add additional 'fake dynamical' scales which
> always return a constant one?

That's the only way. I don't think there is a clear way to do this via a run_card.

> c) When using built-in pdfs, if I have a list defined for lhaid and
> reweight_PDF (with all reweight_PDF set to False) then the code crashes, which
> is bit annoying.

Fixed.

>
> d) When doing a fixed order analysis, with two PDF sets and only the second of
> which has the PDF variations computed, then the plotting fails with:
>
> RuntimeError : Error in LHAPDF::PDFSet::uncertainty. Input vector must contain
> values for all PDF members.
> Please report this bug on https://bugs.launchpad.net/madgraph5
> More information is found in '/Users/valentin/Documents/Work/MG5/improved_scal
> e_pdf_handling/PROCNLO_loop_sm_0/run_06_tag_1_debug.log'.
> Please attach this file to your report.

Fixed.

>
> d) Otherwise the various runs I did went through fine and I really love the
> summary printout.
> It is very clean. So now that you seem to have streamlined the mapping of the
> lhaid to the pdfset name, would it be considerable to be able to input the
> pdfset name instead of its lhaid in the run_card? (just an idea, of course not
> worth it if not trivial to do).

Well, according to Olivier, it's rather tricky to have a list of strings correctly interpreted in the run_card.dat. Therefore, maybe for a future version...

>
> e) In the context of the PY8 merging systematics branch we talked with Stefan
> and thought it would be nice to add the 'name' attribute to the XML ta...

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

336. By Rikkert Frederix on 2016-02-22

changed madgraph5 to mg5amcnlo in the launchpad paths when an error occurs

337. By Rikkert Frederix on 2016-02-22

Improved the warning message if the python interface of lhapdf6 could
not be found/imported.

[Valentin Hirschi (valentin-hirschi)]

Hi Rik,

On Sun, Feb 21, 2016 at 2:36 AM, Rikkert Frederix <email address hidden>
wrote:

> Hi Valentin,
>
> Thanks for the review!
>
> > a) It would be nice to be able to define the list with a python syntax
> like
> > range(10)
> > [1,2,3]
> > [a for a in range(100) if a%2!=0]
> > This can simply be done with an 'eval' statement, and Olivier agreed
> to do
> > it.
> > So I just wrote that here for reference.
> >
>
> I would be kind of against this. This might be *very* unsafe when allowing
> users to upload a run_card for on-line running. Also, it's not at all
> obvious to the user why (s)he is allowed to use python syntax in a
> run_card. And, in general, these will not be very long lists that something
> like range(..) will be necessary.

This is very true! A really dangerous potential code-injection security
liability there!
This could be handled correctly by the WebInterface mother so that the
python syntax would be forbidden only for the web runs, but I agree that it
is probably not worth the trouble.
We already have the possibility of using the python syntax for defining the
model scans in the param card (where it is much more useful there than in
this case, I agree), so Olivier, did you make sure that this is forbidden
when running on the Web ?

>
>
> > b) The default entry and text for the parameter 'reweight_PDF' and
> > 'reweight_scale' is not very clear, especially because in fact they
> should now
> > read ('consider_PDF_variation' and 'consider_scale_variation') but we
> cannot
> > afford to change the name.
> > Also the stressing the fact that it should be a list *of booleans* should
> > help.
> > So all in all, I simply suggest to change it by stressing 'booleans' and
> using
> > the keyword 'variations' instead of 'dependence' which I think is
> clearer for
> > most people (but I might be wrong).
> >
> > True = reweight_scale ! Reweight to get scale variations using the
> > ! rw_rscale and rw_fscale factors. Should be a list of
> booleans
> > ! of length equal to that of the parameter
> > 'dynamical_scale_choice'
> > ! specifying which scales to include in the variation.
> >
> > and similarly for 'reweigh_PDF'.
>
> Done.
>
> >
> > Also, how can one pick several fixed scales? Is there no other way than
> > modifying the code so as to add additional 'fake dynamical' scales which
> > always return a constant one?
>
> That's the only way. I don't think there is a clear way to do this via a
> run_card.

I thought so but it is a bit annoying I think because it is quite a common
thing to do.
I can see a couple ways of doing it elegantly but they all break backward
compatibility.
The only acceptable (from a user poitn of view) backward compatible way of
doing it that I can see is to promote the following run_card parameters:

muR_ref_fixed
muF_ref_fixed
muR_over_ref
muF_over_ref

to be lists of equal lengths as well.
Then 'fixed_ren_scale' and 'fixed_fac_scale' would apply only if the
corresponding entry is of length one. (i.e. lists would always be
considered no matter what).

Unfortunately, it might be too complicated to implement for what it is
worth; you are the bette...

[Rikkert Frederix (frederix)]

Hi Valentin,

>
> I thought so but it is a bit annoying I think because it is quite a common
> thing to do.
> I can see a couple ways of doing it elegantly but they all break backward
> compatibility.
> The only acceptable (from a user poitn of view) backward compatible way of
> doing it that I can see is to promote the following run_card parameters:
>
> muR_ref_fixed
> muF_ref_fixed
> muR_over_ref
> muF_over_ref
>
> to be lists of equal lengths as well.
> Then 'fixed_ren_scale' and 'fixed_fac_scale' would apply only if the
> corresponding entry is of length one. (i.e. lists would always be
> considered no matter what).
>
> Unfortunately, it might be too complicated to implement for what it is
> worth; you are the better judge there.

I think it's too much hassle.

>
> Speaking of the above, did you check everything works fine if you set
> 'fixed_ren_scale' to 'True' but 'fixed_fac_scale' to 'False' with a list of
> dynamical scales?
>
>

I'll double check what the code does in this case. I don't think this is covered correctly.

> What I meant is that, right now the weightid declaration reads:
>
> <weight id='1001'> muR=0.10000E+01 muF=0.10000E+01 </weight>
>
> and it could read
>
> <weight id='1001' name='NAME_OF_THE_WEIGHT_TO_APPEAR_IN_THE_HEP_MC_FILE'>
> muR=0.10000E+01 muF=0.10000E+01 </weight>
>
> where 'NAME_OF_THE_WEIGHT_TO_APPEAR_IN_THE_HEP_MC_FILE' would follow some
> ongoing convention we have with the various analysis tools out there.
> Using the content of this XML tag instead a 'name' attribute like above is
> not ideal because one should be able to put whatever he/she wants there
> (i.e. Olivier puts [or at least planned to] a diff of two param_cards in
> there in his reweighting for example).

This is not following the LHEF v3 standards. The name of the id is the actual "muR=0.10000E+01 muF=0.10000E+01" string. I don't think there is a need to define another one. Of course, we can enlarge it and give it a nice name, but I would suggest to put this string directly in the HepMC file, possibly concatenated with the 'name=' string of the weightgroup to which the weight belongs. But let's discuss this also over Skype. See also here:
https://phystev.cnrs.fr/wiki/2013:groups:tools_lheextension

> Yes, like I said in my other email, if you can make it on wednesday
> morning, 7:45 Munich time, it would work better for me. Let me know.
>

Wednesday morning is okay for me.

Cheers,
Rik

[Valentin Hirschi (valentin-hirschi)]

Hi Rik,

> Hi Valentin,
>
> >
> > I thought so but it is a bit annoying I think because it is quite a common
> > thing to do.
> > I can see a couple ways of doing it elegantly but they all break backward
> > compatibility.
> > The only acceptable (from a user poitn of view) backward compatible way of
> > doing it that I can see is to promote the following run_card parameters:
> >
> > muR_ref_fixed
> > muF_ref_fixed
> > muR_over_ref
> > muF_over_ref
> >
> > to be lists of equal lengths as well.
> > Then 'fixed_ren_scale' and 'fixed_fac_scale' would apply only if the
> > corresponding entry is of length one. (i.e. lists would always be
> > considered no matter what).
> >
> > Unfortunately, it might be too complicated to implement for what it is
> > worth; you are the better judge there.
>
> I think it's too much hassle.

I understand. Then maybe just update set_scales.f to add an example of dynamic scale which is a 'fake fixed one' with a short comment on the run_card regarding its existence for simultaneously considering several fixed scales. I would find it nice, but up to you.

> >
> > Speaking of the above, did you check everything works fine if you set
> > 'fixed_ren_scale' to 'True' but 'fixed_fac_scale' to 'False' with a list of
> > dynamical scales?
> >
> >
>
> I'll double check what the code does in this case. I don't think this is
> covered correctly.

Yes, one of these marginal things that almost nobody uses but that we should still aim at handling correctly...

>
>
> > What I meant is that, right now the weightid declaration reads:
> >
> > <weight id='1001'> muR=0.10000E+01 muF=0.10000E+01 </weight>
> >
> > and it could read
> >
> > <weight id='1001' name='NAME_OF_THE_WEIGHT_TO_APPEAR_IN_THE_HEP_MC_FILE'>
> > muR=0.10000E+01 muF=0.10000E+01 </weight>
> >
> > where 'NAME_OF_THE_WEIGHT_TO_APPEAR_IN_THE_HEP_MC_FILE' would follow some
> > ongoing convention we have with the various analysis tools out there.
> > Using the content of this XML tag instead a 'name' attribute like above is
> > not ideal because one should be able to put whatever he/she wants there
> > (i.e. Olivier puts [or at least planned to] a diff of two param_cards in
> > there in his reweighting for example).
>
> This is not following the LHEF v3 standards. The name of the id is the actual
> "muR=0.10000E+01 muF=0.10000E+01" string. I don't think there is a need to
> define another one. Of course, we can enlarge it and give it a nice name, but
> I would suggest to put this string directly in the HepMC file, possibly
> concatenated with the 'name=' string of the weightgroup to which the weight
> belongs. But let's discuss this also over Skype. See also here:
> https://phystev.cnrs.fr/wiki/2013:groups:tools_lheextension
>
> > Yes, like I said in my other email, if you can make it on wednesday
> > morning, 7:45 Munich time, it would work better for me. Let me know.
> >
>
> Wednesday morning is okay for me.

Ok, talk to you then.

Cheers

>
> Cheers,
> Rik

[Olivier Mattelaer (olivier-mattelaer)]

Hi Rik, Valentin,

>This is very true! A really dangerous potential code-injection security liability there!
> so Olivier, did you make sure that this is forbidden when running on the Web ?

This is not the most dangerous code injection that we can face, since we should also prevent the direct shell injection via the download of the banner. (be sure that the following command in the banner:
! rm /*
is not executed)

So yes, MadGraph/Madevent has a normal and a secure mode.
In the secure mode, the possibility to enter shell command is deactivate.
I'm using this flag to check if the param_card is allowed to have the scan parameter.
actually even in that case, we could still in principle use:
ast.literal_eval
but it is very limited.

So long story short, I'm not particularly worried by code-injection for this feature.
Since we can easily put the same security as for the scan.

Cheers,

Olivier

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

338. By Rikkert Frederix on 2016-02-23

updated the shower interfaces and analyses to be able to deal with the extended weights.
Also, search also in lib64 for the analyses.

339. By Rikkert Frederix on 2016-02-23

some fixes in the previous push

340. By Rikkert Frederix on 2016-02-23

improve the treatment of fixed scales

[Rikkert Frederix (frederix)]

Hi Valentin,

I've fixed some problems when using fixed scales. Also, I've updated all the shower analysis and interfaces to deal with the extended extra weights.

Cheers,
Rik

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

341. By Rikkert Frederix on 2016-02-24

fixed a couple of things following Valentin's suggestions on Skype

[Olivier Mattelaer (olivier-mattelaer)]

Hi Rik,

1) I tried the following:
pdlabel -> lhapdf
lhaid -> 244600 244601 244602
dynamical_scale_choice -> -1 1 2 3
and the code crashes with
 lhaid 244601 not valid input number for the current lhapdf
Not sure if we can fix that or not (and how)...

I actually note later that it is explicitly written than only central value are allowed
But if this is not that much work, it can be nice to support also those ones. Otherwise it is fine.
(Maybe have a nicer error message)

2) If I continue the run and did (with the set command)
set lhaid 244600
the code crash due to the reweight PDF written as [False]
This is a formatting problem that I will have to fix.

3) After having fix the above it crashes since:
InvalidRunCard : 'reweight_scale' and 'lhaid' lists should have the same length

This is confusing since
 - I have both of the same lenght (1)
 - the comment in the run_card refer that this parameter should have the same length as dynamical_scale_choice
I would advise that if reweight_scale/reweight_pdf has only one entry then it goes trough (by automatically switching this to a list of the correct length)

If I define reweight_scale and reweight_pdf to a list of 4 entry (to match dynamical_scale_choice it is still crashing.

4) I would either not advertise at all this list option, or include in the header an example of syntax for list entry. Since it is everything but clear how to enter a list in the card.

5) When I succeed to make a run (with forcing lhaid to be size 4... with the same lhaid) then I have the message:
run_card missed argument lhapdfsetname. Takes default: ['NNPDF23_nlo_as_0118_qed', 'NNPDF23_nlo_as_0118_qed', 'NNPDF23_nlo_as_0118_qed', 'NNPDF23_nlo_as_0118_qed']
This is obviously everything but nice.... This parameter should stay fully hidden.

6) The print_results is very nice (really nice)... but no way to write this in a file:
print_results --path=out.txt

Command "print_results --path=out.txt" interrupted with error:
AttributeError : 'aMCatNLOCmdShell' object has no attribute 'print_results_in_file'
Please report this bug on https://bugs.launchpad.net/mg5amcnlo
More information is found in '/Users/omatt/Documents/eclipse/improved_scale_pdf_handling/PROCNLO_loop_sm_0/run_03_tag_1_debug.log'.
Please attach this file to your report.

For the problem that you ask me to look at:
- I guess taht the best is that I allow to have list of strings. I wanted to avoid it but it seems that you really need it. So let me fight with the parsing.
- lhapdfsetname should be define in the runcardNLO. No way to not have it define in the class if it is used by us. (you can put it as hidden)

I will stop here so far, since some of those problem forbids to fully test this module.
I will move forward on the list of strings and on the formatting problem.
(and will allow the syntax [ , , ] in any case)

Cheers,

Olivier

review: Needs Fixing

[Rikkert Frederix (frederix)]

> Hi Rik,
>
> 1) I tried the following:
> pdlabel -> lhapdf
> lhaid -> 244600 244601 244602
> dynamical_scale_choice -> -1 1 2 3
> and the code crashes with
> lhaid 244601 not valid input number for the current lhapdf
> Not sure if we can fix that or not (and how)...
>
> I actually note later that it is explicitly written than only central value
> are allowed
> But if this is not that much work, it can be nice to support also those ones.
> Otherwise it is fine.
> (Maybe have a nicer error message)
>
> 2) If I continue the run and did (with the set command)
> set lhaid 244600
> the code crash due to the reweight PDF written as [False]
> This is a formatting problem that I will have to fix.
>
> 3) After having fix the above it crashes since:
> InvalidRunCard : 'reweight_scale' and 'lhaid' lists should have the same
> length
>
> This is confusing since
> - I have both of the same lenght (1)
> - the comment in the run_card refer that this parameter should have the same
> length as dynamical_scale_choice
> I would advise that if reweight_scale/reweight_pdf has only one entry then it
> goes trough (by automatically switching this to a list of the correct length)
>
> If I define reweight_scale and reweight_pdf to a list of 4 entry (to match
> dynamical_scale_choice it is still crashing.
>
> 4) I would either not advertise at all this list option, or include in the
> header an example of syntax for list entry. Since it is everything but clear
> how to enter a list in the card.
>
> 5) When I succeed to make a run (with forcing lhaid to be size 4... with the
> same lhaid) then I have the message:
> run_card missed argument lhapdfsetname. Takes default:
> ['NNPDF23_nlo_as_0118_qed', 'NNPDF23_nlo_as_0118_qed',
> 'NNPDF23_nlo_as_0118_qed', 'NNPDF23_nlo_as_0118_qed']
> This is obviously everything but nice.... This parameter should stay fully
> hidden.
>
> 6) The print_results is very nice (really nice)... but no way to write this in
> a file:
> print_results --path=out.txt
>
> Command "print_results --path=out.txt" interrupted with error:
> AttributeError : 'aMCatNLOCmdShell' object has no attribute
> 'print_results_in_file'
> Please report this bug on https://bugs.launchpad.net/mg5amcnlo
> More information is found in '/Users/omatt/Documents/eclipse/improved_scale_pd
> f_handling/PROCNLO_loop_sm_0/run_03_tag_1_debug.log'.
> Please attach this file to your report.
>
>
> For the problem that you ask me to look at:
> - I guess taht the best is that I allow to have list of strings. I wanted to
> avoid it but it seems that you really need it. So let me fight with the
> parsing.
> - lhapdfsetname should be define in the runcardNLO. No way to not have it
> define in the class if it is used by us. (you can put it as hidden)
>
>
> I will stop here so far, since some of those problem forbids to fully test
> this module.
> I will move forward on the list of strings and on the formatting problem.
> (and will allow the syntax [ , , ] in any case)
>
> Cheers,
>
> Olivier

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

342. By Rikkert Frederix on 2016-02-24

fixed some of the issues raised by Olivier

[Rikkert Frederix (frederix)]

Hi Olivier,

> Hi Rik,
>
> 1) I tried the following:
> pdlabel -> lhapdf
> lhaid -> 244600 244601 244602
> dynamical_scale_choice -> -1 1 2 3
> and the code crashes with
> lhaid 244601 not valid input number for the current lhapdf
> Not sure if we can fix that or not (and how)...
>
> I actually note later that it is explicitly written than only central value
> are allowed
> But if this is not that much work, it can be nice to support also those ones.
> Otherwise it is fine.
> (Maybe have a nicer error message)

Maybe. But I'm not sure how to do this... I don't think there is a way to get the name of the PDF or something if only the error set is known. Do you know any?

>
> 2) If I continue the run and did (with the set command)
> set lhaid 244600
> the code crash due to the reweight PDF written as [False]
> This is a formatting problem that I will have to fix.

Thanks.

>
> 3) After having fix the above it crashes since:
> InvalidRunCard : 'reweight_scale' and 'lhaid' lists should have the same
> length
>
> This is confusing since
> - I have both of the same lenght (1)
> - the comment in the run_card refer that this parameter should have the same
> length as dynamical_scale_choice
> I would advise that if reweight_scale/reweight_pdf has only one entry then it
> goes trough (by automatically switching this to a list of the correct length)
>
> If I define reweight_scale and reweight_pdf to a list of 4 entry (to match
> dynamical_scale_choice it is still crashing.

This is my mistake. The printing of the error message is wrong: the code checks that 'reweight_scale' and 'dynamical_scale_choice' are of equal length (which they have to be). I've updated the error message.
It's indeed a good idea that if the reweight_scale or reweight_PDF is of length 1 to automatically switch to the correct length, so I've implemented this.

> 4) I would either not advertise at all this list option, or include in the
> header an example of syntax for list entry. Since it is everything but clear
> how to enter a list in the card.

There are examples (rw_rscale and rw_fscale) as well as a comment all the way at the beginning of the run_card.dat (where the complete syntax is "explained"). Do you really think that stating that it should be "comma-separated list" is not enough?

>
> 5) When I succeed to make a run (with forcing lhaid to be size 4... with the
> same lhaid) then I have the message:
> run_card missed argument lhapdfsetname. Takes default:
> ['NNPDF23_nlo_as_0118_qed', 'NNPDF23_nlo_as_0118_qed',
> 'NNPDF23_nlo_as_0118_qed', 'NNPDF23_nlo_as_0118_qed']
> This is obviously everything but nice.... This parameter should stay fully
> hidden.

Yeah, this is needed. However, with the fact that we cannot use a list of string, there is no way of doing this...

>
> 6) The print_results is very nice (really nice)... but no way to write this in
> a file:
> print_results --path=out.txt
>
> Command "print_results --path=out.txt" interrupted with error:
> AttributeError : 'aMCatNLOCmdShell' object has no attribute
> 'print_results_in_file'
> Please report this bug on https://bugs.launchpad.net/mg5amcnlo
> More information is found in '/Users/omatt/Documents/...

[Olivier Mattelaer (olivier-mattelaer)]

Hi Rik,

> Maybe. But I'm not sure how to do this... I don't think there is a way to get
> the name of the PDF or something if only the error set is known. Do you know
> any?

What about something like that?

=== modified file 'madgraph/interface/common_run_interface.py'
--- madgraph/interface/common_run_interface.py 2016-02-16 18:51:00 +0000
+++ madgraph/interface/common_run_interface.py 2016-02-24 15:32:30 +0000
@@ -639,7 +639,12 @@
                     if lhaid in pdfsets:
                         lhapdfsetname.append(pdfsets[lhaid]['filename'])
                     else:
- raise MadGraph5Error('lhaid %s not valid input number for the current lhapdf' % lhaid )
+ keys = pdfsets.keys()
+ n_lhaid = max([k for k in keys if k < lhaid])
+ misc.sprint(lhaid, n_lhaid)
+ lhapdfsetname.append(pdfsets[n_lhaid]['filename'])
+ if abs(n_lhaid) - abs(lhaid) > 100 and '_1000' not in pdfsets[n_lhaid]['filename']:
+ raise MadGraph5Error('lhaid %s not valid input number for the current lhapdf' % lhaid )
                 run_card['lhapdfsetname']=lhapdfsetname
             run_card.write_include_file(pjoin(opt['output_dir'],'run_card.inc'))

> > 2) If I continue the run and did (with the set command)
> > set lhaid 244600
> > the code crash due to the reweight PDF written as [False]
> > This is a formatting problem that I will have to fix.

Done this was linked to a lower/upper case issue.

> There are examples (rw_rscale and rw_fscale) as well as a comment all the way
> at the beginning of the run_card.dat (where the complete syntax is
> "explained"). Do you really think that stating that it should be "comma-
> separated list" is not enough?

You right, I miss that line. That's enough

> Yeah, this is needed. However, with the fact that we cannot use a list of
> string, there is no way of doing this...

- I have added the possibility. It is not 100% complete and can in extreme case leads to weird results but I think that this is save enough as long as we do not handle path (with space or comma).
- I have added the lhapdfsetname argument and now that message do not exists anymore.

>
> >
> > 6) The print_results is very nice (really nice)... but no way to write this
> in
> > a file:
> > print_results --path=out.txt
> >
> > Command "print_results --path=out.txt" interrupted with error:
> > AttributeError : 'aMCatNLOCmdShell' object has no attribute
> > 'print_results_in_file'
> > Please report this bug on https://bugs.launchpad.net/mg5amcnlo
> > More information is found in
> '/Users/omatt/Documents/eclipse/improved_scale_pd
> > f_handling/PROCNLO_loop_sm_0/run_03_tag_1_debug.log'.
> > Please attach this file to your report.
> >
>
> Sorry, but what is this option/command? Is this supposed to work at NLO? I
> didn't change anything in structure of the code for printing the results, so I
> don't understand what this is.

This command is suppose to print the summary of the run to a file. we have typically two output:
the normal one (the same as printed on the screen)
and a multicolumn one (with...

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

343. By Olivier Mattelaer on 2016-02-24

allow for list of strings

[Rikkert Frederix (frederix)]

Hi Olivier,

Thanks for updating the code to allow for a list of strings. I'll have a look tomorrow, and if there is something that I don't understand/agree with, I'll let you know.

>
> === modified file 'madgraph/interface/common_run_interface.py'
> --- madgraph/interface/common_run_interface.py 2016-02-16 18:51:00 +0000
> +++ madgraph/interface/common_run_interface.py 2016-02-24 15:32:30 +0000
> @@ -639,7 +639,12 @@
> if lhaid in pdfsets:
> lhapdfsetname.append(pdfsets[lhaid]['filename'])
> else:
> - raise MadGraph5Error('lhaid %s not valid input number
> for the current lhapdf' % lhaid )
> + keys = pdfsets.keys()
> + n_lhaid = max([k for k in keys if k < lhaid])
> + misc.sprint(lhaid, n_lhaid)
> + lhapdfsetname.append(pdfsets[n_lhaid]['filename'])
> + if abs(n_lhaid) - abs(lhaid) > 100 and '_1000' not in
> pdfsets[n_lhaid]['filename']:
> + raise MadGraph5Error('lhaid %s not valid input
> number for the current lhapdf' % lhaid )
> run_card['lhapdfsetname']=lhapdfsetname
> run_card.write_include_file(pjoin(opt['output_dir'],'run_card.inc'))
>
>
>

I'm not very happy with this for 2 reasons. It's not obvious if you get a n_lhaid close enough lhaid that it's the correct one. If you look through the list of lhaid for central sets, https://lhapdf.hepforge.org/pdfsets.html , it's very common to have the numbers not spaced very far apart. The second reason is the fortran code: you cannot initialise more than one PDF set from the lhaid number. You'll have to use the name and from there you can specify the pdf error set number, which would be the difference of the lhaid of the run_card and the lhaid of the central set. This quickly become a bit of a mess to get right. Therefore, I decided to only allow for the central set lhaid number and then you can either turn all error pdfs on or off with the reweight_pdf flag.

I've updated the error message to
"lhaid %s is not a valid PDF identification number. This can be due to the use of an outdated version of LHAPDF, or %s is not a LHAGlue number corresponding to a central PDF set (but rather one of the error sets)." % (lhaid,lhaid)

>
> This command is suppose to print the summary of the run to a file. we have
> typically two output:
> the normal one (the same as printed on the screen)
> and a multicolumn one (with option --format=short) which allow easy parsing of
> argument.
> Don't know if that was ever implemented @NLO but it is a must have (when I see
> the error maybe not).
> Especially with the growing number of uncertainties. Having those only in the
> log screen is not a good options.

For NLO running, you already get a 'summary.txt' in the Events/*/ folder by default. Is there something else needed? --I don't think this was ever implemented at NLO.

>
> Will restart this review later ;-)
>
Thanks!

Cheers,
Rikkert

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

344. By Rikkert Frederix on 2016-02-24

updated the error message when having a wrong lhaid number in the run_card.

[Valentin Hirschi (valentin-hirschi)]

Hi Rik,

Now my shower-reweighting run did proceed past the python-lhapdf band
computation. but it still crashed after:

    return self.pdf_scale_from_reweighting(evt_files)
  File
"/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/madgraph/interface/amcatnlo_run_interface.py",
line 3682, in pdf_scale_from_reweighting
    pdfsetname=self.run_card['lhapdfsetname'][2:-2].split("', '")[j]
AttributeError: 'list' object has no attribute 'split'

This seems like a simple typo to fix, so hopefully nothing bad.

Cheers

On Wed, Feb 24, 2016 at 9:37 AM, Rikkert Frederix <email address hidden>
wrote:

> Hi Olivier,
>
> Thanks for updating the code to allow for a list of strings. I'll have a
> look tomorrow, and if there is something that I don't understand/agree
> with, I'll let you know.
>
> >
> > === modified file 'madgraph/interface/common_run_interface.py'
> > --- madgraph/interface/common_run_interface.py 2016-02-16 18:51:00 +0000
> > +++ madgraph/interface/common_run_interface.py 2016-02-24 15:32:30 +0000
> > @@ -639,7 +639,12 @@
> > if lhaid in pdfsets:
> > lhapdfsetname.append(pdfsets[lhaid]['filename'])
> > else:
> > - raise MadGraph5Error('lhaid %s not valid input
> number
> > for the current lhapdf' % lhaid )
> > + keys = pdfsets.keys()
> > + n_lhaid = max([k for k in keys if k < lhaid])
> > + misc.sprint(lhaid, n_lhaid)
> > +
> lhapdfsetname.append(pdfsets[n_lhaid]['filename'])
> > + if abs(n_lhaid) - abs(lhaid) > 100 and '_1000'
> not in
> > pdfsets[n_lhaid]['filename']:
> > + raise MadGraph5Error('lhaid %s not valid
> input
> > number for the current lhapdf' % lhaid )
> > run_card['lhapdfsetname']=lhapdfsetname
> > run_card.write_include_file(pjoin(opt['output_dir'],'run_card.inc'))
> >
> >
> >
>
> I'm not very happy with this for 2 reasons. It's not obvious if you get a
> n_lhaid close enough lhaid that it's the correct one. If you look through
> the list of lhaid for central sets,
> https://lhapdf.hepforge.org/pdfsets.html , it's very common to have the
> numbers not spaced very far apart. The second reason is the fortran code:
> you cannot initialise more than one PDF set from the lhaid number. You'll
> have to use the name and from there you can specify the pdf error set
> number, which would be the difference of the lhaid of the run_card and the
> lhaid of the central set. This quickly become a bit of a mess to get right.
> Therefore, I decided to only allow for the central set lhaid number and
> then you can either turn all error pdfs on or off with the reweight_pdf
> flag.
>
> I've updated the error message to
> "lhaid %s is not a valid PDF identification number. This can be due to the
> use of an outdated version of LHAPDF, or %s is not a LHAGlue number
> corresponding to a central PDF set (but rather one of the error sets)." %
> (lhaid,lhaid)
>
>
> >
> > This command is suppose to print the summary of the run to a file. we
> have
> > typically two output:
> > the normal one (the same as pri...

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

345. By Rikkert Frederix on 2016-02-25

fixed a couple of things related to the fact that we can now have a
list of strings.

[Rikkert Frederix (frederix)]

Thank you Olivier, for the implementation of the list of strings. I've had to change the code in a couple of places to get this working correctly (which also solved Valentin's problem). It should all be okay now.

Cheers,
Rik

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

346. By Rikkert Frederix on 2016-02-25

removed the intrusive message

"Thanks for using LHAPDF 6.1.6. Please make sure to cite the paper: ..."

when closing the main MG5_aMC python prompt. It's still there at the end
of the individual log files of the jobs.

[Valentin Hirschi (valentin-hirschi)]

> Thank you Olivier, for the implementation of the list of strings. I've had to
> change the code in a couple of places to get this working correctly (which
> also solved Valentin's problem). It should all be okay now.

In my multi-weight shower run, I can indeed now go past the issue I reported before, but I know bump into another crash that occurs once the shower is finished:

INFO: Preparing MCatNLO run
INFO: Compiling MCatNLO for PYTHIA8...
WARNING: 'dl' was added to extralibs from the shower_card.dat.
It is needed for the correct running of PY8.2xx.
If this library cannot be found on your system, a crash will occur.
INFO: ... done
INFO: Showering events...
INFO: (Running in /Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/TMP_test_Rik3/MCatNLO/RUN_PYTHIA8_1)
INFO: Idle: 1, Running: 0, Completed: 0 [ current time: 19h31 ]
INFO: Idle: 0, Running: 0, Completed: 1 [ 1m 2s ]
INFO: Idle: 0, Running: 0, Completed: 0 [ current time: 19h32 ]
Command "launch auto " interrupted with error:
UnboundLocalError : local variable 'use_lhapdf' referenced before assignment

with the following backtrace:

[...]
  File "/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/madgraph/interface/amcatnlo_run_interface.py", line 3100, in run_mcatnlo
    format = 'gnuplot',lhapdfconfig=self.options['lhapdf'])
  File "/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/madgraph/various/histograms.py", line 1611, in output
    lhapdfconfig = lhapdfconfig)
  File "/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/madgraph/various/histograms.py", line 1687, in output_group
    (mu_var_pos,mu) = self[0].set_uncertainty(type='all_scale')
  File "/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/madgraph/various/histograms.py", line 1079, in set_uncertainty
    if use_lhapdf: lhapdf.setVerbosity(0)
UnboundLocalError: local variable 'use_lhapdf' referenced before assignment

Again, it does not look like a major thing, but it prevents me from carrying the review further.
Just to make sure it is clear, I am trying to generate and shower events for p p > e+ ve [QCD] with two different dynamical scales and central PDF (with their variations turned on) and using the 'lvl'HwU shower analysis.

And fyi, the corresponding fixed order run which was working before is now also failing for the same problem as above apparently.

Cheers

> Cheers,
> Rik

[Valentin Hirschi (valentin-hirschi)]

Hi Rik,

I think it was really just a simple indentation typo. I replaced the
problematic line with

               else:
                    lhapdf.setVerbosity(0)

and it went through fine. So I pushed this modification and will carry on
with the attempt at merging our two histograms.py. I will let you know.

On Thu, Feb 25, 2016 at 7:35 PM, Valentin Hirschi <
<email address hidden>> wrote:

> > Thank you Olivier, for the implementation of the list of strings. I've
> had to
> > change the code in a couple of places to get this working correctly
> (which
> > also solved Valentin's problem). It should all be okay now.
>
> In my multi-weight shower run, I can indeed now go past the issue I
> reported before, but I know bump into another crash that occurs once the
> shower is finished:
>
> INFO: Preparing MCatNLO run
> INFO: Compiling MCatNLO for PYTHIA8...
> WARNING: 'dl' was added to extralibs from the shower_card.dat.
> It is needed for the correct running of PY8.2xx.
> If this library cannot be found on your system, a crash will occur.
> INFO: ... done
> INFO: Showering events...
> INFO: (Running in
> /Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/TMP_test_Rik3/MCatNLO/RUN_PYTHIA8_1)
> INFO: Idle: 1, Running: 0, Completed: 0 [ current time: 19h31 ]
> INFO: Idle: 0, Running: 0, Completed: 1 [ 1m 2s ]
> INFO: Idle: 0, Running: 0, Completed: 0 [ current time: 19h32 ]
> Command "launch auto " interrupted with error:
> UnboundLocalError : local variable 'use_lhapdf' referenced before
> assignment
>
> with the following backtrace:
>
> [...]
> File
> "/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/madgraph/interface/amcatnlo_run_interface.py",
> line 3100, in run_mcatnlo
> format = 'gnuplot',lhapdfconfig=self.options['lhapdf'])
> File
> "/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/madgraph/various/histograms.py",
> line 1611, in output
> lhapdfconfig = lhapdfconfig)
> File
> "/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/madgraph/various/histograms.py",
> line 1687, in output_group
> (mu_var_pos,mu) = self[0].set_uncertainty(type='all_scale')
> File
> "/Users/valentin/Documents/Work/MG5/improved_scale_pdf_handling/madgraph/various/histograms.py",
> line 1079, in set_uncertainty
> if use_lhapdf: lhapdf.setVerbosity(0)
> UnboundLocalError: local variable 'use_lhapdf' referenced before assignment
>
> Again, it does not look like a major thing, but it prevents me from
> carrying the review further.
> Just to make sure it is clear, I am trying to generate and shower events
> for p p > e+ ve [QCD] with two different dynamical scales and central PDF
> (with their variations turned on) and using the 'lvl'HwU shower analysis.
>
> And fyi, the corresponding fixed order run which was working before is now
> also failing for the same problem as above apparently.
>
> Cheers
>
> > Cheers,
> > Rik
> --
>
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/improved_scale_pdf_handling/+merge/286608
> You are requested to review the proposed merge of
> lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling into
> lp:~maddevelopers/mg5a...

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

347. By Valentin Hirschi on 2016-02-26

1. Fixed a simple indentation typo for if use_lhapdf

348. By Rikkert Frederix on 2016-02-26

small fix in the setverbosity for lhapdf

[Rikkert Frederix (frederix)]

Hi Valentin,

Sorry about the lhapdf.setVerbosity stuff. It was a last-minute addition yesterday to remove the printing of the very intrusive message at the end of runs coming from LHAPDF. I've just fixed it by making sure it's only tried if PDF uncertainties are computed and use_lhapdf is true.

Cheers,
Rik

[Olivier Mattelaer (olivier-mattelaer)]

Hi Rik,

I have made a couple of run and they mainly went trough in a nice way.

I have two comments:

1) We will need to have at least a link on your summary in the webpage.
All results should be linked from that page. So far no information on the scale/PDF uncertainty is available on that page which is quite bad.

2) I face some parser error with the PDF reweighting associated to the HwU:
DEBUG: Combining HwU plots.
Command "launch auto " interrupted with error:
ParseError : There are only 79 weights specified and 161 were expected.

The run was done with:
set lhaid 24000 24000

3) I do not understand the utility of the "lhapdfsetname" parameter.
Looks like this parameter should not be allowed to be modified by the user (at least for the moment) and therefore should not be part of the RunCard (at least not as editable parameter).
I tried to play with this parameter but get only very weird result:

 A) If I do the following:
add the line
['CT10nlo', 'CT10nnlo', 'MMHT2014lo68cl'] = lhapdfsetname
in the run_card, remove the lhaid entry
and set
 True True True = reweight_pdf
then it crash saying that lhaid and reweight_pdf should have the same length...

B) if I do:
set lhaid 24000 24000 24000
set lhapdfsetname ['CT10nlo', 'CT10nnlo', 'MMHT2014lo68cl']
Then looks like it runs three times for 24000 (and therefore crash as above)
But the code seems to have kept "my" value of lhapdfsetname which is everything but save.

4) Looks like you continue the LHEF miss-convention in this branch, even if you modify some of the incriminated branch. I would suggest that this branch being merged with the LHEF_convention branch
such that we can check that all the type= have been correctly removed in this branch.

Cheers,

Olivier

review: Needs Fixing

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

349. By Rikkert Frederix on 2016-02-29

added the changes of the LHEF_convention branch

350. By Rikkert Frederix on 2016-02-29

added a check that all 'lhaid' and 'dynamical_scale_choices' are different

351. By Olivier Mattelaer on 2016-02-29

set lhapdfsetname to private attribute that can not be modified by the user

352. By Rikkert Frederix on 2016-02-29

added the summary.txt to the HTML pages

353. By Rikkert Frederix on 2016-02-29

make 'system' parameters in the run_card also 'hidden'.

[Rikkert Frederix (frederix)]

Hi Olivier,

Thanks for the suggestions. I've implemented all of them. Note that I made the 'system' parameters automatically 'hidden' as well. I guess this is what we want, right?

Cheers,
Rik

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

354. By Olivier Mattelaer on 2016-02-29

correct the fix of Rikkert

355. By Rikkert Frederix on 2016-03-01

added Valentin's improved histrograms.py

356. By Valentin Hirschi on 2016-03-02

1. Fixed a typo in the 3 statements
    uncertainty_plot_lines[-1]['merging'] = ...
   which should have read:
    uncertainty_plot_lines[-1]['merging_scale'] = ...

2. Forced to always have the legend for the variations in the main plot,
   and not with a text in the first subplot.
   However, now only one band can appear in the main plot. The variations
   which are not to be displayed as a band will only show in the first
   subplot.

357. By Valentin Hirschi on 2016-03-02

1. Fixed an obvious little issue in histograms.py when not running with uncertainties.

[Valentin Hirschi (valentin-hirschi)]

Hi Rik,

I tested again the module in various conditions and it worked fine (besides an obvious simple problem in histograms.py that I fixed right away). However, I was too lazy to perform any validation, but I assume you have done so already.
Is there any test related to this advanced reweighting functionality?

My last comment is that I think it would be nice that you change the options for the HwU output in aMC@NLO_run_interface so as to automatically use the band for scale variations (with the use_band= option) *when there is only one central value* (easy to detect once the HwU histograms have been loaded already). But this is up to you, so I already accept this merge; good job.

Cheers

review: Approve

[lp:~maddevelopers/mg5amcnlo/improved_scale_pdf_handling]

358. By Rikkert Frederix on 2016-03-04

slightly improved the importing of the LHAPDF python interface and
improved the warning message in case it cannot do it.

[Olivier Mattelaer (olivier-mattelaer)]

Hi Rik,

I have two small question

1) I see a couple of parameter which have pass in hidden mode:
"hidden" mode is for parameter that the user can modify but which are not present in the default run_card (mainly because they are too technical)

I guess some should be put in "legacy" mode instead. (parameter which generates a warning if present in the card since it has no effect on the code anymore).
I guess that it should be the case for muf1_over_ref, rw_fscale_down, pdf_set_max,...
If those are suppose to be legacy parameter. Is the behavior the same as before?
I guess that (some)of those can not be combine with the new syntax. Did you check that in the check_validity routine?

For reference, here is the list of all the hidden parameter.

I see a lot of parameter not present anymore by default in the run_card:
run_card missed argument muf1_over_ref. Takes default: 0.5
run_card missed argument muf2_over_ref. Takes default: 0.5
run_card missed argument fixed_qes_scale. Takes default: False
run_card missed argument rw_fscale_down. Takes default: -1.0
run_card missed argument rw_rscale_down. Takes default: -1.0
run_card missed argument muf1_ref_fixed. Takes default: 91.118
run_card missed argument qes_over_ref. Takes default: 2.0
run_card missed argument pdf_set_min. Takes default: 244601
run_card missed argument maxjetflavor. Takes default: 4
run_card missed argument rw_fscale_up. Takes default: -1.0
run_card missed argument muf2_ref_fixed. Takes default: 91.118
run_card missed argument pdf_set_max. Takes default: 244700
run_card missed argument rw_rscale_up. Takes default: -1.0
run_card missed argument qes_ref_fixed. Takes default: 91.118

2) Can you comment on the status of maxjetflavor?
I see that the parameter pass in hidden (see above) but we still set it automatically in the routine
create_default_for_process
I'm not sure if that make sense.

Since this is minor anyway, I already approve this.
Thanks a lot,

Olivier

review: Approve

[Rikkert Frederix (frederix)]

Hi Olivier,

Thanks for the review.

1.) I think basically all those parameters are still working; the code is backward compatible. It's just that their use should be discouraged, which is the reason I made them hidden. Maybe in some future version we can put them to 'legacy' status.

2.) I've never noticed that this is set automatically. And it is certainly not working as intended: doing e+ e- > j j [QCD], makes that the default of maxjetflavour remains always equal to 4, no matter how many light partons I have in my model and are part of 'j'. In my opinion, maxjetflavour should be set to the number of massless quarks in the model.

However, maxjetflavour is not a parameter that makes real sense at NLO. I mean, the only case where it might be considered is a process where you ask for explicit (massive) b quarks in the process, but want to put cuts on the b-*jets*. But there is a problem with that. Suppose you do p p > w+ b b~ [QCD] and set maxjetflavour=5 and put pT(j)>50GeV or so, it's not that you get two *b*-jets. Rather, also the real-emission parton can form one of the jets, which means you could also get one b-jet and one light jet, which is something that's easily overlooked when not too familiar with NLO computations. And this is, in general, not what you want when you asked for the process p p > w+ b b~. Hence, I thought it would be safer to move this parameter to hidden.

Cheers,
Rik

=== modified file 'Template/NLO/Cards/run_card.dat'
--- Template/NLO/Cards/run_card.dat	2015-11-02 16:43:45 +0000
+++ Template/NLO/Cards/run_card.dat	2016-03-04 16:01:53 +0000
@@ -10,6 +10,9 @@
 #   Lines starting with a hash (#) are info or comments                *
 #                                                                      *
 #   mind the format:   value    = variable     ! comment               *
+#                                                                      *
+#   Some of the values of variables can be list. These can either be   *
+#   comma or space separated.                                          *
 #***********************************************************************
 #
 #*******************                                                 
@@ -58,8 +61,10 @@
 #***********************************************************************
 # PDF choice: this automatically fixes also alpha_s(MZ) and its evol.  *
 #***********************************************************************
- %(pdlabel)s   = pdlabel   ! PDF set
- %(lhaid)s    = lhaid     ! if pdlabel=lhapdf, this is the lhapdf number
+ %(pdlabel)s = pdlabel ! PDF set
+ %(lhaid)s  = lhaid   ! If pdlabel=lhapdf, this is the lhapdf number. Only 
+              ! numbers for central PDF sets are allowed. Can be a list; 
+              ! PDF sets beyond the first are included via reweighting.
 #***********************************************************************
 # Include the NLO Monte Carlo subtr. terms for the following parton    *
 # shower (HERWIG6 | HERWIGPP | PYTHIA6Q | PYTHIA6PT | PYTHIA8)         *
@@ -73,36 +78,29 @@
 # (Default functional form for the non-fixed scales is the sum of      *
 # the transverse masses divided by two of all final state particles    * 
 # and partons. This can be changed in SubProcesses/set_scales.f or via *
-# dynamical_scale_choice options)                                      *
+# dynamical_scale_choice option)                                       *
 #***********************************************************************
- %(fixed_ren_scale)s        = fixed_ren_scale  ! if .true. use fixed ren scale
- %(fixed_fac_scale)s        = fixed_fac_scale  ! if .true. use fixed fac scale
+ %(fixed_ren_scale)s    = fixed_ren_scale  ! if .true. use fixed ren scale
+ %(fixed_fac_scale)s    = fixed_fac_scale  ! if .true. use fixed fac scale
  %(mur_ref_fixed)s   = muR_ref_fixed    ! fixed ren reference scale 
- %(muf1_ref_fixed)s   = muF1_ref_fixed   ! fixed fact reference scale for pdf1
- %(muf2_ref_fixed)s   = muF2_ref_fixed   ! fixed fact reference scale for pdf2
- %(dynamical_scale_choice)s = dynamical_scale_choice ! Choose one of the preselected dynamical choices
-#***********************************************************************
-# Renormalization and factorization scales (advanced and NLO options)  *
-#***********************************************************************
- %(fixed_qes_scale)s = fixed_QES_scale  ! if .true. use fixed Ellis-Sexton scale
- %(qes_ref_fixed)s = QES_ref_fixed    ! fixed Ellis-Sexton reference scale
- %(mur_over_ref)s  = muR_over_ref     ! ratio of current muR over reference muR
- %(muf1_over_ref)s = muF1_over_ref    ! ratio of current muF1 over reference muF1
- %(muf2_over_ref)s = muF2_over_ref    ! ratio of current muF2 over reference muF2
- %(qes_over_ref)s  = QES_over_ref     ! ratio of current QES over reference QES
+ %(muf_ref_fixed)s   = muF_ref_fixed    ! fixed fact reference scale
+ %(dynamical_scale_choice)s = dynamical_scale_choice ! Choose one (or more) of the predefined
+           ! dynamical choices. Can be a list; scale choices beyond the
+           ! first are included via reweighting
+ %(mur_over_ref)s  = muR_over_ref  ! ratio of current muR over reference muR
+ %(muf_over_ref)s  = muF_over_ref  ! ratio of current muF over reference muF
 #*********************************************************************** 
-# Reweight flags to get scale dependence and PDF uncertainty           *
-# For scale dependence: factor rw_scale_up/down around central scale   *
-# For PDF uncertainty: use LHAPDF with supported set                   *
+# Reweight variables for scale dependence and PDF uncertainty          *
 #***********************************************************************
- %(reweight_scale)s   = reweight_scale   ! reweight to get scale dependence
- %(rw_rscale_down)s   = rw_Rscale_down   ! lower bound for ren scale variations
- %(rw_rscale_up)s     = rw_Rscale_up     ! upper bound for ren scale variations
- %(rw_fscale_down)s     = rw_Fscale_down   ! lower bound for fact scale variations
- %(rw_fscale_up)s     = rw_Fscale_up     ! upper bound for fact scale variations
- %(reweight_pdf)s  = reweight_PDF     ! reweight to get PDF uncertainty
- %(pdf_set_min)s   = PDF_set_min      ! First of the error PDF sets 
- %(pdf_set_max)s   = PDF_set_max      ! Last of the error PDF sets
+ %(rw_rscale)s = rw_rscale ! muR factors to be included by reweighting
+ %(rw_fscale)s = rw_fscale ! muF factors to be included by reweighting
+ %(reweight_scale)s = reweight_scale ! Reweight to get scale variation using the 
+            ! rw_rscale and rw_fscale factors. Should be a list of 
+            ! booleans of equal length to dynamical_scale_choice to
+            ! specify for which choice to include scale dependence.
+ %(reweight_pdf)s = reweight_PDF  ! Reweight to get PDF uncertainty. Should be a
+            ! list booleans of equal length to lhaid to specify for
+            !  which PDF set to include the uncertainties.
 #***********************************************************************
 # ickkw parameter:                                                     *
 #   0: No merging                                                      *
@@ -117,47 +115,43 @@
 #***********************************************************************
 #
 #***********************************************************************
-# BW cutoff (M+/-bwcutoff*Gamma)                                       *
+# BW cutoff (M+/-bwcutoff*Gamma). Determines which resonances are      *
+# written in the LHE event file                                        *
 #***********************************************************************
  %(bwcutoff)s  = bwcutoff
 #***********************************************************************
-# Cuts on the jets                                                     *
-# Jet clustering is performed by FastJet.
-# When matching to a parton shower, these generation cuts should be    *
-# considerably softer than the analysis cuts.                          *
-# (more specific cuts can be specified in SubProcesses/cuts.f)         *
+# Cuts on the jets. Jet clustering is performed by FastJet.            *
+#  - When matching to a parton shower, these generation cuts should be *
+#    considerably softer than the analysis cuts.                       *
+#  - More specific cuts can be specified in SubProcesses/cuts.f        *
 #***********************************************************************
- %(jetalgo)s  = jetalgo   ! FastJet jet algorithm (1=kT, 0=C/A, -1=anti-kT)
- %(jetradius)s  = jetradius ! The radius parameter for the jet algorithm
+  %(jetalgo)s  = jetalgo   ! FastJet jet algorithm (1=kT, 0=C/A, -1=anti-kT)
+  %(jetradius)s  = jetradius ! The radius parameter for the jet algorithm
  %(ptj)s  = ptj       ! Min jet transverse momentum
  %(etaj)s  = etaj      ! Max jet abs(pseudo-rap) (a value .lt.0 means no cut)
 #***********************************************************************
 # Cuts on the charged leptons (e+, e-, mu+, mu-, tau+ and tau-)        *
-# (more specific gen cuts can be specified in SubProcesses/cuts.f)     *
+# More specific cuts can be specified in SubProcesses/cuts.f           *
 #***********************************************************************
   %(ptl)s  = ptl     ! Min lepton transverse momentum
-  %(etal)s  = etal    ! Max lepton abs(pseudo-rap) (a value .lt.0 means no cut)
+ %(etal)s  = etal    ! Max lepton abs(pseudo-rap) (a value .lt.0 means no cut)
   %(drll)s  = drll    ! Min distance between opposite sign lepton pairs
   %(drll_sf)s  = drll_sf ! Min distance between opp. sign same-flavor lepton pairs
   %(mll)s  = mll     ! Min inv. mass of all opposite sign lepton pairs
-  %(mll_sf)s  = mll_sf  ! Min inv. mass of all opp. sign same-flavor lepton pairs
-#***********************************************************************
-# Photon-isolation cuts, according to hep-ph/9801442                   *
-# When ptgmin=0, all the other parameters are ignored                  *
-#***********************************************************************
-  %(ptgmin)s  = ptgmin    ! Min photon transverse momentum
-  %(etagamma)s  = etagamma  ! Max photon abs(pseudo-rap)
+ %(mll_sf)s  = mll_sf  ! Min inv. mass of all opp. sign same-flavor lepton pairs
+#***********************************************************************
+# Photon-isolation cuts, according to hep-ph/9801442. When ptgmin=0,   *
+# all the other parameters are ignored.                                *
+# More specific cuts can be specified in SubProcesses/cuts.f           *
+#***********************************************************************
+ %(ptgmin)s  = ptgmin    ! Min photon transverse momentum
+ %(etagamma)s  = etagamma  ! Max photon abs(pseudo-rap)
   %(r0gamma)s  = R0gamma   ! Radius of isolation code
   %(xn)s  = xn        ! n parameter of eq.(3.4) in hep-ph/9801442
   %(epsgamma)s  = epsgamma  ! epsilon_gamma parameter of eq.(3.4) in hep-ph/9801442
-  %(isoem)s  = isoEM  ! isolate photons from EM energy (photons and leptons)
-#***********************************************************************
-# Maximal PDG code for quark to be considered a jet when applying cuts.*
-# At least all massless quarks of the model should be included here.   *
-#***********************************************************************
- %(maxjetflavor)s = maxjetflavor
+ %(isoem)s  = isoEM  ! isolate photons from EM energy (photons and leptons)
 #***********************************************************************
 # For aMCfast+APPLGRID use in PDF fitting (http://amcfast.hepforge.org)*
 #***********************************************************************
- %(iappl)s = iappl   ! aMCfast switch (0=OFF, 1=prepare APPLgrids, 2=fill grids)
+ %(iappl)s = iappl ! aMCfast switch (0=OFF, 1=prepare grids, 2=fill grids)
 #***********************************************************************

=== modified file 'Template/NLO/FixedOrderAnalysis/HwU.f'
--- Template/NLO/FixedOrderAnalysis/HwU.f	2015-03-05 19:51:04 +0000
+++ Template/NLO/FixedOrderAnalysis/HwU.f	2016-03-04 16:01:53 +0000
@@ -360,16 +360,15 @@
       character*4 str_nbin
       double precision xnorm
 c     column info: x_min, x_max, y (central value), dy, {extra
-c     weights}. Use columns with a width of 17 characters.
-      write (buffer( 1:17),'(a)')'##&       xmin  &'
-      write (buffer(18:34),'(a)')'            xmax '
-      write (buffer(35:51),'(a2,a15)') ' &',wgts_info(1)(1:15)
-      write (buffer(52:68),'(a)')' &            dy '
+c     weights}.
+      write (unit,'(a$)') '##& xmin'
+      write (unit,'(a$)') ' & xmax'
+      write (unit,'(a$)') ' & '//trim(adjustl(wgts_info(1)))
+      write (unit,'(a$)') ' & dy'
       do j=2,nwgts
-         write (buffer((j+2)*17+1:(j+3)*17),'(a2,a15)')
-     $        ' &',wgts_info(j)(1:15)
+         write (unit,'(a$)') ' & '//trim(adjustl(wgts_info(j)))
       enddo
-      write (unit,'(a)') buffer(1:(nwgts+3)*17)
+      write (unit,'(a)') ''
       write (unit,'(a)') ''
       do label=1,max_plots
          if (.not. booked(label)) cycle

=== modified file 'Template/NLO/FixedOrderAnalysis/HwU.inc'
--- Template/NLO/FixedOrderAnalysis/HwU.inc	2015-03-05 19:51:04 +0000
+++ Template/NLO/FixedOrderAnalysis/HwU.inc	2016-03-04 16:01:53 +0000
@@ -3,14 +3,14 @@
       integer max_plots,max_bins,max_wgts,max_points
       parameter (max_plots=200)
       parameter (max_bins=100)
-      parameter (max_wgts=300)
+      parameter (max_wgts=1024)
       parameter (max_points=max_plots*40)
 
       logical booked(max_plots)
       integer nbin(max_plots),nwgts,np,p_bin(max_points)
      &     ,p_label(max_points),histi(max_plots,max_bins)
       character*50 title(max_plots)
-      character*15 wgts_info(max_wgts)
+      character*50 wgts_info(max_wgts)
       double precision histy(max_wgts,max_plots,max_bins)
      $     ,histy_acc(max_wgts,max_plots,max_bins),histy2(max_plots
      $     ,max_bins),histy_err(max_plots,max_bins),histxl(max_plots

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_V.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_V.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_V.f	2016-03-04 16:01:53 +0000
@@ -49,11 +49,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_h.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_h.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_h.f	2016-03-04 16:01:53 +0000
@@ -46,11 +46,7 @@
       integer nwgt,max_weight,nwgt_analysis,kk,l
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_hjj.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_hjj.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_hjj.f	2016-03-04 16:01:53 +0000
@@ -51,11 +51,7 @@
       common /to_veto_hist/vetomin,vetomax,nbinveto
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_leptons.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_leptons.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_leptons.f	2016-03-04 16:01:53 +0000
@@ -60,11 +60,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lplm.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lplm.f	2016-02-17 14:32:27 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lplm.f	2016-03-04 16:01:53 +0000
@@ -48,11 +48,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lvl.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lvl.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_lvl.f	2016-03-04 16:01:53 +0000
@@ -48,11 +48,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_taptam.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_taptam.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_taptam.f	2016-03-04 16:01:53 +0000
@@ -46,11 +46,7 @@
       integer nwgt,max_weight,nwgt_analysis,kk,l
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_tj.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_tj.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_tj.f	2016-03-04 16:01:53 +0000
@@ -46,11 +46,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx.f	2016-03-04 16:01:53 +0000
@@ -46,11 +46,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx_v2.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx_v2.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_pp_ttx_v2.f	2016-03-04 16:01:53 +0000
@@ -46,11 +46,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_rates.f'
--- Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_rates.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/hw6an_HwU_rates.f	2016-03-04 16:01:53 +0000
@@ -42,11 +42,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_V.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_V.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_V.f	2016-03-04 16:01:53 +0000
@@ -25,8 +25,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_h.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_h.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_h.f	2016-03-04 16:01:53 +0000
@@ -17,8 +17,7 @@
       integer nwgt,max_weight,nwgt_analysis,kk,l
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       call inihist
       nwgt_analysis=nwgt

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_hjj.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_hjj.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_hjj.f	2016-03-04 16:01:53 +0000
@@ -17,8 +17,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       character*8 cc(2)
       data cc/'        ','vbfcuts '/

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_leptons.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_leptons.f	2014-02-12 10:28:36 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_leptons.f	2016-03-04 16:01:53 +0000
@@ -17,8 +17,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       integer nsingle,ncorr,nlepton,nplots,ncuts
       common/cplots/nsingle,ncorr,nlepton,nplots,ncuts

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lplm.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lplm.f	2016-02-17 14:32:27 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lplm.f	2016-03-04 16:01:53 +0000
@@ -22,8 +22,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       call inihist
       nwgt_analysis=nwgt

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lvl.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lvl.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_lvl.f	2016-03-04 16:01:53 +0000
@@ -25,8 +25,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_taptam.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_taptam.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_taptam.f	2016-03-04 16:01:53 +0000
@@ -20,8 +20,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       call inihist
       nwgt_analysis=nwgt

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_tj.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_tj.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_tj.f	2016-03-04 16:01:53 +0000
@@ -22,8 +22,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       call inihist
       nwgt_analysis=nwgt

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx.f	2016-03-04 16:01:53 +0000
@@ -22,8 +22,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx_v2.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx_v2.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_pp_ttx_v2.f	2016-03-04 16:01:53 +0000
@@ -22,8 +22,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f'
--- Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/HWAnalyzer/mcatnlo_hwan_rates.f	2016-03-04 16:01:53 +0000
@@ -16,8 +16,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_V_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_V_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_V_hepmc.f	2016-03-04 16:01:53 +0000
@@ -22,12 +22,10 @@
       integer j,kk,l,jpr,i,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
       call inihist
       weights_info(1)="central value  "

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_h_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_h_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_h_hepmc.f	2016-03-04 16:01:53 +0000
@@ -14,12 +14,11 @@
 C----------------------------------------------------------------------
       INCLUDE 'HEPMC.INC'
       include 'reweight0.inc'
-      integer nwgt,max_weight,nwgt_analysis,kk,l,nnn
-      common/cnwgt/nwgt
+      integer nwgt,nwgt_analysis,kk,l,nnn
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
       call inihist
       weights_info(1)="central value  "

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_hjj_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_hjj_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_hjj_hepmc.f	2016-03-04 16:01:53 +0000
@@ -17,12 +17,10 @@
       REAL*8 pi
       PARAMETER (PI=3.14159265358979312D0)
       integer j,kk,l,i,nnn
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
       character*8 cc(2)
       data cc/'        ','vbfcuts '/
       real*8 vetomin, vetomax

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_leptons_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_leptons_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_leptons_hepmc.f	2016-03-04 16:01:53 +0000
@@ -14,12 +14,10 @@
 C----------------------------------------------------------------------
       INCLUDE 'HEPMC.INC'
       include 'reweight0.inc'
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
       integer nsingle,ncorr,nlepton,nplots,ncuts
       common/cplots/nsingle,ncorr,nlepton,nplots,ncuts
       integer MAXELM,MAXELP,MAXMUM,MAXMUP

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lplm_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lplm_hepmc.f	2016-02-17 14:32:27 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lplm_hepmc.f	2016-03-04 16:01:53 +0000
@@ -19,12 +19,10 @@
       integer j,kk,l,jpr,i,nnn
       character*5 cc(2)
       data cc/'     ','cuts '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
       call inihist
       weights_info(1)="central value  "

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lvl_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lvl_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_lvl_hepmc.f	2016-03-04 16:01:53 +0000
@@ -22,12 +22,10 @@
       integer j,kk,l,i,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
       call inihist
       weights_info(1)="central value  "

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_taptam_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_taptam_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_taptam_hepmc.f	2016-03-04 16:01:53 +0000
@@ -17,12 +17,10 @@
       integer j,kk,l,i,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
       call inihist
       weights_info(1)="central value  "

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_tj_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_tj_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_tj_hepmc.f	2016-03-04 16:01:53 +0000
@@ -21,12 +21,10 @@
       integer j,kk,l,i,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
       call inihist
       weights_info(1)="central value  "

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_hepmc.f	2016-03-04 16:01:53 +0000
@@ -19,12 +19,10 @@
       integer j,kk,l,i,nnn
       character*5 cc(2)
       data cc/'     ','cuts '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
       call inihist
       weights_info(1)="central value  "

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_v2_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_v2_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_pp_ttx_v2_hepmc.f	2016-03-04 16:01:53 +0000
@@ -19,12 +19,10 @@
       integer j,kk,l,i,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
       call inihist
       weights_info(1)="central value  "

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_rates_hepmc.f'
--- Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_rates_hepmc.f	2014-05-16 13:57:11 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/mcatnlo_pyan_rates_hepmc.f	2016-03-04 16:01:53 +0000
@@ -14,12 +14,10 @@
       integer j,kk,l,i,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
       call inihist
       weights_info(1)="central value  "

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_V.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_V.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_V.f	2016-03-04 16:01:53 +0000
@@ -46,21 +46,15 @@
       integer j,kk,l,jpr,i,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
+      do i=1,nnn
          weights_info(i+1)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -126,9 +120,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_h.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_h.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_h.f	2016-03-04 16:01:53 +0000
@@ -43,21 +43,15 @@
 c
       character*8 HwUtype(2)
       data HwUtype/'|T@NOCUT','|T@CUT  '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -164,9 +158,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_hjj.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_hjj.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_hjj.f	2016-03-04 16:01:53 +0000
@@ -43,26 +43,20 @@
 c
       character*8 HwUtype(2)
       data HwUtype/'|T@NOCUT','|T@CUT  '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
       character*8 cc(2)
       data cc/'        ','vbfcuts '/
       real*8 vetomin, vetomax
       integer nbinveto
       common /to_veto_hist/vetomin,vetomax,nbinveto
 c      
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -216,9 +210,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_leptons.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_leptons.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_leptons.f	2016-03-04 16:01:53 +0000
@@ -41,15 +41,10 @@
       character*8 HwUtype(2)
       data HwUtype/'|T@NOCUT','|T@CUT  '/
       integer j,jpr
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
       integer nsingle,ncorr,nlepton,nplots,ncuts
       common/cplots/nsingle,ncorr,nlepton,nplots,ncuts
       integer MAXELM,MAXELP,MAXMUM,MAXMUP
@@ -67,11 +62,10 @@
       integer i,kk,l,icuts,nnn
       integer l0,ilep1,ilep2,io,ipair
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -219,9 +213,8 @@
      # PELM(4,25),PELP(4,25),PMUM(4,25),PMUP(4,25),PLEP(4,25),
      # obs(100)
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lplm.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lplm.f	2016-02-17 14:32:27 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lplm.f	2016-03-04 16:01:53 +0000
@@ -45,21 +45,15 @@
       integer j,kk,l,jpr,i,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -140,9 +134,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lvl.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lvl.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lvl.f	2016-03-04 16:01:53 +0000
@@ -45,21 +45,15 @@
       integer j,kk,l,jpr,i,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -124,9 +118,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_taptam.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_taptam.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_taptam.f	2016-03-04 16:01:53 +0000
@@ -41,21 +41,15 @@
 c
       character*8 HwUtype(2)
       data HwUtype/'|T@NOCUT','|T@CUT  '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -120,9 +114,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_tj.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_tj.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_tj.f	2016-03-04 16:01:53 +0000
@@ -43,21 +43,15 @@
 c
       character*8 HwUtype(2)
       data HwUtype/'|T@NOCUT','|T@CUT  '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -151,9 +145,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_ttx.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_ttx.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_ttx.f	2016-03-04 16:01:53 +0000
@@ -43,21 +43,15 @@
 c
       character*8 HwUtype(2)
       data HwUtype/'|T@NOCUT','|T@CUT  '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -148,9 +142,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_ttx_v2.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_ttx_v2.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_ttx_v2.f	2016-03-04 16:01:53 +0000
@@ -43,21 +43,15 @@
 c
       character*8 HwUtype(2)
       data HwUtype/'|T@NOCUT','|T@CUT  '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -132,9 +126,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_rates.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_rates.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_rates.f	2016-03-04 16:01:53 +0000
@@ -39,21 +39,15 @@
       integer i,kk,l,nnn
       character*5 cc(2)
       data cc/'     ','Born '/
-      integer nwgt,max_weight,nwgt_analysis
-      common/cnwgt/nwgt
+      integer nwgt_analysis
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight),wwwi(max_weight)
-      common/cwgtsinfo/weights_info
+      character*50 weights_info(max_weight_shower)
+     $     ,wwwi(max_weight_shower)
 c
-      weights_info(1)="central value  "
-      do i=1,nnn+1
-         weights_info(i+1)=wwwi(i)
+      do i=1,nnn
+         weights_info(i)=wwwi(i)
       enddo
-      nwgt=nnn+1
+      nwgt=nnn
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)
 c Set method for error estimation to '0', i.e., use Poisson statistics
@@ -105,9 +99,8 @@
       double precision ww(max_weight),www(max_weight),xww(max_weight)
       common/cww/ww
 c
-      ww(1)=xww(2)
       if(nnn.eq.0)ww(1)=1d0
-      do i=2,nnn+1
+      do i=1,nnn
          ww(i)=xww(i)
       enddo
 c

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_V.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_V.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_V.f	2016-03-04 16:01:53 +0000
@@ -27,8 +27,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_h.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_h.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_h.f	2016-03-04 16:01:53 +0000
@@ -17,8 +17,7 @@
       integer nwgt,max_weight,nwgt_analysis,kk,l
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       call inihist
       nwgt_analysis=nwgt

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_hjj.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_hjj.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_hjj.f	2016-03-04 16:01:53 +0000
@@ -16,8 +16,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       character*8 cc(2)
       data cc/'        ','vbfcuts '/

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_leptons.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_leptons.f	2014-02-12 10:28:36 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_leptons.f	2016-03-04 16:01:53 +0000
@@ -17,8 +17,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       integer nsingle,ncorr,nlepton,nplots,ncuts
       common/cplots/nsingle,ncorr,nlepton,nplots,ncuts

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_lplm.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_lplm.f	2016-02-17 14:32:27 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_lplm.f	2016-03-04 16:01:53 +0000
@@ -22,8 +22,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       call inihist
       nwgt_analysis=nwgt

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_lvl.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_lvl.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_lvl.f	2016-03-04 16:01:53 +0000
@@ -25,8 +25,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_taptam.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_taptam.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_taptam.f	2016-03-04 16:01:53 +0000
@@ -20,8 +20,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       call inihist
       nwgt_analysis=nwgt

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_tj.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_tj.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_tj.f	2016-03-04 16:01:53 +0000
@@ -21,8 +21,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
       call inihist
       nwgt_analysis=nwgt

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_ttx.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_ttx.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_ttx.f	2016-03-04 16:01:53 +0000
@@ -22,8 +22,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_ttx_v2.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_ttx_v2.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_pp_ttx_v2.f	2016-03-04 16:01:53 +0000
@@ -22,8 +22,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_rates.f'
--- Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_rates.f	2014-03-07 07:46:55 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/mcatnlo_pyan_rates.f	2016-03-04 16:01:53 +0000
@@ -19,8 +19,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
       call inihist

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_V.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_V.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_V.f	2016-03-04 16:01:53 +0000
@@ -51,11 +51,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_h.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_h.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_h.f	2016-03-04 16:01:53 +0000
@@ -48,11 +48,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
 c Initialize histograms

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_hjj.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_hjj.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_hjj.f	2016-03-04 16:01:53 +0000
@@ -52,11 +52,7 @@
       common /to_veto_hist/vetomin,vetomax,nbinveto
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
 c Initialize histograms

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_leptons.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_leptons.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_leptons.f	2016-03-04 16:01:53 +0000
@@ -59,11 +59,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_lplm.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_lplm.f	2016-02-17 14:32:27 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_lplm.f	2016-03-04 16:01:53 +0000
@@ -48,11 +48,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_lvl.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_lvl.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_lvl.f	2016-03-04 16:01:53 +0000
@@ -50,11 +50,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_taptam.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_taptam.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_taptam.f	2016-03-04 16:01:53 +0000
@@ -46,11 +46,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
 c Initialize histograms

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_tj.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_tj.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_tj.f	2016-03-04 16:01:53 +0000
@@ -48,11 +48,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
 c Initialize histograms

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_ttx.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_ttx.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_ttx.f	2016-03-04 16:01:53 +0000
@@ -48,11 +48,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
 c Initialize histograms

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_ttx_v2.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_ttx_v2.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_pp_ttx_v2.f	2016-03-04 16:01:53 +0000
@@ -48,11 +48,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c
 c Initialize histograms

=== modified file 'Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_rates.f'
--- Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_rates.f	2015-12-04 15:47:32 +0000
+++ Template/NLO/MCatNLO/PYAnalyzer/py6an_HwU_rates.f	2016-03-04 16:01:53 +0000
@@ -42,11 +42,7 @@
       integer nwgt,max_weight,nwgt_analysis
       common/cnwgt/nwgt
       common/c_analysis/nwgt_analysis
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
 c Initialize histograms
       call HwU_inithist(nwgt,weights_info)

=== modified file 'Template/NLO/MCatNLO/include/LHEFRead.h'
--- Template/NLO/MCatNLO/include/LHEFRead.h	2015-06-12 07:55:36 +0000
+++ Template/NLO/MCatNLO/include/LHEFRead.h	2016-03-04 16:01:53 +0000
@@ -16,75 +16,41 @@
   LHEF::Reader reader;
 
 
-  void lhef_read_wgtsinfo_(int &cwgtinfo_nn, char (cwgtinfo_weights_info[350][15])) {
+  void lhef_read_wgtsinfo_(int &cwgtinfo_nn, char (cwgtinfo_weights_info[1024][50])) {
 
     // Read header of event file
     std::stringstream hss;
-    std::string hs,hsvec[5];
-    cwgtinfo_nn=0;
-
+    std::string hs;
+    sprintf(cwgtinfo_weights_info[0], "%50s","central value");
+    cwgtinfo_nn=1;
     while (true){
       hss << reader.headerBlock;
       std::getline(hss,hs,'\n');
       if (hs.find("</header>") != std::string::npos) break;
-
-      // Read the scale block
-      if (hs.find("<weightgroup type='scale_variation'") != std::string::npos) {
-	while (true) {
-	  std::getline(hss,hs,'\n');
-	  if (hs.find("</weightgroup>") != std::string::npos) break;
-          //find the values of muR and muF
-	  std::string xmuR = hs.substr(hs.find("muR")+4,hs.length());
-	  xmuR = xmuR.substr(0,xmuR.find("muF")-1);
-	  std::string xmuF = hs.substr(hs.find("muF")+4,hs.length());
-	  xmuF = xmuF.substr(0,xmuF.find("</w")-1);
-	  double muR = atof(xmuR.c_str());
-	  double muF = atof(xmuF.c_str());
-          //store the plot label
-          sprintf(cwgtinfo_weights_info[cwgtinfo_nn], "muR=%2.1f muF=%2.1f", muR, muF);
-	  ++cwgtinfo_nn;
-	}
-      }
-
-      // Read the PDF block
-      if (hs.find("<weightgroup type='PDF_variation'") != std::string::npos) {
-	while (true) {
-	  std::getline(hss,hs,'\n');
-	  if (hs.find("</weightgroup>") != std::string::npos) break;
-          //find the PDF set used
-	  std::string PDF = hs.substr(hs.find("pdfset")+8,hs.length());
-	  PDF = PDF.substr(0,PDF.find("</w")-1);
-          int iPDF = atoi(PDF.c_str());
-          //store the plot label
-          sprintf(cwgtinfo_weights_info[cwgtinfo_nn], "PDF=%8d   ", iPDF);
-	  ++cwgtinfo_nn;
-	}
-      }
-
-      // Read the mg_reweighting block
-      if (hs.find("<weightgroup type='mg_reweighting'") != std::string::npos) {
-	while (true) {
-	  std::getline(hss,hs,'\n');
-	  if (hs.find("</weightgroup>") != std::string::npos) break;
+      // Read the wgt information
+      if (hs.find("<initrwgt>") != std::string::npos) {
+	while (true) {
+	  std::getline(hss,hs,'\n');
+	  if (hs.find("</initrwgt>") != std::string::npos) break;
+	  if (hs.find("<weightgroup") != std::string::npos) continue;
+	  if (hs.find("</weightgroup>") != std::string::npos) continue;
 	  if (hs.find("<weight id") != std::string::npos) {
-	    std::string sRWGT = hs.substr(hs.find("weight id")+11,hs.length());
-	    sRWGT = sRWGT.substr(0,sRWGT.find("'>"));
-	    //store the reweight label
-	    sprintf(cwgtinfo_weights_info[cwgtinfo_nn], "%15s", sRWGT.c_str());
+	    std::string sRWGT = hs.substr(hs.find("'>")+2,hs.find("</w")-3);
+	    sRWGT = sRWGT.substr(0,sRWGT.find("<"));
+	    sprintf(cwgtinfo_weights_info[cwgtinfo_nn],"%50s",sRWGT.c_str());
 	    ++cwgtinfo_nn;
 	  }
 	}
       }
-
+      
     }
   }
 
 
-  void lhef_read_wgts_(double (cwgt_ww[350])) {
+  void lhef_read_wgts_(double (cwgt_ww[1024])) {
     
     // Read events
     if (reader.readEvent()) {
-      double wgtxsecmu[4][4],wgtxsecPDF[200];
       std::string svec[16],isvec[4],refstr;
       std::stringstream ss;
       int i,j;
@@ -129,7 +95,6 @@
 	    ++iww;
 	  }
 	}
-	iww-=1;
       }
     }
   }

=== modified file 'Template/NLO/MCatNLO/srcHerwig/madfks_hwlhin.f'
--- Template/NLO/MCatNLO/srcHerwig/madfks_hwlhin.f	2015-06-12 07:34:40 +0000
+++ Template/NLO/MCatNLO/srcHerwig/madfks_hwlhin.f	2016-03-04 16:01:53 +0000
@@ -35,15 +35,11 @@
       DOUBLE PRECISION EVWGT_LH
       COMMON/CEVWGT_LH/EVWGT_LH
       include 'reweight0.inc'
-      integer iww,max_weight
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      double precision ww(max_weight)
+      integer iww
+      double precision ww(max_weight_shower)
       common/cww/ww
-      integer numRWGTS
-      common/cnrwgts/numRWGTS
+      integer nwgt
+      common/cnwgt/nwgt
 C
       IF (IERROR.NE.0) RETURN
 c
@@ -78,104 +74,15 @@
      #                    scale1_lhe,scale2_lhe,
      #                    jwgtinfo,mexternal,iwgtnumpartn,
      #         wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
-        if(jwgtinfo.ge.1.and.jwgtinfo.le.4)then
-          read(iunit,'(a)')string
-          read(iunit,401)wgtref,wgtqes2(2)
-          read(iunit,402)wgtxbj(1,1),wgtxbj(2,1),
-     #                   wgtxbj(1,2),wgtxbj(2,2),
-     #                   wgtxbj(1,3),wgtxbj(2,3),
-     #                   wgtxbj(1,4),wgtxbj(2,4)
-          if(jwgtinfo.eq.1)then
-            read(iunit,403)wgtmuR2(1),wgtmuF12(1),wgtmuF22(1),
-     #                     wgtmuR2(2),wgtmuF12(2),wgtmuF22(2)
-          elseif(jwgtinfo.eq.2)then
-            ii=iSorH_lhe+1
-            if(ii.eq.3)ii=1
-            read(iunit,404)wgtmuR2(ii),wgtmuF12(ii),wgtmuF22(ii)
-            do i=1,mexternal
-              read(iunit,405)(wgtkinE(j,i,iSorH_lhe),j=0,3)
-            enddo
-          elseif(jwgtinfo.eq.3 .or. jwgtinfo.eq.4)then
-            do i=1,mexternal
-              read(iunit,405)(wgtkinE(j,i,1),j=0,3)
-            enddo
-            do i=1,mexternal
-              read(iunit,405)(wgtkinE(j,i,2),j=0,3)
-            enddo
-          endif
-          read(iunit,441)wgtwreal(1),wgtwreal(2),
-     #                   wgtwreal(3),wgtwreal(4)
-          read(iunit,441)wgtwdeg(3),wgtwdeg(4),
-     #                   wgtwdegmuf(3),wgtwdegmuf(4)
-          read(iunit,405)wgtwborn(2),wgtwns(2),
-     #                    wgtwnsmuf(2),wgtwnsmur(2)
-          do i=1,iwgtnumpartn
-            read(iunit,442)wgtwmcxsecE(i),
-     #                     wgtmcxbjE(1,i),wgtmcxbjE(2,i)
-          enddo
-          if(jwgtinfo.eq.4) read(iunit,'(1x,e14.8)') wgtbpower
-          read(iunit,'(a)')string
-        elseif(jwgtinfo.eq.8)then
-          read(iunit,'(a)')string
-          read(iunit,406)wgtref,wgtxsecmu(1,1),numscales,numPDFpairs
-          do i=1,numscales
-            read(iunit,404)(wgtxsecmu(i,j),j=1,numscales)
-          enddo
-          do i=1,numPDFpairs
-            nps=2*i-1
-            nng=2*i
-            read(iunit,404)wgtxsecPDF(nps),wgtxsecPDF(nng)
-          enddo
-          read(iunit,'(a)')string
-        elseif(jwgtinfo.eq.9)then
-          if (numscales.eq.0 .and. numPDFpairs.eq.0) then
-             write (*,*) 'event file not correct format'
-             write(*,*)'FATAL ERROR #3 IN UPEVNT'
-             stop
-          endif
-          read(iunit,'(a)')string
-          wgtref=XWGTUP/MQQ
-          do i=1,numscales
-             do j=1,numscales
-                call read_rwgt_line(iunit,idwgt,wgtxsecmu(i,j))
-                if (numscales.ne.3) then
-                   write (*,*) 'ERROR #1 in UPEVNT:',numscales
-                   stop
-                endif
-                if(idwgt.eq.1001.and.(i.ne.1.or.j.ne.1).or.
-     &             idwgt.eq.1002.and.(i.ne.1.or.j.ne.2).or.
-     &             idwgt.eq.1003.and.(i.ne.1.or.j.ne.3).or.
-     &             idwgt.eq.1004.and.(i.ne.2.or.j.ne.1).or.
-     &             idwgt.eq.1005.and.(i.ne.2.or.j.ne.2).or.
-     &             idwgt.eq.1006.and.(i.ne.2.or.j.ne.3).or.
-     &             idwgt.eq.1007.and.(i.ne.3.or.j.ne.1).or.
-     &             idwgt.eq.1008.and.(i.ne.3.or.j.ne.2).or.
-     &             idwgt.eq.1009.and.(i.ne.3.or.j.ne.3))then
-                   write(*,*)'incorrect event wgt id',idwgt,i,j
-                   stop
-                endif
-c 1 = central,
-c 2 = (muR0,muF0),    3 = (muR0,muFup),     4 = (muR0,muFdown)
-c 5 = (muRup,muF0),   6 = (muRup,muFup),    7 = (muRup,muFdown)
-c 8 = (muRdown,muF0), 9 = (muRdown,muFup), 10 = (muRdown,muFdown)
-                iww=iww+1
-                ww(iww)=wgtxsecmu(i,j)
+        if(jwgtinfo.eq.9)then
+          if (nwgt.gt.1) then
+             read(iunit,'(a)')string ! <rwgt>
+             wgtref=XWGTUP/MQQ
+             do iww=2,nwgt      ! start at 2, because 'central value' is not part of the extra weights
+                call read_rwgt_line_wgt(iunit,ww(iww))
              enddo
-          enddo
-          do i=1,2*numPDFpairs
-             call read_rwgt_line(iunit,idwgt,wgtxsecPDF(i))
-             iww=iww+1
-             ww(iww)=wgtxsecPDF(i)
-          enddo
-          do i=1,numRWGTS
-             call read_rwgt_line_RWGT(iunit,cidwgt,wgtxsecRWGT(i))
-             iww=iww+1
-             ww(iww)=wgtxsecRWGT(i)
-          enddo
-          if (numscales.eq.0) then
-             wgtxsecmu(1,1)=wgtref
+             read(iunit,'(a)')string ! </rwgt>
           endif
-          read(iunit,'(a)')string
         else
           do while(index(string,'</event>').eq.0)
              read(iunit,'(a)')string
@@ -233,80 +140,48 @@
      &              ICOLUP(2,MAXNUP),PUP(5,MAXNUP),VTIMUP(MAXNUP),
      &              SPINUP(MAXNUP)
 c Hard event file (to be entered in Herwig driver)
+      integer i
       CHARACTER*50 QQIN
       COMMON/VVJIN/QQIN
       CHARACTER*80 STRING
       include 'reweight0.inc'
-      integer nwgt,max_weight
+      integer nwgt
       common/cnwgt/nwgt
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
-      double precision xmuR,xmuF
-      integer iPDF,i,numRWGTS
-      common/cnrwgts/numRWGTS
-      character*20 sRWGT
-C
-      numscales=0
-      numPDFpairs=0
-      numRWGTS=0
+      
       nwgt=1
-      weights_info(nwgt)="central value  "
+      weights_info(nwgt)="central value"
       IF (IERROR.NE.0) RETURN
 C--SET UP INPUT FILES
       OPEN(UNIT=61,FILE=QQIN,STATUS='UNKNOWN')
-C--Read (non compulsory) headers here if need be
-      DO WHILE(.TRUE.)
+C--Read (non compulsory) headers here if need be. Look for extra
+C--weights.
+      do
          READ(61,'(a)')STRING
-c --> see if we have the new format for the weights
-         IF ( INDEX(STRING,"<weightgroup type='scale_variation'").ne.0
-     $        .and.STRING(1:1).ne.'#') then
-            DO WHILE (.TRUE.)
-               READ(61,'(a)') STRING
-               if (INDEX(STRING,"</weightgroup>").ne.0 .and.
-     $              STRING(1:1).ne.'#') exit
-               numscales=numscales+1
-               read(string(index(string,"muR")+4:index(string,"muF")-1),*)xmuR
-               read(string(index(string,"muF")+4:index(string,"</w")-1),*)xmuF
-c 1 = central,
-c 2 = (muR0,muF0),    3 = (muR0,muFup),     4 = (muR0,muFdown)
-c 5 = (muRup,muF0),   6 = (muRup,muFup),    7 = (muRup,muFdown)
-c 8 = (muRdown,muF0), 9 = (muRdown,muFup), 10 = (muRdown,muFdown)
-               write(weights_info(numscales+1), 111)"muR=",xmuR,"muF=",xmuF
-            ENDDO
-            nwgt=nwgt+numscales
-            numscales=nint(sqrt(dble(numscales)))
-            if (numscales.ne.3) then
-               write (*,*) 'ERROR #1 in UPINIT:',numscales
-               stop
-            endif
-         ELSEIF( INDEX(STRING,"<weightgroup type='PDF_variation'").ne.0
-     $           .and.STRING(1:1).ne.'#') then
-            DO WHILE (.TRUE.)
-               READ(61,'(a)') STRING
-               if (INDEX(STRING,"</weightgroup>").ne.0 .and.
-     $              STRING(1:1).ne.'#') exit
-               numPDFpairs=numPDFpairs+1
-               read(string(index(string,"pdf")+7:index(string,"</w")-1),*)iPDF
-               write(weights_info(numscales**2+numPDFpairs+1),112)
-     &              'PDF=',iPDF,'   '
-            ENDDO
-            nwgt=nwgt+numPDFpairs
-            numPDFpairs=numPDFpairs/2
-         ELSEIF( INDEX(STRING,"<weightgroup type='mg_reweighting'").ne.0
-     $           .and.STRING(1:1).ne.'#') then
-            DO WHILE (.TRUE.)
-               READ(61,'(a)') STRING
-               if (INDEX(STRING,"<weight id").ne.0 .and.
-     $              STRING(1:1).ne.'#')then
-                  numRWGTS=numRWGTS+1
-                  read(string(index(string,"weight id")+11:index(string,"'>")-1),*)sRWGT
-                  write(weights_info(numscales**2+2*numPDFpairs+numRWGTS+1),113)sRWGT
+         if (index(string,'<initrwgt>').ne.0) then
+c Found extra weight labels:  
+            do
+               READ(61,'(a)')STRING
+c     exit when end of weight information is found
+               IF ( INDEX(STRING,'</initrwgt>').ne.0 .and.
+     &              STRING(1:1).ne.'#' ) exit
+c     skip comments and weightgroup lines. We just need to copy this
+c     information
+               if ( index(string,"<weightgroup").ne.0 .or.
+     &              index(string,"</weightgroup>").ne.0 .or.
+     &              string(1:1).eq.'#') cycle
+               if (INDEX(STRING,"<weight id").ne.0)then
+                  nwgt=nwgt+1
+                  read(string(index(string,"'>")+2: index(string
+     $                 ,"</weight>")-1),'(a)') weights_info(nwgt)
+                  if (nwgt.gt.max_weight_shower) then
+                     write (*,*) 'Too many weights in event file. '/
+     $                    /'Increase max_weight_shower'
+                     stop
+                  endif
                endif
-               if (INDEX(STRING,"</weightgroup>").ne.0 .and.
-     $              STRING(1:1).ne.'#') exit
-            ENDDO
-            nwgt=nwgt+numRWGTS
+            enddo
          ELSEIF ( INDEX(STRING,'</header>').ne.0 .and.
      &        STRING(1:1).ne.'#' ) then
             EXIT
@@ -396,43 +271,18 @@
       END
 
 
-      subroutine read_rwgt_line(unit,id,wgt)
-c read a line in the <rwgt> tag. The syntax should be
-c  <wgt id='1001'> 0.1234567e+01 </wgt>
-c The id should be exactly 4 digits long.
-      implicit none
-      integer unit,id,wgt_start,id_start
-      double precision wgt
-      character*100 buff
-      read (unit,'(a)') buff
-c Use char() to make sure that the non-standard characters are compiler
-c independent (char(62)=">", char(61)="=", char(39)="'")
-      wgt_start=index(buff,CHAR(39)//CHAR(62))+2
-      id_start=index(buff,'id'//CHAR(61)//CHAR(39))+4
-      read (buff(id_start:100),'(i4)') id
-      read (buff(wgt_start:100),*) wgt
-      return
-      end
-
-
-      subroutine read_rwgt_line_RWGT(unit,cid,wgt)
-c read a line in the <rwgt> tag. The syntax should be
-c  <wgt id='1001'> 0.1234567e+01 </wgt>
-c The id should be exactly 4 digits long.
-      implicit none
-      integer unit,wgt_start,id_start,id_end
-      double precision wgt
-      character*100 buff
-      character*20 cid
-      read (unit,'(a)') buff
-c Use char() to make sure that the non-standard characters are compiler
-c independent (char(62)=">", char(61)="=", char(39)="'")
-      wgt_start=index(buff,CHAR(39)//CHAR(62))+2
-      id_start=index(buff,'id'//CHAR(61)//CHAR(39))+4
-      id_end=wgt_start-3
-
-      read (buff(id_start:id_end),*) cid
-      read (buff(wgt_start:100),*) wgt
-
+      subroutine read_rwgt_line_wgt(unit,wgt)
+c read a line in the <rwgt> tag. The syntax should be
+c  <wgt id='1001'> 0.1234567e+01 </wgt>
+c The id should be exactly 4 digits long.
+      implicit none
+      integer unit,wgt_start
+      double precision wgt
+      character*100 buff
+      read (unit,'(a)') buff
+c Use char() to make sure that the non-standard characters are compiler
+c independent (char(62)=">", char(61)="=", char(39)="'")
+      wgt_start=index(buff,CHAR(39)//CHAR(62))+2
+      read (buff(wgt_start:100),*) wgt
       return
       end

=== modified file 'Template/NLO/MCatNLO/srcPythia/madfks_pylhin.f'
--- Template/NLO/MCatNLO/srcPythia/madfks_pylhin.f	2015-06-12 07:34:40 +0000
+++ Template/NLO/MCatNLO/srcPythia/madfks_pylhin.f	2016-03-04 16:01:53 +0000
@@ -34,15 +34,11 @@
       DOUBLE PRECISION EVWGT_LH
       COMMON/CEVWGT_LH/EVWGT_LH
       include 'reweight0.inc'
-      integer iww,max_weight
-      integer maxRWGT
-      parameter (maxRWGT=100)
-      double precision wgtxsecRWGT(maxRWGT)
-      parameter (max_weight=maxscales*maxscales+maxpdfs+maxRWGT+1)
-      double precision ww(max_weight)
+      integer iww
+      double precision ww(max_weight_shower)
       common/cww/ww
-      integer numRWGTS
-      common/cnrwgts/numRWGTS
+      integer nwgt
+      common/cnwgt/nwgt
 C
       COMMON/PYPARS/MSTP(200),PARP(200),MSTI(200),PARI(200)
       DOUBLE PRECISION EVWEIGHT
@@ -81,104 +77,15 @@
      #                    scale1_lhe,scale2_lhe,
      #                    jwgtinfo,mexternal,iwgtnumpartn,
      #         wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
-        if(jwgtinfo.ge.1.and.jwgtinfo.le.4)then
-          read(iunit,'(a)')string
-          read(iunit,401)wgtref,wgtqes2(2)
-          read(iunit,402)wgtxbj(1,1),wgtxbj(2,1),
-     #                   wgtxbj(1,2),wgtxbj(2,2),
-     #                   wgtxbj(1,3),wgtxbj(2,3),
-     #                   wgtxbj(1,4),wgtxbj(2,4)
-          if(jwgtinfo.eq.1)then
-            read(iunit,403)wgtmuR2(1),wgtmuF12(1),wgtmuF22(1),
-     #                     wgtmuR2(2),wgtmuF12(2),wgtmuF22(2)
-          elseif(jwgtinfo.eq.2)then
-            ii=iSorH_lhe+1
-            if(ii.eq.3)ii=1
-            read(iunit,404)wgtmuR2(ii),wgtmuF12(ii),wgtmuF22(ii)
-            do i=1,mexternal
-              read(iunit,405)(wgtkinE(j,i,iSorH_lhe),j=0,3)
-            enddo
-          elseif(jwgtinfo.eq.3 .or. jwgtinfo.eq.4)then
-            do i=1,mexternal
-              read(iunit,405)(wgtkinE(j,i,1),j=0,3)
-            enddo
-            do i=1,mexternal
-              read(iunit,405)(wgtkinE(j,i,2),j=0,3)
-            enddo
-          endif
-          read(iunit,441)wgtwreal(1),wgtwreal(2),
-     #                   wgtwreal(3),wgtwreal(4)
-          read(iunit,441)wgtwdeg(3),wgtwdeg(4),
-     #                   wgtwdegmuf(3),wgtwdegmuf(4)
-          read(iunit,405)wgtwborn(2),wgtwns(2),
-     #                    wgtwnsmuf(2),wgtwnsmur(2)
-          do i=1,iwgtnumpartn
-            read(iunit,442)wgtwmcxsecE(i),
-     #                     wgtmcxbjE(1,i),wgtmcxbjE(2,i)
-          enddo
-          if(jwgtinfo.eq.4) read(iunit,'(1x,e14.8)') wgtbpower
-          read(iunit,'(a)')string
-        elseif(jwgtinfo.eq.8)then
-          read(iunit,'(a)')string
-          read(iunit,406)wgtref,wgtxsecmu(1,1),numscales,numPDFpairs
-          do i=1,numscales
-            read(iunit,404)(wgtxsecmu(i,j),j=1,numscales)
-          enddo
-          do i=1,numPDFpairs
-            nps=2*i-1
-            nng=2*i
-            read(iunit,404)wgtxsecPDF(nps),wgtxsecPDF(nng)
-          enddo
-          read(iunit,'(a)')string
-        elseif(jwgtinfo.eq.9)then
-          if (numscales.eq.0 .and. numPDFpairs.eq.0) then
-             write (*,*) 'event file not correct format'
-             write(*,*)'FATAL ERROR #3 IN UPEVNT'
-             stop
-          endif
-          read(iunit,'(a)')string
-          wgtref=XWGTUP/MQQ
-          do i=1,numscales
-             do j=1,numscales
-                call read_rwgt_line(iunit,idwgt,wgtxsecmu(i,j))
-                if (numscales.ne.3) then
-                   write (*,*) 'ERROR #1 in UPEVNT:',numscales
-                   stop
-                endif
-                if(idwgt.eq.1001.and.(i.ne.1.or.j.ne.1).or.
-     &             idwgt.eq.1002.and.(i.ne.1.or.j.ne.2).or.
-     &             idwgt.eq.1003.and.(i.ne.1.or.j.ne.3).or.
-     &             idwgt.eq.1004.and.(i.ne.2.or.j.ne.1).or.
-     &             idwgt.eq.1005.and.(i.ne.2.or.j.ne.2).or.
-     &             idwgt.eq.1006.and.(i.ne.2.or.j.ne.3).or.
-     &             idwgt.eq.1007.and.(i.ne.3.or.j.ne.1).or.
-     &             idwgt.eq.1008.and.(i.ne.3.or.j.ne.2).or.
-     &             idwgt.eq.1009.and.(i.ne.3.or.j.ne.3))then
-                   write(*,*)'incorrect event wgt id',idwgt,i,j
-                   stop
-                endif
-c 1 = central,
-c 2 = (muR0,muF0),    3 = (muR0,muFup),     4 = (muR0,muFdown)
-c 5 = (muRup,muF0),   6 = (muRup,muFup),    7 = (muRup,muFdown)
-c 8 = (muRdown,muF0), 9 = (muRdown,muFup), 10 = (muRdown,muFdown)
-                iww=iww+1
-                ww(iww)=wgtxsecmu(i,j)
-             enddo
-          enddo
-          do i=1,2*numPDFpairs
-             call read_rwgt_line(iunit,idwgt,wgtxsecPDF(i))
-             iww=iww+1
-             ww(iww)=wgtxsecPDF(i)
-          enddo
-          do i=1,numRWGTS
-             call read_rwgt_line_RWGT(iunit,cidwgt,wgtxsecRWGT(i))
-             iww=iww+1
-             ww(iww)=wgtxsecRWGT(i)
-          enddo
-          if (numscales.eq.0) then
-             wgtxsecmu(1,1)=wgtref
-          endif
-          read(iunit,'(a)')string
+        if(jwgtinfo.eq.9)then
+           if (nwgt.gt.1) then
+              read(iunit,'(a)')string ! <rwgt>
+              wgtref=XWGTUP/MQQ
+              do iww=2,nwgt     ! start at 2, because 'central value' is not part of the extra weights
+                 call read_rwgt_line_wgt(iunit,ww(iww))
+              enddo
+              read(iunit,'(a)')string ! </rwgt>
+           endif
         else
           do while(index(string,'</event>').eq.0)
              read(iunit,'(a)')string
@@ -235,20 +142,16 @@
      &              ICOLUP(2,MAXNUP),PUP(5,MAXNUP),VTIMUP(MAXNUP),
      &              SPINUP(MAXNUP)
 c Hard event file (to be entered in Herwig driver)
+      integer i
       CHARACTER*50 QQIN
       COMMON/VVJIN/QQIN
       CHARACTER*80 STRING
       common/pypars/mstp(200),parp(200),msti(200),pari(200)
       include 'reweight0.inc'
-      integer nwgt,max_weight
+      integer nwgt
       common/cnwgt/nwgt
-      parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
+      character*50 weights_info(max_weight_shower)
       common/cwgtsinfo/weights_info
-      double precision xmuR,xmuF
-      integer iPDF,i,numRWGTS
-      common/cnrwgts/numRWGTS
-      character*20 sRWGT
 C
       numscales=0
       numPDFpairs=0
@@ -257,58 +160,33 @@
       weights_info(nwgt)="central value  "
 C--SET UP INPUT FILES
       OPEN(UNIT=61,FILE=QQIN,STATUS='UNKNOWN')
-C--Read (non compulsory) headers here if need be
-      DO WHILE(.TRUE.)
+C--Read (non compulsory) headers here if need be. Look for extra
+C--weights.
+      do
          READ(61,'(a)')STRING
-c --> see if we have the new format for the weights
-         IF ( INDEX(STRING,"<weightgroup type='scale_variation'").ne.0
-     $        .and.STRING(1:1).ne.'#') then
-            DO WHILE (.TRUE.)
-               READ(61,'(a)') STRING
-               if (INDEX(STRING,"</weightgroup>").ne.0 .and.
-     $              STRING(1:1).ne.'#') exit
-               numscales=numscales+1
-               read(string(index(string,"muR")+4:index(string,"muF")-1),*)xmuR
-               read(string(index(string,"muF")+4:index(string,"</w")-1),*)xmuF
-c 1 = central,
-c 2 = (muR0,muF0),    3 = (muR0,muFup),     4 = (muR0,muFdown)
-c 5 = (muRup,muF0),   6 = (muRup,muFup),    7 = (muRup,muFdown)
-c 8 = (muRdown,muF0), 9 = (muRdown,muFup), 10 = (muRdown,muFdown)
-               write(weights_info(numscales+1), 111)"muR=",xmuR,"muF=",xmuF
-            ENDDO
-            nwgt=nwgt+numscales
-            numscales=nint(sqrt(dble(numscales)))
-            if (numscales.ne.3) then
-               write (*,*) 'ERROR #1 in UPINIT:',numscales
-               stop
-            endif
-         ELSEIF( INDEX(STRING,"<weightgroup type='PDF_variation'").ne.0
-     $           .and.STRING(1:1).ne.'#') then
-            DO WHILE (.TRUE.)
-               READ(61,'(a)') STRING
-               if (INDEX(STRING,"</weightgroup>").ne.0 .and.
-     $              STRING(1:1).ne.'#') exit
-               numPDFpairs=numPDFpairs+1
-               read(string(index(string,"pdf")+7:index(string,"</w")-1),*)iPDF
-               write(weights_info(numscales**2+numPDFpairs+1),112)
-     &              'PDF=',iPDF,'   '
-            ENDDO
-            nwgt=nwgt+numPDFpairs
-            numPDFpairs=numPDFpairs/2
-         ELSEIF( INDEX(STRING,"<weightgroup type='mg_reweighting'").ne.0
-     $           .and.STRING(1:1).ne.'#') then
-            DO WHILE (.TRUE.)
-               READ(61,'(a)') STRING
-               if (INDEX(STRING,"<weight id").ne.0 .and.
-     $              STRING(1:1).ne.'#')then
-                  numRWGTS=numRWGTS+1
-                  read(string(index(string,"weight id")+11:index(string,"'>")-1),*)sRWGT
-                  write(weights_info(numscales**2+2*numPDFpairs+numRWGTS+1),113)sRWGT
+         if (index(string,'<initrwgt>').ne.0) then
+c Found extra weight labels:  
+            do
+               READ(61,'(a)')STRING
+c     exit when end of weight information is found
+               IF ( INDEX(STRING,'</initrwgt>').ne.0 .and.
+     &              STRING(1:1).ne.'#' ) exit
+c     skip comments and weightgroup lines. We just need to copy this
+c     information
+               if ( index(string,"<weightgroup").ne.0 .or.
+     &              index(string,"</weightgroup>").ne.0 .or.
+     &              string(1:1).eq.'#') cycle
+               if (INDEX(STRING,"<weight id").ne.0)then
+                  nwgt=nwgt+1
+                  read(string(index(string,"'>")+2: index(string
+     $                 ,"</weight>")-1),'(a)')weights_info(nwgt)
+                  if (nwgt.gt.max_weight_shower) then
+                     write (*,*) 'Too many weights in event file. '/
+     $                    /'Increase max_weight_shower'
+                     stop
+                  endif
                endif
-               if (INDEX(STRING,"</weightgroup>").ne.0 .and.
-     $              STRING(1:1).ne.'#') exit
-            ENDDO
-            nwgt=nwgt+numRWGTS
+            enddo
          ELSEIF ( INDEX(STRING,'</header>').ne.0 .and.
      &        STRING(1:1).ne.'#' ) then
             EXIT
@@ -528,43 +406,18 @@
 
 
 
-      subroutine read_rwgt_line(unit,id,wgt)
-c read a line in the <rwgt> tag. The syntax should be
-c  <wgt id='1001'> 0.1234567e+01 </wgt>
-c The id should be exactly 4 digits long.
-      implicit none
-      integer unit,id,wgt_start,id_start
-      double precision wgt
-      character*100 buff
-      read (unit,'(a)') buff
-c Use char() to make sure that the non-standard characters are compiler
-c independent (char(62)=">", char(61)="=", char(39)="'")
-      wgt_start=index(buff,CHAR(39)//CHAR(62))+2
-      id_start=index(buff,'id'//CHAR(61)//CHAR(39))+4
-      read (buff(id_start:100),'(i4)') id
-      read (buff(wgt_start:100),*) wgt
-      return
-      end
-
-
-      subroutine read_rwgt_line_RWGT(unit,cid,wgt)
-c read a line in the <rwgt> tag. The syntax should be
-c  <wgt id='1001'> 0.1234567e+01 </wgt>
-c The id should be exactly 4 digits long.
-      implicit none
-      integer unit,wgt_start,id_start,id_end
-      double precision wgt
-      character*100 buff
-      character*20 cid
-      read (unit,'(a)') buff
-c Use char() to make sure that the non-standard characters are compiler
-c independent (char(62)=">", char(61)="=", char(39)="'")
-      wgt_start=index(buff,CHAR(39)//CHAR(62))+2
-      id_start=index(buff,'id'//CHAR(61)//CHAR(39))+4
-      id_end=wgt_start-3
-
-      read (buff(id_start:id_end),*) cid
-      read (buff(wgt_start:100),*) wgt
-
+      subroutine read_rwgt_line_wgt(unit,wgt)
+c read a line in the <rwgt> tag. The syntax should be
+c  <wgt id='1001'> 0.1234567e+01 </wgt>
+c The id should be exactly 4 digits long.
+      implicit none
+      integer unit,wgt_start
+      double precision wgt
+      character*100 buff
+      read (unit,'(a)') buff
+c Use char() to make sure that the non-standard characters are compiler
+c independent (char(62)=">", char(61)="=", char(39)="'")
+      wgt_start=index(buff,CHAR(39)//CHAR(62))+2
+      read (buff(wgt_start:100),*) wgt
       return
       end

=== modified file 'Template/NLO/MCatNLO/srcPythia8/Pythia8.cc'
--- Template/NLO/MCatNLO/srcPythia8/Pythia8.cc	2015-06-12 07:55:36 +0000
+++ Template/NLO/MCatNLO/srcPythia8/Pythia8.cc	2016-03-04 16:01:53 +0000
@@ -21,7 +21,7 @@
 #define cevwgt cevwgt_
 
 extern "C" { 
-  void pyabeg_(int&,char(*)[15]);
+  void pyabeg_(int&,char(*)[50]);
   void pyaend_(double&);
   void pyanal_(int&,double(*));
 }
@@ -30,8 +30,8 @@
   Pythia pythia;
 
   int cwgtinfo_nn;
-  char cwgtinfo_weights_info[350][15];
-  double cwgt_ww[350];
+  char cwgtinfo_weights_info[1024][50];
+  double cwgt_ww[1024];
 
   string inputname="Pythia8.cmd",outputname="Pythia8.hep";
 
@@ -135,6 +135,7 @@
     for (; iLHEFread<nTry ; ++iLHEFread) {
       read.lhef_read_wgts_(cwgt_ww);
     }
+    cwgt_ww[0]=cevwgt.EVWGT;
     pyanal_(cwgtinfo_nn,cwgt_ww);
 
     if (iEvent % nstep == 0 && iEvent >= 100){

=== modified file 'Template/NLO/MCatNLO/srcPythia8/Pythia82.cc'
--- Template/NLO/MCatNLO/srcPythia8/Pythia82.cc	2015-06-12 07:55:36 +0000
+++ Template/NLO/MCatNLO/srcPythia8/Pythia82.cc	2016-03-04 16:01:53 +0000
@@ -22,7 +22,7 @@
 #define cevwgt cevwgt_
 
 extern "C" { 
-  void pyabeg_(int&,char(*)[15]);
+  void pyabeg_(int&,char(*)[50]);
   void pyaend_(double&);
   void pyanal_(int&,double(*));
 }
@@ -31,8 +31,8 @@
   Pythia pythia;
 
   int cwgtinfo_nn;
-  char cwgtinfo_weights_info[350][15];
-  double cwgt_ww[350];
+  char cwgtinfo_weights_info[1024][50];
+  double cwgt_ww[1024];
 
   string inputname="Pythia8.cmd",outputname="Pythia8.hep";
 
@@ -141,6 +141,7 @@
     for (; iLHEFread<nTry ; ++iLHEFread) {
       read.lhef_read_wgts_(cwgt_ww);
     }
+    cwgt_ww[0]=cevwgt.EVWGT;
     pyanal_(cwgtinfo_nn,cwgt_ww);
 
     if (iEvent % nstep == 0 && iEvent >= 100){

=== modified file 'Template/NLO/Source/PDF/pdfwrap.f'
--- Template/NLO/Source/PDF/pdfwrap.f	2014-05-16 08:09:51 +0000
+++ Template/NLO/Source/PDF/pdfwrap.f	2016-03-04 16:01:53 +0000
@@ -292,3 +292,30 @@
       end
  
 
+      subroutine numberPDFm(idummy)
+      implicit none
+      integer idummy
+      write (*,*) 'ERROR: YOU ARE IN THE numberPDFm SUBROUTINE.'
+      write (*,*) 'THIS SUBROUTINE SHOULD NEVER BE USED'
+      stop
+      return
+      end
+
+      subroutine initPDFm(idummy1,idummy2)
+      implicit none
+      integer idummy1,idummy2
+      write (*,*) 'ERROR: YOU ARE IN THE initPDFm SUBROUTINE.'
+      write (*,*) 'THIS SUBROUTINE SHOULD NEVER BE USED'
+      stop
+      return
+      end
+
+      subroutine initPDFsetbynamem(idummy,cdummy)
+      implicit none
+      integer idummy
+      character*(*) cdummy
+      write (*,*) 'ERROR: YOU ARE IN THE initPDFsetbynamem SUBROUTINE.'
+      write (*,*) 'THIS SUBROUTINE SHOULD NEVER BE USED'
+      stop
+      return
+      end

=== modified file 'Template/NLO/Source/PDF/pdg2pdf_lhapdf.f'
--- Template/NLO/Source/PDF/pdg2pdf_lhapdf.f	2015-10-21 14:57:34 +0000
+++ Template/NLO/Source/PDF/pdg2pdf_lhapdf.f	2016-03-04 16:01:53 +0000
@@ -35,7 +35,7 @@
       include 'pdf.inc'
 C      
       integer i,j,ihlast(20),ipart,iporg,ireuse,imemlast(20),iset,imem
-     &     ,i_replace,ii
+     &     ,i_replace,ii,isetlast(20)
       double precision xlast(20),xmulast(20),pdflast(-7:7,20)
       save ihlast,xlast,xmulast,pdflast,imemlast
       data ihlast/20*-99/
@@ -43,6 +43,7 @@
       data xmulast/20*-99d9/
       data pdflast/300*-99d9/
       data imemlast/20*-99/
+      data isetlast/20*-99/
       data i_replace/20/
 
       if (ih.eq.0) then
@@ -59,8 +60,6 @@
          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
 
@@ -74,19 +73,11 @@
          write(*,*) 'PDF not supported for pdg ',ipdg
          write(*,*) 'For lepton colliders, please set the lpp* '//
      $    'variables to 0 in the run_card'  
-         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)
@@ -100,8 +91,10 @@
             if (x.eq.xlast(ii)) then
                if (xmu.eq.xmulast(ii)) then
                   if (imem.eq.imemlast(ii)) then
-                     ireuse = ii
-                     exit
+                     if (iset.eq.isetlast(ii)) then
+                        ireuse = ii
+                        exit
+                     endif
                   endif
                endif
             endif
@@ -128,6 +121,7 @@
       xmulast(i_replace)=xmu
       ihlast(i_replace)=ih
       imemlast(i_replace)=imem
+      isetlast(i_replace)=iset
 c
       pdg2pdf=pdflast(ipart,i_replace)
       return

=== modified file 'Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f'
--- Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f	2016-02-02 17:38:59 +0000
+++ Template/NLO/Source/PDF/pdg2pdf_lhapdf6.f	2016-03-04 16:01:53 +0000
@@ -35,7 +35,7 @@
       include 'pdf.inc'
 C      
       integer i,j,ihlast(20),ipart,iporg,ireuse,imemlast(20),iset,imem
-     &     ,i_replace,ii,ipartlast(20)
+     &     ,i_replace,ii,ipartlast(20),isetlast(20)
       double precision xlast(20),xmulast(20),pdflast(20)
       save ihlast,xlast,xmulast,pdflast,imemlast,ipartlast
       data ihlast/20*-99/
@@ -44,6 +44,7 @@
       data xmulast/20*-99d9/
       data pdflast/20*-99d9/
       data imemlast/20*-99/
+      data isetlast/20*-99/
       data i_replace/20/
 
       if (ih.eq.0) then
@@ -60,8 +61,6 @@
          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
 
@@ -75,20 +74,11 @@
          write(*,*) 'PDF not supported for pdg ',ipdg
          write(*,*) 'For lepton colliders, please set the lpp* '//
      $    'variables to 0 in the run_card'  
-         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)
 
@@ -102,8 +92,10 @@
                if (x.eq.xlast(ii)) then
                   if (xmu.eq.xmulast(ii)) then
                      if (imem.eq.imemlast(ii)) then
-                        ireuse = ii
-                        exit
+                        if (iset.eq.isetlast(ii)) then
+                           ireuse = ii
+                           exit
+                        endif
                      endif
                   endif
                endif
@@ -126,13 +118,14 @@
 
 c     Call lhapdf and give the current values to the arrays that should
 c     be saved
-      call evolvepart(ipart,x,xmu,pdg2pdf)
+      call evolvepartm(iset,ipart,x,xmu,pdg2pdf)
       pdg2pdf=pdg2pdf/x
       pdflast(i_replace)=pdg2pdf
       xlast(i_replace)=x
       xmulast(i_replace)=xmu
       ihlast(i_replace)=ih
       imemlast(i_replace)=imem
+      isetlast(i_replace)=iset
 c
       return
       end

=== modified file 'Template/NLO/Source/run.inc'
--- Template/NLO/Source/run.inc	2015-09-14 18:56:28 +0000
+++ Template/NLO/Source/run.inc	2016-03-04 16:01:53 +0000
@@ -22,15 +22,15 @@
 c Ratios of current values of scales over their reference values. The
 c latter may be fixed or dynamic
       double precision muR_over_ref,muF1_over_ref,muF2_over_ref,
-     #                 QES_over_ref
+     #                 QES_over_ref,muF_over_ref
       common/cscales_fact/muR_over_ref,muF1_over_ref,muF2_over_ref,
-     #                    QES_over_ref
+     #                    QES_over_ref,muF_over_ref
 
 c Values of fixed reference scales, to be given in input
       double precision muR_ref_fixed,muF1_ref_fixed,
-     #                 muF2_ref_fixed,QES_ref_fixed
+     #                 muF2_ref_fixed,QES_ref_fixed,muF_ref_fixed
       common/cscales_fixed_values/muR_ref_fixed,muF1_ref_fixed,
-     #                            muF2_ref_fixed,QES_ref_fixed
+     #                 muF2_ref_fixed,QES_ref_fixed,muF_ref_fixed
 
 c Values of the current scales squared. The information is partly
 c redundant with that of common block /to_scale/

=== modified file 'Template/NLO/Source/setrun.f'
--- Template/NLO/Source/setrun.f	2015-03-11 13:44:47 +0000
+++ Template/NLO/Source/setrun.f	2016-03-04 16:01:53 +0000
@@ -25,6 +25,7 @@
       include 'run.inc'
       include 'alfas.inc'
       include 'MODEL/coupl.inc'
+      include '../SubProcesses/reweight0.inc'
 
       double precision D
       common/to_dj/D
@@ -81,6 +82,26 @@
       call to_upper(shower_MC)
 C
 
+c Determine if there is a need to do scale and/or PDF reweighting
+      do_rwgt_scale=.false.
+      do i=1,dyn_scale(0)
+         if (lscalevar(i) .or. dyn_scale(0).gt.1) then
+            do_rwgt_scale=.true.
+            exit
+         endif
+      enddo
+      do_rwgt_pdf=.false.
+      do i=1,lhaPDFid(0)
+         if (lpdfvar(i) .or. lhaPDFid(0).gt.1) then
+            do_rwgt_pdf=.true.
+            exit
+         endif
+      enddo
+
+c Default scale and PDF choice used for the actual run
+      dynamical_scale_choice=dyn_scale(1)
+      lhaid=lhaPDFid(1)
+
 c merging cuts
       xqcut=0d0
       xmtc=0d0
@@ -179,6 +200,14 @@
       enddo
       call get_pdfup(pdlabel,pdfgup,pdfsup,lhaid)
 
+      if (lpdfvar(1) .and. (lpp(1).ne.0.or.lpp(2).ne.0) ) then
+c fill the nmemPDF(i) array with the number of PDF error set. This we
+c get from LHAPDF.
+         call numberPDFm(1,nmemPDF(1))
+      else
+         nmemPDF(1)=0
+      endif
+
       return
  99   write(*,*) 'error in reading'
       return

=== modified file 'Template/NLO/SubProcesses/c_weight.inc'
--- Template/NLO/SubProcesses/c_weight.inc	2015-02-13 20:03:34 +0000
+++ Template/NLO/SubProcesses/c_weight.inc	2016-03-04 16:01:53 +0000
@@ -1,7 +1,7 @@
 *     -*-fortran-*-
 
       integer max_contr,max_wgt,max_iproc
-      parameter (max_contr=128,max_wgt=256,max_iproc=100)
+      parameter (max_contr=128,max_wgt=1024,max_iproc=100)
       logical H_event(max_contr)
       integer nFKS(max_contr),itype(max_contr),QCDpower(max_contr)
      $     ,pdg(nexternal,max_contr),pdg_uborn(nexternal,max_contr)

=== modified file 'Template/NLO/SubProcesses/collect_events.f'
--- Template/NLO/SubProcesses/collect_events.f	2014-06-18 11:49:44 +0000
+++ Template/NLO/SubProcesses/collect_events.f	2016-03-04 16:01:53 +0000
@@ -216,7 +216,7 @@
       common /c_i_orig/i_orig
       integer ioutput,junit(80)
       integer imaxevt,maxevt,ii,numoffiles,nevents,itot,iunit,
-     # mx_of_evt(80),i0,i,j
+     # mx_of_evt(80),i0,i,j,jj,kk,n,nn
       double precision evwgt,evwgt_sign
       integer ione
       parameter (ione=1)
@@ -250,6 +250,7 @@
       integer lprup_l(100),nproc_l
       logical found_proc
       include 'reweight_all.inc'
+      include 'run.inc'
       integer proc_id_tot(0:100)
       double precision xsec(100),xsecABS,xerr(100)
       logical get_xsec_from_res1
@@ -412,7 +413,7 @@
      #  IDBMUP,EBMUP,PDFGUP,PDFSUP,IDWTUP,NPRUP,
      #  XSECUP,XERRUP,abs(evwgt),LPRUP)
       itot=maxevt
-      do ii=1,maxevt
+      do i=1,maxevt
         rnd=fk88random(iseed)
         call whichone(rnd,numoffiles,itot,mx_of_evt,junit,iunit,i0)
         call read_lhef_event(iunit,
@@ -425,14 +426,32 @@
 c Overwrite the weights. Also overwrite the weights used for PDF & scale
 c reweighting
            evwgt_sign=dsign(evwgt,XWGTUP)
-           do i=1,numscales
-              do j=1,numscales
-                 wgtxsecmu(i,j)=wgtxsecmu(i,j)*evwgt_sign/XWGTUP
-              enddo
-           enddo
-           do i=1,numPDFpairs*2
-              wgtxsecPDF(i)=wgtxsecPDF(i)*evwgt_sign/XWGTUP
-          enddo
+           if (do_rwgt_scale) then
+              do kk=1,dyn_scale(0)
+                 if (lscalevar(kk)) then
+                    do ii=1,nint(scalevarF(0))
+                       do jj=1,nint(scalevarR(0))
+                          wgtxsecmu(jj,ii,kk)=wgtxsecmu(jj,ii,kk)
+     $                         *evwgt_sign/XWGTUP
+                       enddo
+                    enddo
+                 else
+                    wgtxsecmu(1,1,kk)=wgtxsecmu(1,1,kk)
+     $                   *evwgt_sign/XWGTUP
+                 endif
+              enddo
+           endif
+           if (do_rwgt_pdf) then
+              do nn=1,lhaPDFid(0)
+                 if (lpdfvar(nn)) then
+                    do n=0,nmemPDF(nn)
+                       wgtxsecPDF(n,nn)=wgtxsecPDF(n,nn)*evwgt_sign/XWGTUP
+                    enddo
+                 else
+                    wgtxsecPDF(0,nn)=wgtxsecPDF(0,nn)*evwgt_sign/XWGTUP
+                 endif
+              enddo
+           endif
         endif
         call write_lhef_event(ioutput,
      #    NUP,IDPRUP,evwgt_sign,SCALUP,AQEDUP,AQCDUP,

=== modified file 'Template/NLO/SubProcesses/fks_singular.f'
--- Template/NLO/SubProcesses/fks_singular.f	2015-12-16 16:13:10 +0000
+++ Template/NLO/SubProcesses/fks_singular.f	2016-03-04 16:01:53 +0000
@@ -1276,9 +1276,10 @@
       include 'reweight.inc'
       include 'reweightNLO.inc'
       include 'timing_variables.inc'
-      integer i,kr,kf,iwgt_save
-      double precision xlum(maxscales),dlum,pi,mu2_r(maxscales)
-     &     ,mu2_f(maxscales),mu2_q,alphas,g(maxscales),rwgt_muR_dep_fac
+      integer i,kr,kf,iwgt_save,dd
+      double precision xlum(maxscales),dlum,pi,mu2_r(maxscales),c_mu2_r
+     $     ,c_mu2_f,mu2_f(maxscales),mu2_q,alphas,g(maxscales)
+     $     ,rwgt_muR_dep_fac
       external rwgt_muR_dep_fac
       parameter (pi=3.1415926535897932385d0)
       external dlum,alphas
@@ -1297,33 +1298,41 @@
          xbk(1) = bjx(1,i)
          xbk(2) = bjx(2,i)
          mu2_q=scales2(1,i)
+c Loop over the dynamical_scale_choices
+         do dd=1,dyn_scale(0)
 c renormalisation scale variation (requires recomputation of the strong
 c coupling)
-         do kr=1,numscales
-            mu2_r(kr)=scales2(2,i)*yfactR(kr)**2
-            g(kr)=sqrt(4d0*pi*alphas(sqrt(mu2_r(kr))))
-         enddo
+            call set_mu_central(i,dd,c_mu2_r,c_mu2_f)
+            do kr=1,nint(scalevarR(0))
+               if ((.not. lscalevar(dd)) .and. kr.ne.1) exit
+               mu2_r(kr)=c_mu2_r*scalevarR(kr)**2
+               g(kr)=sqrt(4d0*pi*alphas(sqrt(mu2_r(kr))))
+            enddo
 c factorisation scale variation (require recomputation of the PDFs)
-         do kf=1,numscales
-            mu2_f(kf)=scales2(3,i)*yfactF(kf)**2
-            q2fact(1)=mu2_f(kf)
-            q2fact(2)=mu2_f(kf)
-            xlum(kf) = dlum()
-         enddo
-         do kr=1,numscales
-            do kf=1,numscales
-               iwgt=iwgt+1 ! increment the iwgt for the wgts() array
-               if (iwgt.gt.max_wgt) then
-                  write (*,*) 'ERROR too many weights in reweight_scale'
-     &                 ,iwgt,max_wgt
-                  stop 1
-               endif
+            do kf=1,nint(scalevarF(0))
+               if ((.not. lscalevar(dd)) .and. kf.ne.1) exit
+               mu2_f(kf)=c_mu2_f*scalevarF(kf)**2
+               q2fact(1)=mu2_f(kf)
+               q2fact(2)=mu2_f(kf)
+               xlum(kf) = dlum()
+            enddo
+            do kf=1,nint(scalevarF(0))
+               if ((.not. lscalevar(dd)) .and. kf.ne.1) exit
+               do kr=1,nint(scalevarR(0))
+                  if ((.not. lscalevar(dd)) .and. kr.ne.1) exit
+                  iwgt=iwgt+1   ! increment the iwgt for the wgts() array
+                  if (iwgt.gt.max_wgt) then
+                     write (*,*) 'ERROR too many weights in '/
+     $                    /'reweight_scale',iwgt,max_wgt
+                     stop 1
+                  endif
 c add the weights to the array
-               wgts(iwgt,i)=xlum(kf) * (wgt(1,i)+wgt(2,i)*log(mu2_r(kr)
-     &              /mu2_q)+wgt(3,i)*log(mu2_f(kf)/mu2_q))*g(kr)
-     &              **QCDpower(i)
-               wgts(iwgt,i)=wgts(iwgt,i)
-     &              *rwgt_muR_dep_fac(sqrt(mu2_r(kr)),sqrt(mu2_r(1)))
+                  wgts(iwgt,i)=xlum(kf) * (wgt(1,i)+wgt(2,i)
+     $                 *log(mu2_r(kr)/mu2_q)+wgt(3,i)*log(mu2_f(kf)
+     $                 /mu2_q))*g(kr)**QCDpower(i)
+                  wgts(iwgt,i)=wgts(iwgt,i)*rwgt_muR_dep_fac(
+     &                 sqrt(mu2_r(kr)),sqrt(scales2(2,i)))
+               enddo
             enddo
          enddo
       enddo
@@ -1355,14 +1364,22 @@
       common/c_nFKSprocess/nFKSprocess
       call cpu_time(tBefore)
       if (icontr.eq.0) return
+      if (dyn_scale(0).gt.1) then
+         write (*,*) "When doing NNLL+NLO veto, "/
+     $        /"can only do one dynamical_scale_choice",dyn_scale(0)
+         stop
+      endif
+
 c currently we have 'iwgt' weights in the wgts() array.
       iwgt_save=iwgt
 c compute the new veto multiplier factor      
-      do ks=1,numscales
-         do kh=1,numscales
+      do ks=1,nint(scalevarR(0))
+         if ((.not. lscalevar(1)) .and. ks.ne.1) exit
+         do kh=1,nint(scalevarF(0))
+            if ((.not. lscalevar(1)) .and. kh.ne.1) exit
             if (H1_factor_virt.ne.0d0) then
-               call compute_veto_multiplier(H1_factor_virt,yfactR(ks)
-     &              ,yfactF(kh),veto_multiplier_new(ks,kh))
+               call compute_veto_multiplier(H1_factor_virt,scalevarR(ks)
+     $              ,scalevarF(kh),veto_multiplier_new(ks,kh))
                veto_multiplier_new(ks,kh)=veto_multiplier_new(ks,kh)
      &              /veto_multiplier
             else
@@ -1377,17 +1394,19 @@
          xbk(1) = bjx(1,i)
          xbk(2) = bjx(2,i)
          mu2_q=scales2(1,i)
+c Hard scale variation
+         do kh=1,nint(scalevarF(0))
+            if ((.not. lscalevar(1)) .and. kh.ne.1) exit
 c soft scale variation
-         do ks=1,numscales
-            mu2_r(ks)=scales2(2,i)*yfactR(ks)**2
-            g(ks)=sqrt(4d0*pi*alphas(sqrt(mu2_r(ks))))
-            mu2_f(ks)=scales2(2,i)*yfactR(ks)**2
-            q2fact(1)=mu2_f(ks)
-            q2fact(2)=mu2_f(ks)
-            xlum(ks) = dlum()
-c Hard scale variation
-            do kh=1,numscales
-               iwgt=iwgt+1 ! increment the iwgt for the wgts() array
+            do ks=1,nint(scalevarR(0))
+               if ((.not. lscalevar(1)) .and. ks.ne.1) exit
+               mu2_r(ks)=scales2(2,i)*scalevarR(ks)**2
+               g(ks)=sqrt(4d0*pi*alphas(sqrt(mu2_r(ks))))
+               mu2_f(ks)=scales2(2,i)*scalevarR(ks)**2
+               q2fact(1)=mu2_f(ks)
+               q2fact(2)=mu2_f(ks)
+               xlum(ks) = dlum()
+               iwgt=iwgt+1      ! increment the iwgt for the wgts() array
                if (iwgt.gt.max_wgt) then
                   write (*,*) 'ERROR too many weights in reweight_scale'
      &                 ,iwgt,max_wgt
@@ -1401,14 +1420,14 @@
                else
 c special for the itype=7 (i.e, the veto-compensating factor)                  
                   call compute_veto_compensating_factor(H1_factor_virt
-     &                 ,born_wgt_veto,yfactR(ks),yfactF(kh)
+     &                 ,born_wgt_veto,scalevarR(ks),scalevarF(kh)
      &                 ,veto_compensating_factor_new)
                   wgts(iwgt,i)=xlum(ks) * wgt(1,i)*g(ks)**QCDpower(i)
      &                 /veto_compensating_factor
      &                 *veto_compensating_factor_new
                endif
-               wgts(iwgt,i)=wgts(iwgt,i)
-     &              *rwgt_muR_dep_fac(sqrt(mu2_r(ks)),sqrt(mu2_r(1)))
+               wgts(iwgt,i)=wgts(iwgt,i)*rwgt_muR_dep_fac(
+     &              sqrt(mu2_r(ks)),sqrt(scales2(2,i)))
                wgts(iwgt,i)=wgts(iwgt,i)*veto_multiplier_new(ks,kh)
             enddo
          enddo
@@ -1428,8 +1447,7 @@
       include 'reweight.inc'
       include 'reweightNLO.inc'
       include 'timing_variables.inc'
-      integer n,izero,i
-      parameter (izero=0)
+      integer n,i,nn
       double precision xlum,dlum,pi,mu2_r,mu2_f,mu2_q,rwgt_muR_dep_fac,g
      &     ,alphas
       external rwgt_muR_dep_fac
@@ -1439,38 +1457,40 @@
       common/c_nFKSprocess/nFKSprocess
       call cpu_time(tBefore)
       if (icontr.eq.0) return
+      do nn=1,lhaPDFid(0)
 c Use as external loop the one over the PDF sets and as internal the one
 c over the icontr. This reduces the number of calls to InitPDF and
 c allows for better caching of the PDFs
-      do n=1,numPDFs-1
-         iwgt=iwgt+1
-         if (iwgt.gt.max_wgt) then
-            write (*,*) 'ERROR too many weights in reweight_pdf',iwgt
-     &           ,max_wgt
-            stop 1
-         endif
-         call InitPDF(n)
-         do i=1,icontr
-            nFKSprocess=nFKS(i)
-            xbk(1) = bjx(1,i)
-            xbk(2) = bjx(2,i)
-            mu2_q=scales2(1,i)
-            mu2_r=scales2(2,i)
-            mu2_f=scales2(3,i)
-            q2fact(1)=mu2_f
-            q2fact(2)=mu2_f
+         do n=0,nmemPDF(nn)
+            iwgt=iwgt+1
+            if (iwgt.gt.max_wgt) then
+               write (*,*) 'ERROR too many weights in reweight_pdf',iwgt
+     &              ,max_wgt
+               stop 1
+            endif
+            call InitPDFm(nn,n)
+            do i=1,icontr
+               nFKSprocess=nFKS(i)
+               xbk(1) = bjx(1,i)
+               xbk(2) = bjx(2,i)
+               mu2_q=scales2(1,i)
+               mu2_r=scales2(2,i)
+               mu2_f=scales2(3,i)
+               q2fact(1)=mu2_f
+               q2fact(2)=mu2_f
 c Compute the luminosity
-            xlum = dlum()
+               xlum = dlum()
 c Recompute the strong coupling: alpha_s in the PDF might change
-            g=sqrt(4d0*pi*alphas(sqrt(mu2_r)))
+               g=sqrt(4d0*pi*alphas(sqrt(mu2_r)))
 c add the weights to the array
-            wgts(iwgt,i)=xlum * (wgt(1,i) + wgt(2,i)*log(mu2_r/mu2_q) +
-     &           wgt(3,i)*log(mu2_f/mu2_q))*g**QCDpower(i)
-            wgts(iwgt,i)=wgts(iwgt,i)*
-     &                       rwgt_muR_dep_fac(sqrt(mu2_r),sqrt(mu2_r))
+               wgts(iwgt,i)=xlum * (wgt(1,i) + wgt(2,i)*log(mu2_r/mu2_q)
+     $              +wgt(3,i)*log(mu2_f/mu2_q))*g**QCDpower(i)
+               wgts(iwgt,i)=wgts(iwgt,i)*
+     &              rwgt_muR_dep_fac(sqrt(mu2_r),sqrt(mu2_r))
+            enddo
          enddo
       enddo
-      call InitPDF(izero)
+      call InitPDFm(1,0)
       call cpu_time(tAfter)
       tr_pdf=tr_pdf+(tAfter-tBefore)
       return
@@ -6010,3 +6030,32 @@
       FK88RANDOM = SEED*MINV
       END
 
+
+      subroutine set_mu_central(ic,dd,c_mu2_r,c_mu2_f)
+      implicit none
+      include 'nexternal.inc'
+      include 'c_weight.inc'
+      include 'reweight0.inc'
+      include 'run.inc'
+      integer ic,dd,i,j
+      double precision c_mu2_r,c_mu2_f,muR,muF,pp(0:3,nexternal)
+      if (dd.eq.1) then
+         c_mu2_r=scales2(2,ic)
+         c_mu2_f=scales2(3,ic)
+      else
+c need to recompute the scales using the momenta
+         dynamical_scale_choice=dyn_scale(dd)
+         do i=1,nexternal
+            do j=0,3
+               pp(j,i)=momenta(j,i,ic)
+            enddo
+         enddo
+         call set_ren_scale(pp,muR)
+         c_mu2_r=muR**2
+         call set_fac_scale(pp,muF)
+         c_mu2_f=muF**2
+c     reset the default dynamical_scale_choice
+         dynamical_scale_choice=dyn_scale(1)
+      endif
+      return
+      end

=== modified file 'Template/NLO/SubProcesses/handling_lhe_events.f'
--- Template/NLO/SubProcesses/handling_lhe_events.f	2015-03-03 10:11:02 +0000
+++ Template/NLO/SubProcesses/handling_lhe_events.f	2016-03-04 16:01:53 +0000
@@ -14,9 +14,6 @@
       integer event_id
       common /c_event_id/ event_id
       data event_id /-99/
-      logical rwgt_skip
-      common /crwgt_skip/ rwgt_skip
-      data rwgt_skip /.false./
       integer nattr,npNLO,npLO
       common/event_attributes/nattr,npNLO,npLO
       data nattr,npNLO,npLO /0,-1,-1/
@@ -24,8 +21,12 @@
 
       subroutine write_lhef_header(ifile,nevents,MonteCarlo)
       implicit none 
+      include 'run.inc'
+      include 'reweight0.inc'
+      integer idwgt,kk,ii,jj,nn,n
       integer ifile,nevents
       character*10 MonteCarlo
+      character*13 temp
 c Scales
       character*80 muR_id_str,muF1_id_str,muF2_id_str,QES_id_str
       common/cscales_id_string/muR_id_str,muF1_id_str,
@@ -35,6 +36,63 @@
      #     '<LesHouchesEvents version="3.0">'
       write(ifile,'(a)')
      #     '  <!--'
+      if (do_rwgt_scale .or. do_rwgt_pdf) then
+         write(ifile,'(a)') '  <initrwgt>'
+         idwgt=1000
+         if (do_rwgt_scale) then
+            do kk=1,dyn_scale(0)
+               write(ifile,'(a,i4,a)') 
+     &              "    <weightgroup name='scale_variation ",
+     &              dyn_scale(kk),"' combine='envelope'>"
+               if (lscalevar(kk)) then
+                  do ii=1,nint(scalevarF(0))
+                     do jj=1,nint(scalevarR(0))
+                        idwgt=idwgt+1
+                        write(ifile,'(a,i4,a,i4,a,e11.5,a,e11.5,a)')
+     $                       "      <weight id='",idwgt,"'> dyn=",
+     $                       dyn_scale(kk)," muR=",scalevarR(jj)," muF="
+     $                       ,scalevarF(ii)," </weight>"
+                     enddo
+                  enddo
+               else
+                  idwgt=idwgt+1
+                  write(ifile,'(a,i4,a,i4,a,e11.5,a,e11.5,a)')
+     $                 "      <weight id='",idwgt,"'> dyn=",
+     $                 dyn_scale(kk)," muR=",1d0 ," muF=",1d0
+     $                 ," </weight>"
+               endif
+               write(ifile,'(a)') "    </weightgroup>"
+            enddo
+         endif
+         if (do_rwgt_pdf) then
+            do nn=1,lhaPDFid(0)
+               if (lpdfvar(nn)) then
+                  write(ifile,'(a)') "    <weightgroup "/
+     &                 /"name='PDF_variation "/
+     &                 /trim(adjustl(lhaPDFsetname(nn)))/
+     &                 /"' combine='unknown'>"
+                  do n=0,nmemPDF(nn)
+                     idwgt=idwgt+1
+                     write(temp,'(a4,i8)') "PDF=",lhaPDFid(nn)+n
+                     write(ifile,'(a,i4,a)') "      <weight id='" ,idwgt
+     $                    ,"'> "//trim(adjustl(temp))//' '
+     $                    //trim(adjustl(lhaPDFsetname(nn)))/
+     $                    /" </weight>"
+                  enddo
+               else
+                  write(ifile,'(a)') "    <weightgroup "/
+     &                 /"name='PDF_variation' combine='none'>"
+                  idwgt=idwgt+1
+                  write(temp,'(a4,i8)') "PDF=",lhaPDFid(nn)
+                  write(ifile,'(a,i4,a)') "      <weight id='" ,idwgt
+     $                 ,"'> "//trim(adjustl(temp))//' '
+     $                 //trim(adjustl(lhaPDFsetname(nn)))//" </weight>"
+               endif
+               write(ifile,'(a)') "    </weightgroup>"
+            enddo
+         endif
+         write(ifile,'(a)') '  </initrwgt>'
+      endif
       write(ifile,'(a)')'  <scalesfunctionalform>'
       write(ifile,'(a)')muR_id_str(1:len_trim(muR_id_str))
       write(ifile,'(a)')muF1_id_str(1:len_trim(muF1_id_str))
@@ -57,7 +115,7 @@
 
       subroutine write_lhef_header_banner(ifile,nevents,MonteCarlo,path)
       implicit none 
-      integer ifile, i, idwgt, nevents,iseed
+      integer ifile, i, idwgt, nevents,iseed,ii,jj,kk,nn,n
       double precision mcmass(-16:21)
 c     parameter to allow to include run_card.inc 
       include './run.inc'
@@ -66,6 +124,7 @@
       character*20 pdlabel
       integer iappl
       character*7 event_norm
+      character*13 temp
 c     other parameter
       integer nevents_old
       character*80 muR_id_str,muF1_id_str,muF2_id_str,QES_id_str
@@ -74,9 +133,6 @@
       character*10 MonteCarlo
       character*100 path
       character*72 buffer,buffer_lc,buffer2
-      logical rwgt_skip
-      common /crwgt_skip/ rwgt_skip
-      logical rwgt_skip_pdf,rwgt_skip_scales
       integer event_id
       common /c_event_id/ event_id
       include 'reweight_all.inc'
@@ -107,12 +163,6 @@
  88   close(92)
       write(ifile,'(a)') '  </slha>'
       write(ifile,'(a)') '  <MGRunCard>'
-      rwgt_skip_pdf=.true.
-      rwgt_skip_scales=.true.
-      rwgt_skip=.true.
-      pdf_set_min=-1
-      pdf_set_max=-1
-      numscales=0
 c     import the parameter from the run_card 
       nevents_old = nevents
       include './run_card.inc'
@@ -126,14 +176,9 @@
       close(93)
       goto 95
  96      write (*,*) '"randinit" file not found in write_lhef_header_'/
-     &        /'banner: not overwriting iseed in event file header.'
+     &     /'banner: not overwriting iseed in event file header.'
 c Scale variation
- 95   if (do_rwgt_scale.or.do_rwgt_pdf) rwgt_skip=.false.
-      if (do_rwgt_scale) then
-         rwgt_skip_scales = .false.
-         numscales=3         
-      endif
-      if (do_rwgt_pdf) rwgt_skip_pdf=.false.
+ 95   continue
 
 c     copy the run_card as part of the banner.
       open (unit=92,file=path(1:index(path," ")-1)//'run_card.dat'
@@ -156,13 +201,6 @@
          write(ifile,'(a)') buffer
       enddo
  87   close(92)
-      if ( (pdf_set_min.ne.-1 .and. pdf_set_max.eq.-1) .or.
-     &     (pdf_set_min.eq.-1 .and. pdf_set_max.ne.-1)) then
-         write (*,*) 'Not consistent PDF reweigthing parameters'/
-     $        /' found in the run_card.',pdf_set_min,pdf_set_max
-         stop
-      endif
-      if (.not.rwgt_skip_pdf) numPDFpairs=(pdf_set_max-pdf_set_min+1)/2
       write(ifile,'(a)') '  </MGRunCard>'
 c Functional form of the scales
       write(ifile,'(a)') '  <scalesfunctionalform>'
@@ -183,51 +221,60 @@
       write (ifile,'(2x,i6,3x,e12.6)')21,mcmass(21)
       write(ifile,'(a)') '  </MonteCarloMasses>'
 c Write here the reweight information if need be
-      if (.not.rwgt_skip) then
+      if (do_rwgt_scale .or. do_rwgt_pdf) then
          write(ifile,'(a)') '  <initrwgt>'
-         if (numscales.ne.0) then
-            if (numscales.ne.3) then
-               write (*,*) 'Error in handling_lhe_events.f:'
-               write (*,*) 'number of scale not equal to three'
-     $              ,numscales
-               stop
-            endif
-            write(ifile,'(a)') "    <weightgroup "/
-     &           /"type='scale_variation' combine='envelope'>"
-            write(ifile,602) "      <weight id='1001'>"/
-     $           /" muR=",1d0," muF=",1d0," </weight>"
-            write(ifile,602) "      <weight id='1002'>"/
-     $           /" muR=",1d0," muF=",rw_Fscale_up," </weight>"
-            write(ifile,602) "      <weight id='1003'>"/
-     $           /" muR=",1d0," muF=",rw_Fscale_down," </weight>"
-            write(ifile,602) "      <weight id='1004'>"/
-     $           /" muR=",rw_Rscale_up," muF=",1d0," </weight>"
-            write(ifile,602) "      <weight id='1005'> muR="
-     $           ,rw_Rscale_up," muF=",rw_Fscale_up," </weight>"
-            write(ifile,602) "      <weight id='1006'> muR="
-     $           ,rw_Rscale_up," muF=",rw_Fscale_down," </weight>"
-            write(ifile,602) "      <weight id='1007'> muR="
-     $           ,rw_Rscale_down," muF=",1d0," </weight>"
-            write(ifile,602) "      <weight id='1008'> muR="
-     $           ,rw_Rscale_down," muF=",rw_Fscale_up," </weight>"
-            write(ifile,602) "      <weight id='1009'> muR="
-     $           ,rw_Rscale_down," muF=",rw_Fscale_down," </weight>"
-            write(ifile,'(a)') "    </weightgroup>"
+         idwgt=1000
+         if (do_rwgt_scale) then
+            do kk=1,dyn_scale(0)
+               write(ifile,'(a,i4,a)') 
+     &              "    <weightgroup name='scale_variation ",
+     &              dyn_scale(kk),"' combine='envelope'>"
+               if (lscalevar(kk)) then
+                  do ii=1,nint(scalevarF(0))
+                     do jj=1,nint(scalevarR(0))
+                        idwgt=idwgt+1
+                        write(ifile,'(a,i4,a,i4,a,e11.5,a,e11.5,a)')
+     $                       "      <weight id='",idwgt,"'> dyn=",
+     $                       dyn_scale(kk)," muR=",scalevarR(jj)," muF="
+     $                       ,scalevarF(ii)," </weight>"
+                     enddo
+                  enddo
+               else
+                  idwgt=idwgt+1
+                  write(ifile,'(a,i4,a,i4,a,e11.5,a,e11.5,a)')
+     $                 "      <weight id='",idwgt,"'> dyn=",
+     $                 dyn_scale(kk)," muR=",1d0 ," muF=",1d0
+     $                 ," </weight>"
+               endif
+               write(ifile,'(a)') "    </weightgroup>"
+            enddo
          endif
-         if (numPDFpairs.ne.0) then
-            if (pdf_set_min.lt.90000) then    ! MSTW & CTEQ
-               write(ifile,'(a)') "    <weightgroup "/
-     &              /"type='PDF_variation' combine='hessian'>"
-            else                              ! NNPDF
-               write(ifile,'(a)') "    <weightgroup "/
-     &              /"type='PDF_variation' combine='gaussian'>"
-            endif
-            do i=1,numPDFpairs*2
-               idwgt=2000+i
-               write(ifile,'(a,i4,a,i6,a)') "      <weight id='",idwgt,
-     $              "'> pdfset=",pdf_set_min+(i-1)," </weight>"
+         if (do_rwgt_pdf) then
+            do nn=1,lhaPDFid(0)
+               if (lpdfvar(nn)) then
+                  write(ifile,'(a)') "    <weightgroup "/
+     &                 /"name='PDF_variation "/
+     &                 /trim(adjustl(lhaPDFsetname(nn)))/
+     &                 /"' combine='unknown'>"
+                  do n=0,nmemPDF(nn)
+                     idwgt=idwgt+1
+                     write(temp,'(a4,i8)') "PDF=",lhaPDFid(nn)+n
+                     write(ifile,'(a,i4,a)') "      <weight id='" ,idwgt
+     $                    ,"'> "//trim(adjustl(temp))//' '
+     $                    //trim(adjustl(lhaPDFsetname(nn)))/
+     $                    /" </weight>"
+                  enddo
+               else
+                  write(ifile,'(a)') "    <weightgroup "/
+     &                 /"name='PDF_variation' combine='none'>"
+                  idwgt=idwgt+1
+                  write(temp,'(a4,i8)') "PDF=",lhaPDFid(nn)
+                  write(ifile,'(a,i4,a)') "      <weight id='" ,idwgt
+     $                 ,"'> "//trim(adjustl(temp))//' '
+     $                 //trim(adjustl(lhaPDFsetname(nn)))//" </weight>"
+               endif
+               write(ifile,'(a)') "    </weightgroup>"
             enddo
-            write(ifile,'(a)') "    </weightgroup>"
          endif
          write(ifile,'(a)') '  </initrwgt>'
       endif
@@ -246,13 +293,16 @@
      &     /' run_card.dat not found   :',path(1:index(path," ")-1)
      &     //'run_card.dat'
       stop
- 602  format(a,e11.5,a,e11.5,a)
       end
 
 
       subroutine read_lhef_header(ifile,nevents,MonteCarlo)
       implicit none 
-      integer ifile,nevents,i,ii,ii2,iistr
+      include 'reweight0.inc'
+      include './run.inc'
+      logical already_found
+      integer ifile,nevents,i,ii,ii2,iistr,itemp
+      double precision temp
       character*10 MonteCarlo
       character*80 string,string0
       character*3 event_norm
@@ -264,7 +314,7 @@
       MonteCarlo = ''
 c
       string='  '
-      dowhile(string.ne.'  -->')
+      do while(string.ne.'  -->')
         string0=string
         if (index(string,'</header>').ne.0) return
         read(ifile,'(a)')string
@@ -285,13 +335,92 @@
            read(ifile,'(a)') muF2_id_str
            read(ifile,'(a)') QES_id_str
         endif
+c Find the reweight information for scale and PDF uncertainties
+        if (index(string,'<initrwgt>').ne.0) then
+           dyn_scale(0)=0
+           lhaPDFid(0)=0
+           lscalevar(1)=.false.
+           lpdfvar(1)=.false.
+           do_rwgt_scale=.false.
+           do_rwgt_pdf=.false.
+           do
+c     find the start of a weightgroup
+              do
+                 read(ifile,'(a)')string
+                 if (index(string,'<weightgroup').ne.0) exit
+                 if (index(string,'</initrwgt').ne.0) exit
+              enddo
+              if (index(string,"name='scale_variation").ne.0) then
+                 do_rwgt_scale=.true.
+                 dyn_scale(0)=dyn_scale(0)+1
+                 read(ifile,'(a)')string
+                 read(string(index(string,'dyn=')+4:),*)
+     $                dyn_scale(dyn_scale(0))
+                 read(string(index(string,'muR=')+4:),*) scalevarR(1)
+                 read(string(index(string,'muF=')+4:),*) scalevarF(1)
+                 scalevarR(0)=1d0
+                 scalevarF(0)=1d0
+                 do
+                    read(ifile,'(a)')string
+                    if (index(string,'</weightgroup>').ne.0) exit
+                    read(string(index(string,'muR=')+4:),*) temp
+                    already_found=.false.
+                    do i=1,nint(scalevarR(0))
+                       if (temp.eq.scalevarR(i)) already_found=.true.
+                    enddo
+                    if (.not.already_found) then
+                       scalevarR(0)=scalevarR(0)+1d0
+                       scalevarR(nint(scalevarR(0)))=temp
+                    endif
+                    read(string(index(string,'muF=')+4:),*) temp
+                    already_found=.false.
+                    do i=1,nint(scalevarF(0))
+                       if (temp.eq.scalevarF(i)) already_found=.true.
+                    enddo
+                    if (.not.already_found) then
+                       scalevarF(0)=scalevarF(0)+1d0
+                       scalevarF(nint(scalevarF(0)))=temp
+                    endif
+                 enddo
+                 if (scalevarR(0).gt.1d0 .or. scalevarF(0).gt.1d0) then
+                    lscalevar(dyn_scale(0))=.true.
+                 else
+                    lscalevar(dyn_scale(0))=.false.
+                 endif
+              elseif (index(string,"name='PDF_variation").ne.0) then
+                 do_rwgt_pdf=.true.
+                 lhaPDFid(0)=lhaPDFid(0)+1
+                 nmemPDF(lhaPDFid(0))=-1
+                 do 
+                    read(ifile,'(a)')string
+                    if (index(string,'</weightgroup>').ne.0) exit
+                    nmemPDF(lhaPDFid(0))=nmemPDF(lhaPDFid(0))+1
+                    if (nmemPDF(lhaPDFid(0)).eq.0) then
+                       read(string(index(string,'PDF=')+4:),*)
+     $                      lhaPDFid(lhaPDFid(0))
+     $                      ,lhaPDFsetname(lhaPDFid(0))
+                       lhaPDFsetname(lhaPDFid(0))
+     $                      =trim(adjustl(lhaPDFsetname(lhaPDFid(0))))
+                    endif
+                 enddo
+                 if (nmemPDF(lhaPDFid(0)).gt.0) then
+                    lpdfvar(lhaPDFid(0))=.true.
+                 else
+                    lpdfvar(lhaPDFid(0))=.false.
+                 endif
+              elseif (index(string,'</initrwgt').ne.0) then
+                 exit
+              endif
+           enddo
+        endif
       enddo
+
 c Works only if the name of the MC is the last line of the comments
       MonteCarlo=string0(1:10)
       call case_trap4(10,MonteCarlo)
 c Here we are at the end of (user-defined) comments. Now go to end
 c of headers
-      dowhile(index(string,'</header>').eq.0)
+      do while(index(string,'</header>').eq.0)
         string0=string
         read(ifile,'(a)')string
       enddo
@@ -325,7 +454,7 @@
       itempPDF=0
 c
       string='  '
-      dowhile(string.ne.'  -->')
+      do while(string.ne.'  -->')
         string0=string
         if (index(string,'</header>').ne.0) return
         read(ifile,'(a)')string
@@ -344,7 +473,7 @@
         if( index(string,'<montecarlomasses>').ne.0 .or.
      #      index(string,'<MonteCarloMasses>').ne.0 )then
           read(ifile,'(a)')string
-          dowhile( index(string,'</montecarlomasses>').eq.0 .and.
+          do while( index(string,'</montecarlomasses>').eq.0 .and.
      #             index(string,'</MonteCarloMasses>').eq.0 )
             read(string,*)ipart,temp
             if(ipart.lt.-16.or.ipart.gt.21)then
@@ -356,23 +485,30 @@
             read(ifile,'(a)')string
           enddo
         endif
-        if( index(string,'scale_variation').ne.0 )then
-          read(ifile,'(a)')string
-          itempsc=1
-          dowhile( index(string,'</weightgroup>').eq.0 )
-            read(ifile,'(a)')string
-            itempsc=itempsc+1
-          enddo
-          itempsc=itempsc-1
-        endif
-        if( index(string,'PDF_variation').ne.0 )then
-          read(ifile,'(a)')string
-          itempPDF=1
-          dowhile( index(string,'</weightgroup>').eq.0 )
-            read(ifile,'(a)')string
-            itempPDF=itempPDF+1
-          enddo
-          itempPDF=itempPDF-1
+c Find the reweight information for scale and PDF uncertainties
+        if (index(string,'<initrwgt>').ne.0) then
+           do
+              do
+                 read(ifile,'(a)')string
+                 if (index(string,'<weightgroup').ne.0) exit
+                 if (index(string,'</initrwgt').ne.0) exit
+              enddo
+              if (index(string,"name='scale_variation").eq.0) then
+                 do
+                    read(ifile,'(a)')string
+                    if (index(string,'</weightgroup>').ne.0) exit
+                    itempsc=itempsc+1
+                 enddo
+              elseif (index(string,"name='PDF_variation").eq.0) then
+                 do 
+                    read(ifile,'(a)')string
+                    if (index(string,'</weightgroup>').ne.0) exit
+                    itempsc=itempsc+1
+                 enddo
+              elseif (index(string,'</initrwgt').ne.0) then
+                 exit
+              endif
+           enddo
         endif
         if(index(string,'<scalesfunctionalform>').ne.0) then
            read(ifile,'(a)') muR_id_str
@@ -386,7 +522,7 @@
       call case_trap4(10,MonteCarlo)
 c Here we are at the end of (user-defined) comments. Now go to end
 c of headers
-      dowhile(index(string,'</header>').eq.0)
+      do while(index(string,'</header>').eq.0)
         string0=string
         read(ifile,'(a)')string
       enddo
@@ -465,14 +601,12 @@
       DOUBLE PRECISION XWGTUP,SCALUP,AQEDUP,AQCDUP,
      # PUP(5,*),VTIMUP(*),SPINUP(*)
       character*140 buff
-      integer ifile,i
+      integer ifile,i,kk
       character*9 ch1
       integer isorh_lhe,ifks_lhe,jfks_lhe,fksfather_lhe,ipartner_lhe
       double precision scale1_lhe,scale2_lhe
       integer ii,j,nps,nng,iFKS,idwgt
       double precision wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
-      logical rwgt_skip
-      common /crwgt_skip/ rwgt_skip
       integer event_id
       common /c_event_id/ event_id
       integer i_process
@@ -480,6 +614,7 @@
       integer nattr,npNLO,npLO
       common/event_attributes/nattr,npNLO,npLO
       include 'reweight_all.inc'
+      include './run.inc'
       include 'unlops.inc'
 c     if event_id is zero or positive (that means that there was a call
 c     to write_lhef_header_banner) update it and write it
@@ -539,129 +674,14 @@
      #                  PUP(1,I),PUP(2,I),PUP(3,I),PUP(4,I),PUP(5,I),
      #                  VTIMUP(I),SPINUP(I)
       enddo
-      if(buff(1:1).eq.'#' .and. .not.rwgt_skip) then
+      if(buff(1:1).eq.'#' .and. (do_rwgt_scale .or. do_rwgt_pdf)) then
         write(ifile,'(a)') buff(1:len_trim(buff))
         read(buff,*)ch1,iSorH_lhe,ifks_lhe,jfks_lhe,
      #                    fksfather_lhe,ipartner_lhe,
      #                    scale1_lhe,scale2_lhe,
      #                    jwgtinfo,mexternal,iwgtnumpartn,
      #         wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
-        if(jwgtinfo.ge.1.and.jwgtinfo.le.4)then
-           write(ifile,'(a)') '  <rwgt>'
-          write(ifile,401)wgtref,wgtqes2(2)
-          write(ifile,402)wgtxbj(1,1),wgtxbj(2,1),
-     #                    wgtxbj(1,2),wgtxbj(2,2),
-     #                    wgtxbj(1,3),wgtxbj(2,3),
-     #                    wgtxbj(1,4),wgtxbj(2,4)
-          if(jwgtinfo.eq.1)then
-            write(ifile,403)wgtmuR2(1),wgtmuF12(1),wgtmuF22(1),
-     #                      wgtmuR2(2),wgtmuF12(2),wgtmuF22(2)
-          elseif(jwgtinfo.eq.2)then
-            ii=iSorH_lhe+1
-            if(ii.eq.3)ii=1
-            write(ifile,404)wgtmuR2(ii),wgtmuF12(ii),wgtmuF22(ii)
-            do i=1,mexternal
-              write(ifile,405)(wgtkinE(j,i,iSorH_lhe),j=0,3)
-            enddo
-          elseif(jwgtinfo.eq.3 .or. jwgtinfo.eq.4)then
-            do i=1,mexternal
-              write(ifile,405)(wgtkinE(j,i,1),j=0,3)
-            enddo
-            do i=1,mexternal
-              write(ifile,405)(wgtkinE(j,i,2),j=0,3)
-            enddo
-          endif
-          write(ifile,441)wgtwreal(1),wgtwreal(2),
-     #                    wgtwreal(3),wgtwreal(4)
-          write(ifile,441)wgtwdeg(3),wgtwdeg(4),
-     #                    wgtwdegmuf(3),wgtwdegmuf(4)
-          write(ifile,405)wgtwborn(2),wgtwns(2),
-     #                    wgtwnsmuf(2),wgtwnsmur(2)
-          do i=1,iwgtnumpartn
-            write(ifile,442)wgtwmcxsecE(i),
-     #                      wgtmcxbjE(1,i),wgtmcxbjE(2,i)
-          enddo
-          if(jwgtinfo.eq.4) write(ifile,
-     f         '(1x,e14.8,1x,e14.8,1x,i4,1x,i4)')
-     &       wgtbpower,wgtcpower,nFKSprocess_used,nFKSprocess_used_born
-          write(ifile,'(a)') '  </rwgt>'
-         elseif(jwgtinfo.eq.5) then
-           write(ifile,'(a)')'  <rwgt>'
-           if (iSorH_lhe.eq.1) then ! S-event
-              write(ifile,'(1x,e14.8,1x,e14.8,i4,i4)') 
-     f             wgtbpower,wgtcpower,nScontributions,i_process
-              write(ifile,'(1x,i4,1x,e14.8)') nFKSprocess_used_born
-     &             ,wgtref_nbody_all(i_process)
-              do i=1,mexternal
-                 write(ifile,405)(wgtkin_all(j,i,2,0),j=0,3)
-              enddo
-              write(ifile,402) wgtxbj_all(1,2,0),wgtxbj_all(2,2,0)
-              write(ifile,'(1x,e14.8)') wgtqes2_all(2,0)
-              write(ifile,405)wgtwborn_all,wgtwns_all,
-     &             wgtwnsmuf_all,wgtwnsmur_all
-              write(ifile,404) wgtmuR2_all(2,0),wgtmuF12_all(2,0)
-     $             ,wgtmuF22_all(2,0)
-              do ii=1,nScontributions
-                 write(ifile,'(1x,i4)') nFKSprocess_reweight(ii)
-                 iFKS=nFKSprocess_reweight(ii)*2-1
-                 write(ifile,'(1x,e14.8,1x,i4)')
-     &                wgtref_all(iFKS,i_process),iwgtnumpartn_all(iFKS)
-                 do i=1,mexternal
-                    write(ifile,405)(wgtkin_all(j,i,1,iFKS),j=0,3)
-                 enddo
-                 write(ifile,402)
-     &                wgtxbj_all(1,1,iFKS),wgtxbj_all(2,1,iFKS),
-     &                wgtxbj_all(1,2,iFKS),wgtxbj_all(2,2,iFKS),
-     &                wgtxbj_all(1,3,iFKS),wgtxbj_all(2,3,iFKS),
-     &                wgtxbj_all(1,4,iFKS),wgtxbj_all(2,4,iFKS)
-                 write(ifile,'(1x,e14.8)') wgtqes2_all(2,iFKS)
-                 write(ifile,441)wgtwreal_all(1,iFKS),wgtwreal_all(2
-     &                ,iFKS),wgtwreal_all(3,iFKS),wgtwreal_all(4,iFKS)
-                 write(ifile,441)wgtwdeg_all(3,iFKS),wgtwdeg_all(4,iFKS)
-     &                ,wgtwdegmuf_all(3,iFKS),wgtwdegmuf_all(4,iFKS)
-                 do i=1,iwgtnumpartn_all(iFKS)
-                    write(ifile,442)wgtwmcxsec_all(i,iFKS),
-     &                   wgtmcxbj_all(1,i,iFKS),wgtmcxbj_all(2,i,iFKS)
-                 enddo
-                 write(ifile,404) wgtmuR2_all(1,iFKS),wgtmuF12_all(1
-     $                ,iFKS),wgtmuF22_all(1,iFKS)
-                 write(ifile,404) wgtmuR2_all(2,iFKS),wgtmuF12_all(2
-     $                ,iFKS),wgtmuF22_all(2,iFKS)
-              enddo
-           elseif (iSorH_lhe.eq.2) then ! H-event
-              write(ifile,'(1x,e14.8,1x,e14.8,i4)')
-     f             wgtbpower,wgtcpower,i_process
-              iFKS=nFKSprocess_used*2
-              write(ifile,'(1x,i4)') nFKSprocess_used
-              write(ifile,'(1x,e14.8,1x,i4)') wgtref_all(iFKS,i_process)
-     &             ,iwgtnumpartn_all(iFKS)
-              do i=1,mexternal
-                 write(ifile,405)(wgtkin_all(j,i,1,iFKS),j=0,3)
-              enddo
-              do i=1,mexternal
-                 write(ifile,405)(wgtkin_all(j,i,2,iFKS),j=0,3)
-              enddo
-              write(ifile,402)
-     &                wgtxbj_all(1,1,iFKS),wgtxbj_all(2,1,iFKS),
-     &                wgtxbj_all(1,2,iFKS),wgtxbj_all(2,2,iFKS),
-     &                wgtxbj_all(1,3,iFKS),wgtxbj_all(2,3,iFKS),
-     &                wgtxbj_all(1,4,iFKS),wgtxbj_all(2,4,iFKS)
-              write(ifile,441)wgtwreal_all(1,iFKS),wgtwreal_all(2
-     &             ,iFKS),wgtwreal_all(3,iFKS),wgtwreal_all(4,iFKS)
-              do i=1,iwgtnumpartn_all(iFKS)
-                 write(ifile,442)wgtwmcxsec_all(i,iFKS),
-     &                wgtmcxbj_all(1,i,iFKS),wgtmcxbj_all(2,i,iFKS)
-              enddo
-              write(ifile,404) wgtmuR2_all(1,iFKS),wgtmuF12_all(1,iFKS)
-     $             ,wgtmuF22_all(1,iFKS)
-              write(ifile,404) wgtmuR2_all(2,iFKS),wgtmuF12_all(2,iFKS)
-     $             ,wgtmuF22_all(2,iFKS)
-           else
-              write (*,*) 'Not an S- or H-event in write_lhef_event'
-              stop
-           endif
-           write(ifile,'(a)')'  </rwgt>'
-         elseif(jwgtinfo.eq.-5) then
+        if(jwgtinfo.eq.-5) then
            write(ifile,'(a)')'  <rwgt>'
            write (ifile,'(1x,d16.10,3(1x,i4))') wgtref,n_ctr_found
      &          ,n_mom_conf,nint(wgtcpower)
@@ -685,34 +705,47 @@
      $             VTIMUP_H(I),SPINUP_H(I)
            enddo
            write(ifile,'(a)')'  </unlops>'
-        elseif(jwgtinfo.eq.8)then
-           write(ifile,'(a)') '  <rwgt>'
-          write(ifile,406)wgtref,wgtxsecmu(1,1),numscales,numPDFpairs
-          do i=1,numscales
-            write(ifile,404)(wgtxsecmu(i,j),j=1,numscales)
-          enddo
-          do i=1,numPDFpairs
-            nps=2*i-1
-            nng=2*i
-            write(ifile,404)wgtxsecPDF(nps),wgtxsecPDF(nng)
-          enddo
-          write(ifile,'(a)') '  </rwgt>'
-
         elseif(jwgtinfo.eq.9)then
-           write(ifile,'(a)') '  <rwgt>'
-           do i=1,numscales
-              do j=1,numscales
-                 idwgt=1000+(i-1)*numscales+j
-                 write(ifile,601) "   <wgt id='",idwgt,"'>",wgtxsecmu(i
-     $                ,j)," </wgt>"
-              enddo
-           enddo
-           do i=1,2*numPDFpairs
-              idwgt=2000+i
-              write(ifile,601) "   <wgt id='",idwgt,"'>",wgtxsecPDF(i)
-     $             ," </wgt>"
-           enddo
-           write(ifile,'(a)') '  </rwgt>'
+           if (do_rwgt_scale .or. do_rwgt_pdf) then
+              write(ifile,'(a)') '  <rwgt>'
+              idwgt=1000
+              if (do_rwgt_scale) then
+                 do kk=1,dyn_scale(0)
+                    if (lscalevar(kk)) then
+                       do i=1,nint(scalevarF(0))
+                          do j=1,nint(scalevarR(0))
+                             idwgt=idwgt+1
+                             write(ifile,601) "   <wgt id='",idwgt,"'>"
+     $                            ,wgtxsecmu(j,i,kk)," </wgt>"
+                          enddo
+                       enddo
+                    else
+                       idwgt=idwgt+1
+                       write(ifile,601) "   <wgt id='",idwgt,"'>"
+     $                      ,wgtxsecmu(1,1,kk)," </wgt>"
+                    endif
+                 enddo
+              endif
+              if (do_rwgt_pdf) then
+                 do j=1,lhaPDFid(0)
+                    if (lpdfvar(j)) then
+                       do i=0,nmemPDF(j)
+                          idwgt=idwgt+1
+                          write(ifile,601) "   <wgt id='",idwgt,"'>"
+     $                         ,wgtxsecPDF(i,j)," </wgt>"
+                       enddo
+                    else
+                       idwgt=idwgt+1
+                       write(ifile,601) "   <wgt id='",idwgt,"'>"
+     $                      ,wgtxsecPDF(0,j)," </wgt>"
+                    endif
+                 enddo
+              endif
+              write(ifile,'(a)') '  </rwgt>'
+           endif
+        else
+           write(*,*) 'Unknown jwgtinfo in handling_lhe_events',jwgtinfo
+           stop
         endif
       endif
       write(ifile,'(a)') '  </event>'
@@ -739,7 +772,7 @@
       INTEGER NUP,IDPRUP,IDUP(*),ISTUP(*),MOTHUP(2,*),ICOLUP(2,*)
       DOUBLE PRECISION XWGTUP,SCALUP,AQEDUP,AQCDUP,
      # PUP(5,*),VTIMUP(*),SPINUP(*)
-      integer ifile,i
+      integer ifile,i,kk
       character*140 buff
       character*80 string
       character*12 dummy12
@@ -755,6 +788,7 @@
       common/event_attributes/nattr,npNLO,npLO
       include 'reweight_all.inc'
       include 'unlops.inc'
+      include 'run.inc'
 c
       read(ifile,'(a)')string
       nattr=0
@@ -783,128 +817,7 @@
      #                    jwgtinfo,mexternal,iwgtnumpartn,
      #         wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
 
-        if(jwgtinfo.ge.1.and.jwgtinfo.le.4)then
-          read(ifile,'(a)')string
-          read(ifile,401)wgtref,wgtqes2(2)
-          read(ifile,402)wgtxbj(1,1),wgtxbj(2,1),
-     #                   wgtxbj(1,2),wgtxbj(2,2),
-     #                   wgtxbj(1,3),wgtxbj(2,3),
-     #                   wgtxbj(1,4),wgtxbj(2,4)
-          if(jwgtinfo.eq.1)then
-            read(ifile,403)wgtmuR2(1),wgtmuF12(1),wgtmuF22(1),
-     #                     wgtmuR2(2),wgtmuF12(2),wgtmuF22(2)
-          elseif(jwgtinfo.eq.2)then
-            ii=iSorH_lhe+1
-            if(ii.eq.3)ii=1
-            read(ifile,404)wgtmuR2(ii),wgtmuF12(ii),wgtmuF22(ii)
-            do i=1,mexternal
-              read(ifile,405)(wgtkinE(j,i,iSorH_lhe),j=0,3)
-            enddo
-          elseif(jwgtinfo.eq.3 .or. jwgtinfo.eq.4)then
-            do i=1,mexternal
-              read(ifile,405)(wgtkinE(j,i,1),j=0,3)
-            enddo
-            do i=1,mexternal
-              read(ifile,405)(wgtkinE(j,i,2),j=0,3)
-            enddo
-          endif
-          read(ifile,441)wgtwreal(1),wgtwreal(2),
-     #                   wgtwreal(3),wgtwreal(4)
-          read(ifile,441)wgtwdeg(3),wgtwdeg(4),
-     #                   wgtwdegmuf(3),wgtwdegmuf(4)
-          read(ifile,405)wgtwborn(2),wgtwns(2),
-     #                    wgtwnsmuf(2),wgtwnsmur(2)
-          do i=1,iwgtnumpartn
-            read(ifile,442)wgtwmcxsecE(i),
-     #                     wgtmcxbjE(1,i),wgtmcxbjE(2,i)
-          enddo
-          if(jwgtinfo.eq.4) read(ifile,
-     f     '(1x,e14.8,1x,e14.8,1x,i4,1x,i4)')
-     &     wgtbpower,wgtcpower,nFKSprocess_used,nFKSprocess_used_born
-          read(ifile,'(a)')string
-        elseif(jwgtinfo.eq.5) then
-           read(ifile,'(a)')string
-           if (iSorH_lhe.eq.1) then ! S-event
-              read(ifile,'(1x,e14.8,1x,e14.8,i4,i4)')
-     f             wgtbpower,wgtcpower,nScontributions
-     $             ,i_process
-              read(ifile,'(1x,i4,1x,e14.8)') nFKSprocess_used_born
-     &             ,wgtref_nbody_all(i_process)
-              do i=1,mexternal
-                 read(ifile,405)(wgtkin_all(j,i,2,0),j=0,3)
-              enddo
-              read(ifile,402) wgtxbj_all(1,2,0),wgtxbj_all(2,2,0)
-              read(ifile,'(1x,e14.8)') wgtqes2_all(2,0)
-              read(ifile,405)wgtwborn_all,wgtwns_all,
-     &             wgtwnsmuf_all,wgtwnsmur_all
-              read(ifile,404) wgtmuR2_all(2,0),wgtmuF12_all(2,0)
-     $             ,wgtmuF22_all(2,0)
-              do ii=1,nScontributions
-                 read(ifile,'(1x,i4)') nFKSprocess_reweight(ii)
-                 iFKS=nFKSprocess_reweight(ii)*2-1
-                 read(ifile,'(1x,e14.8,1x,i4)') wgtref_all(iFKS
-     $                ,i_process),iwgtnumpartn_all(iFKS)
-                 do i=1,mexternal
-                    read(ifile,405)(wgtkin_all(j,i,1,iFKS),j=0,3)
-                 enddo
-                 do i=1,mexternal
-                    do j=0,3
-                       wgtkin_all(j,i,2,iFKS)=wgtkin_all(j,i,2,0)
-                    enddo
-                 enddo
-                 read(ifile,402)
-     &                wgtxbj_all(1,1,iFKS),wgtxbj_all(2,1,iFKS),
-     &                wgtxbj_all(1,2,iFKS),wgtxbj_all(2,2,iFKS),
-     &                wgtxbj_all(1,3,iFKS),wgtxbj_all(2,3,iFKS),
-     &                wgtxbj_all(1,4,iFKS),wgtxbj_all(2,4,iFKS)
-                 read(ifile,'(1x,e14.8)') wgtqes2_all(2,iFKS)
-                 read(ifile,441)wgtwreal_all(1,iFKS),wgtwreal_all(2
-     &                ,iFKS),wgtwreal_all(3,iFKS),wgtwreal_all(4,iFKS)
-                 read(ifile,441)wgtwdeg_all(3,iFKS),wgtwdeg_all(4,iFKS)
-     &                ,wgtwdegmuf_all(3,iFKS),wgtwdegmuf_all(4,iFKS)
-                 do i=1,iwgtnumpartn_all(iFKS)
-                    read(ifile,442)wgtwmcxsec_all(i,iFKS),
-     &                   wgtmcxbj_all(1,i,iFKS),wgtmcxbj_all(2,i,iFKS)
-                 enddo
-                 read(ifile,404) wgtmuR2_all(1,iFKS),wgtmuF12_all(1
-     $                ,iFKS),wgtmuF22_all(1,iFKS)
-                 read(ifile,404) wgtmuR2_all(2,iFKS),wgtmuF12_all(2
-     $                ,iFKS),wgtmuF22_all(2,iFKS)
-              enddo
-           elseif (iSorH_lhe.eq.2) then ! H-event
-              read(ifile,'(1x,e14.8,1x,e14.8,i4)')
-     f             wgtbpower,wgtcpower,i_process
-              read(ifile,'(1x,i4)') nFKSprocess_used
-              iFKS=nFKSprocess_used*2
-              read(ifile,'(1x,e14.8,1x,i4)') wgtref_all(iFKS,i_process)
-     $             ,iwgtnumpartn_all(iFKS)
-              do i=1,mexternal
-                 read(ifile,405)(wgtkin_all(j,i,1,iFKS),j=0,3)
-              enddo
-              do i=1,mexternal
-                 read(ifile,405)(wgtkin_all(j,i,2,iFKS),j=0,3)
-              enddo
-              read(ifile,402)
-     &                wgtxbj_all(1,1,iFKS),wgtxbj_all(2,1,iFKS),
-     &                wgtxbj_all(1,2,iFKS),wgtxbj_all(2,2,iFKS),
-     &                wgtxbj_all(1,3,iFKS),wgtxbj_all(2,3,iFKS),
-     &                wgtxbj_all(1,4,iFKS),wgtxbj_all(2,4,iFKS)
-              read(ifile,441)wgtwreal_all(1,iFKS),wgtwreal_all(2
-     &             ,iFKS),wgtwreal_all(3,iFKS),wgtwreal_all(4,iFKS)
-              do i=1,iwgtnumpartn_all(iFKS)
-                 read(ifile,442)wgtwmcxsec_all(i,iFKS),
-     &                wgtmcxbj_all(1,i,iFKS),wgtmcxbj_all(2,i,iFKS)
-              enddo
-              read(ifile,404) wgtmuR2_all(1,iFKS),wgtmuF12_all(1,iFKS)
-     $             ,wgtmuF22_all(1,iFKS)
-              read(ifile,404) wgtmuR2_all(2,iFKS),wgtmuF12_all(2,iFKS)
-     $             ,wgtmuF22_all(2,iFKS)
-           else
-              write (*,*) 'Not an S- or H-event in write_lhef_event'
-              stop
-           endif
-           read(ifile,'(a)')string
-         elseif(jwgtinfo.eq.-5) then
+        if(jwgtinfo.eq.-5) then
            read(ifile,'(a)')string
            read(ifile,*) wgtref,n_ctr_found,n_mom_conf,wgtcpower
            do i=1,n_mom_conf
@@ -916,7 +829,7 @@
               read (ifile,'(a)') n_ctr_str(i)
            enddo
            read(ifile,'(a)')string
-         elseif(jwgtinfo.eq.15) then
+        elseif(jwgtinfo.eq.15) then
            read(ifile,'(a)') string
            read(ifile,*)NUP_H
            do i=1,NUP_H
@@ -926,33 +839,39 @@
      $             VTIMUP_H(I),SPINUP_H(I)
            enddo
            read(ifile,'(a)') string
-        elseif(jwgtinfo.eq.8)then
-          read(ifile,'(a)')string
-          read(ifile,406)wgtref,wgtxsecmu(1,1),numscales,numPDFpairs
-          do i=1,numscales
-            read(ifile,404)(wgtxsecmu(i,j),j=1,numscales)
-          enddo
-          do i=1,numPDFpairs
-            nps=2*i-1
-            nng=2*i
-            read(ifile,404)wgtxsecPDF(nps),wgtxsecPDF(nng)
-          enddo
-          read(ifile,'(a)')string
         elseif(jwgtinfo.eq.9)then
-           read(ifile,'(a)')string
-           wgtref=XWGTUP
-           do i=1,numscales
-              do j=1,numscales
-                 call read_rwgt_line(ifile,idwgt,wgtxsecmu(i,j))
-              enddo
-           enddo
-           do i=1,2*numPDFpairs
-              call read_rwgt_line(ifile,idwgt,wgtxsecPDF(i))
-           enddo
-           if (numscales.eq.0 .and. numPDFpairs.ne.0) then
-              wgtxsecmu(1,1)=XWGTUP
+           if (do_rwgt_scale .or. do_rwgt_pdf) then
+              read(ifile,'(a)')string
+              wgtref=XWGTUP
+              if (do_rwgt_scale) then
+                 do kk=1,dyn_scale(0)
+                    if (lscalevar(kk)) then
+                       do i=1,nint(scalevarF(0))
+                          do j=1,nint(scalevarR(0))
+                             call read_rwgt_line(ifile,idwgt,wgtxsecmu(j,i,kk))
+                          enddo
+                       enddo
+                    else
+                       call read_rwgt_line(ifile,idwgt,wgtxsecmu(1,1,kk))
+                    endif
+                 enddo
+              endif
+              if (do_rwgt_pdf) then
+                 do j=1,lhaPDFid(0)
+                    if (lpdfvar(j)) then
+                       do i=0,nmemPDF(j)
+                          call read_rwgt_line(ifile,idwgt,wgtxsecPDF(i,j))
+                       enddo
+                    else
+                       call read_rwgt_line(ifile,idwgt,wgtxsecPDF(0,j))
+                    endif
+                 enddo
+              endif
+              read(ifile,'(a)')string
            endif
-           read(ifile,'(a)')string
+        else
+           write(*,*) 'Unknown jwgtinfo in handling_lhe_events',jwgtinfo
+           stop
         endif
         read(ifile,'(a)')string
       else
@@ -982,7 +901,7 @@
       INTEGER NUP,IDPRUP,IDUP(*),ISTUP(*),MOTHUP(2,*),ICOLUP(2,*)
       DOUBLE PRECISION XWGTUP,SCALUP,AQEDUP,AQCDUP,
      # PUP(5,*),VTIMUP(*),SPINUP(*)
-      integer ifile,i
+      integer ifile,i,kk
       character*140 buff
       character*80 string
       character*12 dummy12
@@ -998,6 +917,7 @@
       common/event_attributes/nattr,npNLO,npLO
       include 'reweight_all.inc'
       include 'unlops.inc'
+      include 'run.inc'
 c
       read(ifile,'(a)')string
       if(index(string,'<event').eq.0)then
@@ -1035,128 +955,7 @@
      #                    scale1_lhe,scale2_lhe,
      #                    jwgtinfo,mexternal,iwgtnumpartn,
      #         wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
-        if(jwgtinfo.ge.1.and.jwgtinfo.le.4)then
-          read(ifile,'(a)')string
-          read(ifile,401)wgtref,wgtqes2(2)
-          read(ifile,402)wgtxbj(1,1),wgtxbj(2,1),
-     #                   wgtxbj(1,2),wgtxbj(2,2),
-     #                   wgtxbj(1,3),wgtxbj(2,3),
-     #                   wgtxbj(1,4),wgtxbj(2,4)
-          if(jwgtinfo.eq.1)then
-            read(ifile,403)wgtmuR2(1),wgtmuF12(1),wgtmuF22(1),
-     #                     wgtmuR2(2),wgtmuF12(2),wgtmuF22(2)
-          elseif(jwgtinfo.eq.2)then
-            ii=iSorH_lhe+1
-            if(ii.eq.3)ii=1
-            read(ifile,404)wgtmuR2(ii),wgtmuF12(ii),wgtmuF22(ii)
-            do i=1,mexternal
-              read(ifile,405)(wgtkinE(j,i,iSorH_lhe),j=0,3)
-            enddo
-          elseif(jwgtinfo.eq.3 .or. jwgtinfo.eq.4)then
-            do i=1,mexternal
-              read(ifile,405)(wgtkinE(j,i,1),j=0,3)
-            enddo
-            do i=1,mexternal
-              read(ifile,405)(wgtkinE(j,i,2),j=0,3)
-            enddo
-          endif
-          read(ifile,441)wgtwreal(1),wgtwreal(2),
-     #                   wgtwreal(3),wgtwreal(4)
-          read(ifile,441)wgtwdeg(3),wgtwdeg(4),
-     #                   wgtwdegmuf(3),wgtwdegmuf(4)
-          read(ifile,405)wgtwborn(2),wgtwns(2),
-     #                    wgtwnsmuf(2),wgtwnsmur(2)
-          do i=1,iwgtnumpartn
-            read(ifile,442)wgtwmcxsecE(i),
-     #                     wgtmcxbjE(1,i),wgtmcxbjE(2,i)
-          enddo
-          if(jwgtinfo.eq.4) read(ifile,
-     f      '(1x,e14.8,1x,e14.8,1x,i4,1x,i4)')
-     &      wgtbpower,wgtcpower,nFKSprocess_used,nFKSprocess_used_born
-          read(ifile,'(a)')string
-        elseif(jwgtinfo.eq.5) then
-           read(ifile,'(a)')string
-           if (iSorH_lhe.eq.1) then ! S-event
-              read(ifile,'(1x,e14.8,1x,e14.8,i4,i4)') 
-     f             wgtbpower,wgtcpower,nScontributions
-     $             ,i_process
-              read(ifile,'(1x,i4,1x,e14.8)') nFKSprocess_used_born
-     &             ,wgtref_nbody_all(i_process)
-              do i=1,mexternal
-                 read(ifile,405)(wgtkin_all(j,i,2,0),j=0,3)
-              enddo
-              read(ifile,402) wgtxbj_all(1,2,0),wgtxbj_all(2,2,0)
-              read(ifile,'(1x,e14.8)') wgtqes2_all(2,0)
-              read(ifile,405)wgtwborn_all,wgtwns_all,
-     &             wgtwnsmuf_all,wgtwnsmur_all
-              read(ifile,404) wgtmuR2_all(2,0),wgtmuF12_all(2,0)
-     $             ,wgtmuF22_all(2,0)
-              do ii=1,nScontributions
-                 read(ifile,'(1x,i4)') nFKSprocess_reweight(ii)
-                 iFKS=nFKSprocess_reweight(ii)*2-1
-                 read(ifile,'(1x,e14.8,1x,i4)') wgtref_all(iFKS
-     $                ,i_process),iwgtnumpartn_all(iFKS)
-                 do i=1,mexternal
-                    read(ifile,405)(wgtkin_all(j,i,1,iFKS),j=0,3)
-                 enddo
-                 do i=1,mexternal
-                    do j=0,3
-                       wgtkin_all(j,i,2,iFKS)=wgtkin_all(j,i,2,0)
-                    enddo
-                 enddo
-                 read(ifile,402)
-     &                wgtxbj_all(1,1,iFKS),wgtxbj_all(2,1,iFKS),
-     &                wgtxbj_all(1,2,iFKS),wgtxbj_all(2,2,iFKS),
-     &                wgtxbj_all(1,3,iFKS),wgtxbj_all(2,3,iFKS),
-     &                wgtxbj_all(1,4,iFKS),wgtxbj_all(2,4,iFKS)
-                 read(ifile,'(1x,e14.8)') wgtqes2_all(2,iFKS)
-                 read(ifile,441)wgtwreal_all(1,iFKS),wgtwreal_all(2
-     &                ,iFKS),wgtwreal_all(3,iFKS),wgtwreal_all(4,iFKS)
-                 read(ifile,441)wgtwdeg_all(3,iFKS),wgtwdeg_all(4,iFKS)
-     &                ,wgtwdegmuf_all(3,iFKS),wgtwdegmuf_all(4,iFKS)
-                 do i=1,iwgtnumpartn_all(iFKS)
-                    read(ifile,442)wgtwmcxsec_all(i,iFKS),
-     &                   wgtmcxbj_all(1,i,iFKS),wgtmcxbj_all(2,i,iFKS)
-                 enddo
-                 read(ifile,404) wgtmuR2_all(1,iFKS),wgtmuF12_all(1
-     $                ,iFKS),wgtmuF22_all(1,iFKS)
-                 read(ifile,404) wgtmuR2_all(2,iFKS),wgtmuF12_all(2
-     $                ,iFKS),wgtmuF22_all(2,iFKS)
-              enddo
-           elseif (iSorH_lhe.eq.2) then ! H-event
-              read(ifile,'(1x,e14.8,1x,e14.8,i4)') 
-     f             wgtbpower,wgtcpower,i_process
-              read(ifile,'(1x,i4)') nFKSprocess_used
-              iFKS=nFKSprocess_used*2
-              read(ifile,'(1x,e14.8,1x,i4)') wgtref_all(iFKS,i_process)
-     &             ,iwgtnumpartn_all(iFKS)
-              do i=1,mexternal
-                 read(ifile,405)(wgtkin_all(j,i,1,iFKS),j=0,3)
-              enddo
-              do i=1,mexternal
-                 read(ifile,405)(wgtkin_all(j,i,2,iFKS),j=0,3)
-              enddo
-              read(ifile,402)
-     &             wgtxbj_all(1,1,iFKS),wgtxbj_all(2,1,iFKS),
-     &             wgtxbj_all(1,2,iFKS),wgtxbj_all(2,2,iFKS),
-     &             wgtxbj_all(1,3,iFKS),wgtxbj_all(2,3,iFKS),
-     &             wgtxbj_all(1,4,iFKS),wgtxbj_all(2,4,iFKS)
-              read(ifile,441)wgtwreal_all(1,iFKS),wgtwreal_all(2
-     &             ,iFKS),wgtwreal_all(3,iFKS),wgtwreal_all(4,iFKS)
-              do i=1,iwgtnumpartn_all(iFKS)
-                 read(ifile,442)wgtwmcxsec_all(i,iFKS),
-     &                wgtmcxbj_all(1,i,iFKS),wgtmcxbj_all(2,i,iFKS)
-              enddo
-              read(ifile,404) wgtmuR2_all(1,iFKS),wgtmuF12_all(1,iFKS)
-     $             ,wgtmuF22_all(1,iFKS)
-              read(ifile,404) wgtmuR2_all(2,iFKS),wgtmuF12_all(2,iFKS)
-     $             ,wgtmuF22_all(2,iFKS)
-           else
-              write (*,*) 'Not an S- or H-event in write_lhef_event'
-              stop
-           endif
-           read(ifile,'(a)')string
-         elseif(jwgtinfo.eq.-5) then
+        if(jwgtinfo.eq.-5) then
            read(ifile,'(a)')string
            read(ifile,*) wgtref,n_ctr_found,n_mom_conf,wgtcpower
            do i=1,n_mom_conf
@@ -1168,7 +967,7 @@
               read (ifile,'(a)') n_ctr_str(i)
            enddo
            read(ifile,'(a)')string
-         elseif(jwgtinfo.eq.15) then
+        elseif(jwgtinfo.eq.15) then
            read(ifile,'(a)') string
            read(ifile,*)NUP_H
            do i=1,NUP_H
@@ -1178,33 +977,39 @@
      $             VTIMUP_H(I),SPINUP_H(I)
            enddo
            read(ifile,'(a)') string
-        elseif(jwgtinfo.eq.8)then
-          read(ifile,'(a)')string
-          read(ifile,406)wgtref,wgtxsecmu(1,1),numscales,numPDFpairs
-          do i=1,numscales
-            read(ifile,404)(wgtxsecmu(i,j),j=1,numscales)
-          enddo
-          do i=1,numPDFpairs
-            nps=2*i-1
-            nng=2*i
-            read(ifile,404)wgtxsecPDF(nps),wgtxsecPDF(nng)
-          enddo
-          read(ifile,'(a)')string
         elseif(jwgtinfo.eq.9)then
-           read(ifile,'(a)')string
-           wgtref=XWGTUP
-           do i=1,numscales
-              do j=1,numscales
-                call read_rwgt_line(ifile,idwgt,wgtxsecmu(i,j))
-              enddo
-           enddo
-           do i=1,2*numPDFpairs
-             call read_rwgt_line(ifile,idwgt,wgtxsecPDF(i))
-           enddo
-           if (numscales.eq.0 .and. numPDFpairs.ne.0) then
-              wgtxsecmu(1,1)=XWGTUP
+           if (do_rwgt_scale .or. do_rwgt_pdf) then
+              read(ifile,'(a)')string
+              wgtref=XWGTUP
+              if (do_rwgt_scale) then
+                 do kk=1,dyn_scale(0)
+                    if (lscalevar(kk)) then
+                       do i=1,nint(scalevarF(0))
+                          do j=1,nint(scalevarR(0))
+                             call read_rwgt_line(ifile,idwgt,wgtxsecmu(j,i,kk))
+                          enddo
+                       enddo
+                    else
+                       call read_rwgt_line(ifile,idwgt,wgtxsecmu(1,1,kk))
+                    endif
+                 enddo
+              endif
+              if (do_rwgt_pdf) then
+                 do j=1,lhaPDFid(0)
+                    if (lpdfvar(j)) then
+                       do i=0,nmemPDF(j)
+                          call read_rwgt_line(ifile,idwgt,wgtxsecPDF(i,j))
+                       enddo
+                    else
+                       call read_rwgt_line(ifile,idwgt,wgtxsecPDF(0,j))
+                    endif
+                 enddo
+              endif
+              read(ifile,'(a)')string
            endif
-           read(ifile,'(a)')string
+        else
+           write(*,*) 'Unknown jwgtinfo in handling_lhe_events',jwgtinfo
+           stop
         endif
         read(ifile,'(a)')string
       else
@@ -1266,7 +1071,6 @@
 
       function iistr(string)
 c returns the position of the first non-blank character in string
-c 
       implicit none
       logical is_i
       character*(*) string

=== modified file 'Template/NLO/SubProcesses/madfks_plot.f'
--- Template/NLO/SubProcesses/madfks_plot.f	2015-12-16 16:13:10 +0000
+++ Template/NLO/SubProcesses/madfks_plot.f	2016-03-04 16:01:53 +0000
@@ -6,77 +6,92 @@
       include 'reweight0.inc'
       integer nwgt,max_weight
       parameter (max_weight=maxscales*maxscales+maxpdfs+1)
-      character*15 weights_info(max_weight)
-      integer i,npdfs,ii,jj,n
-      double precision xsecScale_acc(maxscales,maxscales)
-     $     ,xsecPDFr_acc(0:maxPDFs)
+      character*50 weights_info(max_weight)
+      character*13 temp
+      integer i,npdfs,ii,jj,n,kk,nn
+      double precision xsecScale_acc(maxscales,maxscales,maxdynscales)
+     $     ,xsecPDFr_acc(0:maxPDFs,maxPDFsets)
       common /scale_pdf_print/xsecScale_acc,xsecPDFr_acc
       integer iappl
       common /for_applgrid/ iappl
       include "appl_common.inc"
-
       nwgt=1
-      weights_info(nwgt)="  central value"
+      weights_info(nwgt)="central value               "
       if (do_rwgt_scale) then
-         nwgt=nwgt+9
-         if (numscales.ne.3) then
-            write (*,*) 'ERROR #1 in initplot:',numscales
-            stop 1
-         endif
-         if (ickkw.ne.-1) then
-c Renormalisation and factorisation scale uncertainties
-            write (weights_info(nwgt-8),'(a4,f3.1,x,a4,f3.1)')
-     &           "muR=",1.0,"muF=",1d0
-            write (weights_info(nwgt-7),'(a4,f3.1,x,a4,f3.1)')
-     &           "muR=",1.0,"muF=",rw_Fscale_up
-            write (weights_info(nwgt-6),'(a4,f3.1,x,a4,f3.1)')
-     &           "muR=",1.0,"muF=",rw_Fscale_down
-            write (weights_info(nwgt-5),'(a4,f3.1,x,a4,f3.1)')
-     &           "muR=",rw_Rscale_up,"muF=",1d0
-            write (weights_info(nwgt-4),'(a4,f3.1,x,a4,f3.1)')
-     &           "muR=",rw_Rscale_up,"muF=",rw_Fscale_up
-            write (weights_info(nwgt-3),'(a4,f3.1,x,a4,f3.1)')
-     &           "muR=",rw_Rscale_up,"muF=",rw_Fscale_down
-            write (weights_info(nwgt-2),'(a4,f3.1,x,a4,f3.1)')
-     &           "muR=",rw_Rscale_down,"muF=",1d0
-            write (weights_info(nwgt-1),'(a4,f3.1,x,a4,f3.1)')
-     &           "muR=",rw_Rscale_down,"muF=",rw_Fscale_up
-            write (weights_info(nwgt  ),'(a4,f3.1,x,a4,f3.1)')
-     &           "muR=",rw_Rscale_down,"muF=",rw_Fscale_down
-         else
-c Soft and Hard scale variations for NLO+NNLO jet veto
-            write (weights_info(nwgt-8),'(a4,f3.1,x,a4,f3.1)')
-     &           "muS=",1.0,"muH=",1.0
-            write (weights_info(nwgt-7),'(a4,f3.1,x,a4,f3.1)')
-     &           "muS=",1.0,"muH=",2.0
-            write (weights_info(nwgt-6),'(a4,f3.1,x,a4,f3.1)')
-     &           "muS=",1.0,"muH=",0.5
-            write (weights_info(nwgt-5),'(a4,f3.1,x,a4,f3.1)')
-     &           "muS=",2.0,"muH=",1.0
-            write (weights_info(nwgt-4),'(a4,f3.1,x,a4,f3.1)')
-     &           "muS=",2.0,"muH=",2.0
-            write (weights_info(nwgt-3),'(a4,f3.1,x,a4,f3.1)')
-     &           "muS=",2.0,"muH=",0.5
-            write (weights_info(nwgt-2),'(a4,f3.1,x,a4,f3.1)')
-     &           "muS=",0.5,"muH=",1.0
-            write (weights_info(nwgt-1),'(a4,f3.1,x,a4,f3.1)')
-     &           "muS=",0.5,"muH=",2.0
-            write (weights_info(nwgt  ),'(a4,f3.1,x,a4,f3.1)')
-     &           "muS=",0.5,"muH=",0.5
-         endif
+         do kk=1,dyn_scale(0)
+c set the weights_info string for scale variations
+            if (lscalevar(kk)) then
+               do ii=1,nint(scalevarF(0))
+                  do jj=1,nint(scalevarR(0))
+                     nwgt=nwgt+1
+                     if (ickkw.ne.-1) then
+                        write(weights_info(nwgt),
+     &                                '(a4,i4,x,a4,f6.3,x,a4,f6.3)')
+     $                       "dyn=",dyn_scale(kk),"muR=",scalevarR(jj)
+     $                       ,"muF=",scalevarF(ii)
+                     else
+                        write(weights_info(nwgt),
+     &                                '(a4,i4,x,a4,f6.3,x,a4,f6.3)')
+     $                       "dyn=",dyn_scale(kk),"muS=",scalevarR(jj)
+     $                       ,"muH=",scalevarF(ii)
+                     endif
+                  enddo
+               enddo
+            else
+               nwgt=nwgt+1
+               if (ickkw.ne.-1) then
+                  write(weights_info(nwgt),'(a4,i4,x,a4,f6.3,x,a4,f6.3)')
+     $                 "dyn=",dyn_scale(kk),"muR=",scalevarR(1)
+     $                 ,"muF=",scalevarF(1)
+               else
+                  write(weights_info(nwgt),'(a4,i4,x,a4,f6.3,x,a4,f6.3)')
+     $                 "dyn=",dyn_scale(kk),"muS=",scalevarR(1)
+     $                 ,"muH=",scalevarF(1)
+               endif
+            endif
+         enddo
       endif
       if (do_rwgt_pdf) then
-         npdfs=pdf_set_max-pdf_set_min+1
-         if (nwgt+npdfs.gt.max_weight) then
-            write (*,*) "ERROR in initplot: "/
-     $           /"too many PDFs in reweighting"
-            stop 1
-         endif
-         do i=1,npdfs
-            write(weights_info(nwgt+i),'(a4,i8,a3)')
-     &           'PDF=',pdf_set_min-1+i,'   '
+         do nn=1,lhaPDFid(0)
+            if (lpdfvar(nn)) then
+               write (*,*) "Including central PDF with "/
+     $              /"uncertainties for "//lhaPDFsetname(nn)
+            else
+               write (*,*) "Including central PDF for "
+     $              //lhaPDFsetname(nn)
+            endif
+c     Load all the PDF sets (the 1st one has already by loaded by the call
+c     to "setrun")
+            if (nn.gt.1) then
+               call initpdfsetbynamem(nn,lhaPDFsetname(nn))
+               if (lpdfvar(nn)) then
+                  call numberPDFm(nn,nmemPDF(nn))
+               else
+                  nmemPDF(nn)=0
+               endif
+            endif
+            if(nmemPDF(nn)+1.gt.maxPDFs)then
+               write(*,*)'Too many PDFs: increase maxPDFs in '/
+     $              /'reweight0.inc to ',numPDFs+1
+               stop
+            endif
+c set the weights_info string for PDF variation
+            if (lpdfvar(nn)) then
+               do n=0,nmemPDF(nn)
+                  nwgt=nwgt+1
+                  write(temp,'(a4,i8)') "PDF=",lhaPDFid(nn)+n
+                  write(weights_info(nwgt),'(a)') trim(adjustl(temp))/
+     $                 /' '//trim(adjustl(lhaPDFsetname(nn)))
+               enddo
+            else
+               nwgt=nwgt+1
+               write(temp,'(a4,i8)') "PDF=",lhaPDFid(nn)
+               write(weights_info(nwgt),'(a)') trim(adjustl(temp))/
+     $              /' '//trim(adjustl(lhaPDFsetname(nn)))
+            endif
          enddo
-         nwgt=nwgt+npdfs
+c start with central member of the first set
+         call InitPDFm(1,0)
       endif
       if(iappl.ne.0)then
 c Initialize grid parameters to negative values.
@@ -91,13 +106,25 @@
       endif
       call analysis_begin(nwgt,weights_info)
 c To keep track of the accumulated results:
-      do ii=1,numscales
-         do jj=1,numscales
-            xsecScale_acc(jj,ii)=0d0
-         enddo
+      do kk=1,dyn_scale(0)
+         if (lscalevar(kk)) then
+            do ii=1,nint(scalevarF(0))
+               do jj=1,nint(scalevarR(0))
+                  xsecScale_acc(jj,ii,kk)=0d0
+               enddo
+            enddo
+         else
+            xsecScale_acc(1,1,kk)=0d0
+         endif
       enddo
-      do n=0,npdfs
-         xsecPDFr_acc(n)=0d0
+      do nn=1,lhaPDFid(0)
+         if (lpdfvar(nn)) then
+            do n=0,nmemPDF(nn)
+               xsecPDFr_acc(n,nn)=0d0
+            enddo
+         else
+            xsecPDFr_acc(0,nn)=0d0
+         endif
       enddo
       return
       end
@@ -107,8 +134,8 @@
       implicit none
       include "nexternal.inc"
       include 'reweight0.inc'
-      include 'reweightNLO.inc'
-      integer ii,jj,n
+      include 'run.inc'
+      integer ii,jj,n,kk,nn
       logical usexinteg,mint
       common/cusexinteg/usexinteg,mint
       integer itmax,ncall
@@ -116,8 +143,8 @@
       logical useitmax
       common/cuseitmax/useitmax
       real*8 xnorm
-      double precision xsecScale_acc(maxscales,maxscales)
-     $     ,xsecPDFr_acc(0:maxPDFs)
+      double precision xsecScale_acc(maxscales,maxscales,maxdynscales)
+     $     ,xsecPDFr_acc(0:maxPDFs,maxPDFsets)
       common /scale_pdf_print/xsecScale_acc,xsecPDFr_acc
       integer iappl
       common /for_applgrid/ iappl
@@ -137,19 +164,32 @@
 c Write the accumulated results to a file
       open (unit=34,file='scale_pdf_dependence.dat',status='unknown')
       if (.not.useitmax) xnorm=xnorm/float(itmax)
-      write (34,*) numscales**2
-      if (numscales.gt.0) then
-         write (34,*) ((xsecScale_acc(ii,jj)*xnorm,ii=1
-     $        ,numscales),jj=1,numscales)
-      else
-         write (34,*) ''
+      if (do_rwgt_scale) then
+         write (34,*) "scale variations:"
+         do kk=1,dyn_scale(0)
+            if (lscalevar(kk)) then
+               write (34,*) dyn_scale(kk),nint(scalevarR(0))
+     $              ,nint(scalevarF(0))
+               write (34,*) ((xsecScale_acc(jj,ii,kk)*xnorm,jj=1
+     $              ,nint(scalevarR(0))),ii=1,nint(scalevarF(0)))
+            else
+               write (34,*) dyn_scale(kk),1,1
+               write (34,*) xsecScale_acc(1,1,kk)*xnorm
+            endif
+         enddo
       endif
-      if (numPDFs.gt.0) then
-         write (34,*) numPDFs
-         write (34,*) (xsecPDFr_acc(n)*xnorm,n=0,numPDFs-1)
-      else
-         write(34,*) numPDFs
-         write (34,*) ''
+      if (do_rwgt_pdf) then
+         write (34,*) "pdf variations:"
+         do nn=1,lhaPDFid(0)
+            if (lpdfvar(nn)) then
+               write (34,*) trim(adjustl(lhaPDFsetname(nn))),
+     $              nmemPDF(nn)+1
+               write (34,*) (xsecPDFr_acc(n,nn)*xnorm,n=0,nmemPDF(nn))
+            else
+               write(34,*) lhaPDFsetname(nn),nmemPDF(nn) + 1
+               write (34,*) xsecPDFr_acc(0,nn)*xnorm
+            endif
+         enddo
       endif
       close(34)
       return                
@@ -185,7 +225,7 @@
       integer itype
       double precision p(0:4,nexternal),pplab(0:3,nexternal),chybst
      $     ,shybst,chybstmo
-      integer i,j,ibody,i_wgt
+      integer i,j,ibody,i_wgt,ii,jj,kk,n,nn
       double precision xd(3)
       data (xd(i),i=1,3) /0d0,0d0,1d0/
       integer istatus(nexternal),iPDG(nexternal)
@@ -199,8 +239,8 @@
       integer nwgt,max_weight
       parameter (max_weight=maxscales*maxscales+maxpdfs+1)
       double precision www(max_weight),wgtden,ratio
-      double precision xsecScale_acc(maxscales,maxscales)
-     $     ,xsecPDFr_acc(0:maxPDFs)
+      double precision xsecScale_acc(maxscales,maxscales,maxdynscales)
+     $     ,xsecPDFr_acc(0:maxPDFs,maxPDFsets)
       common /scale_pdf_print/xsecScale_acc,xsecPDFr_acc
       integer iappl
       common /for_applgrid/ iappl
@@ -243,18 +283,33 @@
 c Fill the accumulated results
       i_wgt=1
       if (do_rwgt_scale) then
-         do i=1,numscales
-            do j=1,numscales
+         do kk=1,dyn_scale(0)
+            if (lscalevar(kk)) then
+               do ii=1,nint(scalevarF(0))
+                  do jj=1,nint(scalevarR(0))
+                     i_wgt=i_wgt+1
+                     xsecScale_acc(jj,ii,kk)=xsecScale_acc(jj,ii,kk)
+     $                    +www(i_wgt)
+                  enddo
+               enddo
+            else
                i_wgt=i_wgt+1
-               xsecScale_acc(i,j)=xsecScale_acc(i,j)+www(i_wgt)
-            enddo
+               xsecScale_acc(1,1,kk)=xsecScale_acc(1,1,kk)
+     $              +www(i_wgt)
+            endif
          enddo
       endif
       if (do_rwgt_pdf) then
-         xsecPDFr_acc(0)=xsecPDFr_acc(0)+www(1)
-         do i=1,numPDFs-1
-            i_wgt=i_wgt+1
-            xsecPDFr_acc(i)=xsecPDFr_acc(i)+www(i_wgt)
+         do nn=1,lhaPDFid(0)
+            if (lpdfvar(nn)) then
+               do n=0,nmemPDF(nn)
+                  i_wgt=i_wgt+1
+                  xsecPDFr_acc(n,nn)=xsecPDFr_acc(n,nn)+www(i_wgt)
+               enddo
+            else
+               i_wgt=i_wgt+1
+               xsecPDFr_acc(0,nn)=xsecPDFr_acc(0,nn)+www(i_wgt)
+            endif
          enddo
       endif
  999  return      

=== modified file 'Template/NLO/SubProcesses/makefile'
--- Template/NLO/SubProcesses/makefile	2016-02-19 09:48:51 +0000
+++ Template/NLO/SubProcesses/makefile	2016-03-04 16:01:53 +0000
@@ -24,6 +24,11 @@
 	$(FC) $(LDFLAGS) -o split40 $(SPLIT40)
 
 collect_events: $(COLLECT_EVENTS)
+<<<<<<< TREE
 	$(FC) $(LDFLAGS) -o collect_events $(COLLECT_EVENTS) $(LINKLIBS)
 	rm handling_lhe_events.o
+=======
+	$(FC) $(LDFLAGS) -o collect_events $(COLLECT_EVENTS)
+	rm handling_lhe_events.o
+>>>>>>> MERGE-SOURCE
 

=== modified file 'Template/NLO/SubProcesses/reweight0.inc'
--- Template/NLO/SubProcesses/reweight0.inc	2015-03-03 17:09:53 +0000
+++ Template/NLO/SubProcesses/reweight0.inc	2016-03-04 16:01:53 +0000
@@ -65,16 +65,28 @@
 c Cross sections after variations of scales and PDFs
 c
       integer maxscales,maxPDFs
-      parameter (maxscales=3)
+      parameter (maxscales=9)
       parameter (maxPDFs=200)
 
+c New format to allow for multiple PDF sets and scales (both functional form
+c and normal)
+      integer    maxPDFsets,   maxdynscales
+      parameter (maxPDFsets=10,maxdynscales=10)
+      integer lhaPDFid(0:maxPDFsets),nmemPDF(maxPDFsets)
+     $     ,dyn_scale(0:maxdynscales)
+      logical lscalevar(maxdynscales),lpdfvar(maxPDFsets)
+      character*100 LHAPDFsetname(maxPDFsets)
+      double precision scalevarR(0:maxscales),scalevarF(0:maxscales)
+      common/new_format_scale_pdf/LHAPDFsetname,scalevarR,scalevarF
+     $     ,lhaPDFid,nmemPDF,dyn_scale,lscalevar,lpdfvar
+
 c Number of scale factors (for each scale) and PDF error pairs
-      integer numscales,numPDFpairs
-      common/cwgxsec1/numscales,numPDFpairs
+      integer numscales,numPDFpairs,numPDFs
+      common/cwgxsec1/numscales,numPDFpairs,numPDFs
 
 c Cross sections at different scales and PDFs
-      double precision wgtxsecmu(maxscales,maxscales),
-     #                 wgtxsecPDF(0:maxPDFs)
+      double precision wgtxsecmu(maxscales,maxscales,maxdynscales),
+     #                 wgtxsecPDF(0:maxPDFs,maxPDFsets)
       common/cwgxsec2/wgtxsecmu,wgtxsecPDF
 
 c Cross sections at different scales and PDFs, for NLO computations
@@ -136,3 +148,8 @@
       character*1024 n_ctr_str(max_n_ctr)
       double precision momenta_str(0:3,maxparticles,max_n_ctr)
       common /c_rwgt_lines/n_ctr_str,momenta_str,n_ctr_found,n_mom_conf
+
+      integer max_weight_shower
+      parameter (max_weight_shower=1024)
+      
+      

=== modified file 'Template/NLO/SubProcesses/reweightNLO.inc'
--- Template/NLO/SubProcesses/reweightNLO.inc	2013-10-29 11:45:05 +0000
+++ Template/NLO/SubProcesses/reweightNLO.inc	2016-03-04 16:01:53 +0000
@@ -14,8 +14,3 @@
 c in the computation, but this condition may be relaxed
       integer idpdf(0:maxPDFs)
       common/cNLOrwgt3/idpdf
-
-c Total number of PDFs used in the computation (ilastPDF-ifirstPDF+2),
-c including the central one
-      integer numPDFs
-      common/cNLOrwgt4/numPDFs

=== modified file 'Template/NLO/SubProcesses/reweight_xsec_events.f'
--- Template/NLO/SubProcesses/reweight_xsec_events.f	2015-08-19 12:50:52 +0000
+++ Template/NLO/SubProcesses/reweight_xsec_events.f	2016-03-04 16:01:53 +0000
@@ -6,54 +6,40 @@
 c and PDF variations
 c Compile with makefile_rwgt
       implicit none
-      include "nexternal.inc"
-      include "genps.inc"
-      include "nFKSconfigs.inc"
+      include "run.inc"
       include "reweight_all.inc"
-      include "run.inc"
-      character*7 pdlabel,epa_label
-      integer lhaid
+      integer i,ii,jj,kk,isave,idpdf(0:maxPDFs),itmp,lef,ifile,maxevt
+     $     ,iSorH_lhe,ifks_lhe,jfks_lhe,fksfather_lhe,ipartner_lhe
+     $     ,kwgtinfo,kexternal,jwgtnumpartn,ofile,kf,kr,n,nn
+      double precision yfactR(maxscales),yfactF(maxscales),value(20)
+     $     ,scale1_lhe,scale2_lhe,wgtcentral,wgtmumin,wgtmumax,wgtpdfmin
+     $     ,wgtpdfmax,saved_weight,xsecPDFr_acc(0:maxPDFs,maxPDFsets)
+     $     ,xsecScale_acc(maxscales,maxscales,maxdynscales)
+      logical AddInfoLHE,unweighted
+      character*9 ch1
+      character*10 MonteCarlo
+      character*20 parm(20)
+      character*80 event_file,fname1
+      character*140 buff
+c Parameters
+      integer    izero
+      parameter (izero=0)
+c Common blocks
+      character*7         pdlabel,epa_label
+      integer       lhaid
       common/to_pdf/lhaid,pdlabel,epa_label
-      integer maxevt,ifile,ofile,i,jj,isave,ii
-      double precision saved_weight
-      logical unweighted
+c Les Houches Event File info:
       integer IDBMUP(2),PDFGUP(2),PDFSUP(2),IDWTUP,NPRUP,LPRUP
       double precision EBMUP(2),XSECUP,XERRUP,XMAXUP
       INTEGER MAXNUP
       PARAMETER (MAXNUP=500)
-      INTEGER NUP,IDPRUP,IDUP(MAXNUP),ISTUP(MAXNUP),
-     # MOTHUP(2,MAXNUP),ICOLUP(2,MAXNUP)
-      DOUBLE PRECISION XWGTUP,SCALUP,AQEDUP,AQCDUP,
-     # PUP(5,MAXNUP),VTIMUP(MAXNUP),SPINUP(MAXNUP)
-      integer isorh_lhe,ifks_lhe,jfks_lhe,fksfather_lhe,ipartner_lhe
-      double precision scale1_lhe,scale2_lhe,percentage
-      integer kwgtinfo,kexternal,jwgtnumpartn
-      double precision wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
-      double precision xmuR_over_ref,xmuF1_over_ref,xmuF2_over_ref,
-     # xQES_over_ref,pr_muR_over_ref,pr_muF1_over_ref,pr_muF2_over_ref,
-     # tmp,yfactR(maxscales),yfactF(maxscales),xsecPDFr(0:maxPDFs)
-      double precision xsecPDFr_acc(0:maxPDFs),xsecScale_acc(maxscales
-     $     ,maxscales)
-      double precision compute_rwgt_wgt_Sev,compute_rwgt_wgt_Sev_nbody
-     &     ,compute_rwgt_wgt_Hev
-      integer kr,kf,n,nng,nps,npairs,nsets,izero,itmp,idpdf(0:maxPDFs)
-      parameter (izero=0)
-      integer lef
-      character*80 event_file,fname1
-      character*140 buff
-      character*10 MonteCarlo
-      character*9 ch1
-      character*20 parm(20)
-      double precision value(20)
-      logical AddInfoLHE
-      external compute_rwgt_wgt_Sev,compute_rwgt_wgt_Sev_nbody
-     &     ,compute_rwgt_wgt_Hev
-      integer i_process
-      common/c_i_process/i_process
+      INTEGER NUP,IDPRUP,IDUP(MAXNUP),ISTUP(MAXNUP),MOTHUP(2,MAXNUP)
+     $     ,ICOLUP(2,MAXNUP)
+      DOUBLE PRECISION XWGTUP,SCALUP,AQEDUP,AQCDUP,PUP(5,MAXNUP)
+     $     ,VTIMUP(MAXNUP),SPINUP(MAXNUP)
 c
       call setrun                !Sets up run parameters
 
-
       write(*,*) 'Enter event file name'
       read(*,*) event_file
 
@@ -66,74 +52,51 @@
         isave=0
       endif
 
-
-      xQES_over_ref=QES_over_ref
-      xmuR_over_ref=muR_over_ref
-      xmuF1_over_ref=muF1_over_ref
-      xmuF2_over_ref=muF2_over_ref
-      write(*,*) 'Using:'  
-      write(*,*) 'QES_over_ref: ', xQES_over_ref
-      write(*,*) 'muR_over_ref: ', xmuR_over_ref
-      write(*,*) 'muF1_over_ref: ', xmuF1_over_ref
-      write(*,*) 'muF2_over_ref: ', xmuF2_over_ref
-      if (xmuF1_over_ref .ne. xmuF2_over_ref) then
-          write(*,*) "The variables muF1_over_ref and muF2_over_ref" //
-     1     " have to be set equal in the run_card.dat." //
-     1     " Run cannot continue, quitting..."
-          stop
-      endif
-
       if(do_rwgt_scale)then
-        yfactR(1)=1.d0
-        yfactR(2)=rw_Rscale_up
-        yfactR(3)=rw_Rscale_down
-        yfactF(1)=1.d0
-        yfactF(2)=rw_Fscale_up
-        yfactF(3)=rw_Fscale_down
-        write(*,*) 'Doing scale reweight:'
-        write(*,*) rw_Fscale_down, ' < mu_F < ', rw_Fscale_up
-        write(*,*) rw_Rscale_down, ' < mu_R < ', rw_Rscale_up
-        numscales=3
-      else
-        numscales=0
+         do nn=1,dyn_scale(0)
+            if (lscalevar(nn)) then
+               write (*,*) "Including scale uncertainties for"/
+     $              /" dynamical_scale_choice",dyn_scale(nn)
+               write (*,*) "  - renormalisation scale variation:"
+     $              ,(scalevarR(i),i=1,nint(scalevarR(0)))
+               write (*,*) "  - factorisation scale variation:"
+     $              ,(scalevarF(i),i=1,nint(scalevarF(0)))
+            else
+               write (*,*) "Including central value for"/
+     $              /" dynamical_scale_choice",dyn_scale(nn)
+            endif
+         enddo
       endif
 
-c Note: when ipdf#0, the central PDF set will be used also as a reference
-c for the scale uncertainty
       if(do_rwgt_pdf)then
-
-        idpdf(0)=lhaid
-        idpdf(1)=pdf_set_min
-        itmp=pdf_set_max
-        nsets=itmp-idpdf(1)+1
-        write(*,*) 'Doing PDF reweight:'
-        write(*,*) 'Central set id: ', idpdf(0)
-        write(*,*) 'Min error set id: ', idpdf(1)
-        write(*,*) 'Max error set id: ', itmp
-        if(mod(nsets,2).ne.0)then
-          write(*,*)'The number of error sets must be even',nsets
-          stop
-        else
-          npairs=nsets/2
-        endif
-        do i=2,nsets
-          idpdf(i)=idpdf(1)+i-1
-        enddo
-        if(nsets.gt.maxPDFs)then
-          write(*,*)'Too many PDFs: increase maxPDFs in reweight0.inc'
-          stop
-        endif
-c
-        value(1)=idpdf(0)
-        parm(1)='DEFAULT'
-        call pdfset(parm,value)
-c
-        numPDFpairs=npairs
-      else
-        numPDFpairs=0
+         do nn=1,lhaPDFid(0)
+            if (lpdfvar(nn)) then
+               write (*,*) "Including central PDF with "/
+     $              /"uncertainties for "//lhaPDFsetname(nn)
+            else
+               write (*,*) "Including central PDF for "
+     $              //lhaPDFsetname(nn)
+            endif
+c Load all the PDF sets (the 1st one has already by loaded by the call
+c to "setrun")
+            if (nn.gt.1) then
+               call initpdfsetbynamem(nn,lhaPDFsetname(nn))
+               if (lpdfvar(nn)) then
+                  call numberPDFm(nn,nmemPDF(nn))
+               else
+                  nmemPDF(nn)=0
+               endif
+            endif
+            if(nmemPDF(nn)+1.gt.maxPDFs)then
+               write(*,*)'Too many PDFs: increase maxPDFs in '/
+     $              /'reweight0.inc to ',numPDFs+1
+               stop
+            endif
+         enddo
+c start with central member of the first set
+         call InitPDFm(1,0)
       endif
 
-c$$$      call fk88strcat(event_file,'.rwgt',fname1)
       lef=index(event_file,' ')-1
       fname1=event_file(1:lef)//'.rwgt'
 
@@ -147,23 +110,21 @@
      &     XSECUP,XERRUP,XMAXUP,LPRUP)
 
       do i=1,min(10,maxevt)
-        call read_lhef_event(ifile,
-     &       NUP,IDPRUP,XWGTUP,SCALUP,AQEDUP,AQCDUP,
-     &       IDUP,ISTUP,MOTHUP,ICOLUP,PUP,VTIMUP,SPINUP,buff)
-
-        if(buff(1:1).ne.'#')then
-          write(*,*)'This event file cannot be reweighted [1]',i
-          stop
-        endif
-        read(buff,*)ch1,iSorH_lhe,ifks_lhe,jfks_lhe,
-     #                    fksfather_lhe,ipartner_lhe,
-     #                    scale1_lhe,scale2_lhe,
-     #                    kwgtinfo,kexternal,jwgtnumpartn,
-     #         wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
-        if((kwgtinfo.lt.1.or.kwgtinfo.gt.5) .and. kwgtinfo.ne.-5)then
-          write(*,*)'This event file cannot be reweighted [2]',i
-          write(*,*)kwgtinfo
-          stop 1
+         call read_lhef_event(ifile,
+     &        NUP,IDPRUP,XWGTUP,SCALUP,AQEDUP,AQCDUP,
+     &        IDUP,ISTUP,MOTHUP,ICOLUP,PUP,VTIMUP,SPINUP,buff)
+         if(buff(1:1).ne.'#')then
+            write (*,*) 'This event file cannot be reweighted [1]',i
+            stop
+         endif
+         read(buff,*)ch1,iSorH_lhe,ifks_lhe,jfks_lhe,fksfather_lhe
+     $        ,ipartner_lhe,scale1_lhe,scale2_lhe,kwgtinfo,kexternal
+     $        ,jwgtnumpartn,wgtcentral,wgtmumin,wgtmumax,wgtpdfmin
+     $        ,wgtpdfmax
+        if(kwgtinfo.ne.-5)then
+           write (*,*) 'This event file cannot be reweighted [2]',i
+           write (*,*) kwgtinfo
+           stop 1
         endif
         if(i.eq.1)then
           saved_weight=abs(XWGTUP)
@@ -198,29 +159,34 @@
      &     XSECUP,XERRUP,XMAXUP,LPRUP)
 
 c To keep track of the accumulated results:
-      do ii=1,numscales
-         do jj=1,numscales
-            xsecScale_acc(jj,ii)=0d0
-         enddo
-      enddo
-      do n=0,nsets
-         xsecPDFr_acc(n)=0d0
-      enddo
-
-       nScontributions=1
+      do kk=1,dyn_scale(0)
+         if (lscalevar(kk)) then
+            do ii=1,nint(scalevarF(0))
+               do jj=1,nint(scalevarR(0))
+                  xsecScale_acc(jj,ii,kk)=0d0
+               enddo
+            enddo
+         else
+            xsecScale_acc(1,1,kk)=0d0
+         endif
+      enddo
+      do nn=1,lhaPDFid(0)
+         if (lpdfvar(nn)) then
+            do n=0,nmemPDF(nn)
+               xsecPDFr_acc(n,nn)=0d0
+            enddo
+         else
+            xsecPDFr_acc(0,nn)=0d0
+         endif
+      enddo
+      nScontributions=1
 
 c Determine the flavor map between the NLO and Born
       call find_iproc_map()
-
-      
-
       do i=1,maxevt
-
-         
          call read_lhef_event(ifile,
      &       NUP,IDPRUP,XWGTUP,SCALUP,AQEDUP,AQCDUP,
      &       IDUP,ISTUP,MOTHUP,ICOLUP,PUP,VTIMUP,SPINUP,buff)
-
          if(buff(1:1).ne.'#')then
             write(*,*)'This event file cannot be reweighted [3]',i
             stop
@@ -230,246 +196,78 @@
      $        ,jwgtnumpartn,wgtcentral,wgtmumin,wgtmumax,wgtpdfmin
      $        ,wgtpdfmax
 
-         if (kwgtinfo.ne.-5) then
-         call reweight_fill_extra_inverse()
-
-        if(kwgtinfo.lt.1.or.kwgtinfo.gt.5)then
-          write(*,*)'This event file cannot be reweighted [4]',i
-          write(*,*)kwgtinfo
-          stop
-        endif
-        if(wgtcentral.ne.0.d0.or.wgtmumin.ne.0.d0.or.
-     #     wgtmumax.ne.0.d0.or.wgtpdfmin.ne.0.d0.or.
-     #     wgtpdfmax.ne.0.d0)then
-          write(*,*)'This event file was already reweighted',i
-          write(*,*)wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
-          stop
-        endif
-
-        if (kwgtinfo.eq.5) call reweight_settozero()
-
-        if(do_rwgt_scale)then
-
-          wgtmumin=1.d40
-          wgtmumax=-1.d40
-
-          do kr=1,3
-            do kf=1,3
-              wgtref=0d0
-              pr_muR_over_ref=xmuR_over_ref*yfactR(kr)
-              pr_muF1_over_ref=xmuF1_over_ref*yfactF(kf)
-              pr_muF2_over_ref=pr_muF1_over_ref
-              wgtxsecmu(kr,kf)=0d0
-              if(iSorH_lhe.eq.1)then
-c The nbody contributions
-                 if (kwgtinfo.eq.5) then
-                    call fill_reweight0inc_nbody(i_process)
-                    wgtxsecmu(kr,kf)=wgtxsecmu(kr,kf)
-     &                   +compute_rwgt_wgt_Sev_nbody(pr_muR_over_ref
-     &                   ,pr_muF1_over_ref, pr_muF2_over_ref
-     &                   ,xQES_over_ref, kwgtinfo)
-                    call reweight_settozero()
-                 endif
-                 do ii=1,nScontributions
-                    nFKSprocess_used=nFKSprocess_reweight(ii)
-                    if (kwgtinfo.eq.5)
-     &                   call fill_reweight0inc(nFKSprocess_used*2-1
-     $                   ,i_process)
-                    wgtxsecmu(kr,kf)=wgtxsecmu(kr,kf)+
-     &                   compute_rwgt_wgt_Sev(pr_muR_over_ref
-     &                   ,pr_muF1_over_ref, pr_muF2_over_ref
-     &                   ,xQES_over_ref, kwgtinfo)
-                    if (kwgtinfo.eq.5) call reweight_settozero()
-                 enddo
-              elseif(iSorH_lhe.eq.2)then
-                 if (kwgtinfo.eq.5)
-     &                call fill_reweight0inc(nFKSprocess_used*2,
-     &                i_process)
-                 wgtxsecmu(kr,kf)=wgtxsecmu(kr,kf)+
-     &                compute_rwgt_wgt_Hev(pr_muR_over_ref
-     &                ,pr_muF1_over_ref, pr_muF2_over_ref
-     &                ,xQES_over_ref, kwgtinfo)
-                 if (kwgtinfo.eq.5) call reweight_settozero()
-              else
-                 write(*,*)'Invalid value of iSorH_lhe',iSorH_lhe
-                 stop
-              endif
-c
-              tmp=wgtxsecmu(kr,kf)
-              if(tmp.lt.wgtmumin)wgtmumin=tmp
-              if(tmp.gt.wgtmumax)wgtmumax=tmp
-            enddo
-          enddo
-
-          if (kwgtinfo.eq.5) then
-             if (iSorH_lhe.eq.1) then
-                wgtref=wgtref_nbody_all(i_process)
-                do ii=1,nScontributions
-                   wgtref=wgtref+ wgtref_all(nFKSprocess_reweight(ii)*2
-     $                  -1,i_process)
-                enddo
-             else
-                wgtref=wgtref_all(nFKSprocess_used*2,i_process)
-             endif
-          endif
-
-          if(unweighted)then
-            wgtcentral=wgtxsecmu(1,1)/wgtref
-            wgtmumin=wgtmumin/wgtref
-            wgtmumax=wgtmumax/wgtref
-          else
-            wgtcentral=wgtxsecmu(1,1)
-          endif
-
-        endif
-
-        if(do_rwgt_pdf)then
-
-          do n=0,nsets
-             wgtref=0d0
-             call InitPDF(n)
-             wgtxsecPDF(n)=0d0
-
-             if(iSorH_lhe.eq.1)then
-c The nbody contributions
-                if (kwgtinfo.eq.5) then
-                   call fill_reweight0inc_nbody(i_process)
-                   wgtxsecPDF(n)=wgtxsecPDF(n)
-     $                  +compute_rwgt_wgt_Sev_nbody(xmuR_over_ref
-     $                  ,xmuF1_over_ref, xmuF2_over_ref ,xQES_over_ref,
-     $                  kwgtinfo)
-                   call reweight_settozero()
-                endif
-                do ii=1,nScontributions
-                   nFKSprocess_used=nFKSprocess_reweight(ii)
-                   if (kwgtinfo.eq.5)
-     &                  call fill_reweight0inc(nFKSprocess_used*2-1
-     $                   ,i_process)
-                   wgtxsecPDF(n)=wgtxsecPDF(n)+
-     &                  compute_rwgt_wgt_Sev(xmuR_over_ref
-     &                  ,xmuF1_over_ref, xmuF2_over_ref ,xQES_over_ref,
-     &                  kwgtinfo)
-                   if (kwgtinfo.eq.5) call reweight_settozero()
-                enddo
-             elseif(iSorH_lhe.eq.2)then
-                if (kwgtinfo.eq.5)
-     &               call fill_reweight0inc(nFKSprocess_used*2,
-     &               i_process)
-                wgtxsecPDF(n)=wgtxsecPDF(n)+
-     &               compute_rwgt_wgt_Hev(xmuR_over_ref ,xmuF1_over_ref,
-     &               xmuF2_over_ref ,xQES_over_ref, kwgtinfo)
-                if (kwgtinfo.eq.5) call reweight_settozero()
-             else
-                write(*,*)'Invalid value of iSorH_lhe',iSorH_lhe
-                stop
-             endif
-c
-             if (kwgtinfo.eq.5) then
-                if (iSorH_lhe.eq.1) then
-                   wgtref=wgtref_nbody_all(i_process)
-                   do ii=1,nScontributions
-                      wgtref=wgtref+wgtref_all(nFKSprocess_reweight(ii)
-     $                     *2-1,i_process)
-                   enddo
-                else
-                   wgtref=wgtref_all(nFKSprocess_used*2,i_process)
-                endif
-             endif
-             
-             if(unweighted)then
-                xsecPDFr(n)=wgtxsecPDF(n)/wgtref
-             else
-                xsecPDFr(n)=wgtxsecPDF(n)
-             endif
-          enddo
-
-          if(do_rwgt_scale)then
-            if(abs(xsecPDFr(0)/wgtcentral-1.d0).gt.1.d-6)then
-              write(*,*)'Central valued computed with mu and PDF differ'
-              write(*,*)xsecPDFr(0),wgtcentral
-              stop
-            endif
-          else
-            wgtcentral=xsecPDFr(0)
-c The following serves to write on tape the reference cross section
-c computed with the new parameters
-            wgtxsecmu(1,1)=wgtxsecPDF(0)
-          endif
-
-          wgtpdfmin=0.d0
-          wgtpdfmax=0.d0
-
-          do n=1,npairs
-            nps=2*n-1
-            nng=2*n
-
-            wgtpdfmin=wgtpdfmin+
-     #                ( max(0.d0,
-     #                      xsecPDFr(0)-xsecPDFr(nps),
-     #                      xsecPDFr(0)-xsecPDFr(nng)) )**2
-            wgtpdfmax=wgtpdfmax+
-     #                ( max(0.d0,
-     #                      xsecPDFr(nps)-xsecPDFr(0),
-     #                      xsecPDFr(nng)-xsecPDFr(0)) )**2
-          enddo
-          wgtpdfmin=wgtcentral-sqrt(wgtpdfmin)
-          wgtpdfmax=wgtcentral+sqrt(wgtpdfmax)
-
-c Restore default PDFs
-          call InitPDF(izero)
-
-        endif
-
-        else                      ! kwgtinfo.eq.-5
-         
-        call fill_wgt_info_from_rwgt_lines
-        if (do_rwgt_scale)call reweight_scale_ext(yfactR,yfactF)
-        if (do_rwgt_pdf)  call reweight_pdf_ext