From ee6b678fd901cf80c9ad3b23e94efbb0496980ab Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 16 Jul 2003 08:52:47 +0000 Subject: [PATCH] Bug fixes. Log replaced by Id --- EMCAL/AliEMCALHadronCorrection.cxx | 7 +------ EMCAL/AliEMCALHadronCorrectionv0.cxx | 21 +-------------------- EMCAL/AliEMCALJet.cxx | 13 +------------ EMCAL/AliEMCALJetFinder.h | 1 + EMCAL/AliEMCALJetFinderAlgo.cxx | 9 +-------- EMCAL/AliEMCALJetFinderAlgoOmni.cxx | 9 +-------- EMCAL/AliEMCALJetFinderAlgoUA1.cxx | 10 +--------- EMCAL/AliEMCALJetFinderAlgoUA1BG.cxx | 7 +------ EMCAL/AliEMCALJetFinderAlgoUA1Hybrid.cxx | 13 +------------ EMCAL/AliEMCALJetFinderAlgoUA1Revised.cxx | 7 +------ EMCAL/AliEMCALJetFinderAlgoUA1Revised2.cxx | 7 +------ EMCAL/AliEMCALJetFinderAlgoUA1Unit.cxx | 9 +-------- EMCAL/AliEMCALJetFinderInput.cxx | 5 +---- EMCAL/AliEMCALJetFinderInputPrep.cxx | 9 +-------- EMCAL/AliEMCALJetFinderInputSimPrep.cxx | 9 +-------- EMCAL/AliEMCALJetFinderOutput.cxx | 9 +-------- EMCAL/AliEMCALJetFinderPlots.cxx | 9 +-------- EMCAL/AliEMCALJetFinderTypes.h | 9 +-------- EMCAL/EMCALLinkDef.h | 3 ++- EMCAL/libEMCAL.pkg | 5 ++++- 20 files changed, 24 insertions(+), 147 deletions(-) diff --git a/EMCAL/AliEMCALHadronCorrection.cxx b/EMCAL/AliEMCALHadronCorrection.cxx index 85a75daceb1..76bd113f1b1 100644 --- 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 49951a68a4c..eea01210458 100644 --- 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 5403fa8d30e..6068f574ae4 100644 --- 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 d40b0d343b8..2f4d28430f1 100644 --- 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 ec33227636d..a715ce8b663 100755 --- 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 9170a8ef406..fe69f0f6c3a 100644 --- 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 9b7442bcc45..3afabe36caf 100755 --- 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 dd69ce3de37..9e0079dfc3b 100644 --- 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 b46ea85778e..8f73114e2e1 100644 --- 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 6644111b718..c114ae9ed40 100644 --- 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 f572e295fae..be512bfcdc0 100644 --- 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 ea73ca0fe05..b41cff49163 100755 --- 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 fa8ab2a41c4..abc8339e132 100755 --- 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 710af17040e..4a4df09ab83 100755 --- 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 b4f3ec99102..a026a284e70 100755 --- 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 e9afce9cf0a..04bb5891cac 100755 --- 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 f5bc0d60dbd..6c93658e00c 100755 --- 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 c8655437025..839b464d4e9 100755 --- 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 23582e4c7b2..4066148c920 100644 --- 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 71744d394a4..0abfc3b8f43 100644 --- 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 -- 2.43.0