]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - RICH/AliRICH.cxx
RichAna() and CheckPR() moved to AliRICHReconstructor
[u/mrichter/AliRoot.git] / RICH / AliRICH.cxx
index d9a31a076125d83c75896875a9d72c179e5585a3..96e5766920cc45dd0ddc04fc8d6e3a7bbfa0631f 100644 (file)
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
+//  **************************************************************************
+//  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+//  *                                                                        *
+//  * Author: The ALICE Off-line Project.                                    *
+//  * Contributors are mentioned in the code where appropriate.              *
+//  *                                                                        *
+//  * Permission to use, copy, modify and distribute this software and its   *
+//  * documentation strictly for non-commercial purposes is hereby granted   *
+//  * without fee, provided that the above copyright notice appears in all   *
+//  * copies and that both the copyright notice and this permission notice   *
+//  * appear in the supporting documentation. The authors make no claims     *
+//  * about the suitability of this software for any purpose. It is          *
+//  * provided "as is" without express or implied warranty.                  *
+//  **************************************************************************
 
-
-#include <strings.h>
-
-#include <TArrayF.h>
+#include "AliRICH.h"
+#include "AliRICHParam.h"
+#include "AliRICHChamber.h"
+#include "AliRICHHelix.h"
+//#include <TArrayF.h>
+#include <TGeometry.h>
 #include <TBRIK.h>
+#include <TTUBE.h>
 #include <TFile.h>
-#include <TGeometry.h>
 #include <TNode.h> 
 #include <TObjArray.h>
-#include <TObject.h>
 #include <TParticle.h>
-#include <TPDGCode.h>
-#include <TRandom.h> 
-#include <TTUBE.h>
-#include <TTree.h>
-#include <TVector.h>
-#include "AliMagF.h"
-#include "AliPoints.h"
-#include "AliRICH.h"
-#include "AliRICHParam.h"
-#include "AliRICHClusterFinder.h"
-#include "AliRICHDigitizer.h"
-#include "AliRICHHitMapA1.h"
-#include "AliRICHMerger.h"
-#include "AliRICHRawCluster.h"
-#include "AliRICHRecHit1D.h"
-#include "AliRICHRecHit3D.h"
-#include "AliRICHSDigit.h"
-#include "AliRICHSegmentationV0.h"
-#include "AliRICHTransientDigit.h"
-#include "AliRun.h"
-#include "AliRunDigitizer.h"
-#include "AliRICHSegmentationV1.h"
-#include "AliRICHResponseV0.h"
+#include <AliStack.h>
+#include <AliHeader.h>
+#include <AliGenEventHeader.h>
+#include <AliGenHijingEventHeader.h>
+#include <AliMagF.h>
+#include <AliRun.h>
+#include <AliRunDigitizer.h>
+#include <AliMC.h>
+#include <AliESD.h>
+#include <TVirtualMC.h>
+#include <TH1F.h>
+#include <TH2F.h>
+#include <TBenchmark.h>
+#include <AliLog.h>
+#include <TNtupleD.h>
+#include <AliTracker.h>
+#include <TLatex.h>   //Display()
+#include <TCanvas.h>  //Display()
+#include <TGraph.h>   //Display()
+#include <TStyle.h>   //Display()
+#include <TMarker.h>  //Display()
  
-ClassImp(AliRICHhit)
-ClassImp(AliRICHdigit)
-ClassImp(AliRICH)
-    
-//___________________________________________
+ClassImp(AliRICH)    
+//__________________________________________________________________________________________________
 // RICH manager class   
-//Begin_Html
+//BEGIN_HTML
 /*
   <img src="gif/alirich.gif">
 */
-//End_Html
-
-AliRICH::AliRICH()
-{//Default ctor should not contain any new operators
-  fIshunt     = 0;
-  fHits       = 0;
-  fSDigits    = 0;
-  fNsdigits   = 0;
-  fNcerenkovs = 0;
-  fDchambers  = 0;
-  fRecHits1D = 0;
-  fRecHits3D = 0;
-  fRawClusters = 0;
-  fChambers = 0;
-  fCerenkovs  = 0;
-  for (Int_t i=0; i<kNCH; i++){
-      fNdch[i]       = 0;
-      fNrawch[i]     = 0;
-      fNrechits1D[i] = 0;
-      fNrechits3D[i] = 0;
-  }
-  fpParam=0;
+//END_HTML
+//__________________________________________________________________________________________________
+AliRICH::AliRICH():AliDetector(),fParam(0),  fSdigits(0),fNsdigits(0),fDigs(0),fClus(0) 
+{
+//Default ctor should not contain any new operators
+//AliDetector ctor deals with Hits and Digits  
+  for(int i=0;i<kNchambers;i++) fNdigs[i]  =0;
+  for(int i=0;i<kNchambers;i++) fNclus[i]=0;
+//  fCounters.ResizeTo(20); fCounters.Zero();
 }//AliRICH::AliRICH()
 //__________________________________________________________________________________________________
 AliRICH::AliRICH(const char *name, const char *title)
-        :AliDetector(name,title)
-{//Named ctor
-  if(GetDebug())Info("named ctor","Start.");
-  fpParam     =new AliRICHParam;
-  fNcerenkovs =fNsdigits   =0;//fNhits and fNdigits reset in AliDetector ctor
-  fHits       =new TClonesArray("AliRICHhit",1000  ); gAlice->AddHitList(fHits);//hits
-  fCerenkovs  =new TClonesArray("AliRICHCerenkov",1000);gAlice->AddHitList(fCerenkovs);//cerenkovs ??? to be removed    
-  fSDigits    =new TClonesArray("AliRICHdigit",100000);//sdigits
-  fDigits     =new TClonesArray("AliRICHdigit",100000);//digits
-  
-  fIshunt     =0;
-  fDchambers  =new TObjArray(kNCH);//digits             ??? to be removed
-  fRawClusters=new TObjArray(kNCH);//clusters
-  fRecHits1D  =new TObjArray(kNCH);//recos Bari
-  fRecHits3D  =new TObjArray(kNCH);//recos Lisbon
-  for(int i=0;i<kNCH;i++) {
-    fNdch[i]=fNrawch[i]=0;
-    fDchambers  ->AddAt(new TClonesArray("AliRICHDigit",10000), i); //??? to be removed
-    fRawClusters->AddAt(new TClonesArray("AliRICHRawCluster",10000), i); 
-    fRecHits1D  ->AddAt(new TClonesArray("AliRICHRecHit1D",1000), i);
-    fRecHits3D  ->AddAt(new TClonesArray("AliRICHRecHit3D",1000), i);
-  }
-  SetMarkerColor(kRed);
-  fCkovNumber=fFreonProd=0;
-  CreateChambers();
-  if(GetDebug())Info("named ctor","Stop.");
+        :AliDetector(name,title),fParam(new AliRICHParam),fSdigits(0),fNsdigits(0),fDigs(0),fClus(0)
+{
+//Named ctor
+  AliDebug(1,"Start.");
+//AliDetector ctor deals with Hits and Digits (reset them to 0, does not create them)
+  HitsCreate();          gAlice->GetMCApp()->AddHitList(fHits);
+  fCounters.ResizeTo(20); fCounters.Zero();
+  AliDebug(1,"Stop.");
 }//AliRICH::AliRICH(const char *name, const char *title)
 //__________________________________________________________________________________________________
 AliRICH::~AliRICH()
-{//dtor
-  if(GetDebug()) Info("dtor","Start.");
-
-    fIshunt  = 0;
-    delete fHits;
-    delete fSDigits;
-    delete fCerenkovs;
-    
-    //PH Delete TObjArrays
-    if (fChambers) {
-      fChambers->Delete();
-      delete fChambers;
-    }
-    if (fDchambers) {
-      fDchambers->Delete();
-      delete fDchambers;
-    }
-    if (fRawClusters) {
-      fRawClusters->Delete();
-      delete fRawClusters;
-    }
-    if (fRecHits1D) {
-      fRecHits1D->Delete();
-      delete fRecHits1D;
-    }
-    if (fRecHits3D) {
-      fRecHits3D->Delete();
-      delete fRecHits3D;
-    }                     
-  if(GetDebug()) Info("dtor","Stop.");    
-}//AliRICH::~AliRICH()
-//__________________________________________________________________________________________________
-void AliRICH::Hits2SDigits()
-{//Create a list of sdigits corresponding to list of hits. Every hit generates sdigit.
-  if(GetDebug()) Info("Hit2SDigits","Start.");
-  
-  for(Int_t iEventN=0;iEventN<gAlice->GetEventsPerRun();iEventN++){//events loop
-    fLoader->GetRunLoader()->GetEvent(iEventN);
-  
-    if(!fLoader->TreeH()) fLoader->LoadHits();
-    if(!fLoader->TreeS()) fLoader->MakeTree("S");
-    MakeBranch("S");
-    
-    AliRICHSegmentationV1 *pSeg=new AliRICHSegmentationV1;
-    AliRICHResponseV0     *pRes=new AliRICHResponseV0;
-    
-    Float_t dx=Param()->SigmaIntegration()*Param()->ChargeSpreadX();
-    Float_t dy=Param()->SigmaIntegration()*Param()->ChargeSpreadY();
-    Float_t charge;
-    
-    for(int iPrimN=0;iPrimN<TreeH()->GetEntries();iPrimN++){//prims loop
-      fLoader->TreeH()->GetEntry(iPrimN); 
-      for(Int_t iHitN=0;iHitN<Hits()->GetEntries();iHitN++){//hits loop
-        AliRICHhit *pHit=(AliRICHhit*)Hits()->At(iHitN);//get current hit
-        
-        if(pHit->Y()>0)
-          charge=Param()->TotalCharge(pHit->Particle(),pHit->Eloss(),pHit->Y()-Param()->SectorSizeY());
-        else
-          charge=Param()->TotalCharge(pHit->Particle(),pHit->Eloss(),pHit->Y()+Param()->SectorSizeY());
-                  
-        for(pSeg->FirstPad(pHit->X(),pHit->Y(),0,dx,dy);pSeg->MorePads();pSeg->NextPad()){//pads loop
-            
-          AddSDigit(pHit->Chamber(),pSeg->Ix(),pSeg->Iy(),
-                                    Int_t(charge*TMath::Abs(pRes->IntXY(pSeg))),
-                iPrimN);//chamber-xpad-ypad-qdc-track1-2-3
-        }//pads loop
-      }//hits loop
-    }//prims loop
-    
-    delete pSeg;
-    
-    fLoader->TreeS()->Fill();
-    fLoader->WriteSDigits("OVERWRITE");
-  }//events loop
-  
-  fLoader->UnloadHits();
-  fLoader->UnloadSDigits();  
-  if(GetDebug()) Info("Hit2SDigits","Stop.");
-}//void AliRICH::Hits2SDigits()
-//__________________________________________________________________________________________________
-void AliRICH::SDigits2Digits()
-{//Generate digits from sdigits.
-  if(GetDebug()) Info("SDigits2Digits","Start.");
-    
-  AliRunDigitizer *pManager = new AliRunDigitizer(1,1);
-  pManager->SetInputStream(0,"galice.root");
-  pManager->Exec("deb");
-  if(GetDebug()) Info("SDigits2Digits","Stop.");
-}//void AliRICH::SDigits2Digits()
-//__________________________________________________________________________________________________
-void AliRICH::Digits2Reco()
 {
-// Generate clusters
-// Called from alirun, single event only.     
-  if(GetDebug()) Info("Digits2Reco","Start.");
-
-  int nparticles = gAlice->GetNtrack();
-  cout << "Particles (RICH):" <<nparticles<<endl;
-  if (nparticles > 0) FindClusters(0);
+//dtor
+  AliDebug(1,"Start.");
 
-}//void AliRICH::Digits2Reco()  
+  if(fParam)     delete fParam;
+  
+  if(fHits)      delete fHits;
+  if(fSdigits)   delete fSdigits;
+  if(fDigits)    delete fDigits;
+  if(fDigs)      {fDigs->Delete();   delete fDigs;}
+  if(fClus)      {fClus->Delete();   delete fClus;}
+  AliDebug(1,"Stop.");    
+}//AliRICH::~AliRICH()
 //__________________________________________________________________________________________________
-
-
-void AliRICH::AddDigits(Int_t id, Int_t *tracks, Int_t *charges, Int_t *digits)
-{// Add a RICH digit to the list   
-
-   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
-   
-    TClonesArray &lrawcl = *((TClonesArray*)fRawClusters->At(id));
-    new(lrawcl[fNrawch[id]++]) AliRICHRawCluster(c);
-}
-//_____________________________________________________________________________
-void AliRICH::AddRecHit1D(Int_t id, Float_t *rechit, Float_t *photons, Int_t *padsx, Int_t* padsy)
-{// Add a RICH reconstructed hit to the list
-
-    TClonesArray &lrec1D = *((TClonesArray*)fRecHits1D->At(id));
-    new(lrec1D[fNrechits1D[id]++]) AliRICHRecHit1D(id,rechit,photons,padsx,padsy);
-}
-//_____________________________________________________________________________
-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
-
-    TClonesArray &lrec3D = *((TClonesArray*)fRecHits3D->At(id));
-    new(lrec3D[fNrechits3D[id]++]) AliRICHRecHit3D(id,rechit,omega,theta,phi);
-}
-//______________________________________________________________________________
 void AliRICH::BuildGeometry() 
