libEMCALbase, libEMCALsim, and libEMCALrec instead of libEMCAL (A.Pavlinov)

diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg
index 75d48c06e1d9b06490b9e6564b6034dfd74248cd..2ac31675d0378dda160c765f7be148908aa63667 100644 (file)
--- a/ALIROOT/binaliroot.pkg
+++ b/ALIROOT/binaliroot.pkg
@@ -11,7 +11,7 @@ ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONmapping \
         TRDsim TRDrec TRDfast \
        FMDbase FMDsim FMDrec TOFbase TOFrec TOFsim PHOS CRT \
         RICHbase RICHrec RICHsim \
-        ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec EMCAL \
+        ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec EMCALbase EMCALsim EMCALrec \
         STRUCT STARTbase STARTsim STARTrec EVGEN ESD STEER \
         pythia6 AliPythia6 pdf THijing \
         hijing TMEVSIM mevsim THbtp HBTP TEPEMGEN EPEMGEN \

diff --git a/EMCAL/EMCALLinkDefbase.h b/EMCAL/EMCALLinkDefbase.h
new file mode 100644 (file)
index 0000000..db8f1e1
--- /dev/null
+++ b/EMCAL/EMCALLinkDefbase.h
@@ -0,0 +1,24 @@
+#ifdef __CINT__
+// for libEMCALbase.pkg 
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class AliEMCAL+;
+#pragma link C++ class AliEMCALGeometry+; 
+#pragma link C++ class AliEMCALv0+;
+#pragma link C++ class AliEMCALv1+;
+#pragma link C++ class AliEMCALv2+;
+#pragma link C++ class AliEMCALHit+;
+#pragma link C++ class AliEMCALLoader+;        
+#pragma link C++ class AliEMCALGetter+;
+#pragma link C++ class AliEMCALFast+;
+#pragma link C++ class AliEMCALGeneratorFactory+;
+#pragma link C++ class AliEMCALShishKebabModule+;
+#pragma link C++ class AliEMCALShishKebabTrd1Module+;
+#pragma link C++ class AliEMCALGeometryOfflineTrd1+;
+#pragma link C++ class AliEMCALWsuCosmicRaySetUp+;
+#pragma link C++ class AliEMCALJet+;
+#pragma link C++ class AliEMCALParton+;                
+
+#endif

diff --git a/EMCAL/EMCALLinkDef.h b/EMCAL/EMCALLinkDefrec.h
similarity index 65%
rename from EMCAL/EMCALLinkDef.h
rename to EMCAL/EMCALLinkDefrec.h
index f6a0b55ba9b6a39e3b6539971910103453a2af43..efc53ffff6a3808e0d1fa4ef82c6af2f21ea8bdf 100644 (file)
--- a/EMCAL/EMCALLinkDef.h
+++ b/EMCAL/EMCALLinkDefrec.h
@@ -1,5 +1,5 @@
 #ifdef __CINT__
- 
+// for libEMCALrec.pkg
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
@@ -12,20 +12,8 @@
 #pragma link C++ enum  AliEMCALJetFinderFileType_t;
 #pragma link C++ enum  AliEMCALJetFinderAlgoUA1UnitFlagType_t;
 #pragma link C++ enum  AliEMCALJetFinderAlgoUA1FillUnitFlagType_t;
-#pragma link C++ class AliEMCAL+;
-#pragma link C++ class AliEMCALGeometry+; 
-#pragma link C++ class AliEMCALv0+;
-#pragma link C++ class AliEMCALv1+;
-#pragma link C++ class AliEMCALv2+;
-#pragma link C++ class AliEMCALHit+;
-#pragma link C++ class AliEMCALDigit+;
-#pragma link C++ class AliEMCALTick+;
-#pragma link C++ class AliEMCALRecPoint+;
-#pragma link C++ class AliEMCALSDigitizer+;
-#pragma link C++ class AliEMCALDigitizer+;
-#pragma link C++ class AliEMCALClusterizer+;
-#pragma link C++ class AliEMCALClusterizerv1+;
-#pragma link C++ class AliEMCALGetter+;
+// -
+#pragma link C++ class AliEMCALReconstructor+;
 #pragma link C++ class AliEMCALJetFinder+;
 #pragma link C++ class AliEMCALJetFinderInput+;
 #pragma link C++ class AliEMCALJetFinderInputPrep+;
@@ -35,33 +23,22 @@
 #pragma link C++ class AliEMCALJetFinderAlgoOmni+;
 #pragma link C++ class AliEMCALJetFinderAlgoUA1Unit+;
 #pragma link C++ class AliEMCALJetFinderPlots+;
