Skip to content

Commit

Permalink
ALIROOT-5713 CT10 data added
Browse files Browse the repository at this point in the history
LHAPDF veraion 5.9.1
https://alice.its.cern.ch/jira/browse/ALIROOT-5648

extension .F -> .f

.F deleted

correction

roll back of previous commit

extension .F matters for preprocessor directives

external declaration added

removed since there are problems on certain platforms.

extension changed

Cmake for new lhapdf version

Fix for include path for Fortran file

LHAPDF5.9.1 always requires -DCTEQ flag

Remove Pydat1 common block from lhaglue

Set ill-formed small numbers to 0

The LHgrid files contains some very small values, which should be 0.
If the value exponent is a negative number with three digits
the exponential notation is dropped.
This seems to be harmless, except when running pre-compiled code on grid.
  • Loading branch information
amorsch authored and hristov committed Nov 24, 2014
1 parent ed1d393 commit d0f2ed0
Show file tree
Hide file tree
Showing 118 changed files with 107,489 additions and 5 deletions.
12 changes: 8 additions & 4 deletions LHAPDF/AliStructFuncType.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void AliStructFuncType::StructA(Double_t xx, Double_t qq, Double_t a,
Int_t AliStructFuncType::PDFsetIndex(StrucFunc_t pdf)
{
// PDF set index
Int_t pdfSetNumber[10] = {
Int_t pdfSetNumber[12] = {
19170,
19150,
19070,
Expand All @@ -73,15 +73,17 @@ Int_t AliStructFuncType::PDFsetIndex(StrucFunc_t pdf)
10100,
10050,
10041,
10042
10042,
10800,
11000
};
return pdfSetNumber[pdf];
}

TString AliStructFuncType::PDFsetName(StrucFunc_t pdf)
{
// PDF Set Name
TString pdfsetName[10] = {
TString pdfsetName[12] = {
"cteq4l.LHgrid",
"cteq4m.LHgrid",
"cteq5l.LHgrid",
Expand All @@ -91,7 +93,9 @@ TString AliStructFuncType::PDFsetName(StrucFunc_t pdf)
"cteq61.LHpdf",
"cteq6m.LHpdf",
"cteq6l.LHpdf",
"cteq6ll.LHpdf"
"cteq6ll.LHpdf",
"CT10.LHgrid",
"CT10nlo.LHgrid"
};
return pdfsetName[pdf];
}
4 changes: 3 additions & 1 deletion LHAPDF/AliStructFuncType.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ typedef enum
kCTEQ61, // cteq61.LHpdf
kCTEQ6m, // cteq6m.LHpdf
kCTEQ6l, // cteq6l.LHpdf
kCTEQ6ll // cteq6ll.LHpdf
kCTEQ6ll, // cteq6ll.LHpdf
kCT10, // CT10.LHgrid
kCT10nlo // CT10nlo.LHgrid
}
StrucFunc_t;

Expand Down
1 change: 1 addition & 0 deletions LHAPDF/CMakeliblhapdf.pkg
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ set ( HDRS AliStructFuncType.h)

set ( DHDR lhapdfLinkDef.h)

set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
set ( EINCLUDE LHAPDF/lhapdf5.5.1 LHAPDF/lhapdf5.5.1/include LHAPDF/lhapdf5.5.1/src)

set ( CSRCS lhapdf5.5.1/src/binreloc.c )
Expand Down
131 changes: 131 additions & 0 deletions LHAPDF/CMakeliblhapdf5_9_1.pkg
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
# -*- mode: cmake -*-

#--------------------------------------------------------------------------------#
# Package File for lhapdf #
# Author : Johny Jose ([email protected]) #
# Variables Defined : #
# #
# SRCS - C++ source files #
# HDRS - C++ header files #
# DHDR - ROOT Dictionary Linkdef header file #
# CSRCS - C source files #
# CHDRS - C header files #
# EINCLUDE - Include directories #
# EDEFINE - Compiler definitions #
# ELIBS - Extra libraries to link #
# ELIBSDIR - Extra library directories #
# PACKFFLAGS - Fortran compiler flags for package #
# PACKCXXFLAGS - C++ compiler flags for package #
# PACKCFLAGS - C compiler flags for package #
# PACKSOFLAGS - Shared library linking flags #
# PACKLDFLAGS - Module linker flags #
# PACKBLIBS - Libraries to link (Executables only) #
# EXPORT - Header files to be exported #
# CINTHDRS - Dictionary header files #
# CINTAUTOLINK - Set automatic dictionary generation #
# ARLIBS - Archive Libraries and objects for linking (Executables only) #
# SHLIBS - Shared Libraries and objects for linking (Executables only) #
#--------------------------------------------------------------------------------#

set ( SRCS AliStructFuncType.cxx lhapdf-5.9.1/src/version.cxx lhapdf-5.9.1/src/getdatapath.cxx)

set ( HDRS AliStructFuncType.h)

set ( DHDR lhapdfLinkDef.h)

set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
set ( EINCLUDE LHAPDF/lhapdf-5.9.1 LHAPDF/lhapdf-5.9.1/include LHAPDF/lhapdf-5.9.1/src)

set ( CSRCS lhapdf-5.9.1/src/binreloc.c )

set ( FSRCS
lhapdf-5.9.1/src/alphas.f
lhapdf-5.9.1/src/commoninit.f
lhapdf-5.9.1/src/description.f
lhapdf-5.9.1/src/eks98.f
lhapdf-5.9.1/src/eksarp.f
lhapdf-5.9.1/src/eps08.f
lhapdf-5.9.1/src/eps09.f
lhapdf-5.9.1/src/EVLCTEQ.f
lhapdf-5.9.1/src/EVLNNPDF.f
lhapdf-5.9.1/src/evolution.f
lhapdf-5.9.1/src/inputPDF.F
lhapdf-5.9.1/src/LHpdflib.F
lhapdf-5.9.1/src/parameter.F
lhapdf-5.9.1/src/QCDNUM.F
lhapdf-5.9.1/src/QCDparams.f
lhapdf-5.9.1/src/Smrst.f
lhapdf-5.9.1/src/Sqcdnum.f
lhapdf-5.9.1/src/Szeus.f
lhapdf-5.9.1/src/uncertainties.f
lhapdf-5.9.1/src/wrapNNPDF.f
lhapdf-5.9.1/src/wrapNNPDF20grid.f
lhapdf-5.9.1/src/wrapNNPDF20qedgrid.f
lhapdf-5.9.1/src/wrapNNPDFgrid.f
lhapdf-5.9.1/src/wrapa02m.f
lhapdf-5.9.1/src/wrapabfkwpi.f
lhapdf-5.9.1/src/wrapabkm09.f
lhapdf-5.9.1/src/wrapabm11.f
lhapdf-5.9.1/src/wrapacfgpg.f
lhapdf-5.9.1/src/wrapct12.f
lhapdf-5.9.1/src/wrapcteq5.f
lhapdf-5.9.1/src/wrapcteq6.f
lhapdf-5.9.1/src/wrapcteq65.f
lhapdf-5.9.1/src/wrapcteq6lg.f
lhapdf-5.9.1/src/wrapdgg.f
lhapdf-5.9.1/src/wrapdog.f
lhapdf-5.9.1/src/wrapEVLCTEQ.f
lhapdf-5.9.1/src/wrapevolve.F
lhapdf-5.9.1/src/wrapgjr.f
lhapdf-5.9.1/src/wrapgrv.f
lhapdf-5.9.1/src/wrapgrvg.f
lhapdf-5.9.1/src/wrapgrvpi.f
lhapdf-5.9.1/src/wrapgsg96.f
lhapdf-5.9.1/src/wrapgsg.f
lhapdf-5.9.1/src/wraph1.f
lhapdf-5.9.1/src/wraphera.f
lhapdf-5.9.1/src/wrapheragrid.f
lhapdf-5.9.1/src/wraphkn.f
lhapdf-5.9.1/src/wraplacg.f
lhapdf-5.9.1/src/wrapowpi.f
lhapdf-5.9.1/src/wrapmrst.f
lhapdf-5.9.1/src/wrapmrst2006.f
lhapdf-5.9.1/src/wrapmrst98.f
lhapdf-5.9.1/src/wrapmrstqed.f
lhapdf-5.9.1/src/wrapQCDNUM3.f
lhapdf-5.9.1/src/wrapQCDNUM4.f
lhapdf-5.9.1/src/wrapQCDNUM.F
lhapdf-5.9.1/src/wrapsasg.f
lhapdf-5.9.1/src/wrapmstw.f
lhapdf-5.9.1/src/wrapsmrspi.f
lhapdf-5.9.1/src/wrapwhitg.f
lhapdf-5.9.1/src/wrapzeus.f
lhapdf-5.9.1/src/lhaglue.f
lhapdf-5.9.1/src/wrapUSER.f
lhapdf-5.9.1/src/wrapusergrid.f
lhapdf-5.9.1/src/wrapXNN.f
)

if( ALICE_TARGET STREQUAL "solarisCC5")
set ( PACKFFLAGS "${FFLAGS} -free")
elseif( ALICE_TARGET STREQUAL "linuxx8664icc")
set ( PACKFFLAGS "${FFLAGS} -nofixed" )
else()
set ( PACKFFLAGS "${FFLAGS} -ffree-form")
endif( ALICE_TARGET STREQUAL "solarisCC5")

set ( PACKFFLAGS "${PACKFFLAGS} -DCTEQ")

set( PACKCXXFLAGS "${CXXFLAGS} -DDEFAULTPREFIXPATH=\\\"NONE\\\" -DDEFAULTLHAPATH=\\\"${ALICE_ROOT}/LHAPDF/PDFsets\\\"" )


set ( EXPORT AliStructFuncType.h)

#--------------------------------------------------------------------------------#
# install PDF data
install ( DIRECTORY PDFsets
DESTINATION LHAPDF
PATTERN ".svn" EXCLUDE
PATTERN ".d" EXCLUDE
PATTERN ".so" EXCLUDE)

39 changes: 39 additions & 0 deletions LHAPDF/lhapdf-5.9.1/include/LHAPDF/FortranWrappers.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
//#ifndef LHAPDF_FORTRANWRAPPERS_H
//#define LHAPDF_FORTRANWRAPPERS_H

/* Define to dummy `main' function (if any) required to link to the Fortran
libraries. */
//#undef FC_DUMMY_MAIN

/* Define if F77 and FC dummy `main' functions are identical. */
//#undef FC_DUMMY_MAIN_EQ_F77

/* Define to a macro mangling the given C identifier (in lower and upper
case), which must not contain underscores, for linking with Fortran. */
//#undef FC_FUNC

/* As FC_FUNC, but for C identifiers containing underscores. */
//#undef FC_FUNC_

//#endif

/* include/LHAPDF/FortranWrappers.h. Generated from FortranWrappers.h.in by configure. */
/* Define to dummy `main' function (if any) required to link to the Fortran
libraries. */
/* #undef FC_DUMMY_MAIN */

/* Define if F77 and FC dummy `main' functions are identical. */
/* #undef FC_DUMMY_MAIN_EQ_F77 */

/* Define to a macro mangling the given C identifier (in lower and upper
case), which must not contain underscores, for linking with Fortran. */
#define FC_FUNC(name,NAME) name ## _

/* As FC_FUNC, but for C identifiers containing underscores. */
#define FC_FUNC_(name,NAME) name ## _

/* As FC_FUNC, but for C identifiers containing underscores. */
#define FC_FUNC_(name,NAME) name ## _

/* LHAPDF version string */
#define PACKAGE_VERSION "5.9.1"
18 changes: 18 additions & 0 deletions LHAPDF/lhapdf-5.9.1/include/LHAPDF/FortranWrappers.h.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#ifndef LHAPDF_FORTRANWRAPPERS_H
#define LHAPDF_FORTRANWRAPPERS_H

/* Define to dummy `main' function (if any) required to link to the Fortran
libraries. */
#undef FC_DUMMY_MAIN

/* Define if F77 and FC dummy `main' functions are identical. */
#undef FC_DUMMY_MAIN_EQ_F77

/* Define to a macro mangling the given C identifier (in lower and upper
case), which must not contain underscores, for linking with Fortran. */
#undef FC_FUNC

/* As FC_FUNC, but for C identifiers containing underscores. */
#undef FC_FUNC_

#endif
Loading

0 comments on commit d0f2ed0

Please sign in to comment.