Merge lp://staging/~madnklo/mg5amcnlo/MadNkLO_ISR into lp://staging/~madnklo/mg5amcnlo/MadNkLO

1. Fix to integrands
2. Skeletton for p p > X soft mapping and walker

Implemented the Soft vs Initial state mapping to higher/lower multiplicity. All methods raise a NotImplemented error for now as they are *not* tested yet.

Soft Vs Initial Mapping corrected to pass invertibility unit_test. Commutativity and associativity tests removed. Still raises NotImplemented error until validated with test_IR_limits

Debugged the evaluation of the Initial-final soft-collinears. pp->Z soft limit validated. pp->Z collinear has issues with cuts.

1. Fixed the definition of the mapping_variable `Q` in InitialLorentzOneMapping. @Simone: CHECK.
2. Fixed the soft-initial-collinear current so as to correctly define pC as 'pC = pC + pS' and use the `is_cut` function.
3. Improved the display of plots from test_IR_limits on a grid of subplots on a single page as opposed to multiple windows.
4. Tested that all limits and poles work on 'u u~ > z g'.

1. Merged with the latest version of the trunk.

1. Improved and fixed the interface of MadNkLO to Cuba@Vegas, which is now a viable alternative to Vegas3.
2. Cuba@Vegas supports the same options as Vegas (--save_grids, --load_grids, etc...) plus some other.
3. Integrator options should now be supplied using the new command 'set_integrator_options <integrator_name> options'
4. When considering observables, the status for Cuba@Vegas is the same as for Vegas3: OK during refine only and without parallellization (which must therefore be done by hand)

1. Improved pyCuba@Vegas to better handle saving and loading grids.
2. Improved handling of interrupts during parallel runs (however not satisfactory yet).

1. Slight improvement of the KeyboardInterrupt handling.
2. Added to the pyCuba@Vegas grid output file the last integration result, to easily be able to recover it with max_eval==max_eval_survey==0.

1. Fixed a bug introduced which prevented correct generation of chsi.

1. First attempt at implementing BS contributions

1. Implemented the BS contribution which is correctly generated when using the colorful scheme with a mapping recoiling soft against initial states.
2. Completed the implementation so that the BS integrand and its counterterms are correctly processed. This is running but not tested yet.
3. TODO: Adapt the phase-space generator so as to generate correlated chsi values.

1. Finished the implementation of the ME7Integrand for the BS contribution and tested that test_IR_limits works for it.

1. Finalized the implementation of the ME7_integrand_BS, including test_IR_poles and the integration.
2. Minor fixes for pyCuba@Vegas, still not perfect yet and as quirks.

1. Fixed typo in last push

1. Fix a typo in last push and solved a problem in the integration of the end-point beam-soft integrated CT.

1. Fix on how to determine correlated beam currents for IntegratedBeamCurrents

1. Corrected the spelling chsi->xi

Added missing argument (walker) in definitions of scale_configuration

1. Fixed so '\xi' to 'xi' as the slash was sometimes understood as an escape character.

1. Finally, flavor mapping and mirrorring is now supported.
2. The problem of overcounting integrated ISR has been adressed.
3. In theory, all should now be working and 'p p > z QED=1 --NLO' is tested
   to be integrating. Next step is validation.

1. Fixed the passing of options to the Vegas3 integrator

Changed output format to JSON, default is now to append result to existing file, new launch option --run_name

Fixed issues that prevented p p > z j to run fine. Now it does.

Fixed some issues to generate NNLO ISR, e.g. p p > z --NNLO with option '--ignore_integrated_counterterms=RR' for the output

Fixed severe bug in the subtraction of EpsilonExpansion

added the integrated soft and soft collinear counterterms computed using the Soft vs IS mapping of Vittorio.

Corrected the scaling of the matrix element when using Vittorio's Soft vs IS mapping

Corrected a typo in colorful.NLO.beam_factorization : need to use filtered_flavor_matrix

changes to ME7Event.convolve_flavor:
- doc reflects that a flavor matrix second entry (end_flavors) is actually a tuple to allow multiple flavors at once
- unspecified flavor matrix entries are set to 0, not 1

added ME7Event.is_empty : check if the convolution was with an empty matrix

in ME7Integrand.convolve_event_with_beam_factorization_currents:
- after convolution check if this has made the event empty, then return None as an event. This makes it be ignored

in test_IR_poles_for_process: now weights are summed, not events. This avoids issues with mapped events that have different kinematics (swapped leg orders) which cannot be summed.

Refactored flavor masking in a separate function and corrected it (it did not account for end_flavors being tuples)

1. BUG FIX: Real-emission local counterterms were not convoluted with the right PDFs.
2. BUG FIX: Sigma failed to add correctly the counterterms to the collection of events generated because of an indentation error.
3. Removed the ugly loop-induced specific class and refactored MadNkLO so that it can do loop-induced exactly like other processes.
4. Added options at generation stage to overwrite the process definition used for any contribution.
5. Improved MadLoop standalone loop-induced output so as to add the missing F2PY function hooks that the MadLoopAccessors needed.
6. Corrected how the flag 'requires_mirrorring' is set for integrated counterterms.
7. Fixed how the mirrored events are generated, so as to really swap the entire attribute relevant to both initial states.
8. Improved the printouts of test_IR_poles.
9. Fixed when the cuts (higher and lower) are called in the test_* functions depending on the options specified by the user.
Conclusion: This is the first revision that has a chance of yielding correct ISR NLO QCD cross-sections.