-#pragma link C++ class AliEMCALJet+;
-#pragma link C++ class AliEMCALJetMicroDst+;
-#pragma link C++ class AliEMCALFast+;
-#pragma link C++ class AliEMCALHadronCorrection+;               
-#pragma link C++ class AliEMCALHadronCorrectionv0+;
-#pragma link C++ class AliEMCALHadronCorrectionv1+;             
-#pragma link C++ class AliEMCALParton+;                
+#pragma link C++ class AliEMCALRecPoint+;
+#pragma link C++ class AliEMCALClusterizer+;
+#pragma link C++ class AliEMCALClusterizerv1+;
+#pragma link C++ class AliEMCALLink+;          
+#pragma link C++ class AliEMCALTracker+;
 #pragma link C++ class AliEMCALTrackSegment+;          
 #pragma link C++ class AliEMCALTrackSegmentMaker+;             
 #pragma link C++ class AliEMCALTrackSegmentMakerv1+;           
-#pragma link C++ class AliEMCALLink+;          
 #pragma link C++ class AliEMCALRecParticle+;           
 #pragma link C++ class AliEMCALFastRecParticle+;               
 #pragma link C++ class AliEMCALPID+;           
 #pragma link C++ class AliEMCALPIDv1+;
-#pragma link C++ class AliEMCALLoader+;        
-#pragma link C++ class AliEMCALReconstructor+;
 #pragma link C++ class AliEMCALRawStream+;
-// 23-aug-04
-#pragma link C++ class AliEMCALGeneratorFactory+;
-// 9-sep-04
-#pragma link C++ class AliEMCALShishKebabModule+;
-#pragma link C++ class AliEMCALShishKebabTrd1Module+;
-#pragma link C++ class AliEMCALGeometryOfflineTrd1+;
-// 17-may-05
-#pragma link C++ class AliEMCALWsuCosmicRaySetUp+;
-//#pragma link C++ enum  PprRunFact_t;
-//#pragma link C++ enum  PprRadFact_t;
+#pragma link C++ class AliEMCALJetMicroDst+;
+#pragma link C++ class AliEMCALHadronCorrection+;               
+#pragma link C++ class AliEMCALHadronCorrectionv0+;
+#pragma link C++ class AliEMCALHadronCorrectionv1+;             
 
 #endif

diff --git a/EMCAL/EMCALLinkDefsim.h b/EMCAL/EMCALLinkDefsim.h
new file mode 100644 (file)
index 0000000..e9092c2
--- /dev/null
+++ b/EMCAL/EMCALLinkDefsim.h
@@ -0,0 +1,12 @@
+#ifdef __CINT__
+ 
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class AliEMCALDigit+;
+#pragma link C++ class AliEMCALSDigitizer+;
+#pragma link C++ class AliEMCALDigitizer+;
+#pragma link C++ class AliEMCALTick+;
+
+#endif

diff --git a/EMCAL/libEMCALbase.pkg b/EMCAL/libEMCALbase.pkg
new file mode 100644 (file)
index 0000000..6ba12ff
--- /dev/null
+++ b/EMCAL/libEMCALbase.pkg
@@ -0,0 +1,25 @@
+FSRCS = jet_finder_ua1.F sgpdge.F
+
+SRCS = \
+AliEMCAL.cxx \
+AliEMCALGeometry.cxx \
+AliEMCALv0.cxx \
+AliEMCALv1.cxx \
+AliEMCALv2.cxx \
+AliEMCALHit.cxx \
+AliEMCALLoader.cxx \
+AliEMCALGetter.cxx \
+AliEMCALFast.cxx \
+AliEMCALGeneratorFactory.cxx \
+AliEMCALShishKebabModule.cxx \
+AliEMCALShishKebabTrd1Module.cxx \
+AliEMCALGeometryOfflineTrd1.cxx \
+AliEMCALWsuCosmicRaySetUp.cxx \
+AliEMCALJet.cxx \
+AliEMCALParton.cxx 
+
+HDRS= $(SRCS:.cxx=.h) 
+
+DHDR:=EMCALLinkDefbase.h
+# have to tune
+EINCLUDE:=PYTHIA6 RAW EVGEN THijing

diff --git a/EMCAL/libEMCAL.pkg b/EMCAL/libEMCALrec.pkg
similarity index 58%
rename from EMCAL/libEMCAL.pkg
rename to EMCAL/libEMCALrec.pkg
index c10ee904efbaf2c81565eaee2879c4e349ae8735..ced5a805b901a6d82c61f42445ddb6520b894f11 100644 (file)
--- a/EMCAL/libEMCAL.pkg
+++ b/EMCAL/libEMCALrec.pkg
@@ -1,16 +1,7 @@
-FSRCS= jet_finder_ua1.F sgpdge.F
+# 19-Aug-05 - split from libEMCAL.pkg
 
