moving trigger description classes to HLTbase to make them commonly available

diff --git a/HLT/trigger/AliHLTDomainEntry.cxx b/HLT/BASE/AliHLTDomainEntry.cxx
similarity index 100%
rename from HLT/trigger/AliHLTDomainEntry.cxx
rename to HLT/BASE/AliHLTDomainEntry.cxx

diff --git a/HLT/trigger/AliHLTDomainEntry.h b/HLT/BASE/AliHLTDomainEntry.h
similarity index 100%
rename from HLT/trigger/AliHLTDomainEntry.h
rename to HLT/BASE/AliHLTDomainEntry.h

diff --git a/HLT/trigger/AliHLTGlobalTriggerDecision.cxx b/HLT/BASE/AliHLTGlobalTriggerDecision.cxx
similarity index 100%
rename from HLT/trigger/AliHLTGlobalTriggerDecision.cxx
rename to HLT/BASE/AliHLTGlobalTriggerDecision.cxx

diff --git a/HLT/trigger/AliHLTGlobalTriggerDecision.h b/HLT/BASE/AliHLTGlobalTriggerDecision.h
similarity index 100%
rename from HLT/trigger/AliHLTGlobalTriggerDecision.h
rename to HLT/BASE/AliHLTGlobalTriggerDecision.h

diff --git a/HLT/trigger/AliHLTReadoutList.cxx b/HLT/BASE/AliHLTReadoutList.cxx
similarity index 98%
rename from HLT/trigger/AliHLTReadoutList.cxx
rename to HLT/BASE/AliHLTReadoutList.cxx
index 8301c85..a38373a 100644 (file)
--- a/HLT/trigger/AliHLTReadoutList.cxx
+++ b/HLT/BASE/AliHLTReadoutList.cxx
@@ -29,7 +29,7 @@
 /// from individual components that derive from AliHLTTrigger.
 
 #include "AliHLTReadoutList.h"
-#include "AliDAQ.h"
+#include "AliHLTDAQ.h"
 #include "Riostream.h"
 #include "TString.h"
 #include "TObjString.h"
@@ -367,14 +367,14 @@ void AliHLTReadoutList::Print(Option_t* /*option*/) const
   // Prints the DDLs that will be readout according to this readout list.
   
   cout << "Readout enabled for DDLs:" << endl;