1. Small fix in Vegas3 integrator options

1. Fixed how the mirrored events of ISR collinear are generated as they need boosting since the maappinds sends them off the c.o.m. frame.

1. Fixed how the flavour map is applied to the integrated collinear counterterms and [F] currents.

Added dispatch in softs recoiling agaist IS according to dipole type (II, IF, FF). Corrected II integrated soft. Added sanity check to avoid handling massive emitters.

corrected Bjorken x bound to avoid crashing when doing e+ e- annihilation. (x<=1 instead of x<1)

1. Improved the printout of test_IR_poles
2. FIXED the PS point specifed when creating counter-events didn't have the right kinematics.
3. FIXED PS point of the counter-event *must* be boosted back to the com for distributions to be correct
   (this is because the xi rescalines must *not* apply with the change of variables chosen by MadNkLO to generate them)

Corrected the printout when creating a new folder for results and improved comments on the result folder appending/creating logic

1. Fixed support for the option --loop_filter
2. Fixed LO beam type guessing
3. Fixed implementation of cuts at LO
4. Fixed return 0. -> continue in __call__ of the integrand base class

1. Fixed how to implement user-based cuts.

1. Fixed a bug in the function that constructs the flavor cuts

1. Fix bug in handling process options

1. Trivial bug fixed in flavor cut building function

1. Correctly apply Gabor's cut to initial state local collinear CT.
2. Compute Q directly in evaluate_(integrated)_counterterm and pass it to currents (possibly overwriting what was computed in the mappings).

1. Also passed Q to the F-type of currents which is necessary structurally, even though they do not depend on it.

1. Fixed the sum of initial momentum 'Q' passed to the PDF counterterms and integrated initial-state collinear counterterms so that they do not include the xi rescalings.

1. Fixed the fact that the '+' distributions in the integrated ISR collinear CT must also apply on the 'Q^2/(xi1*xi2)' prefactor.
   This brings MadNkLO in full agreement with MadFKS for the process 'p p > z' ! :)

1. Fixed last implementation of the log(Q^2)_plus so that it does not crash on endpoint evaluation.

Typo in last push

1. Fixed the definition of NF in the beam factorization currents.

Added a new current scheme to separate colorful and colorful with Vittorio's mapping

1. Improved printouts of the counterterm structure of the events generated, also in test_IR_poles.

1. Safe-guarded the normalization factor in test_IR_poles.

Inserted forgotten multiplicity factor in integrated counterterms

Added the possibility to have 1,2,3 quarks in protons.
A warning is displayed when using a single quark: debug only

Bug correction: identifying colorful_pp as a scheme using BS contributions and correcting selection of initial-initial eikonals

Added safeguard for loading libcuba.so

1. Fixed obvious mistake in the recursion setup for function get_reduced_flavor of the CountertermNode.

1. Fixed issue with mapped processes having non-consecutive leg numbers.
2. Insure to completely skipped the beam factorization treatment when no contribution has an active beam.

ProcessKey now always sorts final states PDGs. The sort_PDGs options only applies to the initial state.

Improved error message of get_parent

Partially fixed counterterm handling in test_IR_limits

Improved handling of flavor assignments and cut events in test_IR_limits

Commented out unused momenta from CataniSeymour currents that could cause fails

Removed a printout of the soft PS point during mapping

Implemented currents for the subtraction of 'e+ e- > u d u~ d~'
with distributed softs.

Improvements to ME7 while coding qqQQ subtractions

These include:
- Saving of plots in grid format
- Print statements for debugging updated (and commented)
- ME-def line is not plotted by default (meaningless with reshuffled counterterms)
- Formatting and cleanup

Fixed a bug in the combination of spin-correlations, some formatting

1. Fixed spin-correlated MEs

1. Forced the fastjet clustering algorithm to be genkt

1. Improved some quirks in test_IR_limits

1. Forced the absence of a factor in the initial collinear currents of colorful.

1. Force the massive Q ref. collinear variables for colorful.

1. Added a new attribute FROZEN_DIMENSIONS to the ME7Integrand base class that allows
   to freeze integration variables to a desired values so as to artificially lower the
   dimensionality of the phase-space integral to perform.

removed colorful cut and factors in local soft and SC counterterms

Temporary xi^2 correction factor in colorful_pp BS bulk to crrect flux factor. A more permanent change is warranted

Correct Q value in coloful_pp BS counterterm

Now using the right prefactor for colorful_pp beam_soft

1. Improved the slowdown from the dot functions in the Vector classes.

1. Added a minimal fix for not applying the Bjorken x's xi boundaries on the counterterm part of the beam convolution CTs. Will need to be generalised.

1. Cleanly implemented the upper bound based on xi for the Bjorken x's in the convolution kernels that are not of type 'counterterms'.
2. Fixed the multiplicity of integrated ISR CT when doing flavor grouping.

1. Merged with latest version of the MadNkLO trunk.

1. Fixed all MadNkLO tests