]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - RICH/AliRICH.cxx
Transition to NewIO
[u/mrichter/AliRoot.git] / RICH / AliRICH.cxx
index 9bda4c0bc86ae1271b89626b2753becc055c3afa..a7c880c5b5a021c00df90fbd442810af7e9207f4 100644 (file)
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-  $Log$
-  Revision 1.56  2001/11/02 15:37:25  hristov
-  Digitizer class created. Code cleaning and bug fixes (J.Chudoba)
-
-  Revision 1.55  2001/10/23 13:03:35  hristov
-  The access to several data members was changed from public to protected. The digitisation was adapted to the multi-event case (J.Chudoba)
-
-  Revision 1.54  2001/09/07 08:38:10  hristov
-  Pointers initialised to 0 in the default constructors
-
-  Revision 1.53  2001/08/30 09:51:23  hristov
-  The operator[] is replaced by At() or AddAt() in case of TObjArray.
-
-  Revision 1.52  2001/05/16 14:57:20  alibrary
-  New files for folders and Stack
-
-  Revision 1.51  2001/05/14 10:18:55  hristov
-  Default arguments declared once
-
-  Revision 1.50  2001/05/10 14:44:16  jbarbosa
-  Corrected some overlaps (thanks I. Hrivnacovna).
-
-  Revision 1.49  2001/05/10 12:23:49  jbarbosa
-  Repositioned the RICH modules.
-  Eliminated magic numbers.
-  Incorporated diagnostics (from macros).
-
-  Revision 1.48  2001/03/15 10:35:00  jbarbosa
-  Corrected bug in MakeBranch (was using a different version of STEER)
-
-  Revision 1.47  2001/03/14 18:13:56  jbarbosa
-  Several changes to adapt to new IO.
-  Removed digitising function, using AliRICHMerger::Digitise from now on.
-
-  Revision 1.46  2001/03/12 17:46:33  hristov
-  Changes needed on Sun with CC 5.0
-
-  Revision 1.45  2001/02/27 22:11:46  jbarbosa
-  Testing TreeS, removing of output.
-
-  Revision 1.44  2001/02/27 15:19:12  jbarbosa
-  Transition to SDigits.
-
-  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.
-
-  Revision 1.41  2001/01/26 20:00:20  hristov
-  Major upgrade of AliRoot code
-
-  Revision 1.40  2001/01/24 20:58:03  jbarbosa
-  Enhanced BuildGeometry. Now the photocathodes are drawn.
-
-  Revision 1.39  2001/01/22 21:40:24  jbarbosa
-  Removing magic numbers
-
-  Revision 1.37  2000/12/20 14:07:25  jbarbosa
-  Removed dependencies on TGeant3 (thanks to F. Carminati and I. Hrivnacova)
-
-  Revision 1.36  2000/12/18 17:45:54  jbarbosa
-  Cleaned up PadHits object.
-
-  Revision 1.35  2000/12/15 16:49:40  jbarbosa
-  Geometry and materials updates (wire supports, pcbs, backplane supports, frame).
-
-  Revision 1.34  2000/11/10 18:12:12  jbarbosa
-  Bug fix for AliRICHCerenkov (thanks to P. Hristov)
-
-  Revision 1.33  2000/11/02 10:09:01  jbarbosa
-  Minor bug correction (some pointers were not initialised in the default constructor)
-
-  Revision 1.32  2000/11/01 15:32:55  jbarbosa
-  Updated to handle both reconstruction algorithms.
-
-  Revision 1.31  2000/10/26 20:18:33  jbarbosa
-  Supports for methane and freon vessels
-
-  Revision 1.30  2000/10/24 13:19:12  jbarbosa
-  Geometry updates.
-
-  Revision 1.29  2000/10/19 19:39:25  jbarbosa
-  Some more changes to geometry. Further correction of digitisation "per part. type"
-
-  Revision 1.28  2000/10/17 20:50:57  jbarbosa
-  Inversed digtise by particle type (now, only the selected particle type is not digitsed).
-  Corrected several geometry minor bugs.
-  Added new parameter (opaque quartz thickness).
-
-  Revision 1.27  2000/10/11 10:33:55  jbarbosa
-  Corrected bug introduced by earlier revisions  (CerenkovData array cannot be reset to zero on wach call of StepManager)
-
-  Revision 1.26  2000/10/03 21:44:08  morsch
-  Use AliSegmentation and AliHit abstract base classes.
-
-  Revision 1.25  2000/10/02 21:28:12  fca
-  Removal of useless dependecies via forward declarations
-
-  Revision 1.24  2000/10/02 15:43:17  jbarbosa
-  Fixed forward declarations.
-  Fixed honeycomb density.
-  Fixed cerenkov storing.
-  New electronics.
-
-  Revision 1.23  2000/09/13 10:42:14  hristov
-  Minor corrections for HP, DEC and Sun; strings.h included
-
-  Revision 1.22  2000/09/12 18:11:13  fca
-  zero hits area before using
-
-  Revision 1.21  2000/07/21 10:21:07  morsch
-  fNrawch   = 0; and  fNrechits = 0; in the default constructor.
-
-  Revision 1.20  2000/07/10 15:28:39  fca
-  Correction of the inheritance scheme
-
-  Revision 1.19  2000/06/30 16:29:51  dibari
-  Added kDebugLevel variable to control output size on demand
-
-  Revision 1.18  2000/06/12 15:15:46  jbarbosa
-  Cleaned up version.
-
-  Revision 1.17  2000/06/09 14:58:37  jbarbosa
-  New digitisation per particle type
-
-  Revision 1.16  2000/04/19 12:55:43  morsch
-  Newly structured and updated version (JB, AM)
-
-*/
-
+/* $Id$ */
 
 ////////////////////////////////////////////////
 //  Manager and hits classes for set:RICH     //
 ////////////////////////////////////////////////
 
-#include <TBRIK.h>
-#include <TTUBE.h>
-#include <TNode.h> 
-#include <TRandom.h> 
-#include <TObject.h>
-#include <TVector.h>
-#include <TObjArray.h>
+#include <Riostream.h>
+#include <strings.h>
+
 #include <TArrayF.h>
+#include <TBRIK.h>
+#include <TCanvas.h>
+#include <TF1.h>
 #include <TFile.h>
-#include <TParticle.h>
 #include <TGeometry.h>
-#include <TTree.h>
 #include <TH1.h>
 #include <TH2.h>
-#include <TCanvas.h>
-//#include <TPad.h>
-#include <TF1.h>
-
-#include <iostream.h>
-#include <strings.h>
-
+#include <TNode.h> 
+#include <TObjArray.h>
+#include <TObject.h>
+#include <TParticle.h>
+#include <TPDGCode.h>
+#include <TRandom.h> 
+#include <TStyle.h>
+#include <TTUBE.h>
+#include <TTree.h>
+#include <TVector.h>
+#include "AliConst.h"
+#include "AliMagF.h"
+#include "AliPoints.h"
 #include "AliRICH.h"
-#include "AliSegmentation.h"
-#include "AliRICHSegmentationV0.h"
-#include "AliRICHHit.h"
 #include "AliRICHCerenkov.h"
-#include "AliRICHSDigit.h"
+#include "AliRICHClusterFinder.h"
 #include "AliRICHDigit.h"
-#include "AliRICHTransientDigit.h"
+#include "AliRICHDigitizer.h"
+#include "AliRICHHit.h"
+#include "AliRICHHitMapA1.h"
+#include "AliRICHMerger.h"
 #include "AliRICHRawCluster.h"
 #include "AliRICHRecHit1D.h"
 #include "AliRICHRecHit3D.h"
-#include "AliRICHHitMapA1.h"
-#include "AliRICHClusterFinder.h"
-#include "AliRICHMerger.h"
+#include "AliRICHSDigit.h"
+#include "AliRICHSegmentationV0.h"
+#include "AliRICHTransientDigit.h"
 #include "AliRun.h"
-#include "AliMC.h"
-#include "AliMagF.h"
-#include "AliConst.h"
-#include "AliPDG.h"
-#include "AliPoints.h"
-#include "AliCallf77.h" 
+#include "AliRunDigitizer.h"
+#include "AliSegmentation.h"
 
 
-// Static variables for the pad-hit iterator routines
-static Int_t sMaxIterPad=0;
+static Int_t sMaxIterPad=0;    // Static variables for the pad-hit iterator routines
 static Int_t sCurIterPad=0;
  
 ClassImp(AliRICH)
     
 //___________________________________________
+// RICH manager class   
+//Begin_Html
+/*
+  <img src="gif/alirich.gif">
+*/
+//End_Html
+
 AliRICH::AliRICH()
 {
-// Default constructor for RICH manager class
+// Default ctor should not contain any new operators
 
     fIshunt     = 0;
     fHits       = 0;
@@ -217,34 +90,28 @@ AliRICH::AliRICH()
     fRawClusters = 0;
     fChambers = 0;
     fCerenkovs  = 0;
-    for (Int_t i=0; i<7; i++)
-      {
+    for (Int_t i=0; i<7; i++){
        fNdch[i]       = 0;
-       fNrawch[i]   = 0;
+       fNrawch[i]     = 0;
        fNrechits1D[i] = 0;
        fNrechits3D[i] = 0;
-      }
+    }
 
     fFileName = 0;
     fMerger = 0;
-}
+}//AliRICH::AliRICH()
 
