From c580e18231cdbb2d4da6b590f170bc11e55ecf7f Mon Sep 17 00:00:00 2001 From: richterm Date: Sat, 27 Jun 2009 05:52:15 +0000 Subject: [PATCH] - setting properties for keyword substitution - removing duplicate LinkDef for AliHLTTrigger - adding LinkDef for HLTbase to build system and moving dict definition of AliHLTComponentDataType from AliHLTTrigger to HLTbase --- HLT/AliHLTTriggerLinkDef.h | 16 ------------ HLT/BASE/AliHLTDomainEntry.cxx | 1 + HLT/BASE/AliHLTDomainEntry.h | 2 ++ HLT/BASE/AliHLTGlobalTriggerDecision.cxx | 1 + HLT/BASE/AliHLTGlobalTriggerDecision.h | 2 ++ HLT/BASE/AliHLTReadoutList.cxx | 1 + HLT/BASE/AliHLTReadoutList.h | 2 ++ HLT/BASE/AliHLTTriggerDecision.cxx | 1 + HLT/BASE/AliHLTTriggerDecision.h | 2 ++ HLT/BASE/AliHLTTriggerDomain.cxx | 1 + HLT/BASE/AliHLTTriggerDomain.h | 2 ++ HLT/BASE/AliHLTTriggerMenu.cxx | 1 + HLT/BASE/AliHLTTriggerMenu.h | 2 ++ HLT/BASE/AliHLTTriggerMenuItem.cxx | 1 + HLT/BASE/AliHLTTriggerMenuItem.h | 2 ++ HLT/BASE/AliHLTTriggerMenuSymbol.cxx | 1 + HLT/BASE/AliHLTTriggerMenuSymbol.h | 2 ++ HLT/{ => BASE}/HLTbaseLinkDef.h | 27 ++++++++++---------- HLT/libHLTbase.pkg | 2 +- HLT/trigger/AliHLTGlobalTrigger.cxx | 1 + HLT/trigger/AliHLTGlobalTrigger.h | 2 ++ HLT/trigger/AliHLTGlobalTriggerComponent.cxx | 1 + HLT/trigger/AliHLTGlobalTriggerComponent.h | 2 ++ HLT/trigger/AliHLTGlobalTriggerConfig.cxx | 1 + HLT/trigger/AliHLTGlobalTriggerConfig.h | 2 ++ HLT/trigger/AliHLTTriggerLinkDef.h | 3 +-- 26 files changed, 49 insertions(+), 32 deletions(-) delete mode 100644 HLT/AliHLTTriggerLinkDef.h rename HLT/{ => BASE}/HLTbaseLinkDef.h (77%) diff --git a/HLT/AliHLTTriggerLinkDef.h b/HLT/AliHLTTriggerLinkDef.h deleted file mode 100644 index 435fff7f8ac..00000000000 --- a/HLT/AliHLTTriggerLinkDef.h +++ /dev/null @@ -1,16 +0,0 @@ -// @(#) $Id: AliHLTTriggerLinkDef.h 27712 2008-07-31 14:38:57Z fca $ - -#ifdef __CINT__ - -#pragma link off all globals; -#pragma link off all classes; -#pragma link off all functions; - -#pragma link C++ class AliHLTEventSummary+; -#pragma link C++ class AliHLTEventSummaryProducerComponent+; -#pragma link C++ class AliHLTRunSummary+; -#pragma link C++ class AliHLTRunSummaryProducerComponent+; -#pragma link C++ class AliHLTTriggerSelectiveReadoutComponent+; - -#endif - diff --git a/HLT/BASE/AliHLTDomainEntry.cxx b/HLT/BASE/AliHLTDomainEntry.cxx index 07ca2874b3a..7bfda707fb3 100644 --- a/HLT/BASE/AliHLTDomainEntry.cxx +++ b/HLT/BASE/AliHLTDomainEntry.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/BASE/AliHLTDomainEntry.h b/HLT/BASE/AliHLTDomainEntry.h index d559b8e2a5c..1ded44a272d 100644 --- a/HLT/BASE/AliHLTDomainEntry.h +++ b/HLT/BASE/AliHLTDomainEntry.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTDOMAINENTRY_H #define ALIHLTDOMAINENTRY_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/BASE/AliHLTGlobalTriggerDecision.cxx b/HLT/BASE/AliHLTGlobalTriggerDecision.cxx index 62d29472d7d..4d618a01833 100644 --- a/HLT/BASE/AliHLTGlobalTriggerDecision.cxx +++ b/HLT/BASE/AliHLTGlobalTriggerDecision.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/BASE/AliHLTGlobalTriggerDecision.h b/HLT/BASE/AliHLTGlobalTriggerDecision.h index 384f9cd68b6..0787ed600ac 100644 --- a/HLT/BASE/AliHLTGlobalTriggerDecision.h +++ b/HLT/BASE/AliHLTGlobalTriggerDecision.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTGLOBALTRIGGERDECISION_H #define ALIHLTGLOBALTRIGGERDECISION_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/BASE/AliHLTReadoutList.cxx b/HLT/BASE/AliHLTReadoutList.cxx index a38373a6c5e..bd054c8fbc8 100644 --- a/HLT/BASE/AliHLTReadoutList.cxx +++ b/HLT/BASE/AliHLTReadoutList.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/BASE/AliHLTReadoutList.h b/HLT/BASE/AliHLTReadoutList.h index 64bfe0d6a30..aa125df1e8c 100644 --- a/HLT/BASE/AliHLTReadoutList.h +++ b/HLT/BASE/AliHLTReadoutList.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTREADOUTLIST_H #define ALIHLTREADOUTLIST_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/BASE/AliHLTTriggerDecision.cxx b/HLT/BASE/AliHLTTriggerDecision.cxx index f055996fb3b..a7e5bd62476 100644 --- a/HLT/BASE/AliHLTTriggerDecision.cxx +++ b/HLT/BASE/AliHLTTriggerDecision.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/BASE/AliHLTTriggerDecision.h b/HLT/BASE/AliHLTTriggerDecision.h index 3b5bd04953b..377b564ef04 100644 --- a/HLT/BASE/AliHLTTriggerDecision.h +++ b/HLT/BASE/AliHLTTriggerDecision.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTTRIGGERDECISION_H #define ALIHLTTRIGGERDECISION_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/BASE/AliHLTTriggerDomain.cxx b/HLT/BASE/AliHLTTriggerDomain.cxx index 02e5dac97fa..f6ce74f8f39 100644 --- a/HLT/BASE/AliHLTTriggerDomain.cxx +++ b/HLT/BASE/AliHLTTriggerDomain.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/BASE/AliHLTTriggerDomain.h b/HLT/BASE/AliHLTTriggerDomain.h index eba32b076f0..e4a81cb6d04 100644 --- a/HLT/BASE/AliHLTTriggerDomain.h +++ b/HLT/BASE/AliHLTTriggerDomain.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTTRIGGERDOMAIN_H #define ALIHLTTRIGGERDOMAIN_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/BASE/AliHLTTriggerMenu.cxx b/HLT/BASE/AliHLTTriggerMenu.cxx index 4b86c87f363..edb3105d52c 100644 --- a/HLT/BASE/AliHLTTriggerMenu.cxx +++ b/HLT/BASE/AliHLTTriggerMenu.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/BASE/AliHLTTriggerMenu.h b/HLT/BASE/AliHLTTriggerMenu.h index ca4c93e810b..656a7d9cac5 100644 --- a/HLT/BASE/AliHLTTriggerMenu.h +++ b/HLT/BASE/AliHLTTriggerMenu.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTTRIGGERMENU_H #define ALIHLTTRIGGERMENU_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/BASE/AliHLTTriggerMenuItem.cxx b/HLT/BASE/AliHLTTriggerMenuItem.cxx index 240e551d073..a41fdabf77a 100644 --- a/HLT/BASE/AliHLTTriggerMenuItem.cxx +++ b/HLT/BASE/AliHLTTriggerMenuItem.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/BASE/AliHLTTriggerMenuItem.h b/HLT/BASE/AliHLTTriggerMenuItem.h index 726b82a3dc7..8815810ab7f 100644 --- a/HLT/BASE/AliHLTTriggerMenuItem.h +++ b/HLT/BASE/AliHLTTriggerMenuItem.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTTRIGGERMENUITEM_H #define ALIHLTTRIGGERMENUITEM_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/BASE/AliHLTTriggerMenuSymbol.cxx b/HLT/BASE/AliHLTTriggerMenuSymbol.cxx index 5ee78da07ca..51eb016f4d7 100644 --- a/HLT/BASE/AliHLTTriggerMenuSymbol.cxx +++ b/HLT/BASE/AliHLTTriggerMenuSymbol.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/BASE/AliHLTTriggerMenuSymbol.h b/HLT/BASE/AliHLTTriggerMenuSymbol.h index 99d2a664aa8..ff65ece3961 100644 --- a/HLT/BASE/AliHLTTriggerMenuSymbol.h +++ b/HLT/BASE/AliHLTTriggerMenuSymbol.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTTRIGGERMENUSYMBOL_H #define ALIHLTTRIGGERMENUSYMBOL_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/HLTbaseLinkDef.h b/HLT/BASE/HLTbaseLinkDef.h similarity index 77% rename from HLT/HLTbaseLinkDef.h rename to HLT/BASE/HLTbaseLinkDef.h index cefbe33327c..881cc0fd4be 100644 --- a/HLT/HLTbaseLinkDef.h +++ b/HLT/BASE/HLTbaseLinkDef.h @@ -1,6 +1,4 @@ -//automatically generated ROOT DICT definition -//!!! DO NOT EDIT THIS FILE !!! -//add further class definitions to the CLASS_HDRS variable in Makefile.am +// $Id:$ #ifdef __CINT__ #pragma link off all globals; #pragma link off all classes; @@ -9,6 +7,7 @@ #pragma link C++ class AliHLTComponentHandler+; #pragma link C++ class AliHLTSystem+; #pragma link C++ class AliHLTReconstructorBase+; +#pragma link C++ class AliHLTPluginBase+; #pragma link C++ class AliHLTProcessor+; #pragma link C++ class AliHLTCalibrationProcessor+; #pragma link C++ class AliHLTConfiguration+; @@ -34,23 +33,25 @@ #pragma link C++ class AliHLTDAQ+; #pragma link C++ class AliHLTOUT+; #pragma link C++ class AliHLTOUTHomerBuffer+; -#pragma link C++ class AliHLTOUTHandlerChain+; #pragma link C++ class AliHLTOUTTask+; #pragma link C++ class AliHLTOUTHandler+; #pragma link C++ class AliHLTOUTHandlerEquId+; #pragma link C++ class AliHLTOUTHandlerDetectorDDL+; +#pragma link C++ class AliHLTOUTHandlerChain+; #pragma link C++ class AliHLTMemoryFile+; #pragma link C++ class AliHLTMessage+; #pragma link C++ class AliHLTEventStatistics+; #pragma link C++ class AliHLTBlockDataCollection+; -#pragma link C++ class AliHLTTriggerDecision.h+; -#pragma link C++ class AliHLTGlobalTriggerDecision.h+; -#pragma link C++ class AliHLTReadoutList.h+; -#pragma link C++ class AliHLTTriggerDomain.h+; -#pragma link C++ class AliHLTDomainEntry.h+; -#pragma link C++ class AliHLTTriggerMenu.h+; -#pragma link C++ class AliHLTTriggerMenuItem.h+; -#pragma link C++ class AliHLTTriggerMenuSymbol.h+; +#pragma link C++ class AliHLTTriggerDecision+; +#pragma link C++ class AliHLTGlobalTriggerDecision+; +#pragma link C++ class AliHLTReadoutList+; +#pragma link C++ class AliHLTTriggerDomain+; +#pragma link C++ class AliHLTDomainEntry+; +#pragma link C++ class AliHLTTriggerMenu+; +#pragma link C++ class AliHLTTriggerMenuItem+; +#pragma link C++ class AliHLTTriggerMenuSymbol+; #pragma link C++ class AliHLTRunStatistics+; -#pragma link C++ class AliHLTPluginBase+; +#pragma link C++ class AliHLTKalmanTrack+; +#pragma link C++ struct AliHLTComponentDataType+; +#pragma link C++ struct AliHLTEventDDL+; #endif diff --git a/HLT/libHLTbase.pkg b/HLT/libHLTbase.pkg index 81083a994e1..058f499a82b 100644 --- a/HLT/libHLTbase.pkg +++ b/HLT/libHLTbase.pkg @@ -68,7 +68,7 @@ MODULE_HDRS:= $(CLASS_HDRS) \ AliHLTDefinitions.h \ AliHLTStdIncludes.h -MODULE_DHDR:= +MODULE_DHDR:= HLTbaseLinkDef.h SRCS:=$(patsubst %,BASE/%,$(MODULE_SRCS)) CINTHDRS:=$(patsubst %,BASE/%,$(CLASS_HDRS)) diff --git a/HLT/trigger/AliHLTGlobalTrigger.cxx b/HLT/trigger/AliHLTGlobalTrigger.cxx index 6d3b345b94e..e931ebbc893 100644 --- a/HLT/trigger/AliHLTGlobalTrigger.cxx +++ b/HLT/trigger/AliHLTGlobalTrigger.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/trigger/AliHLTGlobalTrigger.h b/HLT/trigger/AliHLTGlobalTrigger.h index 232b6470579..b076f5b240c 100644 --- a/HLT/trigger/AliHLTGlobalTrigger.h +++ b/HLT/trigger/AliHLTGlobalTrigger.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTGLOBALTRIGGER_H #define ALIHLTGLOBALTRIGGER_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/trigger/AliHLTGlobalTriggerComponent.cxx b/HLT/trigger/AliHLTGlobalTriggerComponent.cxx index 0c400723e8b..1c60c435a77 100644 --- a/HLT/trigger/AliHLTGlobalTriggerComponent.cxx +++ b/HLT/trigger/AliHLTGlobalTriggerComponent.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/trigger/AliHLTGlobalTriggerComponent.h b/HLT/trigger/AliHLTGlobalTriggerComponent.h index d97e0733d6b..76b4df07e14 100644 --- a/HLT/trigger/AliHLTGlobalTriggerComponent.h +++ b/HLT/trigger/AliHLTGlobalTriggerComponent.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTGLOBALTRIGGERCOMPONENT_H #define ALIHLTGLOBALTRIGGERCOMPONENT_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/trigger/AliHLTGlobalTriggerConfig.cxx b/HLT/trigger/AliHLTGlobalTriggerConfig.cxx index 52b3dcb5cda..091c537a23d 100644 --- a/HLT/trigger/AliHLTGlobalTriggerConfig.cxx +++ b/HLT/trigger/AliHLTGlobalTriggerConfig.cxx @@ -1,3 +1,4 @@ +// $Id:$ /************************************************************************** * This file is property of and copyright by the ALICE HLT Project * * ALICE Experiment at CERN, All rights reserved. * diff --git a/HLT/trigger/AliHLTGlobalTriggerConfig.h b/HLT/trigger/AliHLTGlobalTriggerConfig.h index 8c03ba7866f..153a9bc1218 100644 --- a/HLT/trigger/AliHLTGlobalTriggerConfig.h +++ b/HLT/trigger/AliHLTGlobalTriggerConfig.h @@ -1,3 +1,5 @@ +//-*- Mode: C++ -*- +// $Id:$ #ifndef ALIHLTGLOBALTRIGGERCONFIG_H #define ALIHLTGLOBALTRIGGERCONFIG_H /* This file is property of and copyright by the ALICE HLT Project * diff --git a/HLT/trigger/AliHLTTriggerLinkDef.h b/HLT/trigger/AliHLTTriggerLinkDef.h index cfee4835ac1..6ea51571111 100644 --- a/HLT/trigger/AliHLTTriggerLinkDef.h +++ b/HLT/trigger/AliHLTTriggerLinkDef.h @@ -1,10 +1,9 @@ +// $Id:$ #ifdef __CINT__ #pragma link off all globals; #pragma link off all classes; #pragma link off all functions; #pragma link C++ class AliHLTTrigger+; -#pragma link C++ struct AliHLTComponentDataType+; -#pragma link C++ struct AliHLTEventDDL+; #pragma link C++ class AliHLTGlobalTrigger+; #pragma link C++ class AliHLTGlobalTriggerConfig+; #pragma link C++ class AliHLTGlobalTriggerComponent+; -- 2.39.3