[u/mrichter/AliRoot.git] / RICH / AliRICHDigitizer.cxx

/**************************************************************************
 * Copyright(c) 1998-2000, 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.                  *
 **************************************************************************/


//Piotr.Skowronski@cern.ch :
//Corrections applied in order to compile (only) with new I/O and folder structure
//To be implemented correctly by responsible

#include <Riostream.h> 

#include <TTree.h> 
#include <TObjArray.h>
#include <TFile.h>
#include <TDirectory.h>
#include <TParticle.h>

#include "AliRunLoader.h"
#include "AliLoader.h"

#include "AliRICHDigitizer.h"
#include "AliRICHChamber.h"
#include "AliHitMap.h"
#include "AliRICHHitMapA1.h"
#include "AliRICH.h"
#include "AliRICHSDigit.h"
#include "AliRICHDigit.h"
#include "AliRICHTransientDigit.h"
#include "AliRun.h"
#include "AliPDG.h"
#include "AliRunDigitizer.h"

ClassImp(AliRICHDigitizer)

//__________________________________________________________________________________________________
AliRICHDigitizer::AliRICHDigitizer()
{//default ctor - don't use it   
  fHits = 0;
  fSDigits = 0;
  fHitMap = 0;
  fTDList = 0;
}//default ctor
//__________________________________________________________________________________________________
AliRICHDigitizer::AliRICHDigitizer(AliRunDigitizer *pManager) 
                 :AliDigitizer(pManager)
{//main ctor which should be used
  if(pManager->GetDebug())Info("main ctor","Start.");
  fHits = 0;
  fSDigits = 0;
  fHitMap = 0;
  fTDList = 0;
  fDebug  = pManager->GetDebug(); 
}//main ctor
//__________________________________________________________________________________________________
AliRICHDigitizer::~AliRICHDigitizer()
{//dtor
  if(GetDebug())Info("dtor","Start.");
  
    if (fHits) {
	fHits->Delete();
	delete fHits;
    }
    if (fSDigits) {
	fSDigits->Delete();
	delete fSDigits;
    }
    for (Int_t i=0; i<kNCH; i++ )
	delete fHitMap[i];
    delete [] fHitMap;
    if (fTDList) {
	fTDList->Delete();
	delete fTDList;
  }
}//dtor
//__________________________________________________________________________________________________
Bool_t AliRICHDigitizer::Exists(const AliRICHSDigit *p) 
{
  return (fHitMap[fNch]->TestHit(p->PadX(),p->PadY()));
}//Exists
//__________________________________________________________________________________________________
void AliRICHDigitizer::Update(AliRICHSDigit *padhit)
{
  AliRICHTransientDigit *pdigit = 
    static_cast<AliRICHTransientDigit*>(
      fHitMap[fNch]->GetHit(padhit->PadX(),padhit->PadY()));

  // update charge
  //
  Int_t iqpad    = Int_t(padhit->QPad()); // charge per pad
  pdigit->AddSignal(iqpad);
  pdigit->AddPhysicsSignal(iqpad);            

  // update list of tracks
  //
  Int_t track, charge;
  track = fTrack+fMask;
  if (fSignal) {
    charge = iqpad;
  } else {
    charge = kBgTag;
  }
  pdigit->UpdateTrackList(track,charge);
}//Update()
//__________________________________________________________________________________________________
void AliRICHDigitizer::CreateNew(AliRICHSDigit *padhit)
{
  fTDList->AddAtAndExpand(
    new AliRICHTransientDigit(fNch,fDigits),fCounter);
  fHitMap[fNch]->SetHit(padhit->PadX(),padhit->PadY(),fCounter);

  AliRICHTransientDigit* pdigit = 
    static_cast<AliRICHTransientDigit*>(fTDList->Last());
  // list of tracks
  Int_t track, charge;
  if (fSignal) {
    track = fTrack;
    charge = padhit->QPad();
  } else {
    track = kBgTag;
    charge = kBgTag;
  }
  pdigit->AddToTrackList(track,charge);
  fCounter++;
}//CreateNew()
//__________________________________________________________________________________________________
Bool_t AliRICHDigitizer::Init()
{// Initialisation
  if(GetDebug())Info("Init","Start.");
  fHits     = new TClonesArray("AliRICHhit",1000);
  fSDigits  = new TClonesArray("AliRICHSDigit",1000);
  return kTRUE;
}//Init()
//__________________________________________________________________________________________________
void AliRICHDigitizer::Exec(Option_t* option)
{
  if(GetDebug())Info("Exec","Start with option=%s",option);

  AliRICHChamber*       iChamber;
  AliSegmentation*  segmentation;
 
  AliRunLoader *pInAL, *pOutAL;//in and out Run loaders
  AliLoader    *pInRL, *pOutRL;//in and out RICH loaders
 
  pOutAL = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
  pOutRL = pOutAL->GetLoader("RICHLoader");

  fTDList = new TObjArray;
  
     
  AliRICH *pRICH = (AliRICH *) gAlice->GetDetector("RICH");
  
  if(!pOutRL->TreeD()) pOutRL->MakeTree("D");  pRICH->MakeBranch("D");
  fHitMap= new AliHitMap* [kNCH];
        
  for (Int_t i =0; i<kNCH; i++) {
    iChamber= &(pRICH->Chamber(i));
    segmentation=iChamber->GetSegmentationModel();
    fHitMap[i] = new AliRICHHitMapA1(segmentation, fTDList);
  }

// Loop over files to digitize
  fSignal = kTRUE;
  fCounter = 0;
  for (Int_t inputFile=0;inputFile<fManager->GetNinputs();inputFile++){//files loop
    pInAL = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(inputFile));
    pInRL = pInAL->GetLoader("RICHLoader");
    
// Connect RICH branches

    if (inputFile > 0 ) fSignal = kFALSE;
    TBranch *branchHits = 0;
    TBranch *branchSDigits = 0;

    pInRL->LoadHits("READ");
    
    TTree *treeH = pInRL->TreeH();
    if(pInRL->TreeH()) {
      branchHits = treeH->GetBranch("RICH");
      if(branchHits){
        fHits->Clear();
        branchHits->SetAddress(&fHits);}
      else
        Error("Exec","branch RICH was not found");
    }

    if(treeH) {
      branchSDigits = treeH->GetBranch("RICHSpecials");
      if(branchSDigits) 
        branchSDigits->SetAddress(&fSDigits);
      else
        Error("exec","branch RICHSpecials was not found");
    }
    
    for (fTrack=0; fTrack<treeH->GetEntries(); fTrack++) {//prims loop
      fHits->Clear();                   fSDigits->Clear();  
      fHits->Print();

      branchHits->GetEntry(fTrack);     branchSDigits->GetEntry(fTrack);
      for(Int_t i=0;i<fHits->GetEntriesFast();++i){//hits loop
	AliRICHhit* pHit = static_cast<AliRICHhit*>(fHits->At(i));
	fNch = pHit->Chamber()-1;  // chamber number
	if (fNch >= kNCH) {
	  cerr<<"AliRICHDigitizer: chamber nr. fNch out of range: "<<fNch<<endl;
	  cerr<<"               track: "<<fTrack<<endl;
	  continue;
	}
	iChamber = &(pRICH->Chamber(fNch));
	  
	for (AliRICHSDigit* mPad=FirstPad(pHit,fSDigits);mPad;mPad=NextPad(fSDigits)){//clusters loop
	  Int_t iqpad    = mPad->QPad();       // charge per pad
	  fDigits[0]=mPad->PadX();
	  fDigits[1]=mPad->PadY();
	  fDigits[2]=iqpad;
	  fDigits[3]=iqpad;
	  fDigits[4]=mPad->HitNumber();
	  if (Exists(mPad))	  // build the list of fired pads and update the info
            Update(mPad);
	  else
            CreateNew(mPad);
	}//clusters loop
      }//hits loop
    }//prims loop
  }//files loop
  if(GetDebug()) Info("Exec","END OF FILE LOOP");

  Int_t tracks[kMAXTRACKSPERRICHDIGIT];
  Int_t charges[kMAXTRACKSPERRICHDIGIT];
  Int_t nentries=fTDList->GetEntriesFast();
    
  for (Int_t nent=0;nent<nentries;nent++) {
    AliRICHTransientDigit *transDigit=(AliRICHTransientDigit*)fTDList->At(nent);
    if (transDigit==0) continue; 
    Int_t ich=transDigit->GetChamber();
    Int_t q=transDigit->Signal(); 
    iChamber=&(pRICH->Chamber(ich));
    AliRICHResponse * response=iChamber->GetResponseModel();
    Int_t adcmax= (Int_t) response->MaxAdc();
      
      
    // add white noise and do zero-suppression and signal truncation (new electronics,old electronics gaus 1.2,0.2)
    //printf("Treshold: %d\n",iChamber->fTresh->GetHitIndex(transDigit->PadX(),transDigit->PadY()));

// tmp change
//    Int_t pedestal = iChamber->fTresh->GetHitIndex(transDigit->PadX(),transDigit->PadY());
    Int_t pedestal = 0;

    Float_t treshold = (pedestal + 4*2.2);
      
    Float_t meanNoise = gRandom->Gaus(2.2, 0.3);
    Float_t noise     = gRandom->Gaus(0, meanNoise);
    q+=(Int_t)(noise + pedestal);
    //q+=(Int_t)(noise);
    //          magic number to be parametrised !!! 
    if ( q <= treshold) 
    {
      q = q - pedestal;
      continue;
    }
    q = q - pedestal;
    if ( q >= adcmax) q=adcmax;
    fDigits[0]=transDigit->PadX();
    fDigits[1]=transDigit->PadY();
    fDigits[2]=q;
    fDigits[3]=transDigit->Physics();
    fDigits[4]=transDigit->Hit();

    Int_t nptracks = transDigit->GetNTracks();  

    // this was changed to accomodate the real number of tracks
    if (nptracks > kMAXTRACKSPERRICHDIGIT) {
      printf("Attention - tracks > 10 %d\n",nptracks);
      nptracks=kMAXTRACKSPERRICHDIGIT;
    }
    if (nptracks > 2) {
      printf("Attention - tracks > 2  %d \n",nptracks);
    }
    for (Int_t tr=0;tr<nptracks;tr++) {
      tracks[tr]=transDigit->GetTrack(tr);
      charges[tr]=transDigit->GetCharge(tr);
      //printf("%f \n",charges[tr]);
    }      //end loop over list of tracks for one pad
    if (nptracks < kMAXTRACKSPERRICHDIGIT ) {
      for (Int_t t=nptracks; t<kMAXTRACKSPERRICHDIGIT; t++) {
      tracks[t]=0;
      charges[t]=0;
      }
    }
    pRICH->AddDigits(ich,tracks,charges,fDigits);
  }      
  pOutRL->TreeD()->Fill();

  //pRICH->ResetDigits();
  fTDList->Delete();    // or fTDList->Clear(); ???
  for(Int_t ii=0;ii<kNCH;++ii) {
    if (fHitMap[ii]) {
      delete fHitMap[ii];
      fHitMap[ii]=0;
    }
  }
    
  TClonesArray *richDigits;
  for (Int_t k=0;k<kNCH;k++) {
    richDigits = pRICH->DigitsAddress(k);
    Int_t ndigit=richDigits->GetEntriesFast();
    printf ("Chamber %d digits %d \n",k,ndigit);
  }
  pRICH->ResetDigits(); /// ??? should it be here???
  
  pOutRL->WriteDigits("OVERWRITE");

  delete [] fHitMap;
  delete fTDList;

