Merge lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/2.1.2

Proposed by marco zaro on 2014-04-28
Status: Rejected
Rejected by: marco zaro on 2014-08-20
Proposed branch: lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6
Merge into: lp:~maddevelopers/mg5amcnlo/2.1.2
Diff against target: 151 lines (+28/-43)
5 files modified
Template/NLO/SubProcesses/ajob_template (+0/-1)
UpdateNotes.txt (+2/-1)
madgraph/interface/amcatnlo_run_interface.py (+0/-6)
madgraph/interface/common_run_interface.py (+25/-33)
madgraph/interface/madevent_interface.py (+1/-2)
To merge this branch: bzr merge lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6
Reviewer Review Type Date Requested Status
Olivier Mattelaer 2014-04-28 Needs Fixing on 2014-06-30
Review via email: mp+217497@code.launchpad.net

Description of the change

try again...

To post a comment you must log in.
265. By Marco Zaro <email address hidden> on 2014-06-10

merged with 2.1.2 r 291

266. By Marco Zaro <email address hidden> on 2014-06-11

fixed lhapdf related commands not to copy a pdf set if it exists

marco zaro (marco-zaro) wrote :

Hi all (in particular Paolo & Olivier),
I have fixed one problem which made the code crash before the shower.
Paolo, can you please look at the shower stage, as I get a compilation error related to jimmy:
../srcHerwig/jimmy.f:4624: Error: Can't open included file 'jimmy.inc'
make: *** [/nfs/scratch/fynu/mzaro/2.1.2-lhapdf6/PROCNLO_loop_sm_0/MCatNLO/objects/jimmy.o] Error 1

Olivier, have you tried if madevent works with lhapdf6?

We should try to merge it in the main trunk before releasing 2.1.2

Cheers,

Marco

Hi Marco,

I fail to install (any) lhapdf version on my computer …
So I can’t test this. I will retry to compile properly root/lhapdf/… soon but this will not be before at least two weeks.

Cheers,

Olivier
On Jun 11, 2014, at 8:20 AM, marco zaro <email address hidden> wrote:

> Hi all (in particular Paolo & Olivier),
> I have fixed one problem which made the code crash before the shower.
> Paolo, can you please look at the shower stage, as I get a compilation error related to jimmy:
> ../srcHerwig/jimmy.f:4624: Error: Can't open included file 'jimmy.inc'
> make: *** [/nfs/scratch/fynu/mzaro/2.1.2-lhapdf6/PROCNLO_loop_sm_0/MCatNLO/objects/jimmy.o] Error 1
>
> Olivier, have you tried if madevent works with lhapdf6?
>
> We should try to merge it in the main trunk before releasing 2.1.2
>
> Cheers,
>
> Marco
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> Your team MadDevelopers is requested to review the proposed merge of lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/2.1.2.

marco zaro (marco-zaro) wrote :

Hi Olivier,
indeed compiling lhapdf 6 on a mac is a real pain.
On the louvain cluster it works, though.
Cheers,

Marco

On 11 Jun 2014, at 11:39, Olivier Mattelaer <email address hidden> wrote:

> Hi Marco,
>
> I fail to install (any) lhapdf version on my computer …
> So I can’t test this. I will retry to compile properly root/lhapdf/… soon but this will not be before at least two weeks.
>
> Cheers,
>
> Olivier
> On Jun 11, 2014, at 8:20 AM, marco zaro <email address hidden> wrote:
>
>> Hi all (in particular Paolo & Olivier),
>> I have fixed one problem which made the code crash before the shower.
>> Paolo, can you please look at the shower stage, as I get a compilation error related to jimmy:
>> ../srcHerwig/jimmy.f:4624: Error: Can't open included file 'jimmy.inc'
>> make: *** [/nfs/scratch/fynu/mzaro/2.1.2-lhapdf6/PROCNLO_loop_sm_0/MCatNLO/objects/jimmy.o] Error 1
>>
>> Olivier, have you tried if madevent works with lhapdf6?
>>
>> We should try to merge it in the main trunk before releasing 2.1.2
>>
>> Cheers,
>>
>> Marco
>> --
>> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
>> Your team MadDevelopers is requested to review the proposed merge of lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/2.1.2.
>
>
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> Your team MadDevelopers is requested to review the proposed merge of lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/2.1.2.

