compilation error fixed

[u/mrichter/AliRoot.git] / HLT / ITS / AliHLTITSAgent.cxx

diff --git a/HLT/ITS/AliHLTITSAgent.cxx b/HLT/ITS/AliHLTITSAgent.cxx
index 5bc8b0e3c17220ce352ca55208ae6f67bd04636c..4cbb7d55ea0d06fccd0d2e71523435f186a763bf 100644 (file)
--- a/HLT/ITS/AliHLTITSAgent.cxx
+++ b/HLT/ITS/AliHLTITSAgent.cxx
@@ -26,15 +26,18 @@
 #include "AliHLTITSAgent.h"
 #include "AliHLTConfiguration.h"
 #include "AliHLTOUT.h"
-//#include "AliDAQ.h"
+#include "AliHLTDAQ.h"
 
 // header files of library components
 
 // header file of the module preprocessor
 #include "AliHLTITSCompressRawDataSDDComponent.h"
-#include "AliHLTITSClusterFinderSPDComponent.h"
-#include "AliHLTITSClusterFinderSSDComponent.h"
+#include "AliHLTITSSSDQARecPointsComponent.h"
+#include "AliHLTITSQAComponent.h"
+#include "AliHLTITSClusterFinderComponent.h"
 #include "AliHLTITSClusterHistoComponent.h"
+#include "AliHLTITSTrackerComponent.h"
+#include "AliHLTITSVertexerSPDComponent.h"
 
 /** global instance for agent registration */
 AliHLTITSAgent gAliHLTITSAgent;
@@ -59,18 +62,77 @@ AliHLTITSAgent::~AliHLTITSAgent()
   // see header file for class documentation
 }
 
-int AliHLTITSAgent::CreateConfigurations(AliHLTConfigurationHandler* /*handler*/,
-                                           AliRawReader* /*rawReader*/,
-                                           AliRunLoader* /*runloader*/) const
+int AliHLTITSAgent::CreateConfigurations(AliHLTConfigurationHandler* handler,
+                                        AliRawReader* rawReader,
+                                        AliRunLoader* runloader) const
 {
   // see header file for class documentation
+  int iResult=0;
+  if (!handler) return -EINVAL;
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////////////////////////////////////
+  //
+  // ITS tracking is currently only working on raw data
+  // to run on digits, a digit publisher needs to be implemented
+
+  if (rawReader || !runloader) {
+    // AliSimulation: use the AliRawReaderPublisher if the raw reader is available
+    // Alireconstruction: indicated by runloader==NULL, run always on raw data
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // define the ITS cluster finder configurations
+    //
+
+    TString spdCF;
+    TString ssdCF;
+    TString sddCF;
+    
+    iResult=CreateCFConfigurations(handler, AliHLTDAQ::DetectorID("ITSSPD"), spdCF);
+    handler->CreateConfiguration("ITS-SPD-CF","BlockFilter",spdCF.Data(),"");
+
+    iResult=CreateCFConfigurations(handler, AliHLTDAQ::DetectorID("ITSSDD"), sddCF);
+    handler->CreateConfiguration("ITS-SDD-CF","BlockFilter",sddCF.Data(),"");
+
+    iResult=CreateCFConfigurations(handler, AliHLTDAQ::DetectorID("ITSSSD"), ssdCF);
+    handler->CreateConfiguration("ITS-SSD-CF","BlockFilter",ssdCF.Data(),"");
+
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // define the SPD vertexer Z configuration
+    //
+    handler->CreateConfiguration("ITS-SPD-vertexer","ITSVertexerSPD", "ITS-SPD-CF","");
+    
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // define the ITS tracker configuration
+    //
+    TString trackerInput="ITS-SPD-CF ITS-SDD-CF ITS-SSD-CF";
+
+    if (handler->FindConfiguration("TPC-globalmerger")) {
+      trackerInput+=" TPC-globalmerger";
+    }
+    handler->CreateConfiguration("ITS-tracker","ITSTracker",trackerInput.Data(),"");
+  }
   return 0;
 }
 
 const char* AliHLTITSAgent::GetReconstructionChains(AliRawReader* /*rawReader*/,
-                                                      AliRunLoader* /*runloader*/) const
+                                                      AliRunLoader* runloader) const
 {
   // see header file for class documentation
+  if (runloader) {
+    // reconstruction chains for AliRoot simulation
+    // Note: run loader is only available while running embedded into
+    // AliRoot simulation
+
+    // the chain is just defined and can be used as input for subsequent
+    // components
+    //return "ITS-tracker";
+  }
 
   return "";
 }