//  if (fHits)    fHits->Delete();
//  if (fSDigits) fSDigits->Delete();
  if(GetDebug())Info("Exec","Stop.");
}//Exec()
//__________________________________________________________________________________________________

static Int_t sMaxIterPad=0;    // Static variables for the pad-hit iterator routines
static Int_t sCurIterPad=0;

//__________________________________________________________________________________________________
AliRICHSDigit* AliRICHDigitizer::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;
    }
    
}//FirstPad
//__________________________________________________________________________________________________
AliRICHSDigit* AliRICHDigitizer::NextPad(TClonesArray *clusters) 
{// Iterates over pads
  
    sCurIterPad++;
    if (sCurIterPad <= sMaxIterPad) {
	return (AliRICHSDigit*) clusters->UncheckedAt(sCurIterPad-1);
    } else {
	return 0;
    }
}//NextPad
//__________________________________________________________________________________________________
Commit	Line	Data
b762c2f6	1	/**************************************************************************
	2	* Copyright(c) 1998-2000, ALICE Experiment at CERN, All rights reserved. *
	3	* *
	4	* Author: The ALICE Off-line Project. *
	5	* Contributors are mentioned in the code where appropriate. *
	6	* *
	7	* Permission to use, copy, modify and distribute this software and its *
	8	* documentation strictly for non-commercial purposes is hereby granted *
	9	* without fee, provided that the above copyright notice appears in all *
	10	* copies and that both the copyright notice and this permission notice *
	11	* appear in the supporting documentation. The authors make no claims *
	12	* about the suitability of this software for any purpose. It is *
	13	* provided "as is" without express or implied warranty. *
	14	**************************************************************************/
	15
