Transition to SDigits.

diff --git a/RICH/AliRICH.cxx b/RICH/AliRICH.cxx
index 73a0e47e75a00ae802ddcbc78e2d6a26767a8114..263077ca07065e001937690300a07d93646451d8 100644 (file)
--- a/RICH/AliRICH.cxx
+++ b/RICH/AliRICH.cxx
@@ -15,6 +15,9 @@
 
 /*
   $Log$
+  Revision 1.43  2001/02/23 17:19:06  jbarbosa
+  Corrected photocathode definition in BuildGeometry().
+
   Revision 1.42  2001/02/13 20:07:23  jbarbosa
   Parametrised definition of photcathode dimensions. New spacers. New data members in AliRICHHit to store particle momentum
   when entering the freon. Corrected calls to particle stack.
@@ -127,7 +130,7 @@
 #include "AliRICHSegmentationV0.h"
 #include "AliRICHHit.h"
 #include "AliRICHCerenkov.h"
-#include "AliRICHPadHit.h"
+#include "AliRICHSDigit.h"
 #include "AliRICHDigit.h"
 #include "AliRICHTransientDigit.h"
 #include "AliRICHRawCluster.h"
@@ -160,8 +163,8 @@ AliRICH::AliRICH()
 
     fIshunt     = 0;
     fHits       = 0;
-    fPadHits    = 0;
-    fNPadHits   = 0;
+    fSDigits    = 0;
+    fNSDigits   = 0;
     fNcerenkovs = 0;
     fDchambers  = 0;
     fRecHits1D = 0;
@@ -192,11 +195,11 @@ AliRICH::AliRICH(const char *name, const char *title)
     
     fHits       = new TClonesArray("AliRICHHit",1000  );
     gAlice->AddHitList(fHits);
-    fPadHits    = new TClonesArray("AliRICHPadHit",100000);
+    fSDigits    = new TClonesArray("AliRICHSDigit",100000);
     fCerenkovs  = new TClonesArray("AliRICHCerenkov",1000);
     gAlice->AddHitList(fCerenkovs);
     //gAlice->AddHitList(fHits);
-    fNPadHits   = 0;
+    fNSDigits   = 0;
     fNcerenkovs = 0;
     fIshunt     = 0;
     
@@ -258,7 +261,7 @@ AliRICH::~AliRICH()
 
     fIshunt  = 0;
     delete fHits;
-    delete fPadHits;
+    delete fSDigits;
     delete fCerenkovs;
     
     //PH Delete TObjArrays
@@ -329,15 +332,16 @@ void AliRICH::SDigits2Digits()
    if (nparticles > 0) Digitise(0,0);
 }
 //___________________________________________
-void AliRICH::AddPadHit(Int_t *clhits)
+void AliRICH::AddSDigit(Int_t *clhits)
 {
 
 //
 // Add a RICH pad hit to the list
 //
 
-    TClonesArray &lPadHits = *fPadHits;
-    new(lPadHits[fNPadHits++]) AliRICHPadHit(clhits);
+  //printf("fsdigits:%p, data: %d\n",fSDigits,clhits[2]);
+    TClonesArray &lSDigits = *fSDigits;
+    new(lSDigits[fNSDigits++]) AliRICHSDigit(clhits);
 } 
 //_____________________________________________________________________________
 void AliRICH::AddDigits(Int_t id, Int_t *tracks, Int_t *charges, Int_t *digits)
@@ -1640,19 +1644,28 @@ void AliRICH::MakeBranch(Option_t* option, char *file)
     char *cH = strstr(option,"H");
     char *cD = strstr(option,"D");
     char *cR = strstr(option,"R");
+    char *cS = strstr(option,"S");
 
     if (cH) {
       sprintf(branchname,"%sCerenkov",GetName());
       if (fCerenkovs   && gAlice->TreeH()) {
         gAlice->MakeBranchInTree(gAlice->TreeH(), 
                                  branchname, &fCerenkovs, kBufferSize, file) ;
-      }    
-      sprintf(branchname,"%sPadHits",GetName());
-      if (fPadHits   && gAlice->TreeH()) {
+      } 
+      sprintf(branchname,"%sSDigits",GetName());
+      if (fSDigits   && gAlice->TreeH()) {
         gAlice->MakeBranchInTree(gAlice->TreeH(), 
-                                 branchname, &fPadHits, kBufferSize, file) ;
+                                 branchname, &fSDigits, kBufferSize, file) ;
       }
-    }
+    }   
+      
+    /*if (cS) {  
+      sprintf(branchname,"%sSDigits",GetName());
+      if (fSDigits   && gAlice->TreeS()) {
+        gAlice->MakeBranchInTree(gAlice->TreeS(), 
+                                 branchname, &fSDigits, kBufferSize, file) ;
+      }
+    }*/
     
     if (cD) {
     //
@@ -1716,18 +1729,27 @@ void AliRICH::SetTreeAddress()
     TTree *treeH = gAlice->TreeH();
     TTree *treeD = gAlice->TreeD();
     TTree *treeR = gAlice->TreeR();
+    TTree *treeS = gAlice->TreeS();
     
     if (treeH) {
-       if (fPadHits) {
-           branch = treeH->GetBranch("RICHPadHits");
-           if (branch) branch->SetAddress(&fPadHits);
-       }
-       if (fCerenkovs) {
+      if (fCerenkovs) {
            branch = treeH->GetBranch("RICHCerenkov");
            if (branch) branch->SetAddress(&fCerenkovs);
        }
+      if (fSDigits) {
+       branch = treeH->GetBranch("RICHSDigits");
+       if (branch) branch->SetAddress(&fSDigits);
+      }
     }
     
+    /*if (treeS) {
+      if (fSDigits) {
+       branch = treeS->GetBranch("RICHSDigits");
+       if (branch) branch->SetAddress(&fSDigits);
+      }
+    }*/
+    
+    
     if (treeD) {
        for (int i=0; i<kNCH; i++) {
            sprintf(branchname,"%sDigits%d",GetName(),i+1);
@@ -1769,9 +1791,9 @@ void AliRICH::ResetHits()
 {
   // Reset number of clusters and the cluster array for this detector
     AliDetector::ResetHits();
-    fNPadHits   = 0;
+    fNSDigits   = 0;
     fNcerenkovs = 0;
-    if (fPadHits)  fPadHits->Clear();
+    if (fSDigits)  fSDigits->Clear();
     if (fCerenkovs) fCerenkovs->Clear();
 }
 
@@ -2140,7 +2162,7 @@ void AliRICH::StepManager()
                    ckovData[3] = pos[2];                 // Z-position for hit
                    ckovData[4] = theta;                      // theta angle of incidence
                    ckovData[5] = phi;                      // phi angle of incidence 
-                   ckovData[8] = (Float_t) fNPadHits;      // first padhit
+                   ckovData[8] = (Float_t) fNSDigits;      // first sdigit
                    ckovData[9] = -1;                       // last pad hit
                    ckovData[13] = 4;                       // photon was detected
                    ckovData[14] = mom[0];
@@ -2152,11 +2174,11 @@ void AliRICH::StepManager()
                    cherenkovLoss  += destep;
                    ckovData[7]=cherenkovLoss;
                    
-                   nPads = MakePadHits(localPos[0],localPos[2],cherenkovLoss,idvol,kCerenkov);
+                   nPads = Hits2SDigits(localPos[0],localPos[2],cherenkovLoss,idvol,kCerenkov);
                                    
-                   if (fNPadHits > (Int_t)ckovData[8]) {
+                   if (fNSDigits > (Int_t)ckovData[8]) {
                        ckovData[8]= ckovData[8]+1;
-                       ckovData[9]= (Float_t) fNPadHits;
+                       ckovData[9]= (Float_t) fNSDigits;
                    }
 
                    //printf("Cerenkov loss: %f\n", cherenkovLoss);
@@ -2277,7 +2299,7 @@ void AliRICH::StepManager()
                hits[3] = localPos[2];                 // Z-position for hit
                hits[4] = localTheta;                  // theta angle of incidence
                hits[5] = localPhi;                    // phi angle of incidence 
-               hits[8] = (Float_t) fNPadHits;    // first padhit
+               hits[8] = (Float_t) fNSDigits;    // first sdigit
                hits[9] = -1;                     // last pad hit
                hits[13] = fFreonProd;           // did id hit the freon?
                hits[14] = mom[0];
@@ -2320,7 +2342,7 @@ void AliRICH::StepManager()
                    {
                      if(gMC->TrackPid() == kNeutron)
                        printf("\n\n\n\n\n Neutron Making Pad Hit!!! \n\n\n\n");
-                     nPads = MakePadHits(xhit,yhit,eloss,idvol,kMip);
+                     nPads = Hits2SDigits(xhit,yhit,eloss,idvol,kMip);
                      hits[17] = nPads;
                      //printf("nPads:%d",nPads);
                    }
@@ -2328,9 +2350,9 @@ void AliRICH::StepManager()
                
                hits[6]=tlength;
                hits[7]=eloss;
-               if (fNPadHits > (Int_t)hits[8]) {
+               if (fNSDigits > (Int_t)hits[8]) {
                    hits[8]= hits[8]+1;
-                   hits[9]= (Float_t) fNPadHits;
+                   hits[9]= (Float_t) fNSDigits;
                }
                
                //if(sector !=-1)
@@ -2350,7 +2372,7 @@ void AliRICH::StepManager()
                  {
                    if(gMC->TrackPid() == kNeutron)
                      printf("\n\n\n\n\n Neutron Making Pad Hit!!! \n\n\n\n");
-                   nPads = MakePadHits(xhit,yhit,eloss,idvol,kMip);
+                   nPads = Hits2SDigits(xhit,yhit,eloss,idvol,kMip);
                    hits[17] = nPads;
                    //printf("Npads:%d",NPads);
                  }
@@ -2378,7 +2400,7 @@ void AliRICH::FindClusters(Int_t nev,Int_t lastEntry)
 //
     for (Int_t icat=1;icat<2;icat++) {
        gAlice->ResetDigits();
-       gAlice->TreeD()->GetEvent(0);
+       gAlice->TreeD()->GetEvent(1);
        for (Int_t ich=0;ich<kNCH;ich++) {
          AliRICHChamber* iChamber=(AliRICHChamber*) (*fChambers)[ich];
          TClonesArray *pRICHdigits  = this->DigitsAddress(ich);
@@ -2423,31 +2445,31 @@ void AliRICH::FindClusters(Int_t nev,Int_t lastEntry)
     //gObjectTable->Print();
 }
 
-AliRICHPadHit* AliRICH::FirstPad(AliRICHHit*  hit,TClonesArray *clusters ) 
+AliRICHSDigit* AliRICH::FirstPad(AliRICHHit*  hit,TClonesArray *clusters ) 
 {
 //
     // Initialise the pad iterator
-    // Return the address of the first padhit for hit
+    // Return the address of the first sdigit for hit
     TClonesArray *theClusters = clusters;
     Int_t nclust = theClusters->GetEntriesFast();
     if (nclust && hit->fPHlast > 0) {
        sMaxIterPad=Int_t(hit->fPHlast);
        sCurIterPad=Int_t(hit->fPHfirst);
-       return (AliRICHPadHit*) clusters->UncheckedAt(sCurIterPad-1);
+       return (AliRICHSDigit*) clusters->UncheckedAt(sCurIterPad-1);
     } else {
        return 0;
     }
     
 }
 
-AliRICHPadHit* AliRICH::NextPad(TClonesArray *clusters) 
+AliRICHSDigit* AliRICH::NextPad(TClonesArray *clusters) 
 {
 
   // Iterates over pads
   
     sCurIterPad++;
     if (sCurIterPad <= sMaxIterPad) {
-       return (AliRICHPadHit*) clusters->UncheckedAt(sCurIterPad-1);
+       return (AliRICHSDigit*) clusters->UncheckedAt(sCurIterPad-1);
     } else {
        return 0;
     }
@@ -2490,7 +2512,7 @@ void AliRICH::Digitise(Int_t nev, Int_t flag, Option_t *option,Text_t *filename)
            pFile=new TFile(fFileName);
            cout<<"I have opened "<<fFileName<<" file "<<endl;
            fHits2     = new TClonesArray("AliRICHHit",1000  );
-           fClusters2 = new TClonesArray("AliRICHPadHit",10000);
+           fClusters2 = new TClonesArray("AliRICHSDigit",10000);
            first=kFALSE;
        }
        pFile->cd();
@@ -2598,10 +2620,10 @@ void AliRICH::Digitise(Int_t nev, Int_t flag, Option_t *option,Text_t *filename)
              
              //
              // Loop over pad hits
-             for (AliRICHPadHit* mPad=
-                    (AliRICHPadHit*)pRICH->FirstPad(mHit,fPadHits);
+             for (AliRICHSDigit* mPad=
+                    (AliRICHSDigit*)pRICH->FirstPad(mHit,fSDigits);
                   mPad;
-                  mPad=(AliRICHPadHit*)pRICH->NextPad(fPadHits))
+                  mPad=(AliRICHSDigit*)pRICH->NextPad(fSDigits))
                {
                  Int_t ipx      = mPad->fPadX;       // pad number on X
                  Int_t ipy      = mPad->fPadY;       // pad number on Y
@@ -2696,10 +2718,10 @@ void AliRICH::Digitise(Int_t nev, Int_t flag, Option_t *option,Text_t *filename)
            Int_t rmax = (Int_t)iChamber->ROuter();
            //
            // Loop over pad hits
-           for (AliRICHPadHit* mPad=
-                  (AliRICHPadHit*)pRICH->FirstPad(mHit,fClusters2);
+           for (AliRICHSDigit* mPad=
+                  (AliRICHSDigit*)pRICH->FirstPad(mHit,fClusters2);
                 mPad;
-                mPad=(AliRICHPadHit*)pRICH->NextPad(fClusters2))
+                mPad=(AliRICHSDigit*)pRICH->NextPad(fClusters2))
              {
                Int_t ipx      = mPad->fPadX;       // pad number on X
                Int_t ipy      = mPad->fPadY;       // pad number on Y
@@ -2881,7 +2903,7 @@ AliRICH& AliRICH::operator=(const AliRICH& rhs)
     
 }
 
-Int_t AliRICH::MakePadHits(Float_t xhit,Float_t yhit,Float_t eloss, Int_t idvol, ResponseType res)
+Int_t AliRICH::Hits2SDigits(Float_t xhit,Float_t yhit,Float_t eloss, Int_t idvol, ResponseType res)
 {
 //
 //  Calls the charge disintegration method of the current chamber and adds
@@ -2915,7 +2937,7 @@ Int_t AliRICH::MakePadHits(Float_t xhit,Float_t yhit,Float_t eloss, Int_t idvol,
 
            //printf(" %d %d %d %d %d\n",  clhits[0],  clhits[1],  clhits[2],  clhits[3],  clhits[4]);
            
-           AddPadHit(clhits);
+           AddSDigit(clhits);
        }
     }
 return nnew;

diff --git a/RICH/AliRICH.h b/RICH/AliRICH.h
index ea4438eb9bc1c7cc6b5e4a5ff61a668cf88f9cb9..56fe633c91d61f7f4b02417f3987ec810db307f6 100644 (file)
--- a/RICH/AliRICH.h
+++ b/RICH/AliRICH.h
@@ -18,7 +18,7 @@ static const int kNCH=7;
 class TFile;
 
 class AliRICHHit;
-class AliRICHPadHit;
+class AliRICHSDigit;
 class AliRICHRawCluster;
 class AliRICHRecHit1D;
 class AliRICHRecHit3D;
@@ -39,7 +39,7 @@ class AliRICH : public  AliDetector {
     virtual       ~AliRICH();
     virtual void   AddHit(Int_t track, Int_t *vol, Float_t *hits);
     virtual void   AddCerenkov(Int_t track, Int_t *vol, Float_t *cerenkovs);
-    virtual void   AddPadHit(Int_t *clhits);
+    virtual void   AddSDigit(Int_t *clhits);
     virtual void   AddDigits(Int_t id, Int_t *tracks, Int_t *charges, Int_t *digits);
     virtual void   AddRawCluster(Int_t id, const AliRICHRawCluster& cluster);
     virtual void   AddRecHit1D(Int_t id, Float_t* rechit, Float_t* photons, Int_t* padsx, Int_t* padsy);
@@ -55,7 +55,7 @@ class AliRICH : public  AliDetector {
     Int_t          DistancetoPrimitive(Int_t px, Int_t py);
     virtual Int_t  IsVersion() const =0;
 //
-    TClonesArray  *PadHits() {return fPadHits;}
+    TClonesArray  *SDigits() {return fSDigits;}
     TClonesArray  *Cerenkovs() {return fCerenkovs;}
     virtual void   MakeBranch(Option_t *opt=" ", char *file=0);
     void           SetTreeAddress();
@@ -83,12 +83,12 @@ class AliRICH : public  AliDetector {
 // Get source debugging level
     Int_t GetDebugLevel() {return fDebugLevel;}
 // Response Simulation
-    virtual Int_t   MakePadHits(Float_t xhit,Float_t yhit,Float_t eloss,Int_t id, ResponseType res);
+    virtual Int_t   Hits2SDigits(Float_t xhit,Float_t yhit,Float_t eloss,Int_t id, ResponseType res);
 // Return reference to Chamber #id
     virtual AliRICHChamber& Chamber(Int_t id) {return *((AliRICHChamber *) (*fChambers)[id]);}
 // Retrieve pad hits for a given Hit
-    virtual AliRICHPadHit* FirstPad(AliRICHHit *hit, TClonesArray *clusters);
-    virtual AliRICHPadHit* NextPad(TClonesArray *clusters);
+    virtual AliRICHSDigit* FirstPad(AliRICHHit *hit, TClonesArray *clusters);
+    virtual AliRICHSDigit* NextPad(TClonesArray *clusters);
 // Return pointers to digits 
     TObjArray            *Dchambers() {return fDchambers;}
     Int_t                *Ndch() {return fNdch;}
@@ -109,9 +109,9 @@ class AliRICH : public  AliDetector {
     
  protected:
     TObjArray            *fChambers;           // List of Tracking Chambers
-    Int_t                 fNPadHits;           // Number of clusters
+    Int_t                 fNSDigits;           // Number of clusters
     Int_t                 fNcerenkovs;         // Number of cerenkovs
-    TClonesArray         *fPadHits;            // List of clusters
+    TClonesArray         *fSDigits;            // List of clusters
     TObjArray            *fDchambers;          // List of digits
     TClonesArray         *fCerenkovs;          // List of cerenkovs
     Int_t                 fNdch[kNCH];         // Number of digits

diff --git a/RICH/AliRICHClusterFinder.cxx b/RICH/AliRICHClusterFinder.cxx
index 1ef73c7581ead857b48f23c61d86b29351cc3b9b..521e9a082c356a73605d7f0a22b522b82a3c613a 100644 (file)
--- a/RICH/AliRICHClusterFinder.cxx
+++ b/RICH/AliRICHClusterFinder.cxx
@@ -15,6 +15,9 @@
 
 /*
   $Log$
+  Revision 1.9  2001/01/26 20:00:27  hristov
+  Major upgrade of AliRoot code
+
   Revision 1.8  2000/11/02 09:11:12  jbarbosa
   Removed AliRICHRecHit.h from include.
 
@@ -50,7 +53,7 @@
 #include "AliRICHHit.h"
 #include "AliRICHHitMapA1.h"
 #include "AliRICHCerenkov.h"
-#include "AliRICHPadHit.h"
+#include "AliRICHSDigit.h"
 #include "AliRICHDigit.h"
 #include "AliRICHRawCluster.h"
 

diff --git a/RICH/AliRICHDetect.cxx b/RICH/AliRICHDetect.cxx
index dadbc1255fc9703a501ba6bf5cb09942c7062584..8ff9229d5fbcbd60cb05575aa5e55d997f77f03b 100644 (file)
--- a/RICH/AliRICHDetect.cxx
+++ b/RICH/AliRICHDetect.cxx
@@ -15,6 +15,9 @@
 
 /*
   $Log$
+  Revision 1.10  2001/02/13 20:39:06  jbarbosa
+  Changes to make it work with new IO.
+
   Revision 1.9  2001/01/22 21:39:11  jbarbosa
   Several tune-ups
 
@@ -151,7 +154,7 @@ void AliRICHDetect::Detect()
     Int_t nhits = pHits->GetEntriesFast();
     if (nhits == 0) continue;
     Int_t nent=(Int_t)gAlice->TreeD()->GetEntries();
-    gAlice->TreeD()->GetEvent(0);
+    gAlice->TreeD()->GetEvent(1);
     AliRICHHit *mHit = 0;
     AliRICHDigit *points = 0;
     //Int_t npoints=0;

diff --git a/RICH/AliRICHDisplay.cxx b/RICH/AliRICHDisplay.cxx
index 2a3a33b36617c4e4c895c90724130f77b166bacb..38824b00cf7c74bb9b7a6d1e65cddc25a3abd91f 100644 (file)
--- a/RICH/AliRICHDisplay.cxx
+++ b/RICH/AliRICHDisplay.cxx
@@ -15,6 +15,9 @@
 
 /*
   $Log$
+  Revision 1.10  2001/02/13 20:18:48  jbarbosa
+  Corrected some more positioning of points. Changes in LoadDigits to accomodate the new IO.
+
   Revision 1.9  2000/11/01 15:33:11  jbarbosa
   Updated to handle both reconstruction algorithms.
 
@@ -88,7 +91,7 @@
 
 #include "AliRICHHit.h"
 #include "AliRICHCerenkov.h"
-#include "AliRICHPadHit.h"
+#include "AliRICHSDigit.h"
 #include "AliRICHDigit.h"
 #include "AliRICHRawCluster.h"
 #include "AliRICHRecHit1D.h"
@@ -952,7 +955,7 @@ void AliRICHDisplay::LoadDigits()
         printf ("Chamber:%d has adress:%p\n", ich, pRICHdigits );
         if (pRICHdigits == 0) continue;
         gAlice->ResetDigits();
-        gAlice->TreeD()->GetEvent(0);
+        gAlice->TreeD()->GetEvent(1);
         Int_t ndigits = pRICHdigits->GetEntriesFast();
         printf("ndigits:%d\n",ndigits);
         nAllDigits+=ndigits;
@@ -964,7 +967,7 @@ void AliRICHDisplay::LoadDigits()
         TClonesArray *pRICHdigits  = pRICH->DigitsAddress(ich);
         if (pRICHdigits == 0) continue;
         gAlice->ResetDigits();
-        gAlice->TreeD()->GetEvent(0);
+        gAlice->TreeD()->GetEvent(1);
         Int_t ndigits = pRICHdigits->GetEntriesFast();
         if (ndigits == 0) continue;
         iChamber = &(pRICH->Chamber(ich));

diff --git a/RICH/AliRICHPatRec.cxx b/RICH/AliRICHPatRec.cxx
index 8f844913b3197329fe21b4bd283248b5ad1b25e9..ddefab90e68ab80b80386e2cbd10e7118f6a5871 100644 (file)
--- a/RICH/AliRICHPatRec.cxx
+++ b/RICH/AliRICHPatRec.cxx
@@ -15,6 +15,9 @@
 
 /*
   $Log$
+  Revision 1.9  2001/02/13 20:38:48  jbarbosa
+  Changes to make it work with new IO.
+
   Revision 1.8  2000/11/01 15:37:18  jbarbosa
   Updated to use its own rec. point object.
 
@@ -43,7 +46,7 @@
 
 #include "AliRICHHit.h"
 #include "AliRICHCerenkov.h"
-#include "AliRICHPadHit.h"
+#include "AliRICHSDigit.h"
 #include "AliRICHDigit.h"
 #include "AliRICHRawCluster.h"
 #include "AliRICHRecHit1D.h"
@@ -119,7 +122,7 @@ void AliRICHPatRec::PatRec()
     segmentation=iChamber->GetSegmentationModel();
 
     nent=(Int_t)gAlice->TreeD()->GetEntries();
-    gAlice->TreeD()->GetEvent(0);
+    gAlice->TreeD()->GetEvent(1);
     TClonesArray *pDigitss = pRICH->DigitsAddress(ich);
     ndigits[ich] = pDigitss->GetEntriesFast();
     printf("Digits in chamber %d: %d\n",ich,ndigits[ich]);

diff --git a/RICH/AliRICHPoints.cxx b/RICH/AliRICHPoints.cxx
index 90cbd45e3f211a6e95043c0dfb7c23affd8ba883..ee7e08ed71f82e2a3e0bdb8702b64f27d8dc56f2 100644 (file)
--- a/RICH/AliRICHPoints.cxx
+++ b/RICH/AliRICHPoints.cxx
@@ -15,6 +15,9 @@
 
 /*
   $Log$
+  Revision 1.8  2001/01/26 20:00:27  hristov
+  Major upgrade of AliRoot code
+
   Revision 1.7  2000/11/02 09:10:57  jbarbosa
   Removed AliRICHRecHit.h from include.
 
@@ -65,7 +68,7 @@
 #include "AliRun.h"
 #include "AliRICHHit.h"
 #include "AliRICHCerenkov.h"
-#include "AliRICHPadHit.h"
+#include "AliRICHSDigit.h"
 #include "AliRICHDigit.h"
 #include "AliRICHRawCluster.h"
 

diff --git a/RICH/Makefile b/RICH/Makefile
index 0d20bcbdf4b43a93f8f7368b24ece4fa7a8dc0ee..dd648259fcda4207c0edc3e61b9f66a732bc8f7a 100644 (file)
--- a/RICH/Makefile
+++ b/RICH/Makefile
@@ -15,7 +15,7 @@ SRCS   = AliRICH.cxx AliRICHv0.cxx AliRICHv1.cxx AliRICHv2.cxx\
         AliRICHSegmentationV1.cxx AliRICHResponse.cxx AliRICHResponseV0.cxx \
         AliRICHClusterFinder.cxx AliRICHHitMapA1.cxx\
         AliRICHChamber.cxx AliRICHDetect.cxx AliRICHPatRec.cxx \
-         AliRICHHit.cxx AliRICHCerenkov.cxx AliRICHPadHit.cxx \
+         AliRICHHit.cxx AliRICHCerenkov.cxx AliRICHSDigit.cxx \
         AliRICHDigit.cxx AliRICHTransientDigit.cxx \
         AliRICHRawCluster.cxx AliRICHRecHit1D.cxx AliRICHRecHit3D.cxx AliRICHEllipse.cxx 
 

diff --git a/RICH/RICHLinkDef.h b/RICH/RICHLinkDef.h
index bf40a6bae20227c0e72f95fb8ff71c07c9a64f1b..f0f12d99102436466e705b71c739ca9874704725 100644 (file)
--- a/RICH/RICHLinkDef.h
+++ b/RICH/RICHLinkDef.h
@@ -8,9 +8,8 @@
 #pragma link C++ class  AliRICHv1+;
 #pragma link C++ class  AliRICHv2+;
 #pragma link C++ class  AliRICHHit+;
-//#pragma link C++ class  AliRICHPadHit+;
 #pragma link C++ class  AliRICHDigit+;
-#pragma link C++ class  AliRICHPadHit+;
+#pragma link C++ class  AliRICHSDigit+;
 #pragma link C++ class  AliRICHTransientDigit+;
 #pragma link C++ class  AliRICHRawCluster+;
 #pragma link C++ class  AliRICHRecHit1D+;