General AliHLTComponent data types for ROOT objects added

diff --git a/HLT/BASE/AliHLTDataTypes.cxx b/HLT/BASE/AliHLTDataTypes.cxx
index f71ea5e4b39fe51aa30159368efa64904b2da99c..e1a4ba6014609dd8cbcbddc61776593a787e1d1a 100644 (file)
--- a/HLT/BASE/AliHLTDataTypes.cxx
+++ b/HLT/BASE/AliHLTDataTypes.cxx
@@ -139,6 +139,40 @@ const AliHLTComponentDataType kAliHLTDataTypeRunSummary = (AliHLTComponentDataTy
   kAliHLTDataOriginAny
 }|kAliHLTDataOriginOut;
 
+/** general ROOT TObject */
+const AliHLTComponentDataType kAliHLTDataTypeTObject = (AliHLTComponentDataType) {
+  sizeof(AliHLTComponentDataType),
+  kAliHLTTObjectDataTypeID,
+  kAliHLTDataOriginAny
+};
+
+/** ROOT TObjArray */
+const AliHLTComponentDataType kAliHLTDataTypeTObjArray = (AliHLTComponentDataType) {
+  sizeof(AliHLTComponentDataType),
+  kAliHLTTObjArrayDataTypeID,
+  kAliHLTDataOriginAny
+};
+
+/** ROOT TTree */
+const AliHLTComponentDataType kAliHLTDataTypeTTree = (AliHLTComponentDataType) {
+  sizeof(AliHLTComponentDataType),
+  kAliHLTTTreeDataTypeID,
+  kAliHLTDataOriginAny
+};
+
+/** ROOT TH1 (can be used for all histograms, they derive from TH1) */
+const AliHLTComponentDataType kAliHLTDataTypeHistogram = (AliHLTComponentDataType) {
+  sizeof(AliHLTComponentDataType),
+  kAliHLTHistogramDataTypeID,
+  kAliHLTDataOriginAny
+};
+
+/** ROOT TNtuple */
+const AliHLTComponentDataType kAliHLTDataTypeTNtuple = (AliHLTComponentDataType) {
+  sizeof(AliHLTComponentDataType),
+  kAliHLTTNtupleDataTypeID,
+  kAliHLTDataOriginAny
+};
 
 //////////////////////////////////////////////////////////////////////////
 //

diff --git a/HLT/BASE/AliHLTDataTypes.h b/HLT/BASE/AliHLTDataTypes.h
index ba6ce63a822487bd1ef7aa8cc26649d5cea3c621..d428def878866e24eb4d9034b79ecb30e21cf426 100644 (file)
--- a/HLT/BASE/AliHLTDataTypes.h
+++ b/HLT/BASE/AliHLTDataTypes.h
@@ -29,8 +29,9 @@
  *   4       Component configuration and DCS update events added
  *           gkAliHLTDDLListSize set from 29 to 30 according to new PubSub
  *           specs
+ *   5       Data types for Run and Event summary, and for monitoring added
  */
-#define ALIHLT_DATA_TYPES_VERSION 4
+#define ALIHLT_DATA_TYPES_VERSION 5
 
 //////////////////////////////////////////////////////////////////////////
 //
@@ -172,6 +173,37 @@ const int kAliHLTComponentDataTypefIDsize=8;
  */
 # define kAliHLTRunSummaryDataTypeID          {'R','U','N','S','U','M','M','A'}
 
+/** general ROOT TObject
+ * - a general TObject exported from the HLT analysis
+ * - varying origin
+ */
+#define kAliHLTTObjectDataTypeID              {'R','O','O','T','T','O','B','J'}
+
+/** ROOT TObjArray
+ * - a TObjArray exported from the HLT analysis
+ * - varying origin
+ */
+#define kAliHLTTObjArrayDataTypeID            {'R','O','O','T','O','B','A','R'}
+
+/** ROOT TTree
+ * - a TTree object exported from the HLT analysis
+ * - varying origin
+ */
+#define kAliHLTTTreeDataTypeID                {'R','O','O','T','T','R','E','E'}
+
+/** ROOT histogram
+ * - a histogram object exported from the HLT analysis
+ * - class derives from TH1 (directly or indirectly) and inherits all common functionality
+ * - varying origin
+ */
+#define kAliHLTHistogramDataTypeID            {'R','O','O','T','H','I','S','T'}
+
+/** ROOT TNtuple
+ * - a TNtupl object exported from the HLT analysis
+ * - varying origin
+ */
+#define kAliHLTTNtupleDataTypeID              {'R','O','O','T','T','U','P','L'}
+
 using namespace std;
 
 extern "C" {
@@ -501,6 +533,27 @@ extern "C" {
   /** Event summary */
   extern const AliHLTComponentDataType kAliHLTDataTypeRunSummary;
 
+  //////////////////////////////////////////////////////////////////////////
+  //
+  // Data Types for Monitoring objects
+  //
+  //////////////////////////////////////////////////////////////////////////
+
+  /** general ROOT TObject */
+  extern const AliHLTComponentDataType kAliHLTDataTypeTObject;            // {ROOTTOBJ,"***"}
+                                                                                       
+  /** ROOT TObjArray */                                                                        
+  extern const AliHLTComponentDataType kAliHLTDataTypeTObjArray;         // {ROOTOBAR,"***"}
+                                                                                       
+  /** ROOT TTree */                                                                    
+  extern const AliHLTComponentDataType kAliHLTDataTypeTTree;             // {ROOTTREE,"***"}
+                                                                                       
+  /** ROOT TH1 (can be used for all histograms, they derive from TH1) */               
+  extern const AliHLTComponentDataType kAliHLTDataTypeHistogram;         // {ROOTHIST,"***"}
+                                                                                       
+  /** ROOT TNtuple */                                                                  
+  extern const AliHLTComponentDataType kAliHLTDataTypeTNtuple;           // {ROOTTUPL,"***"}
+
   //////////////////////////////////////////////////////////////////////////
   //
   // FXS subscriber meta information