b9d0a01d	16
88cb7938	17	//Piotr.Skowronski@cern.ch :
	18	//Corrections applied in order to compile (only) with new I/O and folder structure
	19	//To be implemented correctly by responsible
30f2451c	20
7118aef0	21	#include <Riostream.h>
b762c2f6	22
	23	#include <TTree.h>
	24	#include <TObjArray.h>
	25	#include <TFile.h>
	26	#include <TDirectory.h>
	27	#include <TParticle.h>
	28
88cb7938	29	#include "AliRunLoader.h"
	30	#include "AliLoader.h"
	31
b762c2f6	32	#include "AliRICHDigitizer.h"
	33	#include "AliRICHChamber.h"
	34	#include "AliHitMap.h"
	35	#include "AliRICHHitMapA1.h"
	36	#include "AliRICH.h"
b762c2f6	37	#include "AliRICHSDigit.h"
	38	#include "AliRICHDigit.h"
	39	#include "AliRICHTransientDigit.h"
	40	#include "AliRun.h"
	41	#include "AliPDG.h"
	42	#include "AliRunDigitizer.h"
	43
	44	ClassImp(AliRICHDigitizer)
	45
c60862bf	46	//__________________________________________________________________________________________________
	47	AliRICHDigitizer::AliRICHDigitizer()
	48	{//default ctor - don't use it
b762c2f6	49	fHits = 0;
	50	fSDigits = 0;
	51	fHitMap = 0;
	52	fTDList = 0;
c60862bf	53	}//default ctor
	54	//__________________________________________________________________________________________________
	55	AliRICHDigitizer::AliRICHDigitizer(AliRunDigitizer *pManager)
	56	:AliDigitizer(pManager)
	57	{//main ctor which should be used
	58	if(pManager->GetDebug())Info("main ctor","Start.");
b762c2f6	59	fHits = 0;
	60	fSDigits = 0;
	61	fHitMap = 0;
	62	fTDList = 0;
c60862bf	63	fDebug = pManager->GetDebug();
	64	}//main ctor
	65	//__________________________________________________________________________________________________
