More changes
Merge branch 'master' of github.com:cesarotti/Dark-Photons

Conflicts:
	madgraph/e+e-2ge+e-withmass/Cards/delphes_trigger.dat
	madgraph/e+e-2ge+e-withmass/Source/PDF/NNPDFDriver.f
	madgraph/e+e-2ge+e-withmass/bin/internal/ufomodel/aloha.pkl
	madgraph/e+e-2ge+e-withmass/lib/Pdfdata/NNPDF23_lo_as_0119_qed_mem0.grid
	madgraph/e+e-2ge+e-withmass/lib/Pdfdata/NNPDF23_lo_as_0130_qed_mem0.grid
	madgraph/e+e-2ge+e-withmass/lib/Pdfdata/NNPDF23nlo_as_0119_qed_mem0.grid
	madgraph/pythiasource/examples/bin/main41.exe
	madgraph/pythiasource/examples/main41.cc
	madgraph/twogammaanalysis/Cards/README
	madgraph/twogammaanalysis/Cards/delphes_card_ATLAS.dat
	madgraph/twogammaanalysis/Cards/delphes_card_CMS.dat
	madgraph/twogammaanalysis/Cards/delphes_card_default.dat
	madgraph/twogammaanalysis/Cards/delphes_trigger_ATLAS.dat
	madgraph/twogammaanalysis/Cards/delphes_trigger_CMS.dat
	madgraph/twogammaanalysis/Cards/delphes_trigger_default.dat
	madgraph/twogammaanalysis/Cards/grid_card.dat
	madgraph/twogammaanalysis/Cards/grid_card_default.dat
	madgraph/twogammaanalysis/Cards/madspin_card_default.dat
	madgraph/twogammaanalysis/Cards/pgs_card_ATLAS.dat
	madgraph/twogammaanalysis/Cards/pgs_card_CMS.dat
	madgraph/twogammaanalysis/Cards/pgs_card_LHC.dat
	madgraph/twogammaanalysis/Cards/pgs_card_TEV.dat
	madgraph/twogammaanalysis/Cards/pgs_card_default.dat
	madgraph/twogammaanalysis/Cards/plot_card.dat
	madgraph/twogammaanalysis/Cards/pythia_card_default.dat
	madgraph/twogammaanalysis/Cards/replace_card1.dat
	madgraph/twogammaanalysis/Cards/reweight_card_default.dat
	madgraph/twogammaanalysis/Cards/run_card_default.dat
	madgraph/twogammaanalysis/HTML/info-default.html
	madgraph/twogammaanalysis/HTML/mgstyle.css
	madgraph/twogammaanalysis/HTML/sortable.js
	madgraph/twogammaanalysis/HTML/stop.jpg
	madgraph/twogammaanalysis/HTML/thinking.gif
	madgraph/twogammaanalysis/README
	madgraph/twogammaanalysis/README.gridpack
	madgraph/twogammaanalysis/README.systematics
	madgraph/twogammaanalysis/Source/CERNLIB/abend.f
	madgraph/twogammaanalysis/Source/CERNLIB/dlsqp2.f
	madgraph/twogammaanalysis/Source/CERNLIB/lenocc.f
	madgraph/twogammaanalysis/Source/CERNLIB/makefile
	madgraph/twogammaanalysis/Source/CERNLIB/mtlprt.f
	madgraph/twogammaanalysis/Source/CERNLIB/mtlset.f
	madgraph/twogammaanalysis/Source/CERNLIB/radmul.f
	madgraph/twogammaanalysis/Source/DHELAS/aloha_functions.f
	madgraph/twogammaanalysis/Source/DHELAS/makefile
	madgraph/twogammaanalysis/Source/MODEL/formats.inc
	madgraph/twogammaanalysis/Source/MODEL/lha_read.f
	madgraph/twogammaanalysis/Source/MODEL/makefile
	madgraph/twogammaanalysis/Source/MODEL/printout.f
	madgraph/twogammaanalysis/Source/MODEL/testprog.f
	madgraph/twogammaanalysis/Source/PDF/Ctq4Fn.f
	madgraph/twogammaanalysis/Source/PDF/Ctq5Par.f
	madgraph/twogammaanalysis/Source/PDF/Ctq5Pdf.f
	madgraph/twogammaanalysis/Source/PDF/Ctq6Pdf.f
	madgraph/twogammaanalysis/Source/PDF/NNPDFDriver.f
	madgraph/twogammaanalysis/Source/PDF/Partonx5.f
	madgraph/twogammaanalysis/Source/PDF/PhotonFlux.f
	madgraph/twogammaanalysis/Source/PDF/cteq3.f
	madgraph/twogammaanalysis/Source/PDF/jeppe02.f
	madgraph/twogammaanalysis/Source/PDF/makefile
	madgraph/twogammaanalysis/Source/PDF/mrs98.f
	madgraph/twogammaanalysis/Source/PDF/mrs98ht.f
	madgraph/twogammaanalysis/Source/PDF/mrs98lo.f
	madgraph/twogammaanalysis/Source/PDF/mrs99.f
	madgraph/twogammaanalysis/Source/PDF/mrst2001.f
	madgraph/twogammaanalysis/Source/PDF/mrst2002.f
	madgraph/twogammaanalysis/Source/PDF/opendata.f
	madgraph/twogammaanalysis/Source/PDF/pdf.f
	madgraph/twogammaanalysis/Source/PDF/pdf.inc
	madgraph/twogammaanalysis/Source/PDF/pdf_lhapdf.f
	madgraph/twogammaanalysis/Source/PDF/pdf_list.txt
	madgraph/twogammaanalysis/Source/PDF/pdfwrap.f
	madgraph/twogammaanalysis/Source/PDF/pdfwrap_lhapdf.f
	madgraph/twogammaanalysis/Source/PDF/pdg2pdf.f
	madgraph/twogammaanalysis/Source/PDF/pdg2pdf_lhapdf.f
	madgraph/twogammaanalysis/Source/alfas.inc
	madgraph/twogammaanalysis/Source/alfas_functions.f
	madgraph/twogammaanalysis/Source/alfas_functions_lhapdf.f
	madgraph/twogammaanalysis/Source/banner_header.txt
	madgraph/twogammaanalysis/Source/basecode.f
	madgraph/twogammaanalysis/Source/cuts.inc
	madgraph/twogammaanalysis/Source/dgauss.f
	madgraph/twogammaanalysis/Source/dsample.f
	madgraph/twogammaanalysis/Source/gen_ximprove.f
	madgraph/twogammaanalysis/Source/genps.inc
	madgraph/twogammaanalysis/Source/gensudgrid.f
	madgraph/twogammaanalysis/Source/getissud.f
	madgraph/twogammaanalysis/Source/hbook.inc
	madgraph/twogammaanalysis/Source/hbook1.f
	madgraph/twogammaanalysis/Source/hbook2.f
	madgraph/twogammaanalysis/Source/hcurve.f
	madgraph/twogammaanalysis/Source/hfill.f
	madgraph/twogammaanalysis/Source/htuple.f
	madgraph/twogammaanalysis/Source/invarients.f
	madgraph/twogammaanalysis/Source/is-sud.f
	madgraph/twogammaanalysis/Source/kin_functions.f
	madgraph/twogammaanalysis/Source/make_opts
	madgraph/twogammaanalysis/Source/open_file.f
	madgraph/twogammaanalysis/Source/pawgraphs.f
	madgraph/twogammaanalysis/Source/pdf.inc
	madgraph/twogammaanalysis/Source/psample.inc
	madgraph/twogammaanalysis/Source/ran1.f
	madgraph/twogammaanalysis/Source/ranmar.f
	madgraph/twogammaanalysis/Source/readgrid.f
	madgraph/twogammaanalysis/Source/run.inc
	madgraph/twogammaanalysis/Source/run_printout.f
	madgraph/twogammaanalysis/Source/rw_events.f
	madgraph/twogammaanalysis/Source/rw_events.short.f
	madgraph/twogammaanalysis/Source/rw_routines.f
	madgraph/twogammaanalysis/Source/setrun.f
	madgraph/twogammaanalysis/Source/setrun_gen.f
	madgraph/twogammaanalysis/Source/sudgrid.inc
	madgraph/twogammaanalysis/Source/transpole.f
	madgraph/twogammaanalysis/SubProcesses/P1_epem_aa/nexternal.inc
	madgraph/twogammaanalysis/SubProcesses/cluster.f
	madgraph/twogammaanalysis/SubProcesses/cluster.inc
	madgraph/twogammaanalysis/SubProcesses/cuts.f
	madgraph/twogammaanalysis/SubProcesses/dipole.inc
	madgraph/twogammaanalysis/SubProcesses/dipolesub.f
	madgraph/twogammaanalysis/SubProcesses/epsterms.f
	madgraph/twogammaanalysis/SubProcesses/finiteterms.f
	madgraph/twogammaanalysis/SubProcesses/genps.f
	madgraph/twogammaanalysis/SubProcesses/idenparts.f
	madgraph/twogammaanalysis/SubProcesses/initcluster.f
	madgraph/twogammaanalysis/SubProcesses/makefile
	madgraph/twogammaanalysis/SubProcesses/maxconfigs.inc
	madgraph/twogammaanalysis/SubProcesses/maxparticles.inc
	madgraph/twogammaanalysis/SubProcesses/message.inc
	madgraph/twogammaanalysis/SubProcesses/myamp.f
	madgraph/twogammaanalysis/SubProcesses/projection.f
	madgraph/twogammaanalysis/SubProcesses/reweight.f
	madgraph/twogammaanalysis/SubProcesses/run.inc
	madgraph/twogammaanalysis/SubProcesses/setcuts.f
	madgraph/twogammaanalysis/SubProcesses/setscales.f
	madgraph/twogammaanalysis/SubProcesses/shrinktops.f
	madgraph/twogammaanalysis/SubProcesses/subproc.txt
	madgraph/twogammaanalysis/SubProcesses/sudakov.inc
	madgraph/twogammaanalysis/SubProcesses/transform.f
	madgraph/twogammaanalysis/SubProcesses/transformint.f
	madgraph/twogammaanalysis/SubProcesses/unwgt.f
	madgraph/twogammaanalysis/TemplateVersion.txt
	madgraph/twogammaanalysis/bin/cleanall
	madgraph/twogammaanalysis/bin/generate_events
	madgraph/twogammaanalysis/bin/internal/FO_analyse_card.py
	madgraph/twogammaanalysis/bin/internal/Gridpack/TheChopper-pl
	madgraph/twogammaanalysis/bin/internal/Gridpack/clean4grid
	madgraph/twogammaanalysis/bin/internal/Gridpack/compile
	madgraph/twogammaanalysis/bin/internal/Gridpack/gridrun
	madgraph/twogammaanalysis/bin/internal/Gridpack/refine4grid
	madgraph/twogammaanalysis/bin/internal/Gridpack/replace.pl
	madgraph/twogammaanalysis/bin/internal/Gridpack/run.sh
	madgraph/twogammaanalysis/bin/internal/__init__.py
	madgraph/twogammaanalysis/bin/internal/addmasses.py
	madgraph/twogammaanalysis/bin/internal/banner.py
	madgraph/twogammaanalysis/bin/internal/check_param_card.py
	madgraph/twogammaanalysis/bin/internal/clean
	madgraph/twogammaanalysis/bin/internal/clean_template
	madgraph/twogammaanalysis/bin/internal/cluster.py
	madgraph/twogammaanalysis/bin/internal/coloring_logging.py
	madgraph/twogammaanalysis/bin/internal/combine_runs.py
	madgraph/twogammaanalysis/bin/internal/common_run_interface.py
	madgraph/twogammaanalysis/bin/internal/create_matching_plots.C
	madgraph/twogammaanalysis/bin/internal/create_matching_plots.sh
	madgraph/twogammaanalysis/bin/internal/extended_cmd.py
	madgraph/twogammaanalysis/bin/internal/extract_banner-pl
	madgraph/twogammaanalysis/bin/internal/file_writers.py
	madgraph/twogammaanalysis/bin/internal/files.py
	madgraph/twogammaanalysis/bin/internal/gen_cardhtml-pl
	madgraph/twogammaanalysis/bin/internal/gen_crossxhtml.py
	madgraph/twogammaanalysis/bin/internal/gen_jpeg-pl
	madgraph/twogammaanalysis/bin/internal/lhe_parser.py
	madgraph/twogammaanalysis/bin/internal/madevent_interface.py
	madgraph/twogammaanalysis/bin/internal/make_gridpack
	madgraph/twogammaanalysis/bin/internal/make_madevent_tar
	madgraph/twogammaanalysis/bin/internal/me5_logging.conf
	madgraph/twogammaanalysis/bin/internal/merge.pl
	madgraph/twogammaanalysis/bin/internal/misc.py
	madgraph/twogammaanalysis/bin/internal/monitor
	madgraph/twogammaanalysis/bin/internal/multicore
	madgraph/twogammaanalysis/bin/internal/plot
	madgraph/twogammaanalysis/bin/internal/plot_page-pl
	madgraph/twogammaanalysis/bin/internal/plot_pypage-pl
	madgraph/twogammaanalysis/bin/internal/plot_tree.C
	madgraph/twogammaanalysis/bin/internal/read_tree_files.C
	madgraph/twogammaanalysis/bin/internal/restore_data
	madgraph/twogammaanalysis/bin/internal/run_combine
	madgraph/twogammaanalysis/bin/internal/run_delphes
	madgraph/twogammaanalysis/bin/internal/run_delphes3
	madgraph/twogammaanalysis/bin/internal/run_genissud
	madgraph/twogammaanalysis/bin/internal/run_hep2lhe
	madgraph/twogammaanalysis/bin/internal/run_pgs
	madgraph/twogammaanalysis/bin/internal/run_pythia
	madgraph/twogammaanalysis/bin/internal/save_load_object.py
	madgraph/twogammaanalysis/bin/internal/shower_card.py
	madgraph/twogammaanalysis/bin/internal/store4grid
	madgraph/twogammaanalysis/bin/internal/sum_html.py
	madgraph/twogammaanalysis/bin/internal/syscalc_template.dat
	madgraph/twogammaanalysis/bin/internal/ufomodel/__init__.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/build_restrict.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/coupling_orders.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/couplings.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/decays.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/function_library.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/lorentz.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/object_library.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/parameters.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/particles.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/restrict_default.dat
	madgraph/twogammaanalysis/bin/internal/ufomodel/vertices.py
	madgraph/twogammaanalysis/bin/internal/ufomodel/write_param_card.py
	madgraph/twogammaanalysis/bin/madevent
	madgraph/twogammaanalysis/bin/newprocess_mg5
	madgraph/twogammaanalysis/lib/Pdfdata/NNPDF23_lo_as_0119_qed_mem0.grid
	madgraph/twogammaanalysis/lib/Pdfdata/NNPDF23_lo_as_0130_qed_mem0.grid
	madgraph/twogammaanalysis/lib/Pdfdata/NNPDF23nlo_as_0119_qed_mem0.grid
	madgraph/twogammaanalysis/lib/Pdfdata/cteq5l.tbl
	madgraph/twogammaanalysis/lib/Pdfdata/cteq5m.tbl
	madgraph/twogammaanalysis/lib/Pdfdata/cteq6d.tbl
	madgraph/twogammaanalysis/lib/Pdfdata/cteq6l.tbl
	madgraph/twogammaanalysis/lib/Pdfdata/cteq6l1.tbl
	madgraph/twogammaanalysis/lib/Pdfdata/cteq6m.tbl
	madgraph/twogammaanalysis/lib/Pdfdata/mrsb.dat
	madgraph/twogammaanalysis/lib/Pdfdata/mrse.dat
	madgraph/twogammaanalysis/lib/Pdfdata/mrst2002nlo.dat
	madgraph/twogammamasses/Cards/pgs_card_TEV.dat
	madgraph/twogammamasses/HTML/info-default.html
	madgraph/twogammamasses/HTML/mgstyle.css
	madgraph/twogammamasses/HTML/sortable.js
	madgraph/twogammamasses/HTML/stop.jpg
	madgraph/twogammamasses/HTML/thinking.gif
	madgraph/twogammamasses/Source/CERNLIB/abend.f
	madgraph/twogammamasses/Source/CERNLIB/dlsqp2.f
	madgraph/twogammamasses/Source/CERNLIB/lenocc.f
	madgraph/twogammamasses/Source/CERNLIB/mtlprt.f
	madgraph/twogammamasses/Source/CERNLIB/mtlset.f
	madgraph/twogammamasses/Source/CERNLIB/radmul.f
	madgraph/twogammamasses/Source/MODEL/formats.inc
	madgraph/twogammamasses/Source/MODEL/printout.f
	madgraph/twogammamasses/Source/MODEL/testprog.f
	madgraph/twogammamasses/Source/PDF/Ctq4Fn.f
	madgraph/twogammamasses/Source/PDF/Ctq5Par.f
	madgraph/twogammamasses/Source/PDF/Ctq5Pdf.f
	madgraph/twogammamasses/Source/PDF/Ctq6Pdf.f
	madgraph/twogammamasses/Source/PDF/Partonx5.f
	madgraph/twogammamasses/Source/PDF/PhotonFlux.f
	madgraph/twogammamasses/Source/PDF/cteq3.f
	madgraph/twogammamasses/Source/PDF/jeppe02.f
	madgraph/twogammamasses/Source/PDF/mrs98.f
	madgraph/twogammamasses/Source/PDF/mrs98ht.f
	madgraph/twogammamasses/Source/PDF/mrs98lo.f
	madgraph/twogammamasses/Source/PDF/mrs99.f
	madgraph/twogammamasses/Source/PDF/mrst2001.f
	madgraph/twogammamasses/Source/PDF/mrst2002.f
	madgraph/twogammamasses/Source/PDF/pdf.f
	madgraph/twogammamasses/Source/PDF/pdf.inc
	madgraph/twogammamasses/Source/PDF/pdf_lhapdf.f
	madgraph/twogammamasses/Source/PDF/pdf_list.txt
	madgraph/twogammamasses/Source/PDF/pdfwrap.f
	madgraph/twogammamasses/Source/alfas.inc
	madgraph/twogammamasses/Source/basecode.f
	madgraph/twogammamasses/Source/dgauss.f
	madgraph/twogammamasses/Source/getissud.f
	madgraph/twogammamasses/Source/hbook.inc
	madgraph/twogammamasses/Source/hcurve.f
	madgraph/twogammamasses/Source/hfill.f
	madgraph/twogammamasses/Source/pdf.inc
	madgraph/twogammamasses/Source/psample.inc
	madgraph/twogammamasses/Source/ran1.f
	madgraph/twogammamasses/Source/rw_events.short.f
	madgraph/twogammamasses/Source/sudgrid.inc
	madgraph/twogammamasses/SubProcesses/P1_epem_aa/nexternal.inc
	madgraph/twogammamasses/SubProcesses/message.inc
	madgraph/twogammamasses/SubProcesses/sudakov.inc
	madgraph/twogammamasses/bin/internal/ufomodel/build_restrict.py
	madgraph/twogammamasses/bin/internal/ufomodel/coupling_orders.py
	madgraph/twogammamasses/bin/internal/ufomodel/couplings.py
	madgraph/twogammamasses/bin/internal/ufomodel/decays.py
	madgraph/twogammamasses/bin/internal/ufomodel/lorentz.py
	madgraph/twogammamasses/bin/internal/ufomodel/vertices.py
	madgraph/twogammamasses/bin/internal/ufomodel/write_param_card.py
	madgraph/twogammamasses/lib/Pdfdata/NNPDF23_lo_as_0119_qed_mem0.grid
	madgraph/twogammamasses/lib/Pdfdata/NNPDF23_lo_as_0130_qed_mem0.grid
	madgraph/twogammamasses/lib/Pdfdata/NNPDF23nlo_as_0119_qed_mem0.grid
	madgraph/twogammamasses/lib/Pdfdata/cteq5l.tbl
	madgraph/twogammamasses/lib/Pdfdata/cteq5m.tbl
	madgraph/twogammamasses/lib/Pdfdata/cteq6d.tbl
	madgraph/twogammamasses/lib/Pdfdata/cteq6l.tbl
	madgraph/twogammamasses/lib/Pdfdata/cteq6l1.tbl
	madgraph/twogammamasses/lib/Pdfdata/cteq6m.tbl
	madgraph/twogammamasses/lib/Pdfdata/mrsb.dat
	madgraph/twogammamasses/lib/Pdfdata/mrse.dat
	madgraph/twogammamasses/lib/Pdfdata/mrst2002nlo.dat
Mergeed!!!!! 'master' of github.com:cesarotti/Dark-Photons