changing access to data types of AliHLTTPCDefinition

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibTimeComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibTimeComponent.cxx
index a56deb9ce2d9846f5205a20c86a8ffbdf2e5bf98..60f810703b308f76445d2ec77a5076989f77622e 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibTimeComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibTimeComponent.cxx
@@ -117,7 +117,7 @@ void AliHLTTPCCalibTimeComponent::GetInputDataTypes( vector<AliHLTComponentDataT
 AliHLTComponentDataType AliHLTTPCCalibTimeComponent::GetOutputDataType() {
 // see header file for class documentation
 
-  return AliHLTTPCDefinitions::fgkCalibCEDataType|kAliHLTDataOriginOut;
+  return AliHLTTPCDefinitions::CalibCEDataType()|kAliHLTDataOriginOut;
 }
 
 void AliHLTTPCCalibTimeComponent::GetOutputDataSize( unsigned long& constBase, double& inputMultiplier ){

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibTimeGainComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibTimeGainComponent.cxx
index 3b12869ec0501fe2fe1af65bd102e73585c40ac4..36cb5e6ee0fb928646ce41deeb17fd43bd89a3be 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibTimeGainComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibTimeGainComponent.cxx
@@ -90,7 +90,7 @@ void AliHLTTPCCalibTimeGainComponent::GetInputDataTypes( vector<AliHLTComponentD
 AliHLTComponentDataType AliHLTTPCCalibTimeGainComponent::GetOutputDataType() {
 // see header file for class documentation
 
-  return AliHLTTPCDefinitions::fgkCalibCEDataType|kAliHLTDataOriginOut;
+  return AliHLTTPCDefinitions::CalibCEDataType()|kAliHLTDataOriginOut;
 }
 
 void AliHLTTPCCalibTimeGainComponent::GetOutputDataSize( unsigned long& constBase, double& inputMultiplier ) {
@@ -195,7 +195,7 @@ Int_t AliHLTTPCCalibTimeGainComponent::ProcessCalibration( const AliHLTComponent
   fCalibTimeGain->Process(fESDEvent);
 
   fSpecification = AliHLTTPCDefinitions::EncodeDataSpecification( fMinSlice, fMaxSlice, fMinPartition, fMaxPartition );
-  PushBack( (TObject*) fCalibTimeGain, AliHLTTPCDefinitions::fgkCalibCEDataType| kAliHLTDataOriginOut, fSpecification);
+  PushBack( (TObject*) fCalibTimeGain, AliHLTTPCDefinitions::CalibCEDataType()| kAliHLTDataOriginOut, fSpecification);
   
   return 0;
 }

diff --git a/HLT/TPCLib/calibration/AliHLTTPCCalibrationComponent.cxx b/HLT/TPCLib/calibration/AliHLTTPCCalibrationComponent.cxx
index 1c2a34d3b49923a0eae998efdd57839e2dde8c5f..471e24e79fe66aa24eb262759d07faa114439da1 100644 (file)
--- a/HLT/TPCLib/calibration/AliHLTTPCCalibrationComponent.cxx
+++ b/HLT/TPCLib/calibration/AliHLTTPCCalibrationComponent.cxx
@@ -96,7 +96,7 @@ void AliHLTTPCCalibrationComponent::GetInputDataTypes( vector<AliHLTComponentDat
 AliHLTComponentDataType AliHLTTPCCalibrationComponent::GetOutputDataType() {
 // see header file for class documentation
 
-  return AliHLTTPCDefinitions::fgkCalibCEDataType;
+  return AliHLTTPCDefinitions::CalibCEDataType();
 }
 
 void AliHLTTPCCalibrationComponent::GetOutputDataSize( unsigned long& constBase, double& inputMultiplier ) {
@@ -218,7 +218,7 @@ Int_t AliHLTTPCCalibrationComponent::ProcessCalibration( const AliHLTComponentEv
   fCalibTask->Process(fESDEvent);
 
   fSpecification = AliHLTTPCDefinitions::EncodeDataSpecification( fMinSlice, fMaxSlice, fMinPartition, fMaxPartition );
-  PushBack( (TObject*) fCalibTask, AliHLTTPCDefinitions::fgkCalibCEDataType | kAliHLTDataOriginOut, fSpecification);
+  PushBack( (TObject*) fCalibTask, AliHLTTPCDefinitions::CalibCEDataType() | kAliHLTDataOriginOut, fSpecification);
   
   return 0;
 }

diff --git a/HLT/TPCLib/offline/AliHLTTPCOfflineCalibrationComponent.cxx b/HLT/TPCLib/offline/AliHLTTPCOfflineCalibrationComponent.cxx
index 607a8e4b4b4a1b0c33c8f0ea0656d8625dab62ef..ad9d7cb9620f7c0d7679d9a6e16683c6d4075a7a 100644 (file)
--- a/HLT/TPCLib/offline/AliHLTTPCOfflineCalibrationComponent.cxx
+++ b/HLT/TPCLib/offline/AliHLTTPCOfflineCalibrationComponent.cxx
@@ -87,9 +87,9 @@ int AliHLTTPCOfflineCalibrationComponent::GetOutputDataTypes(AliHLTComponentData
 {
   // create output data type
   tgtList.clear();
-  tgtList.push_back(AliHLTTPCDefinitions::fgkOfflineCalibAlignDataType);
-  tgtList.push_back(AliHLTTPCDefinitions::fgkOfflineCalibTracksDataType);
-  tgtList.push_back(AliHLTTPCDefinitions::fgkOfflineCalibTracksGainDataType);
+  tgtList.push_back(AliHLTTPCDefinitions::OfflineCalibAlignDataType());
+  tgtList.push_back(AliHLTTPCDefinitions::OfflineCalibTracksDataType());
+  tgtList.push_back(AliHLTTPCDefinitions::OfflineCalibTracksGainDataType());
 
   return tgtList.size(); 
 }
@@ -229,9 +229,9 @@ int AliHLTTPCOfflineCalibrationComponent::ProcessCalibration(const AliHLTCompone
         AliHLTUInt32_t iSpecification = AliHLTTPCDefinitions::EncodeDataSpecification(minSlice, maxSlice, minPatch, maxPatch);
 
        // send data
-       PushBack((TObject*)fTPCcalibAlign,AliHLTTPCDefinitions::fgkOfflineCalibAlignDataType,iSpecification);
-       PushBack((TObject*)fTPCcalibTracksGain,AliHLTTPCDefinitions::fgkOfflineCalibTracksGainDataType,iSpecification);
-       PushBack((TObject*)fTPCcalibTracks,AliHLTTPCDefinitions::fgkOfflineCalibTracksDataType,iSpecification);
+       PushBack((TObject*)fTPCcalibAlign,AliHLTTPCDefinitions::OfflineCalibAlignDataType(),iSpecification);
+       PushBack((TObject*)fTPCcalibTracksGain,AliHLTTPCDefinitions::OfflineCalibTracksGainDataType(),iSpecification);
+       PushBack((TObject*)fTPCcalibTracks,AliHLTTPCDefinitions::OfflineCalibTracksDataType(),iSpecification);
 
       // reset standard ESD content    
       pSeedsArray->Delete();