Changes to compile on solarisCC5
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 23 Jun 2005 13:03:36 +0000 (13:03 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 23 Jun 2005 13:03:36 +0000 (13:03 +0000)
40 files changed:
HLT/MUON/src/AliRoot/ADCStream.cxx
HLT/MUON/src/AliRoot/ADCStream.hpp
HLT/MUON/src/AliRoot/ADCStreamSource.cxx
HLT/MUON/src/AliRoot/ADCStreamSource.hpp
HLT/MUON/src/AliRoot/ClusterFinderCallback.cxx
HLT/MUON/src/AliRoot/ClusterFinderCallback.hpp
HLT/MUON/src/AliRoot/ClusterFinderInterface.hpp
HLT/MUON/src/AliRoot/ClusterFinderProxy.cxx
HLT/MUON/src/AliRoot/ClusterFinderProxy.hpp
HLT/MUON/src/AliRoot/ClusterSource.cxx
HLT/MUON/src/AliRoot/ClusterSource.hpp
HLT/MUON/src/AliRoot/MicrodHLT.cxx
HLT/MUON/src/AliRoot/Point.cxx
HLT/MUON/src/AliRoot/Point.hpp
HLT/MUON/src/AliRoot/Region.cxx
HLT/MUON/src/AliRoot/Region.hpp
HLT/MUON/src/AliRoot/Track.cxx
HLT/MUON/src/AliRoot/Track.hpp
HLT/MUON/src/AliRoot/TrackSink.cxx
HLT/MUON/src/AliRoot/TrackSink.hpp
HLT/MUON/src/AliRoot/TrackerCallback.cxx
HLT/MUON/src/AliRoot/TrackerCallback.hpp
HLT/MUON/src/AliRoot/TrackerInterface.hpp
HLT/MUON/src/AliRoot/TrackerProxy.cxx
HLT/MUON/src/AliRoot/TrackerProxy.hpp
HLT/MUON/src/AliRoot/TriggerRecord.cxx
HLT/MUON/src/AliRoot/TriggerRecord.hpp
HLT/MUON/src/AliRoot/TriggerSource.cxx
HLT/MUON/src/AliRoot/TriggerSource.hpp
HLT/MUON/src/AliRoot/convert.cxx
HLT/MUON/src/AliRoot/convert.hpp
HLT/MUON/src/Buffers/List.hpp
HLT/MUON/src/Clustering/CenterOfGravityFinder.cxx
HLT/MUON/src/Error.cxx
HLT/MUON/src/Error.hpp
HLT/MUON/src/Point.hpp
HLT/MUON/src/RegionOfInterest.hpp
HLT/MUON/src/Tracking/MansoTracker.hpp
HLT/MUON/src/Version/Version.cxx
HLT/MUON/src/Version/Version.hpp

index 492ea9f661920c901f363336e8c395084b8d0dbb..c0c841ed0abd61ef0b8522cee8042c12412caa72 100644 (file)
@@ -10,7 +10,7 @@
 #include "Utils.hpp"
 
 
-ClassImp(AliMUONHLT::ADCStream);
+ClassImp(AliMUONHLT::ADCStream)
 
 namespace AliMUONHLT
 {
@@ -19,37 +19,37 @@ namespace AliMUONHLT
 ADCStream::ADCStream() : TObject()
 {
        fData.Set(0);
-};
+}
 
 
 ADCStream::ADCStream(const UInt_t* data, const UInt_t size)
 {
        fData.Set(size, (Int_t*)data);
-};
+}
 
 
 ADCStream::~ADCStream()
 {
        fData.Reset();
-};
+}
 
 
 UInt_t ADCStream::Size()
 {
        return fData.GetSize();
-};
+}
 
 
 void ADCStream::Size(const UInt_t size)
 {
        fData.Set(size);
-};
+}
 
 
 void ADCStream::Fill(const UInt_t* data, const UInt_t size)
 {
        fData.Set(size, (Int_t*)data);
-};
+}
 
 
 // UInt_t& ADCStream::operator [] (const UInt_t index)
@@ -63,7 +63,7 @@ UInt_t ADCStream::operator [] (const UInt_t index) const
 {
        Assert( index < (UInt_t) fData.GetSize() );
        return fData[index];
-};
+}
 
 
 ostream& operator << (ostream& os, const ADCStream& s)
@@ -76,9 +76,9 @@ ostream& operator << (ostream& os, const ADCStream& s)
                char* str = (char*)&buffer[0];
                sprintf(str, "0x%X", s.fData[i]);
                os << i << "\t" << str << endl;
-       };
+       }
        return os;
-};
+}
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
index fe7b71746fca34b05fe30afe861c71c8ef403afe..0e1dba8b28ac5dd9670b54e25e912896563e49c7 100644 (file)
@@ -33,8 +33,8 @@ public:
        void Size(const UInt_t size);
        void Fill(const UInt_t* data, const UInt_t size);
        
-       UInt_t* Data() { return (UInt_t*) fData.GetArray(); };
-       const UInt_t* Data() const { return (UInt_t*) fData.GetArray(); };
+       UInt_t* Data() { return (UInt_t*) fData.GetArray(); }
+       const UInt_t* Data() const { return (UInt_t*) fData.GetArray(); }
        
 //     UInt_t& operator [] (const UInt_t index);
        UInt_t operator [] (const UInt_t index) const;
@@ -47,10 +47,10 @@ private:
        // TODO: complete the ADC stream specification.
        TArrayI fData;
 
-       ClassDef(ADCStream, 1);  // ADC stream data.
+       ClassDef(ADCStream, 1)  // ADC stream data.
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_ADC_STREAM_HPP
index bb6413b98120d96efe79ffe44fcb8d62d02d0077..4a289fb79d4275610e86edef05619b537ca0ceb2 100644 (file)
@@ -13,8 +13,8 @@
 // TODO: Change all the Error message statements to AliError at some stage.
 
 
-ClassImp(AliMUONHLT::ADCStreamSource);
-ClassImp(AliMUONHLT::ADCStreamSource::DataBlock);
+ClassImp(AliMUONHLT::ADCStreamSource)
+ClassImp(AliMUONHLT::ADCStreamSource::DataBlock)
 
 namespace AliMUONHLT
 {
@@ -23,13 +23,13 @@ namespace AliMUONHLT
 ADCStreamSource::ADCStreamSource() : TObject()
 {
        fCurrentStream = -1;
-};
+}
 
 
 ADCStreamSource::~ADCStreamSource()
 {
        // Everything is cleaned up implicitly.
-};
+}
 
 
 void ADCStreamSource::FillFromFile(const TString& filename, const Int_t eventnumber)
@@ -64,7 +64,7 @@ void ADCStreamSource::FillFromFile(const TString& filename, const Int_t eventnum
        );
        
        DebugMsg(1, "Leaving FillFromFile");
-};
+}
 
 
 void ADCStreamSource::FillFrom(const TString& directory, const Int_t eventnumber)
@@ -92,7 +92,7 @@ void ADCStreamSource::FillFrom(const TString& directory, const Int_t eventnumber
        
        
        DebugMsg(1, "Leaving FillFrom");
-};
+}
 
 
 void ADCStreamSource::FillFrom(const TString& dirprefix, const UInt_t firstevent, const UInt_t lastevent)
@@ -107,20 +107,20 @@ void ADCStreamSource::FillFrom(const TString& dirprefix, const UInt_t firstevent
        };
        
        DebugMsg(1, "Leaving FillFrom");
-};
+}
 
 
 void ADCStreamSource::Clear()
 {
        fCurrentStream = -1;
        fList.erase( fList.begin(), fList.end() );
-};
+}
 
 
 Int_t ADCStreamSource::NumberOfStreams() const
 {
        return fList.size();
-};
+}
 
 
 Bool_t ADCStreamSource::GetStream(const Int_t index) const
@@ -144,8 +144,8 @@ Bool_t ADCStreamSource::GetStream(const Int_t index) const
                                index
                        );
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Bool_t ADCStreamSource::FirstStream() const
@@ -157,7 +157,7 @@ Bool_t ADCStreamSource::FirstStream() const
        }
        else
                return kFALSE;
-};
+}
 
 
 Bool_t ADCStreamSource::NextStream() const
@@ -183,8 +183,8 @@ Int_t ADCStreamSource::EventNumber() const
        {
                Error("EventNumber", "No ADC stream selected.");
                return -1;
-       };
-};
+       }
+}
 
 
 Bool_t ADCStreamSource::FetchStream(ADCStream& stream) const
@@ -199,8 +199,8 @@ Bool_t ADCStreamSource::FetchStream(ADCStream& stream) const
        {
                Error("FetchStream", "No ADC stream selected.");
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Bool_t ADCStreamSource::FetchStream(const Int_t index, ADCStream& stream) const
@@ -209,7 +209,7 @@ Bool_t ADCStreamSource::FetchStream(const Int_t index, ADCStream& stream) const
                return FetchStream(stream);
        else
                return kFALSE;
-};
+}
 
 
 const ADCStream* ADCStreamSource::FetchStream() const
@@ -223,8 +223,8 @@ const ADCStream* ADCStreamSource::FetchStream() const
        {
                Error("FetchStream", "No ADC stream selected.");
                return NULL;
-       };
-};
+       }
+}
 
 
 void ADCStreamSource::AddStream(ADCStream& stream, const UInt_t eventnumber)
@@ -238,7 +238,7 @@ void ADCStreamSource::AddStream(ADCStream& stream, const UInt_t eventnumber)
        fCurrentStream = fList.size() - 1;
        
        DebugMsg(1, "Leaving AddStream");
-};
+}
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
index 9ba807c4f3ff134270bc22965b504f1982e50fb9..2942b85c05a0e12d7e4eb663e356f65cda7986bf 100644 (file)
@@ -106,17 +106,17 @@ public:  // Unfortunately ROOT requires the following to be public.
                Int_t fEventNumber;  // Event number of the stream.
                ADCStream fStream;  // The ADC stream block.
                
