Removing obsolete macros

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

diff --git a/ITS/AliITSdigit.cxx b/ITS/AliITSdigit.cxx
index faea5353ba3262ee1c9a24edbd28c5ab0f322ab7..e4e7189d61eb7fee1378c6b550814a23555fe5d2 100644 (file)
--- a/ITS/AliITSdigit.cxx
+++ b/ITS/AliITSdigit.cxx
@@ -60,16 +60,18 @@ AliITSdigitSPD::AliITSdigitSPD():AliITSdigit(){
     // default constructor, zero coordinates and set array
     // elements to clearly unphysical values. A value of 0 may
     // be a valide track of hit number.
+    Int_t i;
 
-    fTracks[0] = fTracks[1] = fTracks[2] = -3;
-    fHits[0] = fHits[1] = fHits[2] = -1;
+    for(i=0;i<fkSspd;i++) fTracks[i]  = -3;
+    for(i=0;i<fkSspd;i++) fHits[i]    = -1;
 }
 //______________________________________________________________________
 AliITSdigitSPD::AliITSdigitSPD(const Int_t *digits){
     // Creates a SPD digit object
+    Int_t i;
 
-    fTracks[0] = fTracks[1] = fTracks[2] = -3;
-    fHits[0] = fHits[1] = fHits[2] = -1;
+    for(i=0;i<fkSspd;i++) fTracks[i]  = -3;
+    for(i=0;i<fkSspd;i++) fHits[i]    = -1;
     fCoord1       = digits[0];
     fCoord2       = digits[1];
     fSignal       = 1;
@@ -80,7 +82,7 @@ AliITSdigitSPD::AliITSdigitSPD(const Int_t *digits,const Int_t *tracks,
                               const Int_t *hits){
     // Creates a simulated SPD digit object
 
-    for(Int_t i=0; i<3; i++) {
+    for(Int_t i=0; i<fkSspd; i++) {
        fTracks[i] = tracks[i];
        fHits[i]   = hits[i];
     } // end for i
@@ -92,19 +94,22 @@ AliITSdigitSPD::AliITSdigitSPD(const Int_t *digits,const Int_t *tracks,
 //______________________________________________________________________
 void AliITSdigitSPD::Print(ostream *os){
     //Standard output format for this class
+    Int_t i;
 
     AliITSdigit::Print(os);
-    *os <<","<< fTracks[0] <<","<< fTracks[1] <<","<< fTracks[2];
-    *os <<","<< fHits[0] <<","<< fHits[1] <<","<< fHits[2];
+    for(i=0;i<fkSspd;i++) *os <<","<< fTracks[i];
+    for(i=0;i<fkSspd;i++) *os <<","<< fHits[i];
     *os << "," << fSignalSPD;
 }
 //______________________________________________________________________
 void AliITSdigitSPD::Read(istream *os){
     //Standard input for this class
+    Int_t i;
 
     AliITSdigit::Read(os);
-    *os >> fTracks[0] >> fTracks[1] >> fTracks[2];
-    *os >> fHits[0] >> fHits[1] >> fHits[2] >> fSignalSPD;
+    for(i=0;i<fkSspd;i++) *os >> fTracks[i];
+    for(i=0;i<fkSspd;i++) *os >> fHits[i];
+    *os >> fSignalSPD;
 }
 //______________________________________________________________________
 ostream &operator<<(ostream &os,AliITSdigitSPD &source){
@@ -126,11 +131,12 @@ AliITSdigitSDD::AliITSdigitSDD():AliITSdigit(){
     // default constructor, zero coordinates and set array
     // elements to clearly unphysical values. A value of 0 may
     // be a valide track of hit number.
+    Int_t i;
 
-    fTracks[0] = fTracks[1] = fTracks[2] = -3;
-    fHits[0] = fHits[1] = fHits[2] = -1;
+    for(i=0;i<fkSsdd;i++) fTracks[i] = -3;
+    for(i=0;i<fkSsdd;i++) fHits[i]   = -1;
     fPhysics = 0;
-    fTcharges[0] = fTcharges[1] = fTcharges[2] = 0;
+    for(i=0;i<fkSsdd;i++) fTcharges[i] = 0;
 }
 //________________________________________________________________________
 AliITSdigitSDD::AliITSdigitSDD(Float_t phys,const Int_t *digits):
@@ -147,7 +153,7 @@ AliITSdigitSDD::AliITSdigitSDD(Float_t phys,const Int_t *digits,
     // Creates a simulated SDD digit object
 
     fPhysics = phys;
-    for(Int_t i=0; i<3; i++) {
+    for(Int_t i=0; i<fkSsdd; i++) {
        fTcharges[i] = charges[i];
        fTracks[i]   = tracks[i];
        fHits[i]     = hits[i];
@@ -156,22 +162,24 @@ AliITSdigitSDD::AliITSdigitSDD(Float_t phys,const Int_t *digits,
 //______________________________________________________________________
 void AliITSdigitSDD::Print(ostream *os){
     //Standard output format for this class
+    Int_t i;
 
     AliITSdigit::Print(os);
     *os <<","<< fPhysics;
-    *os <<","<< fTcharges[0] <<","<< fTcharges[1] <<","<< fTcharges[2];
-    *os <<","<< fTracks[0] <<","<< fTracks[1] <<","<< fTracks[2];
-    *os <<","<< fHits[0] <<","<< fHits[1] <<","<< fHits[2];
+    for(i=0; i<fkSsdd; i++) *os <<","<< fTcharges[i];
+    for(i=0; i<fkSsdd; i++) *os <<","<< fTracks[i];
+    for(i=0; i<fkSsdd; i++) *os <<","<< fHits[i];
 }
 //______________________________________________________________________
 void AliITSdigitSDD::Read(istream *os){
     //Standard input for this class
+    Int_t i;
 
     AliITSdigit::Read(os);
     *os >>fPhysics;
-    *os >> fTcharges[0] >> fTcharges[1] >> fTcharges[2];
-    *os >> fTracks[0] >> fTracks[1] >> fTracks[2];
-    *os >> fHits[0] >> fHits[1] >> fHits[2];
+    for(i=0; i<fkSsdd; i++) *os >> fTcharges[i];
+    for(i=0; i<fkSsdd; i++) *os >> fTracks[i];
+    for(i=0; i<fkSsdd; i++) *os >> fHits[i];
 }
 //______________________________________________________________________
 ostream &operator<<(ostream &os,AliITSdigitSDD &source){
@@ -240,9 +248,10 @@ istream &operator>>(istream &os,AliITSTransientDigit &source){
 ClassImp(AliITSdigitSSD)
 AliITSdigitSSD::AliITSdigitSSD():AliITSdigit(){
     // default constructor
+    Int_t i;
 
-    fTracks[0] = fTracks[1] = fTracks[2] = -3;
-    fHits[0] = fHits[1] = fHits[2] = -1;
+    for(i=0; i<fkSssd; i++) fTracks[i] = -3;
+    for(i=0; i<fkSssd; i++) fHits[i] = -1;
 }
 //__________________________________________________________________________
 AliITSdigitSSD::AliITSdigitSSD(const Int_t *digits):AliITSdigit(digits){
@@ -253,7 +262,7 @@ AliITSdigitSSD::AliITSdigitSSD(const Int_t *digits,const Int_t *tracks,
                               const Int_t *hits):AliITSdigit(digits){
     // Creates a simulated SSD digit object
 
-    for(Int_t i=0; i<3; i++) {
+    for(Int_t i=0; i<fkSssd; i++) {
        fTracks[i] = tracks[i];
        fHits[i]   = hits[i];
     } // end for i
@@ -261,18 +270,20 @@ AliITSdigitSSD::AliITSdigitSSD(const Int_t *digits,const Int_t *tracks,
 //______________________________________________________________________
 void AliITSdigitSSD::Print(ostream *os){
     //Standard output format for this class
+    Int_t i;
 
     AliITSdigit::Print(os);
-    *os <<","<< fTracks[0] <<","<< fTracks[1] <<","<< fTracks[2];
-    *os <<","<< fHits[0] <<","<< fHits[1] <<","<< fHits[2];
+    for(i=0; i<fkSssd; i++) *os <<","<< fTracks[i];
+    for(i=0; i<fkSssd; i++) *os <<","<< fHits[i];
 }
 //______________________________________________________________________
 void AliITSdigitSSD::Read(istream *os){
     //Standard input for this class
+    Int_t i;
 
     AliITSdigit::Read(os);
-    *os >> fTracks[0] >> fTracks[1] >> fTracks[2];
-    *os >> fHits[0] >> fHits[1] >> fHits[2];
+    for(i=0; i<fkSssd; i++) *os >> fTracks[i];
+    for(i=0; i<fkSssd; i++) *os >> fHits[i];
 }
 //______________________________________________________________________
 ostream &operator<<(ostream &os,AliITSdigitSSD &source){