Changing name of libRAW into libRAWData

diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg
index 35970c8..cad3034 100644 (file)
--- a/ALIROOT/binaliroot.pkg
+++ b/ALIROOT/binaliroot.pkg
@@ -14,7 +14,7 @@ ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONmapping \
         STRUCT STARTbase STARTsim STARTrec EVGEN ESD STEER CONTAINERS \
         pythia6 AliPythia6 pdf THijing \
         hijing TMEVSIM mevsim THbtp HBTP THerwig herwig TEPEMGEN EPEMGEN \
-        TPHIC FASTSIM microcern RAW AliL3Src AliL3Comp AliL3Misc AliL3Hough AliL3ITS
+        TPHIC FASTSIM microcern RAWData AliL3Src AliL3Comp AliL3Misc AliL3Hough AliL3ITS
 
 ifeq (macosx,$(ALICE_TARGET))
 
@@ -84,7 +84,7 @@ ARLIBS:= \
    STEER/tgt_$(ALICE_TARGET)/G__STEER.o $(LIBPATH)/libSTEER.a \
    STEER/tgt_$(ALICE_TARGET)/G__ESD.o $(LIBPATH)/libESD.a \
    CONTAINERS/tgt_$(ALICE_TARGET)/G__CONTAINERS.o $(LIBPATH)/libCONTAINERS.a \
-   RAW/tgt_$(ALICE_TARGET)/G__RAW.o $(LIBPATH)/libRAW.a
+   RAW/tgt_$(ALICE_TARGET)/G__RAW.o $(LIBPATH)/libRAWData.a
 
 SHLIBS:= $(BINLIBDIRS) -lEVGEN -lpythia6 -lAliPythia6 -lpdf -lTHijing -lhijing -lTMEVSIM -lmevsim -lTHbtp -lHBTP -lTHerwig -lherwig -lTEPEMGEN -lEPEMGEN -lTPHIC -lFASTSIM -lmicrocern
 

diff --git a/HLT/programs/Makefile b/HLT/programs/Makefile
index a0baddb..3ca4324 100644 (file)
--- a/HLT/programs/Makefile
+++ b/HLT/programs/Makefile
@@ -36,7 +36,7 @@ ifeq ($(ALIHLT_USEPACKAGE),ALIROOT)
 DEFSTR = -Duse_aliroot -Duse_root
 ifeq ($(USENEWIO),1)
 DEFSTR += -Duse_newio
-ALICELIBS = -L$(ALICE_ROOT)/lib/tgt_Linux -lTPC -lITS -lCONTAINERS -lSTEER -lRAW -lVMC -lGeom
+ALICELIBS = -L$(ALICE_ROOT)/lib/tgt_Linux -lTPC -lITS -lCONTAINERS -lSTEER -lRAWData -lVMC -lGeom
 else
 ALICELIBS = -L$(ALICE_ROOT)/lib/tgt_Linux -lTPC -lITS -lCONTAINERS -lSTEER -lMC
 endif

diff --git a/MONITOR/binmonitorCheck.pkg b/MONITOR/binmonitorCheck.pkg
index 121ce6c..22a599b 100644 (file)
--- a/MONITOR/binmonitorCheck.pkg
+++ b/MONITOR/binmonitorCheck.pkg
@@ -16,7 +16,7 @@ EINCLUDE+=TPC CONTAINERS ITS RAW HLT/src HLT/hough HLT/comp HLT/ITS
 ifdef DATE_ROOT
 
 ELIBSDIR:=${DATE_MONITOR_DIR}/${DATE_SYS}
-ELIBS:= ESD STEER CONTAINERS RAW monitor shift pythia6 pdf microcern TPCbase TPCsim TPCrec ITS AliL3Src AliL3Comp AliL3Misc AliL3Hough AliL3ITS
+ELIBS:= ESD STEER CONTAINERS RAWData monitor shift pythia6 pdf microcern TPCbase TPCsim TPCrec ITS AliL3Src AliL3Comp AliL3Misc AliL3Hough AliL3ITS
 EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR}
 
 else