-               ClassDef(DataBlock, 1);  // Data per event.
+               ClassDef(DataBlock, 1)  // Data per event.
        };
 
 private:
 
        std::vector<DataBlock> fList;  // List of ADC streams.
 
-       ClassDef(ADCStreamSource, 1);  // The source of ADC stream data for dHLT.
+       ClassDef(ADCStreamSource, 1)  // The source of ADC stream data for dHLT.
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_ADC_STREAM_SOURCE_HPP
index b9c2a8d989815cfcaa0eca9f044b6867b53e2fe6..22168e06492741490523b66143cc651b994d6a0c 100644 (file)
@@ -7,4 +7,4 @@
 
 #include "AliRoot/ClusterFinderCallback.hpp"
 
-ClassImp(AliMUONHLT::ClusterFinderCallback);
+ClassImp(AliMUONHLT::ClusterFinderCallback)
index 85f637d8ecb4c27f3c49de71c26058d227bf3fb9..fb283d76603f2fa533605375613de84f2edc6958 100644 (file)
@@ -22,7 +22,7 @@ public:
        virtual void FoundClusters(const UInt_t numberfound) = 0;
        virtual void NoClustersFound() = 0;
        
-       ClassDef(ClusterFinderCallback, 0);  // Abstract cluster finder callback class.
+       ClassDef(ClusterFinderCallback, 0)  // Abstract cluster finder callback class.
 };
 
 
index 6e70d6bbe68b43b23fa5d8f11e5327de1b25b7d8..655ed06dd3d07bbc4af86494744bd28726898046 100644 (file)
@@ -44,6 +44,6 @@ private:
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_CLUSTER_FINDER_INTERFACE_HPP
index dd69e60ec8935f06c2586874bea6acdac542ac9e..c5abb6665fb4e04b67e59d3e290a4220fa83c584 100644 (file)
@@ -21,7 +21,7 @@ ClusterFinderProxy::ClusterFinderProxy(AliMUONHLT::ClusterFinderInterface* clien
        : Clustering::ClusterFinder(), AliMUONHLT::ClusterFinderCallback()
 {
        clusterfinder = client;
-};
+}
 
 
 void ClusterFinderProxy::FindClusters(const ADCStream* stream)
@@ -31,7 +31,7 @@ void ClusterFinderProxy::FindClusters(const ADCStream* stream)
        AliMUONHLT::ADCStream adc;
        DebugMsg(6, "ClusterFinderProxy::FindClusters: " << adc);
        clusterfinder->FindClusters(&adc);
-};
+}
 
 
 UInt ClusterFinderProxy::FillClusterData(ClusterPoint* clusters, const UInt arraysize)
@@ -46,36 +46,36 @@ UInt ClusterFinderProxy::FillClusterData(ClusterPoint* clusters, const UInt arra
                {
                        clusters[i] = Convert(points[i]);
                        DebugMsg(6, "\tpoints[" << i << "] = " << points[i] );
-               };
+               }
        }
        finally
        (
                delete [] points;
-       );
+       )
        return result;
-};
+}
 
 
 void ClusterFinderProxy::Reset()
 {
        DebugMsg(6, "ClusterFinderProxy::Reset");
        clusterfinder->Reset();
-};
+}
 
 
 void ClusterFinderProxy::FoundClusters(const UInt_t numberfound)
 {
        DebugMsg(6, "ClusterFinderProxy::FoundClusters");
        Clustering::ClusterFinder::FoundClusters(numberfound);
-};
+}
 
 
 void ClusterFinderProxy::NoClustersFound()
 {
        DebugMsg(6, "ClusterFinderProxy::NoClustersFound");
        Clustering::ClusterFinder::NoClustersFound();
-};
+}
 
 
-}; // AliRoot
-}; // dHLT
+} // AliRoot
+} // dHLT
index 62cd6d47c06cb9fb5c8026b32fe021309dab5fb2..2e045eb248550dac5a222aa7354fd4e35dd07f23 100644 (file)
@@ -40,7 +40,7 @@ private:
 };
 
 
-}; // AliRoot
-}; // dHLT
+} // AliRoot
+} // dHLT
 
 #endif // dHLT_ALIROOT_CLUSTER_FINDER_PROXY_HPP
index a63e6e7ef2784e7772edb448bf39a8de6fda6972..03af6f1444a392c767b9f2a6ffe23ad586b199e8 100644 (file)
@@ -17,9 +17,9 @@
 #include <float.h>
 #endif
 
-ClassImp(AliMUONHLT::ClusterSource);
-ClassImp(AliMUONHLT::ClusterSource::BlockData);
-ClassImp(AliMUONHLT::ClusterSource::EventData);
+ClassImp(AliMUONHLT::ClusterSource)
+ClassImp(AliMUONHLT::ClusterSource::BlockData)
+ClassImp(AliMUONHLT::ClusterSource::EventData)
 
 namespace AliMUONHLT
 {
@@ -34,7 +34,7 @@ ClusterSource::ClusterSource()
        fFilename = "";
        fFoldername = "";
        ResetAllPointers();
-};
+}
 
 
 ClusterSource::ClusterSource(AliMUONDataInterface* data)
@@ -47,13 +47,13 @@ ClusterSource::ClusterSource(AliMUONDataInterface* data)
        fFoldername = "";
        ResetAllPointers();
        FillFrom(data);
-};
+}
 
 
 ClusterSource::~ClusterSource()
 {
        fEventList.Clear("C");
-};
+}
 
 
 void ClusterSource::FillFrom(AliMUONDataInterface* data)
@@ -65,9 +65,9 @@ void ClusterSource::FillFrom(AliMUONDataInterface* data)
                for (Int_t i = 0; i < data->NumberOfEvents(); i++)
                {
                        AddEventFrom(data, i);
-               };
-       };
-};
+               }
+       }
+}
 
 
 void ClusterSource::FillFrom(AliMUONDataInterface* data, const Int_t event)
@@ -76,7 +76,7 @@ void ClusterSource::FillFrom(AliMUONDataInterface* data, const Int_t event)
        
        if (FileAndFolderOk(data))
                AddEventFrom(data, event);
-};
+}
 
 
 void ClusterSource::FillFrom(AliMUONDataInterface* data, const Int_t event, const Int_t chamber)
@@ -89,9 +89,9 @@ void ClusterSource::FillFrom(AliMUONDataInterface* data, const Int_t event, cons
                {
                        AddEvent(event);
                        AddChamberFrom(data, chamber);
-               };
-       };
-};
+               }
+       }
+}
 
 
 void ClusterSource::FillFrom(
@@ -143,8 +143,8 @@ void ClusterSource::FillFrom(
                        AddBlock(chamber);  // No block selected so we need to create a new block.
 
                AddClusterFrom(data, chamber, cluster);
-       };
-};
+       }
+}
 
 
 void ClusterSource::Clear()
@@ -153,7 +153,7 @@ void ClusterSource::Clear()
        fFoldername = "";
        ResetAllPointers();
        fEventList.Clear("C");
-};
+}
 
 
 Bool_t ClusterSource::GetEvent(const Int_t eventnumber) const
@@ -173,10 +173,10 @@ Bool_t ClusterSource::GetEvent(const Int_t eventnumber) const
                                << " , fClusterIndex = " << fClusterIndex
                        );
                        return kTRUE;
-               };
-       };
+               }
+       }
        return kFALSE;
-};
+}
 
 
 Bool_t ClusterSource::GetFirstEvent() const
@@ -198,14 +198,14 @@ Bool_t ClusterSource::GetFirstEvent() const
                        << " , fClusterIndex = " << fClusterIndex
                );
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Bool_t ClusterSource::MoreEvents() const
 {
        return 0 <= fEventIndex and fEventIndex < fEventList.GetEntriesFast();
-};
+}
 
 
 Bool_t ClusterSource::GetNextEvent() const
@@ -247,7 +247,7 @@ Int_t ClusterSource::NumberOfBlocks() const
        }
        else
                return fCurrentEvent->fBlocks.GetEntriesFast();
-};
+}
 
 
 Bool_t ClusterSource::GetBlock(const Int_t index) const
@@ -282,8 +282,8 @@ Bool_t ClusterSource::GetBlock(const Int_t index) const
                                index
                        );
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Bool_t ClusterSource::GetFirstBlock() const
@@ -302,13 +302,13 @@ Bool_t ClusterSource::GetFirstBlock() const
        }
        else
                return kFALSE;
-};
+}
 
 
 Bool_t ClusterSource::MoreBlocks() const
 {
        return 0 <= fBlockIndex and fBlockIndex < NumberOfBlocks();
-};
+}
 
 
 Bool_t ClusterSource::GetNextBlock() const
@@ -330,8 +330,8 @@ Bool_t ClusterSource::GetNextBlock() const
        {
                ResetBlockPointers();
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Int_t ClusterSource::Chamber() const
@@ -343,7 +343,7 @@ Int_t ClusterSource::Chamber() const
        }
        else
                return fCurrentBlock->fChamber;
-};
+}
 
 
 Int_t ClusterSource::NumberOfClusters() const
@@ -356,7 +356,7 @@ Int_t ClusterSource::NumberOfClusters() const
        }
        else
                return fCurrentBlock->fClusters.GetEntriesFast();
-};
+}
 
 
 const Point* ClusterSource::GetCluster(const Int_t index) const
@@ -390,8 +390,8 @@ const Point* ClusterSource::GetCluster(const Int_t index) const
                                index
                        );
                return NULL;
-       };
-};
+       }
+}
 
 
 const Point* ClusterSource::GetFirstCluster() const
@@ -409,7 +409,7 @@ const Point* ClusterSource::GetFirstCluster() const
        }
        else
                return NULL;
-};
+}
 
 
 Bool_t ClusterSource::MoreClusters() const
@@ -452,8 +452,8 @@ Bool_t ClusterSource::FetchCluster(Float_t& x, Float_t& y) const
        {
                Error("FetchCluster", "No cluster point selected.");
                return kFALSE;
-       };
-};
+       }
+}
 
 
 void ClusterSource::AddEvent(const Int_t eventnumber)