b762c2f6	66	AliRICHDigitizer::~AliRICHDigitizer()
c60862bf	67	{//dtor
	68	if(GetDebug())Info("dtor","Start.");
	69
b5d9757b	70	if (fHits) {
	71	fHits->Delete();
	72	delete fHits;
	73	}
	74	if (fSDigits) {
	75	fSDigits->Delete();
	76	delete fSDigits;
	77	}
	78	for (Int_t i=0; i<kNCH; i++ )
	79	delete fHitMap[i];
	80	delete [] fHitMap;
	81	if (fTDList) {
	82	fTDList->Delete();
	83	delete fTDList;
00827f3e	84	}
c60862bf	85	}//dtor
	86	//__________________________________________________________________________________________________
	87	Bool_t AliRICHDigitizer::Exists(const AliRICHSDigit *p)
b762c2f6	88	{
c60862bf	89	return (fHitMap[fNch]->TestHit(p->PadX(),p->PadY()));
	90	}//Exists
	91	//__________________________________________________________________________________________________
b762c2f6	92	void AliRICHDigitizer::Update(AliRICHSDigit *padhit)
	93	{
	94	AliRICHTransientDigit *pdigit =
	95	static_cast<AliRICHTransientDigit*>(
	96	fHitMap[fNch]->GetHit(padhit->PadX(),padhit->PadY()));
	97
	98	// update charge
	99	//
	100	Int_t iqpad = Int_t(padhit->QPad()); // charge per pad
	101	pdigit->AddSignal(iqpad);
88cb7938	102	pdigit->AddPhysicsSignal(iqpad);
b762c2f6	103
	104	// update list of tracks
	105	//
	106	Int_t track, charge;
	107	track = fTrack+fMask;
	108	if (fSignal) {
	109	charge = iqpad;
	110	} else {
	111	charge = kBgTag;
	112	}
	113	pdigit->UpdateTrackList(track,charge);
c60862bf	114	}//Update()
c60862bf	115	//__________________________________________________________________________________________________
b762c2f6	116	void AliRICHDigitizer::CreateNew(AliRICHSDigit *padhit)
	117	{
	118	fTDList->AddAtAndExpand(
	119	new AliRICHTransientDigit(fNch,fDigits),fCounter);
	120	fHitMap[fNch]->SetHit(padhit->PadX(),padhit->PadY(),fCounter);
	121
	122	AliRICHTransientDigit* pdigit =
	123	static_cast<AliRICHTransientDigit*>(fTDList->Last());
	124	// list of tracks
	125	Int_t track, charge;
	126	if (fSignal) {
	127	track = fTrack;
	128	charge = padhit->QPad();
	129	} else {
	130	track = kBgTag;
	131	charge = kBgTag;
	132	}
	133	pdigit->AddToTrackList(track,charge);
	134	fCounter++;
c60862bf	135	}//CreateNew()
c60862bf	136	//__________________________________________________________________________________________________
b762c2f6	137	Bool_t AliRICHDigitizer::Init()
c60862bf	138	{// Initialisation
c60862bf	139	if(GetDebug())Info("Init","Start.");
853634d3	140	fHits = new TClonesArray("AliRICHhit",1000);
b762c2f6	141	fSDigits = new TClonesArray("AliRICHSDigit",1000);
b762c2f6	142	return kTRUE;
c60862bf	143	}//Init()
c60862bf	144	//__________________________________________________________________________________________________
b762c2f6	145	void AliRICHDigitizer::Exec(Option_t* option)
b762c2f6	146	{
c60862bf	147	if(GetDebug())Info("Exec","Start with option=%s",option);
b762c2f6	148
	149	AliRICHChamber* iChamber;
	150	AliSegmentation* segmentation;
88cb7938	151
c60862bf	152	AliRunLoader pInAL, pOutAL;//in and out Run loaders
c60862bf	153	AliLoader pInRL, pOutRL;//in and out RICH loaders
88cb7938	154
c60862bf	155	pOutAL = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
c60862bf	156	pOutRL = pOutAL->GetLoader("RICHLoader");
88cb7938	157
b762c2f6	158	fTDList = new TObjArray;
88cb7938	159
88cb7938	160
b762c2f6	161	AliRICH pRICH = (AliRICH ) gAlice->GetDetector("RICH");
88cb7938	162
c60862bf	163	if(!pOutRL->TreeD()) pOutRL->MakeTree("D"); pRICH->MakeBranch("D");
b762c2f6	164	fHitMap= new AliHitMap* [kNCH];
	165
	166	for (Int_t i =0; i<kNCH; i++) {
	167	iChamber= &(pRICH->Chamber(i));
cc23c5c6	168	segmentation=iChamber->GetSegmentationModel();
b762c2f6	169	fHitMap[i] = new AliRICHHitMapA1(segmentation, fTDList);
	170	}
	171
	172	// Loop over files to digitize
	173	fSignal = kTRUE;
	174	fCounter = 0;
c60862bf	175	for (Int_t inputFile=0;inputFile<fManager->GetNinputs();inputFile++){//files loop
	176	pInAL = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(inputFile));
	177	pInRL = pInAL->GetLoader("RICHLoader");
88cb7938	178
b762c2f6	179	// Connect RICH branches
	180
	181	if (inputFile > 0 ) fSignal = kFALSE;
	182	TBranch *branchHits = 0;
	183	TBranch *branchSDigits = 0;
88cb7938	184
c60862bf	185	pInRL->LoadHits("READ");
	186
	187	TTree *treeH = pInRL->TreeH();
	188	if(pInRL->TreeH()) {
b762c2f6	189	branchHits = treeH->GetBranch("RICH");
c60862bf	190	if(branchHits){
	191	fHits->Clear();
	192	branchHits->SetAddress(&fHits);}
b762c2f6	193	else
c60862bf	194	Error("Exec","branch RICH was not found");
b762c2f6	195	}
b762c2f6	196
c60862bf	197	if(treeH) {
	198	branchSDigits = treeH->GetBranch("RICHSpecials");
	199	if(branchSDigits)
	200	branchSDigits->SetAddress(&fSDigits);
b762c2f6	201	else
c60862bf	202	Error("exec","branch RICHSpecials was not found");
b762c2f6	203	}
b762c2f6	204
c60862bf	205	for (fTrack=0; fTrack<treeH->GetEntries(); fTrack++) {//prims loop
	206	fHits->Clear(); fSDigits->Clear();
	207	fHits->Print();
	208
	209	branchHits->GetEntry(fTrack); branchSDigits->GetEntry(fTrack);
	210	for(Int_t i=0;i<fHits->GetEntriesFast();++i){//hits loop
	211	AliRICHhit* pHit = static_cast<AliRICHhit*>(fHits->At(i));
	212	fNch = pHit->Chamber()-1; // chamber number
b762c2f6	213	if (fNch >= kNCH) {
	214	cerr<<"AliRICHDigitizer: chamber nr. fNch out of range: "<<fNch<<endl;
	215	cerr<<" track: "<<fTrack<<endl;
	216	continue;
	217	}
	218	iChamber = &(pRICH->Chamber(fNch));
	219
c60862bf	220	for (AliRICHSDigit* mPad=FirstPad(pHit,fSDigits);mPad;mPad=NextPad(fSDigits)){//clusters loop
b762c2f6	221	Int_t iqpad = mPad->QPad(); // charge per pad
	222	fDigits[0]=mPad->PadX();
	223	fDigits[1]=mPad->PadY();
	224	fDigits[2]=iqpad;
	225	fDigits[3]=iqpad;
	226	fDigits[4]=mPad->HitNumber();
c60862bf	227	if (Exists(mPad)) // build the list of fired pads and update the info
	228	Update(mPad);
	229	else
	230	CreateNew(mPad);
	231	}//clusters loop
	232	}//hits loop
	233	}//prims loop
	234	}//files loop
	235	if(GetDebug()) Info("Exec","END OF FILE LOOP");
