- remove unnecessary cut on the number of ITS clusters

[u/mrichter/AliRoot.git] / HLT / TPCLib / AliHLTTPCClusterFinderComponent.cxx

diff --git a/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx b/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx
index 95961b773c20a90847d38c0411e609085c68a4b6..b12c886ad282f0e167e6467b3c233d8ede75caf0 100644 (file)
--- a/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCClusterFinderComponent.cxx
@@ -27,9 +27,7 @@
 using namespace std;
 #endif
 #include "AliHLTTPCClusterFinderComponent.h"
-#include "AliHLTTPCDigitReaderPacked.h"
 #include "AliHLTTPCDigitReaderUnpacked.h"
-#include "AliHLTTPCDigitReaderDecoder.h"
 #include "AliHLTTPCDigitReader32Bit.h"
 #include "AliHLTTPCClusterFinder.h"
 #include "AliHLTTPCSpacePointData.h"
@@ -37,11 +35,14 @@ using namespace std;
 #include "AliHLTTPCTransform.h"
 #include "AliHLTTPCClusters.h"
 #include "AliHLTTPCDefinitions.h"
+#include "AliGRPObject.h"
 #include "AliCDBEntry.h"
 #include "AliCDBManager.h"
 #include "AliTPCcalibDB.h"
 #include "AliTPCCalPad.h"
 #include "AliTPCParam.h"
+#include "AliTPCTransform.h"
+
 //#include "AliHLTTPCCAInputDataCompressorComponent.h"
 //#include "AliHLTTPCCADef.h"
 
@@ -54,22 +55,19 @@ using namespace std;
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
 #include "TGeoGlobalMagField.h"
+#include "AliGeomManager.h"
 
 #include <sys/time.h>
 
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTPCClusterFinderComponent)
 
-const char* AliHLTTPCClusterFinderComponent::fgkOCDBEntryPacked="HLT/ConfigTPC/TPCClusterFinderPacked";
-const char* AliHLTTPCClusterFinderComponent::fgkOCDBEntryUnpacked="HLT/ConfigTPC/TPCClusterFinderUnpacked";
-const char* AliHLTTPCClusterFinderComponent::fgkOCDBEntryDecoder="HLT/ConfigTPC/TPCClusterFinderDecoder";
-const char* AliHLTTPCClusterFinderComponent::fgkOCDBEntry32Bit="HLT/ConfigTPC/TPCClusterFinder32Bit";
-
 AliHLTTPCClusterFinderComponent::AliHLTTPCClusterFinderComponent(int mode)
   :
   fClusterFinder(NULL),
   fReader(NULL),
   fDeconvTime(kFALSE),
+  fTS(0),
   fDeconvPad(kFALSE),
   fClusterDeconv(false),
   fXYClusterError(-1),