-  for (Int_t i = 0; i < AliDAQ::kNDetectors; i++)
+  for (Int_t i = 0; i < AliHLTDAQ::NumberOfDetectors(); i++)
   {
-    Int_t maxddls = AliDAQ::NumberOfDdls(i);
-    cout << AliDAQ::DetectorName(i) << ":";
+    Int_t maxddls = AliHLTDAQ::NumberOfDdls(i);
+    cout << AliHLTDAQ::DetectorName(i) << ":";
     bool nonefound = true;
     for (Int_t j = 0; j < maxddls; j++)
     {
-      Int_t ddlId = ( ((i == AliDAQ::kNDetectors-1) ? 30 : i) << 8 ) + j;
+      Int_t ddlId = ( ((i == AliHLTDAQ::NumberOfDetectors()-1) ? 30 : i) << 8 ) + j;
       if (GetDDLBit(ddlId))
       {
         cout << " " << ddlId;

diff --git a/HLT/trigger/AliHLTReadoutList.h b/HLT/BASE/AliHLTReadoutList.h
similarity index 100%
rename from HLT/trigger/AliHLTReadoutList.h
rename to HLT/BASE/AliHLTReadoutList.h

diff --git a/HLT/trigger/AliHLTTriggerDecision.cxx b/HLT/BASE/AliHLTTriggerDecision.cxx
similarity index 100%
rename from HLT/trigger/AliHLTTriggerDecision.cxx
rename to HLT/BASE/AliHLTTriggerDecision.cxx

diff --git a/HLT/trigger/AliHLTTriggerDecision.h b/HLT/BASE/AliHLTTriggerDecision.h
similarity index 100%
rename from HLT/trigger/AliHLTTriggerDecision.h
rename to HLT/BASE/AliHLTTriggerDecision.h

diff --git a/HLT/trigger/AliHLTTriggerDomain.cxx b/HLT/BASE/AliHLTTriggerDomain.cxx
similarity index 97%
rename from HLT/trigger/AliHLTTriggerDomain.cxx
rename to HLT/BASE/AliHLTTriggerDomain.cxx
index c8b8944..02e5dac 100644 (file)
--- a/HLT/trigger/AliHLTTriggerDomain.cxx
+++ b/HLT/BASE/AliHLTTriggerDomain.cxx
@@ -30,7 +30,7 @@
 #include "Riostream.h"
 #include "TObjArray.h"
 #include "TObjString.h"
-#include "AliDAQ.h"
+#include "AliHLTDAQ.h"
 
 ClassImp(AliHLTTriggerDomain)
 
@@ -163,7 +163,7 @@ void AliHLTTriggerDomain::Add(const AliHLTReadoutList& list)
   // Adds the readout list to the trigger domain.
   // See header file for more details.
   
-  Int_t detId[AliDAQ::kNDetectors] = {
+  Int_t detId[] = {
       AliHLTReadoutList::kITSSPD, AliHLTReadoutList::kITSSDD, AliHLTReadoutList::kITSSSD,
       AliHLTReadoutList::kTPC, AliHLTReadoutList::kTRD, AliHLTReadoutList::kTOF,
       AliHLTReadoutList::kHMPID, AliHLTReadoutList::kPHOS, AliHLTReadoutList::kCPV,
@@ -173,18 +173,18 @@ void AliHLTTriggerDomain::Add(const AliHLTReadoutList& list)
       AliHLTReadoutList::kEMCAL, AliHLTReadoutList::kDAQTEST, AliHLTReadoutList::kHLT
     };
   
-  for (Int_t deti = 0; deti < AliDAQ::kNDetectors; deti++)
+  for (Int_t deti = 0; deti < AliHLTDAQ::NumberOfDetectors() && deti<(sizeof(detId)/sizeof(Int_t)); deti++)
   {
     if (list.DetectorEnabled(detId[deti]))
     {
-      Add("DAQRDOUT", AliDAQ::OnlineName(deti));
+      Add("DAQRDOUT", AliHLTDAQ::OnlineName(deti));
     }
     else
     {
-      for (Int_t i = 0; i < AliDAQ::NumberOfDdls(deti); i++)
+      for (Int_t i = 0; i < AliHLTDAQ::NumberOfDdls(deti); i++)
       {
-        Int_t ddlId = AliDAQ::DdlID(deti, i);
-        if (list.IsDDLEnabled(ddlId)) Add("DAQRDOUT", AliDAQ::OnlineName(deti), ddlId);
+        Int_t ddlId = AliHLTDAQ::DdlID(deti, i);
+        if (list.IsDDLEnabled(ddlId)) Add("DAQRDOUT", AliHLTDAQ::OnlineName(deti), ddlId);
       }
     }
   }
@@ -293,7 +293,7 @@ void AliHLTTriggerDomain::Remove(const AliHLTReadoutList& list)
   // Removes the entries in the readout list from the trigger domain that are enabled.
   // See header file for more details.
   
-  Int_t detId[AliDAQ::kNDetectors] = {
+  Int_t detId[] = {
       AliHLTReadoutList::kITSSPD, AliHLTReadoutList::kITSSDD, AliHLTReadoutList::kITSSSD,
       AliHLTReadoutList::kTPC, AliHLTReadoutList::kTRD, AliHLTReadoutList::kTOF,
       AliHLTReadoutList::kHMPID, AliHLTReadoutList::kPHOS, AliHLTReadoutList::kCPV,
@@ -303,18 +303,18 @@ void AliHLTTriggerDomain::Remove(const AliHLTReadoutList& list)
       AliHLTReadoutList::kEMCAL, AliHLTReadoutList::kDAQTEST, AliHLTReadoutList::kHLT
     };
   
-  for (Int_t deti = 0; deti < AliDAQ::kNDetectors; deti++)
+  for (Int_t deti = 0; deti < AliHLTDAQ::NumberOfDetectors() && deti<(sizeof(detId)/sizeof(Int_t)); deti++)
   {
     if (list.DetectorEnabled(detId[deti]))
     {
-      Remove("DAQRDOUT", AliDAQ::OnlineName(deti));
+      Remove("DAQRDOUT", AliHLTDAQ::OnlineName(deti));
     }
     else
     {
-      for (Int_t i = 0; i < AliDAQ::NumberOfDdls(deti); i++)
+      for (Int_t i = 0; i < AliHLTDAQ::NumberOfDdls(deti); i++)
       {
-        Int_t ddlId = AliDAQ::DdlID(deti, i);
-        if (list.IsDDLEnabled(ddlId)) Remove("DAQRDOUT", AliDAQ::OnlineName(deti), ddlId);
+        Int_t ddlId = AliHLTDAQ::DdlID(deti, i);
+        if (list.IsDDLEnabled(ddlId)) Remove("DAQRDOUT", AliHLTDAQ::OnlineName(deti), ddlId);
       }
     }
   }
@@ -835,12 +835,12 @@ AliHLTTriggerDomain::operator AliHLTReadoutList () const
   // Typecast operator which constructs a readout list from the trigger domain.
   
   AliHLTReadoutList result;
-  for (Int_t deti = 0; deti < AliDAQ::kNDetectors; deti++)
+  for (Int_t deti = 0; deti < AliHLTDAQ::NumberOfDetectors(); deti++)
   {
-    for (Int_t i = 0; i < AliDAQ::NumberOfDdls(deti); i++)
+    for (Int_t i = 0; i < AliHLTDAQ::NumberOfDdls(deti); i++)
     {
-      Int_t ddlId = AliDAQ::DdlID(deti, i);
-      if (Contains(AliHLTDomainEntry("DAQRDOUT", AliDAQ::OnlineName(deti), ddlId)))
+      Int_t ddlId = AliHLTDAQ::DdlID(deti, i);
+      if (Contains(AliHLTDomainEntry("DAQRDOUT", AliHLTDAQ::OnlineName(deti), ddlId)))
       {
         result.EnableDDLBit(ddlId);
       }

diff --git a/HLT/trigger/AliHLTTriggerDomain.h b/HLT/BASE/AliHLTTriggerDomain.h
similarity index 100%
rename from HLT/trigger/AliHLTTriggerDomain.h
rename to HLT/BASE/AliHLTTriggerDomain.h

diff --git a/HLT/trigger/AliHLTTriggerMenu.cxx b/HLT/BASE/AliHLTTriggerMenu.cxx
similarity index 100%
rename from HLT/trigger/AliHLTTriggerMenu.cxx
rename to HLT/BASE/AliHLTTriggerMenu.cxx

diff --git a/HLT/trigger/AliHLTTriggerMenu.h b/HLT/BASE/AliHLTTriggerMenu.h
similarity index 100%
rename from HLT/trigger/AliHLTTriggerMenu.h
rename to HLT/BASE/AliHLTTriggerMenu.h

diff --git a/HLT/trigger/AliHLTTriggerMenuItem.cxx b/HLT/BASE/AliHLTTriggerMenuItem.cxx
similarity index 100%
rename from HLT/trigger/AliHLTTriggerMenuItem.cxx
rename to HLT/BASE/AliHLTTriggerMenuItem.cxx

diff --git a/HLT/trigger/AliHLTTriggerMenuItem.h b/HLT/BASE/AliHLTTriggerMenuItem.h
similarity index 100%
rename from HLT/trigger/AliHLTTriggerMenuItem.h
rename to HLT/BASE/AliHLTTriggerMenuItem.h

diff --git a/HLT/trigger/AliHLTTriggerMenuSymbol.cxx b/HLT/BASE/AliHLTTriggerMenuSymbol.cxx
similarity index 100%
rename from HLT/trigger/AliHLTTriggerMenuSymbol.cxx
rename to HLT/BASE/AliHLTTriggerMenuSymbol.cxx

diff --git a/HLT/trigger/AliHLTTriggerMenuSymbol.h b/HLT/BASE/AliHLTTriggerMenuSymbol.h
similarity index 100%
rename from HLT/trigger/AliHLTTriggerMenuSymbol.h
rename to HLT/BASE/AliHLTTriggerMenuSymbol.h

diff --git a/HLT/CMake_libAliHLTTrigger.txt b/HLT/CMake_libAliHLTTrigger.txt
index 8495312..07618c6 100644 (file)
--- a/HLT/CMake_libAliHLTTrigger.txt
+++ b/HLT/CMake_libAliHLTTrigger.txt
@@ -2,14 +2,6 @@
 
 set(SRCS
 trigger/AliHLTTrigger.cxx
-trigger/AliHLTTriggerDecision.cxx
-trigger/AliHLTTriggerDomain.cxx
-trigger/AliHLTDomainEntry.cxx
-trigger/AliHLTReadoutList.cxx
-trigger/AliHLTTriggerMenu.cxx
-trigger/AliHLTTriggerMenuItem.cxx
-trigger/AliHLTTriggerMenuSymbol.cxx
-trigger/AliHLTGlobalTriggerDecision.cxx
 trigger/AliHLTGlobalTrigger.cxx
 trigger/AliHLTGlobalTriggerConfig.cxx
 trigger/AliHLTGlobalTriggerComponent.cxx

diff --git a/HLT/CMake_libHLTbase.txt b/HLT/CMake_libHLTbase.txt
index 07d5bff..5889199 100644 (file)
--- a/HLT/CMake_libHLTbase.txt
+++ b/HLT/CMake_libHLTbase.txt
@@ -40,6 +40,14 @@ BASE/AliHLTMemoryFile.cxx
 BASE/AliHLTMessage.cxx
 BASE/AliHLTEventStatistics.cxx
 BASE/AliHLTBlockDataCollection.cxx
+BASE/AliHLTTriggerDecision.h      
+BASE/AliHLTGlobalTriggerDecision.h
+BASE/AliHLTReadoutList.h          
+BASE/AliHLTTriggerDomain.h        
+BASE/AliHLTDomainEntry.h          
+BASE/AliHLTTriggerMenu.h          
+BASE/AliHLTTriggerMenuItem.h      
+BASE/AliHLTTriggerMenuSymbol.h    
 BASE/AliHLTRunStatistics.cxx
 BASE/AliHLT_C_Component_WrapperInterface.cxx
 BASE/AliHLTDataTypes.cxx 

diff --git a/HLT/HLTbaseLinkDef.h b/HLT/HLTbaseLinkDef.h
index 27061b0..cefbe33 100644 (file)
--- a/HLT/HLTbaseLinkDef.h
+++ b/HLT/HLTbaseLinkDef.h
@@ -43,6 +43,14 @@
 #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 AliHLTRunStatistics+;
 #pragma link C++ class AliHLTPluginBase+;
 #endif

diff --git a/HLT/libAliHLTTrigger.pkg b/HLT/libAliHLTTrigger.pkg
index aa9dd4f..59cb855 100644 (file)
--- a/HLT/libAliHLTTrigger.pkg
+++ b/HLT/libAliHLTTrigger.pkg
@@ -10,14 +10,6 @@
 # will be created from the names of the header files
 CLASS_HDRS:= \
                 AliHLTTrigger.h                             \
-                AliHLTTriggerDecision.h                     \
-                AliHLTTriggerDomain.h                       \
-                AliHLTDomainEntry.h                         \
-                AliHLTReadoutList.h                         \
-                AliHLTTriggerMenu.h                         \
-                AliHLTTriggerMenuItem.h                     \
-                AliHLTTriggerMenuSymbol.h                   \
-                AliHLTGlobalTriggerDecision.h               \
                 AliHLTGlobalTrigger.h                       \
                 AliHLTGlobalTriggerConfig.h                 \
                 AliHLTGlobalTriggerComponent.h              \

diff --git a/HLT/libHLTbase.pkg b/HLT/libHLTbase.pkg
index 8d0ed0a..81083a9 100644 (file)
--- a/HLT/libHLTbase.pkg
+++ b/HLT/libHLTbase.pkg
@@ -42,6 +42,14 @@ CLASS_HDRS:=         AliHLTComponent.h \
                AliHLTMessage.h \
                AliHLTEventStatistics.h \
                AliHLTBlockDataCollection.h \
+                AliHLTTriggerDecision.h                     \
+                AliHLTGlobalTriggerDecision.h               \
+                AliHLTReadoutList.h                         \
+                AliHLTTriggerDomain.h                       \
+                AliHLTDomainEntry.h                         \
+                AliHLTTriggerMenu.h                         \
+                AliHLTTriggerMenuItem.h                     \
+                AliHLTTriggerMenuSymbol.h                   \
                 AliHLTRunStatistics.h \
                 AliHLTKalmanTrack.h
 

diff --git a/HLT/trigger/AliHLTTriggerLinkDef.h b/HLT/trigger/AliHLTTriggerLinkDef.h
index 41eea0a..cfee483 100644 (file)
--- a/HLT/trigger/AliHLTTriggerLinkDef.h
+++ b/HLT/trigger/AliHLTTriggerLinkDef.h
@@ -3,13 +3,8 @@
 #pragma link off all classes;
 #pragma link off all functions;
 #pragma link C++ class AliHLTTrigger+;
-#pragma link C++ class AliHLTTriggerDecision+;
-#pragma link C++ class AliHLTTriggerDomain+;
 #pragma link C++ struct AliHLTComponentDataType+;
-#pragma link C++ class AliHLTDomainEntry+;
 #pragma link C++ struct AliHLTEventDDL+;
-#pragma link C++ class AliHLTReadoutList+;
-#pragma link C++ class AliHLTGlobalTriggerDecision+;
 #pragma link C++ class AliHLTGlobalTrigger+;
 #pragma link C++ class AliHLTGlobalTriggerConfig+;
 #pragma link C++ class AliHLTGlobalTriggerComponent+;
@@ -20,7 +15,4 @@
 #pragma link C++ class AliHLTRunSummaryProducerComponent+;
 #pragma link C++ class AliHLTTriggerSelectiveReadoutComponent+;
 #pragma link C++ class AliHLTTriggerMonitoringComponent+;
-#pragma link C++ class AliHLTTriggerMenu+;
-#pragma link C++ class AliHLTTriggerMenuItem+;
-#pragma link C++ class AliHLTTriggerMenuSymbol+;
 #endif