Valentin Hirschi (valentin-hirschi) wrote :

Hi,

I have lhapdf 6 insallted on my mac, so I went on an tried but then it
looked like MG5_aMC can only do 6.1+ and I had 6.0.4. So I'll try to
install 6.1 and let you know.

Cheers

On Wed, Jun 11, 2014 at 3:45 AM, marco zaro <email address hidden> wrote:

> Hi Olivier,
> indeed compiling lhapdf 6 on a mac is a real pain.
> On the louvain cluster it works, though.
> Cheers,
>
> Marco
>
> On 11 Jun 2014, at 11:39, Olivier Mattelaer <
> <email address hidden>> wrote:
>
> > Hi Marco,
> >
> > I fail to install (any) lhapdf version on my computer …
> > So I can’t test this. I will retry to compile properly root/lhapdf/…
> soon but this will not be before at least two weeks.
> >
> > Cheers,
> >
> > Olivier
> > On Jun 11, 2014, at 8:20 AM, marco zaro <email address hidden> wrote:
> >
> >> Hi all (in particular Paolo & Olivier),
> >> I have fixed one problem which made the code crash before the shower.
> >> Paolo, can you please look at the shower stage, as I get a compilation
> error related to jimmy:
> >> ../srcHerwig/jimmy.f:4624: Error: Can't open included file 'jimmy.inc'
> >> make: ***
> [/nfs/scratch/fynu/mzaro/2.1.2-lhapdf6/PROCNLO_loop_sm_0/MCatNLO/objects/jimmy.o]
> Error 1
> >>
> >> Olivier, have you tried if madevent works with lhapdf6?
> >>
> >> We should try to merge it in the main trunk before releasing 2.1.2
> >>
> >> Cheers,
> >>
> >> Marco
> >> --
> >>
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> >> Your team MadDevelopers is requested to review the proposed merge of
> lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/
> 2.1.2.
> >
> >
> > --
> >
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> > Your team MadDevelopers is requested to review the proposed merge of
> lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/
> 2.1.2.
>
>
> --
>
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> Your team MadDevelopers is requested to review the proposed merge of
> lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/
> 2.1.2.
>

--
Valentin

Valentin Hirschi (valentin-hirschi) wrote :

Hi,

I could install lhapdf v. 6.1.2 and this branch runs fine with it. I
checked that I got the same result and PDF scale variation with lhapdf
v5.9.1 (ran both from this new branch and the 2.1.2 trunk) and the v6.1.2
(ran from this branch only of course).
So it all looks good!

Cheers,

On Wed, Jun 11, 2014 at 9:06 AM, Valentin Hirschi <
<email address hidden>> wrote:

> Hi,
>
> I have lhapdf 6 insallted on my mac, so I went on an tried but then it
> looked like MG5_aMC can only do 6.1+ and I had 6.0.4. So I'll try to
> install 6.1 and let you know.
>
> Cheers
>
>
> On Wed, Jun 11, 2014 at 3:45 AM, marco zaro <email address hidden> wrote:
>
> > Hi Olivier,
> > indeed compiling lhapdf 6 on a mac is a real pain.
> > On the louvain cluster it works, though.
> > Cheers,
> >
> > Marco
> >
> > On 11 Jun 2014, at 11:39, Olivier Mattelaer <
> > <email address hidden>> wrote:
> >
> > > Hi Marco,
> > >
> > > I fail to install (any) lhapdf version on my computer …
> > > So I can’t test this. I will retry to compile properly root/lhapdf/…
> > soon but this will not be before at least two weeks.
> > >
> > > Cheers,
> > >
> > > Olivier
> > > On Jun 11, 2014, at 8:20 AM, marco zaro <email address hidden> wrote:
> > >
> > >> Hi all (in particular Paolo & Olivier),
> > >> I have fixed one problem which made the code crash before the shower.
> > >> Paolo, can you please look at the shower stage, as I get a compilation
> > error related to jimmy:
> > >> ../srcHerwig/jimmy.f:4624: Error: Can't open included file 'jimmy.inc'
> > >> make: ***
> >
> [/nfs/scratch/fynu/mzaro/2.1.2-lhapdf6/PROCNLO_loop_sm_0/MCatNLO/objects/jimmy.o]
> > Error 1
> > >>
> > >> Olivier, have you tried if madevent works with lhapdf6?
> > >>
> > >> We should try to merge it in the main trunk before releasing 2.1.2
> > >>
> > >> Cheers,
> > >>
> > >> Marco
> > >> --
> > >>
> >
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> > >> Your team MadDevelopers is requested to review the proposed merge of
> > lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into
> lp:~maddevelopers/mg5amcnlo/
> > 2.1.2.
> > >
> > >
> > > --
> > >
> >
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> > > Your team MadDevelopers is requested to review the proposed merge of
> > lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into
> lp:~maddevelopers/mg5amcnlo/
> > 2.1.2.
> >
> >
> > --
> >
> >
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> > Your team MadDevelopers is requested to review the proposed merge of
> > lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into
> lp:~maddevelopers/mg5amcnlo/
> > 2.1.2.
> >
>
>
>
> --
> Valentin
>
>
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> Your team MadDevelopers is requested to review the proposed merge of
> lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/
> 2.1.2.
>