@@ -78,7 +140,7 @@ const char* AliHLTITSAgent::GetReconstructionChains(AliRawReader* /*rawReader*/,
 const char* AliHLTITSAgent::GetRequiredComponentLibraries() const
 {
   // see header file for class documentation
-  return "";
+  return "libAliHLTUtil.so libAliHLTRCU.so libAliHLTTPC.so";
 }
 
 int AliHLTITSAgent::RegisterComponents(AliHLTComponentHandler* pHandler) const
@@ -87,9 +149,14 @@ int AliHLTITSAgent::RegisterComponents(AliHLTComponentHandler* pHandler) const
   assert(pHandler);
   if (!pHandler) return -EINVAL;
   pHandler->AddComponent(new AliHLTITSCompressRawDataSDDComponent);
-  pHandler->AddComponent(new AliHLTITSClusterFinderSPDComponent);
-  pHandler->AddComponent(new AliHLTITSClusterFinderSSDComponent);
+  pHandler->AddComponent(new AliHLTITSSSDQARecPointsComponent);
+  pHandler->AddComponent(new AliHLTITSQAComponent);
+  pHandler->AddComponent(new AliHLTITSClusterFinderComponent(AliHLTITSClusterFinderComponent::kClusterFinderSPD));
+  pHandler->AddComponent(new AliHLTITSClusterFinderComponent(AliHLTITSClusterFinderComponent::kClusterFinderSDD));
+  pHandler->AddComponent(new AliHLTITSClusterFinderComponent(AliHLTITSClusterFinderComponent::kClusterFinderSSD));
   pHandler->AddComponent(new AliHLTITSClusterHistoComponent);
+  pHandler->AddComponent(new AliHLTITSTrackerComponent);
+  pHandler->AddComponent(new AliHLTITSVertexerSPDComponent);
 
   return 0;
 }
@@ -191,3 +258,53 @@ int AliHLTITSAgent::AliHLTOUTSDDRawDataHandler::ProcessData(AliHLTOUT* pData)
   }
   return iResult;
 }
+
+int AliHLTITSAgent::CreateCFConfigurations(AliHLTConfigurationHandler* pHandler, int detectorId, TString& output) const
+{
+  // see header file for class documentation
+  if (!pHandler) return -EINVAL;
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////
+  //
+  // define the ITS cluster finder components
+  //
+    
+  //The spec starts from 0x1 in SPD, SDD and SSD. So 0x1 is ddl 0 for SPD, 0x10 is ddl 1, and so on
+  //in SDD 0x1 is ddl 256, 0x10 is ddl 257, and so on. This means that the spec has to be set to 0x1 
+  //before the loops over the clusterfinder
+
+  TString idString=AliHLTDAQ::DetectorName(detectorId);
+  if (idString.CompareTo("ITSSPD") &&
+      idString.CompareTo("ITSSDD") &&
+      idString.CompareTo("ITSSSD")) {
+    HLTError("invalid detector id %d does not describe any ITS detector", detectorId);
+    return -ENOENT;
+  }
+
+  int minddl=AliHLTDAQ::DdlIDOffset(detectorId);
+  int maxddl=minddl+AliHLTDAQ::NumberOfDdls(detectorId)-1;
+  int spec=0x1;
+  int ddlno=0;
+
+  TString origin=idString; origin.ReplaceAll("ITS", "I");
+  TString cfBase=idString; cfBase+="_CF";
+  TString componentId=idString; componentId.ReplaceAll("ITS", "ITSClusterFinder");
+  for(ddlno=minddl;ddlno<=maxddl;ddlno++){  
+    TString arg, publisher, cf;
+ 
+    // the HLT origin defines are 4 chars: ISPD, ISSD, ISDD respectively
+    arg.Form("-minid %d -datatype 'DDL_RAW ' '%s' -dataspec 0x%08x -verbose",ddlno, origin.Data(), spec);
+    publisher.Form("ITS-DP_%d", ddlno);
+    pHandler->CreateConfiguration(publisher.Data(), "AliRawReaderPublisher", NULL , arg.Data());
+
+    cf.Form("%s_%d",cfBase.Data(), ddlno);
+    pHandler->CreateConfiguration(cf.Data(), componentId.Data(), publisher.Data(), "");
+
+    if (output.Length()>0) output+=" ";
+    output+=cf;
+
+    spec=spec<<1;
+  }
+  
+  return 0;
+}