b762c2f6	236
	237	Int_t tracks[kMAXTRACKSPERRICHDIGIT];
	238	Int_t charges[kMAXTRACKSPERRICHDIGIT];
	239	Int_t nentries=fTDList->GetEntriesFast();
	240
	241	for (Int_t nent=0;nent<nentries;nent++) {
	242	AliRICHTransientDigit transDigit=(AliRICHTransientDigit)fTDList->At(nent);
	243	if (transDigit==0) continue;
	244	Int_t ich=transDigit->GetChamber();
	245	Int_t q=transDigit->Signal();
	246	iChamber=&(pRICH->Chamber(ich));
	247	AliRICHResponse * response=iChamber->GetResponseModel();
	248	Int_t adcmax= (Int_t) response->MaxAdc();
	249
	250
	251	// add white noise and do zero-suppression and signal truncation (new electronics,old electronics gaus 1.2,0.2)
	252	//printf("Treshold: %d\n",iChamber->fTresh->GetHitIndex(transDigit->PadX(),transDigit->PadY()));
	253
	254	// tmp change
	255	// Int_t pedestal = iChamber->fTresh->GetHitIndex(transDigit->PadX(),transDigit->PadY());
	256	Int_t pedestal = 0;
	257
b762c2f6	258	Float_t treshold = (pedestal + 4*2.2);
	259
	260	Float_t meanNoise = gRandom->Gaus(2.2, 0.3);
	261	Float_t noise = gRandom->Gaus(0, meanNoise);
	262	q+=(Int_t)(noise + pedestal);
	263	//q+=(Int_t)(noise);
	264	// magic number to be parametrised !!!
	265	if ( q <= treshold)
	266	{
	267	q = q - pedestal;
	268	continue;
	269	}
	270	q = q - pedestal;
	271	if ( q >= adcmax) q=adcmax;
	272	fDigits[0]=transDigit->PadX();
	273	fDigits[1]=transDigit->PadY();
	274	fDigits[2]=q;
	275	fDigits[3]=transDigit->Physics();
	276	fDigits[4]=transDigit->Hit();
	277
	278	Int_t nptracks = transDigit->GetNTracks();
	279
	280	// this was changed to accomodate the real number of tracks
	281	if (nptracks > kMAXTRACKSPERRICHDIGIT) {
	282	printf("Attention - tracks > 10 %d\n",nptracks);
	283	nptracks=kMAXTRACKSPERRICHDIGIT;
	284	}
	285	if (nptracks > 2) {
	286	printf("Attention - tracks > 2 %d \n",nptracks);
	287	}
	288	for (Int_t tr=0;tr<nptracks;tr++) {
	289	tracks[tr]=transDigit->GetTrack(tr);
	290	charges[tr]=transDigit->GetCharge(tr);
5546f238	291	//printf("%f \n",charges[tr]);
b762c2f6	292	} //end loop over list of tracks for one pad
	293	if (nptracks < kMAXTRACKSPERRICHDIGIT ) {
	294	for (Int_t t=nptracks; t<kMAXTRACKSPERRICHDIGIT; t++) {
88cb7938	295	tracks[t]=0;
88cb7938	296	charges[t]=0;
b762c2f6	297	}
b762c2f6	298	}
b762c2f6	299	pRICH->AddDigits(ich,tracks,charges,fDigits);
88cb7938	300	}
c60862bf	301	pOutRL->TreeD()->Fill();
b762c2f6	302
5546f238	303	//pRICH->ResetDigits();
b762c2f6	304	fTDList->Delete(); // or fTDList->Clear(); ???
	305	for(Int_t ii=0;ii<kNCH;++ii) {
	306	if (fHitMap[ii]) {
	307	delete fHitMap[ii];
	308	fHitMap[ii]=0;
	309	}
	310	}
	311
	312	TClonesArray *richDigits;
	313	for (Int_t k=0;k<kNCH;k++) {
	314	richDigits = pRICH->DigitsAddress(k);
	315	Int_t ndigit=richDigits->GetEntriesFast();
	316	printf ("Chamber %d digits %d \n",k,ndigit);
	317	}
