Merge lp:~maddevelopers/mg5amcnlo/2.3.0_nopdftransfer into lp:~maddevelopers/mg5amcnlo/2.3

[Olivier Mattelaer]

[marco zaro (marco-zaro)]

Ciao Olivier,
2 thisgs:
1)I get this error with the latest version (see at the end)...
2)in Cards/amcatnlo_configuration.txt the cluster_local_path is still commented...

Cheers,

Marco

INFO: Using LHAPDF v6.1.5 interface for PDFs
DEBUG: [Errno 30] Read-only file system: '/cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF/lhapdf.conf'
DEBUG: [Errno 30] Read-only file system: '/cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF/pdfsets.index'
INFO: Trying to download NNPDF23_nlo_as_0118_qed
ERROR: Could not write to /cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF/NNPDF23_nlo_as_0118_qed.tar.gz
ERROR: Could not write to /cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF/NNPDF23_nlo_as_0118_qed.tar.gz
ERROR: Could not write to /cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF/NNPDF23_nlo_as_0118_qed.tar.gz
Command "launch auto -c" interrupted with error:
MadGraph5Error : Could not download NNPDF23_nlo_as_0118_qed into /cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF. Please try to install it manually.
Please report this bug on https://bugs.launchpad.net/madgraph5
More information is found in '/nfs/scratch/fynu/mzaro/2.3.0_nopdftransfer/PROCNLO_loop_sm_1/run_01_tag_1_debug.log'.
Please attach this file to your report.

review: Needs Fixing

[Olivier Mattelaer (olivier-mattelaer)]

Hi Marco,

For the first point, what can we do?
Looks like your pdf is not part of the one install on each node.
Download them in a different directory? (is that possible?)

For the second point, this is not a bug. This is a feature, the information from one config file is
NEVER pass to the one of madevent/amc@NLO. The madevent/amc@nlo interface load BOTH file (in order).
This allow less ambiguity.

The configuration file reading order is
0. default value in python
1. ${MADGRAPH_BASE}/mg5_configuration.txt [only use for our cluster]
2. ~/.mg5/mg5_configuration.txt
3. ./Cards/madevent_configuration.txt [respectively the amc@NLO one]
4. input/mg5_configuration.txt
5. ./Cards/madevent_configuration.txt

The fact that the cards 3 and 5 are the same is required since the path to the card 4 is present inside file 3.

Cheers,

Olivier

[marco zaro (marco-zaro)]

Hi Olivier,
the problem is that even for files that are there, it tries and fail to download them..
ls /cvmfs/cp3.uclouvain.be/lhapdf/pdfsets/6.1/
CT10/ list.txt MSTW2008nlo68cl/ MSTW2008nnlo68cl_nf4/ NNPDF23_nlo_FFN_NF5_as_0118/
CT10nlo/ MSTW2008lo68cl/ MSTW2008nlo68cl_nf4/ NNPDF23_nlo_as_0118_qed/
CT10nnlo/ MSTW2008lo68cl_nf4/ MSTW2008nnlo68cl/

Command "launch NLO -c" interrupted with error:
MadGraph5Error : Could not download MSTW2008nlo68cl into /cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF. Please try to install it manually.
Please report this bug on https://bugs.launchpad.net/madgraph5
More information is found in '/nfs/scratch/fynu/mzaro/2.3.0_nopdftransfer/PROCNLO_loop_sm_1/run_02_tag_1_debug.log'.
Please attach this file to your report.

On 10 Mar 2015, at 11:34, Olivier Mattelaer <email address hidden> wrote:

> Hi Marco,
>
> For the first point, what can we do?
> Looks like your pdf is not part of the one install on each node.
> Download them in a different directory? (is that possible?)
>
>
>
> For the second point, this is not a bug. This is a feature, the information from one config file is
> NEVER pass to the one of madevent/amc@NLO. The madevent/amc@nlo interface load BOTH file (in order).
> This allow less ambiguity.
>
> The configuration file reading order is
> 0. default value in python
> 1. ${MADGRAPH_BASE}/mg5_configuration.txt [only use for our cluster]
> 2. ~/.mg5/mg5_configuration.txt
> 3. ./Cards/madevent_configuration.txt [respectively the amc@NLO one]
> 4. input/mg5_configuration.txt
> 5. ./Cards/madevent_configuration.txt
>
> The fact that the cards 3 and 5 are the same is required since the path to the card 4 is present inside file 3.
>
> Cheers,
>
> Olivier
>
>
>
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.3.0_nopdftransfer/+merge/250218
> You are reviewing the proposed merge of lp:~maddevelopers/mg5amcnlo/2.3.0_nopdftransfer into lp:~maddevelopers/mg5amcnlo/LoopInduced_splittedrefine.

[Olivier Mattelaer (olivier-mattelaer)]

Ok thanks to have found this, the problem was linked that I never use the "-c" option since I always plays with the configuration file.

Thanks a lot,

Olivier

[Olivier Mattelaer (olivier-mattelaer)]

Just update the target destination for this merge.

In the same line of idea of this merge. I have (in loop induced mode) reduce the number of file that are send back to the /nfs/ position. Those are mainly log/grid which where not use anyway and therefore a waste of ressources to keep them.

[marco zaro (marco-zaro)]

Ciao Olivier,
are you sure that you want to merge 2.3 into the splittedrefine?
Just to be sure...
Cheers,

Marco

Marco Zaro

On Thu, Mar 12, 2015 at 3:11 AM, Olivier Mattelaer <
<email address hidden>> wrote:

> Just update the target destination for this merge.
>
> In the same line of idea of this merge. I have (in loop induced mode)
> reduce the number of file that are send back to the /nfs/ position. Those
> are mainly log/grid which where not use anyway and therefore a waste of
> ressources to keep them.
>
>
>
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.3/+merge/252675
> You are requested to review the proposed merge of
> lp:~maddevelopers/mg5amcnlo/2.3 into
> lp:~maddevelopers/mg5amcnlo/LoopInduced_splittedrefine.
>