diff --git a/MONITOR/binmonitorGDC.pkg b/MONITOR/binmonitorGDC.pkg
index 092046b..1c6fdea 100644 (file)
--- a/MONITOR/binmonitorGDC.pkg
+++ b/MONITOR/binmonitorGDC.pkg
@@ -16,7 +16,7 @@ EINCLUDE+=TPC CONTAINERS ITS RAW HLT/src HLT/hough HLT/comp HLT/ITS
 ifdef DATE_ROOT
 
 ELIBSDIR:=${DATE_MONITOR_DIR}/${DATE_SYS}
-ELIBS:=ESD STEER RAW TPCbase TPCsim TPCrec CONTAINERS AliL3Src AliL3Misc AliL3Hough AliL3Comp AliL3ITS ITS monitor shift pythia6 pdf microcern
+ELIBS:=ESD STEER RAWData TPCbase TPCsim TPCrec CONTAINERS AliL3Src AliL3Misc AliL3Hough AliL3Comp AliL3ITS ITS monitor shift pythia6 pdf microcern
 EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR}
 
 else

diff --git a/MUON/loadlibs.C b/MUON/loadlibs.C
index 8941739..593621b 100644 (file)
--- a/MUON/loadlibs.C
+++ b/MUON/loadlibs.C
@@ -10,7 +10,7 @@ void loadlibs ()
   gSystem->Load("libVMC");
   gSystem->Load("libEGPythia6");
 
-  gSystem->Load("libRAW");
+  gSystem->Load("libRAWData");
   gSystem->Load("libESD");
   gSystem->Load("libSTEER");
   gSystem->Load("libEVGEN");

diff --git a/PDF/libpdf.pkg b/PDF/libpdf.pkg
index 1ecef8b..d0e1254 100644 (file)
--- a/PDF/libpdf.pkg
+++ b/PDF/libpdf.pkg
@@ -410,6 +410,9 @@ PDF/ctmp/%.c: PDF/%.F
 ifeq (macosx,$(ALICE_TARGET))
        $(F77) -E $(pdfINC) $(pdfFFLAGS) $< | f2c -E | sed -e 's/\([0-9,a-z]*_[0-9,a-z]*\)__/\1_/g' > $@
 endif
+ifeq (macosxgcc4,$(ALICE_TARGET))
+       $(F77) -E $(pdfINC) $(pdfFFLAGS) $< | f2c -E | sed -e 's/\([0-9,a-z]*_[0-9,a-z]*\)__/\1_/g' > $@
+endif
 ifeq (macosxxlc,$(ALICE_TARGET))
        $(F77) -d $(pdfINC) -c -o /dev/null $(pdfFFLAGS) $< ; \
        tmpf=F`basename $@ .c`.f ; export tmpf ; \

diff --git a/RAW/Makefile b/RAW/Makefile
index 788889e..b21fd5c 100644 (file)
--- a/RAW/Makefile
+++ b/RAW/Makefile
@@ -50,7 +50,7 @@ endif
 ifneq ($(findstring hlt,$(MAKECMDGOALS)),)
 include ../HLT/hlt.conf
 CXXFLAGS += -DUSE_HLT ${HLTDEFS} -I${ALICE_ROOT}/include -I../HLT/src -I../HLT/hough -I../HLT/comp
-LIBS     += -lEG -lVMC -lGeom -lThread -L../lib/tgt_linuxDEBUG -lSTEER -lRAW -lTPCbase -lTPCsim -lTPCrec -lCONTAINERS -lAliL3Src -lAliL3Misc -lAliL3Hough -lAliL3Comp
+LIBS     += -lEG -lVMC -lGeom -lThread -L../lib/tgt_linuxDEBUG -lSTEER -lRAWData -lTPCbase -lTPCsim -lTPCrec -lCONTAINERS -lAliL3Src -lAliL3Misc -lAliL3Hough -lAliL3Comp
 endif
 
 ##### DATE #####

diff --git a/RAW/binalimdc.pkg b/RAW/binalimdc.pkg
index 4e3d1ff..30fb0dc 100644 (file)
--- a/RAW/binalimdc.pkg
+++ b/RAW/binalimdc.pkg
@@ -14,7 +14,7 @@ SRCS:= alimdc_main.cxx ${ESRCS}
 EINCLUDE+=TPC CONTAINERS ITS RAW HLT/src HLT/hough HLT/comp HLT/ITS
 # -DUSE_DEBUG for alimdc debug printout
 