@@ -472,7 +472,7 @@ void ClusterSource::AddEvent(const Int_t eventnumber)
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fClusterIndex = " << fClusterIndex
        );
-};
+}
 
 
 void ClusterSource::AddBlock(const Int_t chamber)
@@ -495,7 +495,7 @@ void ClusterSource::AddBlock(const Int_t chamber)
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fClusterIndex = " << fClusterIndex
        );
-};
+}
 
 
 void ClusterSource::AddPoint(const Float_t x, const Float_t y)
@@ -515,7 +515,7 @@ void ClusterSource::AddPoint(const Float_t x, const Float_t y)
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fClusterIndex = " << fClusterIndex
        );
-};
+}
 
 
 Bool_t ClusterSource::FileAndFolderOk(AliMUONDataInterface* data)
@@ -544,10 +544,10 @@ Bool_t ClusterSource::FileAndFolderOk(AliMUONDataInterface* data)
                        fFoldername.Data(), data->CurrentFolder().Data()
                );
                return kFALSE;
-       };
+       }
        
        return kTRUE;
-};
+}
 
 
 void ClusterSource::AddEventFrom(AliMUONDataInterface* data, const Int_t event)
@@ -558,9 +558,9 @@ void ClusterSource::AddEventFrom(AliMUONDataInterface* data, const Int_t event)
                for (Int_t chamber = 0; chamber < AliMUONConstants::NTrackingCh(); chamber++)
                {
                        AddChamberFrom(data, chamber);
-               };
-       };
-};
+               }
+       }
+}
 
 
 void ClusterSource::AddChamberFrom(AliMUONDataInterface* data, const Int_t chamber)
@@ -570,7 +570,11 @@ void ClusterSource::AddChamberFrom(AliMUONDataInterface* data, const Int_t chamb
        AddBlock(chamber);
        UInt_t currentblocksize = 0;
 #ifndef __alpha
+#ifndef __sparc
        Float_t x = NAN, y = NAN;
+#else
+       Float_t x = 0, y = 0;
+#endif
 #else
        Float_t x = FLT_QNAN, y = FLT_QNAN;
 #endif
@@ -641,10 +645,10 @@ void ClusterSource::AddChamberFrom(AliMUONDataInterface* data, const Int_t chamb
 
        default:
                Error("AddChamberFrom", "fDataToUse is not set to a valid value.");
-       };
+       }
        
        DebugMsg(1, "Leaving AddChamberFrom");
-};
+}
 
 
 void ClusterSource::AddClusterFrom(
@@ -652,8 +656,12 @@ void ClusterSource::AddClusterFrom(
        )
 {
        DebugMsg(1, "Entering AddClusterFrom");
-#ifndef __alpha        
+#ifndef __alpha
+#ifndef __sparc        
        Float_t x = NAN, y = NAN;
+#else
+       Float_t x = 0, y = 0;
+#endif
 #else
        Float_t x = FLT_QNAN, y = FLT_QNAN;
 #endif
@@ -745,7 +753,7 @@ void ClusterSource::ResetBlockPointers() const
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fClusterIndex = " << fClusterIndex
        );
-};
+}
 
 
 void ClusterSource::ResetClusterPointers() const
@@ -755,28 +763,28 @@ void ClusterSource::ResetClusterPointers() const
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fClusterIndex = " << fClusterIndex
        );
-};
+}
 
 
 ClusterSource::BlockData::BlockData() : fClusters(Point::Class())
 {
        fChamber = -1;
-};
+}
 
 ClusterSource::BlockData::BlockData(const Int_t chamber) : fClusters(Point::Class())
 {
        fChamber = chamber;
-};
+}
 
 ClusterSource::BlockData::~BlockData()
 {
        fClusters.Clear("C");
-};
+}
 
 ClusterSource::EventData::EventData() : fBlocks(ClusterSource::BlockData::Class())
 {
        fEventNumber = -1;
-};
+}
 
 ClusterSource::EventData::EventData(const Int_t eventnumber)
        : fBlocks(ClusterSource::BlockData::Class())
@@ -785,12 +793,12 @@ ClusterSource::EventData::EventData(const Int_t eventnumber)
 
        // If the following is not set then we do not write the fBlocks properly.
        fBlocks.BypassStreamer(kFALSE);
-};
+}
 
 ClusterSource::EventData::~EventData()
 {
        fBlocks.Clear("C");
-};
+}
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
index 23c6602859d98163076ad4d1fb3b95b6ecd6a9a7..85e1dbfbe2ac779b4aba7a363ee46f9054c8e778 100644 (file)
@@ -305,10 +305,10 @@ private:
 
        TClonesArray fEventList;  // List of clusters per event.
 
-       ClassDef(ClusterSource, 1);  // The source of cluster point blocks for dHLT.
+       ClassDef(ClusterSource, 1)  // The source of cluster point blocks for dHLT.
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_CLUSTER_SOURCE_HPP
index 001d9ca5afa9c1d8dd32bf3bf0f5107c17cbdec8..911bba76ebbe076df17d1a1c371f0f84384accb7 100644 (file)
@@ -35,7 +35,7 @@ public:
 
        virtual void RequestClusters(
                        Tracking::Tracker* tracker, 
-                       const Float left, const Float right, const Float bottom, const Float top,
+                       const Float /*left*/, const Float /*right*/, const Float /*bottom*/, const Float /*top*/,
                        const ChamberID chamber, const void* tag
                )
        {
@@ -48,7 +48,7 @@ public:
        };
 
        
-       virtual void EndOfClusterRequests(Tracking::Tracker* tracker)
+  virtual void EndOfClusterRequests(Tracking::Tracker* /*tracker*/)
        {
                DebugMsg(2, "EndOfClusterRequests");
                // We can ignore this. Nothing special to do here.
@@ -228,13 +228,13 @@ private:
 };
 
 
-}; // dHLT
+} // dHLT
 
 
 ////////////////////////////////////////////////////////////////////////////////
 
 
-ClassImp(AliMUONHLT::MicrodHLT);
+ClassImp(AliMUONHLT::MicrodHLT)
 
 namespace AliMUONHLT
 {
@@ -377,4 +377,4 @@ Int_t MicrodHLT::DebugLevel()
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
index 4c0dcb22bfc268101946928a1f5cc1d0c4e049fb..3dd0c9ba72495e730f9553e8ccba1b4b2d7b2c48 100644 (file)
@@ -8,7 +8,7 @@
 #include "AliRoot/Point.hpp"
 #include "TMath.h"
 
-ClassImp(AliMUONHLT::Point);
+ClassImp(AliMUONHLT::Point)
 
 namespace AliMUONHLT
 {
@@ -16,19 +16,19 @@ namespace AliMUONHLT
 Point::Point() : TObject()
 {
        fX = fY = 0.0;
-};
+}
 
 Point::Point(const Float_t x, const Float_t y) : TObject()
 {
        fX = x;
        fY = y;
-};
+}
 
 ostream& operator << (ostream& os, const Point& p)
 {
        os << "[" << p.fX << ", " << p.fY << "]";
        return os;
-};
+}
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
index be75095a58bc685a9d825cbed0f718cf458a5e23..9fe0eee4ec6f333df6417e4a446b4ee52eaae0ac 100644 (file)
@@ -37,10 +37,10 @@ public:
        Float_t fX;    // X coordinate of the 2D point.
        Float_t fY;    // Y coordinate of the 2D point.
 
-       ClassDef(Point, 1);  // A 2D space point.
+       ClassDef(Point, 1)  // A 2D space point.
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_POINT_HPP
index 904ed7c067d3eb7c8f0b245723c750fcd1af5d31..166c00c412ec49e67f5923031691e52c8fd5579a 100644 (file)
@@ -10,7 +10,7 @@
 #include <TMath.h>
 #include "Utils.hpp"
 
-ClassImp(AliMUONHLT::Region);
+ClassImp(AliMUONHLT::Region)
 
 namespace AliMUONHLT
 {
@@ -19,7 +19,7 @@ namespace AliMUONHLT
 Region::Region() : TObject()
 {
        fLeft = fRight = fBottom = fTop = 0.0;
-};
+}
 
 
 Region::Region(const Float_t left, const Float_t right, const Float_t bottom, const Float_t top)
@@ -41,8 +41,8 @@ Region::Region(const Float_t left, const Float_t right, const Float_t bottom, co
                fRight = right;
                fBottom = bottom;
                fTop = top;
-       };
-};
+       }
+}
 
 
 void Region::Left(const Float_t value)
@@ -51,7 +51,7 @@ void Region::Left(const Float_t value)
                Error("Left", "Trying to assign fLeft (%f) larger than fRight (%f).", value, fRight);
        else
                fLeft = value;
-};
+}
 
 
 void Region::Right(const Float_t value)
@@ -60,7 +60,7 @@ void Region::Right(const Float_t value)
                Error("Right", "Trying to assign fRight (%f) smaller than fLeft (%f).", value, fLeft);
        else
                fRight = value;
-};
+}
 
 
 void Region::Bottom(const Float_t value)
@@ -69,7 +69,7 @@ void Region::Bottom(const Float_t value)
                Error("Bottom", "Trying to assign fBottom (%f) larger than fTop (%f).", value, fTop);
        else
                fBottom = value;
-};
+}
 
 
 void Region::Top(const Float_t value)
@@ -78,20 +78,20 @@ void Region::Top(const Float_t value)
                Error("Top", "Trying to assign fTop (%f) smaller than fBottom (%f).", value, fBottom);
        else
                fTop = value;
-};
+}
 
 
 Bool_t Region::Contains(const Point& p) const
 {
        return fLeft <= p.fX and p.fX <= fRight and fBottom <= p.fY and p.fY <= fTop;
-};
+}
 
 
 ostream& operator << (ostream& os, const Region& r)
 {
        os << "[(" << r.fLeft << ", " << r.fRight << "), (" << r.fLeft << ", " << r.fRight << ")]";
        return os;
-};
+}
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
index 3b3a9b96d546507b58ef7dc8374fd12c38469218..7ad665ee398a800a25f7690a379325e22f3ef910 100644 (file)
@@ -33,7 +33,7 @@ public:
         */
        Region(const Float_t left, const Float_t right, const Float_t bottom, const Float_t top);
 