@@ -130,15 +128,11 @@ void AliHLTTPCClusterFinderComponent::GetInputDataTypes( vector<AliHLTComponentD
   // see header file for class documentation
   list.clear(); 
   switch(fModeSwitch){
-  case kClusterFinderPacked:
-    list.push_back( kAliHLTDataTypeDDLRaw | kAliHLTDataOriginTPC );
-    break;
   case kClusterFinderUnpacked:          
     list.push_back( AliHLTTPCDefinitions::fgkUnpackedRawDataType );     
     break;
-  case kClusterFinderDecoder:
-    list.push_back( kAliHLTDataTypeDDLRaw | kAliHLTDataOriginTPC );
-    break;
+  case kClusterFinderDecoder: // deprecated, falling back to 32bit reader
+  case kClusterFinderPacked: // deprecated, falling back to 32bit reader
   case kClusterFinder32Bit:
     list.push_back( kAliHLTDataTypeDDLRaw | kAliHLTDataOriginTPC );
     break;
@@ -168,15 +162,11 @@ void AliHLTTPCClusterFinderComponent::GetOutputDataSize( unsigned long& constBas
   // XXX TODO: Find more realistic values.  
   constBase = 0;
   switch(fModeSwitch){
-  case kClusterFinderPacked:
-    inputMultiplier = (6 * 0.4);
-    break;
   case kClusterFinderUnpacked:
     inputMultiplier = 0.4;
     break;
-  case kClusterFinderDecoder:
-    inputMultiplier = (6 * 0.4);
-    break;
+  case kClusterFinderDecoder: // deprecated, falling back to 32bit reader
+  case kClusterFinderPacked: // deprecated, falling back to 32bit reader
   case kClusterFinder32Bit:
     inputMultiplier = (6 * 0.4);
     break;
@@ -202,6 +192,11 @@ int AliHLTTPCClusterFinderComponent::DoInit( int argc, const char** argv )
     HLTError("AliTPCcalibDB does not exist");
     return -ENOENT;
   }
+
+  fTS = calib->GetTransform();
+
+  calib->SetRun(GetRunNo());
+  calib->UpdateRunInformations(GetRunNo());
   AliTPCCalPad * time0TPC = calib->GetPadTime0(); 
   if(!time0TPC){
     HLTError("OCDB entry TPC/Calib/PadTime0 (AliTPCcalibDB::GetPadTime0()) is not available.");
@@ -221,24 +216,24 @@ int AliHLTTPCClusterFinderComponent::DoInit( int argc, const char** argv )
   }
   calib->SetExBField(GetBz());
 
+  if(!AliGeomManager::GetGeometry()){
+    AliGeomManager::LoadGeometry();
+  }
+
   fClusterFinder = new AliHLTTPCClusterFinder();
 
+  TObject* pOCDBEntry=LoadAndExtractOCDBObject("GRP/GRP/Data");
+  AliGRPObject* pGRP=pOCDBEntry?dynamic_cast<AliGRPObject*>(pOCDBEntry):NULL;
+  TString beamType;
+  if (pGRP) {
+    beamType=pGRP->GetBeamType();
+  }
+
   // first configure the default
   int iResult = 0;
-  switch(fModeSwitch){
-  case kClusterFinderPacked:
-    iResult=ConfigureFromCDBTObjString(fgkOCDBEntryPacked);
-    break;
-  case kClusterFinderUnpacked:          
-    iResult=ConfigureFromCDBTObjString(fgkOCDBEntryUnpacked);
-    break;
-  case kClusterFinderDecoder:
-    iResult=ConfigureFromCDBTObjString(fgkOCDBEntryDecoder);
-    break;
-  case kClusterFinder32Bit:
-    iResult=ConfigureFromCDBTObjString(fgkOCDBEntry32Bit);
-    break;
-  }
+  TString cdbPath="HLT/ConfigTPC/";
+  cdbPath+=GetComponentID();
+  iResult=ConfigureFromCDBTObjString(cdbPath, beamType.Data());
 
   // configure from the command line parameters if specified
   if (iResult>=0 && argc>0)
@@ -278,23 +273,21 @@ int AliHLTTPCClusterFinderComponent::DoInit( int argc, const char** argv )
 
   // Choose reader
   if (fModeSwitch==kClusterFinderPacked) {
-      HLTDebug("using AliHLTTPCDigitReaderPacked");
-      fReader = new AliHLTTPCDigitReaderPacked();
-      if(fUnsorted==1){        fReader->SetUnsorted(kTRUE); }
-      fClusterFinder->SetReader(fReader);
+      HLTWarning("AliHLTTPCDigitReaderPacked is deprecated, falling back to AliHLTTPCDigitReader32Bit");
   }
-  else if(fModeSwitch==kClusterFinderUnpacked){         
+  else if(fModeSwitch==kClusterFinderDecoder){
+    HLTWarning("AliHLTTPCDigitReaderPacked is deprecated, falling back to AliHLTTPCDigitReader32Bit");
+  }
+  
+  if(fModeSwitch==kClusterFinderUnpacked){      
     HLTDebug("using AliHLTTPCDigitReaderUnpacked");     
     fReader = new AliHLTTPCDigitReaderUnpacked();       
     if(fUnsorted==1){  fReader->SetUnsorted(kTRUE); }
     fClusterFinder->SetReader(fReader);
   } 
-  else if(fModeSwitch==kClusterFinderDecoder){
-    HLTDebug("using AliHLTTPCDigitReaderDecoder");
-    fReader = new AliHLTTPCDigitReaderDecoder();
-    fClusterFinder->SetReader(fReader);
-  }
-  else if(fModeSwitch==kClusterFinder32Bit){
+  else if(fModeSwitch==kClusterFinder32Bit ||
+         fModeSwitch==kClusterFinderPacked ||
+         fModeSwitch==kClusterFinderDecoder){
     HLTDebug("using AliHLTTPCDigitReader32Bit");
     fReader = new AliHLTTPCDigitReader32Bit();
     fClusterFinder->SetReader(fReader);
@@ -353,6 +346,15 @@ int AliHLTTPCClusterFinderComponent::DoEvent( const AliHLTComponentEventData& ev
 {
   // see header file for class documentation
   int iResult=0;
+  //SG!!!
+  //fDeconvTime = kTRUE;
+  //fClusterFinder->SetDeconvTime(fDeconvTime);
+  // fDeconvPad = kTRUE;
+  //fClusterFinder->SetDeconvPad(fDeconvPad);
+    
+  
+  fTS->SetCurrentTimeStamp(GetTimeStamp());
+  //fTS->SetCurrentTimeStamp(0);
 
   if(fReader == NULL){
     HLTFatal("Digit reader not initialized, skipping HLT TPC cluster reconstruction.");
@@ -742,25 +744,15 @@ int AliHLTTPCClusterFinderComponent::Reconfigure(const char* cdbEntry, const cha
 {  
   // see header file for class documentation
 
-  const char* entry=cdbEntry;
-  if (!entry || entry[0]==0){
-    switch(fModeSwitch){
-    case kClusterFinderPacked:
-      entry=fgkOCDBEntryPacked;
-      break;
-    case kClusterFinderUnpacked:        
-      entry=fgkOCDBEntryUnpacked;
-      break;
-    case kClusterFinderDecoder:
-      entry=fgkOCDBEntryDecoder;
-      break;
-    case kClusterFinder32Bit:
-      entry=fgkOCDBEntry32Bit;
-      break;
-    }
+  TString cdbPath;
+  if (cdbEntry) {
+    cdbPath=cdbEntry;
+  } else {
+    cdbPath="HLT/ConfigTPC/";
+    cdbPath+=GetComponentID();
   }
 
-  return ConfigureFromCDBTObjString(entry);
+  return ConfigureFromCDBTObjString(cdbPath.Data());
 
   /*
   int iResult=0;