88cb7938	318	pRICH->ResetDigits(); /// ??? should it be here???
88cb7938	319
c60862bf	320	pOutRL->WriteDigits("OVERWRITE");
88cb7938	321
b762c2f6	322	delete [] fHitMap;
	323	delete fTDList;
	324
c60862bf	325	// if (fHits) fHits->Delete();
	326	// if (fSDigits) fSDigits->Delete();
	327	if(GetDebug())Info("Exec","Stop.");
	328	}//Exec()
	329	//__________________________________________________________________________________________________
	330
	331	static Int_t sMaxIterPad=0; // Static variables for the pad-hit iterator routines
	332	static Int_t sCurIterPad=0;
	333
	334	//__________________________________________________________________________________________________
	335	AliRICHSDigit* AliRICHDigitizer::FirstPad(AliRICHhit* hit,TClonesArray *clusters )
	336	{// Initialise the pad iterator Return the address of the first sdigit for hit
	337	TClonesArray *theClusters = clusters;
	338	Int_t nclust = theClusters->GetEntriesFast();
	339	if (nclust && hit->PHlast() > 0) {
	340	sMaxIterPad=Int_t(hit->PHlast());
	341	sCurIterPad=Int_t(hit->PHfirst());
	342	return (AliRICHSDigit*) clusters->UncheckedAt(sCurIterPad-1);
	343	} else {
	344	return 0;
	345	}
	346
	347	}//FirstPad
	348	//__________________________________________________________________________________________________
	349	AliRICHSDigit* AliRICHDigitizer::NextPad(TClonesArray *clusters)
	350	{// Iterates over pads
	351
	352	sCurIterPad++;
	353	if (sCurIterPad <= sMaxIterPad) {
	354	return (AliRICHSDigit*) clusters->UncheckedAt(sCurIterPad-1);
	355	} else {
	356	return 0;
	357	}
	358	}//NextPad
	359	//__________________________________________________________________________________________________