X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FTPCLib%2FAliHLTTPCCalibPulserComponent.cxx;h=4d03c4594dcbdfff57c03d08b397fe593f653ec6;hb=58bc08c10de3f4a77dea8f6631af26204bb5e5a4;hp=e19112fcdba64c8d21159d15390d4e7576a4f95d;hpb=8f8bf0afde127f1b85047e6844bd5eaf082bc868;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/TPCLib/AliHLTTPCCalibPulserComponent.cxx b/HLT/TPCLib/AliHLTTPCCalibPulserComponent.cxx
index e19112fcdba..4d03c4594dc 100644
--- a/HLT/TPCLib/AliHLTTPCCalibPulserComponent.cxx
+++ b/HLT/TPCLib/AliHLTTPCCalibPulserComponent.cxx
@@ -20,6 +20,12 @@
     @brief  A pulser calibration component for the TPC.
 */
 
+// see header file for class documentation
+// or
+// refer to README to build package
+// or
+// visit http://web.ift.uib.no/~kjeks/doc/alice-hlt   
+
 #if __GNUC__>= 3
 using namespace std;
 #endif
@@ -166,12 +172,7 @@ Int_t AliHLTTPCCalibPulserComponent::InitCalibration() {
   if (fRawReader)
     return EINPROGRESS;
 
-#if defined(HAVE_ALIRAWDATA) && defined(HAVE_ALITPCRAWSTREAM_H) 
   fRawReader = new AliRawReaderMemory();
-#else
-  HLTFatal("AliRawReader  not available - check your build");
-  return -ENODEV;
-#endif
 
   return 0;
 #else // HAVE_NOT_ALITPCCALIBPULSER
@@ -201,35 +202,35 @@ Int_t AliHLTTPCCalibPulserComponent::DeinitCalibration() {
 /*
  * --- setter for rcuformat need in AliTPCCalibPulser class
  */
-Int_t AliHLTTPCCalibPulserComponent::ProcessCalibration( const AliHLTComponentEventData& evtData, AliHLTComponentTriggerData& trigData ) {
+Int_t AliHLTTPCCalibPulserComponent::ProcessCalibration( const AliHLTComponentEventData& /*evtData*/, 
+							 AliHLTComponentTriggerData& /*trigData*/ ) {
   // see header file for class documentation
   
   const AliHLTComponentBlockData* iter = NULL;
 
   AliHLTUInt8_t slice=0, patch=0;
-  Int_t DDLid = 0;
+  Int_t ddlId = 0;
     
   // ** Loop over all input blocks and specify which data format should be read - only select Raw Data
-  iter = GetFirstInputBlock( AliHLTTPCDefinitions::fgkDDLPackedRawDataType );
+  iter = GetFirstInputBlock( kAliHLTDataTypeDDLRaw | kAliHLTDataOriginTPC);
   
   while ( iter != NULL ) {
     
     // ** Print Debug output which data format was received
-    char tmp1[14], tmp2[14];
-    DataType2Text( iter->fDataType, tmp1 );
-    DataType2Text( AliHLTTPCDefinitions::fgkDDLPackedRawDataType, tmp2 );
-
-    HLTDebug ( "Event received - Event 0x%08LX (%Lu) received datatype: %s - required datatype: %s", 
-	       evtData.fEventID, evtData.fEventID, tmp1, tmp2 );
+    //    char tmp1[14], tmp2[14];
+    //    DataType2Text( iter->fDataType, tmp1 );
+    //    DataType2Text( AliHLTTPCDefinitions::fgkDDLPackedRawDataType, tmp2 );
+    //     HLTDebug ( "Event received - Event 0x%08LX (%Lu) received datatype: %s - required datatype: %s", 
+    // 	       evtData.fEventID, evtData.fEventID, tmp1, tmp2 );
 
     // ** Get DDL ID in order to tell the memory reader which slice/patch to use
     slice = AliHLTTPCDefinitions::GetMinSliceNr( *iter );
     patch = AliHLTTPCDefinitions::GetMinPatchNr( *iter );
 
-    if (patch < 2) DDLid = 768 + (2 * slice) + patch;
-    else DDLid = 838 + (4*slice) + patch;
+    if (patch < 2) ddlId = 768 + (2 * slice) + patch;
+    else ddlId = 838 + (4*slice) + patch;
 
-    HLTDebug ( "Input Raw Data - Slice/Patch: %d/%d - EquipmentID : %d.", slice, patch, DDLid );
+    HLTDebug ( "Input Raw Data - Slice/Patch: %d/%d - EquipmentID : %d.", slice, patch, ddlId );
 
     // ** Get min and max patch, used for output specification
     if ( patch < fMinPatch ) fMinPatch =  patch;
@@ -237,7 +238,7 @@ Int_t AliHLTTPCCalibPulserComponent::ProcessCalibration( const AliHLTComponentEv
 
     // ** Init TPCRawStream
     fRawReader->SetMemory( reinterpret_cast<UChar_t*>( iter->fPtr ), iter->fSize );
-    fRawReader->SetEquipmentID(DDLid);
+    fRawReader->SetEquipmentID(ddlId);
 
     fRawStream = new AliTPCRawStream( fRawReader );
     fRawStream->SetOldRCUFormat( fRCUFormat );
@@ -270,7 +271,8 @@ Int_t AliHLTTPCCalibPulserComponent::ProcessCalibration( const AliHLTComponentEv
 } // Int_t AliHLTTPCCalibPulserComponent::ProcessCalibration( const AliHLTComponentEventData& evtData, AliHLTComponentTriggerData& trigData ) {
 
 
-Int_t AliHLTTPCCalibPulserComponent::ShipDataToFXS( const AliHLTComponentEventData& /*evtData*/, AliHLTComponentTriggerData& /*trigData*/ ) {
+Int_t AliHLTTPCCalibPulserComponent::ShipDataToFXS( const AliHLTComponentEventData& /*evtData*/, 
+						    AliHLTComponentTriggerData& /*trigData*/ ) {
   // see header file for class documentation
     
 #ifndef HAVE_NOT_ALITPCCALIBPULSER