Changes to compile on alpha

diff --git a/HLT/MUON/src/AliRoot/ADCStream.cxx b/HLT/MUON/src/AliRoot/ADCStream.cxx
index 94866dfcee951336625fe16b097fd61e7e65e65f..492ea9f661920c901f363336e8c395084b8d0dbb 100644 (file)
--- a/HLT/MUON/src/AliRoot/ADCStream.cxx
+++ b/HLT/MUON/src/AliRoot/ADCStream.cxx
@@ -6,7 +6,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "AliRoot/ADCStream.hpp"
-#include "TMath.h"
+#include <TMath.h>
 #include "Utils.hpp"
 
 
@@ -66,16 +66,16 @@ UInt_t ADCStream::operator [] (const UInt_t index) const
 };
 
 
-std::ostream& operator << (std::ostream& os, const ADCStream& s)
+ostream& operator << (ostream& os, const ADCStream& s)
 {
        os << "{ADCStream: " << (void*)s.Data() << "}";
-       os << std::endl;
+       os << endl;
        for (Int_t i = 0; i < s.fData.GetSize(); i++)
        {
                char buffer[32];
                char* str = (char*)&buffer[0];
                sprintf(str, "0x%X", s.fData[i]);
-               os << i << "\t" << str << std::endl;
+               os << i << "\t" << str << endl;
        };
        return os;
 };

diff --git a/HLT/MUON/src/AliRoot/ADCStream.hpp b/HLT/MUON/src/AliRoot/ADCStream.hpp
index 45e65cd275ac298a0778d3d59805eccdcc522c16..fe7b71746fca34b05fe30afe861c71c8ef403afe 100644 (file)
--- a/HLT/MUON/src/AliRoot/ADCStream.hpp
+++ b/HLT/MUON/src/AliRoot/ADCStream.hpp
@@ -8,9 +8,9 @@
 #ifndef dHLT_ALIROOT_ADC_STREAM_HPP
 #define dHLT_ALIROOT_ADC_STREAM_HPP
 
-#include "TObject.h"
-#include "TArrayI.h"
-#include <ostream>
+#include <TObject.h>
+#include <TArrayI.h>
+#include <Riostream.h>
 
 
 namespace AliMUONHLT
@@ -40,7 +40,7 @@ public:
        UInt_t operator [] (const UInt_t index) const;
 
        // ostream operator usefull for text output.
-       friend std::ostream& operator << (std::ostream& os, const ADCStream& s);
+       friend ostream& operator << (ostream& os, const ADCStream& s);
 
 private:
 

diff --git a/HLT/MUON/src/AliRoot/ClusterSource.cxx b/HLT/MUON/src/AliRoot/ClusterSource.cxx
index bb1af0563b119f3ec1ab26d326927d03dc2f738f..a63e6e7ef2784e7772edb448bf39a8de6fda6972 100644 (file)
--- a/HLT/MUON/src/AliRoot/ClusterSource.cxx
+++ b/HLT/MUON/src/AliRoot/ClusterSource.cxx
@@ -11,8 +11,10 @@
 #include "AliMUONHit.h"
 #include "AliMUONRawCluster.h"
 #include "AliMUONDataInterface.h"
-#ifdef __APPLE__
-#include "math.h"
+#ifndef __alpha
+#include <math.h>
+#else
+#include <float.h>
 #endif
 
 ClassImp(AliMUONHLT::ClusterSource);
