Added the Jetfinder classes and merge with old HEAD

diff --git a/EMCAL/AliEMCALHadronCorrection.cxx b/EMCAL/AliEMCALHadronCorrection.cxx
index 76bd113f1b1033b95f8b66fecdf53b7c67477812..85a75daceb12de8c9420b48003f17e781916924b 100644 (file)
--- a/EMCAL/AliEMCALHadronCorrection.cxx
+++ b/EMCAL/AliEMCALHadronCorrection.cxx
@@ -13,7 +13,12 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/* $Id$ */
+/*
+$Log$
+Revision 1.1  2002/01/17 23:52:43  morsch
+First commit.
+
+*/
 
 #include "AliEMCALHadronCorrection.h"
 

diff --git a/EMCAL/AliEMCALHadronCorrectionv0.cxx b/EMCAL/AliEMCALHadronCorrectionv0.cxx
index eea0121045848e9776fdaebb8c661a69a1756141..49951a68a4cdaaaec4dd3868316ea205e06ead39 100644 (file)
--- a/EMCAL/AliEMCALHadronCorrectionv0.cxx
+++ b/EMCAL/AliEMCALHadronCorrectionv0.cxx
@@ -14,7 +14,26 @@
  **************************************************************************/
 
 
-/* $Id$ */
+/*
+$Log$
+Revision 1.4  2002/10/14 14:55:35  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+
+Revision 1.2.6.2  2002/07/24 10:06:16  alibrary
+Updating VirtualMC
+
+Revision 1.3  2002/04/11 19:24:42  nilsen
+fixed a complation warning about not brace-enclosing the sub-elements of
+the static Double_t c[naxVariant][nPol].
+
+Revision 1.2  2002/02/04 15:11:44  hristov
+Use TMath::Abs instead of fabs (Alpha)
+
+Revision 1.1  2002/01/17 23:52:43  morsch
+First commit.
+
+*/
+
 
 #include "AliEMCALHadronCorrectionv0.h"
 

diff --git a/EMCAL/AliEMCALJet.cxx b/EMCAL/AliEMCALJet.cxx
index 6068f574ae40232d2a0470cc96c6c197289f4203..5403fa8d30effc87183f854cbd0033313c228058 100644 (file)
--- a/EMCAL/AliEMCALJet.cxx
+++ b/EMCAL/AliEMCALJet.cxx
@@ -14,7 +14,18 @@
  **************************************************************************/
 
 
-/* $Id$ */
+/*
+$Log$
+Revision 1.4  2002/10/14 14:55:35  hristov
+Merging the VirtualMC branch to the main development branch (HEAD)
+
+Revision 1.2.6.2  2002/07/24 10:06:16  alibrary
+Updating VirtualMC
+
+Revision 1.3  2002/05/22 13:48:43  morsch
+Pdg code added to track list.
+
+*/
 
 //*-- Author: Andreas Morsch (CERN)
 

diff --git a/EMCAL/EMCALLinkDef.h b/EMCAL/EMCALLinkDef.h
index b0e3b52db851eaa4bf02815140d0893793ff1146..23582e4c7b26e1e661725550735120f18b3ca00d 100644 (file)
--- a/EMCAL/EMCALLinkDef.h
+++ b/EMCAL/EMCALLinkDef.h
@@ -19,6 +19,17 @@
 #pragma link C++ class AliEMCALClusterizerv1+;
 #pragma link C++ class AliEMCALGetter+;
 #pragma link C++ class AliEMCALJetFinder+;
+#pragma link C++ class AliEMCALJetFinderInput+;
+#pragma link C++ class AliEMCALJetFinderInputPrep+;
+#pragma link C++ class AliEMCALJetFinderInputSimPrep+;
+#pragma link C++ class AliEMCALJetFinderOutput+;
+#pragma link C++ class AliEMCALJetFinderAlgo+;
+#pragma link C++ class AliEMCALJetFinderAlgoOmni+;
+#pragma link C++ class AliEMCALJetFinderAlgoUA1Unit+;
+#pragma link C++ class AliEMCALJetFinderAlgoUA1+;
+#pragma link C++ class AliEMCALJetFinderAlgoUA1Revised+;
+#pragma link C++ class AliEMCALJetFinderAlgoUA1Hybrid+;
+#pragma link C++ class AliEMCALJetFinderPlots+;
 #pragma link C++ class AliEMCALJet+;
 #pragma link C++ class AliEMCALJetMicroDst+;
 #pragma link C++ class AliEMCALFast+;
@@ -34,5 +45,4 @@
 #pragma link C++ class AliEMCALFastRecParticle+;               
 #pragma link C++ class AliEMCALPID+;           
 #pragma link C++ class AliEMCALPIDv1+;         
-#pragma link C++ class AliEMCALLoader+;                
 #endif

diff --git a/EMCAL/libEMCAL.pkg b/EMCAL/libEMCAL.pkg
index 6a88110811168a350d000198741aac610f747875..71744d394a4803446820d5614ef0753500e97c78 100644 (file)
--- a/EMCAL/libEMCAL.pkg
+++ b/EMCAL/libEMCAL.pkg
@@ -11,6 +11,17 @@ AliEMCALSDigitizer.cxx \
 AliEMCALDigitizer.cxx \
 AliEMCALGetter.cxx \
 AliEMCALJetFinder.cxx \
+AliEMCALJetFinderInput.cxx \
+AliEMCALJetFinderInputSimPrep.cxx \
+AliEMCALJetFinderInputPrep.cxx \
+AliEMCALJetFinderOutput.cxx \
+AliEMCALJetFinderAlgo.cxx \
+AliEMCALJetFinderAlgoOmni.cxx \
+AliEMCALJetFinderAlgoUA1Unit.cxx \
+AliEMCALJetFinderAlgoUA1.cxx \
+AliEMCALJetFinderAlgoUA1Revised.cxx \
+AliEMCALJetFinderAlgoUA1Hybrid.cxx \
+AliEMCALJetFinderPlots.cxx \
 AliEMCALJet.cxx \
 AliEMCALFast.cxx \
 AliEMCALTick.cxx \
@@ -30,8 +41,7 @@ AliEMCALLink.cxx \
 AliEMCALRecParticle.cxx \
 AliEMCALFastRecParticle.cxx \
 AliEMCALPID.cxx \
-AliEMCALPIDv1.cxx \
-AliEMCALLoader.cxx 
+AliEMCALPIDv1.cxx 
 
 HDRS= $(SRCS:.cxx=.h)