-//___________________________________________
 AliRICH::AliRICH(const char *name, const char *title)
     : AliDetector(name,title)
 {
-//Begin_Html
-/*
-  <img src="gif/alirich.gif">
-*/
-//End_Html
-    
+// Named ctor
+   cout<<ClassName()<<"::named ctor(sName,sTitle)>\n"; // no way to control it as ctor is called before call to SetDebugXXXX()
+          
     fHits       = new TClonesArray("AliRICHHit",1000  );
     gAlice->AddHitList(fHits);
     fSDigits    = new TClonesArray("AliRICHSDigit",100000);
     fCerenkovs  = new TClonesArray("AliRICHCerenkov",1000);
     gAlice->AddHitList(fCerenkovs);
-    //gAlice->AddHitList(fHits);
     fNSDigits   = 0;
     fNcerenkovs = 0;
     fIshunt     = 0;
@@ -260,8 +127,8 @@ AliRICH::AliRICH(const char *name, const char *title)
    
     for (i=0; i<kNCH ;i++) {
       //PH     (*fDchambers)[i] = new TClonesArray("AliRICHDigit",10000); 
-       fDchambers->AddAt(new TClonesArray("AliRICHDigit",10000), i); 
-       fNdch[i]=0;
+       fDchambers->AddAt(new TClonesArray("AliRICHDigit",10000), i); 
+       fNdch[i]=0;
     }
 
     //fNrawch      = new Int_t[kNCH];
@@ -300,15 +167,14 @@ AliRICH::AliRICH(const char *name, const char *title)
 
 AliRICH::AliRICH(const AliRICH& RICH)
 {
-// Copy Constructor
+// Copy ctor
 }
 
 
-//___________________________________________
 AliRICH::~AliRICH()
 {
-
-// Destructor of RICH manager class
+// Dtor of RICH manager class
+   if(IsDebugStart()) cout<<ClassName()<<"::default dtor()>\n";
 
     fIshunt  = 0;
     delete fHits;
@@ -343,20 +209,19 @@ AliRICH::~AliRICH()
 //_____________________________________________________________________________
 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
-//  the simulated cluster to the root treee 
-//
-    Int_t clhits[5];
-    Float_t newclust[4][500];
-    Int_t nnew;
+//  the simulated cluster to the root tree 
+   if(IsDebugHit()||IsDebugDigit()) cout<<ClassName()<<"::Hits2SDigits(...)>\n";
+   
+   Int_t clhits[5];
+   Float_t newclust[4][500];
+   Int_t nnew;
     
 //
 //  Integrated pulse height on chamber
     
     clhits[0]=fNhits+1;
 
-    //PH    ((AliRICHChamber*) (*fChambers)[idvol])->DisIntegration(eloss, xhit, yhit, nnew, newclust, res);
     ((AliRICHChamber*)fChambers->At(idvol))->DisIntegration(eloss, xhit, yhit, nnew, newclust, res);
     Int_t ic=0;
     
@@ -380,21 +245,21 @@ Int_t AliRICH::Hits2SDigits(Float_t xhit,Float_t yhit,Float_t eloss, Int_t idvol
        }
     }
     
-    if (gAlice->TreeS())
-      {
+   if (gAlice->TreeS()){
        gAlice->TreeS()->Fill();
        gAlice->TreeS()->Write(0,TObject::kOverwrite);
        //printf("Filled SDigits...\n");
-      }
+   }
     
-return nnew;
-}
-//___________________________________________
+   return nnew;
+}//Int_t AliRICH::Hits2SDigits(Float_t xhit,Float_t yhit,Float_t eloss, Int_t idvol, ResponseType res)
+
 void AliRICH::Hits2SDigits()
 {
-
 // Dummy: sdigits are created during transport.
-// Called from alirun.
+// Called from alirun.   
+   if(IsDebugHit()||IsDebugDigit()) cout<<ClassName()<<"::Hits2SDigits()>\n";
+
 
   int nparticles = gAlice->GetNtrack();
   cout << "Particles (RICH):" <<nparticles<<endl;
@@ -405,28 +270,35 @@ void AliRICH::Hits2SDigits()
 //___________________________________________
 void AliRICH::SDigits2Digits(Int_t nev, Int_t flag)
 {
-
-//
 // Generate digits.
-// Called from macro. Multiple events, more functionality.
+// Called from macro. Multiple events, more functionality.   
+   if(IsDebugDigit()) cout<<ClassName()<<"::SDigits2Digits()>\n";
 
-  AliRICHChamber*       iChamber;
+   //AliRICHChamber*       iChamber;
   
-  printf("Generating tresholds...\n");
+   //printf("Generating tresholds...\n");
   
-  for(Int_t i=0;i<7;i++) {
-    iChamber = &(Chamber(i));
-    iChamber->GenerateTresholds();
-  }
+   //for(Int_t i=0;i<7;i++) {
+   //iChamber = &(Chamber(i));
+   //iChamber->GenerateTresholds();
+   //}
   
-  int nparticles = gAlice->GetNtrack();
-  cout << "Particles (RICH):" <<nparticles<<endl;
-  if (nparticles <= 0) return;
-  if (!fMerger) {
-    fMerger = new AliRICHMerger();
-  }
-  fMerger->Init();
-  fMerger->Digitise(nev,flag);
+   //int nparticles = gAlice->GetNtrack();
+   //cout << "Particles (RICH):" <<nparticles<<endl;
+   //if (nparticles <= 0) return;
+   //if (!fMerger) {
+   //fMerger = new AliRICHMerger();
+   //}
+
+
+   //fMerger->Init();
+   //fMerger->Digitise(nev,flag);
+
+   AliRunDigitizer * manager = new AliRunDigitizer(1,1);
+   manager->SetInputStream(0,"galice.root");
+   //AliRICHDigitizer *dRICH  = new AliRICHDigitizer(manager);
+   manager->Exec("deb");
+
 }
 //___________________________________________
 void AliRICH::SDigits2Digits()
@@ -436,9 +308,10 @@ void AliRICH::SDigits2Digits()
 //___________________________________________
 void AliRICH::Digits2Reco()
 {
-
 // Generate clusters
-// Called from alirun, single event only.  
+// Called from alirun, single event only.     
+   if(IsDebugDigit()||IsDebugReco()) cout<<ClassName()<<"::Digits2Reco()>\n";
+
 
   int nparticles = gAlice->GetNtrack();
   cout << "Particles (RICH):" <<nparticles<<endl;
@@ -446,60 +319,49 @@ void AliRICH::Digits2Reco()
 
 }  
 
-//___________________________________________
 void AliRICH::AddHit(Int_t track, Int_t *vol, Float_t *hits)
 {
-
-//  
-// Adds a hit to the Hits list
+// Adds the current hit to the RICH hits list
+   if(IsDebugHit()) cout<<ClassName()<<"::AddHit(...)>\n";
 
     TClonesArray &lhits = *fHits;
     new(lhits[fNhits++]) AliRICHHit(fIshunt,track,vol,hits);
 }
-//_____________________________________________________________________________
+
 void AliRICH::AddCerenkov(Int_t track, Int_t *vol, Float_t *cerenkovs)
 {
-
-//
-// Adds a RICH cerenkov hit to the Cerenkov Hits list
-//
+// Adds a RICH cerenkov hit to the Cerenkov Hits list   
+   if(IsDebugHit()) cout<<ClassName()<<"::AddCerenkov()>\n";
 
     TClonesArray &lcerenkovs = *fCerenkovs;
     new(lcerenkovs[fNcerenkovs++]) AliRICHCerenkov(fIshunt,track,vol,cerenkovs);
-    //printf ("Done for Cerenkov %d\n\n\n\n",fNcerenkovs);
 }
-//___________________________________________
-void AliRICH::AddSDigit(Int_t *clhits)
-{
 
-//
-// Add a RICH pad hit to the list
-//
+void AliRICH::AddSDigit(Int_t *aSDigit)
+{
+// Adds the current S digit to the RICH list of S digits   
+   if(IsDebugDigit()) cout<<ClassName()<<"::AddSDigit()>\n";
 
-  //printf("fsdigits:%p, data: %d\n",fSDigits,clhits[2]);
   TClonesArray &lSDigits = *fSDigits;
-  new(lSDigits[fNSDigits++]) AliRICHSDigit(clhits);
+  new(lSDigits[fNSDigits++]) AliRICHSDigit(aSDigit);
 } 
-//_____________________________________________________________________________
+
+
 void AliRICH::AddDigits(Int_t id, Int_t *tracks, Int_t *charges, Int_t *digits)
 {
+// Add a RICH digit to the list   
+   if(IsDebugDigit()) cout<<ClassName()<<"::AddDigit()>\n";
 
-  //
-  // Add a RICH digit to the list
-  //
-
-  //printf("fdigits:%p, data: %d\n",((TClonesArray*)(*fDchambers)[id]),digits[0]);
-  //PH  TClonesArray &ldigits = *((TClonesArray*)(*fDchambers)[id]);
-  TClonesArray &ldigits = *((TClonesArray*)fDchambers->At(id));
-  new(ldigits[fNdch[id]++]) AliRICHDigit(tracks,charges,digits);
+   TClonesArray &ldigits = *((TClonesArray*)fDchambers->At(id));
+   new(ldigits[fNdch[id]++]) AliRICHDigit(tracks,charges,digits);
 }
 
-//_____________________________________________________________________________
 void AliRICH::AddRawCluster(Int_t id, const AliRICHRawCluster& c)
 {
-    //
-    // Add a RICH digit to the list
-    //
+// Add a RICH digit to the list
+   
+   if(IsDebugStart())
+      cout<<ClassName()<<"::AddRawCluster()>\n";
 
   //PH    TClonesArray &lrawcl = *((TClonesArray*)(*fRawClusters)[id]);
     TClonesArray &lrawcl = *((TClonesArray*)fRawClusters->At(id));
@@ -520,16 +382,12 @@ void AliRICH::AddRecHit1D(Int_t id, Float_t *rechit, Float_t *photons, Int_t *pa
 }
 
 //_____________________________________________________________________________
-void AliRICH::AddRecHit3D(Int_t id, Float_t *rechit)
+void AliRICH::AddRecHit3D(Int_t id, Float_t *rechit, Float_t omega, Float_t theta, Float_t phi)
 {
-  
-  //
-  // Add a RICH reconstructed hit to the list
-  //
+// Add a RICH reconstructed hit to the list
 
-  //PH    TClonesArray &lrec3D = *((TClonesArray*)(*fRecHits3D)[id]);
     TClonesArray &lrec3D = *((TClonesArray*)fRecHits3D->At(id));
-    new(lrec3D[fNrechits3D[id]++]) AliRICHRecHit3D(id,rechit);
+    new(lrec3D[fNrechits3D[id]++]) AliRICHRecHit3D(id,rechit,omega,theta,phi);
 }
 
 //___________________________________________
@@ -552,7 +410,7 @@ void AliRICH::BuildGeometry()
     AliRICHGeometry*  geometry;
  
     iChamber = &(pRICH->Chamber(0));
-    segmentation=(AliRICHSegmentationV0*) iChamber->GetSegmentationModel(0);
+    segmentation=(AliRICHSegmentationV0*) iChamber->GetSegmentationModel();
     geometry=iChamber->GetGeometryModel();
     
     new TBRIK("S_RICH","S_RICH","void",71.09999,11.5,73.15);
@@ -816,7 +674,7 @@ void AliRICH::CreateGeometry()
   AliRICHChamber*       iChamber;
 
   iChamber = &(pRICH->Chamber(0));
-  segmentation=(AliRICHSegmentationV0*) iChamber->GetSegmentationModel(0);
+  segmentation=(AliRICHSegmentationV0*) iChamber->GetSegmentationModel();
   geometry=iChamber->GetGeometryModel();
 
   Float_t distance;
@@ -1827,100 +1685,107 @@ Int_t AliRICH::DistancetoPrimitive(Int_t , Int_t )
 }
 
 //___________________________________________
-void AliRICH::MakeBranch(Option_t* option, const char *file)
+void AliRICH::MakeBranch(Option_t* option)
 {
   // Create Tree branches for the RICH.
     
   const Int_t kBufferSize = 4000;
   char branchname[20];
+ const Int_t kBufferSize = 4000;
+ char branchname[20];
       
-    AliDetector::MakeBranch(option,file);
    
-    const char *cH = strstr(option,"H");
-    const char *cD = strstr(option,"D");
-    const char *cR = strstr(option,"R");
-    const char *cS = strstr(option,"S");
-
-
-    if (cH) {
-      sprintf(branchname,"%sCerenkov",GetName());
-      if (fCerenkovs   && gAlice->TreeH()) {
-       //TBranch* branch = MakeBranchInTree(gAlice->TreeH(),branchname, &fCerenkovs, kBufferSize, file) ;
-       MakeBranchInTree(gAlice->TreeH(),branchname, &fCerenkovs, kBufferSize, file) ;
-       //branch->SetAutoDelete(kFALSE);
-      } 
-      sprintf(branchname,"%sSDigits",GetName());
-      if (fSDigits   && gAlice->TreeH()) {
-       //TBranch* branch = MakeBranchInTree(gAlice->TreeH(),branchname, &fSDigits, kBufferSize, file) ;
-       MakeBranchInTree(gAlice->TreeH(),branchname, &fSDigits, kBufferSize, file) ;
-       //branch->SetAutoDelete(kFALSE);
-       //printf("Making branch %sSDigits in TreeH\n",GetName());
-      }
-    }   
+ const char *cH = strstr(option,"H");
+ const char *cD = strstr(option,"D");
+ const char *cR = strstr(option,"R");
+ const char *cS = strstr(option,"S");
+
+
+
+ if (cH  && TreeH()) {
+  sprintf(branchname,"%sCerenkov",GetName());
+  if (fCerenkovs == 0x0) fCerenkovs  = new TClonesArray("AliRICHCerenkov",1000);
+  MakeBranchInTree(TreeH(),branchname, &fCerenkovs, kBufferSize, 0) ;
+
+  sprintf(branchname,"%sSDigits",GetName());
+  if (fSDigits == 0x0) fSDigits    = new TClonesArray("AliRICHSDigit",100000);
+  MakeBranchInTree(TreeH(),branchname, &fSDigits, kBufferSize, 0) ;
+    //branch->SetAutoDelete(kFALSE);
+    //printf("Making branch %sSDigits in TreeH\n",GetName());
+  if (fHits == 0x0) fHits       = new TClonesArray("AliRICHHit",1000  );
+
+  }   
+  //this is after cH because we need to guarantee that fHits array is created
+  AliDetector::MakeBranch(option);
       
-    if (cS) {  
-      sprintf(branchname,"%sSDigits",GetName());
-      if (fSDigits   && gAlice->TreeS()) {
-       //TBranch* branch = MakeBranchInTree(gAlice->TreeS(),branchname, &fSDigits, kBufferSize, file) ;
-       MakeBranchInTree(gAlice->TreeS(),branchname, &fSDigits, kBufferSize, file) ;
-       //branch->SetAutoDelete(kFALSE);
-       //printf("Making branch %sSDigits in TreeS\n",GetName());
-      }
-    }
-    
-    if (cD) {
+  if (cS && fLoader->TreeS()) {  
+    sprintf(branchname,"%sSDigits",GetName());
+    if (fSDigits == 0x0) fSDigits    = new TClonesArray("AliRICHSDigit",100000);
+    MakeBranchInTree(gAlice->TreeS(),branchname, &fSDigits, kBufferSize, 0) ;
+  }
+   
+ if (cD && fLoader->TreeD()) 
+   {
     //
     // one branch for digits per chamber
     //
-      Int_t i;
-    
-      for (i=0; i<kNCH ;i++) {
-       sprintf(branchname,"%sDigits%d",GetName(),i+1); 
-       if (fDchambers   && gAlice->TreeD()) {
-          //TBranch* branch = MakeBranchInTree(gAlice->TreeD(),branchname, &((*fDchambers)[i]), kBufferSize, file) ;
-         MakeBranchInTree(gAlice->TreeD(),branchname, &((*fDchambers)[i]), kBufferSize, file) ;
-          //branch->SetAutoDelete(kFALSE);
-         //printf("Making Branch %sDigits%d\n",GetName(),i+1);
-       }       
+    Int_t i;
+    if (fDchambers == 0x0) 
+      {
+         fDchambers = new TObjArray(kNCH);
+         for (i=0; i<kNCH ;i++) 
+           {
+             fDchambers->AddAt(new TClonesArray("AliRICHDigit",10000), i); 
+           }
       }
-    }
+    for (i=0; i<kNCH ;i++) 
+      {
+        sprintf(branchname,"%sDigits%d",GetName(),i+1);        
+        MakeBranchInTree(fLoader->TreeD(),branchname, &((*fDchambers)[i]), kBufferSize, 0);
+      }
+   }
 
-    if (cR) {    
+ if (cR && gAlice->TreeR()) 
+  {
     //
     // one branch for raw clusters per chamber
     //
+    Int_t i;
+    if (fRawClusters == 0x0 ) 
+     {
+       fRawClusters = new TObjArray(kNCH);
+       for (i=0; i<kNCH ;i++) 
+         {
+           fRawClusters->AddAt(new TClonesArray("AliRICHRawCluster",10000), i); 
+         }
+     }
+     
+    if (fRecHits1D == 0x0) 
+     {
+        fRecHits1D = new TObjArray(kNCH);
+        for (i=0; i<kNCH ;i++) 
+         {
+          fRecHits1D->AddAt(new TClonesArray("AliRICHRecHit1D",1000), i);
+         }
+     }
 
-      //printf("Called MakeBranch for TreeR\n");
-
-      Int_t i;
-
-      for (i=0; i<kNCH ;i++) {
-        sprintf(branchname,"%sRawClusters%d",GetName(),i+1);      
-        if (fRawClusters && gAlice->TreeR()) {
-           //TBranch* branch = MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRawClusters)[i]), kBufferSize, file) ;
-         MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRawClusters)[i]), kBufferSize, file) ;
-          //branch->SetAutoDelete(kFALSE);     
-        }        
-      }
-     //
-     // one branch for rec hits per chamber
-     // 
-     for (i=0; i<kNCH ;i++) {
-       sprintf(branchname,"%sRecHits1D%d",GetName(),i+1);    
-       if (fRecHits1D   && gAlice->TreeR()) {
-        //TBranch* branch = MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRecHits1D)[i]), kBufferSize, file) ;
-        MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRecHits1D)[i]), kBufferSize, file) ;
-        //branch->SetAutoDelete(kFALSE);
-       }       
+    if (fRecHits3D == 0x0) 
+     {
+        fRecHits3D = new TObjArray(kNCH);
+        for (i=0; i<kNCH ;i++) 
+         {
+          fRecHits3D->AddAt(new TClonesArray("AliRICHRecHit3D",1000), i);
+         }
      }
-     for (i=0; i<kNCH ;i++) {
+       
+    for (i=0; i<kNCH ;i++) 
+     {
+       sprintf(branchname,"%sRawClusters%d",GetName(),i+1);      
+       MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRawClusters)[i]), kBufferSize, 0);
+       sprintf(branchname,"%sRecHits1D%d",GetName(),i+1);
+       MakeBranchInTree(fLoader->TreeR(),branchname, &((*fRecHits1D)[i]), kBufferSize, 0);
        sprintf(branchname,"%sRecHits3D%d",GetName(),i+1);  