-SRCS= \
-AliEMCAL.cxx \
-AliEMCALGeometry.cxx \
-AliEMCALv0.cxx \
-AliEMCALv1.cxx \
-AliEMCALv2.cxx \
-AliEMCALHit.cxx \
-AliEMCALDigit.cxx \
-AliEMCALSDigitizer.cxx \
-AliEMCALDigitizer.cxx \
-AliEMCALGetter.cxx \
+SRCS =\
+AliEMCALReconstructor.cxx \
 AliEMCALJetFinder.cxx \
 AliEMCALJetFinderInput.cxx \
 AliEMCALJetFinderInputSimPrep.cxx \
@@ -20,37 +11,26 @@ AliEMCALJetFinderAlgo.cxx \
 AliEMCALJetFinderAlgoOmni.cxx \
 AliEMCALJetFinderAlgoUA1Unit.cxx \
 AliEMCALJetFinderPlots.cxx \
-AliEMCALJet.cxx \
-AliEMCALFast.cxx \
-AliEMCALTick.cxx \
 AliEMCALRecPoint.cxx \
 AliEMCALClusterizer.cxx \
 AliEMCALClusterizerv1.cxx \
-AliEMCALHadronCorrection.cxx \
-AliEMCALHadronCorrectionv0.cxx \
-AliEMCALHadronCorrectionv1.cxx \
-AliEMCALJetMicroDst.cxx \
-AliEMCALParton.cxx \
+AliEMCALLink.cxx \
+AliEMCALTracker.cxx \
 AliEMCALTrackSegment.cxx \
 AliEMCALTrackSegmentMaker.cxx \
 AliEMCALTrackSegmentMakerv1.cxx \
-AliEMCALLink.cxx \
 AliEMCALRecParticle.cxx \
 AliEMCALFastRecParticle.cxx \
 AliEMCALPID.cxx \
 AliEMCALPIDv1.cxx \
-AliEMCALLoader.cxx \
-AliEMCALReconstructor.cxx \
 AliEMCALRawStream.cxx \
-AliEMCALGeneratorFactory.cxx \
-AliEMCALShishKebabModule.cxx\
-AliEMCALShishKebabTrd1Module.cxx\
-AliEMCALGeometryOfflineTrd1.cxx\
-AliEMCALWsuCosmicRaySetUp.cxx
+AliEMCALJetMicroDst.cxx \
+AliEMCALHadronCorrection.cxx \
+AliEMCALHadronCorrectionv0.cxx \
+AliEMCALHadronCorrectionv1.cxx 
 
 HDRS= $(SRCS:.cxx=.h) 
 
-DHDR:=EMCALLinkDef.h
-
+DHDR:=EMCALLinkDefrec.h
+# have to tune
 EINCLUDE:=PYTHIA6 RAW EVGEN THijing
-

diff --git a/EMCAL/libEMCALsim.pkg b/EMCAL/libEMCALsim.pkg
new file mode 100644 (file)
index 0000000..adb4b76
--- /dev/null
+++ b/EMCAL/libEMCALsim.pkg
@@ -0,0 +1,14 @@
+# 19-Aug-05 - split from libEMCAL.pkg
+
+SRCS =\
+AliEMCALDigit.cxx \
+AliEMCALSDigitizer.cxx \
+AliEMCALDigitizer.cxx \
+AliEMCALTick.cxx
+
+
+HDRS= $(SRCS:.cxx=.h) 
+
+DHDR:=EMCALLinkDefsim.h
+# have to tune
+EINCLUDE:=PYTHIA6 RAW EVGEN THijing

diff --git a/build/module.dep b/build/module.dep
index e53adae54d5e2a6c22e07a9a0026f16615843b5a..9404104275f6d550d3df4ad6d0956c2dcc993dd9 100644 (file)
--- a/build/module.dep
+++ b/build/module.dep
@@ -4,7 +4,7 @@ ALIROOT/module.mk:       ALIROOT/binaliroot.pkg
 ANALYSIS/module.mk:     ANALYSIS/libANALYSIS.pkg 
 CRT/module.mk:           CRT/libCRT.pkg
 DISPLAY/module.mk:      DISPLAY/libDISPLAY.pkg
-EMCAL/module.mk:        EMCAL/libEMCAL.pkg
+EMCAL/module.mk:        EMCAL/libEMCALbase.pkg EMCAL/libEMCALsim.pkg EMCAL/libEMCALrec.pkg
 EPEMGEN/module.mk:       EPEMGEN/libEPEMGEN.pkg
 EVGEN/module.mk:        EVGEN/libEVGEN.pkg
 FMD/module.mk:          FMD/libFMDbase.pkg FMD/libFMDsim.pkg FMD/libFMDrec.pkg