[Olivier Mattelaer (olivier-mattelaer)]

I did not realise that it was possible the change both the origin and the destination of a merge request. So sorry I change the wrong one.

Olivier

[marco zaro (marco-zaro)]

Ciao Olivier,
it does not work on ingrid.
I have tried both with the default PDF setn (224600) and with mstw2008nlo (21000) and it fails after resubmitting the job a couple of times.
The error in the logs is always hat the PDF file is not found..

==== LHAPDF6 USING DEFAULT-TYPE LHAGLUE INTERFACE ====
terminate called after throwing an instance of 'LHAPDF::ReadError'
  what(): Info file not found for PDF set 'MSTW2008nlo68cl'
Time in seconds: 1

Cheers,

Marco

review: Needs Fixing

[Olivier Mattelaer (olivier-mattelaer)]

Hi Marco,

Thanks for checking, this is really weird since both Valentin and I are using a lot this branch for producing the table of our loopinduced paper.

So I have checked back today with a lot of different configuration and from a fully fresh version.
and they all succeed.

So I arrive to a point to suspect a configuration problem.
The main difference between your configuration and mine is that you set in your ~/.bashrc
LHAPATH=/home/fynu/mzaro/lhapdf/share/lhapdf/PDFsets

I checked that this variable was correctly overwritten by the python code and the environment variable associate to the condor_job indicates correctly:
LHAPATH = /cvmfs/cp3.uclouvain.be/madgraph/../lhapdf/pdfsets/6.1
lhapdf_config = /cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/bin/lhapdf-config

But If I ask the bash script to print that variable it returns:
LHAPATH = /home/fynu/mzaro/lhapdf/share/lhapdf/PDFsets

So looks like the LHAPATH variable is overwritten by the node in some way.
Do you have any idea why is it the case? I do not.

I guess that the ~/.bashrc is read in a way that I do not understand. So not sure of what i can do in this case.

Cheers,

Olivier

[lp:~maddevelopers/mg5amcnlo/2.3.0_nopdftransfer]

476. By Olivier Mattelaer on 2015-03-17

Try to set lhapath internally to fortran to fix Marco configuration issue

477. By Olivier Mattelaer on 2015-03-17

revert last try since the function is not supported on linux (it is on mac)

[Olivier Mattelaer (olivier-mattelaer)]

So I try to set the enviroment level at the fortran level.
But it fails since the associate routine is only define on mac/windows...

So I see two solutions:
1) warn the user if LHAPATH is define and that this mode is on (but if LHAPATH points to the correct path)

2) save the correct value in a "madgraph" specific environment variable (like CLUSTER_LHAPATH). and change all our bashscript to startwiths:
if [$CLUSTER_LHAPATH]; then
   export LHAPATH=$CLUSTER_LHAPATH;
fi
The second solution is not nice but should work nicely.

What do you think Marco?

Cheers,

Olivier

[marco zaro (marco-zaro)]

Ciao Olivier,
thanks for checking, the second solution should be ok, and this should set the variable only on the cluster node, right?
btw, what is the lifetime of these variables? with export they remain forever, right?
I will have a look at how the branch works when i comment the lhapath in my .bashrc.
btw, hos shall it work if i want to use one pdfset which is not among those jerome has pre-installed?

Cheers,

Marco

On 17 Mar 2015, at 06:43, Olivier Mattelaer <email address hidden> wrote:

> So I try to set the enviroment level at the fortran level.
> But it fails since the associate routine is only define on mac/windows...
>
> So I see two solutions:
> 1) warn the user if LHAPATH is define and that this mode is on (but if LHAPATH points to the correct path)
>
> 2) save the correct value in a "madgraph" specific environment variable (like CLUSTER_LHAPATH). and change all our bashscript to startwiths:
> if [$CLUSTER_LHAPATH]; then
> export LHAPATH=$CLUSTER_LHAPATH;
> fi
> The second solution is not nice but should work nicely.
>
> What do you think Marco?
>
> Cheers,
>
> Olivier
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.3.0_nopdftransfer/+merge/252820
> You are reviewing the proposed merge of lp:~maddevelopers/mg5amcnlo/2.3.0_nopdftransfer into lp:~maddevelopers/mg5amcnlo/2.3.

[lp:~maddevelopers/mg5amcnlo/2.3.0_nopdftransfer]

478. By Olivier Mattelaer on 2015-03-18

apply the fix to force the node to use the correct LHAPATH

479. By Olivier Mattelaer on 2015-03-19

remove the dependencies in lhapdf in combine_events (test)

480. By Olivier Mattelaer on 2015-03-19

add the protection for NLO reweighting

[Olivier Mattelaer (olivier-mattelaer)]

Hi Marco,

Ok I have implemented the fix that I was describing above.
I have checked that it is working for
MadEvent
LoopInduced
aMC@NLO
fix order NLO
(by defining a wrong LHAPATH in my .bashrc)

If some bash script are not cover, this is anyway not critical since this is enough to remove the LHAPATH definition from the .bashrc

Please accept the review as soon as possible, I would really like to be able to make this available (hoping that it will reduce the ingrid latency)

Cheers,

Olivier

[Olivier Mattelaer (olivier-mattelaer)]

Forget to answer your question:

> thanks for checking, the second solution should be ok, and this should set the variable only on the cluster node, right?
btw, what is the lifetime of these variables? with export they remain forever, right?

This is going to be contained in the node and only for the process in progress but accessible by all the code launched by the bash script.

> hos shall it work if i want to use one pdfset which is not among those jerome has pre-installed?

If you use the version of lhapdf install by Jerome, this will certainly crash since you can not write in the correct path.
Otherwise I'm not sure, to be honest do not care too much about that case.
At worse, this either means that the user has to use it's own version of lhapdf or to ask Jerome to add one additional pdf set.

Cheers,