--
Valentin

Paolo Torrielli (paolo-torrielli) wrote :

Hi Marco,
I cannot reproduce your error.
If I download the latest version
of 2.1.2-lhapdf6 branch it just
goes smooth for me.
Cheers.
Paolo

On 11 Jun 2014, at 09:20, marco zaro <email address hidden> wrote:

> Hi all (in particular Paolo & Olivier),
> I have fixed one problem which made the code crash before the shower.
> Paolo, can you please look at the shower stage, as I get a compilation error related to jimmy:
> ../srcHerwig/jimmy.f:4624: Error: Can't open included file 'jimmy.inc'
> make: *** [/nfs/scratch/fynu/mzaro/2.1.2-lhapdf6/PROCNLO_loop_sm_0/MCatNLO/objects/jimmy.o] Error 1
>
> Olivier, have you tried if madevent works with lhapdf6?
>
> We should try to merge it in the main trunk before releasing 2.1.2
>
> Cheers,
>
> Marco
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> Your team MadDevelopers is requested to review the proposed merge of lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/2.1.2.

marco zaro (marco-zaro) wrote :

did you try it on linux?

Marco Zaro

On Thu, Jun 12, 2014 at 12:42 AM, Paolo Torrielli <email address hidden>
wrote:

> Hi Marco,
> I cannot reproduce your error.
> If I download the latest version
> of 2.1.2-lhapdf6 branch it just
> goes smooth for me.
> Cheers.
> Paolo
>
>
> On 11 Jun 2014, at 09:20, marco zaro <email address hidden> wrote:
>
> > Hi all (in particular Paolo & Olivier),
> > I have fixed one problem which made the code crash before the shower.
> > Paolo, can you please look at the shower stage, as I get a compilation
> error related to jimmy:
> > ../srcHerwig/jimmy.f:4624: Error: Can't open included file 'jimmy.inc'
> > make: ***
> [/nfs/scratch/fynu/mzaro/2.1.2-lhapdf6/PROCNLO_loop_sm_0/MCatNLO/objects/jimmy.o]
> Error 1
> >
> > Olivier, have you tried if madevent works with lhapdf6?
> >
> > We should try to merge it in the main trunk before releasing 2.1.2
> >
> > Cheers,
> >
> > Marco
> > --
> >
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> > Your team MadDevelopers is requested to review the proposed merge of
> lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/
> 2.1.2.
>
>
> --
>
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> Your team MadDevelopers is requested to review the proposed merge of
> lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/
> 2.1.2.
>

Rikkert Frederix (frederix) wrote :

Hi guys,

It's probably that MacOSX is case insensitive, while Linux is case-sensitive. So, please get your capital letters in JIMMY.INC or jimmy.inc right.

Cheers,
Rik

267. By Marco Zaro <email address hidden> on 2014-06-12

fixed case in srcHerwig/jimmy.f

marco zaro (marco-zaro) wrote :

Hi,
i have fixed jimmy.f (thanks Paolo!) in this branch and in 2.1.2.
The shower now works fine.
Cheers,

Marco

On 12 Jun 2014, at 09:30, Rikkert Frederix <email address hidden> wrote:

> Hi guys,
>
> It's probably that MacOSX is case insensitive, while Linux is case-sensitive. So, please get your capital letters in JIMMY.INC or jimmy.inc right.
>
> Cheers,
> Rik
>
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> Your team MadDevelopers is requested to review the proposed merge of lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/2.1.2.

268. By Marco Zaro <email address hidden> on 2014-06-17

merged with 2.1.2 r301

269. By Marco Zaro <email address hidden> on 2014-06-19

imerged with 2.1.2 r304

------------- th 2.1.2This line and the following will be ignored --------------

modified:
  Template/LO/Source/PDF/pdf_lhapdf.f
  Template/NLO/MCatNLO/srcCommon/myfastjetfortran.cc
  Template/NLO/Source/PDF/pdf_lhapdf.f
  Template/NLO/SubProcesses/cuts.f
  Template/NLO/SubProcesses/fastjet_wrapper.f
  Template/NLO/SubProcesses/fastjetfortran_madfks_core.cc
  Template/NLO/SubProcesses/fastjetfortran_madfks_full.cc
  madgraph/various/cluster.py
unknown:
  --auto
  ME5_debug@
  PROCNLO_loop_sm_0/
  PROCNLO_loop_sm_1/
  PROC_sm_0/
  additional_command
  py.py
  input/mg5_configuration.txt
  models/loop_sm/model.pkl
  models/sm/model.pkl
  vendor/CutTools/includects/
  vendor/StdHEP/log.mcfio.5938
  vendor/StdHEP/log.stdhep.6496
pending merges:
  Marco Zaro 2014-06-19 fix to push 300
    Marco Zaro 2014-06-19 [merge] merged with 2.1.2-fastjet-eta
    Marco Zaro 2014-06-18 compilation errors fixed in
    Marco Zaro 2014-06-17 the fastjet functions now can directly return tje jets within etamax.
    Rikkert Frederix 2014-06-18 [merge] To be sure to have a correct termination when running on a cluster,
    Rikkert Frederix 2014-06-17 To determine if a cluster run finished correctly, also check that the

270. By Marco Zaro <email address hidden> on 2014-06-19

fix in the madevent interface, lhapdf6 should be working for LO as well

marco zaro (marco-zaro) wrote :

Ciao Olivier,
i have changed two lines in the madevent_interface.py (now lhapdf is handled exactly as for NLO runs), it looks like it is working now.
Can you please check?
Thanks a lot!
Cheers,

Marco

Michael Spannowsky try to use lhapdf5 file with this version:

Getting sets from http://www.hepforge.org/archive/lhapdf/pdfsets/current
Installing sets to /Users/mike/Physik/tools/lhapdf589Install/share/lhapdf/PDFsets
Getting PDF set from 'http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf'
INFO: cteq6ll.LHpdf successfully downloaded and stored in /Users/mike/Physik/tools/lhapdf589Install/share/lhapdf/PDFsets
Error detected in "generate_events "
write debug file /Users/mike/Physik/tools/2.1.2-lhapdf6/2jets/run_01_tag_1_debug.log
If you need help with this issue please contact us on https://answers.launchpad.net/madgraph5
MadGraph5Error : A compilation Error occurs when trying to compile /Users/mike/Physik/tools/2.1.2-lhapdf6/2jets/Source.
 The compilation fails with the following output message:
     gfortran -O -w -fbounds-check -ffixed-line-length-132 -c -o combine_events.o combine_events.f
     gfortran -O -w -fbounds-check -ffixed-line-length-132 -c -o alfas_functions.o alfas_functions.f
     gfortran -O -w -fbounds-check -ffixed-line-length-132 -o ../bin/internal/combine_events combine_events.o rw_events.o ranmar.o kin_functions.o open_file.o rw_routines.o alfas_functions.o setrun.o -L../lib/ -lmodel -lpdf -lLHAPDF -lstdc++
     Undefined symbols for architecture x86_64:
       "std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::__init(char const*, unsigned long)", referenced from:
           _getprefixpath_ in libLHAPDF.a(getdatapath.o)

He is trying now with lhapdf6

Cheers,

Olivier

review: Needs Fixing
marco zaro (marco-zaro) wrote :

I think this is a problem related with clang or, in any case the C compiler used for compiling lhapdf6.
Cheers,

