Simplification of Makefile and some small corrections

diff --git a/EMCAL/libEMCALjet.pkg b/EMCAL/libEMCALjet.pkg
index b675cae6f38ad0fd4d337670dc83346086f481fc..a581f58d006ff0762c580a760e44e9911f09f405 100644 (file)
--- a/EMCAL/libEMCALjet.pkg
+++ b/EMCAL/libEMCALjet.pkg
@@ -25,5 +25,6 @@ jetfinder/AliEMCALFast.cxx
 HDRS= $(SRCS:.cxx=.h) 
 
 DHDR:=EMCALLinkDefjet.h
 HDRS= $(SRCS:.cxx=.h) 
 
 DHDR:=EMCALLinkDefjet.h

+

 # have to tune
 EINCLUDE:=PYTHIA6 RAW EVGEN THijing
 # have to tune
 EINCLUDE:=PYTHIA6 RAW EVGEN THijing

diff --git a/HLT/libAliL3Comp.pkg b/HLT/libAliL3Comp.pkg
index 79bd0a6c2ce35e8d2739dbcf5af67445c3ab1f63..45d04d15f13dd25dd5ac6f5c73b11373171d7128 100644 (file)
--- a/HLT/libAliL3Comp.pkg
+++ b/HLT/libAliL3Comp.pkg
@@ -26,5 +26,3 @@ PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE+= HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE+= HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW

-
-SUBDIR:=comp

diff --git a/HLT/libAliL3Hough.pkg b/HLT/libAliL3Hough.pkg
index 20fd5bfbbf9ec8c040aacca6cdbfe7ea7a877625..b5783b7d8d46e1dec2343d3ea2d166bd8b3cee58 100644 (file)
--- a/HLT/libAliL3Hough.pkg
+++ b/HLT/libAliL3Hough.pkg
@@ -36,5 +36,3 @@ PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE+= HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE+= HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW

-
-SUBDIR:=hough

diff --git a/HLT/libAliL3ITS.pkg b/HLT/libAliL3ITS.pkg
index 1e731e6e763565cecde1c7fd2a50820ceb2c7c51..7daedf63ee9a26a9a190a6929880948d2d9aabb7 100644 (file)
--- a/HLT/libAliL3ITS.pkg
+++ b/HLT/libAliL3ITS.pkg
@@ -14,5 +14,3 @@ PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE += HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE += HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW

-
-SUBDIR:=ITS

diff --git a/HLT/libAliL3MUON.pkg b/HLT/libAliL3MUON.pkg
index 43ffa5e21f96be9b976c80316b2a4d8f483b072f..4552d988294ccc9e99883598bceb8baf1cf21c5e 100644 (file)
--- a/HLT/libAliL3MUON.pkg
+++ b/HLT/libAliL3MUON.pkg
@@ -44,5 +44,3 @@ PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE += HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE += HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW

-
-SUBDIR:=MUON/src

diff --git a/HLT/libAliL3Misc.pkg b/HLT/libAliL3Misc.pkg
index db95439f6b8b3a1ef7fbb2647eac913b678bae17..292f26fa1b0fdf4629e5ed25c51a247904a5b729 100644 (file)
--- a/HLT/libAliL3Misc.pkg
+++ b/HLT/libAliL3Misc.pkg
@@ -25,5 +25,3 @@ PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE+= HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE+= HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW

-
-SUBDIR:=misc

diff --git a/HLT/libAliL3Src.pkg b/HLT/libAliL3Src.pkg
index 8899fabefb692144de135822bd0806ee2d8a29ad..4c4f52e82e05a5d1829ba2486276cef884b935c8 100644 (file)
--- a/HLT/libAliL3Src.pkg
+++ b/HLT/libAliL3Src.pkg
@@ -42,5 +42,3 @@ PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE += HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE += HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW

-
-SUBDIR:=src

diff --git a/ITS/AliITSRad.h b/ITS/AliITSRad.h
index c09e93116cd447f7871cc301a48e1c35d7d6987d..1a6010a3dcc59ed8f82be676b5b4cc3c6d622693 100644 (file)
--- a/ITS/AliITSRad.h
+++ b/ITS/AliITSRad.h
@@ -2,12 +2,11 @@
 #define ALIITSRAD_H
 
 #include <TObject.h>
 #define ALIITSRAD_H
 
 #include <TObject.h>

-#include <TMatrix.h>
+#include <TMatrixFfwd.h>

 
 
 class TObjArray;
 
 
 
 class TObjArray;
 

-

 //                  ITS Class to calculate the radiation lenght matrix
 //Origin  A. Badala' and G.S. Pappalardo:  e-mail Angela.Badala@ct.infn.it, Giuseppe.S.Pappalardo@ct.infn.it
 //
 //                  ITS Class to calculate the radiation lenght matrix
 //Origin  A. Badala' and G.S. Pappalardo:  e-mail Angela.Badala@ct.infn.it, Giuseppe.S.Pappalardo@ct.infn.it
 //


