Merge lp:~maddevelopers/mg5amcnlo/2.5.2 into lp:mg5amcnlo/lts

[Olivier Mattelaer]

mainly debugging 2.5.1

[lp:~maddevelopers/mg5amcnlo/2.5.2]

293. By Olivier Mattelaer on 2016-12-07

fix an IO test

294. By Olivier Mattelaer on 2016-12-07

version and update note

[Rikkert Frederix (frederix)]

Automatic installation of COLLIER fails in this branch. It downloads version 1.1, but assume the code is 1.0. Seems like these versions are hard-coded in the HEPToolInstaller.py script, which is tricky to maintain. Is there a better way here?

review: Needs Fixing

[Olivier Mattelaer (olivier-mattelaer)]

Hi,

The HEPToolInstaller.py is actually not part of the MG5 tarball.
The idea is to download that file when you do “install collier” (or many other code).
To be clear this file is updated EACH time you type install XXXXX (if XXXXX need the HEPToolsInstaller.py)

This allow to update the installation procedure independently of MG5aMC. Which offers us a very flexible way to
handle installation procedure.

Valentin is going to fix that collier support tonight.

Cheers,

Olivier

> On Dec 7, 2016, at 15:50, Rikkert Frederix <email address hidden> wrote:
>
> Review: Needs Fixing
>
> Automatic installation of COLLIER fails in this branch. It downloads version 1.1, but assume the code is 1.0. Seems like these versions are hard-coded in the HEPToolInstaller.py script, which is tricky to maintain. Is there a better way here?
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.5.2/+merge/312642
> Your team MadTeam is subscribed to branch lp:mg5amcnlo.

[lp:~maddevelopers/mg5amcnlo/2.5.2]

295. By Rikkert Frederix on 2016-12-07

Fixed a small typo in one of the Pythia8 MC@NLO analyses.

296. By Valentin Hirschi on 2016-12-08

1. Fixed type in loop_exporter which has an effect that the BornColorFlow
   basis was not correctly labeled in the ML standalone output

297. By Olivier Mattelaer on 2016-12-09

fix a small MS bug

298. By Olivier Mattelaer on 2016-12-09

fixing a systematics bug for e+e- collision (with ckkw>0) and introduce 'set no_parton_cut' syntax

299. By Olivier Mattelaer on 2016-12-10

fix a bug in the <init> block reporting wrong cross-section in presence of many channel of integration

=== modified file 'MadSpin/decay.py'
--- MadSpin/decay.py	2016-08-26 13:55:42 +0000
+++ MadSpin/decay.py	2016-12-10 02:02:40 +0000
@@ -2707,16 +2707,20 @@
                     commandline += "define pert_%s = %s;" % (order, ' '.join(map(str,pert)) )
                     
                     # check if we have to increase by one the born order
-                    if '%s=' % order in process:
+                    if '%s=' % order in process or '%s<=' % order in process:
                         result=re.split(' ',process)
                         process=''
                         for r in result:
                             if '%s=' % order in r:
                                 ior=re.split('=',r)
-                                r='QCD=%i' % (int(ior[1])+1)
+                                r='%s<=%i' % (order,int(ior[1])+1)
+                            elif '%s<=' % order in r:
+                                ior=re.split('=',r)
+                                r='%s<=%i' % (order,int(ior[1])+1)
+                                                                
                             process=process+r+' '
                     #handle special tag $ | / @
-                    result = re.split('([/$@]|\w+=\w+)', process, 1)                    
+                    result = re.split('([/$@]|\w+<?=\w+)', process, 1)     
                     if len(result) ==3:
                         process, split, rest = result
                         commandline+="add process %s pert_%s %s%s %s --no_warning=duplicate;" % (process, order ,split, rest, proc_nb)
@@ -2809,16 +2813,20 @@
                         commandline += "define pert_%s = %s;" % (order, ' '.join(map(str,pert)) )
                         
                         # check if we have to increase by one the born order
-                        if '%s=' % order in process:
+                        if '%s=' % order in process or '%s<=' % order in process:
                             result=re.split(' ',process)
                             process=''
                             for r in result:
                                 if '%s=' % order in r:
                                     ior=re.split('=',r)
-                                    r='QCD=%i' % (int(ior[1])+1)
+                                    r='%s=%i' % (order,int(ior[1])+1)
+                                elif '%s<=' % order in r:
+                                    ior=re.split('=',r)
+                                    r='%s<=%i' % (order,int(ior[1])+1)
                                 process=process+r+' '
+                                
                         #handle special tag $ | / @
-                        result = re.split('([/$@]|\w+=\w+)', process, 1)                    
+                        result = re.split('([/$@]|\w+<?=\w+)', process, 1)                    
                         if len(result) ==3:
                             process, split, rest = result
                             commandline+="add process %s pert_%s %s%s , %s %s --no_warning=duplicate;" % \

=== modified file 'MadSpin/interface_madspin.py'
--- MadSpin/interface_madspin.py	2016-07-26 02:15:40 +0000
+++ MadSpin/interface_madspin.py	2016-12-10 02:02:40 +0000
@@ -248,7 +248,6 @@
         if '--bypass_check' in args:
             args.remove('--bypass_check')
             bypass_check = True
-            
         if len(args) == 1:  
             logger.warning("""No param_card defined for the new model. We will use the default one but this might completely wrong.""")
         elif len(args) != 2:
@@ -709,8 +708,10 @@
                cumul allow to merge all the definition in one run (add process)
                      to generate events according to cross-section
             """
-                        
+
             part = self.model.get_particle(pdg)
+            if not part:
+                return {}# this particle is not defined in the current model so ignore it
             name = part.get_name()
             out = {}
             logger.info("generate %s decay event for particle %s" % (nb_event, name))
@@ -739,6 +740,15 @@
                         me5_cmd = madevent_interface.MadEventCmdShell(me_dir=os.path.realpath(\
                                                 decay_dir), options=options)
                         me5_cmd.options["automatic_html_opening"] = False
+                        me5_cmd.options["madanalysis5_path"] = None
+                        me5_cmd.options["madanalysis_path"] = None
+                        try:
+                            os.remove(pjoin(decay_dir, 'Cards', 'madanalysis5_parton_card_default.dat'))
+                            os.remove(pjoin(decay_dir, 'Cards', 'madanalysis5_parton_card.dat'))
+                        except Exception,error:
+                            logger.debug(error)
+                            pass
+                        misc.sprint(os.listdir(pjoin(decay_dir,'Cards')))
                         if self.options["run_card"]:
                             run_card = self.options["run_card"]
                         else:
@@ -746,6 +756,7 @@
                         
                         run_card["iseed"] = self.seed
                         run_card['gridpack'] = True
+                        run_card['systematics_program'] = False
                         run_card.write(pjoin(decay_dir, "Cards", "run_card.dat"))
                         param_card = self.banner['slha']
                         open(pjoin(decay_dir, "Cards", "param_card.dat"),"w").write(param_card)
@@ -763,12 +774,22 @@
                     me5_cmd = madevent_interface.MadEventCmdShell(me_dir=os.path.realpath(\
                                                     decay_dir), options=mg5.options)
                     me5_cmd.options["automatic_html_opening"] = False
+                    me5_cmd.options["madanalysis5_path"] = None
+                    me5_cmd.options["madanalysis_path"] = None
+                    try:
+                        os.remove(pjoin(decay_dir, 'Cards', 'madanalysis5_parton_card_default.dat'))
+                        os.remove(pjoin(decay_dir, 'Cards', 'madanalysis5_parton_card.dat'))
+                    except Exception,error:
+                        logger.debug(error)
+                        pass                    
+                    
                     if self.options["run_card"]:
                         run_card = self.options["run_card"]
                     else:
                         run_card = banner.RunCard(pjoin(decay_dir, "Cards", "run_card.dat"))
                     run_card["nevents"] = int(1.2*nb_event)
                     run_card["iseed"] = self.seed
+                    run_card["systematics_program"] = 'None'
                     run_card.write(pjoin(decay_dir, "Cards", "run_card.dat"))
                     param_card = self.banner['slha']
                     open(pjoin(decay_dir, "Cards", "param_card.dat"),"w").write(param_card)

=== modified file 'MadSpin/src/driver.f'
--- MadSpin/src/driver.f	2016-04-06 18:45:52 +0000
+++ MadSpin/src/driver.f	2016-12-10 02:02:40 +0000
@@ -907,7 +907,11 @@
                 if (index_p2.gt.0) then
                    m2_tchan(i)=m(index_p2)
                 else
-        write(*,*) 'Warning: m_2^2 is negative in t-channel branching ',m2_tchan(i) 
+                   if (m(index_p2).gt.5d-2)then
+                       m2_tchan(i) = 0d0
+                   else 
+        write(*,*) 'Warning: m_2^2 is negative in t-channel branching ',m2_tchan(i)
+                   endif 
                 endif
             endif
          ! extract phi

=== modified file 'Template/LO/Cards/run_card.dat'
--- Template/LO/Cards/run_card.dat	2016-11-03 21:20:15 +0000
+++ Template/LO/Cards/run_card.dat	2016-12-10 02:02:40 +0000
@@ -276,6 +276,6 @@
 %(sys_alpsfact)s = sys_alpsfact  # \alpha_s emission scale factors
 %(sys_matchscale)s = sys_matchscale # variation of merging scale
 # PDF sets and number of members (0 or none for all members).
-%(sys_pdf)s = sys_pdf # separate by && if more than one set.
+%(sys_pdf)s = sys_pdf # list of pdf sets
 # MSTW2008nlo68cl.LHgrid 1  = sys_pdf
 #

=== added file 'Template/LO/Source/.make_opts'
--- Template/LO/Source/.make_opts	1970-01-01 00:00:00 +0000
+++ Template/LO/Source/.make_opts	2016-12-10 02:02:40 +0000
@@ -0,0 +1,103 @@
+DEFAULT_F2PY_COMPILER=f2py
+DEFAULT_F_COMPILER=gfortran
+MACFLAG=-mmacosx-version-min=10.7
+DEFAULT_CPP_COMPILER=clang
+MG5AMC_VERSION=SpecifiedByMG5aMCAtRunTime
+STDLIB=-lc++
+PYTHIA8_PATH=NotInstalled
+STDLIB_FLAG=-stdlib=libc++
+#end_of_make_opts_variables
+
+BIASLIBDIR=../../../lib/
+BIASLIBRARY=libbias.$(libext)
+
+# Rest of the makefile
+ifeq ($(origin FFLAGS),undefined)
+FFLAGS= -O -w -fbounds-check -fPIC
+#FFLAGS+= -g -fbounds-check -ffpe-trap=invalid,zero,overflow,underflow,denormal -Wall
+endif
+
+
+# REMOVE MACFLAG IF NOT ON MAC OR FOR F2PY
+UNAME := $(shell uname -s)
+ifdef f2pymode
+MACFLAG=
+else
+ifneq ($(UNAME), Darwin)
+MACFLAG=
+endif
+endif
+
+
+ifeq ($(origin CXXFLAGS),undefined)
+CXXFLAGS= -O $(STDLIB_FLAG) $(MACFLAG)
+endif
+
+ifeq ($(origin CFLAGS),undefined)
+CFLAGS= -O $(STDLIB_FLAG) $(MACFLAG)
+endif
+
+# Increase the number of allowed charcters in a Fortran line
+FFLAGS+= -ffixed-line-length-132
+
+# Set FC unless it's defined by an environment variable
+ifeq ($(origin FC),default)
+FC=$(DEFAULT_F_COMPILER)
+endif
+ifeq ($(origin F2PY), undefined)
+F2PY=$(DEFAULT_F2PY_COMPILER)
+endif
+
+UNAME := $(shell uname -s)
+ifeq ($(origin LDFLAGS), undefined)
+LDFLAGS=$(STDLIB) $(MACFLAG)
+endif
+
+# Options: dynamic, lhapdf
+# Option dynamic
+
+ifeq ($(UNAME), Darwin)
+dylibext=dylib
+else
+dylibext=so
+endif
+
+ifdef dynamic
+ifeq ($(UNAME), Darwin)
+libext=dylib
+FFLAGS+= -fno-common
+LDFLAGS += -bundle
+define CREATELIB
+$(FC) -dynamiclib -undefined dynamic_lookup -o $(1) $(2)
+endef
+else
+libext=so
+FFLAGS+= -fPIC
+LDFLAGS += -shared
+define CREATELIB
+$(FC) $(FFLAGS) $(LDFLAGS) -o $(1) $(2)
+endef
+endif
+else
+libext=a
+define CREATELIB
+$(AR) cru $(1) $(2)
+ranlib $(1)
+endef
+endif
+
+# Option lhapdf
+
+ifneq ($(lhapdf),)
+CXXFLAGS += $(shell $(lhapdf) --cppflags)
+alfas_functions=alfas_functions_lhapdf
+llhapdf+= -lLHAPDF
+else
+alfas_functions=alfas_functions
+llhapdf=
+endif
+
+# Helper function to check MG5 version
+define CHECK_MG5AMC_VERSION
+python -c 'import re; from distutils.version import StrictVersion; print StrictVersion("$(MG5AMC_VERSION)") >= StrictVersion("$(1)") if re.match("^[\d\.]+$$","$(MG5AMC_VERSION)") else True;'
+endef
\ No newline at end of file

=== removed file 'Template/LO/Source/make_opts'
--- Template/LO/Source/make_opts	2016-10-25 10:11:37 +0000
+++ Template/LO/Source/make_opts	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-DEFAULT_F2PY_COMPILER=f2py
-DEFAULT_F_COMPILER=gfortran
-MACFLAG=-mmacosx-version-min=10.7
-DEFAULT_CPP_COMPILER=clang
-MG5AMC_VERSION=SpecifiedByMG5aMCAtRunTime
-STDLIB=-lc++
-PYTHIA8_PATH=NotInstalled
-STDLIB_FLAG=-stdlib=libc++
-#end_of_make_opts_variables
-
-BIASLIBDIR=../../../lib/
-BIASLIBRARY=libbias.$(libext)
-
-# Rest of the makefile
-ifeq ($(origin FFLAGS),undefined)
-FFLAGS= -O -w -fbounds-check -fPIC
-#FFLAGS+= -g -fbounds-check -ffpe-trap=invalid,zero,overflow,underflow,denormal -Wall
-endif
-
-
-# REMOVE MACFLAG IF NOT ON MAC OR FOR F2PY
-UNAME := $(shell uname -s)
-ifdef f2pymode
-MACFLAG=
-else
-ifneq ($(UNAME), Darwin)
-MACFLAG=
-endif
-endif
-
-
-ifeq ($(origin CXXFLAGS),undefined)
-CXXFLAGS= -O $(STDLIB_FLAG) $(MACFLAG)
-endif
-
-ifeq ($(origin CFLAGS),undefined)
-CFLAGS= -O $(STDLIB_FLAG) $(MACFLAG)
-endif
-
-# Increase the number of allowed charcters in a Fortran line
-FFLAGS+= -ffixed-line-length-132
-
-# Set FC unless it's defined by an environment variable
-ifeq ($(origin FC),default)
-FC=$(DEFAULT_F_COMPILER)
-endif
-ifeq ($(origin F2PY), undefined)
-F2PY=$(DEFAULT_F2PY_COMPILER)
-endif
-
-UNAME := $(shell uname -s)
-ifeq ($(origin LDFLAGS), undefined)
-LDFLAGS=$(STDLIB) $(MACFLAG)
-endif
-
-# Options: dynamic, lhapdf
-# Option dynamic
-
-ifeq ($(UNAME), Darwin)
-dylibext=dylib
-else
-dylibext=so
-endif
-
-ifdef dynamic
-ifeq ($(UNAME), Darwin)
-libext=dylib
-FFLAGS+= -fno-common
-LDFLAGS += -bundle
-define CREATELIB
-$(FC) -dynamiclib -undefined dynamic_lookup -o $(1) $(2)
-endef
-else
-libext=so
-FFLAGS+= -fPIC
-LDFLAGS += -shared
-define CREATELIB
-$(FC) $(FFLAGS) $(LDFLAGS) -o $(1) $(2)
-endef
-endif
-else
-libext=a
-define CREATELIB
-$(AR) cru $(1) $(2)
-ranlib $(1)
-endef
-endif
-
-# Option lhapdf
-
-ifneq ($(lhapdf),)
-CXXFLAGS += $(shell $(lhapdf) --cppflags)
-alfas_functions=alfas_functions_lhapdf
-llhapdf+= -lLHAPDF
-else
-alfas_functions=alfas_functions
-llhapdf=
-endif
-
-# Helper function to check MG5 version
-define CHECK_MG5AMC_VERSION
-python -c 'import re; from distutils.version import StrictVersion; print StrictVersion("$(MG5AMC_VERSION)") >= StrictVersion("$(1)") if re.match("^[\d\.]+$$","$(MG5AMC_VERSION)") else True;'
-endef
\ No newline at end of file

=== modified file 'Template/LO/Source/rw_events.f'
--- Template/LO/Source/rw_events.f	2016-09-03 13:26:00 +0000
+++ Template/LO/Source/rw_events.f	2016-12-10 02:02:40 +0000
@@ -179,7 +179,7 @@
 c      aqcd = g*g/4d0/pi
       write(largeBuff,'(a)') '<event>'
       evt_record=trim(evt_record)//trim(largeBuff)
-      write(largeBuff,'(i2,i4,e16.7e3,3e15.7)') nexternal,ievent,wgt,scale,
+      write(largeBuff,'(i2,i5,e16.7e3,3e15.7)') nexternal,ievent,wgt,scale,
      $                                   aqed,aqcd
       evt_record=trim(evt_record)//CHAR(13)//CHAR(10)//trim(largeBuff)
       do i=1,nexternal
@@ -277,8 +277,7 @@
 c      aqcd = g*g/4d0/pi
 
       write(lun,'(a)') '<event>'
-      write(lun,'(i2,i4,e16.7e3,3e15.7)') nexternal,ievent,wgt,scale,aqed,aqcd
-      write(*,'(i2,i4,e15.7e3,3e15.7)') nexternal,ievent,wgt,scale,aqed,aqcd
+      write(lun,'(i2,i5,e16.7e3,3e15.7)') nexternal,ievent,wgt,scale,aqed,aqcd
       do i=1,nexternal
          write(lun,51) ic(1,i),ic(6,i),(ic(j,i),j=2,5),
      $     (p(j,i),j=1,3),p(0,i),p(4,i),0.,real(ic(7,i))

=== modified file 'Template/LO/SubProcesses/makefile'
--- Template/LO/SubProcesses/makefile	2016-08-11 00:19:31 +0000
+++ Template/LO/SubProcesses/makefile	2016-12-10 02:02:40 +0000
@@ -44,7 +44,7 @@
 	$(FC) -o $(PROG) $(PROCESS) $(LINKLIBS) $(LDFLAGS) $(BIASDEPENDENCIES)
 
 gensym: $(SYMMETRY) configs.inc $(LIBDIR)libmodel.$(libext) $(LIBDIR)libgeneric.$(libext)
-	$(FC) -o gensym $(SYMMETRY) -L../../lib/ -lmodel -lgeneric $(LDFLAGS)
+	$(FC) -o gensym $(SYMMETRY) -L../../lib/ -lmodel -lgeneric -lpdf $(LDFLAGS)
 
 $(LIBDIR)libmodel.$(libext): ../../Cards/param_card.dat
 	cd ../../Source/MODEL; make

=== modified file 'Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lvl.f'
--- Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lvl.f	2016-02-23 10:48:46 +0000
+++ Template/NLO/MCatNLO/PY8Analyzer/py8an_HwU_pp_lvl.f	2016-12-10 02:02:40 +0000
@@ -61,6 +61,7 @@
       call set_error_estimation(0)
       nwgt_analysis=nwgt
       do i=1,1
+        l=0
         call HwU_book(l+1,'total rate   '//HwUtype(i),2,-2.d0,2.d0)
         call HwU_book(l+2,'lep rapidity '//HwUtype(i),40,-9d0,9d0)
         call HwU_book(l+3,'lep pt       '//HwUtype(i),100,0d0,200d0)

=== modified file 'Template/NLO/MCatNLO/srcHerwig/madfks_hwlhin.f'
--- Template/NLO/MCatNLO/srcHerwig/madfks_hwlhin.f	2016-04-04 09:56:54 +0000
+++ Template/NLO/MCatNLO/srcHerwig/madfks_hwlhin.f	2016-12-10 02:02:40 +0000
@@ -74,22 +74,27 @@
      #                    scale1_lhe,scale2_lhe,
      #                    jwgtinfo,mexternal,iwgtnumpartn,
      #         wgtcentral,wgtmumin,wgtmumax,wgtpdfmin,wgtpdfmax
-        if(jwgtinfo.eq.9)then
-          if (nwgt.gt.1) then
+        if(abs(jwgtinfo).eq.9.and.nwgt.gt.1)then
+           do while(index(string,'</event>').eq.0.and.
+     &           index(string,'<rwgt>').eq.0)
              read(iunit,'(a)')string ! <rwgt>
+          enddo
+          if(index(string,'</event>').eq.0)then
              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>
+             write(*,*) string
           endif
+           do while(index(string,'</event>').eq.0)
+             read(iunit,'(a)')string ! <rwgt>
+          enddo
         else
           do while(index(string,'</event>').eq.0)
              read(iunit,'(a)')string
           enddo
-          backspace(iunit)
         endif
-        read(iunit,'(a)')string
       else
         string=buff(1:len_trim(buff))
         buff_tlh=' '

=== modified file 'Template/NLO/SubProcesses/madfks_plot.f'
--- Template/NLO/SubProcesses/madfks_plot.f	2016-10-11 10:29:57 +0000
+++ Template/NLO/SubProcesses/madfks_plot.f	2016-12-10 02:02:40 +0000
@@ -265,7 +265,7 @@
       chybst=cosh(ybst_til_tolab)
       shybst=sinh(ybst_til_tolab)
       chybstmo=chybst-1.d0
-      do i=3,nexternal
+      do i=nincoming+1,nexternal
          call boostwdir2(chybst,shybst,chybstmo,xd,pp(0,i),pplab(0,i))
       enddo
 c Fill the arrays (momenta, status and PDG):

=== modified file 'Template/NLO/SubProcesses/setcuts.f'
--- Template/NLO/SubProcesses/setcuts.f	2016-09-27 15:07:53 +0000
+++ Template/NLO/SubProcesses/setcuts.f	2016-12-10 02:02:40 +0000
@@ -156,7 +156,7 @@
       INTEGER NFKSPROCESS
       COMMON/C_NFKSPROCESS/NFKSPROCESS
       double precision taumin(fks_configs),taumin_s(fks_configs)
-     &     ,taumin_j(fks_configs),stot,xk(-nexternal:0)
+     &     ,taumin_j(fks_configs),stot,xk(nexternal)
       save  taumin,taumin_s,taumin_j,stot
       integer i,j,k,d1,d2,iFKS,nt
       double precision xm(-nexternal:nexternal),xm1,xm2,xmi

=== modified file 'Template/NLO/makefile'
--- Template/NLO/makefile	2013-11-15 12:29:09 +0000
+++ Template/NLO/makefile	2016-12-10 02:02:40 +0000
@@ -1,5 +1,5 @@
-FILES = Cards HTML SubProcesses bin lib Source Events index.html README README.lhapdf \
-           TemplateVersion.txt MGMEVersion.txt
+FILES = Cards HTML SubProcesses bin lib Source Events FixedOrderAnalysis MCatNLO \
+	   index.html README README.lhapdf TemplateVersion.txt MGMEVersion.txt
   
 amcatnlo.tar.gz: amcatnlo.tar
 	rm -f amcatnlo.tar.gz

=== modified file 'Template/loop_material/StandAlone/SubProcesses/MadLoopCommons.inc'
--- Template/loop_material/StandAlone/SubProcesses/MadLoopCommons.inc	2016-05-24 23:58:40 +0000
+++ Template/loop_material/StandAlone/SubProcesses/MadLoopCommons.inc	2016-12-10 02:02:40 +0000
@@ -104,6 +104,9 @@
         call SwitchOffCacheSystem_cll()
       ENDIF
 
+C     Make sure no COLLIER error can interrupt the code
+	  call SwitchOffErrStop_cll()
+
 C     Specify below your other custom COLLIER parameter settings 
 C     [user_specific_COLLIER_settings]
 	  

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2016-11-04 09:47:56 +0000
+++ UpdateNotes.txt	2016-12-10 02:02:40 +0000
@@ -1,5 +1,14 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
+2.5.2(05/07/16)
+      OM: improve systematics (thanks to Philipp Pigard)
+      OM: new syntax to modify the run_card: set no_parton_cut
+          This removes all the cut present in the card.
+      OM: change the default configuration parameter cluster_local_path to None
+      OM: change the syscalc syntax for the pdf to avoid using & since this is not xml compliant
+      OM: avoid to bias module to include trivial weight in gridpack mode
+      OM: Fix a bug making 2.5.1 not compatible with python2.6
+      OM: Improve "add missing" command if a full block is missing
 
 2.5.1 (04/11/16)
        PT+MZ: New interface for Herwig7.

=== modified file 'VERSION'
--- VERSION	2016-11-04 09:47:56 +0000
+++ VERSION	2016-12-10 02:02:40 +0000
@@ -1,5 +1,5 @@
-version = 2.5.1
-date = 2016-11-04
+version = 2.5.2
+date = 2016-05-07
 
 
 

=== modified file 'madgraph/__init__.py'
--- madgraph/__init__.py	2015-10-01 16:00:08 +0000
+++ madgraph/__init__.py	2016-12-10 02:02:40 +0000
@@ -37,3 +37,14 @@
 MG4DIR = MG5DIR
 ReadWrite = os.access(MG5DIR, os.W_OK) # W_OK is for writing
 
+if ReadWrite:
+    # Temporary fix for problem with auto-update
+    try:
+        tmp_path = pjoin(MG5DIR, 'Template','LO','Source','make_opts')
+        #1480375724 is 29/11/16
+        if os.path.exists(tmp_path) and os.path.getmtime(tmp_path) < 1480375724:
+            os.remove(tmp_path)
+            shutil.copy(pjoin(MG5DIR, 'Template','LO','Source','.make_opts'),
+                    pjoin(MG5DIR, 'Template','LO','Source','make_opts'))
+    except Exception,error:
+        pass

=== modified file 'madgraph/core/base_objects.py'
--- madgraph/core/base_objects.py	2016-10-31 19:32:57 +0000
+++ madgraph/core/base_objects.py	2016-12-10 02:02:40 +0000
@@ -237,7 +237,7 @@
         elif name == 'goldstone':
             return self['type'] == 'goldstone'
         elif name == 'propagating':
-            return self['line'] is not None
+            return self['line'] not in ['None',None] 
         else:
             return super(Particle, self).get(name)
 
@@ -348,7 +348,7 @@
             if not isinstance(value, str):
                 raise self.PhysicsObjectError, \
                     "Line type %s is not a string" % repr(value)
-            if value not in ['dashed', 'straight', 'wavy', 'curly', 'double','swavy','scurly','dotted']:
+            if value not in ['None','dashed', 'straight', 'wavy', 'curly', 'double','swavy','scurly','dotted']:
                 raise self.PhysicsObjectError, \
                    "Line type %s is unknown" % value
 

=== modified file 'madgraph/interface/amcatnlo_run_interface.py'
--- madgraph/interface/amcatnlo_run_interface.py	2016-11-03 15:21:05 +0000
+++ madgraph/interface/amcatnlo_run_interface.py	2016-12-10 02:02:40 +0000
@@ -2943,8 +2943,8 @@
                                       'hwpp_path'],
                          'PYTHIA8': ['pythia8_path']}
 
-            if not all([self.options[ppath] for ppath in path_dict[shower]]):
-                raise aMCatNLOError('Some paths are missing in the configuration file.\n' + \
+            if not all([self.options[ppath] and os.path.exists(self.options[ppath]) for ppath in path_dict[shower]]):
+                raise aMCatNLOError('Some paths are missing or invalid in the configuration file.\n' + \
                         ('Please make sure you have set these variables: %s' % ', '.join(path_dict[shower])))
 
         if shower == 'HERWIGPP':

=== modified file 'madgraph/interface/common_run_interface.py'
--- madgraph/interface/common_run_interface.py	2016-11-03 21:20:15 +0000
+++ madgraph/interface/common_run_interface.py	2016-12-10 02:02:40 +0000
@@ -595,7 +595,7 @@
                        'cluster_type': 'condor',
                        'cluster_status_update': (600, 30),
                        'cluster_nb_retry':1,
-                       'cluster_local_path': "/cvmfs/cp3.uclouvain.be/madgraph/",
+                       'cluster_local_path': None,
                        'cluster_retry_wait':300}
 
     options_madgraph= {'stdout_level':None}
@@ -1534,7 +1534,7 @@
           
         # always pass to a path + get the event size
         result_file= sys.stdout
-        if not os.path.sep in args[0]:
+        if not os.path.isfile(args[0]) and not os.path.sep in args[0]:
             path = [pjoin(self.me_dir, 'Events', args[0], 'unweighted_events.lhe.gz'),
                     pjoin(self.me_dir, 'Events', args[0], 'unweighted_events.lhe'),
                     pjoin(self.me_dir, 'Events', args[0], 'events.lhe.gz'),
@@ -1554,7 +1554,7 @@
             else:
                 raise self.InvalidCmd, 'Invalid run name. Please retry'
         elif self.options['nb_core'] != 1:
-            lhe = lhe_parser.EventFile(args)
+            lhe = lhe_parser.EventFile(args[0])
             nb_event = len(lhe)
             lhe.close()
 
@@ -1590,9 +1590,13 @@
             
             # Check that all pdfset are correctly installed
             if 'sys_pdf' in self.run_card:
-                sys_pdf = self.run_card['sys_pdf'].split('&&')
-                lhaid += [l.split()[0] for l in sys_pdf]
-
+                if '&&' in self.run_card['sys_pdf']:
+                    line = ' '.join(self.run_card['sys_pdf'])
+                    sys_pdf = line.split('&&')
+                    lhaid += [l.split()[0] for l in sys_pdf]
+                else:
+                    lhaid += [l for l in self.run_card['sys_pdf'].split() if not l.isdigit() or int(l) > 500]
+                    
         else:
             #check that all p
             pdf = [a[6:] for a in opts if a.startswith('--pdf=')]
@@ -3921,7 +3925,8 @@
                                      'pythia8_card PartonLevel:FSRinResonances False',
                                      'pythia8_card ProcessLevel:resonanceDecays False',
                                      ]),
-                        'mpi':([bool],['pythia8_card partonlevel:mpi %(0)s'])
+                        'mpi':([bool],['pythia8_card partonlevel:mpi %(0)s']),
+                        'no_parton_cut':([],['run_card nocut T'])
                         }
 
     special_shortcut_help = {              
@@ -4576,7 +4581,6 @@
             #else:
             #    logger.warning("too many argument for this command")
             #    return
-            
             for arg in cmd:
                 try:
                     text = arg % values
@@ -4625,7 +4629,6 @@
                     fsock.write(p_card)
                 return
             
-
         card = '' #store which card need to be modify (for name conflict)
         if args[0] == 'madweight_card':
             if not self.mw_card:
@@ -4666,7 +4669,6 @@
                          pjoin(self.me_dir,'Cards', 'delphes_card.dat'))
                 return
             
-            
         if args[0] in ['run_card', 'param_card', 'MadWeight_card', 'shower_card',
                        'delphes_card','madanalysis5_hadron_card','madanalysis5_parton_card']:
             if args[1] == 'default':
@@ -4751,7 +4753,11 @@
                     val = args[start+1]
                 self.setR(args[start], val)
             self.run_card.write(self.paths['run'], self.paths['run_default'])
-            
+        # special mode for set run_card nocut T (generated by set no_parton_cut
+        elif card == 'run_card' and args[start] in ['nocut', 'no_cut']:
+            logger.info("Going to remove all cuts from the run_card", '$MG:color:BLACK')
+            self.run_card.remove_all_cut()
+            self.run_card.write(self.paths['run'], self.paths['run_default'])
         ### PARAM_CARD WITH BLOCK NAME -----------------------------------------
         elif (args[start] in self.param_card or args[start] == 'width') \
                                                   and card in ['','param_card']:
@@ -5280,6 +5286,9 @@
         
         def check_block(self, blockname):
             add_entry = 0
+            if blockname.lower() not in self.param_card_default:
+                logger.info('unknow block %s: block will be ignored', blockname)
+                return add_entry
             block = self.param_card_default[blockname]
             for key in block.keys():
                 if key not in input_in_block:
@@ -5291,6 +5300,8 @@
                     add_entry += 1
             if add_entry:
                 text.append('\n')
+            if add_entry:
+                logger.info("Adding %s parameter(s) to block %s", add_entry, blockname)
             return add_entry
         
         # Add to the current param_card all the missing input at default value
@@ -5344,7 +5355,9 @@
                 continue
 
             if block not in defined_blocks:
-                add_entry += len(self.param_card_default[block])
+                nb_entry = len(self.param_card_default[block])
+                logger.info("Block %s was missing. Adding the %s associated parameter(s)", block,nb_entry)
+                add_entry += nb_entry
                 text.append(str(self.param_card_default[block])) 
             
         # special check for the decay

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2016-11-04 09:42:37 +0000
+++ madgraph/interface/madevent_interface.py	2016-12-10 02:02:40 +0000
@@ -3824,11 +3824,15 @@
         # Now setup the preamble to make sure that everything will use the locally
         # installed tools (if present) even if the user did not add it to its
         # environment variables.
-        if MADEVENT:
+        if 'heptools_install_dir' in self.options:
             preamble = misc.get_HEPTools_location_setter(
-               pjoin(self.options['mg5amc_py8_interface_path'],os.pardir),'lib')
+                                     self.options['heptools_install_dir'],'lib')
         else:
-            preamble = misc.get_HEPTools_location_setter(
+            if MADEVENT:
+                preamble = misc.get_HEPTools_location_setter(
+                pjoin(self.options['mg5amc_py8_interface_path'],os.pardir),'lib')
+            else:
+                preamble = misc.get_HEPTools_location_setter(
                                                  pjoin(MG5DIR,'HEPTools'),'lib')
             
         open(pythia_cmd_card,'w').write("""!