Olivier

[marco zaro (marco-zaro)]

Ciao Olivier,
great, NLO and aMC@NLO+shower modes are working now on ingrid (I have commented the LHAPATH setting in my .bashrc).
Just one thing: this is printed on the screen

INFO: Using LHAPDF v6.1.5 interface for PDFs
DEBUG: [Errno 30] Read-only file system: '/cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF/lhapdf.conf'
DEBUG: [Errno 30] Read-only file system: '/cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF/pdfsets.index'
/cvmfs/cp3.uclouvain.be/madgraph/ 1 True

The info/debug statements are OK, but the last line (/cvmfs/cp3.uclouvain.be/madgraph/ 1 True) should be removed, right?

Thanks a lot!

Cheers,

Marco

review: Approve

[Olivier Mattelaer (olivier-mattelaer)]

Hi Marco,

I do not find the printout in the code (and do not see him). I think that this is my fault, I might have add it when I was using your login.

Thanks,

Olivier

On 19 Mar 2015, at 16:52, marco zaro <email address hidden> wrote:

> Review: Approve
>
> Ciao Olivier,
> great, NLO and aMC@NLO+shower modes are working now on ingrid (I have commented the LHAPATH setting in my .bashrc).
> Just one thing: this is printed on the screen
>
> INFO: Using LHAPDF v6.1.5 interface for PDFs
> DEBUG: [Errno 30] Read-only file system: '/cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF/lhapdf.conf'
> DEBUG: [Errno 30] Read-only file system: '/cvmfs/cp3.uclouvain.be/lhapdf/lhapdf-6.1.5_amd64_gcc44/share/LHAPDF/pdfsets.index'
> /cvmfs/cp3.uclouvain.be/madgraph/ 1 True
>
> The info/debug statements are OK, but the last line (/cvmfs/cp3.uclouvain.be/madgraph/ 1 True) should be removed, right?
>
> Thanks a lot!
>
> Cheers,
>
> Marco
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.3.0_nopdftransfer/+merge/252820
> Your team MadDevelopers is subscribed to branch lp:~maddevelopers/mg5amcnlo/2.3.

=== removed file 'Template/LO/Source/PDF/pdfwrap_lhapdf.f'
--- Template/LO/Source/PDF/pdfwrap_lhapdf.f	2012-11-07 05:57:53 +0000
+++ Template/LO/Source/PDF/pdfwrap_lhapdf.f	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-      subroutine pdfwrap
-      implicit none
-C
-C     INCLUDE
-C
-      include 'pdf.inc'
-      include '../alfas.inc'
-      real*8 zmass
-      data zmass/91.188d0/
-      Character*150 LHAPath
-      character*20 parm(20)
-      double precision value(20)
-      real*8 alphasPDF
-      external alphasPDF
-
-
-c-------------------
-c     START THE CODE
-c-------------------      
-
-c     initialize the pdf set
-      call FindPDFPath(LHAPath)
-      CALL SetPDFPath(LHAPath)
-      value(1)=lhaid
-      parm(1)='DEFAULT'
-      call pdfset(parm,value)
-      call GetOrderAs(nloop)
-      nloop=nloop+1  
-      asmz=alphasPDF(zmass)
-      
-      return
-      end
- 
-
-      subroutine FindPDFPath(LHAPath)
-c********************************************************************
-c generic subroutine to open the table files in the right directories
-c********************************************************************
-      implicit none
-c
-      Character LHAPath*150,up*3
-      data up/'../'/
-      logical exists
-      integer i
-
-c     first try in the current directory
-      LHAPath='PDFsets'
-      Inquire(File=LHAPath, exist=exists)
-      if(exists)return
-c     then try one directory up
-      LHAPath=up//LHAPath
-      Inquire(File=LHAPath, exist=exists)
-      if(exists)return
-c     finally try in the lib directory
-      LHAPath='lib/PDFsets'
-      Inquire(File=LHAPath, exist=exists)
-      if(exists)return
-      do i=1,6
-         LHAPath=up//LHAPath
-         Inquire(File=LHAPath, exist=exists)
-         if(exists)return
-      enddo
-      print*,'Could not find PDFsets directory, quitting'
-      stop 1
-      
-      return
-      end
-

=== modified file 'Template/LO/SubProcesses/refine.sh'
--- Template/LO/SubProcesses/refine.sh	2015-03-09 21:04:25 +0000
+++ Template/LO/SubProcesses/refine.sh	2015-03-19 03:16:56 +0000
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# For support of LHAPATH in cluster mode
+if [ $CLUSTER_LHAPATH ]; then
+  export LHAPATH=$CLUSTER_LHAPATH;
+fi
+
 if [[ -e MadLoop5_resources.tar.gz && ! -e MadLoop5_resources ]]; then
 tar -xzf MadLoop5_resources.tar.gz
 fi

=== modified file 'Template/LO/SubProcesses/refine_splitted.sh'
--- Template/LO/SubProcesses/refine_splitted.sh	2015-03-11 19:19:19 +0000
+++ Template/LO/SubProcesses/refine_splitted.sh	2015-03-19 03:16:56 +0000
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# For support of LHAPATH in cluster mode
+if [ $CLUSTER_LHAPATH ]; then
+  export LHAPATH=$CLUSTER_LHAPATH;
+fi
 if [[ -e MadLoop5_resources.tar.gz && ! -e MadLoop5_resources ]]; then
 tar -xzf MadLoop5_resources.tar.gz
 fi

=== modified file 'Template/LO/SubProcesses/survey.sh'
--- Template/LO/SubProcesses/survey.sh	2015-03-11 19:19:19 +0000
+++ Template/LO/SubProcesses/survey.sh	2015-03-19 03:16:56 +0000
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# For support of LHAPATH in cluster mode
+if [ $CLUSTER_LHAPATH ]; then 
+  export LHAPATH=$CLUSTER_LHAPATH;
+fi
+
 if [[ -e MadLoop5_resources.tar.gz && ! -e MadLoop5_resources ]]; then
 tar -xzf MadLoop5_resources.tar.gz;
 fi

