Fixing some compilation problems.

diff --git a/HLT/MUON/src/AliRoot/ADCStreamSource.cxx b/HLT/MUON/src/AliRoot/ADCStreamSource.cxx
index 96070c66539882c852fe274c7e2659c1ac1340b3..d6824bab397b6d1fe8d475a6c5b96c6deefe14a3 100644 (file)
--- a/HLT/MUON/src/AliRoot/ADCStreamSource.cxx
+++ b/HLT/MUON/src/AliRoot/ADCStreamSource.cxx
@@ -8,7 +8,7 @@
 #include "AliRoot/ADCStreamSource.hpp"
 #include "AliRoot/Base.hpp"
 #include "TSystem.h"
-#include "stdio.h"
+#include <stdio.h>
 
 // TODO: Change all the Error message statements to AliError at some stage.
 
@@ -110,7 +110,7 @@ void ADCStreamSource::FillFrom(const TString& dirprefix, UInt_t firstevent, UInt
 }
 
 
-void ADCStreamSource::Clear()
+void ADCStreamSource::Clear(Option_t* /*option*/)
 {
        fCurrentStream = -1;
        fList.erase( fList.begin(), fList.end() );

diff --git a/HLT/MUON/src/AliRoot/ADCStreamSource.hpp b/HLT/MUON/src/AliRoot/ADCStreamSource.hpp
index 33d19796360f331679725f9699629c215444d869..2f42c1f9663a59decd65a2febbb6618d26831f00 100644 (file)
--- a/HLT/MUON/src/AliRoot/ADCStreamSource.hpp
+++ b/HLT/MUON/src/AliRoot/ADCStreamSource.hpp
@@ -44,7 +44,7 @@ public:
        
        /* Clears all the internal arrays.
         */
-       void Clear();
+       virtual void Clear(Option_t* option = "");
        
        // Get methods.
        Int_t CurrentStream()  const { return fCurrentStream; };

diff --git a/HLT/MUON/src/AliRoot/ClusterSource.cxx b/HLT/MUON/src/AliRoot/ClusterSource.cxx
index ce595a7cf640a23d14f584576756ebc0564d73e3..9ba99061023c6e1f16bbdd9dd3baf6cd8d12ba86 100644 (file)
--- a/HLT/MUON/src/AliRoot/ClusterSource.cxx
+++ b/HLT/MUON/src/AliRoot/ClusterSource.cxx
@@ -147,12 +147,12 @@ void ClusterSource::FillFrom(
 }
 
 
-void ClusterSource::Clear()
+void ClusterSource::Clear(Option_t* /*option*/)
 {
        fFilename = "";
        fFoldername = "";
        ResetAllPointers();
-       fEventList.Clear("C");
+       fEventList.Delete();
 }
 
 
@@ -715,7 +715,7 @@ void ClusterSource::AddClusterFrom(
 };
 
 
-Bool_t ClusterSource::InFillRegion(Float_t x, Float_t y)
+Bool_t ClusterSource::InFillRegion(Float_t x, Float_t /*y*/)
 {
        switch (fAreaToUse)
        {

diff --git a/HLT/MUON/src/AliRoot/ClusterSource.hpp b/HLT/MUON/src/AliRoot/ClusterSource.hpp
index c899e06903eeb1adc86cf6008d48e29254ffcd87..25540e3ff712cb1ac95c45cb110af51508763214 100644 (file)
--- a/HLT/MUON/src/AliRoot/ClusterSource.hpp
+++ b/HLT/MUON/src/AliRoot/ClusterSource.hpp
@@ -85,7 +85,7 @@ public:
        
        /* Clears all the internal arrays.
         */
-       void Clear();
+       virtual void Clear(Option_t* option = "");
        
        // Get methods.
        TString FileName()   const { return fFilename; };

diff --git a/HLT/MUON/src/AliRoot/MicrodHLT.cxx b/HLT/MUON/src/AliRoot/MicrodHLT.cxx
index bf58a6b4e8323a54f1e7e86073520c0a6ee9f94e..b611f31a22e4c50f76276c7573a6577e0e21faa0 100644 (file)
--- a/HLT/MUON/src/AliRoot/MicrodHLT.cxx
+++ b/HLT/MUON/src/AliRoot/MicrodHLT.cxx
@@ -70,7 +70,7 @@ public:
        };
        
        
-       virtual void NoTrackFound(Tracking::Tracker* tracker)
+       virtual void NoTrackFound(Tracking::Tracker* /*tracker*/)
        {
                DebugMsg(2, "NoTrackFound");
                // Again nothing special to do here. The allocated memory is released
@@ -361,10 +361,14 @@ void MicrodHLT::Run()
 };
 
 
+#ifdef DEBUG
 void MicrodHLT::DebugLevel(Int_t value)
 {
-       DebugCode( dHLT::DebugLevel = value );
+       dHLT::DebugLevel = value;
 };
+#else // DEBUG
+void MicrodHLT::DebugLevel(Int_t /*value*/) {}
+#endif // DEBUG
 
 
 Int_t MicrodHLT::DebugLevel()

diff --git a/HLT/MUON/src/AliRoot/TrackSink.cxx b/HLT/MUON/src/AliRoot/TrackSink.cxx
index 41b6e8eb699ae0a392b1e430b3345e3a25d08a60..1f9510fdac338f2e0ae7dc0ecdd04a606094ef3d 100644 (file)
--- a/HLT/MUON/src/AliRoot/TrackSink.cxx
+++ b/HLT/MUON/src/AliRoot/TrackSink.cxx
@@ -162,7 +162,7 @@ void TrackSink::SetNames(const TriggerSource* triggersource)
 }
 
 
-void TrackSink::Clear()
+void TrackSink::Clear(Option_t* /*option*/)
 {
        fFilename = "";
        fFoldername = "";

diff --git a/HLT/MUON/src/AliRoot/TrackSink.hpp b/HLT/MUON/src/AliRoot/TrackSink.hpp
index 8c9e0b80e71e561a38f82e599d6afe10c6e5de55..c7c2ab8f5da2e07a8c586bfa0c600b4e5b40cea1 100644 (file)
--- a/HLT/MUON/src/AliRoot/TrackSink.hpp
+++ b/HLT/MUON/src/AliRoot/TrackSink.hpp
@@ -65,7 +65,7 @@ public:
        
        /* Clears all the internal arrays.
         */
-       void Clear();
+       virtual void Clear(Option_t* option = "");
        
        // Get methods for file and folder names.
        TString FileName()   const { return fFilename; }

diff --git a/HLT/MUON/src/AliRoot/TriggerSource.cxx b/HLT/MUON/src/AliRoot/TriggerSource.cxx
index b16bf1bcb2e0a2f0959fdbc7d3952bff0ae1811f..cbec4f746c4138188c17e4e68eee038b4d4c5bff 100644 (file)
--- a/HLT/MUON/src/AliRoot/TriggerSource.cxx
+++ b/HLT/MUON/src/AliRoot/TriggerSource.cxx
@@ -61,7 +61,7 @@ TriggerSource::TriggerSource(AliMUONDataInterface* data)
 
 TriggerSource::~TriggerSource()
 {
-       fEventList.Clear("C");
+       fEventList.Delete();
 }
 
 
@@ -143,7 +143,7 @@ void TriggerSource::FillFrom(
 }
 
 
-void TriggerSource::Clear()
+void TriggerSource::Clear(Option_t* /*option*/)
 {
        fFilename = "";
        fFoldername = "";
@@ -909,7 +909,7 @@ TriggerSource::EventData::EventData(Int_t eventnumber)
 
 TriggerSource::EventData::~EventData()
 {
-       fBlocks.Clear("C");
+       //fBlocks.Clear("C");  // Done in fBlocks destructor 
 }
 
 

diff --git a/HLT/MUON/src/AliRoot/TriggerSource.hpp b/HLT/MUON/src/AliRoot/TriggerSource.hpp
index 5d1e7139dbd998c86f8182c6a83947ea88219aa2..4e7a916f0c9afc594acbd7404318a7a48f65de00 100644 (file)
--- a/HLT/MUON/src/AliRoot/TriggerSource.hpp
+++ b/HLT/MUON/src/AliRoot/TriggerSource.hpp
@@ -88,7 +88,7 @@ public:
 
        /* Clears all the internal arrays.
         */
-       void Clear();
+       virtual void Clear(Option_t* option = "");
        
        // Get methods.
        TString FileName()   const { return fFilename; };

diff --git a/HLT/MUON/src/Tracking/MansoTracker.cxx b/HLT/MUON/src/Tracking/MansoTracker.cxx
index 654c88f0e83ac46adc66e97e81ef89865d982e91..5cf8cfbe70430be6d0e6701444e4c1d59c339669 100644 (file)
--- a/HLT/MUON/src/Tracking/MansoTracker.cxx
+++ b/HLT/MUON/src/Tracking/MansoTracker.cxx
@@ -13,7 +13,7 @@
 #include "RegionOfInterest.hpp"
 
 
-#ifdef DEBUG
+#if defined(DEBUG) || (defined(USE_ALILOG) && ! defined(LOG_NO_DEBUG))
 #include <ostream>
 #include "Debug/print.hpp"
 namespace

diff --git a/HLT/MUON/src/Tracking/MansoTracker.hpp b/HLT/MUON/src/Tracking/MansoTracker.hpp
index b23bce5a81f7c18f8eca803707c909807bf5e485..17ae9f8a8b0268f4bc1ba116c3ca02ac370b295f 100644 (file)
--- a/HLT/MUON/src/Tracking/MansoTracker.hpp
+++ b/HLT/MUON/src/Tracking/MansoTracker.hpp
@@ -43,7 +43,7 @@ public:
           of interests. Refer to MansoFilter() for details about a and b parameters.
         */
        static Float GetA7()                  { return a7; };
-       static void SetA7(Float value)  { a7 = a7; };
+       static void SetA7(Float value)  { a7 = value; };
        static Float GetA8()                  { return a8; };
        static void SetA8(Float value)  { a8 = value; };
        static Float GetA9()                  { return a9; };

diff --git a/HLT/MUON/src/Utils.hpp b/HLT/MUON/src/Utils.hpp
index af0d973c12ad733a02dead3c90cc4ab87c56092a..5a67a5ffaab00f10517bc282931d7a06846d678a 100644 (file)
--- a/HLT/MUON/src/Utils.hpp
+++ b/HLT/MUON/src/Utils.hpp
@@ -112,7 +112,7 @@ namespace dHLT
 #      define DebugMsg(level, message) \
                { \
                        __DebugMsg_PREECODE__(message) \
-                       AliDebug(level, os.str()); \
+                       AliDebugGeneral("dHLT", level, os.str().c_str()); \
                }
 
 #else // USE_ALILOG