@@ -23,24 +22,24 @@ public:
   Int_t Getimax() {return imax;}               // return the first dimension of the matrices
   Int_t Getjmax() {return jmax;}               // return the second dimension of the matrices
   
   Int_t Getimax() {return imax;}               // return the first dimension of the matrices
   Int_t Getjmax() {return jmax;}               // return the second dimension of the matrices
   

-  TMatrix &GetRadMatrix1() {return *fmrad1;}   // return the radiation lengh matrix for layer 1
-  TMatrix &GetRadMatrix2() {return *fmrad2;}   // return the radiation lengh matrix for layer 2
-  TMatrix &GetRadMatrix3() {return *fmrad3;}   // return the radiation lengh matrix for layer 3
-  TMatrix &GetRadMatrix4() {return *fmrad4;}   // return the radiation lengh matrix for layer 4
-  TMatrix &GetRadMatrix5() {return *fmrad5;}   // return the radiation lengh matrix for layer 5
-  TMatrix &GetRadMatrix6() {return *fmrad6;}   // return the radiation lengh matrix for layer 6
+  TMatrixF &GetRadMatrix1() {return *fmrad1;}   // return the radiation lengh matrix for layer 1
+  TMatrixF &GetRadMatrix2() {return *fmrad2;}   // return the radiation lengh matrix for layer 2
+  TMatrixF &GetRadMatrix3() {return *fmrad3;}   // return the radiation lengh matrix for layer 3
+  TMatrixF &GetRadMatrix4() {return *fmrad4;}   // return the radiation lengh matrix for layer 4
+  TMatrixF &GetRadMatrix5() {return *fmrad5;}   // return the radiation lengh matrix for layer 5
+  TMatrixF &GetRadMatrix6() {return *fmrad6;}   // return the radiation lengh matrix for layer 6

   
 private:
 
   Int_t           imax;        // first dimension of the matrices
   Int_t           jmax;        // second dimension of the matrices
   
   
 private:
 
   Int_t           imax;        // first dimension of the matrices
   Int_t           jmax;        // second dimension of the matrices
   

-  TMatrix         *fmrad1;     // matrix of the radiation lenghts for layer 1
-  TMatrix         *fmrad2;     // matrix of the radiation lenghts for layer 2
-  TMatrix         *fmrad3;     // matrix of the radiation lenghts for layer 3
-  TMatrix         *fmrad4;     // matrix of the radiation lenghts for layer 4
-  TMatrix         *fmrad5;     // matrix of the radiation lenghts for layer 5
-  TMatrix         *fmrad6;     // matrix of the radiation lenghts for layer 6
+  TMatrixF         *fmrad1;     // matrix of the radiation lenghts for layer 1
+  TMatrixF         *fmrad2;     // matrix of the radiation lenghts for layer 2
+  TMatrixF         *fmrad3;     // matrix of the radiation lenghts for layer 3
+  TMatrixF         *fmrad4;     // matrix of the radiation lenghts for layer 4
+  TMatrixF         *fmrad5;     // matrix of the radiation lenghts for layer 5
+  TMatrixF         *fmrad6;     // matrix of the radiation lenghts for layer 6

 
   ClassDef(AliITSRad, 1)
 };
 
   ClassDef(AliITSRad, 1)
 };

diff --git a/MUON/libMUONmapping.pkg b/MUON/libMUONmapping.pkg
index f7d696d971806a576f122ae2638080eb48d289cd..354b7c2f3069676402838efbde8e8f39d65a1771 100644 (file)
--- a/MUON/libMUONmapping.pkg
+++ b/MUON/libMUONmapping.pkg
@@ -100,5 +100,3 @@ HDRS  = $(SRCS:.cxx=.h)
 DHDR := MUONLinkDefMapping.h
  
 EINCLUDE:= RAW MUON/mapping
 DHDR := MUONLinkDefMapping.h
  
 EINCLUDE:= RAW MUON/mapping

- 
-SUBDIR := mapping

diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h
index ee5bf6a7d9ad7884f4ffc0e74cfef0a1f5a966be..84bb9aa77f474b4916f0c49ca920082dd3895d15 100644 (file)
--- a/PHOS/AliPHOSPIDv1.h
+++ b/PHOS/AliPHOSPIDv1.h
@@ -8,6 +8,9 @@
 /* History of cvs commits:
  *
  * $Log$
 /* History of cvs commits:
  *
  * $Log$

+ * Revision 1.57  2006/01/23 17:51:48  hristov
+ * Using the recommended way of forward declarations for TVector and TMatrix (see v5-08-00 release notes). Additional clean-up
+ *

  * Revision 1.56  2005/05/28 14:19:04  schutz
  * Compilation warnings fixed by T.P.
  *
  * Revision 1.56  2005/05/28 14:19:04  schutz
  * Compilation warnings fixed by T.P.
  *


@@ -19,25 +22,26 @@
 // Oh yeah                 
 //*-- Author: Yves Schutz (SUBATECH), Gustavo Conesa.
 
 // Oh yeah                 
 //*-- Author: Yves Schutz (SUBATECH), Gustavo Conesa.
 

-// --- ROOT system ---
-#include <TMatrixFfwd.h>
+// --- Standard library ---

 
 

-class TVector3 ;
-class TPrincipal ;
-class TROOT ;
-class TTree ;
+// --- ROOT system ---

 class TCanvas ;
 class TFolder ;
 class TFormula;
 class TCanvas ;
 class TFolder ;
 class TFormula;

-// --- Standard library ---
+class TPrincipal ;
+class TROOT ;
+class TTree ;
+class TVector3 ;
+#include <TMatrixDfwd.h>
+

 // --- AliRoot header files ---
 // --- AliRoot header files ---

-class AliPHOSEmcRecPoint ;
-class AliPHOSCpvRecPoint ;

 class AliPHOSClusterizerv1 ;
 class AliPHOSClusterizerv1 ;

+class AliPHOSCpvRecPoint ;
+class AliPHOSEmcRecPoint ;

 class AliPHOSTrackSegmentMakerv1 ;
 class AliPHOSTrackSegmentMakerv1 ;

-

 #include "AliPHOSPID.h"
 #include "AliPID.h"
 #include "AliPHOSPID.h"
 #include "AliPID.h"

+

 class  AliPHOSPIDv1 : public AliPHOSPID {
   
 public:
 class  AliPHOSPIDv1 : public AliPHOSPID {
   
 public:

diff --git a/build/header.tpl b/build/header.tpl
index b51c9ca4748bc3c39a4c7a0299c975b319fb6ce9..38f9bfd1f2a19b32682e3112d876fc3ef444cd11 100644 (file)
--- a/build/header.tpl
+++ b/build/header.tpl
@@ -34,4 +34,3 @@ EHDRS:=
 CINTHDRS:=
 ARLIBS:=
 SHLIBS:=
 CINTHDRS:=
 ARLIBS:=
 SHLIBS:=

-SUBDIR:=

diff --git a/build/module.tpl b/build/module.tpl
index 2d8cb27a7f2d8ce6010001d02597fbfe5301ded5..b982ebb871ae69f1dd0067f032cdd5d91fa12c59 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -85,9 +85,6 @@ endif
 @PACKAGE@S:=$(patsubst %,$(MODDIR)/%,$(SRCS))
 @PACKAGE@H:=$(patsubst %,$(MODDIR)/%,$(HDRS)) $(EHDRS)
 
 @PACKAGE@S:=$(patsubst %,$(MODDIR)/%,$(SRCS))
 @PACKAGE@H:=$(patsubst %,$(MODDIR)/%,$(HDRS)) $(EHDRS)
 

-#c++ source subdirectories
-@PACKAGE@SDIR:=$(SUBDIR)
-

 #############################################################################
 #
 #            If special rootcint headerfiles is specified use them
 #############################################################################
 #
 #            If special rootcint headerfiles is specified use them


@@ -362,13 +359,9 @@ check-@MODULE@: $(@PACKAGE@CHECKS)
        $(MUTE)$(CXX) -E $(@PACKAGE@DEFINE) $(@PACKAGE@INC) -I. $< > $@ $(@PACKAGE@CXXFLAGS)
        @cd $(dir $@) ; $(IRST_INSTALLDIR)/patch/patch4alice.prl $(notdir $@)
 
        $(MUTE)$(CXX) -E $(@PACKAGE@DEFINE) $(@PACKAGE@INC) -I. $< > $@ $(@PACKAGE@CXXFLAGS)
        @cd $(dir $@) ; $(IRST_INSTALLDIR)/patch/patch4alice.prl $(notdir $@)
 

-# IRST coding rule check
-@MODULE@/check/$(SUBDIR)/%.viol : @MODULE@/check/$(SUBDIR)/%.i
-       $(MUTE)echo $@ ; $(CODE_CHECK) $< ./@MODULE@/$(@PACKAGE@SDIR) > $@
-

 # IRST coding rule check
 @MODULE@/check/%.viol : @MODULE@/check/%.i
 # IRST coding rule check
 @MODULE@/check/%.viol : @MODULE@/check/%.i

-       $(MUTE)echo $@ ; $(CODE_CHECK) $< ./@MODULE@ > $@
+       $(MUTE)echo $@ ; $(CODE_CHECK) $< $(shell echo $(dir $<) | sed -e 's:/check::') > $@

 
 @PACKAGE@PREPROC       = $(patsubst %.viol,%.i,$(@PACKAGE@CHECKS))
 
 
 @PACKAGE@PREPROC       = $(patsubst %.viol,%.i,$(@PACKAGE@CHECKS))