From f0d05e66697e9789787f8dd04cfd5b7c74766c67 Mon Sep 17 00:00:00 2001 From: richterm Date: Thu, 6 Mar 2008 19:54:18 +0000 Subject: [PATCH] bugfix: missing function implemented; next strike against warnings --- HLT/BASE/AliHLTOUT.cxx | 2 +- .../comp/AliHLTTPCCompDumpComponent.cxx | 33 ++++++++++++++----- HLT/TPCLib/comp/AliHLTTPCCompModelAnalysis.h | 4 +-- .../comp/AliHLTTPCCompModelConverter.cxx | 4 +-- ...AliHLTTPCCompModelDeconverterComponent.cxx | 3 +- .../AliHLTTPCCompModelDeflaterComponent.cxx | 4 +-- HLT/comp/AliHLTCOMPHuffmanAltro.cxx | 4 +-- HLT/comp/AliHLTCOMPHuffmanAltroComponent.cxx | 5 ++- 8 files changed, 37 insertions(+), 22 deletions(-) diff --git a/HLT/BASE/AliHLTOUT.cxx b/HLT/BASE/AliHLTOUT.cxx index 7c66804ae9f..61e143fd729 100644 --- a/HLT/BASE/AliHLTOUT.cxx +++ b/HLT/BASE/AliHLTOUT.cxx @@ -76,7 +76,7 @@ int AliHLTOUT::GetNofDataBlocks() } int AliHLTOUT::SelectFirstDataBlock(AliHLTComponentDataType dt, AliHLTUInt32_t spec, - AliHLTModuleAgent::AliHLTOUTHandlerType handlerType) + AliHLTModuleAgent::AliHLTOUTHandlerType /*handlerType*/) { // see header file for class documentation if (CheckStatusFlag(kLocked)) return -EPERM; diff --git a/HLT/TPCLib/comp/AliHLTTPCCompDumpComponent.cxx b/HLT/TPCLib/comp/AliHLTTPCCompDumpComponent.cxx index 3c1da17fe2f..5a97671d3d1 100644 --- a/HLT/TPCLib/comp/AliHLTTPCCompDumpComponent.cxx +++ b/HLT/TPCLib/comp/AliHLTTPCCompDumpComponent.cxx @@ -96,7 +96,7 @@ AliHLTComponent* AliHLTTPCCompDumpComponent::Spawn() { // see header file for class documentation return new AliHLTTPCCompDumpComponent; - }; + } void AliHLTTPCCompDumpComponent::InitBitDataInput( AliHLTUInt8_t* input, UInt_t inputSize ) { @@ -106,7 +106,7 @@ void AliHLTTPCCompDumpComponent::InitBitDataInput( AliHLTUInt8_t* input, UInt_t fBitDataCurrentInput = fBitDataCurrentInputStart = input; fBitDataCurrentInputEnd = input+inputSize; fBitDataCurrentWord = *fBitDataCurrentInput; - }; + } bool AliHLTTPCCompDumpComponent::InputBit( AliHLTUInt8_t & value ) { @@ -126,7 +126,7 @@ void AliHLTTPCCompDumpComponent::InitBitDataInput( AliHLTUInt8_t* input, UInt_t } } return true; - }; + } bool AliHLTTPCCompDumpComponent::InputBits( AliHLTUInt8_t & value, UInt_t const & bitCount ) { @@ -141,7 +141,7 @@ bool AliHLTTPCCompDumpComponent::InputBits( AliHLTUInt8_t & value, UInt_t const return false; value = (AliHLTUInt8_t)( temp & (AliHLTUInt64_t)0xFFFFFFFFULL ); return true; - }; + } bool AliHLTTPCCompDumpComponent::InputBits( AliHLTUInt16_t & value, UInt_t const & bitCount ) { @@ -156,7 +156,22 @@ bool AliHLTTPCCompDumpComponent::InputBits( AliHLTUInt16_t & value, UInt_t const return false; value = (AliHLTUInt16_t)( temp & (AliHLTUInt64_t)0xFFFFFFFFULL ); return true; - }; + } + +bool AliHLTTPCCompDumpComponent::InputBits( AliHLTUInt32_t & value, UInt_t const & bitCount ) + { + // see header file for class documentation + if ( bitCount>32 ) + { + HLTFatal( "Internal error: Attempt to write more than 32 bits (%u)", (unsigned)bitCount ); + return false; + } + AliHLTUInt64_t temp; + if ( !InputBits( temp, bitCount ) ) + return false; + value = (AliHLTUInt32_t)( temp & (AliHLTUInt64_t)0xFFFFFFFFULL ); + return true; + } bool AliHLTTPCCompDumpComponent::InputBits( Int_t & value, UInt_t const & bitCount ) { @@ -171,7 +186,7 @@ bool AliHLTTPCCompDumpComponent::InputBits( Int_t & value, UInt_t const & bitCou return false; value = (Int_t)( temp & (AliHLTUInt64_t)0xFFFFFFFFULL ); return true; - }; + } bool AliHLTTPCCompDumpComponent::InputBits( AliHLTUInt64_t & value, UInt_t const & bitCount ) { @@ -207,7 +222,7 @@ bool AliHLTTPCCompDumpComponent::InputBits( AliHLTUInt64_t & value, UInt_t const bitsToRead -= curBitCount; } return true; - }; + } void AliHLTTPCCompDumpComponent::Pad8Bits() { @@ -220,7 +235,7 @@ void AliHLTTPCCompDumpComponent::Pad8Bits() fBitDataCurrentWord = *fBitDataCurrentInput; fBitDataCurrentPosInWord = 7; } - }; + } bool AliHLTTPCCompDumpComponent::InputBytes( AliHLTUInt8_t* data, UInt_t const & byteCount ) { @@ -236,7 +251,7 @@ bool AliHLTTPCCompDumpComponent::InputBytes( AliHLTUInt8_t* data, UInt_t const & fBitDataCurrentPosInWord = 7; } return true; - }; + } int AliHLTTPCCompDumpComponent::DoInit( int argc, const char** argv ) { diff --git a/HLT/TPCLib/comp/AliHLTTPCCompModelAnalysis.h b/HLT/TPCLib/comp/AliHLTTPCCompModelAnalysis.h index 354177c3d2b..d9cb0d9fc03 100644 --- a/HLT/TPCLib/comp/AliHLTTPCCompModelAnalysis.h +++ b/HLT/TPCLib/comp/AliHLTTPCCompModelAnalysis.h @@ -73,7 +73,7 @@ public: Bool_t GetfTrackAnalysis() {return fTrackAnalysis;}; /** fill track arrays with track data from original and secondary tracking - * @param firsttracklets pointer to track array to be filled + * @param tracklets pointer to track array to be filled * @param fillingfirsttracks boolean to decide which track array is to be filled (1 for first, 0 for second) * @return 0 upon success */ @@ -141,7 +141,7 @@ private: Bool_t GetTrashTrackPythiaInfo(AliHLTTPCTrack* discardedtrack); /** compare information of a cluster not assigned to any track with its Pythia information - * @param discarded cluster pointer to discarded cluster + * @param discardedcluster pointer to discarded cluster * @return 0 upon correct decision (cluster not assigned to any track is true in Pythia, i.e. cluster = noise cluster) * @return 1 upon wrong decision (cluster wrongly discarded, i.e. it belongs to a valuable track according to Pythia) */ diff --git a/HLT/TPCLib/comp/AliHLTTPCCompModelConverter.cxx b/HLT/TPCLib/comp/AliHLTTPCCompModelConverter.cxx index b82ce4e9763..c9e45f692af 100644 --- a/HLT/TPCLib/comp/AliHLTTPCCompModelConverter.cxx +++ b/HLT/TPCLib/comp/AliHLTTPCCompModelConverter.cxx @@ -53,8 +53,8 @@ AliHLTTPCCompModelConverter::AliHLTTPCCompModelConverter(): AliHLTTPCCompModelConverter::AliHLTTPCCompModelConverter(AliHLTTPCCompModelAnalysis* modelanalysis): fInputTrackArray(), fOutputTrackArray("AliHLTTPCModelTrack"), - fMinHits(0), - fModelAnalysisInstance(modelanalysis) + fModelAnalysisInstance(modelanalysis), + fMinHits(0) { // see header file for class documentation for ( UInt_t slice=0; slice<36; slice++ ) diff --git a/HLT/TPCLib/comp/AliHLTTPCCompModelDeconverterComponent.cxx b/HLT/TPCLib/comp/AliHLTTPCCompModelDeconverterComponent.cxx index 269300c805e..cd75951b33e 100644 --- a/HLT/TPCLib/comp/AliHLTTPCCompModelDeconverterComponent.cxx +++ b/HLT/TPCLib/comp/AliHLTTPCCompModelDeconverterComponent.cxx @@ -44,7 +44,8 @@ AliHLTTPCCompModelDeconverterComponent gAliHLTTPCCompClusterModelDeconverterComp ClassImp(AliHLTTPCCompModelDeconverterComponent) AliHLTTPCCompModelDeconverterComponent::AliHLTTPCCompModelDeconverterComponent(): - fOutputTracks(kTRUE) + fDeconverter(), + fOutputTracks(kTRUE) { // see header file for class documentation } diff --git a/HLT/TPCLib/comp/AliHLTTPCCompModelDeflaterComponent.cxx b/HLT/TPCLib/comp/AliHLTTPCCompModelDeflaterComponent.cxx index 1c659f2e419..9e85622eaa0 100644 --- a/HLT/TPCLib/comp/AliHLTTPCCompModelDeflaterComponent.cxx +++ b/HLT/TPCLib/comp/AliHLTTPCCompModelDeflaterComponent.cxx @@ -36,9 +36,9 @@ AliHLTTPCCompModelDeflaterComponent gAliHLTTPCCompClusterModelDeflaterComponent; ClassImp(AliHLTTPCCompModelDeflaterComponent); AliHLTTPCCompModelDeflaterComponent::AliHLTTPCCompModelDeflaterComponent(): - fForwardIfUncompressed(true), fModelDeflater(), - fConverter() + fConverter(), + fForwardIfUncompressed(true) { // see header file for class documentation } diff --git a/HLT/comp/AliHLTCOMPHuffmanAltro.cxx b/HLT/comp/AliHLTCOMPHuffmanAltro.cxx index 0c58c842652..07166fbb721 100644 --- a/HLT/comp/AliHLTCOMPHuffmanAltro.cxx +++ b/HLT/comp/AliHLTCOMPHuffmanAltro.cxx @@ -1243,8 +1243,8 @@ Int_t AliHLTCOMPHuffmanAltro::CreateCodeTable() // } // findout maximal and minimal codelength and print them out - Int_t maxcodelength = fTranslationTable[0].fvalidcodelength; - Int_t mincodelength = TIMEBINS; + UInt_t maxcodelength = fTranslationTable[0].fvalidcodelength; + UInt_t mincodelength = TIMEBINS; for (Int_t kk = 0; kk < TIMEBINS; kk++) { diff --git a/HLT/comp/AliHLTCOMPHuffmanAltroComponent.cxx b/HLT/comp/AliHLTCOMPHuffmanAltroComponent.cxx index 731b7978663..857a8b9b811 100644 --- a/HLT/comp/AliHLTCOMPHuffmanAltroComponent.cxx +++ b/HLT/comp/AliHLTCOMPHuffmanAltroComponent.cxx @@ -40,13 +40,12 @@ AliHLTCOMPHuffmanAltroComponent::AliHLTCOMPHuffmanAltroComponent(bool compressio fHuffmanCompressor(NULL), fCompressionSwitch(compression), fTrainingMode(kFALSE), - fHuffmanData(NULL), fOrigin(kAliHLTVoidDataOrigin), fRunNumber(0), fDataSpec(0), fTablePath(), - fNrcuTrailerwords(0) - + fNrcuTrailerwords(0), + fHuffmanData(NULL) { // see header file for class documentation // or -- 2.43.0