-ELIBS:=ESD RAW MDC MDCFilter STEER TPCbase TPCsim TPCrec CONTAINERS AliL3Src AliL3Misc AliL3Hough AliL3Comp AliL3ITS ITS pythia6 pdf microcern
+ELIBS:=ESD RAWData MDC MDCFilter STEER TPCbase TPCsim TPCrec CONTAINERS AliL3Src AliL3Misc AliL3Hough AliL3Comp AliL3ITS ITS pythia6 pdf microcern
 
 #ifneq (,$(findstring macosx,$(ALICE_TARGET)))
 ifeq (macosx,$(ALICE_TARGET))

diff --git a/RAW/libRAW.pkg b/RAW/libRAW.pkg
deleted file mode 100644 (file)
index aad3f4a..0000000
--- a/RAW/libRAW.pkg
+++ /dev/null
@@ -1,32 +0,0 @@
-#-*- Mode: Makefile -*-
-
-include HLT/hlt.conf
-
-EDEFINE      := ${HLTDEFS}
-PACKCXXFLAGS := ${HLTCXXFLAGS}
-PACKCFLAGS   := ${HLTCLFAGS}
-PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-SRCS:=  AliRawEventHeader.cxx AliRawEquipmentHeader.cxx \
-       AliRawData.cxx AliRawEquipment.cxx AliRawEvent.cxx \
-       AliStats.cxx AliFilter.cxx \
-       AliRawReader.cxx AliRawReaderFile.cxx AliRawReaderRoot.cxx \
-       AliRawReaderDate.cxx AliRawReaderDateV3.cxx \
-       AliBitPacking.cxx AliAltroBuffer.cxx \
-       AliTPCCompression.cxx AliTPCHNode.cxx AliTPCHTable.cxx \
-       AliAltroRawStream.cxx AliTPCRawStream.cxx \
-       AliVMERawStream.cxx
-
-HDRS:= $(SRCS:.cxx=.h)
-
-EHDRS:=$(shell root-config --incdir)/TH1F.h
-
-EINCLUDE+=TPC CONTAINERS ITS RAW HLT/src HLT/hough HLT/comp HLT/ITS
-
-DHDR:= RAWLinkDef.h 
-
-ifdef DATE_ROOT
-EINCLUDE+= ${DATE_COMMON_DEFS}
-endif
-
-EXPORT:=AliRawReader.h AliRawDataHeader.h AliAltroRawStream.h AliAltroBuffer.h AliBitPacking.h AliFilter.h

diff --git a/STEER/loadSteeringLibs.C b/STEER/loadSteeringLibs.C
index 3b6d7c0..a0c0128 100644 (file)
--- a/STEER/loadSteeringLibs.C
+++ b/STEER/loadSteeringLibs.C
@@ -6,7 +6,7 @@ void loadSteeringLibs ()
   gSystem->Load("libGeom");
   gSystem->Load("libVMC");
 
-  gSystem->Load("libRAW");
+  gSystem->Load("libRAWData");
   gSystem->Load("libESD");
   gSystem->Load("libSTEER");
   gSystem->Load("libCONTAINERS");

diff --git a/build/module.dep b/build/module.dep
index 034aa72..cada9c2 100644 (file)
--- a/build/module.dep
+++ b/build/module.dep
@@ -28,7 +28,7 @@ PHOS/module.mk:                PHOS/libPHOS.pkg
 PMD/module.mk:          PMD/libPMDbase.pkg PMD/libPMDsim.pkg PMD/libPMDrec.pkg
 PYTHIA6/module.mk:      PYTHIA6/libpythia6.pkg
 RALICE/module.mk:       RALICE/libRALICE.pkg
-RAW/module.mk:           RAW/libRAW.pkg RAW/binalimdc.pkg
+RAW/module.mk:           RAW/libRAWData.pkg RAW/binalimdc.pkg
 RICH/module.mk:                 RICH/libRICHbase.pkg RICH/libRICHrec.pkg RICH/libRICHsim.pkg
 START/module.mk:        START/libSTARTbase.pkg START/libSTARTsim.pkg START/libSTARTrec.pkg
 STEER/module.mk:        STEER/libESD.pkg STEER/libSTEER.pkg