update by Gaute:

- SPD and SSD cluster finders now load geometry from OCDB
- Histogram component has SPD, SDD and SSD clusters as input

diff --git a/HLT/ITS/AliHLTITSClusterFinderSPDComponent.cxx b/HLT/ITS/AliHLTITSClusterFinderSPDComponent.cxx
index 59a9767e84f693a720c5e94a4c3e9f6bafad3f59..84b84806bb91643b78314d24f56a6452408a7fbb 100644 (file)
--- a/HLT/ITS/AliHLTITSClusterFinderSPDComponent.cxx
+++ b/HLT/ITS/AliHLTITSClusterFinderSPDComponent.cxx
@@ -35,6 +35,7 @@ using namespace std;
 #include "AliHLTITSSpacePointData.h"
 #include "AliHLTITSClusterDataFormat.h"
 #include <AliHLTDAQ.h>
+#include "AliGeomManager.h"
 
 #include <cstdlib>
 #include <cerrno>
@@ -117,6 +118,14 @@ Int_t AliHLTITSClusterFinderSPDComponent::DoInit( int /*argc*/, const char** /*a
     fClusters[iModule] = NULL;
   }
 
+  AliCDBManager* man = AliCDBManager::Instance();
+  AliGeomManager::LoadGeometry();
+ 
+  if (!man->IsDefaultStorageSet()){
+    HLTError("Default CDB storage has not been set !");
+    return -ENOENT;
+  }
+
   //fgeomInit = new AliITSInitGeometry(kvSPD02,2);
   fgeomInit = new AliITSInitGeometry(kvPPRasymmFMD,2);
   //fgeomInit->InitAliITSgeom(fgeom);

diff --git a/HLT/ITS/AliHLTITSClusterFinderSSDComponent.cxx b/HLT/ITS/AliHLTITSClusterFinderSSDComponent.cxx
index 4615048589f96581aafa8fd4fd35f3e7504c1811..e4e500474f7ae189aa5037b9f7bab848e8b00fbe 100644 (file)
--- a/HLT/ITS/AliHLTITSClusterFinderSSDComponent.cxx
+++ b/HLT/ITS/AliHLTITSClusterFinderSSDComponent.cxx
@@ -35,6 +35,7 @@ using namespace std;
 #include "AliHLTITSSpacePointData.h"
 #include "AliHLTITSClusterDataFormat.h"
 #include <AliHLTDAQ.h>
+#include "AliGeomManager.h"
 
 #include <cstdlib>
 #include <cerrno>
@@ -118,6 +119,14 @@ Int_t AliHLTITSClusterFinderSSDComponent::DoInit( int /*argc*/, const char** /*a
     fClusters[iModule] = NULL;
   }
 
+  AliCDBManager* man = AliCDBManager::Instance();
+  AliGeomManager::LoadGeometry();
+ 
+  if (!man->IsDefaultStorageSet()){
+    HLTError("Default CDB storage has not been set !");
+    return -ENOENT;
+  }
+
   //fgeomInit = new AliITSInitGeometry(kvSSD02,2);
   fgeomInit = new AliITSInitGeometry(kvPPRasymmFMD,2);
   //fgeomInit->InitAliITSgeom(fgeom);

diff --git a/HLT/ITS/AliHLTITSClusterHistoComponent.cxx b/HLT/ITS/AliHLTITSClusterHistoComponent.cxx
index a76b84cf644dff8bc8872a7f108529bf19beb5ab..ea7de6c1fd8ae22ba8b4434a02e4ce6b615a927e 100644 (file)
--- a/HLT/ITS/AliHLTITSClusterHistoComponent.cxx
+++ b/HLT/ITS/AliHLTITSClusterHistoComponent.cxx
@@ -76,7 +76,9 @@ void AliHLTITSClusterHistoComponent::GetInputDataTypes(AliHLTComponentDataTypeLi
 {
   // see header file for class documentation
   list.clear();
-  list.push_back( kAliHLTDataTypeTObjArray );
+  list.push_back( kAliHLTDataTypeClusters|kAliHLTDataOriginITSSPD );
+  list.push_back( kAliHLTDataTypeClusters|kAliHLTDataOriginITSSDD );
+  list.push_back( kAliHLTDataTypeClusters|kAliHLTDataOriginITSSSD );
 }
 
 AliHLTComponentDataType AliHLTITSClusterHistoComponent::GetOutputDataType()
@@ -145,8 +147,13 @@ int AliHLTITSClusterHistoComponent::DoEvent(const AliHLTComponentEventData& /*ev
   if(!IsDataEvent())
     return 0;
   
-  for ( iter = GetFirstInputBlock(kAliHLTDataTypeClusters|kAliHLTDataOriginITSSSD); iter != NULL; iter = GetNextInputBlock() ) {
+  for ( iter = GetFirstInputBlock(kAliHLTDataTypeClusters); iter != NULL; iter = GetNextInputBlock() ) {
     
+    if(iter->fDataType!=(kAliHLTAnyDataType|kAliHLTDataOriginITSSPD) && 
+       iter->fDataType!=(kAliHLTAnyDataType|kAliHLTDataOriginITSSDD) && 
+       iter->fDataType!=(kAliHLTAnyDataType|kAliHLTDataOriginITSSSD))
+       continue;
+
     const AliHLTITSClusterData* clusterData = (const AliHLTITSClusterData*) iter->fPtr;
     Int_t nSpacepoint = (Int_t) clusterData->fSpacePointCnt;
     TotalSpacePoint += nSpacepoint;

diff --git a/HLT/ITS/macros/rec-ssd-cluster.C b/HLT/ITS/macros/rec-ssd-cluster.C
index 873c0e89a71342ff04e28d5aad22cf1f69028fea..a6c5719c534a193bd224d70657fed67386093d9b 100644 (file)
--- a/HLT/ITS/macros/rec-ssd-cluster.C
+++ b/HLT/ITS/macros/rec-ssd-cluster.C
@@ -54,9 +54,13 @@ void rec_ssd_cluster(const char* input="./", char* opt="")
   }
 
   //add dummy
-  AliHLTConfiguration dummyconf("dummy", "Dummy", dummyInput.Data(), "-output_percentage 0");
+  //AliHLTConfiguration dummyconf("dummy", "Dummy", dummyInput.Data(), "-output_percentage 0");
+  //option+="dummy";
 
-  option+="dummy";
+  AliHLTConfiguration cfconf("clusterHisto","ITSClusterHisto",dummyInput.Data(),"");
+  AliHLTConfiguration fwconf("histFile","ROOTFileWriter", "clusterHisto","-datafile ClusterHisto -concatenate-events -overwrite");
+
+  option+="histFile";
 
   ///////////////////////////////////////////////////////////////////////////////////////////////////
   //