-{//Builds a TNode geometry for event display
-  if(GetDebug())Info("BuildGeometry","Start.");
+{
+//Builds a TNode geometry for event display
+  AliInfo("Start.");
   
   TNode *node, *subnode, *top;
   top=gAlice->GetGeometry()->GetNode("alice");
-  
-  new TBRIK("S_RICH","S_RICH","void",71.09999,11.5,73.15);
 
-  Float_t wid=fpParam->SectorSizeX();
-  Float_t len=fpParam->SectorSizeY();
-  new TBRIK("PHOTO","PHOTO","void",wid/2,0.1,len/2);
-  
-  for(int i=1;i<=kNCH;i++){
+  Float_t widx =P()->SectorSizeX();
+  Float_t leny =P()->SectorSizeY();
+  Float_t dz   =P()->Zfreon()+P()->Zwin()+P()->Pc2Win();
+  Float_t dead =P()->DeadZone();
+
+  new TBRIK("RICH","RICH","void",widx+dead/2,leny+leny/2+dead,dz+0.1); //RICH chamber
+  new TBRIK("RPC" ,"RPC" ,"void",widx/2,leny/2,0.01);                  //RICH sector 
+
+  for(int i=1;i<=P()->Nchambers();i++){
     top->cd();
-    node = new TNode(Form("RICH%i",i),Form("RICH%i",i),"S_RICH",C(i)->X(),C(i)->Y(),C(i)->Z(),C(i)->RotMatrixName());
+    node = new TNode(Form("RICH%i",i),Form("RICH%i",i),"RICH",C(i)->Center().X(),C(i)->Center().Y(),C(i)->Center().Z(),C(i)->RotMatrixName());
     node->SetLineColor(kRed);
     node->cd();
-    subnode = new TNode("PHOTO1","PHOTO1","PHOTO",wid+fpParam->DeadZone(),5,len/2+fpParam->DeadZone()/2,"");
+    subnode = new TNode("PHOTO1","PHOTO1","RPC",-widx/2-dead/2,-leny-dead/2,dz,"");
     subnode->SetLineColor(kGreen);
     fNodes->Add(subnode);
-    subnode = new TNode("PHOTO1","PHOTO1","PHOTO",0,5,len/2+fpParam->DeadZone()/2,"");
+    subnode = new TNode("PHOTO1","PHOTO1","RPC", widx/2+dead/2,-leny-dead/2,dz,"");
     subnode->SetLineColor(kGreen);
     fNodes->Add(subnode);
-    subnode = new TNode("PHOTO1","PHOTO1","PHOTO",-wid-fpParam->DeadZone(),5,len/2+fpParam->DeadZone()/2,"");
+    subnode = new TNode("PHOTO1","PHOTO1","RPC",-widx/2-dead/2,           0,dz,"");
     subnode->SetLineColor(kGreen);
     fNodes->Add(subnode);
-    subnode = new TNode("PHOTO1","PHOTO1","PHOTO",wid+fpParam->DeadZone(),5,-len/2-fpParam->DeadZone()/2,"");
+    subnode = new TNode("PHOTO1","PHOTO1","RPC", widx/2+dead/2,           0,dz,"");
     subnode->SetLineColor(kGreen);
     fNodes->Add(subnode);
-    subnode = new TNode("PHOTO1","PHOTO1","PHOTO",0,5,-len/2 -fpParam->DeadZone()/2,"");
+    subnode = new TNode("PHOTO1","PHOTO1","RPC",-widx/2-dead/2, leny+dead/2,dz,"");
     subnode->SetLineColor(kGreen);
     fNodes->Add(subnode);
-    subnode = new TNode("PHOTO1","PHOTO1","PHOTO",-wid-fpParam->DeadZone(),5,-len/2 - fpParam->DeadZone()/2,"");
+    subnode = new TNode("PHOTO1","PHOTO1","RPC", widx/2+dead/2, leny+dead/2,dz,"");
     subnode->SetLineColor(kGreen);
     fNodes->Add(subnode);
     fNodes->Add(node);
-  }  
-  if(GetDebug())Info("BuildGeometry","Stop.");    
+  }
+
+  AliDebug(1,"Stop.");    
 }//void AliRICH::BuildGeometry()
-//______________________________________________________________________________
+//__________________________________________________________________________________________________
 void AliRICH::CreateMaterials()
 {
-    //
-    // *** DEFINITION OF AVAILABLE RICH MATERIALS *** 
-    // ORIGIN    : NICK VAN EIJNDHOVEN 
-    // Modified by:  N. Colonna (INFN - BARI, Nicola.Colonna@ba.infn.it) 
-    //               R.A. Fini  (INFN - BARI, Rosanna.Fini@ba.infn.it) 
-    //               R.A. Loconsole (Bari University, loco@riscom.ba.infn.it) 
-    //
-    Int_t   isxfld = gAlice->Field()->Integ();
-    Float_t sxmgmx = gAlice->Field()->Max();
-    Int_t i;
-
-    /************************************Antonnelo's Values (14-vectors)*****************************************/
-    /*
-    Float_t ppckov[14] = { 5.63e-9,5.77e-9,5.9e-9,6.05e-9,6.2e-9,6.36e-9,6.52e-9,
-                          6.7e-9,6.88e-9,7.08e-9,7.3e-9,7.51e-9,7.74e-9,8e-9 };
-    Float_t rIndexQuarz[14] = { 1.528309,1.533333,
-                                1.538243,1.544223,1.550568,1.55777,
-                                1.565463,1.574765,1.584831,1.597027,
-                              1.611858,1.6277,1.6472,1.6724 };
-    Float_t rIndexOpaqueQuarz[14] = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-    Float_t rIndexMethane[14] = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-    Float_t rIndexGrid[14] = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-    Float_t abscoFreon[14] = { 179.0987,179.0987,
-                               179.0987,179.0987,179.0987,142.92,56.65,13.95,10.43,7.07,2.03,.5773,.33496,0. };
-    //Float_t abscoFreon[14] = { 1e-5,1e-5,1e-5,1e-5,1e-5,1e-5,1e-5,1e-5,1e-5,
-       //                       1e-5,1e-5,1e-5,1e-5,1e-5 };
-    Float_t abscoQuarz[14] = { 64.035,39.98,35.665,31.262,27.527,22.815,21.04,17.52,
-                               14.177,9.282,4.0925,1.149,.3627,.10857 };
-    Float_t abscoOpaqueQuarz[14] = { 1e-5,1e-5,1e-5,1e-5,1e-5,1e-5,1e-5,1e-5,1e-5,
-                                1e-5,1e-5,1e-5,1e-5,1e-5 };
-    Float_t abscoCsI[14] = { 1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,
-                             1e-4,1e-4,1e-4,1e-4 };
-    Float_t abscoMethane[14] = { 1e6,1e6,1e6,1e6,1e6,1e6,1e6,1e6,1e6,1e6,1e6,
-                                 1e6,1e6,1e6 };
-    Float_t abscoGrid[14] = { 1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,1e-4,
-                             1e-4,1e-4,1e-4,1e-4 };
-    Float_t efficAll[14] = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-    Float_t efficCsI[14] = { 6e-4,.005,.0075,.01125,.045,.117,.135,.16575,
-                             .17425,.1785,.1836,.1904,.1938,.221 };
-    Float_t efficGrid[14] = { 1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1.,1. };
-    */
-   
-    
-    /**********************************End of Antonnelo's Values**********************************/
-    
-    /**********************************Values from rich_media.f (31-vectors)**********************************/
-    
-
-    //Photons energy intervals
-    Float_t ppckov[26];
-    for (i=0;i<26;i++) 
-    {
-       ppckov[i] = (Float_t(i)*0.1+5.5)*1e-9;
-    }
-    
-    
-    //Refraction index for quarz
-    Float_t rIndexQuarz[26];
-    Float_t  e1= 10.666;
-    Float_t  e2= 18.125;
-    Float_t  f1= 46.411;
-    Float_t  f2= 228.71;
-    for (i=0;i<26;i++)
-    {
-       Float_t ene=ppckov[i]*1e9;
-       Float_t a=f1/(e1*e1 - ene*ene);
-       Float_t b=f2/(e2*e2 - ene*ene);
-       rIndexQuarz[i] = TMath::Sqrt(1. + a + b );
-    } 
-    
-    //Refraction index for opaque quarz, methane and grid
-    Float_t rIndexOpaqueQuarz[26];
-    Float_t rIndexMethane[26];
-    Float_t rIndexGrid[26];
-    for (i=0;i<26;i++)
-    {
-       rIndexOpaqueQuarz[i]=1;
-       rIndexMethane[i]=1.000444;
-       rIndexGrid[i]=1;
-    } 
-    
-    //Absorption index for freon
-    Float_t abscoFreon[26] = {179.0987, 179.0987, 179.0987, 179.0987, 179.0987,  179.0987, 179.0987, 179.0987, 
-                              179.0987, 142.9206, 56.64957, 25.58622, 13.95293, 12.03905, 10.42953, 8.804196, 
-                              7.069031, 4.461292, 2.028366, 1.293013, .577267,   .40746,  .334964, 0., 0., 0.};
-    
-    //Absorption index for quarz
-    /*Float_t Qzt [21] = {.0,.0,.005,.04,.35,.647,.769,.808,.829,.844,.853,.858,.869,.887,.903,.902,.902,
-                       .906,.907,.907,.907};
-    Float_t Wavl2[] = {150.,155.,160.0,165.0,170.0,175.0,180.0,185.0,190.0,195.0,200.0,205.0,210.0,
-                      215.0,220.0,225.0,230.0,235.0,240.0,245.0,250.0};                                 
-    Float_t abscoQuarz[31];         
-    for (Int_t i=0;i<31;i++)
-    {
-       Float_t Xlam = 1237.79 / (ppckov[i]*1e9);
-       if (Xlam <= 160) abscoQuarz[i] = 0;
-       if (Xlam > 250) abscoQuarz[i] = 1;
-       else 
-       {
-           for (Int_t j=0;j<21;j++)
-           {
-               if (Xlam > Wavl2[j] && Xlam < Wavl2[j+1])
-               {
-                   Float_t Dabs = (Qzt[j+1] - Qzt[j])/(Wavl2[j+1] - Wavl2[j]);
-                   Float_t Abso = Qzt[j] + Dabs*(Xlam - Wavl2[j]);
-                   abscoQuarz[i] = -5.0/(TMath::Log(Abso));
-               } 
-           }
-       }
-    }*/
-
-    /*Float_t abscoQuarz[31] = {49.64211, 48.41296, 47.46989, 46.50492, 45.13682, 44.47883, 43.1929 , 41.30922, 40.5943 ,
-                              39.82956, 38.98623, 38.6247 , 38.43448, 37.41084, 36.22575, 33.74852, 30.73901, 24.25086, 
-                              17.94531, 11.88753, 5.99128,  3.83503,  2.36661,  1.53155, 1.30582, 1.08574, .8779708, 
-                              .675275, 0., 0., 0.};
-    
-    for (Int_t i=0;i<31;i++)
-    {
-       abscoQuarz[i] = abscoQuarz[i]/10;
-    }*/
-
-    Float_t abscoQuarz [26] = {105.8, 65.52, 48.58, 42.85, 35.79, 31.262, 28.598, 27.527, 25.007, 22.815, 21.004,
-                               19.266, 17.525, 15.878, 14.177, 11.719, 9.282, 6.62, 4.0925, 2.601, 1.149, .667, .3627,
-                               .192, .1497, .10857};
-    
-    //Absorption index for methane
-    Float_t abscoMethane[26];
-    for (i=0;i<26;i++) 
-    {
-       abscoMethane[i]=AbsoCH4(ppckov[i]*1e9); 
-    }
-    
-    //Absorption index for opaque quarz, csi and grid, efficiency for all and grid
-    Float_t abscoOpaqueQuarz[26];
-    Float_t abscoCsI[26];
-    Float_t abscoGrid[26];
-    Float_t efficAll[26];
-    Float_t efficGrid[26];
-    for (i=0;i<26;i++)
-    { 
-       abscoOpaqueQuarz[i]=1e-5; 
-       abscoCsI[i]=1e-4; 
-       abscoGrid[i]=1e-4; 
-       efficAll[i]=1; 
-       efficGrid[i]=1;
-    } 
-    
-    //Efficiency for csi 
-    
-    Float_t efficCsI[26] = {0.000199999995, 0.000600000028, 0.000699999975, 0.00499999989, 0.00749999983, 0.010125,
-                            0.0242999997, 0.0405000001, 0.0688500032, 0.105299994, 0.121500008, 0.141749993, 0.157949999,
-                            0.162, 0.166050002, 0.167669997, 0.174299985, 0.176789999, 0.179279998, 0.182599992, 0.18592,
-                            0.187579989, 0.189239994, 0.190899998, 0.207499996, 0.215799987};
-       
-    
-
-    //FRESNEL LOSS CORRECTION FOR PERPENDICULAR INCIDENCE AND
-    //UNPOLARIZED PHOTONS
-
-    for (i=0;i<26;i++)
-    {
-       efficCsI[i] = efficCsI[i]/(1.-Fresnel(ppckov[i]*1e9,1.,0)); 
-    }
-       
-    /*******************************************End of rich_media.f***************************************/
-
+// Definition of available RICH materials  
+        
+  Int_t   material=0; //tmp material id number
+  Float_t a=0,z=0,den=0,radl=0,absl=0; //tmp material parameters
   
-
-    
-    
-    
-    Float_t afre[2], agri, amet[2], aqua[2], ahon, zfre[2], zgri, zhon, 
-    zmet[2], zqua[2];
-    Int_t nlmatfre;
-    Float_t densquao;
-    Int_t nlmatmet, nlmatqua;
-    Float_t wmatquao[2], rIndexFreon[26];
-    Float_t aquao[2], epsil, stmin, zquao[2];
-    Int_t nlmatquao;
-    Float_t radlal, densal, tmaxfd, deemax, stemax;
-    Float_t aal, zal, radlgri, densfre, radlhon, densgri, denshon,densqua, densmet, wmatfre[2], wmatmet[2], wmatqua[2];
-    
-    Int_t *idtmed = fIdtmed->GetArray()-999;
-    
-    // --- Photon energy (GeV) 
-    // --- Refraction indexes 
-    for (i = 0; i < 26; ++i) {
-      rIndexFreon[i] = ppckov[i] * .0172 * 1e9 + 1.177;
-      //rIndexFreon[i] = 1;
-    }
-            
-    // --- Detection efficiencies (quantum efficiency for CsI) 
-    // --- Define parameters for honeycomb. 
-    //     Used carbon of equivalent rad. lenght 
-    
-    ahon    = 12.01;
-    zhon    = 6.;
-    denshon = 0.1;
-    radlhon = 18.8;
-    
-    // --- Parameters to include in GSMIXT, relative to Quarz (SiO2) 
-    
-    aqua[0]    = 28.09;
-    aqua[1]    = 16.;
-    zqua[0]    = 14.;
-    zqua[1]    = 8.;
-    densqua    = 2.64;
-    nlmatqua   = -2;
-    wmatqua[0] = 1.;
-    wmatqua[1] = 2.;
+  Float_t tmaxfd=-10.0, deemax=-0.2, stemax=-0.1,epsil=0.001, stmin=-0.001; 
+  Int_t   isxfld = gAlice->Field()->Integ();
+  Float_t sxmgmx = gAlice->Field()->Max();
     
-    // --- Parameters to include in GSMIXT, relative to opaque Quarz (SiO2) 
-    
-    aquao[0]    = 28.09;
-    aquao[1]    = 16.;
-    zquao[0]    = 14.;
-    zquao[1]    = 8.;
-    densquao    = 2.64;
-    nlmatquao   = -2;
-    wmatquao[0] = 1.;
-    wmatquao[1] = 2.;
-    
-    // --- Parameters to include in GSMIXT, relative to Freon (C6F14) 
-    
-    afre[0]    = 12.;
-    afre[1]    = 19.;
-    zfre[0]    = 6.;
-    zfre[1]    = 9.;
-    densfre    = 1.7;
-    nlmatfre   = -2;
-    wmatfre[0] = 6.;
-    wmatfre[1] = 14.;
-    
-    // --- Parameters to include in GSMIXT, relative to methane (CH4) 
-    
-    amet[0]    = 12.01;
-    amet[1]    = 1.;
-    zmet[0]    = 6.;
-    zmet[1]    = 1.;
-    densmet    = 7.17e-4;
-    nlmatmet   = -2;
-    wmatmet[0] = 1.;
-    wmatmet[1] = 4.;
-    
-    // --- Parameters to include in GSMIXT, relative to anode grid (Cu) 
+  Float_t aAir[4]={12,14,16,36};  Float_t zAir[4]={6,7,8,18}; Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};//total 0.9999999
+  AliMixture(++material, "RichAir",aAir,zAir,den=0.00120479,4,wAir);                                          //1 (Air) 0.01% C 75% N  23% O 1% Ar
+  AliMedium(kAir, "RichAir",material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
   
-    agri    = 63.54;
-    zgri    = 29.;
-    densgri = 8.96;
-    radlgri = 1.43;
-    
-    // --- Parameters to include in GSMATE related to aluminium sheet 
+  AliMixture(++material, "RichAerogel",aAir,zAir,den=P()->DenGel(),4,wAir);                     //Aerogel represented by Air
+  AliMedium(kGel, "RichAerogel",material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+  AliMixture(++material, "RichAerogelReflector",aAir,zAir,den=P()->DenGel(),4,wAir);           //Aerogel reflector represented by Air
+  AliMedium(kReflector, "RichAerogelReflector",material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+  AliMaterial(++material, "RichRohacell", a=12.01,z=6.0, den=0.1,     radl=18.8,   absl=0);                   //2 Rohacell 51 C-equiv radl rad cover
+  AliMedium(kRoha, "RichRohacell", material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+  Float_t  aQuartz[2]={28.09,16.0};  Float_t  zQuartz[2]={14.00, 8.0};  Float_t  wQuartz[2]={1,2};
+  AliMixture(++material, "RichSiO2",aQuartz,zQuartz,den=2.64,-2, wQuartz);                                    //3 Quarz (SiO2) -trasparent rad window
+  AliMedium(kSiO2, "RichSiO2",material, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+  Float_t  aFreon[2]={12,19};  Float_t  zFreon[2]={6,9};  Float_t wmatFreon[2]={6,14};                        // C12-6 F19-9   
+  AliMixture(++material, "RichC6F14",aFreon,zFreon,den=1.68,-2,wmatFreon);                                    //4 Freon (C6F14) 
+  AliMedium(kC6F14, "RichC6F14",material, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+  Float_t aMethane[2]={12.01,1}; Float_t zMethane[2]={6,1}; Float_t wMethane[2]={1,4};
+  AliMixture (++material, "RichCH4", aMethane, zMethane, den=7.17e-4,-2, wMethane);                        //5,9 methane (CH4) normal and for Gap    
+  AliMedium(kCH4, "RichCH4"   , material, 1, isxfld, sxmgmx, tmaxfd, stemax,  deemax, epsil,  stmin);  
+  AliMixture (++material, "RichCH4gap", aMethane, zMethane, den=7.17e-4,-2, wMethane);                      //5,9 methane (CH4) normal and for Gap    
+  AliMedium(kGap, "RichCH4gap", material, 1, isxfld, sxmgmx, tmaxfd, 0.1   , -deemax, epsil, -stmin);
+    
+  AliMaterial(++material, "RichCsI",      a=12.01,z=6.0, den=0.1,     radl=18.8,   absl=0);                   //6 CsI-radl equivalent
+  AliMedium(kCsI, "RichCsI", material, 1, isxfld, sxmgmx,tmaxfd, stemax, deemax, epsil, stmin);
+  
+  AliMaterial(++material, "RichGridCu",    a=63.54,z=29.0,den=8.96,    radl=1.43,   absl=0);                   //7 anode grid (Cu) 
+  AliMedium(kGridCu, "RichGridCu", material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
     
-    aal    = 26.98;
-    zal    = 13.;
-    densal = 2.7;
-    radlal = 8.9;
-
-    // --- Glass parameters
-
-    Float_t aglass[5]={12.01, 28.09, 16.,   10.8,  23.};
-    Float_t zglass[5]={ 6.,   14.,    8.,    5.,   11.};
-    Float_t wglass[5]={ 0.5,  0.105, 0.355, 0.03,  0.01};
-    Float_t dglass=1.74;
+  AliMaterial(++material, "RichPcbCu",     a=63.54,z=29.0,den=8.96,    radl=1.4,    absl=0);                   //12 Cu
+  AliMedium(kCu, "RichPcbCu", material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+  AliMixture (++material, "RichOpSiO2",aQuartz, zQuartz, den=2.64, -2, wQuartz);                             //8 Quarz (SiO2) - opaque
+  AliMedium(kOpSiO2, "RichOpSiO2",material, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+  AliMaterial(++material, "RichAl",     a=26.98,z=13.0,den=2.699,     radl=8.9,    absl=0);                 //10 aluminium sheet (Al)
+  AliMedium(kAl, "RichAl", material, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+  Float_t aGlass[5]={12.01,28.09,16,10.8,23}; Float_t zGlass[5]={6,14,8,5,11};  Float_t wGlass[5]={0.5,0.105,0.355,0.03,0.01};
+  AliMixture(++material,"RichGlass",aGlass, zGlass, den=1.74, 5, wGlass);                                    //11 Glass 50%-C 10.5%-Si 35.5%-O 3%-B 1%-Na
+  AliMedium(kGlass, "RichGlass", material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
 
+  den=19.3;
+  AliMaterial(++material, "RichW",  a=183.84,z=74.0,den,    radl=0.35,    absl=185.0/den);              //13 W - anod wires
+  AliMedium(kW, "RichW", material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+  
+  if(P()->IsRadioSrc()){
+    AliInfo("Special radioactive source materials");
+    den=7.87;
+    AliMaterial(++material, "RichSteel",  a=55.845,z=26.0,den,    radl=1.76,    absl=131.9/den);        //14 Steel (Fe)
+    AliMedium(kSteel, "RichSteel", material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  
+    AliMaterial(++material, "RichPerpex",  a=63.54,z=29.0,den=8.96,    radl=1.4,    absl=0);                 //15 Perpex
+    AliMedium(kPerpex, "RichPerpex", material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
     
-    AliMaterial(1, "Air     $", 14.61, 7.3, .001205, 30420., 67500);
-    AliMaterial(6, "HON", ahon, zhon, denshon, radlhon, 0);
-    AliMaterial(16, "CSI", ahon, zhon, denshon, radlhon, 0);
-    AliMixture(20, "QUA", aqua, zqua, densqua, nlmatqua, wmatqua);
-    AliMixture(21, "QUAO", aquao, zquao, densquao, nlmatquao, wmatquao);
-    AliMixture(30, "FRE", afre, zfre, densfre, nlmatfre, wmatfre);
-    AliMixture(40, "MET", amet, zmet, densmet, nlmatmet, wmatmet);
-    AliMixture(41, "METG", amet, zmet, densmet, nlmatmet, wmatmet);
-    AliMaterial(11, "GRI", agri, zgri, densgri, radlgri, 0);
-    AliMaterial(50, "ALUM", aal, zal, densal, radlal, 0);
-    AliMixture(32, "GLASS",aglass, zglass, dglass, 5, wglass);
-    AliMaterial(31, "COPPER$",   63.54,    29.,   8.96,  1.4, 0.);
-    
-    tmaxfd = -10.;
-    stemax = -.1;
-    deemax = -.2;
-    epsil  = .001;
-    stmin  = -.001;
-    
-    AliMedium(1, "DEFAULT MEDIUM AIR$", 1, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(2, "HONEYCOMB$", 6, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(3, "QUARZO$", 20, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(4, "FREON$", 30, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(5, "METANO$", 40, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(6, "CSI$", 16, 1, isxfld, sxmgmx,tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(7, "GRIGLIA$", 11, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(8, "QUARZOO$", 21, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(9, "GAP$", 41, 1, isxfld, sxmgmx,tmaxfd, .1, -deemax, epsil, -stmin);
-    AliMedium(10, "ALUMINUM$", 50, 1, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(11, "GLASS", 32, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
-    AliMedium(12, "PCB_COPPER", 31, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+    AliMaterial(++material, "RichSr90",  a=87.62,z=38.0,den=2.54,    radl=4.24,    absl=0);                  //16 Sr90
+    AliMedium(kSr90, "RichSr90", material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
     
-
-    gMC->SetCerenkov(idtmed[1000], 26, ppckov, abscoMethane, efficAll, rIndexMethane);
-    gMC->SetCerenkov(idtmed[1001], 26, ppckov, abscoMethane, efficAll, rIndexMethane);
-    gMC->SetCerenkov(idtmed[1002], 26, ppckov, abscoQuarz, efficAll,rIndexQuarz);
-    gMC->SetCerenkov(idtmed[1003], 26, ppckov, abscoFreon, efficAll,rIndexFreon);
-    gMC->SetCerenkov(idtmed[1004], 26, ppckov, abscoMethane, efficAll, rIndexMethane);
-    gMC->SetCerenkov(idtmed[1005], 26, ppckov, abscoCsI, efficCsI, rIndexMethane);
-    gMC->SetCerenkov(idtmed[1006], 26, ppckov, abscoGrid, efficGrid, rIndexGrid);
-    gMC->SetCerenkov(idtmed[1007], 26, ppckov, abscoOpaqueQuarz, efficAll, rIndexOpaqueQuarz);
-    gMC->SetCerenkov(idtmed[1008], 26, ppckov, abscoMethane, efficAll, rIndexMethane);
-    gMC->SetCerenkov(idtmed[1009], 26, ppckov, abscoGrid, efficGrid, rIndexGrid);
-    gMC->SetCerenkov(idtmed[1010], 26, ppckov, abscoOpaqueQuarz, efficAll, rIndexOpaqueQuarz);
-}
+    Float_t aMylar[5]={12.01,1,16}; Float_t zMylar[5]={6,1,8};  Float_t wMylar[5]={5,4,5};                  //17 Mylar C5H4O5
+    AliMixture(++material,"RichMylar",aMylar, zMylar, den=1.39, -3, wMylar); 
+    AliMedium(kMylar, "RichMylar", material, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+  }
+  
+//Optical properties:
+#include "Opticals.h"
+  gMC->SetCerenkov((*fIdtmed)[kAir]      , kNbins, aPckov, aAbsCH4    , aQeAll, aIdxCH4);       //1 Air
+  gMC->SetCerenkov((*fIdtmed)[kRoha]     , kNbins, aPckov, aAbsCH4    , aQeAll, aIdxCH4);       //2 Honeycomb  
+  gMC->SetCerenkov((*fIdtmed)[kSiO2]     , kNbins, aPckov, aAbsSiO2   , aQeAll, aIdxSiO2);      //3 Quartz SiO2 
+  gMC->SetCerenkov((*fIdtmed)[kC6F14]    , kNbins, aPckov, aAbsC6F14  , aQeAll, aIdxC6F14);     //4 Freon C6F14
+  gMC->SetCerenkov((*fIdtmed)[kCH4]      , kNbins, aPckov, aAbsCH4    , aQeAll, aIdxCH4);       //5 Methane CH4 
+  gMC->SetCerenkov((*fIdtmed)[kCsI]      , kNbins, aPckov, aAbsCsI    , aQeCsI, aIdxCH4);       //6 CsI
+  gMC->SetCerenkov((*fIdtmed)[kGridCu]   , kNbins, aPckov, aAbsGrid   , aQeAll, aIdxMetal);     //7 grid Cu
+  gMC->SetCerenkov((*fIdtmed)[kOpSiO2]   , kNbins, aPckov, aAbsOpSiO2 , aQeAll, aIdxMetal);     //8 Opaque quartz SiO2
+  gMC->SetCerenkov((*fIdtmed)[kGap]      , kNbins, aPckov, aAbsCH4    , aQeAll, aIdxCH4);       //9 Special methane gap
+  gMC->SetCerenkov((*fIdtmed)[kAl]       , kNbins, aPckov, aAbsGrid   , aQeAll, aIdxMetal);     //10 Aluminium
+  gMC->SetCerenkov((*fIdtmed)[kGlass]    , kNbins, aPckov, aAbsOpSiO2 , aQeAll, aIdxMetal);     //11 Glass    
+  gMC->SetCerenkov((*fIdtmed)[kGel]      , kNbins, aPckov, aAbsGel    , aQeAll, aIdxGel);       //12 Aerogel
+  gMC->SetCerenkov((*fIdtmed)[kReflector], kNbins, aPckov, aAbsRef    , aQeAll, aIdxMetal);     //13 Aerogel reflector
+}//void AliRICH::CreateMaterials()
 //__________________________________________________________________________________________________
 Float_t AliRICH::Fresnel(Float_t ene,Float_t pdoti, Bool_t pola)
 {
@@ -654,808 +287,979 @@ Float_t AliRICH::Fresnel(Float_t ene,Float_t pdoti, Bool_t pola)
       
     fresn = fresn*rO;
     return(fresn);
-}//Float_t AliRICH::Fresnel(Float_t ene,Float_t pdoti, Bool_t pola)
-//__________________________________________________________________________________________________
-Float_t AliRICH::AbsoCH4(Float_t x)
-{
-
-    //KLOSCH,SCH4(9),WL(9),EM(9),ALENGTH(31)
-    Float_t sch4[9] = {.12,.16,.23,.38,.86,2.8,7.9,28.,80.};              //MB X 10^22
-    //Float_t wl[9] = {153.,152.,151.,150.,149.,148.,147.,146.,145};
-    Float_t em[9] = {8.1,8.158,8.212,8.267,8.322,8.378,8.435,8.493,8.55};
-    const Float_t kLosch=2.686763E19;                                      // LOSCHMIDT NUMBER IN CM-3
-    const Float_t kIgas1=100, kIgas2=0, kOxy=10., kWater=5., kPressure=750.,kTemperature=283.;                                      
-    Float_t pn=kPressure/760.;
-    Float_t tn=kTemperature/273.16;
-    
-       
-// ------- METHANE CROSS SECTION -----------------
-// ASTROPH. J. 214, L47 (1978)
-       
-    Float_t sm=0;
-    if (x<7.75) 
-       sm=.06e-22;
-    
-    if(x>=7.75 && x<=8.1)
-    {
-       Float_t c0=-1.655279e-1;
-       Float_t c1=6.307392e-2;
-       Float_t c2=-8.011441e-3;
-       Float_t c3=3.392126e-4;
-       sm=(c0+c1*x+c2*x*x+c3*x*x*x)*1.e-18;
-    }
-    
-    if (x> 8.1)
-    {
-       Int_t j=0;
-       while (x<=em[j] && x>=em[j+1])
-       {
-           j++;
-           Float_t a=(sch4[j+1]-sch4[j])/(em[j+1]-em[j]);
-           sm=(sch4[j]+a*(x-em[j]))*1e-22;
-       }
-    }
-    
-    Float_t dm=(kIgas1/100.)*(1.-((kOxy+kWater)/1.e6))*kLosch*pn/tn;
-    Float_t abslm=1./sm/dm;
-    
-//    ------- ISOBUTHANE CROSS SECTION --------------
-//     i-C4H10 (ai) abs. length from curves in
-//     Lu-McDonald paper for BARI RICH workshop .
-//     -----------------------------------------------------------
-    
-    Float_t ai;
-    Float_t absli;
-    if (kIgas2 != 0) 
-    {
-       if (x<7.25)
-           ai=100000000.;
-       
-       if(x>=7.25 && x<7.375)
-           ai=24.3;
-       
-       if(x>=7.375)
-           ai=.0000000001;
-       
-       Float_t si = 1./(ai*kLosch*273.16/293.);                    // ISOB. CRO.SEC.IN CM2
-       Float_t di=(kIgas2/100.)*(1.-((kOxy+kWater)/1.e6))*kLosch*pn/tn;
-       absli =1./si/di;
-    }
-    else
-       absli=1.e18;
-//    ---------------------------------------------------------
-//
-//       transmission of O2
-//
-//       y= path in cm, x=energy in eV
-//       so= cross section for UV absorption in cm2
-//       do= O2 molecular density in cm-3
-//    ---------------------------------------------------------
-    
-    Float_t abslo;
-    Float_t so=0;
-    if(x>=6.0)
-    {
-       if(x>=6.0 && x<6.5)
-       {
-           so=3.392709e-13 * TMath::Exp(2.864104 *x);
-           so=so*1e-18;
-       }
-       
-       if(x>=6.5 && x<7.0) 
-       {
-           so=2.910039e-34 * TMath::Exp(10.3337*x);
-           so=so*1e-18;
-       }
-           
-
-       if (x>=7.0) 
-       {
-           Float_t a0=-73770.76;
-           Float_t a1=46190.69;
-           Float_t a2=-11475.44;
-           Float_t a3=1412.611;
-           Float_t a4=-86.07027;
-           Float_t a5=2.074234;
-           so= a0+(a1*x)+(a2*x*x)+(a3*x*x*x)+(a4*x*x*x*x)+(a5*x*x*x*x*x);
-           so=so*1e-18;
-       }
-       
-       Float_t dox=(kOxy/1e6)*kLosch*pn/tn;
-       abslo=1./so/dox;
-    }
-    else
-       abslo=1.e18;
-//     ---------------------------------------------------------
-//
-//       transmission of H2O
-//
-//       y= path in cm, x=energy in eV
-//       sw= cross section for UV absorption in cm2
-//       dw= H2O molecular density in cm-3
-//     ---------------------------------------------------------
-    
-    Float_t abslw;
-    
-    Float_t b0=29231.65;
-    Float_t b1=-15807.74;
-    Float_t b2=3192.926;
-    Float_t b3=-285.4809;
-    Float_t b4=9.533944;
-    
-    if(x>6.75)
-    {    
-       Float_t sw= b0+(b1*x)+(b2*x*x)+(b3*x*x*x)+(b4*x*x*x*x);
-       sw=sw*1e-18;
-       Float_t dw=(kWater/1e6)*kLosch*pn/tn;
-       abslw=1./sw/dw;
-    }
-    else
-       abslw=1.e18;
-           
-//    ---------------------------------------------------------
-    
-    Float_t alength=1./(1./abslm+1./absli+1./abslo+1./abslw);
-    return (alength);
-}
-//__________________________________________________________________________________________________
-void AliRICH::ResetDigits()
-{//Reset number of digits and the digits array for this detector
-  for ( int i=0;i<kNCH;i++ ) {
-    if (fDchambers && fDchambers->At(i))   fDchambers->At(i)->Clear();
-    if (fNdch)  fNdch[i]=0;
-  }
-}
-//__________________________________________________________________________________________________
-void AliRICH::ResetRawClusters()
-{//Reset number of raw clusters and the raw clust array for this detector
-  for ( int i=0;i<kNCH;i++ ) {
-    if (fRawClusters->At(i))    ((TClonesArray*)fRawClusters->At(i))->Clear();
-    if (fNrawch)  fNrawch[i]=0;
-  }
-}
-//__________________________________________________________________________________________________
-void AliRICH::ResetRecHits1D()
-{//Reset number of raw clusters and the raw clust array for this detector
-  for ( int i=0;i<kNCH;i++ ) {
-    if (fRecHits1D->At(i))    ((TClonesArray*)fRecHits1D->At(i))->Clear();
-    if (fNrechits1D)  fNrechits1D[i]=0;
-  }
-}
-
-//__________________________________________________________________________________________________
-void AliRICH::ResetRecHits3D()
-{// Reset number of raw clusters and the raw clust array for this detector
-  for ( int i=0;i<kNCH;i++ ) {
-    if (fRecHits3D->At(i))    ((TClonesArray*)fRecHits3D->At(i))->Clear();
-    if (fNrechits3D)  fNrechits3D[i]=0;
-  }
-}
-//__________________________________________________________________________________________________
-void AliRICH::FindClusters(Int_t nev /*kir,Int_t lastEntry*/)
-{// Loop on chambers and on cathode planes
-    for (Int_t icat=1;icat<2;icat++) {
-       gAlice->ResetDigits();
-       gAlice->TreeD()->GetEvent(0);
-       for (Int_t ich=0;ich<kNCH;ich++) {
-         AliRICHChamber* iChamber=(AliRICHChamber*)fChambers->At(ich);
-         TClonesArray *pRICHdigits  = this->DigitsAddress(ich);
-         if (pRICHdigits == 0)       
-             continue;
-         //
-         // Get ready the current chamber stuff
-         //
-         AliRICHResponse* response = iChamber->GetResponseModel();
-         AliSegmentation*  seg = iChamber->GetSegmentationModel();
-         AliRICHClusterFinder* rec = iChamber->GetReconstructionModel();
-         if (seg) {      
-             rec->SetSegmentation(seg);
-             rec->SetResponse(response);
-             rec->SetDigits(pRICHdigits);
-             rec->SetChamber(ich);
-             if (nev==0) rec->CalibrateCOG(); 
-             rec->FindRawClusters();
-         }  
-         TClonesArray *fRch;
-         fRch=RawClustAddress(ich);
-         fRch->Sort();
-       } // for ich
-
-       gAlice->TreeR()->Fill();
-       TClonesArray *fRch;
-       for (int i=0;i<kNCH;i++) {
-           fRch=RawClustAddress(i);
-           fRch->GetEntriesFast();
-       }
-       
-       ResetRawClusters();
-       
-    } // for icat
-    
-    char hname[30];
-    sprintf(hname,"TreeR%d",nev);
-    gAlice->TreeR()->Write(hname,kOverwrite,0);
-    gAlice->TreeR()->Reset();    
-}//void AliRICH::FindClusters(Int_t nev)
-//__________________________________________________________________________________________________
-void AliRICH::MakeBranchInTreeD(TTree *treeD, const char *file)
-{// Create TreeD branches for the RICH.
-  if(GetDebug())Info("MakeBranchInTreeD","Start.");
-
-  const Int_t kBufferSize = 4000;
-  char branchname[30];
-    
-  //
-  // one branch for digits per chamber
-  // 
-  for (Int_t i=0; i<kNCH ;i++) {
-    sprintf(branchname,"%sDigits%d",GetName(),i+1);    
-    if (fDchambers && treeD) {
-      MakeBranchInTree(treeD,branchname, &((*fDchambers)[i]), kBufferSize, file);
-//      printf("Making Branch %s for digits in chamber %d\n",branchname,i+1);
-    }
-  }
-}
+}//Fresnel()
 //__________________________________________________________________________________________________
 void AliRICH::MakeBranch(Option_t* option)
-{//Create Tree branches for the RICH.
-  if(GetDebug())Info("MakeBranch","Start with option= %s.",option);
+{
+//Create Tree branches for the RICH.
+  AliDebug(1,Form("Start with option= %s.",option));
     
   const Int_t kBufferSize = 4000;
-  char branchname[20];
       
-   
   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()){
-    if(!fHits) fHits=new TClonesArray("AliRICHhit",1000  );
-    if(!fCerenkovs) fCerenkovs  = new TClonesArray("AliRICHCerenkov",1000);
-    MakeBranchInTree(TreeH(),"RICHCerenkov", &fCerenkovs, kBufferSize, 0) ;
-
-    //kir if(!fSDigits) fSDigits    = new TClonesArray("AliRICHdigit",100000);
-    //kir MakeBranchInTree(TreeH(),"RICHSDigits", &fSDigits, kBufferSize, 0) ;
-  }     
+  if(cH&&TreeH()){//H
+    HitsCreate();      //branch will be created in AliDetector::MakeBranch
+  }//H     
   AliDetector::MakeBranch(option);//this is after cH because we need to guarantee that fHits array is created
       
-  if(cS&&fLoader->TreeS()){  
-    if(!fSDigits) fSDigits=new TClonesArray("AliRICHdigit",100000);
-    MakeBranchInTree(fLoader->TreeS(),"RICH",&fSDigits,kBufferSize,0) ;
-  }
+  if(cS&&fLoader->TreeS()){//S  
+    SDigitsCreate();   MakeBranchInTree(fLoader->TreeS(),"RICH",&fSdigits,kBufferSize,0) ;
+  }//S
    
-  int i;
-  if (cD&&fLoader->TreeD()){
-    if(!fDchambers){
-      fDchambers=new TObjArray(kNCH);    // one branch for digits per chamber
-      for(i=0;i<kNCH;i++){ 
-        fDchambers->AddAt(new TClonesArray("AliRICHDigit",10000), i); 
-      }       
+  if(cD&&fLoader->TreeD()){//D
+    DigitsCreate();
+    for(Int_t i=0;i<kNchambers;i++){ 
+      MakeBranchInTree(fLoader->TreeD(),Form("%s%d",GetName(),i+1),&((*fDigs)[i]),kBufferSize,0);
     }
-    for (i=0; i<kNCH ;i++) 
-      {
-        sprintf(branchname,"%sDigits%d",GetName(),i+1);        
-        MakeBranchInTree(fLoader->TreeD(),branchname, &((*fDchambers)[i]), kBufferSize, 0);
-      }
-   }
-
-  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);
-         }
-     }
-
-    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);      
-       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);  
-       MakeBranchInTree(fLoader->TreeR(),branchname, &((*fRecHits3D)[i]), kBufferSize, 0);
-     }
-   }//if (cR && gAlice->TreeR())
-  if(GetDebug())Info("MakeBranch","Stop.");   
+  }//D
+  
+  if(cR&&fLoader->TreeR()){//R
+    ClustersCreate();
+    for(Int_t i=0;i<kNchambers;i++)
+      MakeBranchInTree(fLoader->TreeR(),Form("%sClusters%d",GetName(),i+1), &((*fClus)[i]), kBufferSize, 0);    
+  }//R
+  AliDebug(1,"Stop.");   
 }//void AliRICH::MakeBranch(Option_t* option)
-//______________________________________________________________________________
+//__________________________________________________________________________________________________
 void AliRICH::SetTreeAddress()
-{//Set branch address for the Hits and Digits Tree.
-  if(GetDebug())Info("SetTreeAddress","Start.");
-  
-  char branchname[20];
-  Int_t i;
-
-    
+{
+//Set branch address for the Hits and Digits Tree.
+  AliDebug(1,"Start.");
+      
   TBranch *branch;
-  TTree *treeH = fLoader->TreeH();
-  TTree *treeD = fLoader->TreeD();
-  TTree *treeR = fLoader->TreeR();
-    
-  if(treeH){
-    if(GetDebug())Info("SetTreeAddress","tree H is requested.");
-    if(fHits==0x0) fHits=new TClonesArray("AliRICHhit",1000); 
     
-    branch = treeH->GetBranch("RICHCerenkov");
-    if(branch){
-      if (fCerenkovs == 0x0) fCerenkovs  = new TClonesArray("AliRICHCerenkov",1000); 
-        branch->SetAddress(&fCerenkovs);
-    }
-       
-//kir      branch = treeH->GetBranch("RICHSDigits");
-//kir      if (branch) 
-//kir       {
-//kir         if (fSDigits == 0x0) fSDigits    = new TClonesArray("AliRICHdigit",100000);
-//kir         branch->SetAddress(&fSDigits);
-//kir       }
-  }//if(treeH)
+  if(fLoader->TreeH()){//H
+    AliDebug(1,"tree H is requested.");
+    HitsCreate();//branch map will be in AliDetector::SetTreeAddress    
+  }//H
   AliDetector::SetTreeAddress();//this is after TreeH because we need to guarantee that fHits array is created
 
-    
-  if(fLoader->TreeS()){
-    if(GetDebug())Info("SetTreeAddress","tree S is requested.");
-    if(!fSDigits) fSDigits=new TClonesArray("AliRICHdigit",100000);
-    fLoader->TreeS()->GetBranch("RICH")->SetAddress(&fSDigits);
-  }
-    
-    
-  if(treeD){
-    if(GetDebug())Info("SetTreeAddress","tree D is requested.");
-
-      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(fLoader->TreeS()){//S
+    AliDebug(1,"tree S is requested.");
+    branch=fLoader->TreeS()->GetBranch(GetName());        if(branch){SDigitsCreate();   branch->SetAddress(&fSdigits);}
+  }//S
+    
+  if(fLoader->TreeD()){//D    
+    AliDebug(1,"tree D is requested.");
+    for(int i=0;i<kNchambers;i++){      
+      branch=fLoader->TreeD()->GetBranch(Form("%s%d",GetName(),i+1)); 
+      if(branch){DigitsCreate(); branch->SetAddress(&((*fDigs)[i]));}
     }
+  }//D
     
-  if(treeR){
-    if(GetDebug())Info("SetTreeAddress","tree R is requested.");
-
-    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]));
-         }
+  if(fLoader->TreeR()){//R
+    AliDebug(1,"tree R is requested.");
+    for(int i=0;i<kNchambers;i++){         
+      branch=fLoader->TreeR()->GetBranch(Form("%sClusters%d" ,GetName(),i+1));
+      if(branch){ClustersCreate(); branch->SetAddress(&((*fClus)[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);
-       if (fRecHits3D) {
-         branch = treeR->GetBranch(branchname);
-         if (branch) branch->SetAddress(&((*fRecHits3D)[i]));
-         }
-      } 
-      
-  }//if(treeR)
-  if(GetDebug())Info("SetTreeAddress","Stop.");
+  }//R
+  AliDebug(1,"Stop.");
 }//void AliRICH::SetTreeAddress()
 //__________________________________________________________________________________________________
 void AliRICH::Print(Option_t *option)const
 {
+//Debug printout
   TObject::Print(option);
-  fpParam->Dump();
-  fChambers->Print(option);  
+  P()->Print();
+  fCounters.Print();
 }//void AliRICH::Print(Option_t *option)const
 //__________________________________________________________________________________________________
-void AliRICH::CreateGeometry()
-{//Creates detailed geometry simulation (currently GEANT volumes tree)         
-  if(GetDebug())Info("CreateGeometry","Start.");
-//???????? to be removed to AliRICHParam?
-  fpParam->RadiatorToPads(fpParam->FreonThickness()/2+fpParam->QuartzThickness()+fpParam->GapThickness());
+void AliRICH::ControlPlots()
+{ 
+//Creates a set of QA hists to control the results of simulation. Hists are in file $HOME/RCP.root     
+  TH1F             *pElecP=0 ,*pMuonP=0 ,*pPionP=0 ,*pKaonP=0 ,*pProtP=0,  //stack particles
+                   *pHxD=0,*pHyD=0,*pHxSd=0,*pHySd=0,      //diff hit position - digit sdigit position 
+                   *pNumClusH1=0,
+                   *pQdcH1=0,       *pSizeH1=0,
+                   *pPureMipQdcH1=0,*pPureMipSizeH1=0,
+                   *pPureCerQdcH1=0,*pPureCerSizeH1=0,
+                   *pPureFeeQdcH1=0,*pPureFeeSizeH1=0,
+                   *pMipQdcH1=0,    *pPhotQdcH1=0;  
+  TH2F *pMapH2=0,*pPureMipMapH2=0,*pPureCerMapH2=0,*pPureFeeMapH2=0;
+  TH1F *pelecRadius=0,*pprotRadius=0,*pprotbarRadius=0;
+//load all information  
+                 GetLoader()->GetRunLoader()->LoadHeader();  
+                 GetLoader()->GetRunLoader()->LoadKinematics();  
+                 GetLoader()->LoadHits();  
+  Bool_t isSdig=0;//!GetLoader()->LoadSDigits();
+  Bool_t isDig =0;//!GetLoader()->LoadDigits();
+  Bool_t isClus=!GetLoader()->LoadRecPoints();
+
+  gBenchmark->Start("ControlPlots");
     
-//Opaque quartz thickness
-  Float_t oqua_thickness = .5;
-//CsI dimensions
-  Float_t csi_width =fpParam->Nx()*fpParam->PadSizeX()+fpParam->DeadZone();
-  Float_t csi_length=fpParam->Ny()*fpParam->PadSizeY()+2*fpParam->DeadZone();
+  TFile *pFile = new TFile("$(HOME)/RCP.root","RECREATE");   
   
-  Int_t *idtmed = fIdtmed->GetArray()-999;
-    
-  Int_t i;
-  Float_t zs;
-  Int_t idrotm[1099];
-  Float_t par[3];
+  pElecP=new TH1F("Pelec","Electrons made hit in RICH;p [GeV]",1000,-30,30); 
+  pMuonP=new TH1F("Pmuon","Muons made hit in RICH;p [GeV]",1000,-30,30); 
+  pPionP=new TH1F("Ppion","Pions made hit in RICH;p [GeV]",1000,-30,30); 
+  pKaonP=new TH1F("Pkaon","Kaon made hit in RICH;p [GeV]",1000,-30,30); 
+  pProtP=new TH1F("Pprot","Protons made hit in RICH;p [GeV]",1000,-30,30); 
+  pelecRadius=new TH1F("elecRadius","elec",600,0.,600.);  
+  pprotRadius=new TH1F("protRadius","elec",600,0.,600.);  
+  pprotbarRadius=new TH1F("protbarRadius","elec",600,0.,600.);
+    
+  if(isSdig){
+    AliInfo("SDigits available");
+    pHxSd=new TH1F("DiffHitSDigitX","Hit-SDigit diff X all chambers;diff [cm]",300,-10,10); 
+    pHySd=new TH1F("DiffHitSDigitY","Hit-SDigit diff Y all chambers;diff [cm]",300,-10,10); 
+  }//isSdig
+  
+  if(isDig){
+    AliInfo("Digits available");
+    pHxD=new TH1F("DiffHitDigitX","Hit-Digit diff X all chambers;diff [cm]",300,-10,10); 
+    pHyD=new TH1F("DiffHitDigitY","Hit-Digit diff Y all chambers;diff [cm]",300,-10,10); 
+  }//isDig
+  
+  if(isClus){ 
+    AliInfo("Clusters available");
+    pNumClusH1=new TH1F("NumClusPerEvent","Number of clusters per event;number",50,0,49);
     
-//External aluminium box 
-  par[0]=68.8*cm;par[1]=13*cm;par[2]=70.86*cm;//Original Settings
-  gMC->Gsvolu("RICH", "BOX ", idtmed[1009], par, 3);
-//Air 
-  par[0]=66.3;   par[1] = 13; par[2] = 68.35; //Original Settings
-  gMC->Gsvolu("SRIC", "BOX ", idtmed[1000], par, 3); 
-//Air 2 (cutting the lower part of the box)
-  par[0]=1.25;    par[1] = 3;    par[2] = 70.86; //Original Settings
-  gMC->Gsvolu("AIR2", "BOX ", idtmed[1000], par, 3);
-//Air 3 (cutting the lower part of the box)
-  par[0]=66.3;    par[1] = 3;  par[2] = 1.2505; //Original Settings
-  gMC->Gsvolu("AIR3", "BOX ", idtmed[1000], par, 3);
-//Honeycomb 
-  par[0]=66.3;par[1]=0.188;  par[2] = 68.35;  //Original Settings
-  gMC->Gsvolu("HONE", "BOX ", idtmed[1001], par, 3);
-//Aluminium sheet 
-  par[0]=66.3;par[1]=0.025;par[2]=68.35; //Original Settings
-  //par[0] = 66.5; par[1] = .025; par[2] = 63.1;
-  gMC->Gsvolu("ALUM", "BOX ", idtmed[1009], par, 3);
-//Quartz 
-  par[0]=fpParam->QuartzWidth()/2;par[1]=fpParam->QuartzThickness()/2;par[2]=fpParam->QuartzLength()/2;
-  gMC->Gsvolu("QUAR", "BOX ", idtmed[1002], par, 3);
-//Spacers (cylinders) 
-  par[0]=0.;par[1]=.5;par[2]=fpParam->FreonThickness()/2;
-  gMC->Gsvolu("SPAC", "TUBE", idtmed[1002], par, 3);    
-//Feet (freon slabs supports)
-  par[0] = .7;  par[1] = .3;  par[2] = 1.9;
-  gMC->Gsvolu("FOOT", "BOX", idtmed[1009], par, 3);
-//Opaque quartz 
-  par[0]=fpParam->QuartzWidth()/2;par[1]= .2;par[2]=fpParam->QuartzLength()/2;
-  gMC->Gsvolu("OQUA", "BOX ", idtmed[1007], par, 3);
-//Frame of opaque quartz
-  par[0]=fpParam->OuterFreonWidth()/2;par[1]=fpParam->FreonThickness()/2;par[2]=fpParam->OuterFreonLength()/2; 
-  gMC->Gsvolu("OQF1", "BOX ", idtmed[1007], par, 3);
-  par[0]=fpParam->InnerFreonWidth()/2;par[1]=fpParam->FreonThickness()/2;par[2]=fpParam->InnerFreonLength()/2; 
-  gMC->Gsvolu("OQF2", "BOX ", idtmed[1007], par, 3);
-//Freon 
-  par[0]=fpParam->OuterFreonWidth()/2 - oqua_thickness;
-  par[1]=fpParam->FreonThickness()/2;
-  par[2]=fpParam->OuterFreonLength()/2 - 2*oqua_thickness; 
-  gMC->Gsvolu("FRE1", "BOX ", idtmed[1003], par, 3);
-
-  par[0]=fpParam->InnerFreonWidth()/2 - oqua_thickness;
-  par[1]=fpParam->FreonThickness()/2;
-  par[2]=fpParam->InnerFreonLength()/2 - 2*oqua_thickness; 
-  gMC->Gsvolu("FRE2", "BOX ", idtmed[1003], par, 3);    
-//Methane 
-  par[0]=csi_width/2;par[1]=fpParam->GapThickness()/2;par[2]=csi_length/2;
-  gMC->Gsvolu("META", "BOX ", idtmed[1004], par, 3);
-//Methane gap 
-  par[0]=csi_width/2;par[1]=fpParam->ProximityGapThickness()/2;par[2] = csi_length/2;
-  gMC->Gsvolu("GAP ", "BOX ", idtmed[1008], par, 3);
-//CsI photocathode 
-  par[0]=csi_width/2;par[1]=.25;par[2]=csi_length/2;
-  gMC->Gsvolu("CSI ", "BOX ", idtmed[1005], par, 3);
-//Anode grid 
-  par[0] = 0.;par[1] = .001;par[2] = 20.;
-  gMC->Gsvolu("GRID", "TUBE", idtmed[1006], par, 3);
-
-//Wire supports
-//Bar of metal
-  par[0]=csi_width/2;par[1]=1.05;par[2]=1.05;
-  gMC->Gsvolu("WSMe", "BOX ", idtmed[1009], par, 3);
-//Ceramic pick up (base)
-  par[0]=csi_width/2;par[1]= .25;par[2]=1.05;
-  gMC->Gsvolu("WSG1", "BOX ", idtmed[1010], par, 3);
-//Ceramic pick up (head)
-  par[0] = csi_width/2;par[1] = .1;par[2] = .1;
-  gMC->Gsvolu("WSG2", "BOX ", idtmed[1010], par, 3);
-
-//Aluminium supports for methane and CsI
-//Short bar
-  par[0]=csi_width/2;par[1]=fpParam->GapThickness()/2 + .25; par[2] = (68.35 - csi_length/2)/2;
-  gMC->Gsvolu("SMSH", "BOX", idtmed[1009], par, 3);
-//Long bar
-  par[0]=(66.3 - csi_width/2)/2;par[1]=fpParam->GapThickness()/2+.25;par[2]=csi_length/2+68.35-csi_length/2;
-  gMC->Gsvolu("SMLG", "BOX", idtmed[1009], par, 3);
+    pQdcH1        =new TH1F("ClusQdc",   "Cluster Charge all chambers;q [QDC]",P()->MaxQdc(),0,P()->MaxQdc());
+    pSizeH1       =new TH1F("ClusSize",  "Cluster size all chambers;size [number of pads in cluster]",100,0,100);
+    pMapH2        =new TH2F("ClusMap",   "Cluster map;x [cm];y [cm]",1000,0,P()->PcSizeX(),1000,0,P()->PcSizeY());
+  
+    pMipQdcH1     =new TH1F("QdcMip"      ,"MIP Cluster Charge all chambers;q [QDC]",P()->MaxQdc(),0,P()->MaxQdc());
+    pPhotQdcH1    =new TH1F("QdcPhot"     ,"Cer+Fee Cluster Charge all chambers;q [QDC]",P()->MaxQdc(),0,P()->MaxQdc());
+        
+    pPureMipQdcH1 =new TH1F("QdcPureMip"  ,"MIP only Cluster Charge all chambers;q [QDC]",P()->MaxQdc(),0,P()->MaxQdc());
+    pPureMipSizeH1=new TH1F("SizePureMip" ,"MIP only Cluster size all chambers;size [number of pads in cluster]",100,0,100);
+    pPureMipMapH2 =new TH2F("MapPureMip"  ,"MIP only Cluster map;x [cm];y [cm]",1000,0,P()->PcSizeX(),1000,0,P()->PcSizeY());
+  
+    pPureCerQdcH1 =new TH1F("QdcPureCer"  ,"Cerenkov only Cluster Charge all chambers;q [QDC]",P()->MaxQdc(),0,P()->MaxQdc());
+    pPureCerSizeH1=new TH1F("SizePureCer" ,"Cernekov only Cluster size all chambers;size [number of pads in cluster]",100,0,100);
+    pPureCerMapH2 =new TH2F("MapPureCer"  ,"Cerenkov only Cluster map;x [cm];y [cm]",1000,0,P()->PcSizeX(),1000,0,P()->PcSizeY());
     
-//Aluminium supports for freon
-//Short bar
-  par[0] = fpParam->QuartzWidth()/2; par[1] = .3; par[2] = (68.35 - fpParam->QuartzLength()/2)/2;
-  gMC->Gsvolu("SFSH", "BOX", idtmed[1009], par, 3);    
-//Long bar
-  par[0] = (66.3 - fpParam->QuartzWidth()/2)/2; par[1] = .3;
-  par[2] = fpParam->QuartzLength()/2 + 68.35 - fpParam->QuartzLength()/2;
-  gMC->Gsvolu("SFLG", "BOX", idtmed[1009], par, 3);    
-//PCB backplane
-  par[0] = csi_width/2;par[1] = .25; par[2] = csi_length/4 -.5025;
-  gMC->Gsvolu("PCB ", "BOX", idtmed[1011], par, 3);
+    pPureFeeQdcH1 =new TH1F("QdcPureFee"  ,"Feedback only Cluster Charge all chambers;q [QDC]",P()->MaxQdc(),0,P()->MaxQdc());
+    pPureFeeSizeH1=new TH1F("SizePureFee" ,"Feedback only Cluster size all chambers;size [number of pads in cluster]",100,0,100);
+    pPureFeeMapH2 =new TH2F("MapPureFee"  ,"Feedback only Cluster map;x [cm];y [cm]",1000,0,P()->PcSizeX(),1000,0,P()->PcSizeY());
 
-//Backplane supports
-//Aluminium slab
-  par[0] = 33.15;par[1] = 2;par[2] = 21.65;
-  gMC->Gsvolu("BACK", "BOX", idtmed[1009], par, 3);    
-//Big hole
-  par[0] = 9.05; par[1] = 2; par[2] = 4.4625;
-  gMC->Gsvolu("BKHL", "BOX", idtmed[1000], par, 3);
-//Small hole
-  par[0] = 5.7;par[1] = 2;par[2] = 4.4625;
-  gMC->Gsvolu("BKHS", "BOX", idtmed[1000], par, 3);
-//Place holes inside backplane support
-  gMC->Gspos("BKHS", 1, "BACK", .8 + 5.7,0., .6 + 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHS", 2, "BACK", -.8 - 5.7,0., .6 + 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHS", 3, "BACK", .8 + 5.7,0., -.6 - 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHS", 4, "BACK", -.8 - 5.7,0., -.6 - 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHS", 5, "BACK", .8 + 5.7,0., .6 + 8.925 + 1.2 + 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHS", 6, "BACK", -.8 - 5.7,0., .6 + 8.925 + 1.2 + 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHS", 7, "BACK", .8 + 5.7,0., -.6 - 8.925 - 1.2 - 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHS", 8, "BACK", -.8 - 5.7,0., -.6 - 8.925 - 1.2 - 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHL", 1, "BACK", .8 + 11.4 + 1.6 + 9.05, 0., .6 + 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHL", 2, "BACK", -.8 - 11.4 - 1.6 - 9.05, 0., .6 + 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHL", 3, "BACK", .8 + 11.4 + 1.6 + 9.05, 0., -.6 - 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHL", 4, "BACK", -.8 - 11.4 - 1.6 - 9.05, 0., -.6 - 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHL", 5, "BACK", .8 + 11.4+ 1.6 + 9.05, 0., .6 + 8.925 + 1.2 + 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHL", 6, "BACK", -.8 - 11.4 - 1.6 - 9.05, 0., .6 + 8.925 + 1.2 + 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHL", 7, "BACK", .8 + 11.4 + 1.6 + 9.05, 0., -.6 - 8.925 - 1.2 - 4.4625, 0, "ONLY");
-  gMC->Gspos("BKHL", 8, "BACK", -.8 - 11.4 - 1.6 - 9.05, 0., -.6 - 8.925 - 1.2 - 4.4625, 0, "ONLY");
-//Place material inside RICH 
-  gMC->Gspos("SRIC", 1, "RICH", 0.,0., 0., 0, "ONLY");
-  gMC->Gspos("AIR2", 1, "RICH", 66.3 + 1.2505, 1.276-fpParam->GapThickness()/2-fpParam->QuartzThickness()-fpParam->FreonThickness()- .4 - .6 - .05 - .376 -.5 - 3.35, 0., 0, "ONLY");
-  gMC->Gspos("AIR2", 2, "RICH", -66.3 - 1.2505,1.276-fpParam->GapThickness()/2-fpParam->QuartzThickness()-fpParam->FreonThickness()- .4 - .6 - .05 - .376 -.5 - 3.35, 0., 0, "ONLY");
-  gMC->Gspos("AIR3", 1, "RICH", 0., 1.276-fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .6 - .05 - .376 -.5 - 3.35, -68.35 - 1.25, 0, "ONLY");
-  gMC->Gspos("AIR3", 2, "RICH", 0., 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .6 - .05 - .376 -.5 - 3.35,  68.35 + 1.25, 0, "ONLY");
-  gMC->Gspos("ALUM", 1, "SRIC", 0., 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .6 - .05 - .376 -.025, 0., 0, "ONLY");
-  gMC->Gspos("HONE", 1, "SRIC", 0., 1.276- fpParam->GapThickness()/2  - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .6 - .05 - .188, 0., 0, "ONLY");
-  gMC->Gspos("ALUM", 2, "SRIC", 0., 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .6 - .025, 0., 0, "ONLY");
-  gMC->Gspos("FOOT", 1, "SRIC", 64.95, 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .3, 36.9, 0, "ONLY");
-  gMC->Gspos("FOOT", 2, "SRIC", 21.65, 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .3 , 36.9, 0, "ONLY");
-  gMC->Gspos("FOOT", 3, "SRIC", -21.65, 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .3, 36.9, 0, "ONLY");
-  gMC->Gspos("FOOT", 4, "SRIC", -64.95, 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .3, 36.9, 0, "ONLY");
-  gMC->Gspos("FOOT", 5, "SRIC", 64.95, 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .3, -36.9, 0, "ONLY");
-  gMC->Gspos("FOOT", 6, "SRIC", 21.65, 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .3, -36.9, 0, "ONLY");
-  gMC->Gspos("FOOT", 7, "SRIC", -21.65, 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .3, -36.9, 0, "ONLY");
-  gMC->Gspos("FOOT", 8, "SRIC", -64.95, 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .4 - .3, -36.9, 0, "ONLY");
-  gMC->Gspos("OQUA", 1, "SRIC", 0., 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()- .2, 0., 0, "ONLY");
-// Methane supports
-  gMC->Gspos("SMLG", 1, "SRIC", csi_width/2 + (66.3 - csi_width/2)/2, 1.276 + .25, 0., 0, "ONLY");
-  gMC->Gspos("SMLG", 2, "SRIC", - csi_width/2 - (66.3 - csi_width/2)/2, 1.276 + .25, 0., 0, "ONLY");
-  gMC->Gspos("SMSH", 1, "SRIC", 0., 1.276 + .25, csi_length/2 + (68.35 - csi_length/2)/2, 0, "ONLY");
-  gMC->Gspos("SMSH", 2, "SRIC", 0., 1.276 + .25, - csi_length/2 - (68.35 - csi_length/2)/2, 0, "ONLY");
-//Freon supports
-  Float_t supp_y = 1.276 - fpParam->GapThickness()/2- fpParam->QuartzThickness() -fpParam->FreonThickness() - .2 + .3; //y position of freon supports
-  gMC->Gspos("SFLG", 1, "SRIC", fpParam->QuartzWidth()/2 + (66.3 - fpParam->QuartzWidth()/2)/2, supp_y, 0., 0, "ONLY");
-  gMC->Gspos("SFLG", 2, "SRIC", - fpParam->QuartzWidth()/2 - (66.3 - fpParam->QuartzWidth()/2)/2, supp_y, 0., 0, "ONLY");
-  gMC->Gspos("SFSH", 1, "SRIC", 0., supp_y, fpParam->QuartzLength()/2 + (68.35 - fpParam->QuartzLength()/2)/2, 0, "ONLY");
-  gMC->Gspos("SFSH", 2, "SRIC", 0., supp_y, - fpParam->QuartzLength()/2 - (68.35 - fpParam->QuartzLength()/2)/2, 0, "ONLY");
-  AliMatrix(idrotm[1019], 0., 0., 90., 0., 90., 90.);
-//Place spacers
-  Int_t nspacers = 30;
-  for (i = 0; i < nspacers/3; i++) {
-    zs = -11.6/2 + (TMath::Abs(nspacers/6) - i) * 12.2;
-    gMC->Gspos("SPAC", i, "FRE1", 10.5, 0., zs, idrotm[1019], "ONLY");  //Original settings 
-  }
-  for (i = nspacers/3; i < (nspacers*2)/3; i++) {
-    zs = -11.6/2 + (nspacers/3 + TMath::Abs(nspacers/6) - i) * 12.2;
-    gMC->Gspos("SPAC", i, "FRE1", 0, 0., zs, idrotm[1019], "ONLY");  //Original settings 
+  }//isClus
+//end of hists booking  
+  for(Int_t iEvtN=0;iEvtN < GetLoader()->GetRunLoader()->GetAliRun()->GetEventsPerRun();iEvtN++){//events loop
+    GetLoader()->GetRunLoader()->GetEvent(iEvtN);    //get current event
+    
+    for(Int_t iPrimN=0;iPrimN < GetLoader()->TreeH()->GetEntries();iPrimN++){//hit tree loop
+      GetLoader()->TreeH()->GetEntry(iPrimN);      
+      for(Int_t j=0;j<Hits()->GetEntries();j++){//hits loop
+        AliRICHHit *pHit = (AliRICHHit*)Hits()->At(j);
+        TParticle *pParticle = GetLoader()->GetRunLoader()->Stack()->Particle(pHit->GetTrack());//get particle produced this hit
+        Double_t dRadius = TMath::Sqrt(pParticle->Vx()*pParticle->Vx()+pParticle->Vy()*pParticle->Vy()+pParticle->Vz()*pParticle->Vz());
+        switch(pParticle->GetPdgCode()){
+          case kPositron : pElecP->Fill( pParticle->P());pelecRadius->Fill(dRadius); break;
+          case kElectron : pElecP->Fill(-pParticle->P());pelecRadius->Fill(dRadius); break;
+          
+          case kMuonPlus : pMuonP->Fill( pParticle->P()); break;
+          case kMuonMinus: pMuonP->Fill(-pParticle->P()); break;
+                    
+          case kPiPlus   : pPionP->Fill( pParticle->P()); break;
+          case kPiMinus  : pPionP->Fill(-pParticle->P()); break;
+          
+          case kKPlus    : pKaonP->Fill( pParticle->P()); break;
+          case kKMinus   : pKaonP->Fill(-pParticle->P()); break;
+          
+          case kProton   : pProtP->Fill( pParticle->P()); pprotRadius->Fill(dRadius); break;
+          case kProtonBar: pProtP->Fill(-pParticle->P()); pprotbarRadius->Fill(dRadius); break;
+              
+        }//switch PdgCode
+            
+      }//hits loop
+    }//hit tree loop
+    
+    if(isSdig){
+      GetLoader()->TreeS()->GetEntry(0);  
+      for(Int_t iSdigN=0;iSdigN<SDigits()->GetEntries();iSdigN++){//sdigits loop 
+        AliRICHDigit *pSdig=(AliRICHDigit*)SDigits()->At(iSdigN); //get current sdigit pointer  
+        AliRICHHit   *pHit=Hit(pSdig->GetTrack(0));               //get hit of this sdigit (always one)
+        TVector2 hit2 =C(pHit->C())->Mrs2Pc(pHit->OutX3());       //this hit position  in local system
+        TVector2 sdig2=P()->Pad2Loc(pSdig->Pad());                //center of pad for this sdigit
+        pHxSd->Fill(hit2.X()-sdig2.X());        
+        pHySd->Fill(hit2.Y()-sdig2.Y());      
+      }//sdigits loop
+    }//if(isSdig)
+        
+    if(isDig)  GetLoader()->TreeD()->GetEntry(0);  
+    if(isClus) GetLoader()->TreeR()->GetEntry(0);
+    
+    for(Int_t iChamN=1;iChamN<=7;iChamN++){//chambers loop
+      if(isDig){
+        for(Int_t iDigN=0;iDigN<Digits(iChamN)->GetEntries();iDigN++){//digits loop
+          AliRICHDigit *pDig=(AliRICHDigit*)Digits(iChamN)->At(iDigN);
+          AliRICHHit   *pHit=Hit(pDig->GetTrack(0));           //get first hit of this digit
+          TVector2 hitV2=C(iChamN)->Mrs2Pc(pHit->OutX3()); 
+          TVector2 digV2=P()->Pad2Loc(pDig->Pad());            //center of pad for this digit
+          pHxD->Fill(hitV2.X()-digV2.X());        pHyD->Fill(hitV2.Y()-digV2.Y());
+        }//digits loop
+      }//isDig
+      if(isClus){
+        Int_t iNclusCham=Clusters(iChamN)->GetEntries(); if(iNclusCham) pNumClusH1->Fill(iNclusCham);//number of clusters per event
+        for(Int_t iClusN=0;iClusN<iNclusCham;iClusN++){//clusters loop
+          AliRICHCluster *pClus=(AliRICHCluster*)Clusters(iChamN)->At(iClusN);
+                                       pQdcH1        ->Fill(pClus->Q());   
+                                       pSizeH1       ->Fill(pClus->Size());  
+                                       pMapH2        ->Fill(pClus->X(),pClus->Y()); //common
+                                       
+           if(pClus->IsSingleMip())     {pPureMipQdcH1 ->Fill(pClus->Q());
+                                       pPureMipSizeH1->Fill(pClus->Size());
+                                       pPureMipMapH2 ->Fill(pClus->X(),pClus->Y());}//Pure Mips
+                                       
+           if(pClus->IsSingleCerenkov()){pPureCerQdcH1 ->Fill(pClus->Q());
+                                       pPureCerSizeH1->Fill(pClus->Size());
+                                       pPureCerMapH2 ->Fill(pClus->X(),pClus->Y());}//Pure Cerenkovs
+                                       
+           if(pClus->IsSingleFeedback()){pPureFeeQdcH1 ->Fill(pClus->Q());
+                                       pPureFeeSizeH1->Fill(pClus->Size());
+                                       pPureFeeMapH2 ->Fill(pClus->X(),pClus->Y());}//Pure Feedbacks
+           
+           if(pClus->IsMip()) {pMipQdcH1 ->Fill(pClus->Q());} //MIP+ other contributions
+           if(!pClus->IsPureMip())     pPhotQdcH1->Fill(pClus->Q());  //not MIP
+        }//clusters loop
+      }//isClus
+    }//chambers loop
+    Info("ControlPlots","Event %i processed.",iEvtN);
+  }//events loop 
+             GetLoader()->UnloadHits();
+  if(isSdig) GetLoader()->UnloadSDigits();
+  if(isDig)  GetLoader()->UnloadDigits();
+  if(isClus) GetLoader()->UnloadRecPoints();
+  
+  GetLoader()->GetRunLoader()->UnloadHeader();  
+  GetLoader()->GetRunLoader()->UnloadKinematics();  
+  
+  pFile->Write(); delete pFile;
+  
+  gBenchmark->Show("ControlPlots");
+}//ControlPlots()
+//__________________________________________________________________________________________________
+AliRICHHit* AliRICH::Hit(Int_t tid)const
+{
+//defines which hit provided by given tid for the currently loaded event
+  GetLoader()->LoadHits();
+  for(Int_t iPrimN=0;iPrimN<GetLoader()->TreeH()->GetEntries();iPrimN++){//prims loop      
+    GetLoader()->TreeH()->GetEntry(iPrimN);
+    for(Int_t iHitN=0;iHitN<Hits()->GetEntries();iHitN++){
+      AliRICHHit *pHit=(AliRICHHit*)Hits()->At(iHitN);
+      if(tid==pHit->Track()) {GetLoader()->UnloadHits();return pHit;}
+    }//hits
+  }//prims loop
+  GetLoader()->UnloadHits();
+  return 0;
+}
+//__________________________________________________________________________________________________
+void AliRICH::HitsPrint(Int_t iEvtN)const
+{
+//Prints a list of RICH hits for a given event. Default is event number 0.
+  if(GetLoader()->GetRunLoader()->GetEvent(iEvtN)) return;    
+  AliInfo(Form("List of RICH hits for event %i",iEvtN));
+  if(GetLoader()->LoadHits()) return;
+  
+  Int_t iTotalHits=0;
+  for(Int_t iPrimN=0;iPrimN<GetLoader()->TreeH()->GetEntries();iPrimN++){//prims loop
+    GetLoader()->TreeH()->GetEntry(iPrimN);      
+    Hits()->Print();
+    iTotalHits+=Hits()->GetEntries();
   }
-  for (i = (nspacers*2)/3; i < nspacers; ++i) {
-    zs = -11.6/2 + ((nspacers*2)/3 + TMath::Abs(nspacers/6) - i) * 12.2;
-    gMC->Gspos("SPAC", i, "FRE1", -10.5, 0., zs, idrotm[1019], "ONLY"); //Original settings  
+  GetLoader()->UnloadHits();
+  AliInfo(Form("totally %i hits",iTotalHits));
+}
+//__________________________________________________________________________________________________
+void AliRICH::SDigitsPrint(Int_t iEvtN)const
+{
+//prints a list of RICH sdigits  for a given event
+  if(GetLoader()->GetRunLoader()->GetEvent(iEvtN)) return;    
+  Info("PrintSDigits","List of RICH sdigits for event %i",iEvtN);
+  if(GetLoader()->LoadSDigits()) return;
+  
+  GetLoader()->TreeS()->GetEntry(0);
+  SDigits()->Print();
+  GetLoader()->UnloadSDigits();
+  Info("PrintSDigits","totally %i sdigits",SDigits()->GetEntries());
+}
+//__________________________________________________________________________________________________
+void AliRICH::DigitsPrint(Int_t iEvtN)const
+{
+//prints a list of RICH digits  for a given event
+  if(GetLoader()->GetRunLoader()->GetEvent(iEvtN)) return;    
+  Info("PrintDigits","List of RICH digits for event %i",iEvtN);
+  if(GetLoader()->LoadDigits()) return;
+  
+  Int_t iTotalDigits=0;
+  GetLoader()->TreeD()->GetEntry(0);
+  for(Int_t iChamber=1;iChamber<=kNchambers;iChamber++){
+    Digits(iChamber)->Print();
+    iTotalDigits+=Digits(iChamber)->GetEntries();
   }
-  for (i = 0; i < nspacers/3; i++) {
-    zs = -11.6/2 + (TMath::Abs(nspacers/6) - i) * 12.2;
-    gMC->Gspos("SPAC", i, "FRE2", 10.5, 0., zs, idrotm[1019], "ONLY");  //Original settings 
+  GetLoader()->UnloadDigits();
+  Info("PrintDigits","totally %i Digits",iTotalDigits);
+}
+//__________________________________________________________________________________________________
+void AliRICH::OccupancyPrint(Int_t iEvtNreq)const
+{
+//prints occupancy for each chamber in a given event
+  Int_t iEvtNmin,iEvtNmax;
+  if(iEvtNreq==-1){
+    iEvtNmin=0;
+    iEvtNmax=gAlice->GetEventsPerRun();
+  } else { 
+    iEvtNmin=iEvtNreq;iEvtNmax=iEvtNreq+1;
   }
-  for (i = nspacers/3; i < (nspacers*2)/3; i++) {
-    zs = -11.6/2 + (nspacers/3 + TMath::Abs(nspacers/6) - i) * 12.2;
-    gMC->Gspos("SPAC", i, "FRE2", 0, 0., zs, idrotm[1019], "ONLY");  //Original settings 
+    
+  if(GetLoader()->GetRunLoader()->LoadHeader()) return;    
+  if(GetLoader()->GetRunLoader()->LoadKinematics()) return;    
+  
+//  Info("Occupancy","for event %i",iEvtN);
+  if(GetLoader()->LoadHits()) return;
+  if(GetLoader()->LoadDigits()) return;
+
+  Int_t totPadsPerChamber = AliRICHParam::NpadsX()*AliRICHParam::NpadsY();  
+
+  
+  for(Int_t iEvtN=iEvtNmin;iEvtN<iEvtNmax;iEvtN++){    
+    Int_t nDigCh[kNchambers]={0,0,0,0,0,0,0};  
+    Int_t iChHits[kNchambers]={0,0,0,0,0,0,0};
+    Int_t nPrim[kNchambers]={0,0,0,0,0,0,0};
+    Int_t nSec[kNchambers]={0,0,0,0,0,0,0};
+    AliInfo(Form("events processed %i",iEvtN));
+    if(GetLoader()->GetRunLoader()->GetEvent(iEvtN)) return;    
+    AliStack *pStack = GetLoader()->GetRunLoader()->Stack();
+    for(Int_t iPrimN=0;iPrimN<GetLoader()->TreeH()->GetEntries();iPrimN++){//prims loop
+      GetLoader()->TreeH()->GetEntry(iPrimN);      
+      for(Int_t iHitN=0;iHitN<Hits()->GetEntries();iHitN++){
+        AliRICHHit *pHit = (AliRICHHit *)Hits()->At(iHitN);
+        if(pHit->Eloss()>0){
+          iChHits[pHit->C()-1]++;
+          if(pStack->Particle(pHit->GetTrack())->Rho()<0.01) nPrim[pHit->C()-1]++;else nSec[pHit->C()-1]++;
+        }
+      }
+    }
+    GetLoader()->TreeD()->GetEntry(0);
+    for(Int_t iChamber=1;iChamber<=kNchambers;iChamber++) {
+      nDigCh[iChamber-1]= Digits(iChamber)->GetEntries();
+      Double_t occupancy = (Double_t)nDigCh[iChamber-1]/(Double_t)totPadsPerChamber;
+      Info("Occupancy","for chamber %i = %4.2f %% and charged prim tracks %i and sec. tracks %i with total %i",
+        iChamber,occupancy*100.,nPrim[iChamber-1],nSec[iChamber-1],iChHits[iChamber-1]);
+    }
   }
-  for (i = (nspacers*2)/3; i < nspacers; ++i) {
-    zs = -11.6/2 + ((nspacers*2)/3 + TMath::Abs(nspacers/6) - i) * 12.2;
-    gMC->Gspos("SPAC", i, "FRE2", -10.5, 0., zs, idrotm[1019], "ONLY"); //Original settings  
+  GetLoader()->UnloadHits();
+  GetLoader()->UnloadDigits();
+  GetLoader()->GetRunLoader()->UnloadHeader();    
+  GetLoader()->GetRunLoader()->UnloadKinematics();    
+}
+//__________________________________________________________________________________________________
+void AliRICH::ClustersPrint(Int_t iEvtN)const
+{
+//prints a list of RICH clusters  for a given event
+  AliInfo(Form("List of RICH clusters for event %i",iEvtN));
+  GetLoader()->GetRunLoader()->GetEvent(iEvtN);    
+  if(GetLoader()->LoadRecPoints()) return;
+  
+  Int_t iTotalClusters=0;
+  GetLoader()->TreeR()->GetEntry(0);
+  for(Int_t iChamber=1;iChamber<=kNchambers;iChamber++){
+    Clusters(iChamber)->Print();
+    iTotalClusters+=Clusters(iChamber)->GetEntries();
   }
-  gMC->Gspos("FRE1", 1, "OQF1", 0., 0., 0., 0, "ONLY");
-  gMC->Gspos("FRE2", 1, "OQF2", 0., 0., 0., 0, "ONLY");
-  gMC->Gspos("OQF1", 1, "SRIC", fpParam->OuterFreonWidth()/2 + fpParam->InnerFreonWidth()/2 + 2, 1.276 - fpParam->GapThickness()/2- fpParam->QuartzThickness() -fpParam->FreonThickness()/2, 0., 0, "ONLY"); //Original settings (31.3)
-  gMC->Gspos("OQF2", 2, "SRIC", 0., 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()/2, 0., 0, "ONLY");          //Original settings 
-  gMC->Gspos("OQF1", 3, "SRIC", - (fpParam->OuterFreonWidth()/2 + fpParam->InnerFreonWidth()/2) - 2, 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness() - fpParam->FreonThickness()/2, 0., 0, "ONLY");       //Original settings (-31.3)
-  gMC->Gspos("QUAR", 1, "SRIC", 0., 1.276 - fpParam->GapThickness()/2 - fpParam->QuartzThickness()/2, 0., 0, "ONLY");
-  gMC->Gspos("GAP ", 1, "META", 0., fpParam->GapThickness()/2 - fpParam->ProximityGapThickness()/2 - 0.0001, 0., 0, "ONLY");
-  gMC->Gspos("META", 1, "SRIC", 0., 1.276, 0., 0, "ONLY");
-  gMC->Gspos("CSI ", 1, "SRIC", 0., 1.276 + fpParam->GapThickness()/2 + .25, 0., 0, "ONLY");
-//Wire support placing
-  gMC->Gspos("WSG2", 1, "GAP ", 0., fpParam->ProximityGapThickness()/2 - .1, 0., 0, "ONLY");
-  gMC->Gspos("WSG1", 1, "CSI ", 0., 0., 0., 0, "ONLY");
-  gMC->Gspos("WSMe", 1, "SRIC ", 0., 1.276 + fpParam->GapThickness()/2 + .5 + 1.05, 0., 0, "ONLY");
-//Backplane placing
-  gMC->Gspos("BACK", 1, "SRIC ", -33.15, 1.276 + fpParam->GapThickness()/2 + .5 + 2.1 + 2, 43.3, 0, "ONLY");
-  gMC->Gspos("BACK", 2, "SRIC ", 33.15, 1.276 + fpParam->GapThickness()/2 + .5 + 2.1 + 2 , 43.3, 0, "ONLY");
-  gMC->Gspos("BACK", 3, "SRIC ", -33.15, 1.276 + fpParam->GapThickness()/2 + .5 + 2.1 + 2, 0., 0, "ONLY");
-  gMC->Gspos("BACK", 4, "SRIC ", 33.15, 1.276 + fpParam->GapThickness()/2 + .5 + 2.1 + 2, 0., 0, "ONLY");
-  gMC->Gspos("BACK", 5, "SRIC ", 33.15, 1.276 + fpParam->GapThickness()/2 + .5 + 2.1 + 2, -43.3, 0, "ONLY");
-  gMC->Gspos("BACK", 6, "SRIC ", -33.15, 1.276 + fpParam->GapThickness()/2 + .5 + 2.1 + 2, -43.3, 0, "ONLY");
-//PCB placing
-  gMC->Gspos("PCB ", 1, "SRIC ", 0.,  1.276 + fpParam->GapThickness()/2 + .5 + 1.05, csi_width/4 + .5025 + 2.5, 0, "ONLY");
-  gMC->Gspos("PCB ", 2, "SRIC ", 0.,  1.276 + fpParam->GapThickness()/2 + .5 + 1.05, -csi_width/4 - .5025 - 2.5, 0, "ONLY");
+  GetLoader()->UnloadRecPoints();
+  AliInfo(Form("totally %i clusters for event %i",iTotalClusters,iEvtN));
+}
+//__________________________________________________________________________________________________
+void AliRICH::PrintTracks(Int_t iEvtN)
+{
+//prints a list of tracks (including secondary) for a given event
+  AliInfo(Form("List of all tracks for event %i",iEvtN));
+  GetLoader()->GetRunLoader()->GetEvent(iEvtN);    
+  if(GetLoader()->GetRunLoader()->LoadHeader()) return;
+  if(GetLoader()->GetRunLoader()->LoadKinematics()) return;
+  AliStack *pStack=GetLoader()->GetRunLoader()->Stack();
+  
+  for(Int_t i=0;i<pStack->GetNtrack();i++) pStack->Particle(i)->Print();
+  
+  AliInfo(Form("totally %i tracks including %i primaries for event %i",pStack->GetNtrack(),pStack->GetNprimary(),iEvtN));
+  GetLoader()->GetRunLoader()->UnloadHeader();
+  GetLoader()->GetRunLoader()->UnloadKinematics();
+}
+//__________________________________________________________________________________________________
+void AliRICH::GeomPadPanelFrame()const
+{
+//Pad Panel frame  6 sectors
+  Double_t cm=1,mm=0.1*cm;//default is cm
+  Float_t par[3];
+  
+  par[0]=648*mm/2;par[1]=  411*mm/2;par[2]=40  *mm/2;gMC->Gsvolu("RPPF","BOX ",(*fIdtmed)[kAl]  ,par,3);//PPF 2001P2 inner size of the slab by 1mm more
+  par[0]=181*mm/2;par[1]=89.25*mm/2;par[2]=38.3*mm/2;gMC->Gsvolu("PPFL","BOX ",(*fIdtmed)[kAir] ,par,3);//large whole
+  par[0]=114*mm/2;par[1]=89.25*mm/2;par[2]=38.3*mm/2;gMC->Gsvolu("PPFS","BOX ",(*fIdtmed)[kAir] ,par,3);//small whole
+  par[0]=644*mm/2;par[1]=  407*mm/2;par[2]= 1.7*mm/2;gMC->Gsvolu("RPC ","BOX ",(*fIdtmed)[kCsI] ,par,3);//by 0.2 mm more then actual size (PCB 2006P1)
+  
+  gMC->Gspos("RPPF",1,"RICH",    -335*mm,      -433*mm,  8*cm+20*mm,  0,"ONLY");//F1 2040P1 z p.84 TDR
+  gMC->Gspos("RPPF",2,"RICH",    +335*mm,      -433*mm,  8*cm+20*mm,  0,"ONLY");
+  gMC->Gspos("RPPF",3,"RICH",    -335*mm,         0*mm,  8*cm+20*mm,  0,"ONLY");
+  gMC->Gspos("RPPF",4,"RICH",    +335*mm,         0*mm,  8*cm+20*mm,  0,"ONLY");
+  gMC->Gspos("RPPF",5,"RICH",    -335*mm,      +433*mm,  8*cm+20*mm,  0,"ONLY");
+  gMC->Gspos("RPPF",6,"RICH",    +335*mm,      +433*mm,  8*cm+20*mm,  0,"ONLY");  
+    gMC->Gspos("RPC ",1,"RPPF",       0*mm,         0*mm,   -19.15*mm,  0,"ONLY");//PPF 2001P2 
+    gMC->Gspos("PPFL",1,"RPPF",  -224.5*mm,  -151.875*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFL",2,"RPPF",  -224.5*mm,  - 50.625*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFL",3,"RPPF",  -224.5*mm,  + 50.625*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFL",4,"RPPF",  -224.5*mm,  +151.875*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFS",1,"RPPF",  - 65.0*mm,  -151.875*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFS",2,"RPPF",  - 65.0*mm,  - 50.625*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFS",3,"RPPF",  - 65.0*mm,  + 50.625*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFS",4,"RPPF",  - 65.0*mm,  +151.875*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFS",5,"RPPF",  + 65.0*mm,  -151.875*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFS",6,"RPPF",  + 65.0*mm,  - 50.625*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFS",7,"RPPF",  + 65.0*mm,  + 50.625*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFS",8,"RPPF",  + 65.0*mm,  +151.875*mm,     0.85*mm,  0,"ONLY"); 
+    gMC->Gspos("PPFL",5,"RPPF",  +224.5*mm,  -151.875*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFL",6,"RPPF",  +224.5*mm,  - 50.625*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFL",7,"RPPF",  +224.5*mm,  + 50.625*mm,     0.85*mm,  0,"ONLY");
+    gMC->Gspos("PPFL",8,"RPPF",  +224.5*mm,  +151.875*mm,     0.85*mm,  0,"ONLY");
+}//GeomPadPanelFrame()
+//__________________________________________________________________________________________________
+void AliRICH::GeomAmpGap()const
+{
+//Gap - anod wires 6 copies to RICH
+  Double_t cm=1,mm=0.1*cm,mkm=0.001*mm;//default is cm
+  Int_t matrixIdReturn=0; //matrix id returned by AliMatrix
+  Float_t par[3];
+
 
+  par[0]=648*mm/2;par[1]=  411*mm/2 ;par[2]=4.45*mm/2;gMC->Gsvolu("RGAP","BOX ",(*fIdtmed)[kCH4] ,par,3);//xy as PPF 2001P2 z WP 2099P1
+  par[0]=  0*mm  ;par[1]=  20*mkm/2 ;par[2]= 648*mm/2;gMC->Gsvolu("RANO","TUBE",(*fIdtmed)[kW]   ,par,3);//WP 2099P1 z = gap x PPF 2001P2
+  AliMatrix(matrixIdReturn,180,0, 90,90, 90,0); //wires along x
+  
+  gMC->Gspos("RGAP",1,"RICH",    -335*mm,      -433*mm,8*cm-2.225*mm, 0,"ONLY"); //F1 2040P1 z WP 2099P1
+  gMC->Gspos("RGAP",2,"RICH",    +335*mm,      -433*mm,8*cm-2.225*mm, 0,"ONLY"); 
+  gMC->Gspos("RGAP",3,"RICH",    -335*mm,         0*mm,8*cm-2.225*mm, 0,"ONLY"); 
+  gMC->Gspos("RGAP",4,"RICH",    +335*mm,         0*mm,8*cm-2.225*mm, 0,"ONLY"); 
+  gMC->Gspos("RGAP",5,"RICH",    -335*mm,      +433*mm,8*cm-2.225*mm, 0,"ONLY"); 
+  gMC->Gspos("RGAP",6,"RICH",    +335*mm,      +433*mm,8*cm-2.225*mm, 0,"ONLY"); 
+  for(int i=1;i<=96;i++)
+    gMC->Gspos("RANO",i,"RGAP",     0*mm, -411/2*mm+i*4*mm, 0.185*mm, matrixIdReturn,"ONLY"); //WP 2099P1  
+}//GeomAmpGap()
+//__________________________________________________________________________________________________
+void AliRICH::GeomRadiators()const
+{
+//Defines radiators geometry  
+  Double_t mm=0.1;//default is cm
+  Float_t par[3];
+  par[0]=1330*mm/2 ;par[1]= 413*mm/2  ;par[2]=  24*mm/2;  gMC->Gsvolu("RRAD","BOX ",(*fIdtmed)[kC6F14]     ,par,3); // Rad 2011P1
+  par[0]=1330*mm/2 ;par[1]= 413*mm/2  ;par[2]=   4*mm/2;  gMC->Gsvolu("RRFR","BOX ",(*fIdtmed)[kRoha]      ,par,3); //front 
+  par[0]=1330*mm/2 ;par[1]= 413*mm/2  ;par[2]=   5*mm/2;  gMC->Gsvolu("RRWI","BOX ",(*fIdtmed)[kSiO2]      ,par,3); //window
+  par[0]=1330*mm/2 ;par[1]=   5*mm/2  ;par[2]=  15*mm/2;  gMC->Gsvolu("RRLO","BOX ",(*fIdtmed)[kRoha]      ,par,3); //long side  
+  par[0]=  10*mm/2 ;par[1]= 403*mm/2  ;par[2]=  15*mm/2;  gMC->Gsvolu("RRSH","BOX ",(*fIdtmed)[kRoha]      ,par,3); //short side 
+  par[0]=   0      ;par[1]=  10*mm/2  ;par[2]=  15*mm/2;  gMC->Gsvolu("RRSP","TUBE",(*fIdtmed)[kSiO2]      ,par,3); //spacer        
+    
+  gMC->Gspos("RRAD",1,"RICH",   0*mm,-434*mm,   -12*mm,  0,"ONLY"); //3 radiators to RICH
+  gMC->Gspos("RRAD",2,"RICH",   0*mm,   0*mm,   -12*mm,  0,"ONLY"); 
+  gMC->Gspos("RRAD",3,"RICH",   0*mm,+434*mm,   -12*mm,  0,"ONLY"); 
+    gMC->Gspos("RRFR",1,"RRAD",   0*mm,   0*mm, -10.0*mm,  0,"ONLY"); //front cover 
+    gMC->Gspos("RRWI",1,"RRAD",   0*mm,   0*mm,   9.5*mm,  0,"ONLY"); //quartz window (back cover)
+    gMC->Gspos("RRLO",1,"RRAD",   0*mm,-204*mm,  -0.5*mm,  0,"ONLY"); //long side
+    gMC->Gspos("RRLO",2,"RRAD",   0*mm,+204*mm,  -0.5*mm,  0,"ONLY"); //long side
+    gMC->Gspos("RRSH",1,"RRAD",-660*mm,   0*mm,  -0.5*mm,  0,"ONLY"); //short side
+    gMC->Gspos("RRSH",2,"RRAD",+660*mm,   0*mm,  -0.5*mm,  0,"ONLY"); //short side 
+    for(int i=0;i<3;i++)
+      for(int j=0;j<10;j++)
+        gMC->Gspos("RRSP",10*i+j,"RRAD",-1330*mm/2+116*mm+j*122*mm,(i-1)*105*mm,-0.5*mm,0,"ONLY");//spacers
+}//GeomRadiators()
+//__________________________________________________________________________________________________
+void AliRICH::GeomSandBox()const
+{
+//Defines SandBox geometry
+  Double_t mm=0.1;//default is cm
+  Float_t par[3];
+  par[0]=1419*mm/2 ;par[1]=1378*mm/2;par[2]=50.5*mm/2; gMC->Gsvolu("RSNB","BOX ",(*fIdtmed)[kAir]  ,par,3);  //2072P1   
+  par[0]=1419*mm/2 ;par[1]=1378*mm/2;par[2]= 0.5*mm/2; gMC->Gsvolu("RSCO","BOX ",(*fIdtmed)[kAl]   ,par,3);  //cover
+  par[0]=1359*mm/2 ;par[1]=1318*mm/2;par[2]=49.5*mm/2; gMC->Gsvolu("RSHO","BOX ",(*fIdtmed)[kRoha] ,par,3); //honeycomb structure 
+  
+  gMC->Gspos("RSNB",1,"RICH",   0*mm, 0*mm, -73.75*mm, 0,"ONLY"); //p.84 TDR sandbox to rich
+    gMC->Gspos("RSHO",1,"RSNB", 0*mm, 0*mm,      0*mm, 0,"ONLY"); //2072P1 honeycomv to sandbox
+    gMC->Gspos("RSCO",1,"RSNB", 0*mm, 0*mm,    +25*mm, 0,"ONLY"); //cover to sandbox
+    gMC->Gspos("RSCO",2,"RSNB", 0*mm, 0*mm,    -25*mm, 0,"ONLY"); //cover to sandbox
+}//GeomSandBox()
+//__________________________________________________________________________________________________
+void AliRICH::GeomRadioSrc()const
+{
+// Defines geometry for radioactive source  
+  Double_t cm=1,mm=0.1*cm,mkm=0.001*cm;
+  Float_t par[3];
+  
+  par[0]=0 ;par[1]= 70*mm/2  ;par[2]=  30*mm/2;      gMC->Gsvolu("RSRC","TUBE",(*fIdtmed)[kCH4]    ,par,3); //top src container
+    par[0]=0 ;par[1]= 38*mm/2  ;par[2]=  21.8*mm/2;  gMC->Gsvolu("RSAG","TUBE",(*fIdtmed)[kAl]     ,par,3); //Al glass
+      par[0]=0 ;par[1]= 34*mm/2  ;par[2]=  20*mm/2;  gMC->Gsvolu("RSPP","TUBE",(*fIdtmed)[kPerpex] ,par,3); //perpex plug
+        par[0]=0 ;par[1]= 5*mm/2  ;par[2]=  15*mm/2; gMC->Gsvolu("RSSC","TUBE",(*fIdtmed)[kSteel]  ,par,3); //steel screw in center of perpex
+        par[0]=0 ;par[1]= 2*mm/2  ;par[2]=  10*mm/2; gMC->Gsvolu("RSSS","TUBE",(*fIdtmed)[kSteel]  ,par,3); //Steel screw to support Sr90 
+          par[0]=0 ;par[1]= 1*mm/2  ;par[2]= 1*mm/2; gMC->Gsvolu("RSSR","TUBE",(*fIdtmed)[kSr90]   ,par,3); //Sr90 source
+        par[0]=0 ;par[1]= 4*mm/2  ;par[2]= 10*mm/2;  gMC->Gsvolu("RSWP","TUBE",(*fIdtmed)[kAir]    ,par,3); //Air hole in perpex plug      
+      par[0]=0 ;par[1]= 5*mm/2  ;par[2]= 1.8*mm/2;   gMC->Gsvolu("RSWA","TUBE",(*fIdtmed)[kAir]    ,par,3); //Air hole in Al glass bottom
+    par[0]=0 ;par[1]= 30*mm/2  ;par[2]= 50*mkm/2;    gMC->Gsvolu("RSMF","TUBE",(*fIdtmed)[kMylar]  ,par,3); //Mylar foil                
+    
+  gMC->Gspos("RSRC",1,"RICH",       30*cm,        0,     1*cm, 0,"ONLY"); //source to RICH
+    gMC->Gspos("RSMF",1,"RSRC",         0,        0,21.8*mm/2+50*mkm/2, 0,"ONLY");//mylar foil to top src volume
+    gMC->Gspos("RSAG",1,"RSRC",         0,        0,        0, 0,"ONLY");//Al glass to fake Src volume 
+      gMC->Gspos("RSWA",1,"RSAG",    6*mm,        0,   -10*mm, 0,"ONLY");//air whole in al glass bottom
+      gMC->Gspos("RSPP",1,"RSAG",       0,        0,   0.9*mm, 0,"ONLY");//perpex plug to Al glass
+        gMC->Gspos("RSWP",1,"RSPP",  6*mm,        0,    -5*mm, 0,"ONLY");//air whole in perpex plug
+        gMC->Gspos("RSSC",1,"RSPP",     0,        0,   2.5*mm, 0,"ONLY");//steel screw in center of perpex plug
+        gMC->Gspos("RSSS",1,"RSPP",  6*mm,        0,     5*mm, 0,"ONLY");//steel screw to support Sr90  in perpex plug
+          gMC->Gspos("RSSR",1,"RSSS",   0,        0,  -4.5*mm, 0,"ONLY");//Sr90  in support steel screw
+}//GeomSr90()
+//__________________________________________________________________________________________________
+void AliRICH::GeomAerogel()const
+{
+//Creates detailed geometry for aerogel study.
+  AliDebug(1,"Start.");
+  Double_t cm=1;
+  Float_t par[3]; //tmp array for volume dimentions
+       
+  par[0]=10.1*cm/2;par[1]=10.1*cm/2;par[2]=10.1*cm/2;
+  gMC->Gsvolu("RREF","BOX ",(*fIdtmed)[kReflector],par,3);//reflector box
+  gMC->Gspos("RREF",1,"RICH",0,0,0,0, "ONLY");            //put it to RICH volume
+  
+  par[0]=10*cm/2;par[1]=10*cm/2;par[2]=10*cm/2;
+  gMC->Gsvolu("RGEL","BOX ",(*fIdtmed)[kGel],par,3);//10x10x10 cm^3 cubic of aerogel
+  gMC->Gspos("RGEL",1,"RREF",0,0,0,0,"ONLY");//put gel cell to reflector
+  AliDebug(1,"Stop.");  
+}//GeomAerogel()
+//__________________________________________________________________________________________________
+void AliRICH::CreateGeometry()
+{
+//Creates detailed geometry simulation (currently GEANT volumes tree)         
+  AliDebug(1,"Start main.");
+  Double_t mm=0.1;//default is cm
+  Float_t par[3];
+  Int_t matrixIdReturn=0; //matrix id returned by AliMatrix
+       
 //place chambers into mother volume ALIC
-  for(int i=1;i<=kNCH;i++){
-    AliMatrix(idrotm[1000+i],C(i)->ThetaXd(),C(i)->PhiXd(),
-                             C(i)->ThetaYd(),C(i)->PhiYd(),
-                             C(i)->ThetaZd(),C(i)->PhiZd());
-    gMC->Gspos("RICH",i,"ALIC",C(i)->X(),C(i)->Y(),C(i)->Z(),idrotm[1000+i], "ONLY");
+  par[0]=(6*mm+1681*mm+6*mm)/2;par[1]=(6*mm+1466*mm+6*mm)/2;par[2]=(80*mm+40*mm)*2/2;
+  gMC->Gsvolu("RICH","BOX ",(*fIdtmed)[kCH4],par,3);//2033P1  z p84 TDR
+  for(int i=1;i<=P()->Nchambers();i++){ //test configuration with single chamber is taken into account automaticaly in AliRICHParam
+    AliMatrix(matrixIdReturn,
+                   C(i)->ThetaXd(),C(i)->PhiXd(),  
+                   C(i)->ThetaYd(),C(i)->PhiYd(),  
+                   C(i)->ThetaZd(),C(i)->PhiZd());
+    gMC->Gspos("RICH",i,"ALIC",C(i)->Center().X(),
+                               C(i)->Center().Y(),
+                               C(i)->Center().Z(),matrixIdReturn, "ONLY");
   }
+  
+  if(P()->IsAerogel()) 
+    GeomAerogel();
+  else{
+    GeomPadPanelFrame();
+    GeomAmpGap();
+    if(P()->IsRadioSrc())    GeomRadioSrc(); else GeomRadiators(); 
+    GeomSandBox();           
+  }
+  AliDebug(1,"Stop main.");  
+}//CreateGeometry()
+//__________________________________________________________________________________________________
+void AliRICH::DisplayEvent(Int_t iEvtNmin,Int_t iEvtNmax)const
+{
+  TH2F *pDigitsH2[8];
 
-  if(GetDebug())Info("CreateGeometry","Stop.");  
-}//void AliRICH::CreateGeometry()
-//______________________________________________________________________________
-void AliRICH::CreateChambers()
-{//(re)create all RICH Chambers
-  if(GetDebug())Info("CreateChambers","Start.");
+  Bool_t isDigits  =!GetLoader()->LoadDigits();
+  if(!isDigits){Error("ShoEvent","No digits. Nothing to display.");return;}
+  
+  TCanvas *canvas = new TCanvas("RICHDisplay","RICH Display",0,0,1226,900);     
+  gStyle->SetPalette(1);
 
-  if(fChambers) delete fChambers;//recreate chambers
-  fChambers=new TObjArray(kNCH);
-  fChambers->SetOwner();
-  for(int i=0;i<kNCH;i++){
-    fChambers->AddAt(new AliRICHChamber(i+1,fpParam),i);
+  
+  for(Int_t iChamber=1;iChamber<=7;iChamber++) {
+    pDigitsH2[iChamber] = new TH2F(Form("pDigitsH2_%i",iChamber),Form("Chamber %i",iChamber),165,0,P()->PcSizeX(),144,0,P()->PcSizeY());
+    pDigitsH2[iChamber]->SetMarkerColor(kGreen); 
+    pDigitsH2[iChamber]->SetMarkerStyle(29); 
+    pDigitsH2[iChamber]->SetMarkerSize(0.4);
+    pDigitsH2[iChamber]->SetStats(kFALSE);
+    pDigitsH2[iChamber]->SetMaximum(300);
   }
+  
+  if(iEvtNmax>gAlice->GetEventsPerRun()||iEvtNmax==0) iEvtNmax=gAlice->GetEventsPerRun()-1;
 
-  if(GetDebug())Info("CreateChambers","Stop.");
-}//void AliRICH::CreateChambers()
-//__________________________________________________________________________________________________
-void AliRICH::GenerateFeedbacks(Float_t eloss)
-{// Generate FeedBack photons
-  Int_t j;
-  Float_t cthf, phif, enfp = 0, sthf;
-  Float_t e1[3], e2[3], e3[3];
-  Float_t vmod, uswop;
-  Float_t dir[3], phi;
-  Float_t pol[3], mom[4];
-//Determine number of feedback photons
-  TLorentzVector x4;
-  gMC->TrackPosition(x4);//This sould return the current track position
-  Float_t charge=Param()->TotalCharge(gMC->TrackPid(),eloss,5*cm);//??? Totsl Charge
-  Int_t iNphotons=gMC->GetRandom()->Poisson(Param()->AlphaFeedback()*charge);    
-  Info("GenerateFeedbacks","N photons=%i",iNphotons);
-//Generate photons
-  for(Int_t i=0;i<iNphotons;i++){
-    Double_t ranf[2];
-    gMC->GetRandom()->RndmArray(2,ranf);    //Sample direction
-    cthf=ranf[0]*2-1.0;
-    if(cthf<0) continue;
-    sthf = TMath::Sqrt((1 - cthf) * (1 + cthf));
-    phif = ranf[1] * 2 * TMath::Pi();
-    
-    if(Double_t randomNumber=gMC->GetRandom()->Rndm()<=0.57)
-      enfp = 7.5e-9;
-    else if(randomNumber<=0.7)
-      enfp = 6.4e-9;
-    else
-      enfp = 7.9e-9;
-    
+  TLatex t;  t.SetTextSize(0.1);
+  for(Int_t iEventN=iEvtNmin;iEventN<=iEvtNmax;iEventN++) {//events loop
+    canvas->Divide(3,3);    
+    canvas->cd(1);
+    t.DrawText(0.2,0.4,Form("Event Number %i",iEventN));        
 
-    dir[0] = sthf * TMath::Sin(phif);    dir[1] = cthf;    dir[2] = sthf * TMath::Cos(phif);
-    gMC->Gdtom(dir, mom, 2);
-    mom[0]*=enfp;    mom[1]*=enfp;    mom[2]*=enfp;
-    mom[3] = TMath::Sqrt(mom[0]*mom[0]+mom[1]*mom[1]+mom[2]*mom[2]);
-    
-    // Polarisation
-    e1[0]=      0;    e1[1]=-dir[2];    e1[2]= dir[1];
-    e2[0]=-dir[1];    e2[1]= dir[0];    e2[2]=      0;
-    e3[0]= dir[1];    e3[1]=      0;    e3[2]=-dir[0];
-    
-    vmod=0;
-    for(j=0;j<3;j++) vmod+=e1[j]*e1[j];
-    if (!vmod) for(j=0;j<3;j++) {
-      uswop=e1[j];
-      e1[j]=e3[j];
-      e3[j]=uswop;
-    }
-    vmod=0;
-    for(j=0;j<3;j++) vmod+=e2[j]*e2[j];
-    if (!vmod) for(j=0;j<3;j++) {
-      uswop=e2[j];
-      e2[j]=e3[j];
-      e3[j]=uswop;
-    }
-    
-    vmod=0;
-    for(j=0;j<3;j++) vmod+=e1[j]*e1[j];
-    vmod=TMath::Sqrt(1/vmod);
-    for(j=0;j<3;j++) e1[j]*=vmod;
-    
-    vmod=0;
-    for(j=0;j<3;j++) vmod+=e2[j]*e2[j];
-    vmod=TMath::Sqrt(1/vmod);
-    for(j=0;j<3;j++) e2[j]*=vmod;
-    
-    phi = gMC->GetRandom()->Rndm()* 2 * TMath::Pi();
-    for(j=0;j<3;j++) pol[j]=e1[j]*TMath::Sin(phi)+e2[j]*TMath::Cos(phi);
-    gMC->Gdtom(pol, pol, 2);
-    Int_t outputNtracksStored;    
-    gAlice->PushTrack(1,                             //do not transport
-                     gAlice->GetCurrentTrackNumber(),//parent track 
-                     kFeedback,                      //PID
-                    mom[0],mom[1],mom[2],mom[3],    //track momentum  
-                     x4.X(),x4.Y(),x4.Z(),x4.T(),    //track origin 
-                     pol[0],pol[1],pol[2],           //polarization
-                    kPFeedBackPhoton,outputNtracksStored,1.0);
-    
-  }
-}//Int_t AliRICH::FeedBackPhotons()
-//__________________________________________________________________________________________________
-static Int_t sMaxIterPad=0;    // Static variables for the pad-hit iterator routines
-static Int_t sCurIterPad=0;
+    GetLoader()->GetRunLoader()->GetEvent(iEventN); //get event
+    GetLoader()->TreeD()->GetEntry(0);              //get list of digits 
+    for(Int_t iChamber=1;iChamber<=7;iChamber++) {//chambers loop
+      pDigitsH2[iChamber]->Reset();    
+      for(Int_t j=0;j<Digits(iChamber)->GetEntries();j++) {//digits loop
+        AliRICHDigit *pDig = (AliRICHDigit*)Digits(iChamber)->At(j);
+        TVector2 x2=AliRICHParam::Pad2Loc(pDig->Pad());
+        pDigitsH2[iChamber]->Fill(x2.X(),x2.Y(),pDig->Qdc());
+      }//digits loop
+      if(iChamber==1) canvas->cd(7);
+      if(iChamber==2) canvas->cd(8);
+      if(iChamber==3) canvas->cd(4);
+      if(iChamber==4) canvas->cd(5);
+      if(iChamber==5) canvas->cd(6);
+      if(iChamber==6) canvas->cd(2);
+      if(iChamber==7) canvas->cd(3);
+      pDigitsH2[iChamber]->Draw("col");
+      ReadESD(iEventN,iChamber);
+      AliRICHParam::DrawSectors();
+    }//chambers loop
+    canvas->Update();
+    canvas->Modified();
 
+    if(iEventN<iEvtNmax) {gPad->WaitPrimitive();canvas->Clear();}
+  }//events loop
+}//ShowEvent()
+//__________________________________________________________________________________________________
+void AliRICH::Display()const
+{
+//Provides fast event display
+//For RICH only, full display is .x Display.C    
+  Bool_t isHits    =!GetLoader()->LoadHits();
+  Bool_t isDigits  =!GetLoader()->LoadDigits();
+  Bool_t isClusters=!GetLoader()->LoadRecPoints();
+  
+  if(!isHits && !isDigits && !isClusters){Error("Exec","No hits digits and clusters. Nothing to display.");return;}
+  
+  TCanvas *pCanvas = new TCanvas("Display","RICH Display",0,0,600,600);
+  
+  TH2F *pHitsH2=0,*pDigitsH2=0,*pClustersH2=0;
+  
+  if(isHits)     pHitsH2     = new TH2F("pHitsH2"  ,  "Event Display;x,cm;y,cm",165,0,AliRICHParam::PcSizeX(),
+                                                                                144,0,AliRICHParam::PcSizeY());
+  if(pHitsH2)    pHitsH2->SetStats(kFALSE);
+  
+  if(isDigits)   pDigitsH2   = new TH2F("pDigitsH2"  ,"Event Display",165,0,AliRICHParam::PcSizeX(),
+                                                                      144,0,AliRICHParam::PcSizeY());
+  if(isClusters) pClustersH2 = new TH2F("pClustersH2","Event Display",165,0,AliRICHParam::PcSizeX(),
+                                                                      144,0,AliRICHParam::PcSizeY());
+  
+  for(Int_t iEventN=0;iEventN<gAlice->GetEventsPerRun();iEventN++){//events Loop
+    GetLoader()->GetRunLoader()->GetEvent(iEventN);  
+//display all the staff on chamber by chamber basis           
+    for(Int_t iChamber=1;iChamber<=7;iChamber++){//chambers loop       
+      if(isHits)     pHitsH2    ->Reset();     
+      if(isDigits)   pDigitsH2  ->Reset();     
+      if(isClusters) pClustersH2->Reset();
+//deals with hits
+      for(Int_t i=0;i<GetLoader()->TreeH()->GetEntries();i++){//TreeH loop
+        GetLoader()->TreeH()->GetEntry(i);
+        for(Int_t j=0;j<Hits()->GetEntries();j++){//hits loop
+          AliRICHHit *pHit = (AliRICHHit*)Hits()->At(j);
+          if(pHit->C()==iChamber){
+            TVector3 hitGlobX3= pHit->OutX3();
+            TVector2 hitLocX2 = C(iChamber)->Mrs2Pc(hitGlobX3);
+            pHitsH2->Fill(hitLocX2.X(),hitLocX2.Y(),200);
+          }//if
+        }//hits loop         
+      }//TreeH loop
+      pHitsH2->SetTitle(Form("event %i chamber %2i",iEventN,iChamber));
+      pHitsH2->SetMarkerColor(kRed); pHitsH2->SetMarkerStyle(29); pHitsH2->SetMarkerSize(0.4);
+      ReadESD(iEventN,iChamber);
+      pHitsH2->Draw();
+//      ReadESD(iEventN,iChamber);
+      AliRICHParam::DrawSectors();
+      TLatex l; l.SetNDC(); l.SetTextSize(0.02);
+      if(!isHits)     {l.SetTextColor(kRed)  ;l.DrawLatex(0.1,0.01,"No Hits"    );}
+      if(!isDigits)   {l.SetTextColor(kGreen);l.DrawLatex(0.4,0.01,"No DIGITS"  );}
+      if(!isClusters) {l.SetTextColor(kBlue) ;l.DrawLatex(0.8,0.01,"No CLUSTERS");}
+      pCanvas->Update();        pCanvas->Modified();       gPad->WaitPrimitive();
+//deals with digits      
+      if(isDigits){
+        GetLoader()->TreeD()->GetEntry(0);
+        for(Int_t j=0;j<Digits(iChamber)->GetEntries();j++){//digits loop
+          AliRICHDigit *pDig = (AliRICHDigit*)Digits(iChamber)->At(j);
+         TVector2 x2=AliRICHParam::Pad2Loc(pDig->Pad());
+         pDigitsH2->Fill(x2.X(),x2.Y(),100);
+        }//digits loop
+        pDigitsH2->SetMarkerColor(kGreen); pDigitsH2->SetMarkerStyle(29); pDigitsH2->SetMarkerSize(0.4);
+        pDigitsH2->Draw("same");
+        pCanvas->Update();        pCanvas->Modified();       gPad->WaitPrimitive();
+      }//if(isDigits)      
+//deals with clusters      
+      if(isClusters){
+        GetLoader()->TreeR()->GetEntry(0);
+        for(Int_t j=0;j<Clusters(iChamber)->GetEntries();j++){//clusters loop
+          AliRICHCluster *pClus = (AliRICHCluster*)Clusters(iChamber)->At(j);
+          pClustersH2->Fill(pClus->X(),pClus->Y(),50);
+        }//clusters loop
+        pClustersH2->SetMarkerColor(kBlue); pClustersH2->SetMarkerStyle(29);  pClustersH2->SetMarkerSize(0.4);
+        pClustersH2->Draw("same");
+        pCanvas->Update();        pCanvas->Modified();       gPad->WaitPrimitive();
+      }//if(isClusters)
+    }//chambers loop
+  }//events Loop
+  
+  delete pCanvas;
+  GetLoader()->UnloadHits();
+  if(isDigits)   GetLoader()->UnloadDigits();
+  if(isClusters) GetLoader()->UnloadRecPoints();
+}//Display()
+//__________________________________________________________________________________________________
+Int_t AliRICH::Nparticles(Int_t iPartID,Int_t iEvtN,AliRunLoader *pRL)
+{
+//counts total number of particles of given type (including secondary) for a given event
+  pRL->GetEvent(iEvtN);    
+  if(pRL->LoadHeader()) return 0;
+  if(pRL->LoadKinematics()) return 0;
+  AliStack *pStack=pRL->Stack();
+  
+  Int_t iCounter=0;
+  for(Int_t i=0;i<pStack->GetNtrack();i++){
+    if(pStack->Particle(i)->GetPdgCode()==iPartID) iCounter++;
+  }
+  
+  pRL->UnloadHeader();
+  pRL->UnloadKinematics();
+  return iCounter;
+}
 //__________________________________________________________________________________________________
-AliRICHSDigit* AliRICH::FirstPad(AliRICHhit*  hit,TClonesArray *clusters ) 
-{// Initialise the pad iterator Return the address of the first sdigit for hit
-    TClonesArray *theClusters = clusters;
-    Int_t nclust = theClusters->GetEntriesFast();
-    if (nclust && hit->PHlast() > 0) {
-       sMaxIterPad=Int_t(hit->PHlast());
-       sCurIterPad=Int_t(hit->PHfirst());
-       return (AliRICHSDigit*) clusters->UncheckedAt(sCurIterPad-1);
-    } else {
-       return 0;
+void AliRICH::ReadESD(Int_t iEventN, Int_t iChamber)const
+{
+//
+  AliInfo("Start.");
+  TFile *pFile=TFile::Open("AliESDs.root","read");
+  if(!pFile || !pFile->IsOpen()) {AliInfo("ESD file not open.");return;}      //open AliESDs.root                                                                    
+  TTree *pTree = (TTree*) pFile->Get("esdTree");
+  if(!pTree){AliInfo("ESD not found.");return;}                               //get ESD tree
+  
+  AliInfo("ESD found. Try to draw ring");
+                                                                 
+  AliESD *pESD=new AliESD;  pTree->SetBranchAddress("ESD", &pESD);
+  
+  pTree->GetEvent(iEventN);
+  
+  Double_t b = pESD->GetMagneticField()/10.;
+  
+  Int_t iNtracks=pESD->GetNumberOfTracks();    
+  
+  for(Int_t iTrackN=0;iTrackN<iNtracks;iTrackN++){//ESD tracks loop
+    AliESDtrack *pTrack = pESD->GetTrack(iTrackN);// get next reconstructed track
+    Int_t charge = (Int_t)(-TMath::Sign(1.,pTrack->GetSign()*b));
+    AliRICHHelix helix(pTrack->X3(),pTrack->P3(),charge,b);
+    Int_t iChamberOnRICH=helix.RichIntersect(P());        
+    if(iChamberOnRICH==iChamber) {
+//
+      TMarker *trackImpact = new TMarker(helix.PosPc().X(),helix.PosPc().Y(),kStar);
+      trackImpact->SetMarkerColor(kRed);
+      trackImpact->Draw();
+//
+      Int_t iChamberRecon = pTrack->GetRICHcluster()/100000;
+      if(iChamberRecon==iChamber) {
+        Double_t thetaCer = pTrack->GetRICHsignal();
+        if(thetaCer<0) continue;
+        TVector3 entrance(helix.PosRad().X(),helix.PosRad().Y(),0);
+        Double_t thetaTrack,phiTrack;
+        pTrack->GetRICHthetaPhi(thetaTrack,phiTrack);
+        TVector3 vectorTrack;
+        vectorTrack.SetMagThetaPhi(pTrack->GetP(),thetaTrack,phiTrack);
+        AliInfo(Form("Draw ring started for track %i on chamber %i",iTrackN,iChamber));
+        AliInfo(Form("ThetaCer %f TrackTheta %f TrackPhi %f Momentum %f",thetaCer,thetaTrack,phiTrack,pTrack->GetP()));
+        Double_t dx,dy;
+        pTrack->GetRICHdxdy(dx,dy);
+        AliInfo(Form("dx %f dy %f ",dx,dy));
+        DrawRing(entrance,vectorTrack,thetaCer);
+      }
     }
-    
+  }
+  delete pESD;  pFile->Close();//close AliESDs.root
+  AliInfo("Stop.");
+}
+//__________________________________________________________________________________________________
+void AliRICH::DrawRing(TVector3 entrance,TVector3 vectorTrack,Double_t thetaCer)const
+{
+  Double_t xGraph[100],yGraph[100];
+  Int_t nPointsToDraw = 0;
+  for(Int_t i=0;i<100;i++) {
+    Double_t phiCer = 2*TMath::Pi()*i/100;
+    TVector3 pos = AliRICHParam::ForwardTracing(entrance,vectorTrack,thetaCer,phiCer);
+    if(pos.X()==-999) continue;
+    xGraph[nPointsToDraw] = pos.X();yGraph[nPointsToDraw] = pos.Y();nPointsToDraw++;
+  }
+//  AliInfo(Form("Npoints per ring %i",nPointsToDraw));
+  TGraph *gra = new TGraph(nPointsToDraw,xGraph,yGraph);
+  gra->Draw("C");  
 }
 //__________________________________________________________________________________________________
-AliRICHSDigit* AliRICH::NextPad(TClonesArray *clusters) 
-{// Iterates over pads
-  
-    sCurIterPad++;
-    if (sCurIterPad <= sMaxIterPad) {
-       return (AliRICHSDigit*) clusters->UncheckedAt(sCurIterPad-1);
-    } else {
-       return 0;
+void AliRICH::SummaryOfEvent(Int_t iEvtN) const
+{
+//prints a summary for a given event
+  AliInfo(Form("Summary of event %i",iEvtN));
+  GetLoader()->GetRunLoader()->GetEvent(iEvtN);    
+  if(GetLoader()->GetRunLoader()->LoadHeader()) return;
+  if(GetLoader()->GetRunLoader()->LoadKinematics()) return;
+  AliStack *pStack=GetLoader()->GetRunLoader()->Stack();
+  
+  AliGenEventHeader* pGenHeader =  gAlice->GetHeader()->GenEventHeader();
+  if(pGenHeader->InheritsFrom("AliGenHijingEventHeader")) {
+    AliInfo(Form(" Hijing event with impact parameter b = %.2f (fm)",((AliGenHijingEventHeader*) pGenHeader)->ImpactParameter()));
+  }
+  Int_t nChargedPrimaries=0;
+  for(Int_t i=0;i<pStack->GetNtrack();i++) {
+    TParticle *pParticle = pStack->Particle(i);
+    if(pParticle->IsPrimary()&&pParticle->GetPDG()->Charge()!=0) nChargedPrimaries++;
     }
+  AliInfo(Form("Total number of         primaries %i",pStack->GetNprimary()));
+  AliInfo(Form("Total number of charged primaries %i",nChargedPrimaries));
+  AliInfo(Form("Total n. of tracks in stack(+sec) %i",pStack->GetNtrack()));
+  GetLoader()->GetRunLoader()->UnloadHeader();
+  GetLoader()->GetRunLoader()->UnloadKinematics();
 }
 //__________________________________________________________________________________________________
+void AliRICH::HitsQA(Double_t cut,Double_t cutele,Double_t cutR)
+{
+// Provides a set of control plots intended primarily for charged particle flux analisys
+// Arguments: cut (GeV)    - cut on momentum of any charged particles but electrons, 
+//            cetele (GeV) - the same for electrons-positrons
+//            cutR (cm)    - cut on production vertex radius (cylindrical system)        
+  gBenchmark->Start("HitsAna");
+  
+  Double_t cutPantiproton    =cut;
+  Double_t cutPkaonminus     =cut;
+  Double_t cutPpionminus     =cut;
+  Double_t cutPmuonminus     =cut;
+  Double_t cutPpositron      =cutele;
+                    
+  Double_t cutPelectron      =cutele;
+  Double_t cutPmuonplus      =cut;
+  Double_t cutPpionplus      =cut;
+  Double_t cutPkaonplus      =cut;
+  Double_t cutPproton        =cut;
+                       
+
+  TH2F *pEleHitRZ    =new TH2F("EleHitRZ"    ,Form("e^{+} e^{-} hit %s;z[cm];R[cm]" ,GetName())     , 400,-300,300 ,400,-500,500);   //R-z plot 0cm<R<550cm -300cm<z<300cm  
+  TH2F *pEleHitRP    =new TH2F("EleHitRP"    ,Form("e^{+} e^{-} hit %s;p[GeV];R[cm]",GetName())     ,1000,-1  ,1   ,400,   0,550);   //R-p plot 0cm<R<550cm -1GeV<p<1GeV 
+  TH1F *pEleAllP     =new TH1F("EleAllP"     ,     "e^{+} e^{-} all;p[GeV]"                         ,1000,-1  ,1                );  
+  TH1F *pEleHitP     =new TH1F("EleHitP"     ,Form("e^{+} e^{-} hit %s;p[GeV]"      ,GetName())     ,1000,-1  ,1                );   
+  TH1F *pMuoHitP     =new TH1F("MuoHitP"     ,Form("#mu^{-} #mu^{+} hit %s;p[GeV]"  ,GetName())     ,1000,-4  ,4                ); 
+  TH1F *pPioHitP     =new TH1F("PioHitP"     ,Form("#pi^{-} #pi^{+} hit %s;p[GeV]"  ,GetName())     ,1000,-4  ,4                ); 
+  TH1F *pKaoHitP     =new TH1F("KaoHitP"     ,Form("K^{-} K^{+} hit %s;p[GeV]"      ,GetName())     ,1000,-4  ,4                ); 
+  TH1F *pProHitP     =new TH1F("ProHitP"     ,Form("p^{-} p^{+} hit %s;p[GeV]"      ,GetName())     ,1000,-4  ,4                ); 
+  TH2F *pFlux        =new TH2F("flux"        ,Form("%s flux with Rvertex<%.1fcm"    ,GetName(),cutR),10  ,-5  ,5   , 10,0    ,10); //special text hist
+  TH2F *pVertex      =new TH2F("vertex"      ,Form("%s 2D vertex of RICH hit;x;y"   ,GetName())     ,120 ,0   ,600 ,120,0    ,600); //special text hist
+  TH1F *pRho         =new TH1F("rho"         ,Form("%s r of RICH hit"               ,GetName())     ,600 ,0   ,600); //special text hist
+  pFlux->SetStats(0);
+  pFlux->GetXaxis()->SetBinLabel(1 ,Form("p^{-}>%.3fGeV/c"   ,cutPantiproton));        
+  pFlux->GetXaxis()->SetBinLabel(2 ,Form("K^{-}>%.3fGeV/c"   ,cutPkaonminus ));        
+  pFlux->GetXaxis()->SetBinLabel(3 ,Form("#pi^{-}>%.3fGeV/c" ,cutPpionminus ));      
+  pFlux->GetXaxis()->SetBinLabel(4 ,Form("#mu^{-}>%.3fGeV/c" ,cutPmuonminus ));      
+  pFlux->GetXaxis()->SetBinLabel(5 ,Form("e^{+}>%.3fGeV/c"   ,cutPpositron  ));        
+  
+  pFlux->GetXaxis()->SetBinLabel(6 ,Form("e^{-}>%.3fGeV/c"   ,cutPelectron  ));        
+  pFlux->GetXaxis()->SetBinLabel(7 ,Form("#mu^{+}>%.3fGeV/c" ,cutPmuonplus  ));      
+  pFlux->GetXaxis()->SetBinLabel(8 ,Form("#pi^{+}>%.3fGeV/c" ,cutPpionplus  ));      
+  pFlux->GetXaxis()->SetBinLabel(9 ,Form("K^{+}>%.3fGeV/c"   ,cutPkaonplus  ));        
+  pFlux->GetXaxis()->SetBinLabel(10,Form("p^{+}>%.3fGeV/c"   ,cutPproton    ));        
+  
+  pFlux->GetYaxis()->SetBinLabel(1,"sum");  
+  pFlux->GetYaxis()->SetBinLabel(2,"ch1");  
+  pFlux->GetYaxis()->SetBinLabel(3,"ch2");  
+  pFlux->GetYaxis()->SetBinLabel(4,"ch3");  
+  pFlux->GetYaxis()->SetBinLabel(5,"ch4");  
+  pFlux->GetYaxis()->SetBinLabel(6,"ch5");  
+  pFlux->GetYaxis()->SetBinLabel(7,"ch6");  
+  pFlux->GetYaxis()->SetBinLabel(8,"ch7");  
+  pFlux->GetYaxis()->SetBinLabel(9,"prim"); 
+  pFlux->GetYaxis()->SetBinLabel(10,"tot");  
+  
+//end of hists definition
+   
+  Int_t iNevents=fLoader->GetRunLoader()->GetAliRun()->GetEventsPerRun(),iCntPrimParts=0,iCntTotParts=0;
+//load all needed trees   
+  fLoader->LoadHits(); 
+  fLoader->GetRunLoader()->LoadHeader(); 
+  fLoader->GetRunLoader()->LoadKinematics();  
+  
+  for(Int_t iEvtN=0;iEvtN < iNevents;iEvtN++){//events loop
+    fLoader->GetRunLoader()->GetEvent(iEvtN);
+    AliInfo(Form(" %i event processes",fLoader->GetRunLoader()->GetEventNumber()));
+    AliStack *pStack= fLoader->GetRunLoader()->Stack(); 
+    
+    for(Int_t iParticleN=0;iParticleN<pStack->GetNtrack();iParticleN++){//stack loop
+      TParticle *pPart=pStack->Particle(iParticleN);
+
+      if(iParticleN%10000==0) AliInfo(Form(" %i particles read",iParticleN));
+    
+      switch(pPart->GetPdgCode()){
+        case kProtonBar: pFlux->Fill(-4.5,9); if(pPart->Rho()<0.01) pFlux->Fill(-4.5,8); break;
+        case kKMinus:    pFlux->Fill(-3.5,9); if(pPart->Rho()<0.01) pFlux->Fill(-3.5,8); break;
+        case kPiMinus:   pFlux->Fill(-2.5,9); if(pPart->Rho()<0.01) pFlux->Fill(-2.5,8); break;
+        case kMuonMinus: pFlux->Fill(-1.5,9); if(pPart->Rho()<0.01) pFlux->Fill(-1.5,8); break;
+        case kPositron:  pFlux->Fill(-0.5,9); if(pPart->Rho()<0.01) pFlux->Fill(-0.5,8); pEleAllP->Fill(-pPart->P()); break;
+      
+        case kElectron:  pFlux->Fill( 0.5,9); if(pPart->Rho()<0.01) pFlux->Fill( 0.5,8); pEleAllP->Fill( pPart->P()); break;      
+        case kMuonPlus:  pFlux->Fill( 1.5,9); if(pPart->Rho()<0.01) pFlux->Fill( 1.5,8); break;      
+        case kPiPlus:    pFlux->Fill( 2.5,9); if(pPart->Rho()<0.01) pFlux->Fill( 2.5,8); break;      
+        case kKPlus:     pFlux->Fill( 3.5,9); if(pPart->Rho()<0.01) pFlux->Fill( 3.5,8); break;      
+        case kProton:    pFlux->Fill( 4.5,9); if(pPart->Rho()<0.01) pFlux->Fill( 4.5,8); break;            
+      }//switch
+    }//stack loop
+//now hits analiser        
+    for(Int_t iEntryN=0;iEntryN < fLoader->TreeH()->GetEntries();iEntryN++){//TreeH loop
+      fLoader->TreeH()->GetEntry(iEntryN);                                  //get current entry (prim)                
+      for(Int_t iHitN=0;iHitN < Hits()->GetEntries();iHitN++){//hits loop
+        AliRICHHit *pHit = (AliRICHHit*)Hits()->At(iHitN);            //get current hit
+        TParticle  *pPart=pStack->Particle(pHit->GetTrack());      //get stack particle which produced the current hit
+        
+        if(pPart->GetPDG()->Charge()!=0&&pPart->Rho()>0.1) pVertex->Fill(pPart->Vx(),pPart->Vy()); //safe margin for sec.
+        if(pPart->GetPDG()->Charge()!=0) pRho->Fill(pPart->Rho()); //safe margin for sec.
+        if(pPart->R()>cutR) continue;                                   //cut on production radius (cylindrical system) 
+      
+        switch(pPart->GetPdgCode()){
+          case kProtonBar: if(pPart->P()>cutPantiproton) {pProHitP->Fill(-pPart->P()); pFlux->Fill(-4.5,pHit->C());}break;
+          case kKMinus   : if(pPart->P()>cutPkaonminus)  {pKaoHitP->Fill(-pPart->P()); pFlux->Fill(-3.5,pHit->C());}break;
+          case kPiMinus  : if(pPart->P()>cutPpionminus)  {pPioHitP->Fill(-pPart->P()); pFlux->Fill(-2.5,pHit->C());}break;
+          case kMuonMinus: if(pPart->P()>cutPmuonminus)  {pMuoHitP->Fill(-pPart->P()); pFlux->Fill(-1.5,pHit->C());}break;        
+          case kPositron : if(pPart->P()>cutPpositron)   {pEleHitP->Fill(-pPart->P()); pFlux->Fill(-0.5,pHit->C()); 
+               pEleHitRP->Fill(-pPart->P(),pPart->R());  pEleHitRZ->Fill(pPart->Vz(),pPart->R()); }break;
+          
+          case kElectron : if(pPart->P()>cutPelectron)   {pEleHitP->Fill( pPart->P()); pFlux->Fill( 0.5,pHit->C()); 
+               pEleHitRP->Fill( pPart->P(),pPart->R());  pEleHitRZ->Fill(pPart->Vz(),pPart->R()); }break;
+          case kMuonPlus : if(pPart->P()>cutPmuonplus)   {pMuoHitP->Fill( pPart->P()); pFlux->Fill( 1.5,pHit->C());}break;                     
+          case kPiPlus   : if(pPart->P()>cutPpionplus)   {pPioHitP->Fill( pPart->P()); pFlux->Fill( 2.5,pHit->C());}break;           
+          case kKPlus    : if(pPart->P()>cutPkaonplus)   {pKaoHitP->Fill( pPart->P()); pFlux->Fill( 3.5,pHit->C());}break;           
+          case kProton   : if(pPart->P()>cutPproton)     {pProHitP->Fill( pPart->P()); pFlux->Fill( 4.5,pHit->C());}break;
+        }
+      }//hits loop      
+    }//TreeH loop
+    iCntPrimParts +=pStack->GetNprimary();
+    iCntTotParts  +=pStack->GetNtrack();
+  }//events loop                        
+//unload all loaded staff  
+  fLoader->UnloadHits();  
+  fLoader->GetRunLoader()->UnloadHeader(); 
+  fLoader->GetRunLoader()->UnloadKinematics();  
+//Calculater some sums
+  Stat_t sum=0;
+//sum row, sum over rows  
+  for(Int_t i=1;i<=pFlux->GetNbinsX();i++){
+    sum=0; for(Int_t j=2;j<=8;j++)    sum+=pFlux->GetBinContent(i,j);    
+    pFlux->SetBinContent(i,1,sum);
+  }
+    
+//display everything  
+  new TCanvas("canvas1",Form("Events %i Nprims=%i Nparticles=%i",iNevents,iCntPrimParts,iCntTotParts),1000,900); pFlux->Draw("text");  gPad->SetGrid();  
+//total prims and particles
+  TLatex latex; latex.SetTextSize(0.02);
+  sum=0; for(Int_t i=1;i<=pFlux->GetNbinsX();i++) sum+=pFlux->GetBinContent(i,10);    latex.DrawLatex(5.1,9.5,Form("%.0f",sum));
+  sum=0; for(Int_t i=1;i<=pFlux->GetNbinsX();i++) sum+=pFlux->GetBinContent(i,9);     latex.DrawLatex(5.1,8.5,Form("%.0f",sum));
+  for(Int_t iChN=1;iChN<=kNchambers;iChN++) {
+    sum=0; for(Int_t i=1;i<=pFlux->GetNbinsX();i++) sum+=pFlux->GetBinContent(i,iChN+1);latex.DrawLatex(5.1,iChN+0.5,Form("%.0f",sum));
+  }  
+  sum=0; for(Int_t i=1;i<=pFlux->GetNbinsX();i++) sum+=pFlux->GetBinContent(i,1);    latex.DrawLatex(5.1,0.5,Form("%.0f",sum));
+  
+  new TCanvas("cEleAllP"   ,"e" ,200,100); pEleAllP->Draw();
+  new TCanvas("cEleHitRP"  ,"e" ,200,100); pEleHitRP->Draw();
+  new TCanvas("cEleHitRZ"  ,"e" ,200,100); pEleHitRZ->Draw();
+  new TCanvas("cEleHitP"   ,"e" ,200,100); pEleHitP->Draw();
+  new TCanvas("cMuoHitP"   ,"mu",200,100); pMuoHitP->Draw();
+  new TCanvas("cPioHitP"   ,"pi",200,100); pPioHitP->Draw();
+  new TCanvas("cKaoHitP"   ,"K" ,200,100); pKaoHitP->Draw();
+  new TCanvas("cProHitP"   ,"p" ,200,100); pProHitP->Draw();
+  new TCanvas("cVertex"    ,"2d vertex" ,200,100); pVertex->Draw();
+  new TCanvas("cRho"    ,"Rho of sec" ,200,100); pRho->Draw();
+  
+  gBenchmark->Show("HitsPlots");
+}//HitsPlots()