-       if (fRecHits3D   && gAlice->TreeR()) {
-        MakeBranchInTree(gAlice->TreeR(),branchname, &((*fRecHits3D)[i]), kBufferSize, file) ;
-        //branch->SetAutoDelete(kFALSE);
-      }        
-    }
-  }  
+       MakeBranchInTree(fLoader->TreeR(),branchname, &((*fRecHits3D)[i]), kBufferSize, 0);
+     }
+   }//if (cR && gAlice->TreeR())
 }
 
 //___________________________________________
@@ -1930,66 +1795,110 @@ void AliRICH::SetTreeAddress()
   char branchname[20];
   Int_t i;
 
-    AliDetector::SetTreeAddress();
     
-    TBranch *branch;
-    TTree *treeH = gAlice->TreeH();
-    TTree *treeD = gAlice->TreeD();
-    TTree *treeR = gAlice->TreeR();
-    TTree *treeS = gAlice->TreeS();
+  TBranch *branch;
+  TTree *treeH = fLoader->TreeH();
+  TTree *treeD = fLoader->TreeD();
+  TTree *treeR = fLoader->TreeR();
+  TTree *treeS = fLoader->TreeS();
     
-    if (treeH) {
-      if (fCerenkovs) {
-           branch = treeH->GetBranch("RICHCerenkov");
-           if (branch) branch->SetAddress(&fCerenkovs);
-       }
-    if (fSDigits) {
-       branch = treeH->GetBranch("RICHSDigits");
-       if (branch) 
-         {
-           branch->SetAddress(&fSDigits);
-           //printf("Setting sdigits branch address at %p in TreeH\n",&fSDigits);
-         }
+  if (treeH) 
+   {
+     branch = treeH->GetBranch("RICHCerenkov");
+     if (branch) 
+      {
+        if (fCerenkovs == 0x0) fCerenkovs  = new TClonesArray("AliRICHCerenkov",1000); 
+        branch->SetAddress(&fCerenkovs);
       }
-    }
-    
-    if (treeS) {
-      if (fSDigits) {
-       branch = treeS->GetBranch("RICHSDigits");
-       if (branch) 
-         {
-           branch->SetAddress(&fSDigits);
-           //printf("Setting sdigits branch address at %p in TreeS\n",&fSDigits);
-         }
+       
+     branch = treeH->GetBranch("RICHSDigits");
+     if (branch) 
+      {
+        if (fSDigits == 0x0) fSDigits    = new TClonesArray("AliRICHSDigit",100000);
+        branch->SetAddress(&fSDigits);
+         //printf("Setting sdigits branch address at %p in TreeH\n",&fSDigits);
       }
+     if (fHits == 0x0) fHits       = new TClonesArray("AliRICHHit",1000  ); 
+    }
+   //this is after TreeH because we need to guarantee that fHits array is created
+   AliDetector::SetTreeAddress();
+    
+   if (treeS) {
+      branch = treeS->GetBranch("RICHSDigits");
+      if (branch) 
+        {
+          if (fSDigits == 0x0) fSDigits = new TClonesArray("AliRICHSDigit",100000);
+          branch->SetAddress(&fSDigits);
+          //printf("Setting sdigits branch address at %p in TreeS\n",&fSDigits);
+        }
     }
     
     
-    if (treeD) {
-       for (int i=0; i<kNCH; i++) {
-           sprintf(branchname,"%sDigits%d",GetName(),i+1);
-           if (fDchambers) {
-             branch = treeD->GetBranch(branchname);
-             if (branch) branch->SetAddress(&((*fDchambers)[i]));
-           }
-       }
+   if (treeD) 
+    {
+      if (fDchambers == 0x0) 
+        {
+           fDchambers = new TObjArray(kNCH);
+           for (i=0; i<kNCH ;i++) 
+             {
+               fDchambers->AddAt(new TClonesArray("AliRICHDigit",10000), i); 
+             }
+        }
+      
+      for (i=0; i<kNCH; i++) {
+        sprintf(branchname,"%sDigits%d",GetName(),i+1);
+        if (fDchambers) {
+           branch = treeD->GetBranch(branchname);
+           if (branch) branch->SetAddress(&((*fDchambers)[i]));
+        }
+      }
     }
+    
   if (treeR) {
-      for (i=0; i<kNCH; i++) {
+    
+    if (fRawClusters == 0x0 ) 
+     {
+       fRawClusters = new TObjArray(kNCH);
+       for (i=0; i<kNCH ;i++) 
+         {
+           fRawClusters->AddAt(new TClonesArray("AliRICHRawCluster",10000), i); 
+         }
+     }
+     
+    if (fRecHits1D == 0x0) 
+     {
+        fRecHits1D = new TObjArray(kNCH);
+        for (i=0; i<kNCH ;i++) 
+         {
+          fRecHits1D->AddAt(new TClonesArray("AliRICHRecHit1D",1000), i);
+         }
+     }
+
+    if (fRecHits3D == 0x0) 
+     {
+        fRecHits3D = new TObjArray(kNCH);
+        for (i=0; i<kNCH ;i++) 
+         {
+          fRecHits3D->AddAt(new TClonesArray("AliRICHRecHit3D",1000), i);
+         }
+     }
+    
+    for (i=0; i<kNCH; i++) {
          sprintf(branchname,"%sRawClusters%d",GetName(),i+1);
          if (fRawClusters) {
              branch = treeR->GetBranch(branchname);
              if (branch) branch->SetAddress(&((*fRawClusters)[i]));
          }
-      }
+    }
       
-      for (i=0; i<kNCH; i++) {
+    for (i=0; i<kNCH; i++) {
        sprintf(branchname,"%sRecHits1D%d",GetName(),i+1);
        if (fRecHits1D) {
          branch = treeR->GetBranch(branchname);
          if (branch) branch->SetAddress(&((*fRecHits1D)[i]));
          }
-      }
+     }
       
      for (i=0; i<kNCH; i++) {
        sprintf(branchname,"%sRecHits3D%d",GetName(),i+1);
@@ -2071,7 +1980,6 @@ void AliRICH::ResetRecHits3D()
 //___________________________________________
 void AliRICH::StepManager()
 {
-
 // Full Step Manager
 
     Int_t          copy, id;
@@ -2089,7 +1997,7 @@ void AliRICH::StepManager()
     Float_t        localTheta,localPhi;
     Float_t        theta,phi;
     Float_t        destep, step;
-    Float_t        ranf[2];
+    Double_t        ranf[2];
     Int_t          nPads;
     Float_t        coscerenkov;
     static Float_t eloss, xhit, yhit, tlength;
@@ -2104,8 +2012,9 @@ void AliRICH::StepManager()
     // Only gas gap inside chamber
     // Tag chambers and record hits when track enters 
     
-    idvol=-1;
     id=gMC->CurrentVolID(copy);
+    idvol = copy-1;
     Float_t cherenkovLoss=0;
     //gAlice->KeepTrack(gAlice->CurrentTrack());
     
@@ -2181,15 +2090,12 @@ void AliRICH::StepManager()
                        mom[1]=momentum(1);
                        mom[2]=momentum(2);
                        mom[3]=momentum(3);
-                       // Z-position for hit
-                       
                        
-                       /**************** Photons lost in second grid have to be calculated by hand************/ 
-                       
-                       Float_t cophi = TMath::Cos(TMath::ATan2(mom[0], mom[1]));
+                       gMC->Gmtod(mom,localMom,2);
+                       Float_t cophi = TMath::Cos(TMath::ATan2(localMom[0], localMom[1]));
                        Float_t t = (1. - .025 / cophi) * (1. - .05 /  cophi);
-                       gMC->Rndm(ranf, 1);
-                       //printf("grid calculation:%f\n",t);
+                       /**************** Photons lost in second grid have to be calculated by hand************/ 
+                       gMC->GetRandom()->RndmArray(1,ranf);
                        if (ranf[0] > t) {
                          gMC->StopTrack();
                          ckovData[13] = 5;
@@ -2210,21 +2116,25 @@ void AliRICH::StepManager()
                        mom[1]=momentum(1);
                        mom[2]=momentum(2);
                        mom[3]=momentum(3);
-                       
+
+                       gMC->Gmtod(mom,localMom,2);
                        /********* Photons lost by Fresnel reflection have to be calculated by hand********/ 
                        /***********************Cerenkov phtons (always polarised)*************************/
-                       
-                       Float_t cophi = TMath::Cos(TMath::ATan2(mom[0], mom[1]));
-                       Float_t t = Fresnel(ckovEnergy*1e9,cophi,1);
-                       gMC->Rndm(ranf, 1);
-                       if (ranf[0] < t) {
-                         gMC->StopTrack();
-                         ckovData[13] = 6;
-                         AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
-                         //printf("Added One (2)!\n");
-                         //printf("Lost by Fresnel\n");
-                       }
-                       /**********************************************************************************/
+                       Double_t localTc = localMom[0]*localMom[0]+localMom[2]*localMom[2];
+                       Double_t localRt = TMath::Sqrt(localTc);
+                       localTheta   = Float_t(TMath::ATan2(localRt,Double_t(localMom[1])));
+                       Double_t cotheta = TMath::Abs(cos(localTheta));
+                       Float_t t = Fresnel(ckovEnergy*1e9,cotheta,1);
+                           gMC->GetRandom()->RndmArray(1,ranf);
+                           if (ranf[0] < t) {
+                             gMC->StopTrack();
+                             ckovData[13] = 6;
+                             AddCerenkov(gAlice->CurrentTrack(),vol,ckovData);
+                               
+                             //printf("Added One (2)!\n");
+                             //printf("Lost by Fresnel\n");
+                           }
+                           /**********************************************************************************/
                      }
                  } //track entering?
                  
@@ -2318,8 +2228,19 @@ void AliRICH::StepManager()
                Double_t rt = TMath::Sqrt(tc);
                theta   = Float_t(TMath::ATan2(rt,Double_t(mom[2])))*kRaddeg;
                phi     = Float_t(TMath::ATan2(Double_t(mom[1]),Double_t(mom[0])))*kRaddeg;
-               gMC->Gmtod(pos,localPos,1);                                                                    
+               
+               gMC->CurrentVolOffID(2,copy);
+               vol[0]=copy;
+               idvol=vol[0]-1;
+               
+
+               gMC->Gmtod(pos,localPos,1);
+
+               //Chamber(idvol).GlobaltoLocal(pos,localPos);
+                                                                    
                gMC->Gmtod(mom,localMom,2);
+
+               //Chamber(idvol).GlobaltoLocal(mom,localMom);
                
                gMC->CurrentVolOffID(2,copy);
                vol[0]=copy;
@@ -2451,8 +2372,14 @@ void AliRICH::StepManager()
            mom[1]=momentum(1);
            mom[2]=momentum(2);
            mom[3]=momentum(3);
-           gMC->Gmtod(pos,localPos,1);                                                                    
+
+           gMC->Gmtod(pos,localPos,1);
+           
+           //Chamber(idvol).GlobaltoLocal(pos,localPos);
+                                                                    
            gMC->Gmtod(mom,localMom,2);
+
+           //Chamber(idvol).GlobaltoLocal(mom,localMom);
            
            ipart  = gMC->TrackPid();
            //
@@ -2575,7 +2502,7 @@ void AliRICH::StepManager()
       }
     /*************************************************End of MIP treatment**************************************/
    //}
-}
+}//void AliRICH::StepManager()
 
 void AliRICH::FindClusters(Int_t nev,Int_t lastEntry)
 {
@@ -2739,7 +2666,7 @@ void AliRICH::DiagnosticsFE(Int_t evNumber1,Int_t evNumber2)
        
        AliRICH *pRICH = (AliRICH *) gAlice->GetDetector("RICH");
      
-       TTree *treeH = gAlice->TreeH();
+       TTree *treeH = TreeH();
        Int_t ntracks =(Int_t) treeH->GetEntries();
             
 // Start loop on tracks in the hits containers
@@ -2980,6 +2907,10 @@ void AliRICH::DiagnosticsFE(Int_t evNumber1,Int_t evNumber2)
        
    }
    //   }
+
+   TStyle *mystyle=new TStyle("Plain","mystyle");
+   mystyle->SetPalette(1,0);
+   mystyle->cd();
    
    //Create canvases, set the view range, show histograms
 
@@ -3194,7 +3125,7 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
    AliRICHChamber*       chamber;
    
    chamber = &(pRICH->Chamber(0));
-   segmentation=(AliRICHSegmentationV0*) chamber->GetSegmentationModel(0);
+   segmentation=(AliRICHSegmentationV0*) chamber->GetSegmentationModel();
 
    Int_t NpadX = segmentation->Npx();                 // number of pads on X
    Int_t NpadY = segmentation->Npy();                 // number of pads on Y
@@ -3211,6 +3142,11 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
    Int_t xmax=  NpadX/2;
    Int_t ymin= -NpadY/2;
    Int_t ymax=  NpadY/2;
+
+   Float_t PTfinal = 0;
+   Int_t pionCount = 0;
+   Int_t kaonCount = 0;
+   Int_t protonCount = 0;
    
    TH2F *feedback = 0;
    TH2F *mip = 0;
@@ -3219,17 +3155,17 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
    TH1F *hitsX = 0;
    TH1F *hitsY = 0;
 
-   TH2F *hc0 = new TH2F("hc0","Zoom on center of central chamber",150,-30,30,150,-50,10);
+   TH2F *hc0 = new TH2F("hc0","Zoom on center of central chamber",150,-25,25,150,-45,5);
 
    if (diaglevel == 1)
      {
        printf("Single Ring Hits\n");
-       feedback = new TH2F("feedback","Feedback hit distribution",150,-30,30,150,-50,10);
-       mip = new TH2F("mip","Mip hit distribution",150,-30,30,150,-50,10);
-       cerenkov = new TH2F("cerenkov","Cerenkov hit distribution",150,-30,30,150,-50,10);
-       h = new TH2F("h","Detector hit distribution",150,-30,30,150,-50,10);
-       hitsX = new TH1F("hitsX","Distribution of hits along x-axis",150,-30,30);
-       hitsY = new TH1F("hitsY","Distribution of hits along z-axis",150,-50,10);
+       feedback = new TH2F("feedback","Feedback hit distribution",150,-20,20,150,-35,5);
+       mip = new TH2F("mip","Mip hit distribution",150,-20,20,150,-35,5);
+       cerenkov = new TH2F("cerenkov","Cerenkov hit distribution",150,-20,20,150,-35,5);
+       h = new TH2F("h","Detector hit distribution",150,-20,20,150,-35,5);
+       hitsX = new TH1F("hitsX","Distribution of hits along x-axis",150,-50,50);
+       hitsY = new TH1F("hitsY","Distribution of hits along z-axis",150,-50,50);
      }       
    else
      {
@@ -3254,7 +3190,7 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
    TH2F *hc7 = new TH2F("hc7","Chamber 7 signal distribution",NpadX,xmin,xmax,NpadY,ymin,ymax);
       
    TH1F *Clcharge = new TH1F("Clcharge","Cluster Charge Distribution",500,0.,500.);
-   TH1F *ckovangle = new TH1F("ckovangle","Cerenkov angle per photon",200,.3,1);
+   TH1F *ckovangle = new TH1F("ckovangle","Cerenkov angle per photon",100,.35,.8);
    TH1F *hckphi = new TH1F("hckphi","Cerenkov phi angle per photon",620,-3.1,3.1);
    TH1F *mother = new TH1F("mother","Cerenkovs per Mip",75,0.,75.);
    TH1F *radius = new TH1F("radius","Mean distance to Mip",100,0.,20.);
@@ -3274,15 +3210,23 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
    TH1F *protonspectra = new TH1F("protonspectra","Proton Spectra",200,.5,10.);
    TH1F *kaonspectra = new TH1F("kaonspectra","Kaon Spectra",100,.5,10.);
    TH1F *chargedspectra = new TH1F("chargedspectra","Charged particles above 1 GeV Spectra",100,.5,10.);
-   TH1F *hitsPhi = new TH1F("hitsPhi","Distribution of phi angle of incidence",100,0,360);
-   TH1F *hitsTheta = new TH1F("hitsTheta","Distribution of Theta angle of incidence",100,0,15);
-   TH1F *Omega1D = new TH1F("omega","Reconstructed Cerenkov angle per track",200,.5,1);
-   TH1F *Theta = new TH1F("theta","Reconstructed theta incidence angle per track",200,0,15);
-   TH1F *Phi = new TH1F("phi","Reconstructed phi incidence per track",200,0,360);
-   TH1F *Omega3D = new TH1F("omega","Reconstructed Cerenkov angle per track",200,.3,1);
-   TH1F *PhotonCer = new TH1F("photoncer","Reconstructed Cerenkov angle per photon",200,.3,1);
+   TH1F *hitsPhi = new TH1F("hitsPhi","Distribution of phi angle of incidence",50,0,360);
+   TH1F *hitsTheta = new TH1F("hitsTheta","Distribution of theta angle of incidence",50,0,15);
+   TH1F *Omega1D = new TH1F("omega","Reconstructed Cerenkov angle per track",50,.5,1);
+   TH1F *Theta = new TH1F("theta","Reconstructed theta incidence angle per track",100,0,15);
+   TH1F *Phi = new TH1F("phi","Reconstructed phi incidence per track",100,0,360);
+   TH1F *Omega3D = new TH1F("omega","Reconstructed Cerenkov angle per track",100,.35,.8);
+   TH1F *PhotonCer = new TH1F("photoncer","Reconstructed Cerenkov angle per photon",100,.35,.8);
    TH2F *PadsUsed = new TH2F("padsused","Pads Used for Reconstruction",100,-30,30,100,-30,30);
    TH1F *MeanRadius = new TH1F("radius","Mean Radius for reconstructed track",100,0.,20.);
+   TH2F *identification = new TH2F("identification","Particle Identification",100,1,5,100,0,.8);
+   TH1F *OriginalOmega = new TH1F("Original Omega","Cerenkov angle per track",100,.35,.8);
+   TH1F *OriginalPhi = new TH1F("Original Phi","Distribution of phi angle of incidence per track",100,0,360);
+   TH1F *OriginalTheta = new TH1F("Original Theta","Distribution of theta angle per track",100,0,15);
+   TH1F *OmegaError = new TH1F("Omega Error","Difference between original an reconstructed cerenkov angle",100,0,.2);
+   TH1F *PhiError = new TH1F("Phi Error","Difference between original an reconstructed phi angle",100,0,360);
+   TH1F *ThetaError = new TH1F("Theta Error","Difference between original an reconstructed phi angle",100,0,15);
+
 
 //   Start loop over events 
 
@@ -3297,6 +3241,17 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
    Int_t feed=0;
    Int_t padmip=0;
    Float_t x=0,y=0;
+
+   Float_t chiSquareOmega = 0;
+   Float_t chiSquareTheta = 0;
+   Float_t chiSquarePhi = 0;
+
+   Float_t recEffEvent = 0;
+   Float_t recEffTotal = 0;
+
+   Float_t trackglob[3];
+   Float_t trackloc[3];
+
    
    for (Int_t i=0;i<100;i++) mothers[i]=0;
 
@@ -3314,7 +3269,7 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
 // Get pointers to RICH detector and Hits containers
        
 
-       TTree *TH = gAlice->TreeH(); 
+       TTree *TH = TreeH(); 
        Stat_t ntracks = TH->GetEntries();
 
        // Start loop on tracks in the hits containers
@@ -3331,14 +3286,37 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
             mHit;
             mHit=(AliRICHHit*)pRICH->NextHit()) 
           {
-            //Int_t nch  = mHit->fChamber;              // chamber number
-            x  = mHit->X();                           // x-pos of hit
-            y  = mHit->Z();                           // y-pos
+            Int_t nch  = mHit->Chamber();              // chamber number
+            trackglob[0] = mHit->X();                 // x-pos of hit
+            trackglob[1] = mHit->Y();
+            trackglob[2] = mHit->Z();                 // y-pos of hit
+            //x  = mHit->X();                           // x-pos of hit
+            //y  = mHit->Z();                           // y-pos
             Float_t phi = mHit->Phi();                 //Phi angle of incidence
             Float_t theta = mHit->Theta();             //Theta angle of incidence
             Int_t index = mHit->Track();
             Int_t particle = (Int_t)(mHit->Particle());        
             //Int_t freon = (Int_t)(mHit->fLoss);    
+            Float_t px = mHit->MomX();
+            Float_t py = mHit->MomY();
+            
+            if (TMath::Abs(particle) < 10000000)
+              {
+                PTfinal=TMath::Sqrt(px*px + py*py);
+                //printf("PTfinal 0: %f\n",PTfinal);
+              }
+       
+            chamber = &(pRICH->Chamber(nch-1));
+            
+            //printf("Nch:%d\n",nch);
+            
+            chamber->GlobaltoLocal(trackglob,trackloc);
+            
+            chamber->LocaltoGlobal(trackloc,trackglob);
+            
+       
+            x=trackloc[0];
+            y=trackloc[2];
             
             hitsX->Fill(x,(float) 1);
             hitsY->Fill(y,(float) 1);
@@ -3392,7 +3370,7 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
              h->Fill(x,y,(float) 1);
                  //}
               //}
-          }
+          }
           
           Int_t ncerenkovs = pRICH->Cerenkovs()->GetEntriesFast();
           //if (current->GetPdgCode() < 50000051 && current->GetPdgCode() > 50000040)
@@ -3403,16 +3381,33 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
             totalphotonsevent->Fill(ncerenkovs,(float) 1);
             for (Int_t hit=0;hit<ncerenkovs;hit++) {
               AliRICHCerenkov* cHit = (AliRICHCerenkov*) pRICH->Cerenkovs()->UncheckedAt(hit);
-              //Int_t nchamber = cHit->fChamber;     // chamber number
+              Int_t nchamber = cHit->fChamber;     // chamber number
               Int_t index =    cHit->Track();
               //Int_t pindex =   (Int_t)(cHit->fIndex);
-              Float_t cx  =      cHit->X();                // x-position
-              Float_t cy  =      cHit->Z();                // y-position
+              trackglob[0] = cHit->X();                 // x-pos of hit
+              trackglob[1] = cHit->Y();
+              trackglob[2] = cHit->Z();                 // y-pos of hit
+              //Float_t cx  =      cHit->X();                // x-position
+              //Float_t cy  =      cHit->Z();                // y-position
               Int_t cmother =  cHit->fCMother;      // Index of mother particle
               Int_t closs =    (Int_t)(cHit->fLoss);           // How did the particle get lost? 
               Float_t cherenkov = cHit->fCerenkovAngle;   //production cerenkov angle
-              //printf ("Cerenkov hit number %d/%d, X:%d, Y:%d\n",hit,ncerenkovs,cx,cy); 
               
+              chamber = &(pRICH->Chamber(nchamber-1));
+            
+              //printf("Nch:%d\n",nch);
+              
+              chamber->GlobaltoLocal(trackglob,trackloc);
+            
+              chamber->LocaltoGlobal(trackloc,trackglob);
+            
+       
+              Float_t cx=trackloc[0];
+              Float_t cy=trackloc[2];
+              
+              //printf ("Cerenkov hit number %d/%d, X:%f, Y:%f\n",hit,ncerenkovs,cx,cy); 
+
+
               //printf("Particle:%9d\n",index);
                                 
               TParticle *current = (TParticle*)gAlice->Particle(index);
@@ -3475,8 +3470,8 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
                       Float_t mx = mipHit->X();
                       Float_t my = mipHit->Z();
                       //printf("FX %e, FY %e, VX %e, VY %e\n",cx,cy,mx,my);
-                      Float_t dx = cx - mx;
-                      Float_t dy = cy - my;
+                      Float_t dx = trackglob[0] - mx;
+                      Float_t dy = trackglob[2] - my;
                       //printf("Dx:%f, Dy:%f\n",dx,dy);
                       Float_t final_radius = TMath::Sqrt(dx*dx+dy*dy);
                       //printf("Final radius:%f\n",final_radius);
@@ -3567,28 +3562,115 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
               
               if(nrechits3D)
                 {
-                  for (Int_t hit=0;hit<nrechits3D;hit++) {
-                    AliRICHRecHit3D* recHit3D = (AliRICHRecHit3D*) pRICH->RecHitsAddress3D(2)->UncheckedAt(hit);
-                    Float_t r_omega    = recHit3D->fOmega;                  // Cerenkov angle
-                    Float_t r_theta    = recHit3D->fTheta;                  // Theta angle of incidence
-                    Float_t r_phi      = recHit3D->fPhi;                    // Phi angle if incidence
-                    Float_t meanradius = recHit3D->fMeanRadius;              // Mean radius for reconstructed point
-                   
-                    //printf("rechit %f %f %f %f %f\n",recHit3D->fOmega,recHit3D->fTheta,recHit3D->fPhi, recHit3D->fX,recHit3D->fY);  
-                    
-                    Omega3D->Fill(r_omega,(float) 1);
-                    Theta->Fill(r_theta*180/TMath::Pi(),(float) 1);
-                    Phi->Fill(r_phi*180/TMath::Pi()-180,(float) 1);
-                    MeanRadius->Fill(meanradius,(float) 1);
-                  }
+                  recEffEvent = 0;
+                  
+                  //for (Int_t hit=0;hit<nrechits3D;hit++) {
+                  AliRICHRecHit3D* recHit3D = (AliRICHRecHit3D*) pRICH->RecHitsAddress3D(2)->UncheckedAt(track);
+                  Float_t r_omega    = recHit3D->fOmega;                  // Cerenkov angle
+                  Float_t r_theta    = recHit3D->fTheta;                  // Theta angle of incidence
+                  Float_t r_phi      = recHit3D->fPhi;                    // Phi angle if incidence
+                  Float_t meanradius = recHit3D->fMeanRadius;              // Mean radius for reconstructed point
+                  Float_t originalOmega = recHit3D->fOriginalOmega;       // Real Cerenkov angle
+                  Float_t originalTheta = recHit3D->fOriginalTheta;       // Real incidence angle
+                  Float_t originalPhi = recHit3D->fOriginalPhi;           // Real azimuthal angle
+                  
+                  
+                  //correction to track cerenkov angle
+                  originalOmega = (Float_t) ckovangle->GetMean();
+                  
+                  if(diaglevel == 4)
+                    {
+                      printf("\nMean cerenkov angle: %f\n", originalOmega);
+                      printf("Reconstructed cerenkov angle: %f\n",r_omega);
+                    }
+                  
+                  Float_t omegaError = TMath::Abs(originalOmega - r_omega);
+                  Float_t thetaError = TMath::Abs(originalTheta - r_theta);
+                  Float_t phiError   = TMath::Abs(originalPhi - r_phi);
+                  
+                  //chiSquareOmega += (omegaError/originalOmega)*(omegaError/originalOmega); 
+                  //chiSquareTheta += (thetaError/originalTheta)*(thetaError/originalTheta); 
+                  //chiSquarePhi += (phiError/originalPhi)*(phiError/originalPhi); 
+                  
+                  if(TMath::Abs(omegaError) < 0.015)
+                    recEffEvent += 1;
+                  
+                  
+                  
+                  //printf("rechit %f %f %f %f %f\n",recHit3D->fOmega,recHit3D->fTheta,recHit3D->fPhi, recHit3D->fX,recHit3D->fY);  
+                  
+                  Omega3D->Fill(r_omega,(float) 1);
+                  Theta->Fill(r_theta*180/TMath::Pi(),(float) 1);
+                  Phi->Fill(r_phi*180/TMath::Pi()-180,(float) 1);
+                  MeanRadius->Fill(meanradius,(float) 1);
+                  identification->Fill(PTfinal, r_omega,1);
+                  OriginalOmega->Fill(originalOmega, (float) 1);
+                  OriginalTheta->Fill(originalTheta, (float) 1);
+                  OriginalPhi->Fill(TMath::Abs(originalPhi), (float) 1);
+                  OmegaError->Fill(omegaError, (float) 1);
+                  ThetaError->Fill(thetaError, (float) 1);
+                  PhiError->Fill(phiError, (float) 1);
+                  
+                  recEffEvent = recEffEvent;
+                  recEffTotal += recEffEvent;
+                  
+                  Float_t pioncer = acos(sqrt((.139*.139+PTfinal*PTfinal)/(PTfinal*PTfinal*1.285*1.285)));
+                  Float_t kaoncer = acos(sqrt((.439*.439+PTfinal*PTfinal)/(PTfinal*PTfinal*1.285*1.285)));
+                  Float_t protoncer = acos(sqrt((.938*.938+PTfinal*PTfinal)/(PTfinal*PTfinal*1.285*1.285)));
+
+                  Float_t piondist = TMath::Abs(r_omega - pioncer);
+                  Float_t kaondist = TMath::Abs(r_omega - kaoncer);
+                  Float_t protondist = TMath::Abs(r_omega - protoncer);
+
+                  if(diaglevel == 4)
+                    {
+                      if(pioncer<r_omega)
+                        {
+                          printf("Identified as a PION!\n");
+                          pionCount += 1;
+                        }
+                      if(kaoncer<r_omega && pioncer>r_omega)
+                        {
+                          if(kaondist>piondist)
+                            {
+                              printf("Identified as a PION!\n");
+                              pionCount += 1;
+                            }
+                          else
+                            {
+                              printf("Identified as a KAON!\n");
+                              kaonCount += 1;
+                            }
+                        }                       }
+                      if(protoncer<r_omega && kaoncer>r_omega)
+                        {
+                          if(kaondist>protondist)
+                            {
+                              printf("Identified as a PROTON!\n");
+                              protonCount += 1;
+                            }
+                          else
+                            {
+                              printf("Identified as a KAON!\n");
+                              pionCount += 1;
+                            }
+                        }
+                      if(protoncer>r_omega)
+                        {
+                          printf("Identified as a PROTON!\n");
+                          protonCount += 1;
+                        }
+
+                      printf("\nReconstruction efficiency: %5.2f%%\n", recEffEvent*100);
                 }
             }
        }
+   
        
        for (Int_t nmothers=0;nmothers<ntracks;nmothers++){
-          totalphotonstrack->Fill(mothers[nmothers],(float) 1);
-          mother->Fill(mothers2[nmothers],(float) 1);
-          //printf ("Entries in %d : %d\n",nmothers, mothers[nmothers]);
+        totalphotonstrack->Fill(mothers[nmothers],(float) 1);
+        mother->Fill(mothers2[nmothers],(float) 1);
+        //printf ("Entries in %d : %d\n",nmothers, mothers[nmothers]);
        }
        
        clusev->Fill(nraw,(float) 1);
@@ -3602,17 +3684,17 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
        pads = 0;
        nraw=0;
        padmip=0;
-
-
-
+       
+       
+       
        gAlice->ResetDigits();
        //Int_t nent=(Int_t)gAlice->TreeD()->GetEntries();
        gAlice->TreeD()->GetEvent(0);
-
+       
        if (diaglevel < 4)
         {
-
-
+          
+          
           TClonesArray *Digits  = pRICH->DigitsAddress(2);
           Int_t ndigits = Digits->GetEntriesFast();
           printf("Digits          : %d\n",ndigits);
@@ -3626,7 +3708,7 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
             if( ipx<=100 && ipy <=100) hc0->Fill(ipx,ipy,(float) qtot);
           }
         }