@@ -567,7 +569,11 @@ void ClusterSource::AddChamberFrom(AliMUONDataInterface* data, const Int_t chamb
        
        AddBlock(chamber);
        UInt_t currentblocksize = 0;
+#ifndef __alpha
        Float_t x = NAN, y = NAN;
+#else
+       Float_t x = FLT_QNAN, y = FLT_QNAN;
+#endif
        
        switch (fDataToUse)
        {
@@ -646,8 +652,11 @@ void ClusterSource::AddClusterFrom(
        )
 {
        DebugMsg(1, "Entering AddClusterFrom");
-       
+#ifndef __alpha        
        Float_t x = NAN, y = NAN;
+#else
+       Float_t x = FLT_QNAN, y = FLT_QNAN;
+#endif
 
        switch (fDataToUse)
        {

diff --git a/HLT/MUON/src/AliRoot/Point.cxx b/HLT/MUON/src/AliRoot/Point.cxx
index 0a4039b1172fb88f4bd89f92ca56716d37b95d7a..4c0dcb22bfc268101946928a1f5cc1d0c4e049fb 100644 (file)
--- a/HLT/MUON/src/AliRoot/Point.cxx
+++ b/HLT/MUON/src/AliRoot/Point.cxx
@@ -24,7 +24,7 @@ Point::Point(const Float_t x, const Float_t y) : TObject()
        fY = y;
 };
 
-std::ostream& operator << (std::ostream& os, const Point& p)
+ostream& operator << (ostream& os, const Point& p)
 {
        os << "[" << p.fX << ", " << p.fY << "]";
        return os;

diff --git a/HLT/MUON/src/AliRoot/Point.hpp b/HLT/MUON/src/AliRoot/Point.hpp
index 1af91b3f69ca916ea65a83f72b30a1ea8cc629e4..be75095a58bc685a9d825cbed0f718cf458a5e23 100644 (file)
--- a/HLT/MUON/src/AliRoot/Point.hpp
+++ b/HLT/MUON/src/AliRoot/Point.hpp
@@ -8,8 +8,8 @@
 #ifndef dHLT_ALIROOT_POINT_HPP
 #define dHLT_ALIROOT_POINT_HPP
 
-#include "TObject.h"
-#include <ostream>
+#include <TObject.h>
+#include <Riostream.h>
 
 
 namespace AliMUONHLT
@@ -31,7 +31,7 @@ public:
        virtual ~Point() {};
        
        // ostream operator usefull for text output.
-       friend std::ostream& operator << (std::ostream& os, const Point& p);
+       friend ostream& operator << (ostream& os, const Point& p);
 
 
        Float_t fX;    // X coordinate of the 2D point.

diff --git a/HLT/MUON/src/AliRoot/Region.cxx b/HLT/MUON/src/AliRoot/Region.cxx
index 9a56b608357ba04465ddf923130473a00a6956e0..904ed7c067d3eb7c8f0b245723c750fcd1af5d31 100644 (file)
--- a/HLT/MUON/src/AliRoot/Region.cxx
+++ b/HLT/MUON/src/AliRoot/Region.cxx
@@ -7,7 +7,8 @@
 
 #include "AliRoot/Region.hpp"
 #include "AliRoot/Point.hpp"
-#include "TMath.h"
+#include <TMath.h>
+#include "Utils.hpp"
 
 ClassImp(AliMUONHLT::Region);
 
@@ -86,7 +87,7 @@ Bool_t Region::Contains(const Point& p) const
 };
 
 
-std::ostream& operator << (std::ostream& os, const Region& r)
+ostream& operator << (ostream& os, const Region& r)
 {
        os << "[(" << r.fLeft << ", " << r.fRight << "), (" << r.fLeft << ", " << r.fRight << ")]";
        return os;

diff --git a/HLT/MUON/src/AliRoot/Region.hpp b/HLT/MUON/src/AliRoot/Region.hpp
index 1058e0fa1e744b2a7fa46376f7a706ef01dbdbe8..3b3a9b96d546507b58ef7dc8374fd12c38469218 100644 (file)
--- a/HLT/MUON/src/AliRoot/Region.hpp
+++ b/HLT/MUON/src/AliRoot/Region.hpp
@@ -8,8 +8,8 @@
 #ifndef dHLT_ALIROOT_REGION_HPP
 #define dHLT_ALIROOT_REGION_HPP
 
-#include "TObject.h"
-#include <ostream>
+#include <TObject.h>
+#include <Riostream.h>
 
 
 namespace AliMUONHLT
@@ -56,7 +56,7 @@ public:
        Bool_t Contains(const Point& p) const;
 
        // ostream operator usefull for text output.
-       friend std::ostream& operator << (std::ostream& os, const Region& r);
+       friend ostream& operator << (ostream& os, const Region& r);
 
 private:
 

diff --git a/HLT/MUON/src/AliRoot/Track.cxx b/HLT/MUON/src/AliRoot/Track.cxx
index 0077bf3853bbab9e791de0de302cc19d4ccd7473..299aeabc25fd9be4bb960e594ff73b61f37da926 100644 (file)
--- a/HLT/MUON/src/AliRoot/Track.cxx
+++ b/HLT/MUON/src/AliRoot/Track.cxx
@@ -6,7 +6,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "AliRoot/Track.hpp"
-#include "TMath.h"
+#include <TMath.h>
+#include "Utils.hpp"
 
 ClassImp(AliMUONHLT::Track);
 
@@ -200,7 +201,7 @@ Bool_t Track::HitsInRegions() const
 };
 
 
-std::ostream& operator << (std::ostream& os, const Track& t)
+ostream& operator << (ostream& os, const Track& t)
 {
        os << "{trigid: " << t.fTriggerID << ", sign: " << t.fParticleSign
           << ", p: " << t.fP << ", pt: " << t.fPt << "}";

diff --git a/HLT/MUON/src/AliRoot/Track.hpp b/HLT/MUON/src/AliRoot/Track.hpp
index 89bfcc4a87ff26755d952541fb7406819cca704a..f1377119d214a5c6f15b75fe0a33d3326f321672 100644 (file)
--- a/HLT/MUON/src/AliRoot/Track.hpp
+++ b/HLT/MUON/src/AliRoot/Track.hpp
@@ -8,8 +8,8 @@
 #ifndef dHLT_ALIROOT_TRACK_HPP
 #define dHLT_ALIROOT_TRACK_HPP
 
-#include "TObject.h"
-#include <ostream>
+#include <TObject.h>
+#include <Riostream.h>
 
 #include "AliRoot/Point.hpp"
 #include "AliRoot/Region.hpp"
@@ -92,7 +92,7 @@ public:
        Bool_t HitsInRegions() const;
 
        // ostream operator usefull for text output.
-       friend std::ostream& operator << (std::ostream& os, const Track& t);
+       friend ostream& operator << (ostream& os, const Track& t);
 
 private:
 

diff --git a/HLT/MUON/src/AliRoot/TriggerRecord.cxx b/HLT/MUON/src/AliRoot/TriggerRecord.cxx
index 8850eab415bd6f86b5774824de59130c69fa7c62..c069d0e111d3668cafb7a34d5aa7419b95fcb403 100644 (file)
--- a/HLT/MUON/src/AliRoot/TriggerRecord.cxx
+++ b/HLT/MUON/src/AliRoot/TriggerRecord.cxx
@@ -103,7 +103,7 @@ void TriggerRecord::Pt(const Float_t value)
 };
 
 
-std::ostream& operator << (std::ostream& os, const TriggerRecord& r)
+ostream& operator << (ostream& os, const TriggerRecord& r)
 {
        os << "{trig#: " << r.fTriggerNumber << ", sign: " << r.fParticleSign
           << ", pt: " << r.fPt << ", st1: " << r.fSt1Point << ", st2: "

diff --git a/HLT/MUON/src/AliRoot/TriggerRecord.hpp b/HLT/MUON/src/AliRoot/TriggerRecord.hpp
index 06a5a7ddb70c5857e1ced7e172e0661b750abd3b..792e42941f106dca658f4576ad380add63d14f24 100644 (file)
--- a/HLT/MUON/src/AliRoot/TriggerRecord.hpp
+++ b/HLT/MUON/src/AliRoot/TriggerRecord.hpp
@@ -8,8 +8,9 @@
 #ifndef dHLT_ALIROOT_TRIGGER_RECORD_HPP
 #define dHLT_ALIROOT_TRIGGER_RECORD_HPP
 
-#include "TObject.h"
+#include <TObject.h>
 #include "AliRoot/Point.hpp"
+#include "Utils.hpp"
 
 namespace AliMUONHLT
 {
@@ -72,7 +73,7 @@ public:
        const Point& Station2Point() const { return fSt2Point; };
 
        // ostream operator usefull for text output.
-       friend std::ostream& operator << (std::ostream& os, const TriggerRecord& r);
+       friend ostream& operator << (ostream& os, const TriggerRecord& r);
 
 private:
 

diff --git a/HLT/MUON/src/AliRoot/TriggerSource.cxx b/HLT/MUON/src/AliRoot/TriggerSource.cxx
index eca7d698376b406a3b69c8bcc8cfa342c0be4115..f48b24fb59bd54e2aa5beed15c792f0ba2184eba 100644 (file)
--- a/HLT/MUON/src/AliRoot/TriggerSource.cxx
+++ b/HLT/MUON/src/AliRoot/TriggerSource.cxx
@@ -18,6 +18,11 @@
 #include "AliMUONTriggerCircuit.h"
 #include "AliMUONDataInterface.h"
 #include "TDatabasePDG.h"
+#ifndef __alpha
+#include <math.h>
+#else
+#include <float.h>
+#endif
 
 ClassImp(AliMUONHLT::TriggerSource);
 ClassImp(AliMUONHLT::TriggerSource::EventData);
@@ -687,8 +692,11 @@ Bool_t TriggerSource::FillTriggerFromHits(AliMUONDataInterface* data, const Int_
        DebugMsg(2, "Creating TriggerRecord from hits on track: " << track );
        
        Float_t x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4;
+#ifndef __alpha
        x1 = y1 = z1 = x2 = y2 = z2 = x3 = y3 = z3 = x4 = y4 = z4 = NAN;
-
+#else
+       x1 = y1 = z1 = x2 = y2 = z2 = x3 = y3 = z3 = x4 = y4 = z4 = FLT_QNAN;
+#endif
        // Find the hit that corresponds to chambers. 11 to 14. We can ignore any
        // hits above the first 14. If there are that many it means the particle
        // is cycling in the detector.

diff --git a/HLT/MUON/src/Error.hpp b/HLT/MUON/src/Error.hpp
index 75f8ee0bc2d2d853b5cc986ad514a7980ccfca1a..b3cdff0d179f76c8180a4bf3172c4ba209e9cad8 100644 (file)
--- a/HLT/MUON/src/Error.hpp
+++ b/HLT/MUON/src/Error.hpp
@@ -10,7 +10,7 @@
 
 #include "BasicTypes.hpp"
 #include <exception>
-#include <ostream>
+#include <Riostream.h>
 
 namespace dHLT
 {
@@ -43,7 +43,7 @@ public:
                Error myerror;
                cout << myerror << endl;
        */
-       friend std::ostream& operator << (std::ostream& os, const dHLT::Error& error)
+       friend ostream& operator << (ostream& os, const dHLT::Error& error)
        {
                os << error.Message();
                return os;

diff --git a/HLT/MUON/src/Utils.hpp b/HLT/MUON/src/Utils.hpp
index e476f4fa47c29fe373eaefb81443d6549e403e96..af0d973c12ad733a02dead3c90cc4ab87c56092a 100644 (file)
--- a/HLT/MUON/src/Utils.hpp
+++ b/HLT/MUON/src/Utils.hpp
@@ -36,7 +36,7 @@
    or = ||
    not = !
  */
-#ifndef __GNUC__
+#if !defined(__GNUC__) && !defined(__CINT__)
 
 #      define and &&
 #      define or ||
@@ -102,7 +102,7 @@ namespace dHLT
        // We are defining this DebugMsg_PREECODE macro to use in DebugMsg in such a way
        // so that the code is removed when the LOG_NO_DEBUG macro is specified but 
        // compiled otherwise.
-#      include <sstream>
+#      include <Rstrstream.h>
 #      ifndef LOG_NO_DEBUG
 #              define __DebugMsg_PREECODE__(message) std::ostringstream os; os << message;
 #      else // LOG_NO_DEBUG