-       virtual ~Region() {};
+       virtual ~Region() {}
        
        /* Get/Set methods for the boundary lines.
           Note: before assignment we check for the following parameter consistency:
@@ -42,13 +42,13 @@ public:
           and nothing is changed internally.
         */
        void Left(const Float_t value);
-       Float_t Left() const { return fLeft; };
+       Float_t Left() const { return fLeft; }
        void Right(const Float_t value);
-       Float_t Right() const { return fRight; };
+       Float_t Right() const { return fRight; }
        void Bottom(const Float_t value);
-       Float_t Bottom() const { return fBottom; };
+       Float_t Bottom() const { return fBottom; }
        void Top(const Float_t value);
-       Float_t Top() const { return fTop; };
+       Float_t Top() const { return fTop; }
        
        /* Checks if the point is within this region. If it is then kTRUE is returned
           otherwise kFALSE is returned.
@@ -65,10 +65,10 @@ private:
        Float_t fBottom;  // Bottom boundary of boundary box.
        Float_t fTop;     // Top boundary of boundary box.
 
-       ClassDef(Region, 1);  // A boundary box region.
+       ClassDef(Region, 1)  // A boundary box region.
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_REGION_HPP
index 299aeabc25fd9be4bb960e594ff73b61f37da926..fb99f2e5285679e9bae5a4f18e491f70d510c88f 100644 (file)
@@ -9,7 +9,7 @@
 #include <TMath.h>
 #include "Utils.hpp"
 
-ClassImp(AliMUONHLT::Track);
+ClassImp(AliMUONHLT::Track)
 
 namespace AliMUONHLT
 {
@@ -18,7 +18,7 @@ namespace AliMUONHLT
 Track::Track() : TObject()
 {
        Init();
-};
+}
 
 
 Track::Track(
@@ -53,9 +53,9 @@ Track::Track(
                {
                        fHit[i] = hits[i];
                        fRegionOfInterest[i] = regions[i];
-               };
-       };
-};
+               }
+       }
+}
 
 
 void Track::Init()
@@ -63,7 +63,7 @@ void Track::Init()
        fTriggerID = -1;
        fParticleSign = 0;
        fP = fPt = 0.0;
-};
+}
 
 
 void Track::ParticleSign(const Int_t value)
@@ -75,7 +75,7 @@ void Track::ParticleSign(const Int_t value)
                        "The particle sign must be a value of -1, 0 or +1, but got %d",
                        value
                );
-};
+}
 
 
 void Track::P(const Float_t value)
@@ -87,7 +87,7 @@ void Track::P(const Float_t value)
                        "Trying to assing momentum (%f) which is smaller than the pt value (%f).",
                        value, fPt
                );
-};
+}
 
 void Track::Pt(const Float_t value)
 {
@@ -117,8 +117,8 @@ Point& Track::Hit(const UInt_t chamber)
                        chamber
                );
                return fHit[0];
-       };
-};
+       }
+}
 
 
 const Point& Track::Hit(const UInt_t chamber) const
@@ -145,7 +145,7 @@ void Track::Hit(const UInt_t chamber, const Point& value)
                        "The chamber is out of range. Got: %d, but should be in [0..9].",
                        chamber
                );
-};
+}
 
 
 Region& Track::RegionOfInterest(const UInt_t chamber)
@@ -159,8 +159,8 @@ Region& Track::RegionOfInterest(const UInt_t chamber)
                        chamber
                );
                return fRegionOfInterest[0];
-       };
-};
+       }
+}
 
 
 const Region& Track::RegionOfInterest(const UInt_t chamber) const
@@ -174,8 +174,8 @@ const Region& Track::RegionOfInterest(const UInt_t chamber) const
                        chamber
                );
                return fRegionOfInterest[0];
-       };
-};
+       }
+}
 
 
 void Track::RegionOfInterest(const UInt_t chamber, const Region& value)
@@ -187,7 +187,7 @@ void Track::RegionOfInterest(const UInt_t chamber, const Region& value)
                        "The chamber is out of range. Got: %d, but should be in [0..9].",
                        chamber
                );
-};
+}
 
 
 Bool_t Track::HitsInRegions() const
@@ -196,9 +196,9 @@ Bool_t Track::HitsInRegions() const
        {
                if ( not fRegionOfInterest[i].Contains(fHit[i]) )
                        return kFALSE;
-       };
+       }
        return kTRUE;
-};
+}
 
 
 ostream& operator << (ostream& os, const Track& t)
@@ -206,7 +206,7 @@ ostream& operator << (ostream& os, const Track& t)
        os << "{trigid: " << t.fTriggerID << ", sign: " << t.fParticleSign
           << ", p: " << t.fP << ", pt: " << t.fPt << "}";
        return os;
-};
+}
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
index f1377119d214a5c6f15b75fe0a33d3326f321672..718395db3e945c6dfee4fbdde479a14c8a1b5a24 100644 (file)
@@ -38,7 +38,7 @@ public:
                const Point hits[10], const Region regions[10]
        );
 
-       virtual ~Track() {};
+       virtual ~Track() {}
        
        
        // Get/et methods for the trigger ID.
@@ -106,10 +106,10 @@ private:
        Point fHit[10];   // Fitted track hit coordinates for the 10 tracking chambers.
        Region fRegionOfInterest[10];  // Region of interest per chamber.
 
-       ClassDef(Track, 1);  // Track data.
+       ClassDef(Track, 1)  // Track data.
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_TRACK_HPP
index e1ff409d8306039149d4133057c2edd1b0b469ab..6581a14f698546343f6ccfa3bd6d112b88c3466a 100644 (file)
@@ -8,8 +8,8 @@
 #include "AliRoot/TrackSink.hpp"
 #include "AliRoot/Base.hpp"
 
-ClassImp(AliMUONHLT::TrackSink);
-ClassImp(AliMUONHLT::TrackSink::EventData);
+ClassImp(AliMUONHLT::TrackSink)
+ClassImp(AliMUONHLT::TrackSink::EventData)
 
 namespace AliMUONHLT
 {
@@ -21,14 +21,14 @@ TrackSink::TrackSink() :
        fFilename = "";
        fFoldername = "";
        ResetAllPointers();
-};
+}
 
 
 TrackSink::~TrackSink()
 {
        DebugMsg(1, "TrackSink::~TrackSink()");
        fEventList.Clear("C");
-};
+}
 
 
 void TrackSink::AddEvent(const Int_t eventnumber)
@@ -63,7 +63,7 @@ void TrackSink::AddEvent(const Int_t eventnumber)
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTrackIndex = " << fTrackIndex
        );
-};
+}
 
 
 void TrackSink::AddBlock()
@@ -86,7 +86,7 @@ void TrackSink::AddBlock()
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTrackIndex = " << fTrackIndex
        );
-};
+}
 
 
 void TrackSink::AddTrack(const Track& track)
@@ -106,7 +106,7 @@ void TrackSink::AddTrack(const Track& track)
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTrackIndex = " << fTrackIndex
        );
-};
+}
 
 
 Track* TrackSink::AddTrack()
@@ -152,14 +152,14 @@ void TrackSink::AddTrack(
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTrackIndex = " << fTrackIndex
        );
-};
+}
 
 
 void TrackSink::SetNames(const TriggerSource* triggersource)
 {
        fFilename = triggersource->FileName();
        fFoldername = triggersource->FolderName();
-};
+}
 
 
 void TrackSink::Clear()
@@ -168,7 +168,7 @@ void TrackSink::Clear()
        fFoldername = "";
        ResetAllPointers();
        fEventList.Clear("C");
-};
+}
 
 
 Bool_t TrackSink::GetEvent(const Int_t eventnumber) const
@@ -188,10 +188,10 @@ Bool_t TrackSink::GetEvent(const Int_t eventnumber) const
                                << " , fTrackIndex = " << fTrackIndex
                        );
                        return kTRUE;
-               };
-       };
+               }
+       }
        return kFALSE;
-};
+}
 
 
 Bool_t TrackSink::GetFirstEvent() const
@@ -213,14 +213,14 @@ Bool_t TrackSink::GetFirstEvent() const
                        << " , fTrackIndex = " << fTrackIndex
                );
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Bool_t TrackSink::MoreEvents() const
 {
        return 0 <= fEventIndex and fEventIndex < fEventList.GetEntriesFast();
-};
+}
 
 
 Bool_t TrackSink::GetNextEvent() const
@@ -249,7 +249,7 @@ Int_t TrackSink::CurrentEvent() const
                return fCurrentEvent->fEventNumber;
        else
                return -1;
-};
+}
 
 
 Int_t TrackSink::NumberOfBlocks() const
@@ -262,7 +262,7 @@ Int_t TrackSink::NumberOfBlocks() const
        }
        else
                return fCurrentEvent->fBlocks.GetEntriesFast();
-};
+}
 
 
 Bool_t TrackSink::GetBlock(const Int_t index) const
@@ -297,8 +297,8 @@ Bool_t TrackSink::GetBlock(const Int_t index) const
                                index
                        );
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Bool_t TrackSink::GetFirstBlock() const
@@ -317,13 +317,13 @@ Bool_t TrackSink::GetFirstBlock() const
        }
        else
                return kFALSE;
-};
+}
 
 
 Bool_t TrackSink::MoreBlocks() const
 {
        return 0 <= fBlockIndex and fBlockIndex < NumberOfBlocks();
-};
+}
 
 
 Bool_t TrackSink::GetNextBlock() const
@@ -345,8 +345,8 @@ Bool_t TrackSink::GetNextBlock() const
        {
                ResetBlockPointers();
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Int_t TrackSink::NumberOfTracks() const
@@ -393,8 +393,8 @@ const Track* TrackSink::GetTrack(const Int_t index) const
                                index
                        );
                return NULL;
-       };
-};
+       }
+}
 
 
 const Track* TrackSink::GetFirstTrack() const
@@ -412,13 +412,13 @@ const Track* TrackSink::GetFirstTrack() const
        }
        else
                return NULL;
-};
+}
 
 
 Bool_t TrackSink::MoreTracks() const
 {
        return 0 <= fTrackIndex and fTrackIndex < NumberOfTracks();
-};
+}
 
 
 const Track* TrackSink::GetNextTrack() const
@@ -439,8 +439,8 @@ const Track* TrackSink::GetNextTrack() const
        {
                ResetTrackPointers();
                return NULL;
-       };
-};
+       }
+}
 
 
 void TrackSink::ResetAllPointers() const
@@ -454,7 +454,7 @@ void TrackSink::ResetAllPointers() const
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTrackIndex = " << fTrackIndex
        );
-};
+}
 
 
 void TrackSink::ResetBlockPointers() const
@@ -466,7 +466,7 @@ void TrackSink::ResetBlockPointers() const
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTrackIndex = " << fTrackIndex
        );
-};
+}
 
 
 void TrackSink::ResetTrackPointers() const
@@ -476,13 +476,13 @@ void TrackSink::ResetTrackPointers() const
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTrackIndex = " << fTrackIndex
        );
-};
+}
 
 
 TrackSink::EventData::EventData() : fBlocks(TClonesArray::Class())
 {
        fEventNumber = -1;
-};
+}
 
 
 TrackSink::EventData::EventData(const Int_t eventnumber)
@@ -492,14 +492,14 @@ TrackSink::EventData::EventData(const Int_t eventnumber)
        
        // If the following is not set then we do not write the fBlocks properly.
        fBlocks.BypassStreamer(kFALSE);
-};
+}
 
 
 TrackSink::EventData::~EventData()
 {
        DebugMsg(1, "TrackSink::EventData::~EventData()");
        fBlocks.Clear("C");
-};
+}
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
index 5e528918cc9a771f30c4821234743c7bda1318f8..99c7a528edeb625abf2db3a749801ce1d7e323d9 100644 (file)
@@ -68,8 +68,8 @@ public:
        void Clear();
        
        // Get methods for file and folder names.
-       TString FileName()   const { return fFilename; };
-       TString FolderName() const { return fFoldername; };
+       TString FileName()   const { return fFilename; }
+       TString FolderName() const { return fFoldername; }
        
        /* Returns the number of events stored.
         */
@@ -220,10 +220,10 @@ private:
 
        TClonesArray fEventList;  // List of tracks per event.
 
-       ClassDef(TrackSink, 1);  // The data sink for track blocks for dHLT.
+       ClassDef(TrackSink, 1)  // The data sink for track blocks for dHLT.
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_TRACK_SINK_HPP
index b399b17998e2aff2faa73246d5ff2c32a15e6fdb..13ce16d0a4170ec337a970ed666b37891a5a8574 100644 (file)
@@ -7,4 +7,4 @@
 
 #include "AliRoot/TrackerCallback.hpp"
 
-ClassImp(AliMUONHLT::TrackerCallback);
+ClassImp(AliMUONHLT::TrackerCallback)
index 0b29f772512065f78f1918eec5d2ee7948840844..59989e759f0f33118502e9d5d55ef9f8c921791d 100644 (file)
@@ -27,7 +27,7 @@ public:
        virtual void FoundTrack() = 0;
        virtual void NoTrackFound() = 0;
        
-       ClassDef(TrackerCallback, 0);  // Abstract tracker callback class.
+       ClassDef(TrackerCallback, 0)  // Abstract tracker callback class.
 };
 
 
index 2970dd19ce580d01d2d10aba578f5dc3e6c0de7a..fcf6792637148e0c94bca40d1be3052886f441fb 100644 (file)
@@ -47,6 +47,6 @@ private:
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_TRACKER_INTERFACE_HPP
index efc5ef944670bb51d3b83b605dd356916c4971ed..5641c5b51daa35cbdcc3c20cb05f924b50bd2a5f 100644 (file)
@@ -20,7 +20,7 @@ TrackerProxy::TrackerProxy(AliMUONHLT::TrackerInterface* client)
        : Tracking::Tracker(), AliMUONHLT::TrackerCallback()
 {
        tracker = client;
-};
+}
 
 
 void TrackerProxy::FindTrack(const TriggerRecord& trigger)
@@ -28,7 +28,7 @@ void TrackerProxy::FindTrack(const TriggerRecord& trigger)
        AliMUONHLT::TriggerRecord rec = Convert(trigger, 0);
        DebugMsg(6, "TrackerProxy::FindTrack : rec = " << rec);
        tracker->FindTrack(rec);
-};
+}
 
 
 void TrackerProxy::ReturnClusters(void* tag, const ClusterPoint* clusters, const UInt count)
@@ -47,15 +47,15 @@ void TrackerProxy::ReturnClusters(void* tag, const ClusterPoint* clusters, const
        finally
        (
                delete [] points;
-       );
-};
+       )
+}
 
 
 void TrackerProxy::EndOfClusters(void* tag)
 {
        DebugMsg(6, "TrackerProxy::EndOfClusters");
        tracker->EndOfClusters(tag);
-};
+}
 
 
 void TrackerProxy::FillTrackData(Track& track)
@@ -64,14 +64,14 @@ void TrackerProxy::FillTrackData(Track& track)
        tracker->FillTrackData(data);
        DebugMsg(6, "TrackerProxy::FillTrackData : data = " << data);
        track = Convert(data);
-};
+}
 
 
 void TrackerProxy::Reset()
 {
        DebugMsg(6, "TrackerProxy::Reset");
        tracker->Reset();
-};
+}
 
 
 void TrackerProxy::RequestClusters(
@@ -81,29 +81,29 @@ void TrackerProxy::RequestClusters(
 {
        DebugMsg(6, "TrackerProxy::RequestClusters");
        Tracking::Tracker::RequestClusters(left, right, bottom, top, (ChamberID)chamber, tag);
-};
+}
 
 
 void TrackerProxy::EndOfClusterRequests()
 {
        DebugMsg(6, "TrackerProxy::EndOfClusterRequests");
        Tracking::Tracker::EndOfClusterRequests();
-};
+}
 
 
 void TrackerProxy::FoundTrack()
 {
        DebugMsg(6, "TrackerProxy::FoundTrack");
        Tracking::Tracker::FoundTrack();
-};
+}
 
 
 void TrackerProxy::NoTrackFound()
 {
        DebugMsg(6, "TrackerProxy::NoTrackFound");
        Tracking::Tracker::NoTrackFound();
-};
+}
 
 
-}; // AliRoot
-}; // dHLT
+} // AliRoot
+} // dHLT
index e6414206acf75f2cd59e549ad60a3877cd9f25c0..d02c8b27010ae8197fa0fb1333937854bd21eb21 100644 (file)
@@ -47,7 +47,7 @@ private:
 };
 
 
-}; // AliRoot
-}; // dHLT
+} // AliRoot
+} // dHLT
 
 #endif // dHLT_ALIROOT_TRACKER_PROXY_HPP
index c069d0e111d3668cafb7a34d5aa7419b95fcb403..ed16184b0bc9ca46a265591a559566a5efdd5779 100644 (file)
@@ -8,7 +8,7 @@
 #include "AliRoot/TriggerRecord.hpp"
 #include "TMath.h"
 
-ClassImp(AliMUONHLT::TriggerRecord);
+ClassImp(AliMUONHLT::TriggerRecord)
 
 namespace AliMUONHLT
 {
@@ -16,7 +16,7 @@ namespace AliMUONHLT
 TriggerRecord::TriggerRecord()
 {
        Init();
-};
+}
 
 
 TriggerRecord::TriggerRecord(
@@ -55,8 +55,8 @@ TriggerRecord::TriggerRecord(
                fPt = pt;
                fSt1Point = station1point;
                fSt2Point = station2point;
-       };
-};
+       }
+}
 
 
 void TriggerRecord::Init()
@@ -64,7 +64,7 @@ void TriggerRecord::Init()
        fTriggerNumber = -1;
        fParticleSign = 0;
        fPt = 0.0;
-};
+}
 
 
 void TriggerRecord::TriggerNumber(const Int_t value)
@@ -76,7 +76,7 @@ void TriggerRecord::TriggerNumber(const Int_t value)
                        "The trigger number must be a positive number. Got: %d",
                        value
                );
-};
+}
 
 
 void TriggerRecord::ParticleSign(const Int_t value)
@@ -88,7 +88,7 @@ void TriggerRecord::ParticleSign(const Int_t value)
                        "The particle sign must a value of -1, 0 or +1. Got: %d",
                        value
                );
-};
+}
 
 
 void TriggerRecord::Pt(const Float_t value)
@@ -100,7 +100,7 @@ void TriggerRecord::Pt(const Float_t value)
                        "The transverse momentum must be a positive number. Got: %f",
                        value
                );
-};
+}
 
 
 ostream& operator << (ostream& os, const TriggerRecord& r)
@@ -109,7 +109,7 @@ ostream& operator << (ostream& os, const TriggerRecord& r)
           << ", pt: " << r.fPt << ", st1: " << r.fSt1Point << ", st2: "
           << r.fSt2Point << "}";
        return os;
-};
+}
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
index 792e42941f106dca658f4576ad380add63d14f24..e63e96b80bf09f72b366c50376805f7e490e174a 100644 (file)
@@ -86,10 +86,10 @@ private:
        Point fSt1Point;       // Coordinate on trigger station 1.
        Point fSt2Point;       // Coordinate on trigger station 2.
 
-       ClassDef(TriggerRecord, 1);  // Trigger information.
+       ClassDef(TriggerRecord, 1)  // Trigger information.
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_TRIGGER_RECORD_HPP
index f48b24fb59bd54e2aa5beed15c792f0ba2184eba..d267842184420cdb1cba07d1ba36031a6a367c46 100644 (file)
@@ -24,8 +24,8 @@
 #include <float.h>
 #endif
 
-ClassImp(AliMUONHLT::TriggerSource);
-ClassImp(AliMUONHLT::TriggerSource::EventData);
+ClassImp(AliMUONHLT::TriggerSource)
+ClassImp(AliMUONHLT::TriggerSource::EventData)
 
 namespace AliMUONHLT
 {
@@ -41,7 +41,7 @@ TriggerSource::TriggerSource()
        fFoldername = "";
        ResetAllPointers();
        fHadToLoadgAlice = kFALSE;
-};
+}
 
 
 TriggerSource::TriggerSource(AliMUONDataInterface* data)
@@ -56,13 +56,13 @@ TriggerSource::TriggerSource(AliMUONDataInterface* data)
        ResetAllPointers();
        fHadToLoadgAlice = kFALSE;
        FillFrom(data);
-};
+}
 
 
 TriggerSource::~TriggerSource()
 {
        fEventList.Clear("C");
-};
+}
 
 
 void TriggerSource::FillFrom(AliMUONDataInterface* data)
@@ -77,11 +77,11 @@ void TriggerSource::FillFrom(AliMUONDataInterface* data)
                for (Int_t i = 0; i < data->NumberOfEvents(); i++)
                {
                        AddEventFrom(data, module, i);
-               };
+               }
                
                FinishedWithAliMUON();
-       };
-};
+       }
+}
 
 
 void TriggerSource::FillFrom(AliMUONDataInterface* data, const Int_t event)
@@ -94,8 +94,8 @@ void TriggerSource::FillFrom(AliMUONDataInterface* data, const Int_t event)
                if ( not FetchAliMUON(module) ) return;
                AddEventFrom(data, module, event);
                FinishedWithAliMUON();
-       };
-};
+       }
+}
 
 
 void TriggerSource::FillFrom(
@@ -139,8 +139,8 @@ void TriggerSource::FillFrom(
 
                AddTriggerFrom(data, module, trigger);
                FinishedWithAliMUON();
-       };
-};
+       }
+}
 
 
 void TriggerSource::Clear()
@@ -149,7 +149,7 @@ void TriggerSource::Clear()
        fFoldername = "";
        ResetAllPointers();
        fEventList.Clear("C");
-};
+}
 
 
 Bool_t TriggerSource::GetEvent(const Int_t eventnumber) const
@@ -172,7 +172,7 @@ Bool_t TriggerSource::GetEvent(const Int_t eventnumber) const
                };
        };
        return kFALSE;
-};
+}
 
 
 Bool_t TriggerSource::GetFirstEvent() const
@@ -194,14 +194,14 @@ Bool_t TriggerSource::GetFirstEvent() const
                        << " , fTriggerIndex = " << fTriggerIndex
                );
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Bool_t TriggerSource::MoreEvents() const
 {
        return 0 <= fEventIndex and fEventIndex < fEventList.GetEntriesFast();
-};
+}
 
 
 Bool_t TriggerSource::GetNextEvent() const
@@ -220,8 +220,8 @@ Bool_t TriggerSource::GetNextEvent() const
        {
                ResetAllPointers();
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Int_t TriggerSource::CurrentEvent() const
@@ -230,7 +230,7 @@ Int_t TriggerSource::CurrentEvent() const
                return fCurrentEvent->fEventNumber;
        else
                return -1;
-};
+}
 
 
 Int_t TriggerSource::NumberOfBlocks() const
@@ -243,7 +243,7 @@ Int_t TriggerSource::NumberOfBlocks() const
        }
        else
                return fCurrentEvent->fBlocks.GetEntriesFast();
-};
+}
 
 
 Bool_t TriggerSource::GetBlock(const Int_t index) const
@@ -278,8 +278,8 @@ Bool_t TriggerSource::GetBlock(const Int_t index) const
                                index
                        );
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Bool_t TriggerSource::GetFirstBlock() const
@@ -298,13 +298,13 @@ Bool_t TriggerSource::GetFirstBlock() const
        }
        else
                return kFALSE;
-};
+}
 
 
 Bool_t TriggerSource::MoreBlocks() const
 {
        return 0 <= fBlockIndex and fBlockIndex < NumberOfBlocks();
-};
+}
 
 
 Bool_t TriggerSource::GetNextBlock() const
@@ -326,8 +326,8 @@ Bool_t TriggerSource::GetNextBlock() const
        {
                ResetBlockPointers();
                return kFALSE;
-       };
-};
+       }
+}
 
 
 Int_t TriggerSource::NumberOfTriggers() const
@@ -340,7 +340,7 @@ Int_t TriggerSource::NumberOfTriggers() const
        }
        else
                return fCurrentBlock->GetEntriesFast();
-};
+}
 
 
 const TriggerRecord* TriggerSource::GetTrigger(const Int_t triggernumber) const
@@ -365,10 +365,10 @@ const TriggerRecord* TriggerSource::GetTrigger(const Int_t triggernumber) const
                                << " , fTriggerIndex = " << fTriggerIndex
                        );
                        return current;
-               };
-       };
+               }
+       }
        return NULL;
-};
+}
 
 
 const TriggerRecord* TriggerSource::GetFirstTrigger() const
@@ -392,7 +392,7 @@ const TriggerRecord* TriggerSource::GetFirstTrigger() const
 Bool_t TriggerSource::MoreTriggers() const
 {
        return 0 <= fTriggerIndex and fTriggerIndex < NumberOfTriggers();
-};
+}
 
 
 const TriggerRecord* TriggerSource::GetNextTrigger() const
@@ -427,8 +427,8 @@ Int_t TriggerSource::CurrentTrigger() const
        {
                Error("CurrentTrigger", "No trigger record selected.");
                return -1;
-       };
-};
+       }
+}
 
 
 void TriggerSource::AddEvent(const Int_t eventnumber)
@@ -447,7 +447,7 @@ void TriggerSource::AddEvent(const Int_t eventnumber)
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTriggerIndex = " << fTriggerIndex
        );
-};
+}
 
 
 void TriggerSource::AddBlock()
@@ -470,7 +470,7 @@ void TriggerSource::AddBlock()
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTriggerIndex = " << fTriggerIndex
        );
-};
+}
 
 
 void TriggerSource::AddTrigger(const TriggerRecord& data)
@@ -481,7 +481,7 @@ void TriggerSource::AddTrigger(const TriggerRecord& data)
        {
                Error("AddTrigger", "No block selected.");
                return;
-       };
+       }
        
        fTriggerIndex = fCurrentBlock->GetEntriesFast();
        new ( (*fCurrentBlock)[fTriggerIndex] ) TriggerRecord(data);
@@ -490,7 +490,7 @@ void TriggerSource::AddTrigger(const TriggerRecord& data)
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTriggerIndex = " << fTriggerIndex
        );
-};
+}
 
 
 Bool_t TriggerSource::FileAndFolderOk(AliMUONDataInterface* data)
@@ -522,7 +522,7 @@ Bool_t TriggerSource::FileAndFolderOk(AliMUONDataInterface* data)
        };
        
        return kTRUE;
-};
+}
 
 
 void TriggerSource::AddEventFrom(AliMUONDataInterface* data, AliMUON* module, const Int_t event)
@@ -583,9 +583,9 @@ void TriggerSource::AddEventFrom(AliMUONDataInterface* data, AliMUON* module, co
 
                default:
                        Error("AddChamberFrom", "fDataToUse is not set to a valid value.");
-               };
-       };  // Loop on events.
-};
+               }
+       }  // Loop on events.
+}
 
 
 void TriggerSource::AddTriggerFrom(AliMUONDataInterface* data, AliMUON* module, const Int_t trigger)
@@ -621,7 +621,7 @@ void TriggerSource::AddTriggerFrom(AliMUONDataInterface* data, AliMUON* module,
        AddTrigger(trigdata);
        
        DebugMsg(1, "Leaving AddTriggerFrom");
-};
+}
 
 
 Bool_t TriggerSource::InFillRegion(const TriggerRecord& data)
@@ -635,8 +635,8 @@ Bool_t TriggerSource::InFillRegion(const TriggerRecord& data)
        default:
                Error("InFillRegion", "fAreaToUse is not set to a valid value.");
                return kFALSE;
-       };
-};
+       }
+}
 
 
 void TriggerSource::FillTriggerFromLocalTrigger(
@@ -684,7 +684,7 @@ void TriggerSource::FillTriggerFromLocalTrigger(
        DebugMsg(2, "fStation1y = " << record.Station1Point().fY);
        DebugMsg(2, "fStation2x = " << record.Station2Point().fX);
        DebugMsg(2, "fStation2y = " << record.Station2Point().fY);
-};
+}
 
 
 Bool_t TriggerSource::FillTriggerFromHits(AliMUONDataInterface* data, const Int_t track, TriggerRecord& record)
@@ -693,7 +693,11 @@ Bool_t TriggerSource::FillTriggerFromHits(AliMUONDataInterface* data, const Int_
        
        Float_t x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4;
 #ifndef __alpha
+#ifndef __sparc
        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 = 0;
+#endif
 #else
        x1 = y1 = z1 = x2 = y2 = z2 = x3 = y3 = z3 = x4 = y4 = z4 = FLT_QNAN;
 #endif
@@ -798,7 +802,7 @@ Bool_t TriggerSource::FillTriggerFromHits(AliMUONDataInterface* data, const Int_
        DebugMsg(3, "Pt = " << record.Pt());
        
        return kTRUE;
-};
+}
 
 
 Bool_t TriggerSource::FetchAliMUON(AliMUON*& module)
@@ -840,7 +844,7 @@ Bool_t TriggerSource::FetchAliMUON(AliMUON*& module)
        // Get the MUON module pointer and return it.
        module = dynamic_cast<AliMUON*>( alirun->GetModule("MUON") );
        return kTRUE;
-};
+}
 
 
 void TriggerSource::FinishedWithAliMUON()
@@ -848,7 +852,7 @@ void TriggerSource::FinishedWithAliMUON()
        // Only unload the gAlice object if we had to load it ourselves.
        if (fHadToLoadgAlice)
                AliRunLoader::GetRunLoader()->UnloadgAlice();
-};
+}
 
 
 void TriggerSource::ResetAllPointers() const
@@ -862,7 +866,7 @@ void TriggerSource::ResetAllPointers() const
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTriggerIndex = " << fTriggerIndex
        );
-};
+}
 
 
 void TriggerSource::ResetBlockPointers() const
@@ -874,7 +878,7 @@ void TriggerSource::ResetBlockPointers() const
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTriggerIndex = " << fTriggerIndex
        );
-};
+}
 
 
 void TriggerSource::ResetTriggerPointers() const
@@ -884,13 +888,13 @@ void TriggerSource::ResetTriggerPointers() const
        DebugMsg(2, "\tfEventIndex = " << fEventIndex << " , fBlockIndex = " << fBlockIndex
                << " , fTriggerIndex = " << fTriggerIndex
        );
-};
+}
 
 
 TriggerSource::EventData::EventData() : fBlocks(TClonesArray::Class())
 {
        fEventNumber = -1;
-};
+}
 
 
 TriggerSource::EventData::EventData(const Int_t eventnumber)
@@ -900,13 +904,13 @@ TriggerSource::EventData::EventData(const Int_t eventnumber)
 
        // If the following is not set then we do not write the fBlocks properly.
        fBlocks.BypassStreamer(kFALSE);
-};
+}
 
 
 TriggerSource::EventData::~EventData()
 {
        fBlocks.Clear("C");
-};
+}
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
index 13ab835fe981ac59b7a2f12970b5081d633c87db..73123c8fbd4fe49103137d489bb5180d8205c3ca 100644 (file)
@@ -296,7 +296,7 @@ public:  // Unfortunately ROOT requires the following to be public.
                Int_t fEventNumber;  // Event number in AliMUONDataInterface from which the triggers were taken.
                TClonesArray fBlocks; // The list of blocks of trigger records.
                
-               ClassDef(EventData, 1);  // Data per event.
+               ClassDef(EventData, 1)  // Data per event.
        };
        
 private:
@@ -320,10 +320,10 @@ private:
        
        Bool_t fHadToLoadgAlice;  //! Flag indicating if this object had to load the AliRun object.
 
-       ClassDef(TriggerSource, 1);  // The source of trigger records for dHLT.
+       ClassDef(TriggerSource, 1)  // The source of trigger records for dHLT.
 };
 
 
-}; // AliMUONHLT
+} // AliMUONHLT
 
 #endif // dHLT_ALIROOT_TRIGGER_SOURCE_HPP
index 7b7f979592e9496c637294051de6c8cea3a22259..0cae861ab3881b802f0256b5936b7ee3bcf785b1 100644 (file)
@@ -19,14 +19,14 @@ AliMUONHLT::Point Convert(const dHLT::Point& point)
 {
        DebugMsg(5, "Convert from dHLT::Point");
        return AliMUONHLT::Point(point.x, point.y);
-};
+}
 
 
 dHLT::Point Convert(const AliMUONHLT::Point& point)
 {
        DebugMsg(5, "Convert from AliMUONHLT::Point");
        return dHLT::Point(point.fX, point.fY);
-};
+}
 
 
 AliMUONHLT::TriggerRecord Convert(const dHLT::TriggerRecord& record, const Int_t triggernumber)
@@ -52,8 +52,8 @@ AliMUONHLT::TriggerRecord Convert(const dHLT::TriggerRecord& record, const Int_t
                                        Convert( record.station1impact ),
                                        Convert( record.station2impact )
                                );
-       };
-};
+       }
+}
 
 
 dHLT::TriggerRecord Convert(const AliMUONHLT::TriggerRecord& record)
@@ -65,7 +65,7 @@ dHLT::TriggerRecord Convert(const AliMUONHLT::TriggerRecord& record)
                                Convert( record.Station1Point() ),
                                Convert( record.Station2Point() )
                        );
-};
+}
 
 
 AliMUONHLT::Track Convert(const dHLT::Track& track)
@@ -84,9 +84,9 @@ AliMUONHLT::Track Convert(const dHLT::Track& track)
                // is filled with NaN's.
                if (track.region[i] != dHLT::INVALID_ROI)
                        t.RegionOfInterest(i) = Convert( track.region[i] );
-       };
+       }
        return t;
-};
+}
 
 
 dHLT::Track Convert(const AliMUONHLT::Track& track)
@@ -101,9 +101,9 @@ dHLT::Track Convert(const AliMUONHLT::Track& track)
        {
                t.point[i] = Convert( track.Hit(i) );
                t.region[i] = Convert( track.RegionOfInterest(i), i );
-       };
+       }
        return t;
-};
+}
 
 
 AliMUONHLT::Region Convert(const dHLT::ROI region)
@@ -111,7 +111,7 @@ AliMUONHLT::Region Convert(const dHLT::ROI region)
        DebugMsg(5, "Convert from dHLT::ROI");
        dHLT::RegionOfInterest roi(region);
        return AliMUONHLT::Region( roi.Left(), roi.Right(), roi.Bottom(), roi.Top() );
-};
+}
 
 
 dHLT::ROI Convert(const AliMUONHLT::Region& region, const UInt_t chamber)
@@ -133,9 +133,9 @@ dHLT::ROI Convert(const AliMUONHLT::Region& region, const UInt_t chamber)
                                dHLT::Chamber10
                        );
                return roi;
-       };
-};
+       }
+}
 
 
-}; // AliRoot
-}; // dHLT
+} // AliRoot
+} // dHLT
index 88ee1dbf5ab660e2d8e410df1e0ae7232175e3e6..a1039856a5eb87c8370fd2f18bce341d15f6495c 100644 (file)
@@ -36,7 +36,7 @@ extern AliMUONHLT::Region        Convert(const dHLT::ROI                  region
 extern dHLT::ROI                 Convert(const AliMUONHLT::Region&        region, const UInt_t chamber);
 
 
-}; // AliRoot
-}; // dHLT
+} // AliRoot
+} // dHLT
 
 #endif // dHLT_ALIROOT_CONVERT_HPP
index 35d6671fa05c84bf43a5d80d160582e767c078a6..8a72c67577f05802316656e389fd349cdd230de1 100644 (file)
@@ -28,7 +28,9 @@ namespace Buffers
 template <typename DataType>
 class List
 {
-protected:
+  //protected:
+
+public:
 
        struct Node
        {
@@ -38,8 +40,6 @@ protected:
 
        Node* first;
 
-public:
-
        class ConstIterator
        {
        public:
@@ -47,34 +47,34 @@ public:
                ConstIterator()
                {
                        current = NULL;
-               };
+               }
 
                ConstIterator(const ConstIterator& iter)
                {
                        current = iter.current;
-               };
+               }
 
                ConstIterator(Node* node)
                {
                        current = node;
-               };
+               }
 
                const DataType& operator * () const
                {
                        return current->data;
-               };
+               }
 
                const DataType* operator -> () const
                {
                        return &current->data;
-               };
+               }
 
                ConstIterator& operator ++ ()
                {
                        Assert( current != NULL );
                        current = current->next;
                        return *this;
-               };
+               }
 
                ConstIterator operator ++ (int)
                {
@@ -82,22 +82,22 @@ public:
                        ConstIterator copy = *this;
                        current = current->next;
                        return copy;
-               };
+               }
                
                operator const DataType* () const
                {
                        return &current->data;
-               };
+               }
 
                friend bool operator == (const ConstIterator& a, const ConstIterator& b)
                {
                        return a.current == b.current;
-               };
+               }
 
                friend bool operator != (const ConstIterator& a, const ConstIterator& b)
                {
                        return a.current != b.current;
-               };
+               }
 
        protected:
        
@@ -114,27 +114,27 @@ public:
                Iterator() : ConstIterator()
                {
                        previous = NULL;
-               };
+               }
 
                Iterator(const Iterator& iter) : ConstIterator(iter)
                {
                        previous = iter.previous;
-               };
+               }
 
                Iterator(Node* current, Node* prev) : ConstIterator(current)
                {
                        previous = prev;
-               };
+               }
 
                DataType& operator * ()
                {
                        return ConstIterator::current->data;
-               };
+               }
 
                DataType* operator -> ()
                {
                        return &ConstIterator::current->data;
-               };
+               }
 
                Iterator& operator ++ ()
                {
@@ -142,7 +142,7 @@ public:
                        previous = ConstIterator::current;
                        ConstIterator::current = ConstIterator::current->next;
                        return *this;
-               };
+               }
 
                Iterator operator ++ (int)
                {
@@ -151,7 +151,7 @@ public:
                        previous = ConstIterator::current;
                        ConstIterator::current = ConstIterator::current->next;
                        return copy;
-               };
+               }
                
                operator DataType* ()
                {
@@ -159,7 +159,7 @@ public:
                                return &ConstIterator::current->data;
                        else
                                return NULL;
-               };
+               }
 
        protected:
        
@@ -172,7 +172,7 @@ public:
        List()
        {
                first = NULL;
-       };
+       }
        
        
        ~List()
@@ -183,14 +183,14 @@ public:
                        Node* temp = current;
                        current = current->next;
                        delete temp;
-               };
-       };
+               }
+       }
        
 
        bool Empty() const
        {
                return first == NULL;
-       };
+       }
 
        
        DataType* New()
@@ -199,20 +199,20 @@ public:
                newnode->next = first;
                first = newnode;
                return &newnode->data;
-       };
+       }
        
        
        inline DataType* Add()
        {
                return New();
-       };
+       }
        
 
        void Add(const DataType& data)
        {
                DataType* newdata = New();
                *newdata = data;
-       };
+       }
        
 
        DataType* AddNew(const DataType& data)
@@ -220,7 +220,7 @@ public:
                DataType* newdata = Add();
                *newdata = data;
                return newdata;
-       };
+       }
 
 
        DataType* AddUniquely(const DataType& data)
@@ -230,7 +230,7 @@ public:
                        return AddNew(data);
                else
                        return result;
-       };
+       }
 
        
        void Remove(const UInt index)
@@ -242,7 +242,7 @@ public:
                        Assert( current != NULL );
                        previous = current;
                        current = current->next;
-               };
+               }
                Node* temp;
                if (previous == NULL)
                {
@@ -253,9 +253,9 @@ public:
                {
                        temp = current;
                        previous->next = current->next;
-               };
+               }
                delete temp;
-       };
+       }
        
 
        bool Remove(const DataType& data)
@@ -268,7 +268,7 @@ public:
                }
                else
                        return false;
-       };
+       }
        
 
        void Remove(Iterator& iter)
@@ -287,9 +287,9 @@ public:
                {
                        temp = current;
                        previous->next = current->next;
-               };
+               }
                delete temp;
-       };
+       }
 
 
        Iterator Find(const DataType& data)
@@ -302,9 +302,9 @@ public:
                                return Iterator(current, previous);
                        previous = current;
                        current = current->next;
-               };
+               }
                return End();
-       };
+       }
 
 
        ConstIterator Find(const DataType& data) const
@@ -317,7 +317,7 @@ public:
                        current = current->next;
                };
                return End();
-       };
+       }
 
 
        template <typename PredicateType>
@@ -331,9 +331,9 @@ public:
                                return Iterator(current, previous);
                        previous = current;
                        current = current->next;
-               };
+               }
                return End();
-       };
+       }
 
 
        template <typename PredicateType>
@@ -345,15 +345,15 @@ public:
                        if ( predicate(current->data) )
                                return current;
                        current = current->next;
-               };
+               }
                return End();
-       };
+       }
 
 
        bool Contains(const DataType& data) const
        {
                return Find(data) != End();
-       };
+       }
 
 
        void Clear()
@@ -366,31 +366,31 @@ public:
                        delete temp;
                };
                first = NULL;
-       };
+       }
 
 
        Iterator First()
        {
                return Iterator(first, NULL);
-       };
+       }
 
 
        ConstIterator First() const
        {
                return first;
-       };
+       }
 
 
        Iterator End()
        {
                return Iterator(NULL, NULL);
-       };
+       }
 
 
        ConstIterator End() const
        {
                return NULL;
-       };
+       }
 
        
 #      ifdef DEBUG
@@ -402,8 +402,8 @@ public:
                {
                        cout << current->data << endl;
                        current = current->next;
-               };
-       };
+               }
+       }
 
 #      endif // DEBUG
 };
index a50fa9982263436f4214a29b3a4e2f250aebb3e1..7d42a348bdecc23aa31c94aecaa41c4784550e1e 100644 (file)
@@ -23,19 +23,19 @@ CenterOfGravityFinder::CenterOfGravityFinder() : ClusterFinder()
        DigitMax = 35; // maximum number of padhits in columns or rows.
        DDLMax = 200; // Maximum number of padhits in one ddl;
        DDLTot = 500; // totoal number of padhits in one ddl;
-};
+}
 
 
 CenterOfGravityFinder::~CenterOfGravityFinder()
 {
        // TODO
-};
+}
 
 
 void CenterOfGravityFinder::FindClusters(const ADCStream* stream)
 {
        // TODO
-};
+}
 
 
 UInt CenterOfGravityFinder::FillClusterData(
@@ -44,14 +44,14 @@ UInt CenterOfGravityFinder::FillClusterData(
 {
        // TODO
        return 0;
-};
+}
 
 
 void CenterOfGravityFinder::Reset() {
            // TODO
-};
+}
 
 
-}; // Clustering
-}; // dHLT
+} // Clustering
+} // dHLT
 
index c64cb93a3ff290b394165e29821f1fe13cacd5be..948ec933d0ce4ff7353e4d92edae92768edaf25c 100644 (file)
@@ -13,7 +13,7 @@ namespace
        // The one and only pree allocated out of memory error object.
        static dHLT::OutOfMemory _out_of_memory_;
 
-}; // end of namespace
+} // end of namespace
 
 
 namespace dHLT
@@ -23,17 +23,17 @@ namespace dHLT
 const char* OutOfMemory::Message() const throw()
 {
        return "Out of memory.";
-};
+}
 
 Int OutOfMemory::ErrorCode() const throw()
 {
        return OUT_OF_MEMORY;
-};
+}
 
 void ThrowOutOfMemory() throw (OutOfMemory)
 {
        throw _out_of_memory_;
-};
+}
 
 
-}; // dHLT
+} // dHLT
index b3cdff0d179f76c8180a4bf3172c4ba209e9cad8..bafb8763dba3a62e8eb5fce212dd9abe20cc1699 100644 (file)
@@ -75,6 +75,6 @@ enum
 };
 
 
-}; // dHLT
+} // dHLT
 
 #endif // dHLT_ERROR_HPP
index 8aff1ab26d079b635c8eeff79882a8b64ad5cb8e..74318a2b90d7d96f9cf495f028cbedc893407124 100644 (file)
@@ -28,13 +28,13 @@ public:
        {
                x = 0.0;
                y = 0.0;
-       };
+       }
 
-       Point(const Float x, const Float y)
+       Point(const Float x0, const Float y0)
        {
-               this->x = x;
-               this->y = y;
-       };
+               this->x = x0;
+               this->y = y0;
+       }
 };
 
 
index b67473aa99941e39ee7283f40a99f797da704f32..e41c1f754c370038d1be462bb9f81437d4225762 100644 (file)
@@ -58,7 +58,7 @@ public:
        {
                chamber = Chamber1;
                left = right = top = bottom = 0.0;
-       };
+       }
        
        /* This constructor decodes the ROI bit pattern into a region of
           interest object.
@@ -66,36 +66,36 @@ public:
        RegionOfInterest(const ROI& code)
        {
                Decode(code);
-       };
+       }
 
        /* Creates a region of interest around the given point for the
           specified chamber.
         */
-       RegionOfInterest(const ClusterPoint& point, const ChamberID chamber)
+       RegionOfInterest(const ClusterPoint& point0, const ChamberID chamber0)
        {
-               CreateToContain(point, chamber);
-       };
+               CreateToContain(point0, chamber0);
+       }
 
        /* Creates a region of interest around all the given points and for the
           specified chamber.
         */
-       RegionOfInterest(const ClusterPoint* points, const UInt count, const ChamberID chamber)
+       RegionOfInterest(const ClusterPoint* points0, const UInt count0, const ChamberID chamber0)
        {
-               CreateToContain(points, count, chamber);
-       };
+               CreateToContain(points0, count0, chamber0);
+       }
 
        /* Creates a region of interest with the specified boundaries and for
           the specified chamber.
         */
-       RegionOfInterest(const Float left, const Float right, const Float bottom, const Float top, const ChamberID chamber)
+       RegionOfInterest(const Float left0, const Float right0, const Float bottom0, const Float top0, const ChamberID chamber0)
        {
-               Assert( 0 <= chamber and chamber < NUMBER_OF_TRACKING_CHAMBERS );
-               this->chamber = chamber;
-               this->left = left;
-               this->right = right;
-               this->bottom = bottom;
-               this->top = top;
-       };
+               Assert( 0 <= chamber0 and chamber0 < NUMBER_OF_TRACKING_CHAMBERS );
+               this->chamber = chamber0;
+               this->left = left0;
+               this->right = right0;
+               this->bottom = bottom0;
+               this->top = top0;
+       }
 
 
        /* Checks if the point is contained in this region of interest.
@@ -104,18 +104,18 @@ public:
        {
                return left <= point.x and point.x <= right and
                        bottom <= point.y and point.y <= top;
-       };
+       }
 
 
        /* Checks if the point is contained in this region of interest and the
           chamber number corresponds to this region object.
         */
-       bool Contains(const ClusterPoint& point, const ChamberID chamber) const
+       bool Contains(const ClusterPoint& point, const ChamberID chamber0) const
        {
                return left <= point.x and point.x <= right and
                        bottom <= point.y and point.y <= top and
-                       this->chamber == chamber;
-       };
+                       this->chamber == chamber0;
+       }
 
 
        /* Checks if the specified region of interest is contained in this
@@ -126,7 +126,7 @@ public:
                return chamber == roi.chamber and 
                        left <= roi.left and right >= roi.right and
                        bottom <= roi.bottom and top >= roi.top;
-       };
+       }
 
 
        /* Creates a region of interest around the given point for the
index 56070c20a5f37d604aa1ea6db48e91084f2da752..f997e18e937fcfb0ded63ee094eacea4d98d0498 100644 (file)
@@ -74,7 +74,7 @@ public:
        static void SetZ13(const Float value) { z13 = value; };
 
 
-protected:
+  //protected:
 
 
        class RegionOfInterest
index 42a6a407788d4cadbb29b45d5383ee80759e820c..53d42d73d35779afbea2af2d01837b9c28cdf0a9 100644 (file)
@@ -20,22 +20,22 @@ const Char* VersionString()
        Char* str = (Char*) &strbuf;
        sprintf(str, "%d.%d.%d", MAJOR_VERSION, MINOR_VERSION, BUILD_NUMBER);
        return str;
-};
+}
 
 UInt MajorVersion()
 {
        return MAJOR_VERSION;
-};
+}
 
 UInt MinorVersion()
 {
        return MINOR_VERSION;
-};
+}
 
 UInt BuildNumber()
 {
        return BUILD_NUMBER;
-};
+}
 
 
-}; // dHLT
+} // dHLT
index e131e6805b01bebb40aa601717b6a46ef32338d4..c553741262066a30f254b1aa885694ecbaec6851 100644 (file)
@@ -44,6 +44,6 @@ UInt MinorVersion();
 UInt BuildNumber();
 
 
-}; // dHLT
+} // dHLT
 
 #endif // dHLT_VERSION_FUNCTIONS_HPP