Changes done in order to remove compilation warnings

diff --git a/ITS/AliITS.h b/ITS/AliITS.h
index 69305996d5af296939be23c4643805e21e401048..ff1c39168533f542315609a4d93375dfe2f3aa45 100644 (file)
--- a/ITS/AliITS.h
+++ b/ITS/AliITS.h
@@ -58,7 +58,7 @@ class AliITS : public AliDetector {
     AliITS(const AliITS &source); // copy constructor. Not to be used!
     AliITS& operator=(AliITS &source); // = operator. Not to be used!
     virtual Int_t IsVersion() const {return 1;}
-    virtual Int_t DistancetoPrimitive(Int_t,Int_t) const{return 999;};
+    virtual Int_t DistancetoPrimitive(Int_t , Int_t )  {return 999;}
 
     //===================== Simulation Geometry ========================
     // get geometry version - detailed (major) or coarse (minor)

diff --git a/ITS/AliITSClusterFinder.h b/ITS/AliITSClusterFinder.h
index 7206c45bc81545d6aa81480cbdeccfca9fa53f39..95e99ebe4dc51b1214f76ef5be41b62a2243191a 100644 (file)
--- a/ITS/AliITSClusterFinder.h
+++ b/ITS/AliITSClusterFinder.h
@@ -81,7 +81,7 @@ class AliITSClusterFinder :public TObject{
     virtual void   FillCluster(AliITSRawCluster *,Int_t) {}// fiil cluster
     virtual void   FillCluster(AliITSRawCluster *cluster) {// fill cluster
         FillCluster(cluster,1);}
-    virtual void FindCluster(Int_t,Int_t,AliITSRawCluster *) {}// find cluster
+
     //
     virtual void SetModule(Int_t module){fModule = module;}// Set module number
     virtual Int_t GetModule()const{return fModule;}// Returns module number
@@ -116,6 +116,8 @@ class AliITSClusterFinder :public TObject{
     // IO functions
     void Print(ostream *os); // Class ascii print function
     void Read(istream *os);  // Class ascii read function
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
 
     // Conversion from RecPoints to V2Clusters
     void RecPoints2Clusters(const TClonesArray *points, Int_t idx, TClonesArray *clusters);

diff --git a/ITS/AliITSClusterFinderSDD.cxx b/ITS/AliITSClusterFinderSDD.cxx
index 89fb081f1dcfc9009961471ffff7e1470b456ca7..7256e198f62106e3ae184b14229de3be2654c523 100644 (file)
--- a/ITS/AliITSClusterFinderSDD.cxx
+++ b/ITS/AliITSClusterFinderSDD.cxx
@@ -15,6 +15,9 @@
 /*
   $Id$
   $Log$
+  Revision 1.38  2005/02/15 13:39:35  masera
+  V2 clusterer moved to the standard framework. V2 clusters and recpoints are still different objects for the moment
+
   Revision 1.37  2004/06/10 21:00:24  nilsen
   Modifications associated with remerging the Ba/Sa and Dubna pixel simulations,
   some cleaning of general code (including coding convensions), and adding some
@@ -1136,7 +1139,7 @@ void AliITSClusterFinderSDD::FindRawClusters(Int_t mod){
     GetRecPoints();
 }
 //_______________________________________________________________________
-void AliITSClusterFinderSDD::Print() const{
+void AliITSClusterFinderSDD::PrintStatus() const{
     // Print SDD cluster finder Parameters
 
     cout << "**************************************************" << endl;

diff --git a/ITS/AliITSClusterFinderSDD.h b/ITS/AliITSClusterFinderSDD.h
index 68320c59ddc8c578e4c745b683832968d69ce74c..b72fe8a91da3a20263a5090783a5c128f7c3710f 100644 (file)
--- a/ITS/AliITSClusterFinderSDD.h
+++ b/ITS/AliITSClusterFinderSDD.h
@@ -74,7 +74,7 @@ class AliITSClusterFinderSDD : public AliITSClusterFinder{
     Double_t ChiSqr(Int_t xdim,Int_t zdim,Double_t *spe,Double_t *speFit)const;
     void  PeakFunc( Int_t xdim, Int_t zdim, Double_t *par, Double_t *spe,
                     Double_t *Integral=0 );
-    void  Print() const;
+    void  PrintStatus() const;
 
   private:
     virtual AliITSresponseSDD* GetResp()const{

diff --git a/ITS/AliITSPid.h b/ITS/AliITSPid.h
index 77e3dc5555fe386e7ecbc686d81a30518814f2af..2ba29e80e5b68e5bdfdcba99465e83bb6e56075f 100644 (file)
--- a/ITS/AliITSPid.h
+++ b/ITS/AliITSPid.h
@@ -21,6 +21,7 @@ public:
        void    SetPmom(Int_t track,Float_t Pmom);
        void    SetPcod(Int_t track,Int_t Pcod);
        void    Print(Int_t track);
+        virtual void Print(Option_t *option="") const {TObject::Print(option);}
        void    Tab(void);
        void    Reset(void);
        void    SetVec(Int_t track,TVector info);

diff --git a/ITS/AliITSRecPoint.h b/ITS/AliITSRecPoint.h
index 578449974921e796560b802852b26cd1778d8e32..a973c90e0a6517e50560bb88c23963663a21dae5 100644 (file)
--- a/ITS/AliITSRecPoint.h
+++ b/ITS/AliITSRecPoint.h
@@ -44,6 +44,9 @@ class AliITSRecPoint : public TObject {
     void Print(ostream *os); 
     // Reads in the content of this class in the format of Print
     void Read(istream *is);
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
+
  public:
     Int_t     fTracks[3]; //labels of overlapped tracks
     Float_t   fX ;        //X of cluster

diff --git a/ITS/AliITSReconstructor.h b/ITS/AliITSReconstructor.h
index 1a8a992d696468a6cada58fe565702c6d1136562..4d91b19c7ac191e66c066bb7d810b2eeb7ee995e 100644 (file)
--- a/ITS/AliITSReconstructor.h
+++ b/ITS/AliITSReconstructor.h
@@ -18,10 +18,25 @@ public:
   virtual void         Reconstruct(AliRunLoader* runLoader) const;
   virtual void         Reconstruct(AliRunLoader* runLoader,
                                   AliRawReader* rawReader) const;
+  virtual void         Reconstruct(AliRawReader* rawReader, TTree* clustersTree) const 
+    {AliReconstructor::Reconstruct(rawReader,clustersTree);}
+  virtual void         Reconstruct(TTree* digitsTree, TTree* clustersTree) const 
+    {AliReconstructor::Reconstruct(digitsTree, clustersTree);}
+
   virtual AliTracker*  CreateTracker(AliRunLoader* runLoader) const;
   virtual AliVertexer* CreateVertexer(AliRunLoader* runLoader) const;
   virtual void         FillESD(AliRunLoader* runLoader, AliESD* esd) const;
 
+  virtual void         FillESD(TTree* digitsTree, TTree* clustersTree, 
+                                AliESD* esd) const 
+    {AliReconstructor::FillESD(digitsTree, clustersTree, esd);}
+  virtual void         FillESD(AliRawReader* rawReader, TTree* clustersTree, 
+                              AliESD* esd) const
+    {AliReconstructor::FillESD(rawReader, clustersTree, esd);}
+  virtual void         FillESD(AliRunLoader* runLoader, 
+                              AliRawReader* rawReader, AliESD* esd) const
+    {AliReconstructor::FillESD(runLoader,rawReader, esd);}
+
 private:
   AliITSgeom*          GetITSgeom(AliRunLoader* runLoader) const;
 

diff --git a/ITS/AliITSTableSSD.h b/ITS/AliITSTableSSD.h
index 22f902aae7e0aca71d3db69ede9ed5c32a48e4ea..d8895751b1a17150f2b5ccfff36fee4f48beba95 100644 (file)
--- a/ITS/AliITSTableSSD.h
+++ b/ITS/AliITSTableSSD.h
@@ -17,6 +17,8 @@ class AliITSTableSSD : public TObject{
     void Clear(); // Clears the contents of the table
     void DumpTable(); // it dumps the contents of the table
     Int_t Use(Int_t side); // use current element - returns -1 if none
+    
+    virtual void Clear(Option_t*)  {return TObject::Clear();}
 
  private:
     Int_t SearchValue(Int_t *arr, Int_t refer, Int_t max){

diff --git a/ITS/AliITSTransientDigit.h b/ITS/AliITSTransientDigit.h
index 0b9b273374001967e16704d9cd4d79e25320d406..bbc1750b92b56f66ffc594db7e0f70c9def76233 100644 (file)
--- a/ITS/AliITSTransientDigit.h
+++ b/ITS/AliITSTransientDigit.h
@@ -26,7 +26,8 @@ class AliITSTransientDigit : public AliITSdigitSDD {
     void PutTrackItem(TObject *obj,Int_t i){fTrackList->AddAt(obj,i);}
     void Print(ostream *os); // Class ascii print function
     void Read(istream *os);  // Class ascii read function
-
+    virtual Int_t Read(const char *name) {return AliITSdigitSDD::Read(name);}
+    virtual void Print(Option_t *option="") const {AliITSdigitSDD::Print(option);}
  protected:
     TObjArray *fTrackList;  // track list 
 

diff --git a/ITS/AliITSdigit.h b/ITS/AliITSdigit.h
index ca1cd88ee6ba80e97c6f83c85b2c458f29b2ea8c..b76d02772b8a77c50592fda91b8f0db18edabfd5 100644 (file)
--- a/ITS/AliITSdigit.h
+++ b/ITS/AliITSdigit.h
@@ -44,8 +44,11 @@ class AliITSdigit: public TObject  {
     virtual void SetCoord1(Int_t i){fCoord1 = i;} // Sets fCoord1 value
     virtual void SetCoord2(Int_t i){fCoord2 = i;} // Sets fCoord12value
     virtual void SetSignal(Int_t i){fSignal = i;} // Sets fSignal value
-    void Print(ostream *os); // Class ascii print function
-    void Read(istream *os);  // Class ascii read function
+
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual void Print(ostream *os); // Class ascii print function
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
+    virtual void Read(istream *os);  // Class ascii read function
 
  protected:
     Int_t fCoord1; // Cell number on Z axis (SPD+SDD), flag for side type (SSD)

diff --git a/ITS/AliITSdigitSDD.h b/ITS/AliITSdigitSDD.h
index 9e054b7a1edf02d0c4212260ec9b4e39bd68185b..1ec1bb0454a3fdb9dd56ada9e481d5a007ca1378 100644 (file)
--- a/ITS/AliITSdigitSDD.h
+++ b/ITS/AliITSdigitSDD.h
@@ -52,8 +52,10 @@ class AliITSdigitSDD: public AliITSdigit {
     //set array element i of fHits to hit.
     virtual void SetHit(Int_t i,Int_t hit){fHits[i]=hit;}
     void SetSignalExpanded(Int_t sig){fSignalExpanded = sig;}
-    void Print(ostream *os); // Class ascii print function
-    void Read(istream *os);  // Class ascii read function
+    virtual void Print(ostream *os); // Class ascii print function
+    virtual void Read(istream *os);  // Class ascii read function
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
 
  protected:
     void InitObject(Float_t phys,const Int_t *tracks,

diff --git a/ITS/AliITSdigitSPD.h b/ITS/AliITSdigitSPD.h
index e6d79ec8194270a94ab7a841cd6c11841c280ee7..aad05f94375e8d35390446320421ccc858905c4d 100644 (file)
--- a/ITS/AliITSdigitSPD.h
+++ b/ITS/AliITSdigitSPD.h
@@ -40,8 +40,10 @@ class AliITSdigitSPD: public AliITSdigit {
     virtual void SetTrack(Int_t i,Int_t trk){fTracks[i]=trk;}
     //set array element i of fHits to hit.
     virtual void SetHit(Int_t i,Int_t hit){fHits[i]=hit;}
-    void Print(ostream *os); // Class ascii print function
-    void Read(istream *os);  // Class ascii read function
+    virtual void Print(ostream *os); // Class ascii print function
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual void Read(istream *os);  // Class ascii read function
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
 
  protected:
     static const Int_t fgkSspd = 10; // size of fTracks and fHits arrays

diff --git a/ITS/AliITSdigitSSD.h b/ITS/AliITSdigitSSD.h
index fc1a66fcac89b492896f156af7889c8d5add47bc..c62f49c375905f0ee1362b3bb11c81edc4840a68 100644 (file)
--- a/ITS/AliITSdigitSSD.h
+++ b/ITS/AliITSdigitSSD.h
@@ -43,6 +43,9 @@ class AliITSdigitSSD: public AliITSdigit {
     virtual void SetHit(Int_t i,Int_t hit){fHits[i]=hit;}
     void Print(ostream *os); // Class ascii print function
     void Read(istream *os);  // Class ascii read function
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
+
 
  protected:
     static const Int_t fgkSssd = 10; // size of fTracks and fHits arrays

diff --git a/ITS/AliITSgeomMatrix.h b/ITS/AliITSgeomMatrix.h
index 9286baa5f2c9ec352271c4cd17eafcbcf16ada20..97591533f57ce1b6fe75e26b6b137cefd677b403 100644 (file)
--- a/ITS/AliITSgeomMatrix.h
+++ b/ITS/AliITSgeomMatrix.h
@@ -40,6 +40,8 @@ class AliITSgeomMatrix : public TObject {
        void PrintTitles(ostream *os) const;
        // Reads in the content of this class in the format of Print
        void Read(istream *is);
+        virtual void Print(Option_t *option="") const {TObject::Print(option);}
+        virtual Int_t Read(const char *name) {return TObject::Read(name);}
 
        // Given the rotation angles [radians] it fills frot and computes
        // the rotation matrix fm.

diff --git a/ITS/AliITSgeomSDD.h b/ITS/AliITSgeomSDD.h
index db5bc817e87e9b1f78a5fe760fe788cab3a30d3b..901e6d350f0b4c7c4ac853be634e024f5af04889 100644 (file)
--- a/ITS/AliITSgeomSDD.h
+++ b/ITS/AliITSgeomSDD.h
@@ -62,6 +62,8 @@ class AliITSgeomSDD: public TObject {
     virtual void Det2Local(Int_t a,Int_t t,Int_t s,Float_t &xl,Float_t &zl);
     virtual void Print(ostream *os) const; // Output streamer to standard out.
     virtual void Read(istream *is);   // Input streamer to standard in.
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
     // or what other or different information that is needed.
 
  protected:

diff --git a/ITS/AliITSgeomSPD.h b/ITS/AliITSgeomSPD.h
index b232198a3d5f7cbe778d30b40b794129129f41bc..ec6f1444f51756eddf3f23411d635f168aa4947e 100644 (file)
--- a/ITS/AliITSgeomSPD.h
+++ b/ITS/AliITSgeomSPD.h
@@ -70,6 +70,8 @@ class AliITSgeomSPD : public TObject {
     virtual void DetToL(Int_t row,Int_t col,Float_t &xl,Float_t &zl);
     virtual void Print(ostream *os) const; // output streamer to standard out.
     virtual void Read(istream *is); // input streamer from standard in.
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
 
  protected:
     TBRIK  *fShapeSPD; // SPD active area shape

diff --git a/ITS/AliITSgeomSSD.cxx b/ITS/AliITSgeomSSD.cxx
index 923429c5eb899578cacdfff4d312d326074b3254..a835d47d174f2953b4a2c11b5e9e758f031493c3 100644 (file)
--- a/ITS/AliITSgeomSSD.cxx
+++ b/ITS/AliITSgeomSSD.cxx
@@ -304,6 +304,18 @@ istream &operator>>(istream &is,AliITSgeomSSD175 &r){
     r.Read(&is);
     return is;
 }
+AliITSgeomSSD175& AliITSgeomSSD175::operator=(const AliITSgeomSSD &source) {
+////////////////////////////////////////////////////////////////////////
+//    assignment operator
+////////////////////////////////////////////////////////////////////////
+  
+
+    if(this == &source) return *this;
+    Error("AliITSgeomSSD175","Not allowed to make a = with "
+          "AliITSgeomSSD175 Using default creater instead");
+
+    return *this;
+}
 //======================================================================
 
 ClassImp(AliITSgeomSSD275and75)
@@ -371,6 +383,19 @@ istream &operator>>(istream &is,AliITSgeomSSD275and75 &r){
     r.Read(&is);
     return is;
 }
+AliITSgeomSSD275and75& AliITSgeomSSD275and75::operator=(const AliITSgeomSSD &source) {
+////////////////////////////////////////////////////////////////////////
+//    assignment operator
+////////////////////////////////////////////////////////////////////////
+  
+
+    if(this == &source) return *this;
+    Error("AliITSgeomSSD275and75","Not allowed to make a = with "
+          "AliITSgeomSSD275and75 Using default creater instead");
+
+    return *this;
+}
+
 //======================================================================
 
 ClassImp(AliITSgeomSSD75and275)
@@ -437,4 +462,17 @@ istream &operator>>(istream &is,AliITSgeomSSD75and275 &r){
     r.Read(&is);
     return is;
 }
+AliITSgeomSSD75and275& AliITSgeomSSD75and275::operator=(const AliITSgeomSSD &source) {
+////////////////////////////////////////////////////////////////////////
+//    assignment operator
+////////////////////////////////////////////////////////////////////////
+  
+
+    if(this == &source) return *this;
+    Error("AliITSgeomSSD75and275","Not allowed to make a = with "
+          "AliITSgeomSSD75and275 Using default creater instead");
+
+    return *this;
+}
+
 //======================================================================

diff --git a/ITS/AliITSgeomSSD.h b/ITS/AliITSgeomSSD.h
index 8b2ca671156f0def1a8742bfb98ea9fa0ee8ca7d..a3dcc2ab859101d25990222e12bca03d16269089 100644 (file)
--- a/ITS/AliITSgeomSSD.h
+++ b/ITS/AliITSgeomSSD.h
@@ -65,6 +65,8 @@ class AliITSgeomSSD : public TObject {
 
     virtual void Print(ostream *os) const;  // Output streamer to standard out.
     virtual void Read(istream *is);   // Input streamer to standard in.
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
 
  protected:
     // -+-> x
@@ -106,6 +108,7 @@ class AliITSgeomSSD175 : public AliITSgeomSSD {
 
  public:
     AliITSgeomSSD175();
+    virtual AliITSgeomSSD175& operator=(const AliITSgeomSSD &source);
 
     // This clas now has version 0 so that it will not be written to a root
     // file. This is good since there are no longer any data members to this
@@ -138,7 +141,9 @@ class AliITSgeomSSD275and75 : public AliITSgeomSSD {
  public:
     AliITSgeomSSD275and75();
     AliITSgeomSSD275and75(Int_t npar,Float_t *par);
+    virtual AliITSgeomSSD275and75& operator=(const AliITSgeomSSD &source);
 
+ // This clas now has version 0 so that it will not be
     // This clas now has version 0 so that it will not be written to a root
     // file. This is good since there are no longer any data members to this
     // class. It is only designed to make it easer to define this standard
@@ -169,7 +174,9 @@ class AliITSgeomSSD75and275 : public AliITSgeomSSD {
  public:
     AliITSgeomSSD75and275();
     AliITSgeomSSD75and275(Int_t npar,Float_t *par);
+    virtual AliITSgeomSSD75and275& operator=(const AliITSgeomSSD &source);
 
+ // This clas now has version 0 so that it will not be
     // This clas now has version 0 so that it will not be written to a root
     // file. This is good since there are no longer any data members to this
     // class. It is only designed to make it easer to define this standard
@@ -181,3 +188,5 @@ class AliITSgeomSSD75and275 : public AliITSgeomSSD {
 ostream &operator<<(ostream &os,AliITSgeomSSD75and275 &source);
 istream &operator>>(istream &os,AliITSgeomSSD75and275 &source);
 #endif
+
+

diff --git a/ITS/AliITShit.h b/ITS/AliITShit.h
index ffb716abd169eb27c2beb2a8456cd074fe880871..a750127d8a2a7cdc9d70e7c479a18c6b403099f7 100644 (file)
--- a/ITS/AliITShit.h
+++ b/ITS/AliITShit.h
@@ -223,6 +223,9 @@ class AliITShit : public AliHit {
     void Print(ostream *os) const; 
     // Reads in the content of this class in the format of Print
     void Read(istream *is);
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
+
 
  protected:
     Int_t     fStatus; // Track Status

diff --git a/ITS/AliITSpListItem.h b/ITS/AliITSpListItem.h
index ce1614fd867626d0e365540e11e99925b1dcdcc9..96e990f8589e3bd6436dd3514d9f24574cfa1729 100644 (file)
--- a/ITS/AliITSpListItem.h
+++ b/ITS/AliITSpListItem.h
@@ -66,6 +66,9 @@ class AliITSpListItem: public TObject {
     void Print(ostream *os) const;
     // Standard ascii class read function
     void Read(istream *is);
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
+
     // Returns max size of array for for Tracks, Hits, and signals.
     static Int_t GetMaxKept() {return fgksize;};
 

diff --git a/ITS/AliITSresponse.h b/ITS/AliITSresponse.h
index bfe0f1a828c6dd325c2ae2bdba0449d66cf69eb4..f5939c222b533bf6f0d2498e6eb8ba3c56f5d693 100644 (file)
--- a/ITS/AliITSresponse.h
+++ b/ITS/AliITSresponse.h
@@ -168,6 +168,8 @@ class AliITSresponse : public TObject {
     virtual void Print(ostream *os) const;
     // Reads in the content of this class in the format of Print
     virtual void Read(istream *is);
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
  protected:
     void NotImplemented(const char *method) const {if(gDebug>0)
          Warning(method,"This method is not implemented for this sub-class");}

diff --git a/ITS/AliITSresponseSDD.h b/ITS/AliITSresponseSDD.h
index 0ddc1d89091760f62329f4f02250c63636aeb7dc..5dbe1202617515ce72563e3bb1da938813dcf516 100644 (file)
--- a/ITS/AliITSresponseSDD.h
+++ b/ITS/AliITSresponseSDD.h
@@ -119,7 +119,8 @@ class AliITSresponseSDD : public AliITSresponse {
     //********
     void    PrintGains();
     void    Print();
-
+    virtual void Print(ostream *os) const {AliITSresponseSDD::Print(os);}
+    virtual void Print(Option_t *option="") const {AliITSresponseSDD::Print(option);}
     // not implemented virtual methods (devlared in the mother class
     virtual  void   SetDetParam(Double_t *)
       {NotImplemented("SetDetParam");}

diff --git a/ITS/AliITSsimulationFastPoints.h b/ITS/AliITSsimulationFastPoints.h
index f46da605c078823b0a8b80c0ae5d513c5fcbb974..29abb1ec0562d46775ff01c18ff86afc8fbc4c7e 100644 (file)
--- a/ITS/AliITSsimulationFastPoints.h
+++ b/ITS/AliITSsimulationFastPoints.h
@@ -2,7 +2,10 @@
 #define ALIITSSIMULATIONFASTPOINTS_H
 
 #include "AliITSsimulation.h"
-
+//////////////////////////////////////////////////////////
+// implements fast simulation 
+/////////////////////////////////////////////////////////
+//
 class AliITSmodule;
 class TRandom;
 
@@ -11,20 +14,22 @@ class AliITSsimulationFastPoints : public AliITSsimulation
 
 public:
   AliITSsimulationFastPoints(); // default constructor
-  virtual ~AliITSsimulationFastPoints() {} 
+  virtual ~AliITSsimulationFastPoints() {;} 
   void CreateFastRecPoints(AliITSmodule *mod,Int_t module,TRandom *rndm);
   void CreateFastRecPoints(Int_t module);
   
 private:
+
+  virtual AliITSsimulationFastPoints& operator=(const AliITSsimulation &source); 
   
     virtual void SetSigmaRPhi(Double_t sigmarphi[6]);  
     virtual void SetSigmaZ(Double_t sigmaz[6]);  
     virtual void SetSigmaDe(Double_t sigmade[6]);  
     virtual void SetThrDe(Double_t thrde[6]); 
-    Double_t SigmaRPhi(Int_t layer) {return fSigmaRPhi[layer-1];}  
-    Double_t SigmaZ(Int_t layer) {return fSigmaZ[layer-1];}  
-    Double_t SigmaDe(Int_t layer) {return fSigmaDe[layer-1];} 
-    Double_t ThrDe(Int_t layer) {return fThrDe[layer-1];} 
+    Double_t SigmaRPhi(Int_t layer) const {return fSigmaRPhi[layer-1];}  
+    Double_t SigmaZ(Int_t layer) const  {return fSigmaZ[layer-1];}  
+    Double_t SigmaDe(Int_t layer) const {return fSigmaDe[layer-1];} 
+    Double_t ThrDe(Int_t layer) const {return fThrDe[layer-1];} 
 
 
 private:

diff --git a/ITS/AliITSsimulationFastPointsV0.cxx b/ITS/AliITSsimulationFastPointsV0.cxx
index 447bc9ce7f53f55b7208d5f21b8e739d508aac58..0d0411edebae5c075f52c1da9c7ddc7cb82cff72 100644 (file)
--- a/ITS/AliITSsimulationFastPointsV0.cxx
+++ b/ITS/AliITSsimulationFastPointsV0.cxx
@@ -15,14 +15,10 @@
 
 /* $Id$ */
 
-#include <TParticle.h>
-#include <TRandom.h>
-
 #include "AliITS.h"
 #include "AliITShit.h"
 #include "AliITSRecPoint.h"
 #include "AliITSmodule.h"
-#include "AliITSgeom.h"
 #include "AliITSsimulationFastPointsV0.h"
 #include "AliITSstatistics.h"
 
@@ -51,7 +47,7 @@ AliITSsimulationFastPointsV0::~AliITSsimulationFastPointsV0()
 }
 
 //-------------------------------------------------------------
-void AliITSsimulationFastPointsV0::CreateFastRecPoints(AliITSmodule *mod,Int_t module,TRandom *rndm){
+void AliITSsimulationFastPointsV0::CreateFastRecPoints(AliITSmodule *mod,Int_t module,TRandom *rndm) {
   // Fast points simulator for all of the ITS.
   Int_t   nhit,h,trk,ifirst;
   Float_t x,y,z,t,e;// local coordinate (cm) and time of flight, and dedx.
@@ -105,6 +101,8 @@ void AliITSsimulationFastPointsV0::CreateFastRecPoints(AliITSmodule *mod,Int_t m
 //_______________________________________________________________________
 void AliITSsimulationFastPointsV0::AddSPD(Float_t &e,
                                         AliITSmodule *mod,Int_t trackNumber){
+  //
+
   const Float_t kmicronTocm = 1.0e-4;
   //  const Float_t kdEdXtoQ = ;
   const Float_t kRMSx = 12.0*kmicronTocm; // microns->cm ITS TDR Table 1.3
@@ -132,6 +130,7 @@ void AliITSsimulationFastPointsV0::AddSPD(Float_t &e,
 //_______________________________________________________________________
 void AliITSsimulationFastPointsV0::AddSDD(Float_t &e,
                                         AliITSmodule *mod,Int_t trackNumber){
+  //
 
   const Float_t kmicronTocm = 1.0e-4;
   const Float_t kdEdXtoQ = 2.778e+8; 
@@ -160,6 +159,7 @@ void AliITSsimulationFastPointsV0::AddSDD(Float_t &e,
 //_______________________________________________________________________
 void AliITSsimulationFastPointsV0::AddSSD(Float_t &e,
                                         AliITSmodule *mod,Int_t trackNumber){
+  // 
 
   const Float_t kmicronTocm = 1.0e-4;
   const Float_t kdEdXtoQ = 2.778e+8;

diff --git a/ITS/AliITSsimulationFastPointsV0.h b/ITS/AliITSsimulationFastPointsV0.h
index d82ec6c46a213e15b53ba93676886f5451297940..36f423b02e93597d65392a08ff808bf717317908 100644 (file)
--- a/ITS/AliITSsimulationFastPointsV0.h
+++ b/ITS/AliITSsimulationFastPointsV0.h
@@ -2,7 +2,9 @@
 #define ALIITSSIMULATIONFASTPOINTSV0_H
 
 #include "AliITSsimulation.h"
-
+/////////////////////////////////////////////////////////
+//  fast simulation V0
+/////////////////////////////////////////////////////////
 class AliITSmodule;
 class AliITSstatistics;
 class TRandom;
@@ -16,6 +18,9 @@ public:
   virtual ~AliITSsimulationFastPointsV0(); 
   void CreateFastRecPoints(AliITSmodule *mod,Int_t module,TRandom *rndm);
 private:
+  virtual AliITSsimulation& operator=(const AliITSsimulation &src);
+  AliITSsimulationFastPointsV0(const AliITSsimulationFastPointsV0 &);
+  AliITSsimulationFastPointsV0 & operator=(const AliITSsimulationFastPointsV0 &);
   void AddSPD(Float_t &e,AliITSmodule *mod,Int_t trackNumber);
   void AddSDD(Float_t &e,AliITSmodule *mod,Int_t trackNumber);
   void AddSSD(Float_t &e,AliITSmodule *mod,Int_t trackNumber);

diff --git a/ITS/AliITSsimulationSDD.cxx b/ITS/AliITSsimulationSDD.cxx
index 43c1d799611f9c9d30d66e34ddd5f16e86a1a8d8..bdb9306e289e5bb96b52bf6adcb6f2aa0da47e05 100644 (file)
--- a/ITS/AliITSsimulationSDD.cxx
+++ b/ITS/AliITSsimulationSDD.cxx
@@ -179,12 +179,21 @@ AliITSsimulationSDD::AliITSsimulationSDD(AliITSsimulationSDD &source) :
     // Copy constructor to satify Coding roules only.
 
     if(this==&source) return;
-    Error("AliITSsimulationSSD","Not allowed to make a copy of "
+    Error("AliITSsimulationSDD","Not allowed to make a copy of "
           "AliITSsimulationSDD Using default creater instead");
     AliITSsimulationSDD();
 }
 //______________________________________________________________________
-AliITSsimulationSDD& AliITSsimulationSDD::operator=(AliITSsimulationSDD &src){
+AliITSsimulationSDD& AliITSsimulationSDD::operator=(const AliITSsimulationSDD &src){
+    // Assignment operator to satify Coding roules only.
+
+    if(this==&src) return *this;
+    Error("AliITSsimulationSDD","Not allowed to make a = with "
+          "AliITSsimulationSDD Using default creater instead");
+    return *this ;
+}
+//______________________________________________________________________
+AliITSsimulationSDD& AliITSsimulationSDD::operator=(const AliITSsimulation &src){
     // Assignment operator to satify Coding roules only.
 
     if(this==&src) return *this;
@@ -192,6 +201,7 @@ AliITSsimulationSDD& AliITSsimulationSDD::operator=(AliITSsimulationSDD &src){
           "AliITSsimulationSDD Using default creater instead");
     return *this ;
 }
+
 //______________________________________________________________________
 AliITSsimulationSDD::AliITSsimulationSDD(AliITSsegmentation *seg,
                                          AliITSresponse *resp):
@@ -1640,7 +1650,7 @@ void AliITSsimulationSDD::WriteSDigits(){
     return;
 }
 //______________________________________________________________________
-void AliITSsimulationSDD::Print() {
+void AliITSsimulationSDD::PrintStatus() const {
     // Print SDD simulation Parameters
 
     cout << "**************************************************" << endl;

diff --git a/ITS/AliITSsimulationSDD.h b/ITS/AliITSsimulationSDD.h
index c751c285551c0779f152f0b882fae033e42d7734..f9d34fffefe92c05b8376f0e33e07682cb53e8e2 100644 (file)
--- a/ITS/AliITSsimulationSDD.h
+++ b/ITS/AliITSsimulationSDD.h
@@ -35,7 +35,8 @@ class AliITSsimulationSDD : public AliITSsimulation {
     AliITSsimulationSDD(AliITSsimulationSDD &source);
     virtual ~AliITSsimulationSDD(); // Destructor
     // = opporator
-    AliITSsimulationSDD& operator=(AliITSsimulationSDD &source);
+    AliITSsimulationSDD& operator=(const AliITSsimulationSDD &source);
+    virtual AliITSsimulationSDD& operator=(const AliITSsimulation &source);
     // Initilize variables for this simulation
     void Init();
 
@@ -148,7 +149,7 @@ class AliITSsimulationSDD : public AliITSsimulation {
     void SetDoFFT(Int_t doFFT=1) {fDoFFT=doFFT;}
 
     // Print SSD simulation Parameters
-    virtual void Print();
+    virtual void PrintStatus() const;
 
   private:
     // Variables and pointers for local use only. Not Streamed out.

diff --git a/ITS/AliITSsimulationSPD.cxx b/ITS/AliITSsimulationSPD.cxx
index e5795da733ac3be74a08b7000d333318e86c8bc0..106794ca97b9cd0236be9b3523619ddce5e80fc6 100644 (file)
--- a/ITS/AliITSsimulationSPD.cxx
+++ b/ITS/AliITSsimulationSPD.cxx
@@ -168,6 +168,24 @@ AliITSsimulationSPD& AliITSsimulationSPD::operator=(const AliITSsimulationSPD
     this->fHis      = source.fHis;
     return *this;
 } 
+//______________________________________________________________________
+AliITSsimulationSPD& AliITSsimulationSPD::operator=(const AliITSsimulation 
+                                                   &source) {
+    //    Assignment operator
+    // Inputs: 
+    //    none.
+    // Outputs:
+    //    none.
+    // Return:
+    //    A new AliITSsimulationSPD class with the same parameters as source.
+
+    if(&source == this) return *this;
+    Error("AliITSsimulationSPD","Not allowed to make a = with "
+          "AliITSsimulationSPD Using default creater instead");
+
+    return *this;
+} 
+
 //______________________________________________________________________
 void AliITSsimulationSPD::InitSimulationModule(Int_t module,Int_t event){
     // Creates maps to build the list of tracks for each sumable digit

diff --git a/ITS/AliITSsimulationSPD.h b/ITS/AliITSsimulationSPD.h
index 779ada9e437c7ebce5caa8941a06c1f4b177be37..e5ec447e4acb0e414580c5a2505c7ff4d712af5a 100644 (file)
--- a/ITS/AliITSsimulationSPD.h
+++ b/ITS/AliITSsimulationSPD.h
@@ -26,6 +26,7 @@ class AliITSsimulationSPD : public AliITSsimulation {
     AliITSsimulationSPD(const AliITSsimulationSPD &source); // copy constructo
     // assignment operator
     AliITSsimulationSPD& operator=(const AliITSsimulationSPD &source);
+    virtual AliITSsimulationSPD& operator=(const AliITSsimulation &source);
     // Initilizes the variables
     void Init();
     // Initilizes the variables with replacement segmentation/response class

diff --git a/ITS/AliITSsimulationSPDdubna.cxx b/ITS/AliITSsimulationSPDdubna.cxx
index 0e0e2e49b0bf96e39c4a12f4bb9b45187489e7f9..86e4d7d0b001c3e09e97a616e362e20561a2f297 100644 (file)
--- a/ITS/AliITSsimulationSPDdubna.cxx
+++ b/ITS/AliITSsimulationSPDdubna.cxx
@@ -159,6 +159,23 @@ AliITSsimulationSPDdubna&  AliITSsimulationSPDdubna::operator=(const
     return *this;
 }
 //______________________________________________________________________
+AliITSsimulationSPDdubna&  AliITSsimulationSPDdubna::operator=(const 
+                                           AliITSsimulation &s){
+    //    Assignment operator
+    // Inputs:
+    //    AliITSsimulationSPDdubna &s The original class for which
+    //                                this class is a copy of
+    // Outputs:
+    //    none.
+    // Return:
+
+    if(&s == this) return *this;
+    Error("AliITSsimulationSPDdubna","Not allowed to make a = with "
+          "AliITSsimulationSPDdubna","Using default creater instead");
+
+    return *this;
+}
+//______________________________________________________________________
 void AliITSsimulationSPDdubna::InitSimulationModule(Int_t module, Int_t event){
     //  This function creates maps to build the list of tracks for each
     //  summable digit. Inputs defined by base class.

diff --git a/ITS/AliITSsimulationSPDdubna.h b/ITS/AliITSsimulationSPDdubna.h
index b00b0ada24ebc8750330da8ff24657dc60565c4c..d802e53fd8a59c3548def271db81e25871f6c432 100644 (file)
--- a/ITS/AliITSsimulationSPDdubna.h
+++ b/ITS/AliITSsimulationSPDdubna.h
@@ -25,6 +25,7 @@ class AliITSsimulationSPDdubna : public AliITSsimulation {
     AliITSsimulationSPDdubna(const AliITSsimulationSPDdubna &source); 
      // ass. operator
     AliITSsimulationSPDdubna& operator=(const AliITSsimulationSPDdubna &s);
+    virtual AliITSsimulationSPDdubna& operator=(const AliITSsimulation &source);
     // Initilizes the variables
     void Init();
 

diff --git a/ITS/AliITSsimulationSSD.cxx b/ITS/AliITSsimulationSSD.cxx
index f318b65ca8f8e0aaae9bde2040e748578faaa7ad..b38fcce28890e705f740a49494bfc588003a618e 100644 (file)
--- a/ITS/AliITSsimulationSSD.cxx
+++ b/ITS/AliITSsimulationSSD.cxx
@@ -120,6 +120,17 @@ AliITSsimulationSSD& AliITSsimulationSSD::operator=(
   return *this;
 }
 //______________________________________________________________________
+AliITSsimulationSSD& AliITSsimulationSSD::operator=(
+                                         const AliITSsimulation &s){
+  // Operator =
+
+  if(this==&s) return *this;
+  Error("AliITSsimulationSSD","Not allowed to make a = with "
+       "AliITSsimulationSSD Using default creater instead");
+  
+  return *this;
+}
+//______________________________________________________________________
 AliITSsimulationSSD::AliITSsimulationSSD(const AliITSsimulationSSD &source):
     AliITSsimulation(source){
   // copy constructor

diff --git a/ITS/AliITSsimulationSSD.h b/ITS/AliITSsimulationSSD.h
index 74c9ac237e2286a2bda73cda1e7c5059bac07aa9..8253696a4e4d813ffe8bdaf0ca0ffc6add79f902 100644 (file)
--- a/ITS/AliITSsimulationSSD.h
+++ b/ITS/AliITSsimulationSSD.h
@@ -22,6 +22,7 @@ class AliITSsimulationSSD: public AliITSsimulation {
     AliITSsimulationSSD(const AliITSsimulationSSD &source); // copy constructor
     // operator =
     AliITSsimulationSSD& operator=(const AliITSsimulationSSD &source);
+    virtual AliITSsimulationSSD& operator=(const AliITSsimulation &source);
     //Standard Constructor
     AliITSsimulationSSD(AliITSsegmentation *seg,AliITSresponse *resp);
     //Destructor
@@ -65,6 +66,8 @@ class AliITSsimulationSSD: public AliITSsimulation {
     void Print(ostream *os);
     // Standard ascii class read function
     void Read(istream *is);
+    virtual void Print(Option_t *option="") const {TObject::Print(option);}
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
 
  private:
     // Return the Response class

diff --git a/ITS/AliITSspdTestBeam.h b/ITS/AliITSspdTestBeam.h
index 9790550e6454d2b1dc564baac2168cca2a88cb73..bbbd992c62456c1dbbc1e52de13d8b538eed4377 100644 (file)
--- a/ITS/AliITSspdTestBeam.h
+++ b/ITS/AliITSspdTestBeam.h
@@ -32,6 +32,7 @@ public:
     virtual Int_t OpenInputFile(const Char_t *filename,Int_t start=0,
                                 Int_t end=-1);
     virtual Int_t Read(Int_t i=0);
+    virtual Int_t Read(const char *name) {return TObject::Read(name);}
     virtual Int_t Decode();
     virtual Int_t GetNumberOfPilots()const{return 3;}
 private:

diff --git a/ITS/AliITSvPPRcoarseasymm.cxx b/ITS/AliITSvPPRcoarseasymm.cxx
index 0224508717876c165690b1aaf6ba2dd9eb7fc811..e73c39905f094e5a0a7bbf46aaa0f5892984e90d 100644 (file)
--- a/ITS/AliITSvPPRcoarseasymm.cxx
+++ b/ITS/AliITSvPPRcoarseasymm.cxx
@@ -1123,7 +1123,7 @@ void AliITSvPPRcoarseasymm::Init(){
 }  
  
 //_____________________________________________________________________________
-void AliITSvPPRcoarseasymm::DrawModule(){
+void AliITSvPPRcoarseasymm::DrawModule() const {
 ////////////////////////////////////////////////////////////////////////
 //     Draw a shaded view of the FMD version 6.
 ////////////////////////////////////////////////////////////////////////

diff --git a/ITS/AliITSvPPRcoarseasymm.h b/ITS/AliITSvPPRcoarseasymm.h
index 5933de0d26a224731e44fa36b064194eee18068d..789b3367b21c3f004096eed055515baf51c55cd9 100644 (file)
--- a/ITS/AliITSvPPRcoarseasymm.h
+++ b/ITS/AliITSvPPRcoarseasymm.h
@@ -25,7 +25,7 @@ class AliITSvPPRcoarseasymm : public AliITS {
     virtual void   Init(); 
     virtual Int_t  IsVersion() const {// returns the ITS version number 
        return 6;}
-    virtual void   DrawModule();
+    virtual void   DrawModule() const;
     virtual void   StepManager();
     virtual void   SetRails(Int_t v=1){ 
         // Set flag for rails
@@ -39,9 +39,9 @@ class AliITSvPPRcoarseasymm : public AliITS {
     virtual Int_t GetSupportMaterial(){ 
         // Get material of the services supports 
         return fSuppMat;}                
-    virtual Int_t GetMajorVersion(){// return Major Version Number
+    virtual Int_t GetMajorVersion() const {// return Major Version Number
        return fMajorVersion;}
-    virtual Int_t GetMinorVersion(){// return Major Version Number
+    virtual Int_t GetMinorVersion() const {// return Major Version Number
        return fMinorVersion;}