Using LHAPDF instead of PDF

diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg
index a3a4735..0a70cbe 100644 (file)
--- a/ALIROOT/binaliroot.pkg
+++ b/ALIROOT/binaliroot.pkg
@@ -14,7 +14,7 @@ ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONraw MUONmapping \
         ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec \
         EMCALbase EMCALsim EMCALrec EMCALjet \
         STRUCT STARTbase STARTsim STARTrec EVGEN ESD CDB STEER \
-        pythia6 AliPythia6 pdf THijing \
+        pythia6 AliPythia6 lhapdf THijing \
         hijing TMEVSIM mevsim THbtp HBTP TEPEMGEN EPEMGEN \
         FASTSIM microcern \
        RAWDatabase RAWDatarec RAWDatasim \
@@ -25,7 +25,7 @@ ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONraw MUONmapping \
 ifeq (macosx,$(ALICE_TARGET))
 
 ELIBSCPP:=$(filter-out microcern,$(ELIBS))
-ELIBSCPP:=$(filter-out pdf,$(ELIBSCPP))
+ELIBSCPP:=$(filter-out lhapdf,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out mevsim,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out HBTP,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out herwig,$(ELIBSCPP))
@@ -101,5 +101,5 @@ ARLIBS:= \
    RAW/tgt_$(ALICE_TARGET)/G__RAWDatarec.o $(LIBPATH)/libRAWDatarec.a \
    RAW/tgt_$(ALICE_TARGET)/G__MDC.o $(LIBPATH)/libMDC.a
 
-SHLIBS:= $(BINLIBDIRS) -lEVGEN -lEGPythia6 -lPythia6 -lpythia6 -lAliPythia6 -lpdf -lTHijing -lhijing -lTMEVSIM -lmevsim -lTHbtp -lHBTP -lTHerwig -lherwig -lTEPEMGEN -lEPEMGEN -lTPHIC -lFASTSIM -lmicrocern
+SHLIBS:= $(BINLIBDIRS) -lEVGEN -lEGPythia6 -lPythia6 -lpythia6 -lAliPythia6 -llhapdf -lTHijing -lhijing -lTMEVSIM -lmevsim -lTHbtp -lHBTP -lTHerwig -lherwig -lTEPEMGEN -lEPEMGEN -lTPHIC -lFASTSIM -lmicrocern
 

diff --git a/EVE/binalieve.pkg b/EVE/binalieve.pkg
index cb1a5e5..86af5dd 100644 (file)
--- a/EVE/binalieve.pkg
+++ b/EVE/binalieve.pkg
@@ -13,7 +13,7 @@ ELIBS    := Reve Alieve \
   ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec \
   EMCALbase EMCALsim EMCALrec EMCALjet \
   STRUCT STARTbase STARTsim STARTrec EVGEN ESD CDB STEER \
-  pythia6 AliPythia6 pdf THijing \
+  pythia6 AliPythia6 lhapdf THijing \
   hijing TMEVSIM mevsim THbtp HBTP TEPEMGEN EPEMGEN \
   FASTSIM microcern \
   RAWDatabase RAWDatarec RAWDatasim \
@@ -31,7 +31,7 @@ ELIBS+=GL
 ELIBSDIR+=/usr/X11R6/lib/
 
 ELIBSCPP:=$(filter-out microcern,$(ELIBS))
-ELIBSCPP:=$(filter-out pdf,$(ELIBSCPP))
+ELIBSCPP:=$(filter-out lhapdf,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out mevsim,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out HBTP,$(ELIBSCPP))
 ELIBSCPP:=$(filter-out herwig,$(ELIBSCPP))

diff --git a/LHAPDF/lhapdf5.2.2/LHpdflib.f b/LHAPDF/lhapdf5.2.2/LHpdflib.f
index 33b6319..29b6595 100644 (file)
--- a/LHAPDF/lhapdf5.2.2/LHpdflib.f
+++ b/LHAPDF/lhapdf5.2.2/LHpdflib.f
@@ -31,17 +31,22 @@ c     --------------------------------------------------------
 c      integer :: ierror
       integer n, dirpathlength, setnamelength
       character*512 dirpath, setpath
+
+      INTEGER LNROOT
+      CHARACTER*1000 CHROOT
+      CHROOT=' '
+
 c check enviromental variable LHAPATH
       call getenv('LHAPATH',dirpath)
       if (dirpath.eq.'') then
-c      Use the lhapdf-config script to get the path to the PDF sets
-       call system
-     + ("lhapdf-config --pdfsets-path > /tmp/lhapdf-pdfsets-path")
-       open(unit=8, file="/tmp/lhapdf-pdfsets-path", status="old")
-c      open(unit=8, file="/tmp/lhapdf-pdfsets-path", status="old", iostat
-c      $=ierror)
-       read (8,'(A)') dirpath
-       close(8)
+C     Take the data from $ALICE_ROOT/LHAPDF/PDFsets
+         CALL GETENV('ALICE_ROOT',CHROOT)
+         LNROOT = LNBLNK(CHROOT)
+         IF(LNROOT.LE.0) THEN
+            dirpath='PDFsets'   ! Default value
+         ELSE
+            dirpath=CHROOT(1:LNROOT)//'/LHAPDF/PDFsets'
+         ENDIF
       endif
 
 c     Now do some mangling to get the right path length from the 

diff --git a/LHAPDF/lhapdf5.2.2/lhaglue.f b/LHAPDF/lhapdf5.2.2/lhaglue.f
index a784eaf..4eda9b1 100644 (file)
--- a/LHAPDF/lhapdf5.2.2/lhaglue.f
+++ b/LHAPDF/lhapdf5.2.2/lhaglue.f
@@ -253,19 +253,25 @@ C...Local arrays and character variables (NOT USED here DB)
       data first/.TRUE./
       save first
  