-        
+       
        if (diaglevel == 5)
         {
           for (Int_t ich=0;ich<7;ich++)
@@ -3659,7 +3741,61 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
             }
         }
    }
+   
+   if(diaglevel == 4)
+     {
+
+       Stat_t omegaE;
+       Stat_t thetaE;
+       Stat_t phiE;
+       
+       Stat_t omegaO;
+       Stat_t thetaO;
+       Stat_t phiO;
        
+       for(Int_t i=0;i<99;i++)
+        {
+          omegaE = OriginalOmega->GetBinContent(i);
+          if(omegaE != 0)
+            {
+              omegaO = Omega3D->GetBinContent(i);
+              chiSquareOmega += (TMath::Power(omegaE,2) - TMath::Power(omegaO,2))/omegaO;
+            }
+
+          thetaE = OriginalTheta->GetBinContent(i);
+          if(thetaE != 0)
+            {
+              thetaO = Theta->GetBinContent(i);
+              chiSquareTheta += (TMath::Power(thetaE,2) - TMath::Power(thetaO,2))/thetaO;
+            }
+
+          phiE = OriginalPhi->GetBinContent(i);
+          if(phiE != 0)
+            {
+              phiO = Phi->GetBinContent(i);
+              chiSquarePhi += (TMath::Power(phiE,2) - TMath::Power(phiO,2))/phiO;
+            }
+          
+          //printf(" o: %f  t: %f  p: %f\n", OriginalOmega->GetBinContent(i), OriginalTheta->GetBinContent(i),OriginalPhi->GetBinContent(i));
+
+        }
+
+       
+
+       printf("\nChi square test values:   Omega - %f\n", chiSquareOmega);
+       printf("                          Theta - %f\n", chiSquareTheta);
+       printf("                          Phi   - %f\n", chiSquarePhi);
+       
+       printf("\nKolmogorov test values:   Omega - %5.4f\n", Omega3D->KolmogorovTest(OriginalOmega));
+       printf("                          Theta - %5.4f\n", Theta->KolmogorovTest(OriginalTheta));
+       printf("                          Phi   - %5.4f\n", Phi->KolmogorovTest(OriginalPhi));
+
+       recEffTotal = recEffTotal/evNumber2;
+       printf("\nTotal reconstruction efficiency: %5.2f%%\n", recEffTotal*100);
+       printf("\n Pions: %d\n Kaons: %d\n Protons:%d\n",pionCount, kaonCount, protonCount);
+
+     }
+   
    
    //Create canvases, set the view range, show histograms
 
