X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSdigit.cxx;h=1689dc8367ab87947f6ee7bdcef32f09531a6bc9;hb=264b1bb9c6010786c7d61fdcb4593167ee1bbe2c;hp=53d56cbb3cc3aa58f39799b0d8c7c54963924364;hpb=f8dece8df1f1d1be3821ef14c00555d0da7bed3c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSdigit.cxx b/ITS/AliITSdigit.cxx
index 53d56cbb3cc..1689dc8367a 100644
--- a/ITS/AliITSdigit.cxx
+++ b/ITS/AliITSdigit.cxx
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 2004-2006, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *
@@ -12,270 +12,67 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
+
 /* $Id$ */
 
 ////////////////////////////////////////////////
 //  Digits classes for all ITS detectors      //
+//                                            //
+//                                            //
 ////////////////////////////////////////////////
-#include "AliITSdigit.h"
-
-//______________________________________________________________________
-ClassImp(AliITSdigit)
-AliITSdigit::AliITSdigit(const Int_t *digits) {
-  // Creates a real data digit object
-
-  fCoord1       = digits[0];
-  fCoord2       = digits[1];
-  fSignal       = digits[2];
-}
-//______________________________________________________________________
-void AliITSdigit::Print(ostream *os){
-    //Standard output format for this class
-
-    *os << fCoord1 <<","<< fCoord2 <<","<< fSignal;
-}
-//______________________________________________________________________
-void AliITSdigit::Read(istream *os){
-    //Standard input for this class
-
-    *os >> fCoord1 >> fCoord2 >> fSignal;
-}
-//______________________________________________________________________
-ostream &operator<<(ostream &os,AliITSdigit &source){
-    // Standard output streaming function.
-
-    source.Print(&os);
-    return os;
-}
-//______________________________________________________________________
-istream &operator>>(istream &os,AliITSdigit &source){
-    // Standard output streaming function.
-
-    source.Read(&os);
-    return os;
-}
-//______________________________________________________________________
-ClassImp(AliITSdigitSPD)
-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.
-
-    fTracks[0] = fTracks[1] = fTracks[2] = -3;
-    fHits[0] = fHits[1] = fHits[2] = -1;
-}
-//______________________________________________________________________
-AliITSdigitSPD::AliITSdigitSPD(const Int_t *digits):AliITSdigit(digits){
-    // Creates a SPD digit object
-
-    fTracks[0] = fTracks[1] = fTracks[2] = -3;
-    fHits[0] = fHits[1] = fHits[2] = -1;
-}
-//______________________________________________________________________
-AliITSdigitSPD::AliITSdigitSPD(const Int_t *digits,const Int_t *tracks,
-			       const Int_t *hits): AliITSdigit(digits){
-    // Creates a simulated SPD digit object
-
-    for(Int_t i=0; i<3; i++) {
-	fTracks[i] = tracks[i];
-	fHits[i]   = hits[i];
-    } // end for i
-}
-//______________________________________________________________________
-void AliITSdigitSPD::Print(ostream *os){
-    //Standard output format for this class
-
-    AliITSdigit::Print(os);
-    *os <<","<< fTracks[0] <<","<< fTracks[1] <<","<< fTracks[2];
-    *os <<","<< fHits[0] <<","<< fHits[1] <<","<< fHits[2];
-}
-//______________________________________________________________________
-void AliITSdigitSPD::Read(istream *os){
-    //Standard input for this class
-
-    AliITSdigit::Read(os);
-    *os >> fTracks[0] >> fTracks[1] >> fTracks[2];
-    *os >> fHits[0] >> fHits[1] >> fHits[2];
-}
-//______________________________________________________________________
-ostream &operator<<(ostream &os,AliITSdigitSPD &source){
-    // Standard output streaming function.
-
-    source.Print(&os);
-    return os;
-}
-//______________________________________________________________________
-istream &operator>>(istream &os,AliITSdigitSPD &source){
-    // Standard output streaming function.
 
-    source.Read(&os);
-    return os;
-}
-//______________________________________________________________________
-ClassImp(AliITSdigitSDD)
-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.
-
-    fTracks[0] = fTracks[1] = fTracks[2] = -3;
-    fHits[0] = fHits[1] = fHits[2] = -1;
-    fPhysics = 0;
-    fTcharges[0] = fTcharges[1] = fTcharges[2] = 0;
-}
-//________________________________________________________________________
-AliITSdigitSDD::AliITSdigitSDD(Float_t phys,const Int_t *digits):
-    AliITSdigit(digits){
-    // Creates a simulated SDD digit object to be updated
+#include "AliITSdigit.h"
 
-    fPhysics = phys;
-}
-//_____________________________________________________________________________
-AliITSdigitSDD::AliITSdigitSDD(Float_t phys,const Int_t *digits,
-			       const Int_t *tracks,const Int_t *hits,
-			       const Float_t *charges):
-    AliITSdigit(digits){
-    // Creates a simulated SDD digit object
 
-    fPhysics = phys;
-    for(Int_t i=0; i<3; i++) {
-	fTcharges[i] = charges[i];
-	fTracks[i]   = tracks[i];
-	fHits[i]     = hits[i];
-    } // end for i
-}
 //______________________________________________________________________