@@ -5485,8 +5489,12 @@
     
         # Check that all pdfset are correctly installed
         lhaid = [self.run_card.get_lhapdf_id()]
-        sys_pdf = self.run_card['sys_pdf'].split('&&')
-        lhaid += [l.split()[0] for l in sys_pdf]
+        if '&&' in self.run_card['sys_pdf']:
+            line = ' '.join(self.run_card['sys_pdf'])
+            sys_pdf = line.split('&&')
+            lhaid += [l.split()[0] for l in sys_pdf]
+        else:
+            lhaid += [l for l in self.run_card['sys_pdf'].split() if not l.isdigit() or int(l) > 500]
         try:
             pdfsets_dir = self.get_lhapdf_pdfsetsdir()
         except Exception, error:
@@ -5497,17 +5505,34 @@
         # Copy all the relevant PDF sets
         [self.copy_lhapdf_set([onelha], pdfsets_dir) for onelha in lhaid]
         
-        
+        to_syscalc={'sys_scalefact': self.run_card['sys_scalefact'],
+                    'sys_alpsfact': self.run_card['sys_alpsfact'],
+                    'sys_matchscale': self.run_card['sys_matchscale'],
+                    'sys_scalecorrelation': self.run_card['sys_scalecorrelation'],
+                    'sys_pdf': self.run_card['sys_pdf']}
         
         tag = self.run_card['run_tag']  
         card = pjoin(self.me_dir, 'bin','internal', 'syscalc_card.dat')
         template = open(pjoin(self.me_dir, 'bin','internal', 'syscalc_template.dat')).read()