=== removed file 'Template/NLO/Source/PDF/opendata.f'
--- Template/NLO/Source/PDF/opendata.f	2014-05-16 08:09:51 +0000
+++ Template/NLO/Source/PDF/opendata.f	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-      Integer Function NextUnopen()
-c********************************************************************
-C     Returns an unallocated FORTRAN i/o unit.
-c********************************************************************
-
-      Logical EX
-C
-      Do 10 N = 10, 300
-         INQUIRE (UNIT=N, OPENED=EX)
-         If (.NOT. EX) then
-            NextUnopen = N
-            Return
-         Endif
- 10   Continue
-      Stop ' There is no available I/O unit. '
-C               *************************
-      End
-
-
-
-      subroutine OpenData(Tablefile)
-c********************************************************************
-c generic subroutine to open the table files in the right directories
-c********************************************************************
-      implicit none
-c
-      Character Tablefile*(*),up*3,lib*4,dir*8,tempname*100
-      data up,lib,dir/'../','lib/','Pdfdata/'/
-      Integer IU,NextUnopen,i
-      External NextUnopen
-      common/IU/IU
-c
-c--   start
-c
-      IU=NextUnopen()
-
-c     first try in the current directory
-
-      tempname=Tablefile
-      open(IU,file=tempname,status='old',ERR=10)
-      return
-
- 10   tempname=up//Tablefile
-      open(IU,file=tempname,status='old',ERR=20)
-      return
-
- 20   tempname=dir//Tablefile
-      open(IU,file=tempname,status='old',ERR=30)
-      return
-
- 30   tempname=lib//tempname
-      open(IU,file=tempname,status='old',ERR=40)
-
- 40   continue
-      do i=0,6
-         open(IU,file=tempname,status='old',ERR=50)
-         return
- 50      tempname=up//tempname
-         if (i.eq.6)then
-            write(*,*) 'Error: PDF file ',Tablefile,' not found'
-            stop
-         endif
-      enddo
-
-      print*,'table for the pdf NOT found!!!'
-      
-      return
-      end
-

=== modified file 'Template/NLO/SubProcesses/ajob_template'
--- Template/NLO/SubProcesses/ajob_template	2014-10-31 11:06:18 +0000
+++ Template/NLO/SubProcesses/ajob_template	2015-03-19 03:16:56 +0000
@@ -7,6 +7,11 @@
 fi
 }
 
+#Force LHAPATH to be set correctly on cluster
+if [ $CLUSTER_LHAPATH ]; then
+   export LHAPATH=$CLUSTER_LHAPATH;
+fi
+
 tarCounter=0
 while [[ (-f MadLoop5_resources.tar.gz) && (! -f MadLoop5_resources/HelConfigs.dat) && ($tarCounter < 10) ]]; do
     if [[ $tarCounter > 0 ]]; then

=== modified file 'Template/NLO/SubProcesses/reweight_xsec_events.local'
--- Template/NLO/SubProcesses/reweight_xsec_events.local	2012-12-02 22:17:23 +0000
+++ Template/NLO/SubProcesses/reweight_xsec_events.local	2015-03-19 03:16:56 +0000
@@ -3,6 +3,11 @@
 event_file=$1
 save_wgts=$2
 
+# For support of LHAPATH in cluster mode                                                                                                                                                                    
+if [ $CLUSTER_LHAPATH ]; then
+  export LHAPATH=$CLUSTER_LHAPATH;
+fi
+
 if [[ -e ./reweight_xsec_events ]]
 then
     (echo $event_file; echo $save_wgts) | ./reweight_xsec_events > reweight_xsec_events.output

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2015-03-12 08:12:39 +0000
+++ UpdateNotes.txt	2015-03-19 03:16:56 +0000
@@ -1,13 +1,13 @@
 Update notes for MadGraph5_aMC@NLO (in reverse time order)
 
-2.3.0(XX/XX/XX) OM+VH: Adding the possibility to compute cross-section for loop-induced process
+2.3.0(XX/XX/XX) OM+VH: Adding the possibility to compute cross-section/generate events for loop-induced process
 		JB+OM: Addign matchbox output for matching in the Matchbox framework
                 OM: New MultiCore class with better thread support
                 OM+VH: Change the handling of the run_card.
                       - The default value depends now of your running process
                       - cut_decays is now on False by default
                       - nhel can only take 0/1 value. 1 is a real MC over helicity (with importance sampling)