-void AliITSdigitSDD::Print(ostream *os){
-    //Standard output format for this class
+ClassImp(AliITSdigit)
 
-    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];
+AliITSdigit::AliITSdigit():
+fCoord1(0),
+fCoord2(0),
+fSignal(0){
+  //default constructor. zero all values.
+  for(Int_t i=0;i<fgkSize;i++) fTracks[i] = 0;
+  for(Int_t i=0;i<fgkSize;i++) fHits[i]   = 0;
+  
 }
-//______________________________________________________________________
-void AliITSdigitSDD::Read(istream *os){
-    //Standard input for this class
 
-    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];
-}
-//______________________________________________________________________
-ostream &operator<<(ostream &os,AliITSdigitSDD &source){
-    // Standard output streaming function.
 
-    source.Print(&os);
-    return os;
-}
-//______________________________________________________________________
-istream &operator>>(istream &os,AliITSdigitSDD &source){
-    // Standard output streaming function.
+AliITSdigit::AliITSdigit(const Int_t *digits):
+fCoord1(digits[0]),
+fCoord2(digits[1]),
+fSignal(digits[2]){
+  // Creates a real data digit object
+  for(Int_t i=0;i<fgkSize;i++) fTracks[i] = 0;
+  for(Int_t i=0;i<fgkSize;i++) fHits[i]   = 0;
 
-    source.Read(&os);
-    return os;
-}
-//______________________________________________________________________
-ClassImp(AliITSTransientDigit)
-AliITSTransientDigit::AliITSTransientDigit(Float_t phys,const Int_t *digits): 
-    AliITSdigitSDD(phys,digits) {
-    // Creates a digit object in a list of digits to be updated
 
-    fTrackList   = new TObjArray;  
-}
-//__________________________________________________________________________
-AliITSTransientDigit::AliITSTransientDigit(const AliITSTransientDigit &source){
-    // Copy Constructor 
-    if(&source == this) return;
-    this->fTrackList = source.fTrackList;
-    return;
-}
-//_________________________________________________________________________
-AliITSTransientDigit& AliITSTransientDigit::operator=(
-    const AliITSTransientDigit &source) {
-    // Assignment operator
-    if(&source == this) return *this;
-    this->fTrackList = source.fTrackList;
-    return *this;
 }
 //______________________________________________________________________
-void AliITSTransientDigit::Print(ostream *os){
+void AliITSdigit::Print(ostream *os) {
     //Standard output format for this class
 
-    AliITSdigitSDD::Print(os);
+    *os << fCoord1 <<","<< fCoord2 <<","<< fSignal;
 }
 //______________________________________________________________________
-void AliITSTransientDigit::Read(istream *os){
+void AliITSdigit::Read(istream *os) {
     //Standard input for this class
 
-    AliITSdigitSDD::Read(os);
+    *os >> fCoord1 >> fCoord2 >> fSignal;
 }
 //______________________________________________________________________
-ostream &operator<<(ostream &os,AliITSTransientDigit &source){
+ostream &operator<<(ostream &os,AliITSdigit &source){
     // Standard output streaming function.
 
     source.Print(&os);
     return os;
 }
 //______________________________________________________________________
-istream &operator>>(istream &os,AliITSTransientDigit &source){
+istream &operator>>(istream &os,AliITSdigit &source){
     // Standard output streaming function.
 
     source.Read(&os);
     return os;
 }
-//______________________________________________________________________
-ClassImp(AliITSdigitSSD)
-AliITSdigitSSD::AliITSdigitSSD():AliITSdigit(){
-    // default constructor
-
-    fTracks[0] = fTracks[1] = fTracks[2] = -3;
-    fHits[0] = fHits[1] = fHits[2] = -1;
-}
-//__________________________________________________________________________
-AliITSdigitSSD::AliITSdigitSSD(const Int_t *digits):AliITSdigit(digits){
-    // Creates a real SSD digit object
-}
-//_____________________________________________________________________________
-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++) {
-	fTracks[i] = tracks[i];
-	fHits[i]   = hits[i];
-    } // end for i
-}
-//______________________________________________________________________
-void AliITSdigitSSD::Print(ostream *os){
-    //Standard output format for this class
-
-    AliITSdigit::Print(os);
-    *os <<","<< fTracks[0] <<","<< fTracks[1] <<","<< fTracks[2];
-    *os <<","<< fHits[0] <<","<< fHits[1] <<","<< fHits[2];
-}
-//______________________________________________________________________
-void AliITSdigitSSD::Read(istream *os){
-    //Standard input for this class
 
-    AliITSdigit::Read(os);
-    *os >> fTracks[0] >> fTracks[1] >> fTracks[2];
-    *os >> fHits[0] >> fHits[1] >> fHits[2];
-}
-//______________________________________________________________________
-ostream &operator<<(ostream &os,AliITSdigitSSD &source){
-    // Standard output streaming function.
-
-    source.Print(&os);
-    return os;
-}
-//______________________________________________________________________
-istream &operator>>(istream &os,AliITSdigitSSD &source){
-    // Standard output streaming function.
 
-    source.Read(&os);
-    return os;
-}