-        self.run_card['sys_pdf'] = self.run_card['sys_pdf'].split('#',1)[0].replace('&&',' \n ')
-        
-        if self.run_card['sys_pdf'].lower() in ['', 'f', 'false', 'none', '.false.']:
-            self.run_card['sys_pdf'] = ''
-        if self.run_card['sys_alpsfact'].lower() in ['', 'f', 'false', 'none','.false.']:
-            self.run_card['sys_alpsfact'] = ''
+        
+        if '&&' in to_syscalc['sys_pdf']:
+            to_syscalc['sys_pdf'] = to_syscalc['sys_pdf'].split('#',1)[0].replace('&&',' \n ')
+        else:
+            data = to_syscalc['sys_pdf'].split()
+            new = []
+            for d in data:
+                if not d.isdigit():
+                    new.append(d)
+                elif int(d) > 500:
+                    new.append(d)
+                else:
+                    new[-1] += ' %s' % d
+            to_syscalc['sys_pdf'] = '\n'.join(new)  
+        
+        if to_syscalc['sys_pdf'].lower() in ['', 'f', 'false', 'none', '.false.']:
+            to_syscalc['sys_pdf'] = ''
+        if to_syscalc['sys_alpsfact'].lower() in ['', 'f', 'false', 'none','.false.']:
+            to_syscalc['sys_alpsfact'] = ''
 
 
 
