Using assert in a way compatible with Root v5-13-06

diff --git a/HLT/MUON/src/AliHLTMUONUtils.h b/HLT/MUON/src/AliHLTMUONUtils.h
index c39c57773f47a961def57f3c542508a4402836fa..ed55447995e5373900821958f3b363e1cfb1e06f 100644 (file)
--- a/HLT/MUON/src/AliHLTMUONUtils.h
+++ b/HLT/MUON/src/AliHLTMUONUtils.h
@@ -56,11 +56,12 @@
 
 #      ifdef __ROOT__
 #              include <TError.h>
-#      else
+#      endif // __ROOT__
+#       ifndef Assert
 #              include <cassert>
                // Define assert with a capital first letter to maintain coding style. 
 #              define Assert(statement) assert(statement);
-#      endif // __ROOT__
+#       endif
 
        // Any code that should be compiled in only when the DEBUG macro is specified
        // can be enclosed with this DebugCode macro.
@@ -70,9 +71,10 @@
 
 #      ifdef __ROOT__
 #              include <TError.h>
-#      else
-#              define Assert(statement)
 #      endif // __ROOT__
+#       ifndef Assert
+#              define Assert(statement)
+#       endif
 
 #      define DebugCode(code)
 

diff --git a/MUON/AliMUONDataInterface.cxx b/MUON/AliMUONDataInterface.cxx
index 025fba08927bb9f905bdbc01469757558473c8ea..b132191e1ad5b959faebb2898b4bc0b1ef2be3fa 100644 (file)
--- a/MUON/AliMUONDataInterface.cxx
+++ b/MUON/AliMUONDataInterface.cxx
@@ -15,6 +15,7 @@
  
 /* $Id$ */
 
+#include <cassert>
 #include <TError.h>
 #include <TParticle.h>
 
@@ -505,8 +506,8 @@ Int_t AliMUONDataInterface::NumberOfSDigits(
 /// Returns the number of s-digits in the given file, folder, event,
 /// chamber and cathode. -1 is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
-       Assert( 0 <= cathode && cathode <= 1 );
+       assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= cathode && cathode <= 1 );
        
        if ( ! FetchLoaders(filename, foldername) ) return -1;
        if ( ! FetchEvent(event) ) return -1;
@@ -530,8 +531,8 @@ AliMUONDigit* AliMUONDataInterface::SDigit(
 /// Returns the specified s-digit in the given file, folder, event,
 /// chamber and cathode. NULL is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
-       Assert( 0 <= cathode && cathode <= 1 );
+       assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= cathode && cathode <= 1 );
        
        if ( ! FetchLoaders(filename, foldername) ) return NULL;
        if ( ! FetchEvent(event) ) return NULL;
@@ -554,8 +555,8 @@ Int_t AliMUONDataInterface::NumberOfDigits(
 {
 /// Returns the number of digits in the given file, folder, event,
 /// chamber and cathode. -1 is returned on error.
-       Assert( 0 <= chamber && chamber <= 13 );
-       Assert( 0 <= cathode && cathode <= 1 );
+       assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= cathode && cathode <= 1 );
        
        if ( ! FetchLoaders(filename, foldername) ) return -1;
        if ( ! FetchEvent(event) ) return -1;
@@ -579,8 +580,8 @@ AliMUONDigit* AliMUONDataInterface::Digit(
 /// Returns the specified digit in the given file, folder, event,
 /// chamber and cathode. NULL is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
-       Assert( 0 <= cathode && cathode <= 1 );
+       assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= cathode && cathode <= 1 );
        
        if ( ! FetchLoaders(filename, foldername) ) return NULL;
        if ( ! FetchEvent(event) ) return NULL;
@@ -603,7 +604,7 @@ Int_t AliMUONDataInterface::NumberOfRawClusters(
 /// Returns the number of raw clusters in the specified file, folder, event and chamber.
 /// -1 is returned or error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= chamber && chamber <= 13 );
        if ( ! FetchLoaders(filename, foldername) ) return -1;
        if ( ! FetchEvent(event) ) return -1;
        if ( ! FetchTreeR() ) return -1;
@@ -627,7 +628,7 @@ AliMUONRawCluster* AliMUONDataInterface::RawCluster(
 /// Fetch the specified raw cluster from the given file, folder, event and chamber number.
 /// NULL is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= chamber && chamber <= 13 );
        if ( ! FetchLoaders(filename, foldername) ) return NULL;
        if ( ! FetchEvent(event) ) return NULL;
        if ( ! FetchTreeR() ) return NULL;
@@ -838,8 +839,8 @@ Int_t AliMUONDataInterface::NumberOfSDigits(Int_t chamber, Int_t cathode)
 /// Get the number of s-digits on the chamber, cathode in the current event.
 /// -1 is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
-       Assert( 0 <= cathode && cathode <= 1 );
+       assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= cathode && cathode <= 1 );
        
        if (fRunloader == NULL)
        {
@@ -868,8 +869,8 @@ AliMUONDigit* AliMUONDataInterface::SDigit(Int_t chamber, Int_t cathode, Int_t s
 /// Fetch the specified s-digits on the chamber, cathode from the current event.
 /// NULL is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
-       Assert( 0 <= cathode && cathode <= 1 );
+       assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= cathode && cathode <= 1 );
        
        if (fRunloader == NULL)
        {
@@ -898,8 +899,8 @@ Int_t AliMUONDataInterface::NumberOfDigits(Int_t chamber, Int_t cathode)
 /// Get the number of digits on the chamber, cathode in the current event.
 /// -1 is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
-       Assert( 0 <= cathode && cathode <= 1 );
+       assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= cathode && cathode <= 1 );
        
        if (fRunloader == NULL)
        {
@@ -928,8 +929,8 @@ AliMUONDigit* AliMUONDataInterface::Digit(Int_t chamber, Int_t cathode, Int_t di
 /// Fetch the specified digits on the chamber, cathode from the current event.
 /// NULL is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
-       Assert( 0 <= cathode && cathode <= 1 );
+       assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= cathode && cathode <= 1 );
        
        if (fRunloader == NULL)
        {
@@ -958,7 +959,7 @@ Int_t AliMUONDataInterface::NumberOfRawClusters(Int_t chamber)
 /// Get the number of raw clusters on the given chamber in the current event.
 /// -1 is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= chamber && chamber <= 13 );
 
        if (fRunloader == NULL)
        {
@@ -988,7 +989,7 @@ AliMUONRawCluster* AliMUONDataInterface::RawCluster(Int_t chamber, Int_t cluster
 /// Fetch the specified raw cluster on the given chamber from the current event.
 /// NULL is returned on error.
 
-       Assert( 0 <= chamber && chamber <= 13 );
+       assert( 0 <= chamber && chamber <= 13 );
 
        if (fRunloader == NULL)
        {