Marco

On 30 Jun 2014, at 15:44, Olivier Mattelaer <email address hidden> wrote:

> Review: Needs Fixing
>
> Michael Spannowsky try to use lhapdf5 file with this version:
>
> Getting sets from http://www.hepforge.org/archive/lhapdf/pdfsets/current
> Installing sets to /Users/mike/Physik/tools/lhapdf589Install/share/lhapdf/PDFsets
> Getting PDF set from 'http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf'
> INFO: cteq6ll.LHpdf successfully downloaded and stored in /Users/mike/Physik/tools/lhapdf589Install/share/lhapdf/PDFsets
> Error detected in "generate_events "
> write debug file /Users/mike/Physik/tools/2.1.2-lhapdf6/2jets/run_01_tag_1_debug.log
> If you need help with this issue please contact us on https://answers.launchpad.net/madgraph5
> MadGraph5Error : A compilation Error occurs when trying to compile /Users/mike/Physik/tools/2.1.2-lhapdf6/2jets/Source.
> The compilation fails with the following output message:
> gfortran -O -w -fbounds-check -ffixed-line-length-132 -c -o combine_events.o combine_events.f
> gfortran -O -w -fbounds-check -ffixed-line-length-132 -c -o alfas_functions.o alfas_functions.f
> gfortran -O -w -fbounds-check -ffixed-line-length-132 -o ../bin/internal/combine_events combine_events.o rw_events.o ranmar.o kin_functions.o open_file.o rw_routines.o alfas_functions.o setrun.o -L../lib/ -lmodel -lpdf -lLHAPDF -lstdc++
> Undefined symbols for architecture x86_64:
> "std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::__init(char const*, unsigned long)", referenced from:
> _getprefixpath_ in libLHAPDF.a(getdatapath.o)
>
> He is trying now with lhapdf6
>
> Cheers,
>
> Olivier
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> Your team MadDevelopers is subscribed to branch lp:~maddevelopers/mg5amcnlo/2.1.2.

No this is for lhapdf5!

o.
On Jun 30, 2014, at 2:48 PM, marco zaro <email address hidden> wrote:

> I think this is a problem related with clang or, in any case the C compiler used for compiling lhapdf6.
> Cheers,
>
> Marco
>
> On 30 Jun 2014, at 15:44, Olivier Mattelaer <email address hidden> wrote:
>
>> Review: Needs Fixing
>>
>> Michael Spannowsky try to use lhapdf5 file with this version:
>>
>> Getting sets from http://www.hepforge.org/archive/lhapdf/pdfsets/current
>> Installing sets to /Users/mike/Physik/tools/lhapdf589Install/share/lhapdf/PDFsets
>> Getting PDF set from 'http://www.hepforge.org/archive/lhapdf/pdfsets/current/cteq6ll.LHpdf'
>> INFO: cteq6ll.LHpdf successfully downloaded and stored in /Users/mike/Physik/tools/lhapdf589Install/share/lhapdf/PDFsets
>> Error detected in "generate_events "
>> write debug file /Users/mike/Physik/tools/2.1.2-lhapdf6/2jets/run_01_tag_1_debug.log
>> If you need help with this issue please contact us on https://answers.launchpad.net/madgraph5
>> MadGraph5Error : A compilation Error occurs when trying to compile /Users/mike/Physik/tools/2.1.2-lhapdf6/2jets/Source.
>> The compilation fails with the following output message:
>> gfortran -O -w -fbounds-check -ffixed-line-length-132 -c -o combine_events.o combine_events.f
>> gfortran -O -w -fbounds-check -ffixed-line-length-132 -c -o alfas_functions.o alfas_functions.f
>> gfortran -O -w -fbounds-check -ffixed-line-length-132 -o ../bin/internal/combine_events combine_events.o rw_events.o ranmar.o kin_functions.o open_file.o rw_routines.o alfas_functions.o setrun.o -L../lib/ -lmodel -lpdf -lLHAPDF -lstdc++
>> Undefined symbols for architecture x86_64:
>> "std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::__init(char const*, unsigned long)", referenced from:
>> _getprefixpath_ in libLHAPDF.a(getdatapath.o)
>>
>> He is trying now with lhapdf6
>>
>> Cheers,
>>
>> Olivier
>> --
>> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
>> Your team MadDevelopers is subscribed to branch lp:~maddevelopers/mg5amcnlo/2.1.2.
>
>
> --
> https://code.launchpad.net/~maddevelopers/mg5amcnlo/2.1.2-lhapdf6/+merge/217497
> You are reviewing the proposed merge of lp:~maddevelopers/mg5amcnlo/2.1.2-lhapdf6 into lp:~maddevelopers/mg5amcnlo/2.1.2.