@@ -6477,7 +6502,7 @@
             interface.do_treatcards('all --no_MadLoopInit')
         
         # First make sure that IREGI and CUTTOOLS are compiled if needed
-        if os.path.exists(pjoin(proc_dir,'Source','CUTTOOLS')):
+        if os.path.exists(pjoin(proc_dir,'Source','CutTools')):
             misc.compile(arg=['libcuttools'],cwd=pjoin(proc_dir,'Source'))
         if os.path.exists(pjoin(proc_dir,'Source','IREGI')):
             misc.compile(arg=['libiregi'],cwd=pjoin(proc_dir,'Source'))

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2016-11-01 15:20:16 +0000
+++ madgraph/interface/madgraph_interface.py	2016-12-10 02:02:40 +0000
@@ -2449,6 +2449,7 @@
 
     def complete_set(self, text, line, begidx, endidx):
         "Complete the set command"
+        misc.sprint([text,line,begidx, endidx])
         args = self.split_arg(line[0:begidx])
 
         # Format
@@ -2864,6 +2865,14 @@
                              mgme_dir)
                 self._mgme_dir = MG4DIR
 
+        # check that make_opts exists
+        make_opts = pjoin(MG5DIR, 'Template','LO','Source','make_opts')
+        make_opts_source = pjoin(MG5DIR, 'Template','LO','Source','.make_opts')
+        if not os.path.exists(make_opts):
+            shutil.copy(make_opts_source, make_opts)
+        elif  os.path.getmtime(make_opts) <  os.path.getmtime(make_opts_source):
+            shutil.copy(make_opts_source, make_opts)
+            
         # Variables to store state information
         self._multiparticles = {}
         self.options = {}
@@ -6409,6 +6418,12 @@
             subprocess.call([os.path.join('tests','test_manager.py')],
                                                                   cwd=MG5DIR)            
             print 'new version installed, please relaunch mg5'
+            try:
+                os.remove(pjoin(MG5DIR, 'Template','LO','Source','make_opts'))
+                shutil.copy(pjoin(MG5DIR, 'Template','LO','Source','.make_opts'),
+                            pjoin(MG5DIR, 'Template','LO','Source','make_opts'))
+            except:
+                pass
             sys.exit(0)
         elif answer == 'n':
             # prevent for a future check

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2016-10-24 12:21:59 +0000
+++ madgraph/iolibs/export_v4.py	2016-12-10 02:02:40 +0000
@@ -907,7 +907,7 @@
             return two value:
             - True/False if the matrix_element was modified
             - the new(or old) matrix element"""
-        misc.sprint("DO not modify grouping") 
+
         return False, matrix_element
         
     #===========================================================================

=== modified file 'madgraph/iolibs/template_files/madevent_makefile_source'
--- madgraph/iolibs/template_files/madevent_makefile_source	2016-09-01 09:14:58 +0000
+++ madgraph/iolibs/template_files/madevent_makefile_source	2016-12-10 02:02:40 +0000
@@ -54,8 +54,8 @@
 
 $(BINDIR)gen_ximprove: gen_ximprove.o ranmar.o rw_routines.o open_file.o 
 	$(FC) $(LDFLAGS) -o $@ $^
-$(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext) run_card.inc
-			 $(FC) $(LDFLAGS) -o $@ $(COMBINE) -L$(LIBDIR) -lmodel -lpdf $(llhapdf) $(LDFLAGS)
+$(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext) run_card.inc $(LIBDIR)libbias.$(libext)
+			 $(FC) $(LDFLAGS) -o $@ $(COMBINE) -L$(LIBDIR) -lmodel -lpdf $(llhapdf) $(LDFLAGS) -lbias
 $(BINDIR)gensudgrid: $(GENSUDGRID) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libcernlib.$(libext)
 	$(FC) $(LDFLAGS) -o $@ $(GENSUDGRID) -L$(LIBDIR) -lmodel -lpdf -lcernlib $(llhapdf) $(LDFLAGS)
 

=== modified file 'madgraph/iolibs/template_files/madevent_symmetry.f'
--- madgraph/iolibs/template_files/madevent_symmetry.f	2016-09-06 15:01:18 +0000
+++ madgraph/iolibs/template_files/madevent_symmetry.f	2016-12-10 02:02:40 +0000
@@ -13,6 +13,8 @@
       include 'run_config.inc'
       include 'maxamps.inc'
       include 'nexternal.inc'
+      include 'cuts.inc'
+      include '../../Source/run.inc'
       
       double precision ZERO
       parameter       (ZERO = 0d0)
@@ -32,16 +34,13 @@
       integer pow(-max_branch:-1,lmaxconfigs)
       character*20 param(maxpara),value(maxpara)
       double precision pmass(nexternal)   !External particle mass
-      double precision pi1(0:3),pi2(0:3),m1,m2,ebeam(2)
-      integer lpp(2)
+      double precision pi1(0:3),pi2(0:3),m1,m2
 c
 c     Global
 c
       include 'coupl.inc'
       logical gridpack
       common/to_gridpack/gridpack
-      double precision bwcutoff
-      common/to_bwcutoff/bwcutoff
       double precision stot
       common/to_stot/stot
 c
@@ -53,6 +52,13 @@
       include 'configs.inc'
       data use_config/0,lmaxconfigs*0/
 
+c
+c    needed for the run_card handling
+c
+      logical gridrun
+      integer iseed,lhaid
+      character*100 pdlabel
+      double precision sf1,sf2,pb1,pb2,d
 c-----
 c  Begin Code
 c-----
@@ -74,13 +80,14 @@
 c         stop
 c      endif
 
-      call load_para(npara,param,value)
-      call get_logical(npara,param,value," gridpack ",gridpack,.false.)
-      call get_real(npara,param,value," bwcutoff ",bwcutoff,5d0)
-      call get_real(npara,param,value," ebeam1 ",ebeam(1),0d0)
-      call get_real(npara,param,value," ebeam2 ",ebeam(2),0d0)
-      call get_integer(npara,param,value," lpp1 ",lpp(1),0)
-      call get_integer(npara,param,value," lpp2 ",lpp(2),0)
+      include '../../Source/run_card.inc'
+c      call load_para(npara,param,value)
+c      call get_logical(npara,param,value," gridpack ",gridpack,.false.)
+c      call get_real(npara,param,value," bwcutoff ",bwcutoff,5d0)
+c      call get_real(npara,param,value," ebeam1 ",ebeam(1),0d0)
+c      call get_real(npara,param,value," ebeam2 ",ebeam(2),0d0)
+c      call get_integer(npara,param,value," lpp1 ",lpp(1),0)
+c      call get_integer(npara,param,value," lpp2 ",lpp(2),0)
 
       call setpara('%(param_card_name)s' %(setparasecondarg)s)   !Sets up couplings and masses
       include 'pmass.inc'

=== modified file 'madgraph/iolibs/template_files/makefile_sa_f_sp'
--- madgraph/iolibs/template_files/makefile_sa_f_sp	2015-08-14 13:56:58 +0000
+++ madgraph/iolibs/template_files/makefile_sa_f_sp	2016-12-10 02:02:40 +0000
@@ -24,4 +24,4 @@
 
 matrix$(MENUM)py.so: matrix.f makefile $(LIBS)
 	touch __init__.py
-	$(F2PY) $(LINKLIBS) -c  matrix.f -m matrix$(MENUM)py --fcompiler=$(FC)
\ No newline at end of file
+	$(F2PY) $(LINKLIBS) -c  matrix.f -m matrix$(MENUM)py
\ No newline at end of file

=== modified file 'madgraph/loop/loop_exporters.py'
--- madgraph/loop/loop_exporters.py	2016-09-08 23:15:34 +0000
+++ madgraph/loop/loop_exporters.py	2016-12-10 02:02:40 +0000
@@ -2445,7 +2445,7 @@
                                       '%(proc_prefix)sBornColorFlowCoefs.dat'
                                                 %matrix_element.rep_dict),'w')
             self.write_color_flow_coefs_data_file(dat_writer,
-                          born_col_amps, matrix_element.get('loop_color_basis'))
+                          born_col_amps, matrix_element.get('born_color_basis'))
             dat_writer.close()
             
             dat_writer = open(pjoin('..','MadLoop5_resources',

=== modified file 'madgraph/various/histograms.py'
--- madgraph/various/histograms.py	2016-10-03 09:30:33 +0000
+++ madgraph/various/histograms.py	2016-12-10 02:02:40 +0000
@@ -771,8 +771,13 @@
             elif selector == 'ALPSFACT':
                 selector = r'ALPSFACT'
             elif selector == 'PDF':
-                selector = r'MUF=1_MUR=1_PDF=(\d*)'
+                selector = r'(?:MUF=1_MUR=1_PDF=|MU(?:F|R)="1.0" MU(?:R|F)="1.0" PDF=")(\d*)'
                 if not mode:
+#                    pdfs=[]
+##                    for n in self.bins[0].wgts:
+#                        misc.sprint( n)
+#                        if re.search(selector,n, re.IGNORECASE):
+#                            pdfs.append(int(re.findall(selector, n)[0]))
                     pdfs = [int(re.findall(selector, n)[0]) for n in self.bins[0].wgts if re.search(selector,n, re.IGNORECASE)]
                     min_pdf, max_pdf = min(pdfs), max(pdfs) 
                     if max_pdf - min_pdf > 100:
@@ -816,9 +821,9 @@
             for i in xrange(len(values[0])):
                 pdf_stdev = 0.0
                 data = [values[s][i] for s in xrange(len(values))]
-                sdata = sum(data)
-                sdata2 = sum(x**2 for x in data)
-                pdf_stdev = math.sqrt(max(sdata2 -sdata**2/float(len(values)-2),0.0))
+                sdata = sum(data)/len(data)
+                sdata2 = sum(x**2 for x in data)/len(data)
+                pdf_stdev = math.sqrt(max(sdata2 -sdata**2,0.0))
                 min_value.append(sdata - pdf_stdev)
                 max_value.append(sdata + pdf_stdev)                 
 
@@ -3353,7 +3358,7 @@
             h_min = [hwu_mult*b for b in h_min] 
             h_max = [hwu_mult*b for b in h_max] 
         fill_between_steps(bins, h_min, h_max, ax=ax, facecolor=H.get_color(),
-                           alpha=0.5, edgecolor=H.get_color())
+                           alpha=0.5, edgecolor=H.get_color(),hatch='/')
 
     return hwu, H
 

=== modified file 'madgraph/various/lhe_parser.py'
--- madgraph/various/lhe_parser.py	2016-11-04 08:50:51 +0000
+++ madgraph/various/lhe_parser.py	2016-12-10 02:02:40 +0000
@@ -772,14 +772,16 @@
                     grouped_error[group] = self.error[i]**2
             else:
                 ban = banner_mod.Banner(ff.banner)
-                for line in  ban['init']:
+                for line in  ban['init'].split('\n'):
                     splitline = line.split()
                     if len(splitline)==4:
-                        cross, error, wgt, group = splitline
-                        grouped_cross[int(group)] += cross
-                        grouped_error[int(group)] += error**2                        
-                
-                
+                        cross, error, _, group = splitline
+                        if int(group) in grouped_cross:
+                            grouped_cross[group] += float(cross)
+                            grouped_error[group] += float(error)**2                        
+                        else:
+                            grouped_cross[group] = float(cross)
+                            grouped_error[group] = float(error)**2                             
         nb_group = len(grouped_cross)
         
         # compute the information for the first line 
@@ -818,7 +820,6 @@
         init_information["cross_info"] = '\n'.join(init_information["cross_info"])
         init_information['lha_stra'] = -1 * abs(lha_strategy)
         
-        
         template_init =\
         """    %(idbmup1)i %(idbmup2)i %(ebmup1)e %(ebmup2)e %(pdfgup1)i %(pdfgup2)i %(pdfsup1)i %(pdfsup2)i %(lha_stra)i %(nprup)i
 %(cross_info)s

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2016-10-14 22:51:35 +0000
+++ madgraph/various/misc.py	2016-12-10 02:02:40 +0000
@@ -45,7 +45,6 @@
     import madgraph.iolibs.files as files
     MADEVENT = False
 
-
     
 logger = logging.getLogger('cmdprint.ext_program')
 logger_stderr = logging.getLogger('madevent.misc')
@@ -991,15 +990,25 @@
     """
 
     def __init__(self, cls, attribute, value):
-        
-        self.old_value = getattr(cls, attribute)
+
         self.cls = cls
-        self.attribute = attribute
-        setattr(self.cls, self.attribute, value)
+        self.attribute = attribute        
+        if isinstance(attribute, list):
+            self.old_value = []
+            for key, onevalue in zip(attribute, value):
+                self.old_value.append(getattr(cls, key))
+                setattr(self.cls, key, onevalue)
+        else:
+            self.old_value = getattr(cls, attribute)
+            setattr(self.cls, self.attribute, value)
     
     def __exit__(self, ctype, value, traceback ):
-
-        setattr(self.cls, self.attribute, self.old_value)
+        
+        if isinstance(self.attribute, list):
+            for key, old_value in zip(self.attribute, self.old_value):
+                setattr(self.cls, key, old_value)
+        else:
+            setattr(self.cls, self.attribute, self.old_value)
         
     def __enter__(self):
         return self.old_value 
@@ -1225,7 +1234,7 @@
     is in the environment paths of the user. If not, it returns a preamble that
     sets it before calling the exectuable, for example:
        <preamble> ./my_exe
-    with <preamble> -> DYLD_LIBRARY_PATH='blabla;$DYLD_LIBRARY_PATH'"""
+    with <preamble> -> DYLD_LIBRARY_PATH=blabla:$DYLD_LIBRARY_PATH"""
     
     assert(type in ['bin','include','lib'])
     
@@ -1236,7 +1245,7 @@
     
     if target_env_var not in os.environ or \
                 target_path not in os.environ[target_env_var].split(os.pathsep):
-        return "%s='%s;$%s' "%(target_env_var,target_path,target_env_var)
+        return "%s=%s:$%s "%(target_env_var,target_path,target_env_var)
     else:
         return ''
 

=== modified file 'madgraph/various/systematics.py'
--- madgraph/various/systematics.py	2016-11-03 15:21:05 +0000
+++ madgraph/various/systematics.py	2016-12-10 02:02:40 +0000
@@ -366,7 +366,15 @@
         for lhapdfid,values in pdfs.items():
             if lhapdfid == self.orig_pdf.lhapdfID:
                 continue
+            if len(values) == 1 :
+                continue
             pdfset = self.pdfsets[lhapdfid]
+
+            if pdfset.errorType == 'unknown' :
+                # Don't know how to determine uncertainty for 'unknown' errorType :
+                # File "lhapdf.pyx", line 329, in lhapdf.PDFSet.uncertainty (lhapdf.cpp:6621)
+                # RuntimeError: "ErrorType: unknown" not supported by LHAPDF::PDFSet::uncertainty.
+                continue
             pdferr =  pdfset.uncertainty(values)
             resume.write( '#PDF %s: %g +%2.3g%% -%2.3g%%\n' % (pdfset.name, pdferr.central,pdferr.errplus*100/all_cross[0], pdferr.errminus*100/all_cross[0]))
 
@@ -402,6 +410,7 @@
         
         text = ''
         
+        default = self.args[0]
         for arg in self.args[1:]:
             mur, muf, alps, dyn, pdf = arg[:5]
             if pdf == self.orig_pdf and alps ==1 and (mur!=1 or muf!=1 or dyn!=-1):
@@ -409,7 +418,7 @@
                     text += "<weightgroup name=\"Central scale variation\" combine=\"envelope\">\n"
                     in_scale=True
             elif in_scale:
-                if (pdf == self.orig_pdf and alps ==1):
+                if (pdf == self.orig_pdf and alps ==1) and arg != default:
                     pass
                 else:
                     text += "</weightgroup> # scale\n"
@@ -423,7 +432,12 @@
                 text += "</weightgroup> # ALPS\n"
                 in_alps=False
             
-            if pdf != self.orig_pdf and mur == muf == 1 and dyn==-1 and alps ==1:
+            if mur == muf == 1 and dyn==-1 and alps ==1:
+                if pdf.lhapdfID < 0:
+                    for central,sets in self.pdfsets.items():
+                        if pdf in sets.set():
+                            misc.sprint(central)
+                
                 if pdf.lhapdfID in self.pdfsets:
                     if in_pdf:
                         text += "</weightgroup> # PDFSET -> PDFSET\n"
@@ -432,7 +446,7 @@
                     text +="<weightgroup name=\"%s\" combine=\"%s\"> # %s: %s\n" %\
                             (pdfset.name, pdfset.errorType,pdfset.lhapdfID, descrip)
                     in_pdf=pdf.lhapdfID 
-                elif pdf.memberID == 1 and (pdf.lhapdfID - pdf.memberID) in self.pdfsets:
+                elif pdf.memberID == 0 and (pdf.lhapdfID - pdf.memberID) in self.pdfsets:
                     if in_pdf:
                         text += "</weightgroup> # PDFSET -> PDFSET\n"
                     pdfset = self.pdfsets[pdf.lhapdfID - 1]
@@ -441,6 +455,7 @@
                             (pdfset.name, pdfset.errorType,pdfset.lhapdfID, descrip)
                     in_pdf=pdfset.lhapdfID 
                 elif in_pdf and pdf.lhapdfID - pdf.memberID != in_pdf:
+                    misc.sprint(pdf.lhapdfID)
                     text += "</weightgroup> # PDFSET -> PDF\n"
                     in_pdf = False 
             elif in_pdf:
@@ -525,7 +540,14 @@
                 new_args[pos[name]] = value
                 all_args.append(new_args)
         
-        self.args = [default]+ [arg for arg in all_args if arg!= default]
+        self.args = [default] + [arg for arg in all_args if arg!= default]
+
+        # add the default before the pdf scan to have a full grouping
+        pdfplusone = [pdf for pdf in self.pdf if pdf.lhapdfID == self.orig_pdf.lhapdfID+1]
+        if pdfplusone:
+            pdfplusone = default[:-1] + [pdfplusone[0]] 
+            index = self.args.index(pdfplusone)
+            self.args.insert(index, default)
 
         self.log( "#Will Compute %s weights per event." % (len(self.args)-1))
         return
@@ -594,14 +616,18 @@
                 mur = event.get_sqrts_scale(1.)
             muf1 = mur
             muf2 = mur
-            loinfo['pdf_q1'][-1] = mur
-            loinfo['pdf_q2'][-1] = mur
+            loinfo = dict(loinfo)
+            loinfo['pdf_q1'] = loinfo['pdf_q1'] [:-1] + [mur]
+            loinfo['pdf_q2'] = loinfo['pdf_q2'] [:-1] + [mur]
             
         
         
         # MUR part
         if self.b1 == 0 == self.b2:
-            wgt = self.alpsrunner(Dmur*mur)**loinfo['n_qcd']
+            if loinfo['n_qcd'] != 0:
+                wgt = self.alpsrunner(Dmur*mur)**loinfo['n_qcd']
+            else:
+                wgt = 1.0
         else:
             wgt = pdf.alphasQ(Dmur*mur)**loinfo['n_qcd']
         # MUF/PDF part
@@ -685,7 +711,7 @@
                 wgt += tmp
                 
                 if __debug__ and dyn== -1 and Dmur==1 and Dmuf==1 and pdf==self.orig_pdf:
-                    if not misc.equal(tmp, onewgt.ref_wgt, sig_fig=4):
+                    if not misc.equal(tmp, onewgt.ref_wgt, sig_fig=2):
                         misc.sprint(tmp, onewgt.ref_wgt, (tmp-onewgt.ref_wgt)/tmp)
                         misc.sprint(onewgt)
                         misc.sprint(cevent)
@@ -756,7 +782,19 @@
             else:
                 opts['alps'] = [1.0]
             opts['together'] = [('mur','muf','alps','dyn')]
-            pdfs =  card['sys_pdf'].split('&&')
+            if '&&' in card['sys_pdf']:
+                pdfs =  card['sys_pdf'].split('&&')
+            else:
+                data = card['sys_pdf'].split()
+                pdfs = []
+                for d in data:
+                    if not d.isdigit():
+                        pdfs.append(d)
+                    elif int(d) > 500:
+                        pdfs.append(d)
+                    else:
+                        pdfs[-1] = '%s %s' % (pdfs[-1], d)
+
             opts['dyn'] = [-1,1,2,3,4]
             opts['pdf'] = []
             for pdf in pdfs:
@@ -781,7 +819,21 @@
     return obj
 
 if __name__ == "__main__":
-    call_systematics(sys.argv[1:])
+    sys_args = sys.argv[1:]
+    for i, arg in enumerate(sys_args) :
+        if arg.startswith('--lhapdf_config=') :
+            lhapdf = misc.import_python_lhapdf(arg[len('--lhapdf_config='):])
+            del sys_args[i]
+            break
+
+    if 'lhapdf' not in globals():
+        lhapdf = misc.import_python_lhapdf('lhapdf-config')
+         
+    if not lhapdf:
+            sys.exit('Can not run systematics since can not link python to lhapdf, specify --lhapdf-config=')
+    call_systematics(sys_args)
+    
+
    
    
         

=== modified file 'models/check_param_card.py'
--- models/check_param_card.py	2016-10-26 20:14:22 +0000
+++ models/check_param_card.py	2016-12-10 02:02:40 +0000
@@ -120,13 +120,13 @@
         
         if format == 'float':
             if self.lhablock == 'decay' and not isinstance(self.value,basestring):
-                return 'DECAY %s %.{}e # %s'.format(precision) % (' '.join([str(d) for d in self.lhacode]), self.value, self.comment)
+                return 'DECAY %s %.{0}e # %s'.format(precision) % (' '.join([str(d) for d in self.lhacode]), self.value, self.comment)
             elif self.lhablock == 'decay':
                 return 'DECAY %s Auto # %s' % (' '.join([str(d) for d in self.lhacode]), self.comment)
             elif self.lhablock and self.lhablock.startswith('qnumbers'):
                 return '      %s %i # %s' % (' '.join([str(d) for d in self.lhacode]), int(self.value), self.comment)
             else:
-                return '      %s %.{}e # %s'.format(precision) % (' '.join([str(d) for d in self.lhacode]), self.value, self.comment)
+                return '      %s %.{0}e # %s'.format(precision) % (' '.join([str(d) for d in self.lhacode]), self.value, self.comment)
         elif format == 'int':
             return '      %s %i # %s' % (' '.join([str(d) for d in self.lhacode]), int(self.value), self.comment)
         elif format == 'str':
@@ -435,7 +435,7 @@
         
         # apply all the basic restriction rule
         if restrict_rule:
-            restrict_rule.check_param_card(self, modify=True, log=loglevel)
+            _, modify = restrict_rule.check_param_card(self, modify=True, log=loglevel)
         
         import models.model_reader as model_reader
         import madgraph.core.base_objects as base_objects
@@ -449,7 +449,6 @@
         for particle in model.get('particles'):
             if particle.get('goldstone') or particle.get('ghost'):
                 continue
-
             mass = model.get_parameter(particle.get('mass'))
             lhacode = abs(particle.get_pdg_code())
 
@@ -481,6 +480,7 @@
                     model_value = model_value.real
                 if not misc.equal(model_value, param_value, 4):
                     modify = True
+                    misc.sprint(modify)
                     if loglevel == 20:
                         logger.info('For consistency, the width of particle %s (%s) is changed to %s.' % (lhacode, particle.get('name'), model_value), '$MG:color:BLACK')
                     else:
@@ -488,6 +488,7 @@
                     #logger.debug('was %s', param_value)
                 if model_value != param_value:   
                     self.get('decay').get(abs(particle.get_pdg_code())).value = model_value
+
         return modify
 
 
@@ -1140,7 +1141,9 @@
     
     def check_param_card(self, path, modify=False, write_missing=False, log=False):
         """Check that the restriction card are applied"""
-            
+        
+        is_modified = False
+        
         if isinstance(path,str):    
             card = self.read_param_card(path)
         else:
@@ -1169,6 +1172,7 @@
                         param = card[block].get(id) 
                         param.value = 0.0
                         param.comment += ' fixed by the model'
+                        is_modified = True
                         if log ==20:
                             logger.log(log,'For model consistency, update %s with id %s to value %s',
                                         (block, id, 0.0), '$MG:color:BLACK')                            
@@ -1199,6 +1203,7 @@
                         param = card[block].get(id) 
                         param.value = 1.0
                         param.comment += ' fixed by the model'
+                        is_modified = True
                         if log ==20:
                             logger.log(log,'For model consistency, update %s with id %s to value %s',
                                         (block, id, 1.0), '$MG:color:BLACK')                            
@@ -1210,6 +1215,7 @@
         # check identical
         for block, id1, id2, comment in self.identical:
             if block not in card:
+                is_modified = True
                 logger.warning('''Param card is not complete: Block %s is simply missing.
                 We will use model default for all missing value! Please cross-check that
                 this correspond to your expectation.''' % block)
@@ -1234,6 +1240,7 @@
                         param = card[block].get(id1) 
                         param.value = value2
                         param.comment += ' must be identical to %s' % id2
+                        is_modified = True
                         if log ==20:
                             logger.log(log,'For model consistency, update %s with id %s to value %s since it should be equal to parameter with id %s',
                                         block, id1, value2, id2, '$MG:color:BLACK')
@@ -1262,6 +1269,7 @@
                         param = card[block].get(id1) 
                         param.value = -value2
                         param.comment += ' must be opposite to %s' % id2
+                        is_modified = True
                         if log ==20:
                             logger.log(log,'For model consistency, update %s with id %s to value %s since it should be equal to the opposite of the parameter with id %s',
                                         block, id1, -value2, id2, '$MG:color:BLACK')
@@ -1269,7 +1277,7 @@
                             logger.log(log,'For model consistency, update %s with id %s to value %s since it should be equal to the opposite of the parameter with id %s',
                                         block, id1, -value2, id2)
 
-        return card
+        return card, is_modified
                         
 
 def convert_to_slha1(path, outputpath=None ):
@@ -1651,8 +1659,9 @@
     try :
         cardrule.check_param_card(path, modify=False)
     except InvalidParamCard:
-        new_data = cardrule.check_param_card(path, modify=True, write_missing=True)
-        cardrule.write_param_card(outputpath, new_data)
+        new_data, was_modified = cardrule.check_param_card(path, modify=True, write_missing=True)
+        if was_modified:
+            cardrule.write_param_card(outputpath, new_data)
     else:
         if path != outputpath:
             shutil.copy(path, outputpath)

=== modified file 'models/usermod.py'
--- models/usermod.py	2016-06-20 10:43:25 +0000
+++ models/usermod.py	2016-12-10 02:02:40 +0000
@@ -30,6 +30,7 @@
 import models as ufomodels
 import models.import_ufo as import_ufo
 import models.check_param_card as check_param_card
+from madgraph import MG5DIR
 
 pjoin =os.path.join
 logger = logging.getLogger('madgraph.model')
@@ -897,6 +898,16 @@
                             else:
                                 first =False
                             old_part = p
+                    if not old_part:
+                    # last possibility is that the model do not follow MG5 convention
+                    # but that "old" does
+                        defaultname = base_objects.Model.load_default_name() # id->name
+                        for pdg, value in defaultname.items():
+                            if value == old:
+                                old_part = self.particle_dict[pdg]
+                                identify_particles[new] = old_part.name
+                                break
+                    
                 # end for the case security
                 identify_pid[new_part.pdg_code] = old_part.pdg_code   
                 if new_part is None:

=== modified file 'tests/acceptance_tests/test_cmd_madevent.py'
--- tests/acceptance_tests/test_cmd_madevent.py	2016-09-07 09:55:52 +0000
+++ tests/acceptance_tests/test_cmd_madevent.py	2016-12-10 02:02:40 +0000
@@ -570,12 +570,21 @@
 
     def setUp(self):
         
-        self.path = tempfile.mkdtemp(prefix='acc_test_mg5')
+        self.debuging = False
+        if self.debuging:
+            self.path = pjoin(MG5DIR, 'ACC_TEST')
+            if os.path.exists(self.path):
+                 shutil.rmtree(self.path)
+            os.mkdir(self.path) 
+        else:
+            self.path = tempfile.mkdtemp(prefix='acc_test_mg5')
         self.run_dir = pjoin(self.path, 'MGPROC') 
+        
     
     def tearDown(self):
 
-        shutil.rmtree(self.path)
+        if not self.debuging:
+            shutil.rmtree(self.path)
 
     def test_add_time_of_flight(self):
         """checking time of flight is working fine"""
@@ -646,6 +655,7 @@
         self.assertTrue(has_zero)
         self.assertTrue(has_non_zero)
         
+        self.assertFalse(self.debuging)
     
 
     def test_w_production_with_ms_decay(self):

=== modified file 'tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%MadLoopCommons.f'
--- tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%MadLoopCommons.f	2016-09-07 13:39:06 +0000
+++ tests/input_files/IOTestsComparison/MadLoop_output_from_the_interface/TIR_output/%ggttx_IOTest%SubProcesses%MadLoopCommons.f	2016-12-10 02:02:40 +0000
@@ -103,6 +103,9 @@
         CALL SWITCHOFFCACHESYSTEM_CLL()
       ENDIF
 
+C     Make sure no COLLIER error can interrupt the code
+      CALL SWITCHOFFERRSTOP_CLL()
+
 C     Specify below your other custom COLLIER parameter settings 
 C     [user_specific_COLLIER_settings]