Merge branch 'devel'

* devel:
  forgot the header file
  compilation warning

diff --git a/HLT/EVE/AliHLTEveTRD.cxx b/HLT/EVE/AliHLTEveTRD.cxx
index c27ff380d85034f2de1eee65bd84d0b994b70073..68e06c0ab9a783cb84c5bf7a691ad49277a0c032 100644 (file)
--- a/HLT/EVE/AliHLTEveTRD.cxx
+++ b/HLT/EVE/AliHLTEveTRD.cxx
@@ -59,8 +59,6 @@ AliHLTEveTRD::~AliHLTEveTRD()
 void AliHLTEveTRD::ProcessBlock(AliHLTHOMERBlockDesc * block) {
   //See header file for documentation
 
-  cout <<"TRD Clusters"<<endl;
-
   if ( ! block->GetDataType().CompareTo("CLUSTERS") ) {
     
     if(!fEveColClusters){
@@ -68,7 +66,7 @@ void AliHLTEveTRD::ProcessBlock(AliHLTHOMERBlockDesc * block) {
       fEventManager->GetEveManager()->AddElement(fEveColClusters);
     } 
     
-    ProcessClusters(block, fEveClusters, fEveColClusters);
+    ProcessClusters(block, fEveColClusters);
    
   } else if ( ! block->GetDataType().CompareTo("ROOTHIST") ) {
   
@@ -87,7 +85,6 @@ void AliHLTEveTRD::ProcessBlock(AliHLTHOMERBlockDesc * block) {
 void AliHLTEveTRD::AddHistogramsToCanvas(AliHLTHOMERBlockDesc* block, TCanvas * canvas, Int_t &cdCount ) {
   //See header file for documentation
   if ( ! block->GetClassName().CompareTo("TH1F")) {
-    cout<<"TH1F"<<endl;
     TH1F* histo = reinterpret_cast<TH1F*>(block->GetTObject());
     ++cdCount;
   
@@ -161,10 +158,8 @@ void AliHLTEveTRD::ResetElements(){
   fHistoCount = 0;
 }
 
-Int_t AliHLTEveTRD::ProcessClusters( AliHLTHOMERBlockDesc * block, TEvePointSet * cont, TEvePointSetArray * contCol ){
+Int_t AliHLTEveTRD::ProcessClusters( AliHLTHOMERBlockDesc * block, TEvePointSetArray * contCol ){
   //See header file for documentation
-  
-  cout <<"processclusters"<<endl;
 
   Int_t iResult = 0;
 

diff --git a/HLT/EVE/AliHLTEveTRD.h b/HLT/EVE/AliHLTEveTRD.h
index f2d4e9a5eff8b5b222e839ba94b02af56ef54ecb..bed068de53ac4237f68b59fa22a28ebf1cddc997 100644 (file)
--- a/HLT/EVE/AliHLTEveTRD.h
+++ b/HLT/EVE/AliHLTEveTRD.h
@@ -45,7 +45,7 @@ private:
   TEvePointSetArray * CreatePointSetArray();
 
   /** Proces clusters block */
-  Int_t ProcessClusters( AliHLTHOMERBlockDesc * block, TEvePointSet * cont, TEvePointSetArray * contCol );
+  Int_t ProcessClusters( AliHLTHOMERBlockDesc * block, TEvePointSetArray * contCol );
 
   /** Inherited from AliHLTEveBase */
   void AddHistogramsToCanvas(AliHLTHOMERBlockDesc* block, TCanvas * canvas, Int_t &cdCount );