Compare() declared const (R.Brun)

diff --git a/ITS/AliITSHuffman.cxx b/ITS/AliITSHuffman.cxx
index 644e67e8567799bf8c1f751694e1ee87a363439b..5e3b5a20b6332e879b0dcbfde3d46ac78f4d6fbe 100644 (file)
--- a/ITS/AliITSHuffman.cxx
+++ b/ITS/AliITSHuffman.cxx
@@ -61,7 +61,7 @@ AliITSHNode&
 }
 
 //____________________________________________
-Int_t AliITSHNode::Compare(TObject *obj)
+Int_t AliITSHNode::Compare(const TObject *obj) const
 {
   // function called by Sort method of TObjArray
 

diff --git a/ITS/AliITSHuffman.h b/ITS/AliITSHuffman.h
index 9259899ed6c8acdbc3597a39d528c6740aa62735..b0948dc0ed04de593038dc4a9288ef32c1ba7f94 100644 (file)
--- a/ITS/AliITSHuffman.h
+++ b/ITS/AliITSHuffman.h
@@ -29,7 +29,7 @@ class AliITSHNode: public TObject  {
     // is sortable
     return kTRUE;
   }
-  Int_t Compare(TObject *obj);
+  Int_t Compare(const TObject *obj) const;
   
   ClassDef(AliITSHNode,1)     //HuffT node object for set:ITS
 

diff --git a/ITS/AliITSRecPoint.h b/ITS/AliITSRecPoint.h
index eb169606f6f0344234143c35648b698cf78e554a..5a4c537378fdd54fbff5ee515c9c540c778ef15d 100644 (file)
--- a/ITS/AliITSRecPoint.h
+++ b/ITS/AliITSRecPoint.h
@@ -35,7 +35,7 @@ class AliITSRecPoint : public TObject {
     fQ=-fQ;
   }
   Int_t IsUsed() const {return (fQ<0) ? 1 : 0;} // checks Use condision
-  Int_t Compare(TObject *o) {
+  Int_t Compare(const TObject *o) const {
     //to be defined
     return 0;
   } 

diff --git a/MUON/AliMUONHitForRec.cxx b/MUON/AliMUONHitForRec.cxx
index e1a4fc035aa778bb8c424fcadde97fc4189b1fa9..b9bdcde1007cc7605011110898690b169e6279c6 100644 (file)
--- a/MUON/AliMUONHitForRec.cxx
+++ b/MUON/AliMUONHitForRec.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.5  2001/01/26 21:46:33  morsch
+Use access functions to MUONHit, ... data members.
+
 Revision 1.4  2000/10/02 21:28:09  fca
 Removal of useless dependecies via forward declarations
 
@@ -119,7 +122,7 @@ AliMUONHitForRec & AliMUONHitForRec::operator=(const AliMUONHitForRec& MUONHitFo
     return *this;
 }
   //__________________________________________________________________________
-Int_t AliMUONHitForRec::Compare(TObject* Hit)
+Int_t AliMUONHitForRec::Compare(const TObject* Hit) const
 {
   // "Compare" function to sort with increasing chamber number.
   // Returns -1 (0, +1) if ChamberNumber of current HitForRec

diff --git a/MUON/AliMUONHitForRec.h b/MUON/AliMUONHitForRec.h
index 98deca7b047e3c55a01d1350218a57462ad2d20f..c193b70322a3f10cde1f4fc7f912faf6e82f21df 100644 (file)
--- a/MUON/AliMUONHitForRec.h
+++ b/MUON/AliMUONHitForRec.h
@@ -61,7 +61,7 @@ class AliMUONHitForRec : public TObject {
 
   // What is necessary for sorting TClonesArray's; sufficient too ????
   Bool_t IsSortable() const { return kTRUE; }
-  Int_t Compare(TObject* HitForRec); // "Compare" function for sorting
+  Int_t Compare(const TObject* HitForRec) const; // "Compare" function for sorting
  protected:
  private:
   Double_t fBendingCoor; // coordinate (cm) in bending plane

diff --git a/MUON/AliMUONRawCluster.cxx b/MUON/AliMUONRawCluster.cxx
index 35a60df2f64a5629161c9580b9e35841ffbd4047..3715fdffe0ff98e082a04433116b8861f78c08d4 100644 (file)
--- a/MUON/AliMUONRawCluster.cxx
+++ b/MUON/AliMUONRawCluster.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.2  2000/06/15 07:58:48  morsch
+Code from MUON-dev joined
+
 Revision 1.1.2.1  2000/06/09 22:04:50  morsch
 Was before in DataStructures.cxx
 
@@ -48,7 +51,7 @@ AliMUONRawCluster::AliMUONRawCluster() {
     fNcluster[0]=fNcluster[1]=-1;
 }
 
-Int_t AliMUONRawCluster::Compare(TObject *obj)
+Int_t AliMUONRawCluster::Compare(const TObject *obj) const
 {
   /*
          AliMUONRawCluster *raw=(AliMUONRawCluster *)obj;

diff --git a/MUON/AliMUONRawCluster.h b/MUON/AliMUONRawCluster.h
index c3769bdc632e127692145362353e4436be7ad4ce..c9842b5614c877ec3d35611b51abd89d5763ba4a 100644 (file)
--- a/MUON/AliMUONRawCluster.h
+++ b/MUON/AliMUONRawCluster.h
@@ -34,7 +34,7 @@ public:
    virtual ~AliMUONRawCluster() {}
    Float_t GetRadius(Int_t i) {return TMath::Sqrt(fX[i]*fX[i]+fY[i]*fY[i]);}
    Bool_t IsSortable() const {return kTRUE;}
-   Int_t  Compare(TObject *obj);
+   Int_t  Compare(const TObject *obj) const;
    Int_t PhysicsContribution();
    static Int_t BinarySearch(Float_t r, TArrayF ccord, Int_t from, Int_t upto);
    static void  SortMin(Int_t *idx,Float_t *xdarray, Float_t *xarray,

diff --git a/MUON/AliMUONSegment.cxx b/MUON/AliMUONSegment.cxx
index fcf369a5750deab291b85f31e2c0e9f46b9fa261..aff7f4a82b13ab53b6bfcd4b51babe05861b95ca 100644 (file)
--- a/MUON/AliMUONSegment.cxx
+++ b/MUON/AliMUONSegment.cxx
@@ -15,6 +15,24 @@
 
 /*
 $Log$
+Revision 1.5  2001/01/08 11:01:02  gosset
+Modifications used for addendum to Dimuon TDR (JP Cussonneau):
+*. MaxBendingMomentum to make both a segment and a track (default 500)
+*. MaxChi2 per degree of freedom to make a track (default 100)
+*. MinBendingMomentum used also to make a track
+   and not only a segment (default 3)
+*. wider roads for track search in stations 1 to 3
+*. extrapolation to actual Z instead of Z(chamber) in FollowTracks
+*. in track fit:
+   - limits on parameters X and Y (+/-500)
+   - covariance matrices in double precision
+   - normalization of covariance matrices before inversion
+   - suppression of Minuit printouts
+*. correction against memory leak (delete extrapHit) in FollowTracks
+*. RMax to 10 degrees with Z(chamber) instead of fixed values;
+   RMin and Rmax cuts suppressed in NewHitForRecFromGEANT,
+   because useless with realistic geometry
+
 Revision 1.4  2000/06/30 10:15:48  gosset
 Changes to EventReconstructor...:
 precision fit with multiple Coulomb scattering;
@@ -105,7 +123,7 @@ AliMUONSegment & AliMUONSegment::operator=(const AliMUONSegment& MUONSegment)
 }
 
   //__________________________________________________________________________
-Int_t AliMUONSegment::Compare(TObject* Segment)
+Int_t AliMUONSegment::Compare(const TObject* Segment) const
 {
   // "Compare" function to sort with increasing absolute value
   // of the "impact parameter" in bending plane.

diff --git a/MUON/AliMUONSegment.h b/MUON/AliMUONSegment.h
index e4c242fe8a334040bc5cf78dd284c515481ab382..ffd0233d58355c14aad02eb7dbe944689e61e945 100644 (file)
--- a/MUON/AliMUONSegment.h
+++ b/MUON/AliMUONSegment.h
@@ -79,7 +79,7 @@ class AliMUONSegment : public TObject {
 
   // What is necessary for sorting TClonesArray's; sufficient too ????
   Bool_t IsSortable() const { return kTRUE; }
-  Int_t Compare(TObject* Segment); // "Compare" function for sorting
+  Int_t Compare(const TObject* Segment) const; // "Compare" function for sorting
  protected:
  private:
   AliMUONHitForRec* fHitForRecPtr1; // pointer to HitForRec in first chamber

diff --git a/MUON/AliMUONTrackHit.cxx b/MUON/AliMUONTrackHit.cxx
index e0a7f786379c44aec43e7d8395e42c0bddceb111..ef569b7ba87e63e938c1b5a8be8c45523197289a 100644 (file)
--- a/MUON/AliMUONTrackHit.cxx
+++ b/MUON/AliMUONTrackHit.cxx
@@ -15,6 +15,12 @@
 
 /*
 $Log$
+Revision 1.5  2000/07/20 12:45:27  gosset
+New "EventReconstructor..." structure,
+       hopefully more adapted to tree/streamer.
+"AliMUONEventReconstructor::RemoveDoubleTracks"
+       to keep only one track among similar ones.
+
 Revision 1.4  2000/07/18 16:04:06  gosset
 AliMUONEventReconstructor package:
 * a few minor modifications and more comments
@@ -115,7 +121,7 @@ AliMUONTrackHit::~AliMUONTrackHit()
 }
 
   //__________________________________________________________________________
-Int_t AliMUONTrackHit::Compare(TObject* TrackHit)
+Int_t AliMUONTrackHit::Compare(const TObject* TrackHit) const
 {
   // "Compare" function to sort with increasing Z.
   // Returns -1 (0, +1) if Z of current TrackHit

diff --git a/MUON/AliMUONTrackHit.h b/MUON/AliMUONTrackHit.h
index f373791c452506a3525363a3eae77572ec30dd6d..92ffa7ec0235a0eae139ec95b8541eb99eae3c97 100644 (file)
--- a/MUON/AliMUONTrackHit.h
+++ b/MUON/AliMUONTrackHit.h
@@ -35,7 +35,7 @@ class AliMUONTrackHit : public TObject {
   Bool_t IsSortable () const {
     // necessary for sorting TClonesArray of TrackHit's
     return kTRUE; }
-  Int_t Compare(TObject* TrackHit); // "Compare" function for sorting
+  Int_t Compare(const TObject* TrackHit) const; // "Compare" function for sorting
 
  protected:
  private:

diff --git a/PHOS/AliPHOSCpvRecPoint.cxx b/PHOS/AliPHOSCpvRecPoint.cxx
index a83bf9c1c7295f9da0ed78e7060f238f29ff62e9..123cdcd1a00a70422745686a4ff59c02a3db1ef4 100644 (file)
--- a/PHOS/AliPHOSCpvRecPoint.cxx
+++ b/PHOS/AliPHOSCpvRecPoint.cxx
@@ -129,7 +129,7 @@ Bool_t AliPHOSCpvRecPoint::AreNeighbours(AliPHOSDigit * digit1, AliPHOSDigit * d
 }
 
 //____________________________________________________________________________
-Int_t AliPHOSCpvRecPoint::Compare(TObject * obj)
+Int_t AliPHOSCpvRecPoint::Compare(const TObject * obj) const
 {
   // Compares two RecPoints according to their position in the PHOS modules
 

diff --git a/PHOS/AliPHOSCpvRecPoint.h b/PHOS/AliPHOSCpvRecPoint.h
index 1feea02929407dae7aa99d4885016c15e1458dd2..325cf4edc58f8c77557f793888c363832a6f7d18 100644 (file)
--- a/PHOS/AliPHOSCpvRecPoint.h
+++ b/PHOS/AliPHOSCpvRecPoint.h
@@ -41,7 +41,7 @@ public:
   virtual ~AliPHOSCpvRecPoint() ;  
 
   virtual void  AddDigit(AliPHOSDigit & digit, Float_t Energy) ;  // add a digit to the digits list  
-  Int_t       Compare(TObject * obj) ;                         // method for sorting  
+  Int_t       Compare(const TObject * obj) const;                         // method for sorting  
   
   Float_t     GetDelta (){ 
     // gets the fDelta data member 

diff --git a/PHOS/AliPHOSEmcRecPoint.cxx b/PHOS/AliPHOSEmcRecPoint.cxx
index bc06a2efd6b637f5d712517dcbfdb1b4bc85cbd6..ea03066627369ea70733d30f88a3960eb12fa6c8 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.cxx
+++ b/PHOS/AliPHOSEmcRecPoint.cxx
@@ -128,7 +128,7 @@ Bool_t AliPHOSEmcRecPoint::AreNeighbours(AliPHOSDigit * digit1, AliPHOSDigit * d
 }
 
 //____________________________________________________________________________
-Int_t AliPHOSEmcRecPoint::Compare(TObject * obj)
+Int_t AliPHOSEmcRecPoint::Compare(const TObject * obj) const
 {
   // Compares two RecPoints according to their position in the PHOS modules
 

diff --git a/PHOS/AliPHOSEmcRecPoint.h b/PHOS/AliPHOSEmcRecPoint.h
index 27217a3728276cf6f6e4548b307e8de83b00fb27..620f86f50e9a0697320c4a304bcf23f980808ad3 100644 (file)
--- a/PHOS/AliPHOSEmcRecPoint.h
+++ b/PHOS/AliPHOSEmcRecPoint.h
@@ -41,7 +41,7 @@ public:
   virtual ~AliPHOSEmcRecPoint() ;  
 
   virtual void  AddDigit(AliPHOSDigit & digit, Float_t Energy) ;  // add a digit to the digits list  
-  Int_t       Compare(TObject * obj) ;                         // method for sorting  
+  Int_t       Compare(const TObject * obj) const;                         // method for sorting  
   Float_t CoreEnergy() ;
   
   Float_t     GetDelta (){ 

diff --git a/PHOS/AliPHOSLink.cxx b/PHOS/AliPHOSLink.cxx
index 5774371c56d8539046e49fcc9ef5f7f09deac931..56c7aad3f5b5902ced75decbd38d2c07de87c002 100644 (file)
--- a/PHOS/AliPHOSLink.cxx
+++ b/PHOS/AliPHOSLink.cxx
@@ -41,7 +41,7 @@ ClassImp(AliPHOSLink)
 }
 
 //____________________________________________________________________________
-Int_t AliPHOSLink::Compare(TObject * obj)
+Int_t AliPHOSLink::Compare(const TObject * obj) const
 {
   // Compare according to the distance between EMC and PPSD RecPoints in a track segment 
 

diff --git a/PHOS/AliPHOSLink.h b/PHOS/AliPHOSLink.h
index d0b54036a28e78ec4877d1d7c1a6a4963122fdb9..e17576f89685b2e4929067b6f63734df9b62c28a 100644 (file)
--- a/PHOS/AliPHOSLink.h
+++ b/PHOS/AliPHOSLink.h
@@ -27,7 +27,7 @@ public:
   virtual ~AliPHOSLink(){
     // dtor
   }
-  Int_t   Compare(TObject * obj) ;
+  Int_t   Compare(const TObject * obj) const;
   Int_t   GetEmc(void) { 
     // returns the index of EMC
     return fEmcN; 

diff --git a/PHOS/AliPHOSPpsdRecPoint.cxx b/PHOS/AliPHOSPpsdRecPoint.cxx
index a1484cf4f3df298a6e7ff4655c34de1a9af0c1a3..40e0e558c82e485d02e67fce1025835b473c3a30 100644 (file)
--- a/PHOS/AliPHOSPpsdRecPoint.cxx
+++ b/PHOS/AliPHOSPpsdRecPoint.cxx
@@ -80,7 +80,7 @@ void AliPHOSPpsdRecPoint::AddDigit(AliPHOSDigit & digit, Float_t Energy)
 }
 
 //____________________________________________________________________________
-Int_t AliPHOSPpsdRecPoint::Compare(TObject * obj)
+Int_t AliPHOSPpsdRecPoint::Compare(const TObject * obj) const
 {
   // Compares according to the position
   

diff --git a/PHOS/AliPHOSPpsdRecPoint.h b/PHOS/AliPHOSPpsdRecPoint.h
index 3df80b71cb4d533a8db07c210887bae8f7665105..69165f8660801e19cd97f7d59db7eda39bad8136 100644 (file)
--- a/PHOS/AliPHOSPpsdRecPoint.h
+++ b/PHOS/AliPHOSPpsdRecPoint.h
@@ -29,7 +29,7 @@ public:
     // dtor
   }
   virtual void AddDigit(AliPHOSDigit & digit, Float_t Energy) ;
-  Int_t   Compare(TObject * obj) ;                    // method to sort clusters
+  Int_t   Compare(const TObject * obj) const;                    // method to sort clusters
 
   Float_t GetDelta(void) {
     // returns the parameter used for sorting

diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h
index 3927b2ed3130fcad021224b3578d28a2bbcd75b2..0a86afc013bd2b5aada8d98d59341656746713b2 100644 (file)
--- a/PHOS/AliPHOSRecPoint.h
+++ b/PHOS/AliPHOSRecPoint.h
@@ -45,7 +45,7 @@ class AliPHOSRecPoint : public AliRecPoint {
     assert(0==1) ; 
   }
   virtual  void   AddDigit(AliPHOSDigit & digit, Float_t Energy) = 0 ; 
-  virtual Int_t   Compare(TObject * obj) { 
+  virtual Int_t   Compare(const TObject * obj) const { 
     // check why this is done
     assert(0==1) ; return 1 ; 
   }   

diff --git a/RICH/AliRICHRawCluster.cxx b/RICH/AliRICHRawCluster.cxx
index 402070fd5ff51023d385227307bc0bda7c05682b..7ef582c9ab9a53a8bb2c8f627d220cb276a8d65b 100644 (file)
--- a/RICH/AliRICHRawCluster.cxx
+++ b/RICH/AliRICHRawCluster.cxx
@@ -15,6 +15,10 @@
 
 /*
   $Log$
+  Revision 1.2  2000/10/02 15:51:49  jbarbosa
+  Fixed forward declarations.
+  Moved constructor into implementation file.
+
   Revision 1.1  2000/06/12 15:27:26  jbarbosa
   Cleaned up version.
 
@@ -43,7 +47,7 @@ AliRICHRawCluster :: AliRICHRawCluster()
   fNcluster[0]=fNcluster[1]=-1;
 }
 
-Int_t AliRICHRawCluster::Compare(TObject *obj)
+Int_t AliRICHRawCluster::Compare(const TObject *obj) const
 {
 
 // Compare two clusters

diff --git a/RICH/AliRICHRawCluster.h b/RICH/AliRICHRawCluster.h
index 907abd577a5c4220e8b2462633f0a040d5e4c767..a94a9e7cf7c13c1f22764148abca315f74246f8a 100644 (file)
--- a/RICH/AliRICHRawCluster.h
+++ b/RICH/AliRICHRawCluster.h
@@ -34,7 +34,7 @@ public:
     Float_t GetRadius() {return TMath::Sqrt(fX*fX+fY*fY);}
     
     Bool_t IsSortable() const {return kTRUE;}
-    Int_t  Compare(TObject *obj);
+    Int_t  Compare(const TObject *obj) const;
     Int_t PhysicsContribution();
     static Int_t BinarySearch(Float_t r, TArrayF coord, Int_t from, Int_t upto);
     static void  SortMin(Int_t *idx,Float_t *xdarray,Float_t *xarray,Float_t *yarray,Float_t *qarray,Int_t ntr);

diff --git a/STEER/AliKalmanTrack.cxx b/STEER/AliKalmanTrack.cxx
index ee4400de1b18d5d4092dadbc30134af3454605cb..f552202c18390570c08e97005ea6c20ca9adaa1b 100644 (file)
--- a/STEER/AliKalmanTrack.cxx
+++ b/STEER/AliKalmanTrack.cxx
@@ -46,7 +46,7 @@ AliKalmanTrack::AliKalmanTrack(const AliKalmanTrack& t) {
 }
 
 //_____________________________________________________________________________
-Int_t AliKalmanTrack::Compare(TObject *o) {
+Int_t AliKalmanTrack::Compare(const TObject *o) const {
   //-----------------------------------------------------------------
   // This function compares tracks according to the their curvature
   //-----------------------------------------------------------------

diff --git a/STEER/AliKalmanTrack.h b/STEER/AliKalmanTrack.h
index 04e038a06d711600392c56aef1f4968c06877d6e..1c637d5b2c749bda648276f583f7b426dacaf2aa 100644 (file)
--- a/STEER/AliKalmanTrack.h
+++ b/STEER/AliKalmanTrack.h
@@ -19,7 +19,7 @@ public:
   AliKalmanTrack() {fN=0; fChi2=0; fLab=-3141593;}
   AliKalmanTrack(const AliKalmanTrack& t);
   virtual ~AliKalmanTrack() {}
-  Int_t Compare(TObject *o);
+  Int_t Compare(const TObject *o) const;
   void SetLabel(Int_t lab) {fLab=lab;} 
 
   Double_t GetPredictedChi2(const AliCluster *cluster) const;

diff --git a/TRD/AliTRDtrack.cxx b/TRD/AliTRDtrack.cxx
index 07dcc1d320aa6b5042826c4b24d770dbe8cef5c6..57ebd5eb32c5a8e88cd8bb712f6a3171ab6af2ed 100644 (file)
--- a/TRD/AliTRDtrack.cxx
+++ b/TRD/AliTRDtrack.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.4  2000/12/08 16:07:02  cblume
+Update of the tracking by Sergei
+
 Revision 1.3  2000/10/15 23:40:01  cblume
 Remove AliTRDconst
 
@@ -100,7 +103,7 @@ void AliTRDtrack::GetCovariance(Double_t cc[15]) const {
 }    
 
 //_____________________________________________________________________________
-Int_t AliTRDtrack::Compare(TObject *o) {
+Int_t AliTRDtrack::Compare(const TObject *o) const {
 
 // Compares tracks according to their Y2
 

diff --git a/TRD/AliTRDtrack.h b/TRD/AliTRDtrack.h
index e30c03566c57b6a49b88c86336071ca03ac0da91..17ac8f15960734d44a6f874053847c01d10c0566 100644 (file)
--- a/TRD/AliTRDtrack.h
+++ b/TRD/AliTRDtrack.h
@@ -19,7 +19,7 @@ public:
                const Double_t cc[15], Double_t xr, Double_t alpha);  
    AliTRDtrack(const AliTRDtrack& t);    
 
-   Int_t  Compare(TObject *o);
+   Int_t  Compare(const TObject *o) const;
 
    Double_t GetAlpha() const {return fAlpha;}
    Double_t GetC()     const {return fC;}