Bug fixes. Log replaced by Id

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

diff --git a/EMCAL/AliEMCALHadronCorrectionv0.cxx b/EMCAL/AliEMCALHadronCorrectionv0.cxx
index 49951a68a4cdaaaec4dd3868316ea205e06ead39..eea0121045848e9776fdaebb8c661a69a1756141 100644 (file)
--- a/EMCAL/AliEMCALHadronCorrectionv0.cxx
+++ b/EMCAL/AliEMCALHadronCorrectionv0.cxx
@@ -14,26 +14,7 @@
  **************************************************************************/
 
 
-/*
-$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.
-
-*/
-
+/* $Id$ */
 
 #include "AliEMCALHadronCorrectionv0.h"
 

diff --git a/EMCAL/AliEMCALJet.cxx b/EMCAL/AliEMCALJet.cxx
index 5403fa8d30effc87183f854cbd0033313c228058..6068f574ae40232d2a0470cc96c6c197289f4203 100644 (file)
--- a/EMCAL/AliEMCALJet.cxx
+++ b/EMCAL/AliEMCALJet.cxx
@@ -14,18 +14,7 @@
  **************************************************************************/
 
 
-/*
-$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.
-
-*/
+/* $Id$ */
 
 //*-- Author: Andreas Morsch (CERN)
 

