Skip to content
This repository has been archived by the owner on Jan 13, 2021. It is now read-only.

Commit

Permalink
MCFM library CMS MELA update, remove empty file
Browse files Browse the repository at this point in the history
  • Loading branch information
usarica committed Apr 17, 2019
1 parent a4bb6b5 commit e3f6546
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Empty file removed MEKD/macros/Pedja.log
Empty file.
4 changes: 2 additions & 2 deletions MELA/BuildFile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<flags CPPFLAGS="-I$(CMSSW_BASE)/src/ZZMatrixElement/MELA/interface/" />
<flags CPPDEFINES="_melapkgpathstr_='std::string(std::getenv(xstr_lit(CMSSW_BASE)))+std::string(xstr_lit(/src/ZZMatrixElement/MELA/))'" />
<!--Some magic to retrieve the mcfm library over http, and link it hardcoding its path in the resulting library, so that LD_LIBRARY_PATH is not required. -->
<flags LDFLAGS="-Wl,-rpath=$(CMSSW_BASE)/src/ZZMatrixElement/MELA/data/$(SCRAM_ARCH) $(shell $(CMSSW_BASE)/src/ZZMatrixElement/MELA/data/retrieve.csh $(SCRAM_ARCH) mcfm_705) -L$(CMSSW_BASE)/src/ZZMatrixElement/MELA/data/$(SCRAM_ARCH) -lmcfm_705 -ljhugenmela -lcollier" />
<flags LDFLAGS="-Wl,-rpath=$(CMSSW_BASE)/src/ZZMatrixElement/MELA/data/$(SCRAM_ARCH) $(shell $(CMSSW_BASE)/src/ZZMatrixElement/MELA/data/retrieve.csh $(SCRAM_ARCH) mcfm_706) -L$(CMSSW_BASE)/src/ZZMatrixElement/MELA/data/$(SCRAM_ARCH) -lmcfm_706 -ljhugenmela -lcollier" />

<use name="f77compiler"/>
<use name="root"/>
Expand All @@ -15,7 +15,7 @@

<export>
<lib name="1"/>
<use name="mcfm_705"/> <!--For this to work, one needs to specify mcfm as a scram tool.-->
<use name="mcfm_706"/> <!--For this to work, one needs to specify mcfm as a scram tool.-->
</export>

<export>
Expand Down
2 changes: 1 addition & 1 deletion MELA/test/loadMELA.C
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
TString LIBCOLLIER="libcollier.so";
TString LIBMCFM="libmcfm_705.so";
TString LIBMCFM="libmcfm_706.so";

gSystem->AddIncludePath("-I$ROOFITSYS/include/");
gSystem->AddIncludePath("-I$CMSSW_BASE/interface/");
Expand Down

0 comments on commit e3f6546

Please sign in to comment.