X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSdigitSDD.cxx;h=f77196e881d210e4026cfa1acd32e5fe267bbad1;hb=cfaccd7133e59687985aa3c1178220027e3094e8;hp=3d357bd512e2f3023594eceea5a83361fee64c9b;hpb=7d62fb642e8e534a0745ecf2706ee54afa6ffa5c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSdigitSDD.cxx b/ITS/AliITSdigitSDD.cxx
index 3d357bd512e..f77196e881d 100644
--- a/ITS/AliITSdigitSDD.cxx
+++ b/ITS/AliITSdigitSDD.cxx
@@ -14,6 +14,7 @@
  **************************************************************************/
 
 #include <AliITSdigitSDD.h>
+#include <AliITSCalibrationSDD.h>
 #include <AliITSresponseSDD.h>
 #include <TArrayI.h>
 #include <TArrayF.h>
@@ -30,25 +31,30 @@ ClassImp(AliITSdigitSDD)
 
 
 //______________________________________________________________________
-AliITSdigitSDD::AliITSdigitSDD():AliITSdigit(){
+AliITSdigitSDD::AliITSdigitSDD():AliITSdigit(),
+fPhysics(0),
+fSignalExpanded(0){
     // 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;
 
-    for(i=0;i<fgkSsdd;i++) fTracks[i] = -3;
-    for(i=0;i<fgkSsdd;i++) fHits[i]   = -1;
-    fPhysics = 0;
-    for(i=0;i<fgkSsdd;i++) fTcharges[i] = 0;
+    for(i=0;i<fgkSize;i++) fTracks[i] = -3;
+    for(i=0;i<fgkSize;i++) fHits[i]   = -1;
+    for(i=0;i<fgkSize;i++) fTcharges[i] = 0;
     SetSignalExpanded(-1000);
 }
 //________________________________________________________________________
-AliITSdigitSDD::AliITSdigitSDD(Float_t phys,const Int_t *digits): AliITSdigit(digits){
+AliITSdigitSDD::AliITSdigitSDD(Float_t phys,const Int_t *digits): AliITSdigit(digits),
+fPhysics(phys),
+fSignalExpanded(0){
  
    // Creates a simulated SDD digit object to be updated
-
-    fPhysics = phys;
-    SetSignalExpanded(-1000);
+  for(Int_t i=0;i<fgkSize;i++) fTracks[i] = -3;
+  for(Int_t i=0;i<fgkSize;i++) fHits[i]   = -1;
+  for(Int_t i=0;i<fgkSize;i++) fTcharges[i] = 0;
+  
+  SetSignalExpanded(-1000);
 }
 
 //________________________________________________________________________
@@ -57,7 +63,7 @@ void AliITSdigitSDD::InitObject(Float_t phys,const Int_t *tracks,
 
   // Protected function used by standard constructors
   fPhysics = phys;
-  for(Int_t i=0; i<fgkSsdd; i++) {
+  for(Int_t i=0; i<fgkSize; i++) {
     fTcharges[i] = charges[i];
     fTracks[i]   = tracks[i];
     fHits[i]     = hits[i];
@@ -67,7 +73,9 @@ void AliITSdigitSDD::InitObject(Float_t phys,const Int_t *tracks,
 //_____________________________________________________________________________
 AliITSdigitSDD::AliITSdigitSDD(Float_t phys,const Int_t *digits,
 			       const Int_t *tracks,const Int_t *hits,
-			       const Float_t *charges):AliITSdigit(digits){
+			       const Float_t *charges):AliITSdigit(digits),
+fPhysics(0),
+fSignalExpanded(0){
 
 // standard constructor
   InitObject(phys,tracks,hits,charges);
@@ -75,7 +83,9 @@ AliITSdigitSDD::AliITSdigitSDD(Float_t phys,const Int_t *digits,
 }
 //_____________________________________________________________________________
 AliITSdigitSDD::AliITSdigitSDD( Float_t phys,const Int_t *digits,
-    const Int_t *tracks,const Int_t *hits,const Float_t *charges, Int_t sige): AliITSdigit(digits) {
+    const Int_t *tracks,const Int_t *hits,const Float_t *charges, Int_t sige): AliITSdigit(digits),
+fPhysics(0),
+fSignalExpanded(0){
 
   //constructor setting also fSignalExpanded
   InitObject(phys,tracks,hits,charges);
@@ -85,11 +95,14 @@ AliITSdigitSDD::AliITSdigitSDD( Float_t phys,const Int_t *digits,
 //_____________________________________________________________________________
 AliITSdigitSDD::AliITSdigitSDD( Float_t phys,const Int_t *digits,
     const Int_t *tracks,const Int_t *hits,const Float_t *charges,
-    AliITSresponseSDD* resp): AliITSdigit(digits) {
+    AliITSCalibrationSDD* resp): AliITSdigit(digits),
+fPhysics(0),
+fSignalExpanded(0){
 
-  //constructor setting fSignalExpanded through AliITSresponseSDD
+  //constructor setting fSignalExpanded through AliITSCalibrationSDD
   InitObject(phys,tracks,hits,charges);
-  SetSignalExpanded(resp->Convert8to10(digits[2]));
+  AliITSresponseSDD* pd = (AliITSresponseSDD*)resp->GetResponse();
+  SetSignalExpanded(pd->Convert8to10(digits[2]));
 }
 
 //______________________________________________________________________
@@ -167,9 +180,9 @@ void AliITSdigitSDD::Print(ostream *os){
 
     AliITSdigit::Print(os);
     *os <<","<< fPhysics;
-    for(i=0; i<fgkSsdd; i++) *os <<","<< fTcharges[i];
-    for(i=0; i<fgkSsdd; i++) *os <<","<< fTracks[i];
-    for(i=0; i<fgkSsdd; i++) *os <<","<< fHits[i];
+    for(i=0; i<fgkSize; i++) *os <<","<< fTcharges[i];
+    for(i=0; i<fgkSize; i++) *os <<","<< fTracks[i];
+    for(i=0; i<fgkSize; i++) *os <<","<< fHits[i];
     *os <<","<< fSignalExpanded;
 }
 //______________________________________________________________________
@@ -180,9 +193,9 @@ void AliITSdigitSDD::Read(istream *os){
 
     AliITSdigit::Read(os);
     *os >>fPhysics;
-    for(i=0; i<fgkSsdd; i++) *os >> fTcharges[i];
-    for(i=0; i<fgkSsdd; i++) *os >> fTracks[i];
-    for(i=0; i<fgkSsdd; i++) *os >> fHits[i];
+    for(i=0; i<fgkSize; i++) *os >> fTcharges[i];
+    for(i=0; i<fgkSize; i++) *os >> fTracks[i];
+    for(i=0; i<fgkSize; i++) *os >> fHits[i];
     *os >>fSignalExpanded;
 }
 //______________________________________________________________________