-                      - use_syst is set on by default (but for matching)                      
+                      - use_syst is set on by default (but for matching where it is keep off)                      
                 OM: Cuts are also applied for 1>N processes (but the default run_card doesn't have any cut).     
                 RF: Fixed a bug in the aMCfast/APPLGrid interface introduced in version 2.2.3
 		RF: Fixed a bug in the setting of the integration grids (LO process generation) for the minimum
@@ -20,6 +20,10 @@
                 MZ+RF: Added 'LOonly' asNLO mode to export processes without any real and virtuals 
                        (useful e.g. for higher multiplicities when merging)
 		RF: Added support for the computation of NLO+NNLL jet veto cross sections
+                OM: Possibility to not transfer pdf file to the node for each job. 
+                       This is done via a new option (cluster_local_path) which should contain the pdf set.
+                       This path is intented to point to a node specific filesystem.
+
 
 2.2.3(10/02/15) RF: Re-factoring of the structure of the code for fNLO computations.
                 OM: Fix a bug in MadWeight (correlated param_card was not creating the correct input file)

=== modified file 'VERSION'
--- VERSION	2015-02-10 02:53:57 +0000
+++ VERSION	2015-03-19 03:16:56 +0000
@@ -1,5 +1,6 @@
-version = 2.2.3
-date = 2015-02-10
+version = 2.3.0.beta
+date = 2015-03-01
+
 
 
 

=== modified file 'input/.mg5_configuration_default.txt'
--- input/.mg5_configuration_default.txt	2015-02-09 03:11:19 +0000
+++ input/.mg5_configuration_default.txt	2015-03-19 03:16:56 +0000
@@ -99,6 +99,10 @@
 #!  options didn't modify condor cluster)
 # cluster_temp_path = None
 
+#! path to a node directory where local file can be found (typically pdf)
+#! to avoid to send them to the node (if cluster_temp_path is on True or condor)
+# cluster_local_path = /cvmfs/cp3.uclouvain.be/madgraph/
+
 #! Cluster waiting time for status update 
 #!  First number is when the number of waiting job is higher than the number 
 #!  of running one (time in second). The second number is in the second case.

=== modified file 'madgraph/interface/common_run_interface.py'
--- madgraph/interface/common_run_interface.py	2015-03-09 04:06:53 +0000
+++ madgraph/interface/common_run_interface.py	2015-03-19 03:16:56 +0000
@@ -482,6 +482,7 @@
                        'cluster_type': 'condor',
                        'cluster_status_update': (600, 30),
                        'cluster_nb_retry':1,
+                       'cluster_local_path': "/cvmfs/cp3.uclouvain.be/madgraph/",
                        'cluster_retry_wait':300}
 
     options_madgraph= {'stdout_level':None}
@@ -1286,6 +1287,25 @@
     def get_pdf_input_filename(self):
         """return the name of the file which is used by the pdfset"""
 
+        if self.options["cluster_local_path"] and self.options['run_mode'] ==1:
+            # no need to transfer the pdf.
+            return ''
+        
+        def check_cluster(path):
+            if not self.options["cluster_local_path"] or self.options['run_mode'] !=1:
+                return path
+            main = self.options["cluster_local_path"]
+            if os.path.isfile(path):
+                filename = os.path.basename(path)
+            possible_path = [pjoin(main, filename),
+                             pjoin(main, "lhadpf", filename),
+                             pjoin(main, "Pdfdata", filename)]
+            if any(os.path.exists(p) for p in possible_path):
+                return " "
+            else:
+                return path
+                             
+
         if hasattr(self, 'pdffile') and self.pdffile:
             return self.pdffile
         else:
@@ -1294,11 +1314,15 @@
                 if len(data) < 4:
                     continue
                 if data[1].lower() == self.run_card['pdlabel'].lower():
-                    self.pdffile = pjoin(self.me_dir, 'lib', 'Pdfdata', data[2])
+                    self.pdffile = check_cluster(pjoin(self.me_dir, 'lib', 'Pdfdata', data[2]))
                     return self.pdffile
             else:
                 # possible when using lhapdf
-                self.pdffile = pjoin(self.me_dir, 'lib', 'PDFsets')
+                path = pjoin(self.me_dir, 'lib', 'PDFsets')
+                if os.path.exists(path):
+                    self.pdffile = path
+                else:
+                    self.pdffile = " "
                 return self.pdffile
                 
     def do_quit(self, line):
@@ -1457,6 +1481,7 @@
         """change the way to submit job 0: single core, 1: cluster, 2: multicore"""
 
         self.cluster_mode = run_mode
+        self.options['run_mode'] = run_mode
 
         if run_mode == 2:
             if not self.options['nb_core']:
@@ -1472,13 +1497,14 @@
             self.cluster = cluster.MultiCore(
                              **self.options)
             self.cluster.nb_core = nb_core
-                             #cluster_temp_path=self.options['cluster_temp_path'],
+        #cluster_temp_path=self.options['cluster_temp_path'],
 
         if self.cluster_mode == 1:
             opt = self.options
             cluster_name = opt['cluster_type']
             self.cluster = cluster.from_name[cluster_name](**opt)
 
+
     def check_param_card(self, path, run=True):
         """Check that all the width are define in the param_card.
         If some width are set on 'Auto', call the computation tools."""
@@ -1639,6 +1665,7 @@
         # read the file and extract information
         logger.info('load configuration from %s ' % config_file.name)
         for line in config_file:
+            
             if '#' in line:
                 line = line.split('#',1)[0]
             line = line.replace('\n','').replace('\r\n','')
@@ -1649,7 +1676,7 @@
             else:
                 name = name.strip()
                 value = value.strip()
-                if name.endswith('_path'):
+                if name.endswith('_path') and not name.startswith('cluster'):
                     path = value
                     if os.path.isdir(path):
                         self.options[name] = os.path.realpath(path)
@@ -1668,12 +1695,11 @@
         if not final:
             return self.options # the return is usefull for unittest
 
-
         # Treat each expected input
         # delphes/pythia/... path
         for key in self.options:
             # Final cross check for the path
-            if key.endswith('path'):
+            if key.endswith('path') and not key.startswith("cluster"):
                 path = self.options[key]
                 if path is None:
                     continue
@@ -1692,7 +1718,7 @@
                 self.options[key] = None
             elif key.startswith('cluster') and key != 'cluster_status_update':
                 if key in ('cluster_nb_retry','cluster_wait_retry'):
-                    self.options[key] = int(self.options[key])
+                    self.options[key] = int(self.options[key]) 
                 if hasattr(self,'cluster'):
                     del self.cluster
                 pass
@@ -1709,9 +1735,7 @@
                                    % key)
 
         # Configure the way to open a file:
-        misc.open_file.configure(self.options)
         self.configure_run_mode(self.options['run_mode'])
-
         return self.options
 
     @staticmethod
@@ -1980,9 +2004,44 @@
                 os.mkdir(pdfsets_dir)
             except OSError:
                 pdfsets_dir = pjoin(self.me_dir, 'lib', 'PDFsets')