@@ -3675,9 +3811,25 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
    TCanvas *c10 = 0;
    TCanvas *c11 = 0;
    TCanvas *c12 = 0;
+   TCanvas *c13 = 0;
+
    //TF1* expo = 0;
    //TF1* gaus = 0;
    
+   TStyle *mystyle=new TStyle("Plain","mystyle");
+   mystyle->SetPalette(1,0);
+   //mystyle->SetTitleYSize(0.2);
+   //mystyle->SetStatW(0.19);
+   //mystyle->SetStatH(0.1);
+   //mystyle->SetStatFontSize(0.01);
+   //mystyle->SetTitleYSize(0.3);
+   mystyle->SetFuncColor(2);
+   //mystyle->SetOptStat(0111);
+   mystyle->SetDrawBorder(0);
+   mystyle->SetTitleBorderSize(0);
+   mystyle->SetOptFit(1111);
+   mystyle->cd();
+
    
    TClonesArray *RecHits3D = pRICH->RecHitsAddress3D(2);
    Int_t nrechits3D = RecHits3D->GetEntriesFast();
@@ -3690,7 +3842,7 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
        
        c1 = new TCanvas("c1","Alice RICH digits",50,50,300,350);
        hc0->SetXTitle("ix (npads)");
-       hc0->Draw("box");
+       hc0->Draw("colz");
        
 //
        c2 = new TCanvas("c2","Hits per type",100,100,600,700);
@@ -3700,25 +3852,25 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
        c2->cd(1);
        feedback->SetXTitle("x (cm)");
        feedback->SetYTitle("y (cm)");
-       feedback->Draw();
+       feedback->Draw("colz");
        
        c2->cd(2);
        //mip->SetFillColor(5);
        mip->SetXTitle("x (cm)");
        mip->SetYTitle("y (cm)");
-       mip->Draw();
+       mip->Draw("colz");
        
        c2->cd(3);
        //cerenkov->SetFillColor(5);
        cerenkov->SetXTitle("x (cm)");
        cerenkov->SetYTitle("y (cm)"); 
-       cerenkov->Draw();
+       cerenkov->Draw("colz");
        
        c2->cd(4);
        //h->SetFillColor(5);
        h->SetXTitle("x (cm)");
        h->SetYTitle("y (cm)");
-       h->Draw();
+       h->Draw("colz");
 
        c3 = new TCanvas("c3","Hits distribution",150,150,600,350);
        c3->Divide(2,1);
@@ -3885,38 +4037,149 @@ AliRICH *pRICH  = (AliRICH*)gAlice->GetDetector("RICH");
 
        if(nrechits3D)
         {
-          c8 = new TCanvas("c8","3D reconstruction",50,50,1100,700);
-          c8->Divide(4,2);
+          c8 = new TCanvas("c8","3D reconstruction of Phi angle",50,50,300,1050);
+          c8->Divide(1,3);
           //c2->SetFillColor(42);
           
+          
+          // data per hit
           c8->cd(1);
           hitsPhi->SetFillColor(5);
+          if (evNumber2>10)
+            hitsPhi->Fit("gaus");
           hitsPhi->Draw();
+          
+           //data per track
           c8->cd(2);
-          hitsTheta->SetFillColor(5);
-          hitsTheta->Draw();
+          OriginalPhi->SetFillColor(5);
+          if (evNumber2>10)
+            OriginalPhi->Fit("gaus");
+          OriginalPhi->Draw();
+
+          //recontructed data
           c8->cd(3);
-          ckovangle->SetFillColor(5);
-          ckovangle->SetXTitle("angle (radians)");
-          ckovangle->Draw();
-          c8->cd(4);
-          radius->SetFillColor(5);
-          radius->SetXTitle("radius (cm)");
-          radius->Draw();
-          c8->cd(5);
           Phi->SetFillColor(5);
+          if (evNumber2>10)
+            Phi->Fit("gaus");
           Phi->Draw();
-          c8->cd(6);
+
+          c9 = new TCanvas("c9","3D reconstruction of theta angle",75,75,300,1050);
+          c9->Divide(1,3);
+
+          // data per hit
+          c9->cd(1);
+          hitsTheta->SetFillColor(5);
+          if (evNumber2>10)
+            hitsTheta->Fit("gaus");
+          hitsTheta->Draw();
+          
+          //data per track
+          c9->cd(2);
+          OriginalTheta->SetFillColor(5);
+          if (evNumber2>10)
+            OriginalTheta->Fit("gaus");
+          OriginalTheta->Draw();
+
+          //recontructed data
+          c9->cd(3);
           Theta->SetFillColor(5);
+          if (evNumber2>10)
+            Theta->Fit("gaus");
           Theta->Draw();
-          c8->cd(7);
+
+          c10 = new TCanvas("c10","3D reconstruction of cherenkov angle",100,100,300,1050);
+          c10->Divide(1,3);
+
+          // data per hit
+          c10->cd(1);
+          ckovangle->SetFillColor(5);
+          ckovangle->SetXTitle("angle (radians)");
+          if (evNumber2>10)
+            ckovangle->Fit("gaus");
+          ckovangle->Draw();
+          
+          //data per track
+          c10->cd(2);
+          OriginalOmega->SetFillColor(5);
+          OriginalOmega->SetXTitle("angle (radians)");
+          if (evNumber2>10)
+            OriginalOmega->Fit("gaus");
+          OriginalOmega->Draw();
+
+          //recontructed data
+          c10->cd(3);
           Omega3D->SetFillColor(5);
           Omega3D->SetXTitle("angle (radians)");
+          if (evNumber2>10)
+            Omega3D->Fit("gaus");
           Omega3D->Draw(); 
-          c8->cd(8);
+
+
+          c11 = new TCanvas("c11","3D reconstruction of mean radius",125,125,300,700);
+          c11->Divide(1,2);
+
+          // data per hit
+          c11->cd(1);
+          radius->SetFillColor(5);
+          radius->SetXTitle("radius (cm)");
+          radius->Draw();
+
+          //recontructed data
+          c11->cd(2);
           MeanRadius->SetFillColor(5);
           MeanRadius->SetXTitle("radius (cm)");
           MeanRadius->Draw();
+
+          
+          c12 = new TCanvas("c12","Cerenkov angle vs. Momentum",150,150,550,350);
+
+          c12->cd(1);
+          identification->SetFillColor(5);
+          identification->SetXTitle("Momentum (GeV/c)");
+          identification->SetYTitle("Cherenkov angle (radians)");
+          
+          //Float_t pionmass=.139;
+          //Float_t kaonmass=.493;
+          //Float_t protonmass=.938;
+          //Float_t n=1.295;
+          
+          TF1 *pionplot = new TF1("pion","acos(sqrt((.139*.139+x*x)/(x*x*1.285*1.285)))",1,5);
+          TF1 *kaonplot = new TF1("kaon","acos(sqrt((.439*.439+x*x)/(x*x*1.285*1.285)))",1,5);
+          TF1 *protonplot = new TF1("proton","acos(sqrt((.938*.938+x*x)/(x*x*1.285*1.285)))",1,5);
+          
+          identification->Draw();
+
+          pionplot->SetLineColor(5);
+          pionplot->Draw("same");
+
+          kaonplot->SetLineColor(4);
+          kaonplot->Draw("same");
+
+          protonplot->SetLineColor(3);
+          protonplot->Draw("same");
+          //identification->Draw("same");
+
+
+
+          c13 = new TCanvas("c13","Reconstruction Errors",200,200,900,350);
+          c13->Divide(3,1);
+
+          c13->cd(1);
+          PhiError->SetFillColor(5);
+          if (evNumber2>10)
+            PhiError->Fit("gaus");
+          PhiError->Draw();
+          c13->cd(2);
+          ThetaError->SetFillColor(5);
+          if (evNumber2>10)
+            ThetaError->Fit("gaus");
+          ThetaError->Draw();
+          c13->cd(3);
+          OmegaError->SetFillColor(5);
+          OmegaError->SetXTitle("angle (radians)");
+          if (evNumber2>10)
+            OmegaError->Fit("gaus");
+          OmegaError->Draw();
           
         }