- corrected access to the TPC parameters from AliTPCcalibDB

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.cxx
index 13be74985d697a8f750cac1404e31e0c94e194b5..1535372c5275b5957117cd0e726771fee9eba1bb 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.cxx
@@ -38,7 +38,7 @@ using namespace std;
 #include "AliTPCclusterMI.h"
 #include "AliTPCseed.h"
 #include "AliTPCcalibDB.h"
-#include "AliTPCParamSR.h"
+#include "AliTPCParam.h"
 
 #include "AliRieman.h"
 
@@ -128,8 +128,8 @@ AliHLTComponent* AliHLTTPCCalibSeedMakerComponent::Spawn() {
 int AliHLTTPCCalibSeedMakerComponent::DoInit( int /*argc*/, const char** /*argv*/ ) { 
 // see header file for class documentation
  
-  fTPCGeomParam = new AliTPCParamSR;
-  if(fTPCGeomParam) fTPCGeomParam->ReadGeoMatrices();  
+  fTPCGeomParam = AliTPCcalibDB::Instance()->GetParameters();
+  if(!fTPCGeomParam) HLTError("TPC Parameters are not loaded.");
   
   fSeedArray = new TObjArray;
   fSeedArray->SetOwner(kTRUE);
@@ -230,10 +230,10 @@ int AliHLTTPCCalibSeedMakerComponent::DoEvent(const AliHLTComponentEventData& /*
          Double_t xrow[160]; for(Int_t i=0; i<160; i++) xrow[i] = 0.;
          Int_t nrowlow = fTPCGeomParam->GetNRowLow();
          Int_t nrowup  = fTPCGeomParam->GetNRowUp();
-
+       
          for (Int_t i=0;i<nrowlow;i++) xrow[i]         = fTPCGeomParam->GetPadRowRadiiLow(i);
          for (Int_t i=0;i<nrowup;i++)  xrow[i+nrowlow] = fTPCGeomParam->GetPadRowRadiiUp(i);
-
+         
          // sector rotation angles - only one angle is needed
          Double_t angle = fTPCGeomParam->GetInnerAngle();
            

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.h b/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.h
index 0da2f20c8bcc22c64ec4393d6efe6aa6adbe9c51..675aaee3c94d13bf71f6e0c325845a5a30a21611 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.h
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibSeedMakerComponent.h
@@ -18,7 +18,7 @@
 
 //forward declarations
 class AliHLTTPCSpacePointData;
-class AliTPCParamSR;
+class AliTPCParam;
 class TObjArray;
 
 /**
@@ -78,7 +78,7 @@ class AliHLTTPCCalibSeedMakerComponent : public AliHLTProcessor {
       AliHLTUInt8_t   fMaxSlice;      //!transient
       AliHLTUInt8_t   fMinPartition;  //!transient
       AliHLTUInt8_t   fMaxPartition;  //!transient
-      AliTPCParamSR  *fTPCGeomParam;   //!transient
+      AliTPCParam    *fTPCGeomParam;  //!transient
       
       AliHLTTPCSpacePointData *fClustersArray[36][6]; //! transient
       UInt_t                   fNSpacePoints[36][6];  //! transient