+        else:
+            #clean previous set of pdf used
+            for name in os.listdir(pdfsets_dir):
+                if name != pdfsetname:
+                    try:
+                        if os.path.isdir(pjoin(pdfsets_dir, name)):
+                            shutil.rmtree(pjoin(pdfsets_dir, name))
+                        else:
+                            os.remove(pjoin(pdfsets_dir, name))
+                    except Exception, error:
+                        logger.debug('%s', error)
+        
+        lhapdf_cluster_possibilities = [self.options["cluster_local_path"],
+                                      pjoin(self.options["cluster_local_path"], "lhapdf"),
+                                      pjoin(self.options["cluster_local_path"], "lhapdf", "pdfsets"),
+                                      pjoin(self.options["cluster_local_path"], "..", "lhapdf"),
+                                      pjoin(self.options["cluster_local_path"], "..", "lhapdf", "pdfsets"),
+                                      pjoin(self.options["cluster_local_path"], "..", "lhapdf","pdfsets", "6.1")
+                                      ]
+        
+        # Check if we need to copy the pdf
+        if self.options["cluster_local_path"] and self.options["run_mode"] == 1 and \
+            any((os.path.exists(pjoin(d, pdfsetname)) for d in lhapdf_cluster_possibilities)):
 
+            os.environ["LHAPATH"] = [d for d in lhapdf_cluster_possibilities if os.path.exists(pjoin(d, pdfsetname))][0]
+            os.environ["CLUSTER_LHAPATH"] = os.environ["LHAPATH"]
+            # no need to copy it
+            if os.path.exists(pjoin(pdfsets_dir, pdfsetname)):
+                try:
+                    if os.path.isdir(pjoin(pdfsets_dir, name)):
+                        shutil.rmtree(pjoin(pdfsets_dir, name))
+                    else:
+                        os.remove(pjoin(pdfsets_dir, name))
+                except Exception, error:
+                    logger.debug('%s', error)
+        
         #check that the pdfset is not already there
-        if not os.path.exists(pjoin(self.me_dir, 'lib', 'PDFsets', pdfsetname)) and \
+        elif not os.path.exists(pjoin(self.me_dir, 'lib', 'PDFsets', pdfsetname)) and \
            not os.path.isdir(pjoin(self.me_dir, 'lib', 'PDFsets', pdfsetname)):
 
             if pdfsetname and not os.path.exists(pjoin(pdfsets_dir, pdfsetname)):
@@ -1993,7 +2052,6 @@
             elif os.path.exists(pjoin(os.path.dirname(pdfsets_dir), pdfsetname)):
                 files.cp(pjoin(os.path.dirname(pdfsets_dir), pdfsetname), pjoin(self.me_dir, 'lib', 'PDFsets'))
             
-
     def install_lhapdf_pdfset(self, pdfsets_dir, filename):
         """idownloads and install the pdfset filename in the pdfsets_dir"""
         lhapdf_version = self.get_lhapdf_version()

=== modified file 'madgraph/interface/madevent_interface.py'
--- madgraph/interface/madevent_interface.py	2015-03-12 23:21:23 +0000
+++ madgraph/interface/madevent_interface.py	2015-03-19 03:16:56 +0000
@@ -1653,15 +1653,17 @@
         
         super(MadEventCmd,self).set_configuration(amcatnlo=amcatnlo, 
                                                             final=final, **opt)
+
         if not final:
             return self.options # the return is usefull for unittest
 
+
         # Treat each expected input
         # delphes/pythia/... path
         # ONLY the ONE LINKED TO Madevent ONLY!!!
         for key in (k for k in self.options if k.endswith('path')):
             path = self.options[key]
-            if path is None:
+            if path is None or key.startswith("cluster"):
                 continue
             if not os.path.isdir(path):
                 path = pjoin(self.me_dir, self.options[key])

=== modified file 'madgraph/interface/madgraph_interface.py'
--- madgraph/interface/madgraph_interface.py	2015-03-11 09:51:21 +0000
+++ madgraph/interface/madgraph_interface.py	2015-03-19 03:16:56 +0000
@@ -2470,6 +2470,7 @@
                        'applgrid':'applgrid-config',
                        'amcfast':'amcfast-config',
                        'cluster_temp_path':None,
+                       'cluster_local_path': '/cvmfs/cp3.uclouvain.be/madgraph/',
                        'OLP': 'MadLoop',
                        'cluster_nb_retry':1,
                        'cluster_retry_wait':300,
@@ -5212,7 +5213,6 @@
                         self.history.append('set %s %s' % (key, self.options[key]))
         # Configure the way to open a file:
         launch_ext.open_file.configure(self.options)
-
         return self.options
 
     def check_for_export_dir(self, filepath):
@@ -5744,6 +5744,9 @@
                          'cluster_retry_wait', 'cluster_size']:
                 self.options[args[0]] = int(args[1])
 
+        elif args[0] in ['cluster_local_path']:
+            self.options[args[0]] = args[1].strip()
+
         elif args[0] == 'cluster_status_update':
             if '(' in args[1]:
                 data = ' '.join([a for a in args[1:] if not a.startswith('-')])

=== modified file 'madgraph/iolibs/export_fks.py'
--- madgraph/iolibs/export_fks.py	2015-03-12 08:12:39 +0000
+++ madgraph/iolibs/export_fks.py	2015-03-19 03:16:56 +0000
@@ -73,6 +73,7 @@
         dir_path = self.dir_path
         clean =self.opt['clean']
         
+        
         #First copy the full template tree if dir_path doesn't exit
         if not os.path.isdir(dir_path):
             if not mgme_dir:
@@ -191,6 +192,9 @@
         # Copy the different python files in the Template
         self.copy_python_files()
 
+        # We need to create the correct open_data for the pdf
+        self.write_pdf_opendata()
+        
     # I put it here not in optimized one, because I want to use the same makefile_loop.inc
     # Also, we overload this function (i.e. it is already defined in 
     # LoopProcessExporterFortranSA) because the path of the template makefile
@@ -3151,6 +3155,11 @@
 
         self.copy_python_files()
 