+      INTEGER LNROOT
+      CHARACTER*1000 CHROOT
+      CHROOT=' '
+
       if(first .AND. (LHAPARM(20).NE.'LHAPATH')) then
 c...overide the default PDFsets path
-c ... check first if the environmental variable LHAPATH is set ... of not the
-*     Use the lhapdf-config script to get the path to the PDF sets
-      call getenv('LHAPATH',lhapath)
-      if(lhapath.eq.'') then
-      call system("lhapdf-config --pdfsets-path > /tmp/lhapdf-pdfsets-pa
-     $th")
-      open(unit=8, file="/tmp/lhapdf-pdfsets-path", status="old", iostat
-     $=ierror)
-      read (8,'(A)') LHAPATH
-      close(8)
-      endif
+c ... check first if the environmental variable LHAPATH is set
+         call getenv('LHAPATH',lhapath)
+         if(lhapath.eq.'') then
+C     The environment variable LHAPATH is not set.
+C     Take the data from $ALICE_ROOT/LHAPDF/PDFsets
+            CALL GETENV('ALICE_ROOT',CHROOT)
+            LNROOT = LNBLNK(CHROOT)
+            IF(LNROOT.LE.0) THEN
+               LHAPATH='PDFsets' ! Default value
+            ELSE
+               LHAPATH=CHROOT(1:LNROOT)//'/LHAPDF/PDFsets'
+            ENDIF
+         endif
       first=.FALSE.
       endif
 c
@@ -1205,6 +1211,9 @@ C...Interface to LHAPDFLIB.
 * $Id$
 *
 * $Log$
+* Revision 1.1  2006/08/07 09:09:40  morsch
+* LHAPDF 5.2.2 source code.
+*
 * Revision 1.7  2005/12/02 14:50:54  whalley
 * Changes for new CTEQ code/AB sets
 *

diff --git a/Makefile b/Makefile
index 6e41898..42fb92c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ ifeq ($(findstring Flugg,$(MAKECMDGOALS)),Flugg)
 ALIROOTMODULES += Flugg
 endif
 
-CERNMODULES := PDF PYTHIA6 HIJING MICROCERN HERWIG
+CERNMODULES := LHAPDF PYTHIA6 HIJING MICROCERN HERWIG
 
 MODULES := $(ALIROOTMODULES) $(CERNMODULES) ALIROOT
 
@@ -316,7 +316,7 @@ CHECKMODULES := $(filter-out HBTP,$(CHECKMODULES))
 CHECKMODULES := $(filter-out MEVSIM,$(CHECKMODULES))
 CHECKMODULES := $(filter-out EPEMGEN,$(CHECKMODULES))
 CHECKMODULES := $(filter-out TPHIC,$(CHECKMODULES))
-CHECKMODULES := $(filter-out PDF,$(CHECKMODULES))
+CHECKMODULES := $(filter-out LHAPDF,$(CHECKMODULES))
 CHECKMODULES := $(filter-out MICROCERN,$(CHECKMODULES))
 
 check-all:    $(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,check-%,$(CHECKMODULES))

diff --git a/build/module.dep b/build/module.dep
index 153f35a..9512228 100644 (file)
--- a/build/module.dep
+++ b/build/module.dep
@@ -20,7 +20,7 @@ MICROCERN/module.mk:   MICROCERN/libmicrocern.pkg
 MONITOR/module.mk:       MONITOR/libMONITOR.pkg MONITOR/binmonitorGDC.pkg MONITOR/binmonitorCheck.pkg
 MUON/module.mk:                 MUON/libMUONrec.pkg MUON/libMUONsim.pkg MUON/libMUONbase.pkg MUON/libMUONraw.pkg MUON/libMUONmapping.pkg
 LHC/module.mk:          LHC/libLHC.pkg
-PDF/module.mk:          PDF/libpdf.pkg
+LHAPDF/module.mk:       LHAPDF/liblhapdf.pkg
 PHOS/module.mk:                 PHOS/libPHOSbase.pkg PHOS/libPHOSsim.pkg PHOS/libPHOSrec.pkg
 PMD/module.mk:          PMD/libPMDbase.pkg PMD/libPMDsim.pkg PMD/libPMDrec.pkg
 PYTHIA6/module.mk:      PYTHIA6/libpythia6.pkg

diff --git a/macros/loadlibs.C b/macros/loadlibs.C
index 5ba3b96..b532f4b 100644 (file)
--- a/macros/loadlibs.C
+++ b/macros/loadlibs.C
@@ -17,7 +17,7 @@ void loadlibs ()
   //  gSystem->Load("libg2c_sh");
   gSystem->Load("libmicrocern");
   gSystem->Load("libpythia6");
-  gSystem->Load("libpdf");
+  gSystem->Load("liblhapdf");
 
   gSystem->Load("libEG");
   gSystem->Load("libGeom");

diff --git a/macros/loadlibssim.C b/macros/loadlibssim.C
index 79fd5ff..5a699f9 100644 (file)
--- a/macros/loadlibssim.C
+++ b/macros/loadlibssim.C
@@ -15,7 +15,7 @@ void loadlibssim ()
   //  gSystem->Load("libg2c_sh");
   gSystem->Load("libmicrocern");
   gSystem->Load("libpythia6");
-  gSystem->Load("libpdf");
+  gSystem->Load("liblhapdf");
 
   gSystem->Load("libEG");
   gSystem->Load("libGeom");