Fixing code so that components use the new standard DDL_RAW data type.

[u/mrichter/AliRoot.git] / HLT / MUON / OnlineAnalysis / AliHLTMUONTrackerCalibratorComponent.cxx

diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONTrackerCalibratorComponent.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONTrackerCalibratorComponent.cxx
index 4d69ae91a3b05f4700a3d774c96ac510acfb6d86..99a1a45f12694b00197730a563ae9c0710bd1605 100644 (file)
--- a/HLT/MUON/OnlineAnalysis/AliHLTMUONTrackerCalibratorComponent.cxx
+++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONTrackerCalibratorComponent.cxx
@@ -755,7 +755,7 @@ void AliHLTMUONTrackerCalibratorComponent::GetInputDataTypes(
        /// Returns the list of input block types expected by this component.
        
        list.clear();
-       list.push_back( AliHLTMUONConstants::TrackingDDLRawDataType() );
+       list.push_back( AliHLTMUONConstants::DDLRawDataType() );
 }
 
 AliHLTComponentDataType AliHLTMUONTrackerCalibratorComponent::GetOutputDataType()
@@ -764,7 +764,7 @@ AliHLTComponentDataType AliHLTMUONTrackerCalibratorComponent::GetOutputDataType(
        /// Returns the type of output block generated by this component.
 
        //TODO: fix.
-       return AliHLTMUONConstants::TrackingDDLRawDataType();
+       return AliHLTMUONConstants::DDLRawDataType();
 }
 
 void AliHLTMUONTrackerCalibratorComponent::GetOutputDataSize(
@@ -995,9 +995,16 @@ Int_t AliHLTMUONTrackerCalibratorComponent::ProcessCalibration(
        const AliHLTComponentBlockData* iter = NULL;
        
        // Loop over all DDL raw data input blocks and decode the event.
-       iter = GetFirstInputBlock( AliHLTMUONConstants::TriggerDDLRawDataType() );
+       iter = GetFirstInputBlock( AliHLTMUONConstants::DDLRawDataType() );
        while (iter != NULL)
        {
+               // Make sure we have the correct muon tracker DDL type.
+               if (not AliHLTMUONUtils::IsTrackerDDL(iter->fSpecification))
+               {
+                       iter = GetNextInputBlock();
+                       continue;
+               }
+
                // decoding rawdata headers
                AliRawReaderMemory* rawReader = new AliRawReaderMemory(
                                reinterpret_cast<UChar_t*>(iter->fPtr), iter->fSize