+
+        # We need to create the correct open_data for the pdf
+        self.write_pdf_opendata()
+
+
         # Return to original PWD
         os.chdir(cwd)
         

=== modified file 'madgraph/iolibs/export_v4.py'
--- madgraph/iolibs/export_v4.py	2015-03-05 00:14:16 +0000
+++ madgraph/iolibs/export_v4.py	2015-03-19 03:16:56 +0000
@@ -229,6 +229,11 @@
         files.cp(pjoin(MG5DIR,'vendor', 'DiscreteSampler', 'StringCast.f'), 
                  pjoin(self.dir_path, 'Source'))
         
+        # We need to create the correct open_data for the pdf
+        self.write_pdf_opendata()
+        
+        
+        
             
     #===========================================================================
     # write a procdef_mg5 (an equivalent of the MG4 proc_card.dat)
@@ -298,6 +303,67 @@
         pass
 
     #===========================================================================
+    # write_pdf_opendata
+    #===========================================================================
+    def write_pdf_opendata(self):
+        """ modify the pdf opendata file, to allow direct access to cluster node
+        repository if configure"""
+        
+        if not self.opt["cluster_local_path"]:
+            changer = {"pdf_systemwide": ""}
+        else: 
+            to_add = """
+            tempname='%(path)s'//Tablefile
+            open(IU,file=tempname,status='old',ERR=1)
+            return
+ 1          tempname='%(path)s/Pdfdata/'//Tablefile
+            open(IU,file=tempname,status='old',ERR=2)
+            return
+ 2          tempname='%(path)s/lhapdf'//Tablefile
+            open(IU,file=tempname,status='old',ERR=3)
+            return            
+ 3          tempname='%(path)s/../lhapdf/pdfsets/'//Tablefile
+            open(IU,file=tempname,status='old',ERR=4)
+            return              
+ 4          tempname='%(path)s/../lhapdf/pdfsets/6.1/'//Tablefile
+            open(IU,file=tempname,status='old',ERR=10)
+            return  
+            """ % {"path" : self.opt["cluster_local_path"]}
+            
+            changer = {"pdf_systemwide": to_add}
+
+        ff = open(pjoin(self.dir_path, "Source", "PDF", "opendata.f"),"w")
+        template = open(pjoin(MG5DIR, "madgraph", "iolibs", "template_files", "pdf_opendata.f"),"r").read()
+        ff.write(template % changer)
+        
+        # Do the same for lhapdf set
+        if not self.opt["cluster_local_path"]:
+            changer = {"cluster_specific_path": ""}
+        else:
+            to_add="""
+         LHAPath='%(path)s/PDFsets'
+         Inquire(File=LHAPath, exist=exists)
+         if(exists)return        
+         LHAPath='%(path)s/../lhapdf/pdfsets/6.1/'
+         Inquire(File=LHAPath, exist=exists)
+         if(exists)return
+         LHAPath='%(path)s/../lhapdf/pdfsets/'
+         Inquire(File=LHAPath, exist=exists)
+         if(exists)return  
+         LHAPath='./PDFsets'            
+         """ % {"path" : self.opt["cluster_local_path"]}
+            changer = {"cluster_specific_path": to_add}
+
+        ff = open(pjoin(self.dir_path, "Source", "PDF", "pdfwrap_lhapdf.f"),"w")
+        template = open(pjoin(MG5DIR, "madgraph", "iolibs", "template_files", "pdf_wrap_lhapdf.f"),"r").read()
+        ff.write(template % changer)
+        
+        
+        return
+
+
+
+    #===========================================================================
     # write_maxparticles_file
     #===========================================================================
     def write_maxparticles_file(self, writer, matrix_elements):
@@ -5905,6 +5971,8 @@
 
     group_subprocesses = cmd.options['group_subprocesses']
 