Unmerged revisions

275. By Olivier Mattelaer on 2014-09-05

add a nice error message if the pdlabel is not valid (doesn't need to dig into the fortran log file anymore).

274. By marco zaro on 2014-09-05

merged with 2.2.0 r307

273. By marco zaro on 2014-09-05

fixed bug related to madevent

the commands
    generate p p > e+ e-
    launch
    set pdlabel cteq6l1
    launch
    set pdlabel lhapdf
    set lhaid 21100
now work

272. By marco zaro on 2014-08-26

the pdf set is installed locally only for v5 (for v6 an error is raised)

271. By marco zaro on 2014-08-21

merged with 2.2.0 r303

270. By Marco Zaro <email address hidden> on 2014-06-19

fix in the madevent interface, lhapdf6 should be working for LO as well

269. By Marco Zaro <email address hidden> on 2014-06-19

imerged with 2.1.2 r304

------------- th 2.1.2This line and the following will be ignored --------------

modified:
  Template/LO/Source/PDF/pdf_lhapdf.f
  Template/NLO/MCatNLO/srcCommon/myfastjetfortran.cc
  Template/NLO/Source/PDF/pdf_lhapdf.f
  Template/NLO/SubProcesses/cuts.f
  Template/NLO/SubProcesses/fastjet_wrapper.f
  Template/NLO/SubProcesses/fastjetfortran_madfks_core.cc
  Template/NLO/SubProcesses/fastjetfortran_madfks_full.cc
  madgraph/various/cluster.py
unknown:
  --auto
  ME5_debug@
  PROCNLO_loop_sm_0/
  PROCNLO_loop_sm_1/
  PROC_sm_0/
  additional_command
  py.py
  input/mg5_configuration.txt
  models/loop_sm/model.pkl
  models/sm/model.pkl
  vendor/CutTools/includects/
  vendor/StdHEP/log.mcfio.5938
  vendor/StdHEP/log.stdhep.6496
pending merges:
  Marco Zaro 2014-06-19 fix to push 300
    Marco Zaro 2014-06-19 [merge] merged with 2.1.2-fastjet-eta
    Marco Zaro 2014-06-18 compilation errors fixed in
    Marco Zaro 2014-06-17 the fastjet functions now can directly return tje jets within etamax.
    Rikkert Frederix 2014-06-18 [merge] To be sure to have a correct termination when running on a cluster,
    Rikkert Frederix 2014-06-17 To determine if a cluster run finished correctly, also check that the

268. By Marco Zaro <email address hidden> on 2014-06-17

merged with 2.1.2 r301

267. By Marco Zaro <email address hidden> on 2014-06-12

fixed case in srcHerwig/jimmy.f

266. By Marco Zaro <email address hidden> on 2014-06-11

fixed lhapdf related commands not to copy a pdf set if it exists

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Template/NLO/SubProcesses/ajob_template'
2--- Template/NLO/SubProcesses/ajob_template 2014-06-12 08:52:03 +0000
3+++ Template/NLO/SubProcesses/ajob_template 2014-06-19 11:28:42 +0000
4@@ -87,7 +87,6 @@
5 link1up FKS_params.dat
6 link1up OLE_order.olc
7 link1up param_card.dat
8- link1up libLHAPDF.so
9
10 # check where is the basic file for the creation of input_app.txt
11 #
12
13=== modified file 'UpdateNotes.txt'
14--- UpdateNotes.txt 2014-06-12 08:52:03 +0000
15+++ UpdateNotes.txt 2014-06-19 11:28:42 +0000
16@@ -1,6 +1,7 @@
17 Update notes for MadGraph5_aMC@NLO (in reverse time order)
18
19-2.1.2.beta2(03/06/14) OM: Fix a bug in ALOHA in presence of customized propagator (Thanks Saurabh)
20+2.1.2.beta2(03/06/14) MZ: enabled LHAPDF6 interface
21+ OM: Fix a bug in ALOHA in presence of customized propagator (Thanks Saurabh)
22 OM: Fixing some compilation issue with MadWeight (Thanks A. Pin)
23 OM: Fixing a bug preventing MadWidth to run due to the model prefixing (depending
24 on the way it was called)
25
26=== modified file 'madgraph/interface/amcatnlo_run_interface.py'
27--- madgraph/interface/amcatnlo_run_interface.py 2014-06-12 16:29:53 +0000
28+++ madgraph/interface/amcatnlo_run_interface.py 2014-06-19 11:28:42 +0000
29@@ -2947,12 +2947,6 @@
30 if os.path.exists(pjoin(self.me_dir,'SubProcesses','OLE_order.olc')):
31 input_files.append(pjoin(cwd, 'OLE_order.olc'))
32
33- # LHAPDF dynamic libraries (needed for lhapdf6)
34- lhalibs = ['libLHAPDF.dylib', 'libLHAPDF.so']
35- for lib in [pjoin(self.me_dir, 'lib', l) for l in lhalibs \
36- if os.path.exists(pjoin(self.me_dir, 'lib', l))]:
37- input_files.append(lib)
38-
39 # File for the loop (might not be present if MadLoop is not used)
40 if os.path.exists(pjoin(cwd, 'MadLoopParams.dat')):
41 to_add = ['MadLoopParams.dat', 'ColorDenomFactors.dat',
42
43=== modified file 'madgraph/interface/common_run_interface.py'
44--- madgraph/interface/common_run_interface.py 2014-06-10 17:09:36 +0000
45+++ madgraph/interface/common_run_interface.py 2014-06-19 11:28:42 +0000
46@@ -1573,33 +1573,18 @@
47
48 if lhapdf_version.startswith('5.'):
49 pdfsetsdir = subprocess.Popen([self.options['lhapdf'], '--pdfsets-path'],
50- stdout = subprocess.PIPE).stdout.read().strip()
51- self.lhapdf_pdfsets = self.get_lhapdf_pdfsets_list(pdfsetsdir)
52- # link the static library in lib
53- lhalib = 'libLHAPDF.a'
54-
55- elif lhapdf_version.startswith('6.'):
56+ stdout = subprocess.PIPE).stdout.read().strip()
57+ else:
58 pdfsetsdir = subprocess.Popen([self.options['lhapdf'], '--datadir'],
59- stdout = subprocess.PIPE).stdout.read().strip()
60- self.lhapdf_pdfsets = self.get_lhapdf_pdfsets_list(pdfsetsdir)
61- # link the dynamic library in lib
62- if os.path.exists(pjoin(lhalibdir, 'libLHAPDF.so')):
63- lhalib = 'libLHAPDF.so'
64- elif os.path.exists(pjoin(lhalibdir, 'libLHAPDF.dylib')):
65- lhalib = 'libLHAPDF.dylib'
66- else:
67- raise MadGraph5Error('Dynamic library not found for LHAPDF6')
68-
69- else:
70- raise MadGraph5Error('Not valid LHAPDF version: %s' % lhapdf_version)
71+ stdout = subprocess.PIPE).stdout.read().strip()
72+
73+ self.lhapdf_pdfsets = self.get_lhapdf_pdfsets_list(pdfsetsdir)
74+ # link the static library in lib
75+ lhalib = 'libLHAPDF.a'
76
77 if os.path.exists(pjoin(libdir, lhalib)):
78 files.rm(pjoin(libdir, lhalib))
79 files.ln(pjoin(lhalibdir, lhalib), libdir)
80- # link the dynamic library for v6 in extra_dirs
81- if lhapdf_version.startswith('6.'):
82- for d in extra_dirs:
83- files.ln(pjoin(libdir, lhalib), pjoin(self.me_dir, d))
84 # just create the PDFsets dir, the needed PDF set will be copied at run time
85 if not os.path.isdir(pjoin(libdir, 'PDFsets')):
86 os.mkdir(pjoin(libdir, 'PDFsets'))
87@@ -1626,9 +1611,12 @@
88 'lhaid and PDF_set_min/max in the run_card do not correspond to the' + \
89 'same PDF set. Please check the run_card.')
90 except KeyError:
91- raise MadGraph5Error(\
92+ if self.lhapdf_version.startswith('5'):
93+ raise MadGraph5Error(\
94 ('invalid lhaid set in th run_card: %d .\nPlease note that some sets' % lhaid) + \
95- '(eg MSTW 90%CL error sets) \nare not available in aMC@NLO + LHAPDF 5.x.x')
96+ '(eg MSTW 90%CL error sets) \nare not available in aMC@NLO + LHAPDF 5.x.x')
97+ else:
98+ logger.debug('%d not found in pdfsets.index' % lhaid)
99
100
101 # check if the file exists, otherwise install it:
102@@ -1640,13 +1628,17 @@
103 except OSError:
104 pdfsets_dir = pjoin(self.me_dir, 'lib', 'PDFsets')
105
106- if pdfsetname and not os.path.exists(pjoin(pdfsets_dir, pdfsetname)):
107- self.install_lhapdf_pdfset(pdfsets_dir, pdfsetname)
108-
109- if os.path.exists(pjoin(pdfsets_dir, pdfsetname)):
110- files.cp(pjoin(pdfsets_dir, pdfsetname), pjoin(self.me_dir, 'lib', 'PDFsets'))
111- elif os.path.exists(pjoin(os.path.dirname(pdfsets_dir), pdfsetname)):
112- files.cp(pjoin(os.path.dirname(pdfsets_dir), pdfsetname), pjoin(self.me_dir, 'lib', 'PDFsets'))
113+ #check that the pdfset is not already there
114+ if not os.path.exists(pjoin(self.me_dir, 'lib', 'PDFsets', pdfsetname)) and \
115+ not os.path.isdir(pjoin(self.me_dir, 'lib', 'PDFsets', pdfsetname)):
116+
117+ if pdfsetname and not os.path.exists(pjoin(pdfsets_dir, pdfsetname)):
118+ self.install_lhapdf_pdfset(pdfsets_dir, pdfsetname)
119+
120+ if os.path.exists(pjoin(pdfsets_dir, pdfsetname)):
121+ files.cp(pjoin(pdfsets_dir, pdfsetname), pjoin(self.me_dir, 'lib', 'PDFsets'))
122+ elif os.path.exists(pjoin(os.path.dirname(pdfsets_dir), pdfsetname)):
123+ files.cp(pjoin(os.path.dirname(pdfsets_dir), pdfsetname), pjoin(self.me_dir, 'lib', 'PDFsets'))
124
125
126 def install_lhapdf_pdfset(self, pdfsets_dir, filename):
127@@ -1731,8 +1723,8 @@
128 stdout = subprocess.PIPE).stdout.read().strip()
129
130 # this will be removed once some issues in lhapdf6 will be fixed
131- if self.lhapdf_version.startswith('6.'):
132- raise MadGraph5Error('LHAPDF 6 not yet supported. Please use v5.x.x')
133+ if self.lhapdf_version.startswith('6.0'):
134+ raise MadGraph5Error('LHAPDF 6.0.x not supported. Please use v6.1 or later')
135
136 return self.lhapdf_version
137
138
139=== modified file 'madgraph/interface/madevent_interface.py'
140--- madgraph/interface/madevent_interface.py 2014-04-16 17:34:29 +0000
141+++ madgraph/interface/madevent_interface.py 2014-06-19 11:28:42 +0000
142@@ -3528,8 +3528,7 @@
143 if self.run_card['pdlabel'] == "lhapdf":
144 os.environ['lhapdf'] = 'True'
145 self.link_lhapdf(pjoin(self.me_dir,'lib'))
146- pdfsetsdir = subprocess.Popen('%s --pdfsets-path' % self.options['lhapdf'],
147- shell = True, stdout = subprocess.PIPE).stdout.read().strip()
148+ pdfsetsdir = self.get_lhapdf_pdfsetsdir()
149 lhaid_list = [int(self.run_card['lhaid'])]
150 self.copy_lhapdf_set(lhaid_list, pdfsetsdir)
151 elif 'lhapdf' in os.environ.keys():

Subscribers

People subscribed via source and target branches

to all changes: