More typos (Martin)

[u/mrichter/AliRoot.git] / ITS / AliITSmodule.cxx

diff --git a/ITS/AliITSmodule.cxx b/ITS/AliITSmodule.cxx
index db7a2ceb5b441aec02f3340db66c312cd398e29a..18ed2338a7214f18f29ae15a731d2220b01550d3 100644 (file)
--- a/ITS/AliITSmodule.cxx
+++ b/ITS/AliITSmodule.cxx
@@ -40,20 +40,24 @@ ClassImp(AliITSmodule)
 // Constructors and deconstructor
 //________________________________________________________________________
 //
-AliITSmodule::AliITSmodule() {
+AliITSmodule::AliITSmodule():
+fITS(0),
+fIndex(0),
+fHitsM(0),
+fTrackIndex(0),
+fHitIndex(0) {
     // constructor
 
-    fHitsM       = 0;
-    fTrackIndex  = 0;
-    fHitIndex    = 0;
-    fITS         = 0;
-
 }
 //_________________________________________________________________________
-AliITSmodule::AliITSmodule(Int_t index) {
+AliITSmodule::AliITSmodule(Int_t index):
+fITS(0),
+fIndex(index),
+fHitsM(0),
+fTrackIndex(0),
+fHitIndex(0) {
   // constructor
 
-    fIndex      = index;
     fHitsM      = new TObjArray();
     fTrackIndex = new TArrayI(16);
     fHitIndex   = new TArrayI(16);
@@ -74,22 +78,25 @@ AliITSmodule::~AliITSmodule() {
     fITS = 0; // We don't delete this pointer since it is just a copy.
 }
 //____________________________________________________________________________
-AliITSmodule::AliITSmodule(const AliITSmodule &source):TObject(source){
+AliITSmodule::AliITSmodule(const AliITSmodule &source):TObject(source),
+fITS(source.fITS),
+fIndex(source.fIndex),
+fHitsM(source.fHitsM),
+fTrackIndex(source.fTrackIndex),
+fHitIndex(source.fHitIndex){
 ////////////////////////////////////////////////////////////////////////
 //     Copy Constructor 
 ////////////////////////////////////////////////////////////////////////
-  Error("AliITSmodule","AliITSmodule class has not to be copied! Exit.");
-  exit(1);
+
 }
 //_____________________________________________________________________________
 AliITSmodule& AliITSmodule::operator=(const AliITSmodule &source){
 ////////////////////////////////////////////////////////////////////////
 //    Assignment operator 
 ////////////////////////////////////////////////////////////////////////
-    if(&source == this) return *this;
-    Error("AliITSmodule","AliITSmodule class has not to be copied! Exit.");
-    exit(1);
-    return *this; // fake return neded on Sun
+  this->~AliITSmodule();
+  new(this) AliITSmodule(source);
+  return *this;
 }
 //_________________________________________________________________________
 // 
@@ -112,14 +119,13 @@ Int_t AliITSmodule::AddHit(AliITShit* hit,Int_t t,Int_t h) {
     return fNhitsM;
 }
 //___________________________________________________________________________
-Double_t AliITSmodule::PathLength(Int_t index,AliITShit *itsHit1,
+Double_t AliITSmodule::PathLength(AliITShit *itsHit1,
                                  AliITShit *itsHit2) {
   // path lenght
    Float_t  x1g,y1g,z1g;   
    Float_t  x2g,y2g,z2g;
    Double_t s;
 
-   index = 0;
    itsHit1->GetPositionG(x1g,y1g,z1g);
    itsHit2->GetPositionG(x2g,y2g,z2g);
 
@@ -129,8 +135,7 @@ Double_t AliITSmodule::PathLength(Int_t index,AliITShit *itsHit1,
    return s;
 }
 //___________________________________________________________________________
-void AliITSmodule::PathLength(Int_t index,
-                             Float_t x,Float_t y,Float_t z,
+void AliITSmodule::PathLength(Float_t x,Float_t y,Float_t z,
                              Int_t status,Int_t &nseg,
                              Float_t &x1,Float_t &y1,Float_t &z1,
                              Float_t &dx1,Float_t &dy1,Float_t &dz1,
@@ -138,7 +143,6 @@ void AliITSmodule::PathLength(Int_t index,
   // path length
     static Float_t x0,y0,z0;
 
-    index = 0;
     if ((status&0x0002)!=0){ // entering
        x0 = x;
        y0 = y;