+    opt = cmd.options
+
     # First treat the MadLoop5 standalone case       
     MadLoop_SA_options = {'clean': not noclean, 
       'complex_mass':cmd.options['complex_mass_scheme'],
@@ -5944,7 +6012,8 @@
     elif output_type=='amcatnlo':
         import madgraph.iolibs.export_fks as export_fks
         ExporterClass=None
-        amcatnlo_options = MadLoop_SA_options
+        amcatnlo_options = dict(opt)
+        amcatnlo_options.update(MadLoop_SA_options)
         amcatnlo_options['mp'] = len(cmd._fks_multi_proc.get_virt_amplitudes()) > 0
         if not cmd.options['loop_optimized_output']:
             logger.info("Writing out the aMC@NLO code")
@@ -5968,19 +6037,21 @@
 
         assert group_subprocesses in [True, False]
         
-        opt = {'clean': not noclean,
+        opt = dict(opt)
+        opt.update({'clean': not noclean,
                'complex_mass': cmd.options['complex_mass_scheme'],
                'export_format':cmd._export_format,
                'mp': False,  
                'sa_symmetry':False, 
-               'model': cmd._curr_model.get('name') }
+               'model': cmd._curr_model.get('name') })
 
         format = cmd._export_format #shortcut
 
         if format in ['standalone_msP', 'standalone_msF', 'standalone_rw']:
             opt['sa_symmetry'] = True        
     
-        loop_induced_opt = MadLoop_SA_options
+        loop_induced_opt = dict(opt)
+        loop_induced_opt.update(MadLoop_SA_options)
         loop_induced_opt['export_format'] = 'madloop_optimized'
         loop_induced_opt['SubProc_prefix'] = 'PV'
         # For loop_induced output with MadEvent, we must have access to the 

=== modified file 'madgraph/iolibs/template_files/madevent_combine_events.f'
--- madgraph/iolibs/template_files/madevent_combine_events.f	2015-03-07 01:00:32 +0000
+++ madgraph/iolibs/template_files/madevent_combine_events.f	2015-03-19 03:16:56 +0000
@@ -87,7 +87,7 @@
       endif
 c   Get information for the <init> block
       param_card_name = '%(param_card_name)s'
-      call setrun
+c      call setrun
 
 c      nreq = 10000
 c

=== modified file 'madgraph/iolibs/template_files/madevent_makefile_source'
--- madgraph/iolibs/template_files/madevent_makefile_source	2015-02-24 23:12:53 +0000
+++ madgraph/iolibs/template_files/madevent_makefile_source	2015-03-19 03:16:56 +0000
@@ -17,7 +17,7 @@
           rw_events.o rw_routines.o kin_functions.o open_file.o basecode.o setrun.o \
           run_printout.o dgauss.o readgrid.o getissud.o
 INCLUDEF= coupl.inc genps.inc hbook.inc DECAY/decay.inc psample.inc cluster.inc sudgrid.inc
-COMBINE = combine_events.o  rw_events.o ranmar.o  kin_functions.o open_file.o rw_routines.o alfas_functions.o setrun.o
+COMBINE = combine_events.o  rw_events.o ranmar.o  kin_functions.o open_file.o rw_routines.o
 GENSUDGRID = gensudgrid.o is-sud.o setrun_gen.o rw_routines.o open_file.o
 
 # Locally compiled libraries
@@ -50,8 +50,8 @@
 
 $(BINDIR)gen_ximprove: gen_ximprove.o ranmar.o rw_routines.o open_file.o 
 	$(FC) $(FFLAGS) -o $@ $^
-$(BINDIR)combine_events: $(COMBINE) $(LIBDIR)libmodel.$(libext) $(LIBDIR)libpdf.$(libext) run_card.inc
-	$(FC) $(FFLAGS) -o $@ $(COMBINE) -L$(LIBDIR) -lmodel -lpdf $(lhapdf)
+$(BINDIR)combine_events: $(COMBINE)  run_card.inc
+	$(FC) $(FFLAGS) -o $@ $(COMBINE)
 $(BINDIR)gensudgrid: $(GENSUDGRID) $(LIBDIR)libpdf.$(libext) $(LIBDIR)libcernlib.$(libext)
 	$(FC) $(FFLAGS) -o $@ $(GENSUDGRID) -L$(LIBDIR) -lmodel -lpdf -lcernlib $(lhapdf)
 

=== renamed file 'Template/LO/Source/PDF/opendata.f' => 'madgraph/iolibs/template_files/pdf_opendata.f'
--- Template/LO/Source/PDF/opendata.f	2014-02-23 03:15:09 +0000
+++ madgraph/iolibs/template_files/pdf_opendata.f	2015-03-19 03:16:56 +0000
@@ -34,8 +34,11 @@
 c
       IU=NextUnopen()
 
-c     first try in the current directory (for cluster use)
-      tempname=Tablefile
+c     First try system wide (for cluster if define)
+      %(pdf_systemwide)s
+
+c     Then try in the current directory (for cluster use)
+ 5    tempname=Tablefile
       open(IU,file=tempname,status='old',ERR=10)
       return
 

=== renamed file 'Template/NLO/Source/PDF/pdfwrap_lhapdf.f' => 'madgraph/iolibs/template_files/pdf_wrap_lhapdf.f'
--- Template/NLO/Source/PDF/pdfwrap_lhapdf.f	2012-11-07 02:20:18 +0000
+++ madgraph/iolibs/template_files/pdf_wrap_lhapdf.f	2015-03-19 03:16:56 +0000
@@ -43,10 +43,12 @@
       logical exists
       integer i
 
+
 c     first try in the current directory
       LHAPath='./PDFsets'
       Inquire(File=LHAPath, exist=exists)
       if(exists)return
+      %(cluster_specific_path)s
       do i=1,6
          LHAPath=up//LHAPath
          Inquire(File=LHAPath, exist=exists)

=== modified file 'madgraph/madevent/gen_crossxhtml.py'
--- madgraph/madevent/gen_crossxhtml.py	2015-03-06 18:09:36 +0000
+++ madgraph/madevent/gen_crossxhtml.py	2015-03-19 03:16:56 +0000
@@ -912,9 +912,12 @@
                 elif exists(pjoin(self.me_dir, 'Events', self['run_name'], 'events.lhe')) or\
                   exists(pjoin(self.me_dir, 'Events', self['run_name'], 'events.lhe.gz')):
                     link = './Events/%(run_name)s/events.lhe'
-                level = 'parton'
-                name = 'LHE'
-                out += self.special_link(link, level, name) 
+                else:
+                    link = None
+                if link:
+                    level = 'parton'
+                    name = 'LHE'
+                    out += self.special_link(link, level, name) 
             if 'root' in self.parton:
                 out += ' <a href="./Events/%(run_name)s/unweighted_events.root">rootfile</a>'
             if 'plot' in self.parton:

=== modified file 'madgraph/various/lhe_parser.py'
--- madgraph/various/lhe_parser.py	2015-03-12 23:21:23 +0000
+++ madgraph/various/lhe_parser.py	2015-03-19 03:16:56 +0000
@@ -720,7 +720,7 @@
             try:
                 self.reweight_data = dict([(pid, float(value)) for (pid, value) in data
                                            if not self.reweight_order.append(pid)])
-            # the if is to create the order file on the flight
+                                      # the if is to create the order file on the flight
             except ValueError, error:
                 raise Exception, 'Event File has unvalid weight. %s' % error
             self.tag = self.tag[:start] + self.tag[stop+7:]

=== modified file 'madgraph/various/process_checks.py'
--- madgraph/various/process_checks.py	2015-03-10 23:52:32 +0000
+++ madgraph/various/process_checks.py	2015-03-19 03:16:56 +0000
@@ -718,6 +718,8 @@
 
         for key, value in MLOptions.items():
             if key == "MLReductionLib":
+                if isinstance(value, int):
+                    ml_reds = str(value)
                 if isinstance(value,list):
                     if len(value)==0:
                         ml_reds = '1'