diff --git a/EMCAL/AliEMCALJetFinder.h b/EMCAL/AliEMCALJetFinder.h
index d40b0d343b84386d63940040068d0cc1faac0d55..2f4d28430f1575b7aa0f4d1a2a702487a2a46990 100644 (file)
--- a/EMCAL/AliEMCALJetFinder.h
+++ b/EMCAL/AliEMCALJetFinder.h
@@ -20,6 +20,7 @@ class TList;
 class AliEMCALHadronCorrection;
 
 class AliEMCALJetFinder : public TTask {
+  friend class AliEMCALJetMicroDst; //PH Temporary solution
  public:
     AliEMCALJetFinder();
     AliEMCALJetFinder(const char* name, const char *title);

diff --git a/EMCAL/AliEMCALJetFinderAlgo.cxx b/EMCAL/AliEMCALJetFinderAlgo.cxx
index ec33227636d9a8e2403f2fd2174859a1bafcfcad..a715ce8b66384cfb187fedd85187fe2d068c80e5 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderAlgo.cxx
+++ b/EMCAL/AliEMCALJetFinderAlgo.cxx
@@ -14,14 +14,7 @@
  **************************************************************************/
 
 
-/*
-
-$Log$
-Revision 1.1.1.1  2003/05/29 18:55:23  horner
-Initial import - Mark
-
-
-*/  
+/* $Id$ */
 
 //_________________________________________________________________________
 //  Base Class for JetFinder Algorithms     

diff --git a/EMCAL/AliEMCALJetFinderAlgoOmni.cxx b/EMCAL/AliEMCALJetFinderAlgoOmni.cxx
index 9170a8ef406b8e8a8a1f4f8fc96c9c8b0f9ae294..fe69f0f6c3ae4871cb486965162068e2ff1b9ae0 100644 (file)
--- a/EMCAL/AliEMCALJetFinderAlgoOmni.cxx
+++ b/EMCAL/AliEMCALJetFinderAlgoOmni.cxx
@@ -17,14 +17,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- 
-$Log$
-
-
-
-*/
-
+/* $Id$ */
 
 //*--Author: Sarah Blyth (LBL)
 //*--Based on UA1 jet algorithm from LUND JETSET called from EMC-erj

diff --git a/EMCAL/AliEMCALJetFinderAlgoUA1.cxx b/EMCAL/AliEMCALJetFinderAlgoUA1.cxx
index 9b7442bcc4576ac53ce058d75c11b18b6da1c966..3afabe36cafb3f42a5f4905ed6f32f6b1c43f6a4 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderAlgoUA1.cxx
+++ b/EMCAL/AliEMCALJetFinderAlgoUA1.cxx
@@ -14,15 +14,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- 
-$Log$
-Revision 1.1.1.1  2003/05/29 18:55:31  horner
-Initial import - Mark
-
-
-*/
-
+/* $Id$ */
 
 //*--Author: Sarah Blyth (LBL)
 //*--Based on UA1 jet algorithm from LUND JETSET called from EMC-erj

diff --git a/EMCAL/AliEMCALJetFinderAlgoUA1BG.cxx b/EMCAL/AliEMCALJetFinderAlgoUA1BG.cxx
index dd69ce3de37e6766b32c40c134c52e99d8f4174e..9e0079dfc3bcf0e9edb41056411d598ba8cdbdf1 100644 (file)
--- a/EMCAL/AliEMCALJetFinderAlgoUA1BG.cxx
+++ b/EMCAL/AliEMCALJetFinderAlgoUA1BG.cxx
@@ -17,12 +17,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- 
-$Log$
-
-*/
-
+/* $Id$ */
 
 //*--Author: Sarah Blyth (LBL)
 //*--Based on UA1 jet algorithm from LUND JETSET called from EMC-erj

diff --git a/EMCAL/AliEMCALJetFinderAlgoUA1Hybrid.cxx b/EMCAL/AliEMCALJetFinderAlgoUA1Hybrid.cxx
index b46ea85778e09764f783e95d8ea50a64b7c3ef49..8f73114e2e1274d6c2e2b827102f24f66f2be879 100644 (file)
--- a/EMCAL/AliEMCALJetFinderAlgoUA1Hybrid.cxx
+++ b/EMCAL/AliEMCALJetFinderAlgoUA1Hybrid.cxx
@@ -19,18 +19,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- 
-$Log$
-Revision 1.3  2003/06/18 17:00:25  horner
-Cleaned up more cout statements - Mark
-
-Revision 1.2  2003/06/18 00:20:07  horner
-Removed cout statement - Mark
-
-
-*/
-
+/* $Id$ */
 
 //*--Author: Sarah Blyth (LBL)
 //*--Based on UA1 jet algorithm from LUND JETSET called from EMC-erj

diff --git a/EMCAL/AliEMCALJetFinderAlgoUA1Revised.cxx b/EMCAL/AliEMCALJetFinderAlgoUA1Revised.cxx
index 6644111b718456dd0b285c9bd5a339288a2aa8ef..c114ae9ed40ae2499a0722baa0394007db326355 100644 (file)
--- a/EMCAL/AliEMCALJetFinderAlgoUA1Revised.cxx
+++ b/EMCAL/AliEMCALJetFinderAlgoUA1Revised.cxx
@@ -17,12 +17,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- 
-$Log$
-
-*/
-
+/* $Id$ */
 
 //*--Author: Sarah Blyth (LBL)
 //*--Based on UA1 jet algorithm from LUND JETSET called from EMC-erj

diff --git a/EMCAL/AliEMCALJetFinderAlgoUA1Revised2.cxx b/EMCAL/AliEMCALJetFinderAlgoUA1Revised2.cxx
index f572e295fae402653e0b30dc8ebd4a05eda7cb9d..be512bfcdc0ef311d6abf10160a157acadfc3d3f 100644 (file)
--- a/EMCAL/AliEMCALJetFinderAlgoUA1Revised2.cxx
+++ b/EMCAL/AliEMCALJetFinderAlgoUA1Revised2.cxx
@@ -17,12 +17,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- 
-$Log$
-
-*/
-
+/* $Id$ */
 
 //*--Author: Sarah Blyth (LBL)
 //*--Based on UA1 jet algorithm from LUND JETSET called from EMC-erj

diff --git a/EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx b/EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx
index ea73ca0fe05fd2c6f5dc06c7c1948c0389a3f673..b41cff49163c95770a3ec98ec5d68795829117ae 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx
+++ b/EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx
@@ -14,14 +14,7 @@
  **************************************************************************/
 
 
-/*
- 
-$Log$
-Revision 1.1.1.1  2003/05/29 18:56:35  horner
-Initial import - Mark
-
- 
-*/
+/* $Id$ */
 
 //_________________________________________________________________________
 //  Unit used by UA1 algorithm

diff --git a/EMCAL/AliEMCALJetFinderInput.cxx b/EMCAL/AliEMCALJetFinderInput.cxx
index fa8ab2a41c41f6b144af34067be0e3e99b6d7020..abc8339e1320595751b0731c333a8b2943dcc52c 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderInput.cxx
+++ b/EMCAL/AliEMCALJetFinderInput.cxx
@@ -13,10 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/* $Log$
-  Revision 1.1.1.1  2003/05/29 18:56:35  horner
-  Initial import - Mark
-*/
+/* $Id$ */
 
 //________________________________________________________________________
 // Initial JetFinder input object

diff --git a/EMCAL/AliEMCALJetFinderInputPrep.cxx b/EMCAL/AliEMCALJetFinderInputPrep.cxx
index 710af17040e5a8a049e78b3e7ef7ba703ef884a7..4a4df09ab83340dd3b45ce426a829d5e4566cc28 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderInputPrep.cxx
+++ b/EMCAL/AliEMCALJetFinderInputPrep.cxx
@@ -13,14 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
- 
-$Log$
-Revision 1.1.1.1  2003/05/29 18:56:38  horner
-Initial import - Mark
-
- 
-*/
+/* $Id$ */
 
 //_________________________________________________________________________
 //  Base Class for JetFinder Input Preparation

diff --git a/EMCAL/AliEMCALJetFinderInputSimPrep.cxx b/EMCAL/AliEMCALJetFinderInputSimPrep.cxx
index b4f3ec99102a185c0f872144488b5df35f42bec2..a026a284e700d803f915d8443d05147b3d9f9cfd 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderInputSimPrep.cxx
+++ b/EMCAL/AliEMCALJetFinderInputSimPrep.cxx
@@ -14,14 +14,7 @@
  **************************************************************************/
 
 
-/*
- 
-$Log$
-Revision 1.1.1.1  2003/05/29 18:56:43  horner
-Initial import - Mark
-
- 
-*/
+/* $Id$ */
 
 //_________________________________________________________________________
 //  Class for JetFinder Input preparation from simulated data 

diff --git a/EMCAL/AliEMCALJetFinderOutput.cxx b/EMCAL/AliEMCALJetFinderOutput.cxx
index e9afce9cf0a203e4fe6979a3301f8dda66d704fd..04bb5891cac56e2a278c38323f438aaa2860dd3a 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderOutput.cxx
+++ b/EMCAL/AliEMCALJetFinderOutput.cxx
@@ -13,14 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-
-$Log$
-Revision 1.1.1.1  2003/05/29 18:56:53  horner
-Initial import - Mark
-
-
-*/
+/* $Id$ */
 
 //_________________________________________________________________________
 //  Output object for jetfinder

diff --git a/EMCAL/AliEMCALJetFinderPlots.cxx b/EMCAL/AliEMCALJetFinderPlots.cxx
index f5bc0d60dbd33a2ca949b7648a55231c6fe41c88..6c93658e00c1b4f7fdb35ece1a9547957fcb834e 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderPlots.cxx
+++ b/EMCAL/AliEMCALJetFinderPlots.cxx
@@ -15,14 +15,7 @@
  **************************************************************************/
 
 
-/*
- 
-$Log$
-Revision 1.1.1.1  2003/05/29 18:56:58  horner
-Initial import - Mark
-
-
-*/
+/* $Id$ */
 
 //_________________________________________________________________________
 //  Class for Filling JetFinder Plots

diff --git a/EMCAL/AliEMCALJetFinderTypes.h b/EMCAL/AliEMCALJetFinderTypes.h
index c8655437025066ef27b7be079fb0b7c85bb6ee6a..839b464d4e9a3966288bd1c14dfda93d3a7fb879 100755 (executable)
--- a/EMCAL/AliEMCALJetFinderTypes.h
+++ b/EMCAL/AliEMCALJetFinderTypes.h
@@ -14,14 +14,7 @@
  **************************************************************************/
 
 
-/*
-
-$Log$
-Revision 1.1.1.1  2003/05/29 18:57:13  horner
-Initial import - Mark
-
-
-*/
+/* $Id$ */
 
 //_________________________________________________________________________
 //  Enumerated types for use in JetFinder classes

diff --git a/EMCAL/EMCALLinkDef.h b/EMCAL/EMCALLinkDef.h
index 23582e4c7b26e1e661725550735120f18b3ca00d..4066148c9208eebf7b3af2dd33efcdc80e11f4df 100644 (file)
--- a/EMCAL/EMCALLinkDef.h
+++ b/EMCAL/EMCALLinkDef.h
@@ -44,5 +44,6 @@
 #pragma link C++ class AliEMCALRecParticle+;           
 #pragma link C++ class AliEMCALFastRecParticle+;               
 #pragma link C++ class AliEMCALPID+;           
-#pragma link C++ class AliEMCALPIDv1+;         
+#pragma link C++ class AliEMCALPIDv1+;
+#pragma link C++ class AliEMCALLoader+;        
 #endif

diff --git a/EMCAL/libEMCAL.pkg b/EMCAL/libEMCAL.pkg
index 71744d394a4803446820d5614ef0753500e97c78..0abfc3b8f43baafb978c378288766c2f519c4148 100644 (file)
--- a/EMCAL/libEMCAL.pkg
+++ b/EMCAL/libEMCAL.pkg
@@ -41,8 +41,11 @@ AliEMCALLink.cxx \
 AliEMCALRecParticle.cxx \
 AliEMCALFastRecParticle.cxx \
 AliEMCALPID.cxx \
-AliEMCALPIDv1.cxx 
+AliEMCALPIDv1.cxx \
+AliEMCALLoader.cxx
 
 HDRS= $(SRCS:.cxx=.h) 
 
 DHDR:=EMCALLinkDef.h
+
+EINCLUDE:=PYTHIA6