[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.                  *
 **************************************************************************/

/* 
   $Log$
   Revision 1.5  2002/07/09 13:11:26  hristov
   Old style include files needed on HP (aCC)

   Revision 1.4  2002/05/28 07:53:10  morsch
   Wrong order of arguments in for-statement corrected.

   Revision 1.3  2001/12/05 14:53:34  hristov
   Destructor corRevision 1.60  2002/10/22 16:28:21  alibrary
  Introducing Riostream.h

  Revision 1.59  2002/10/14 14:57:31  hristov
  Merging the VirtualMC branch to the main development branch (HEAD)

  Revision 1.58.6.1  2002/06/10 15:12:46  hristov
  Merged with v3-08-02rected

   Revision 1.2  2001/11/07 14:50:31  hristov
   Minor correction of the Log part

   Revision 1.1  2001/11/02 15:37:26  hristov
   Digitizer class created. Code cleaning and bug fixes (J.Chudoba)
*/
#include <Riostream.h> 

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

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

ClassImp(AliRICHDigitizer)

//___________________________________________
  AliRICHDigitizer::AliRICHDigitizer()
{
// Default constructor - don't use it   
  fHits = 0;
  fSDigits = 0;
  fHitMap = 0;
  fTDList = 0;
}

////////////////////////////////////////////////////////////////////////
AliRICHDigitizer::AliRICHDigitizer(AliRunDigitizer* manager) 
    :AliDigitizer(manager)
{
// ctor which should be used
  fHits = 0;
  fSDigits = 0;
  fHitMap = 0;
  fTDList = 0;
  fDebug   = 0; 
  if (GetDebug()>2) 
    cerr<<"AliRICHDigitizer::AliRICHDigitizer"
	<<"(AliRunDigitizer* manager) was processed"<<endl;
}

////////////////////////////////////////////////////////////////////////
AliRICHDigitizer::~AliRICHDigitizer()
{
// Destructor
    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;
  }
}

//------------------------------------------------------------------------
Bool_t AliRICHDigitizer::Exists(const AliRICHSDigit *padhit)
{
  return (fHitMap[fNch]->TestHit(padhit->PadX(),padhit->PadY()));
}

//------------------------------------------------------------------------
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);
}

//------------------------------------------------------------------------
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++;
}


////////////////////////////////////////////////////////////////////////
Bool_t AliRICHDigitizer::Init()
{
// Initialisation
  fHits     = new TClonesArray("AliRICHHit",1000);
  fSDigits  = new TClonesArray("AliRICHSDigit",1000);
  return kTRUE;
}

////////////////////////////////////////////////////////////////////////
//void AliRICHDigitizer::Digitise(Int_t nev, Int_t flag)
void AliRICHDigitizer::Exec(Option_t* option)
{
  TString optionString = option;
  if (optionString.Data() == "deb") {
    cout<<"AliMUONDigitizer::Exec: called with option deb "<<endl;
    fDebug = 3;
  }

  AliRICHChamber*       iChamber;
  AliSegmentation*  segmentation;
  
  fTDList = new TObjArray;
    
  AliRICH *pRICH = (AliRICH *) gAlice->GetDetector("RICH");
  pRICH->MakeBranchInTreeD(fManager->GetTreeD());
  fHitMap= new AliHitMap* [kNCH];
        
  for (Int_t i =0; i<kNCH; i++) {
    iChamber= &(pRICH->Chamber(i));
    segmentation=iChamber->GetSegmentationModel(1);
    fHitMap[i] = new AliRICHHitMapA1(segmentation, fTDList);
  }

// Loop over files to digitize
  fSignal = kTRUE;
  fCounter = 0;
  for (Int_t inputFile=0; inputFile<fManager->GetNinputs();
       inputFile++) {

// Connect RICH branches

    if (inputFile > 0 ) fSignal = kFALSE;
    TBranch *branchHits = 0;
    TBranch *branchSDigits = 0;
    TTree *treeH = fManager->GetInputTreeH(inputFile);
    if (GetDebug()>2) {
      cerr<<"   inputFile  "<<inputFile<<endl;
      cerr<<"   treeH, fHits "<<treeH<<" "<<fHits<<endl;
    }
    if (treeH && fHits) {
      branchHits = treeH->GetBranch("RICH");
      if (branchHits) {
	fHits->Clear();
	branchHits->SetAddress(&fHits);
      }
      else
	Error("Exec","branch RICH was not found");
    }
    if (GetDebug()>2) cerr<<"   branchHits = "<<branchHits<<endl;

    if (treeH && fSDigits) {
      branchSDigits = treeH->GetBranch("RICHSDigits");
      if (branchSDigits) 
	branchSDigits->SetAddress(&fSDigits);
      else
	Error("exec","branch RICHSDigits was not found");
    }
    if (GetDebug()>2) cerr<<"   branchSDigits = "<<branchSDigits<<endl;


    //
    //   Loop over tracks
    //
    
    Int_t ntracks =(Int_t) treeH->GetEntries();
    for (fTrack=0; fTrack<ntracks; fTrack++) {
      fHits->Clear();
      fSDigits->Clear();  
      branchHits->GetEntry(fTrack);
      branchSDigits->GetEntry(fTrack);


      //
      //   Loop over hits
      for(Int_t i = 0; i < fHits->GetEntriesFast(); ++i) {
	AliRICHHit* mHit = static_cast<AliRICHHit*>(fHits->At(i));
	fNch = mHit->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));
	  
	//
	// Loop over pad hits
	for (AliRICHSDigit* mPad=
	       (AliRICHSDigit*)pRICH->FirstPad(mHit,fSDigits);
	     mPad;
	     mPad=(AliRICHSDigit*)pRICH->NextPad(fSDigits))
	{
	  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();
		  
	
	  // build the list of fired pads and update the info
	  if (Exists(mPad)) {
	    Update(mPad);
	  } else {
	    CreateNew(mPad);
	  }
	} //end loop over clusters
      } // hit loop
    } // track loop
  } // end file loop
  if (GetDebug()>2) cerr<<"END OF FILE LOOP"<<endl;

  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;


    //printf("Pedestal:%d\n",pedestal);
    //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;
      }
    }
    //write file
    //if (ich==2)
    //fprintf(points,"%4d,      %4d,      %4d\n",digits[0],digits[1],digits[2]);
      
    // fill digits
    pRICH->AddDigits(ich,tracks,charges,fDigits);
    
   
  }	
  fManager->GetTreeD()->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);
  }
  fManager->GetTreeD()->Write(0,TObject::kOverwrite);
  pRICH->ResetDigits();
  delete [] fHitMap;
  delete fTDList;

  if (fHits)    fHits->Delete();
  if (fSDigits) fSDigits->Delete();

}
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
34a219bd	16	/*
34a219bd	17	$Log$
5546f238	18	Revision 1.5 2002/07/09 13:11:26 hristov
5546f238	19	Old style include files needed on HP (aCC)
b9d0a01d	20
30f2451c	21	Revision 1.4 2002/05/28 07:53:10 morsch
	22	Wrong order of arguments in for-statement corrected.
	23
b5d9757b	24	Revision 1.3 2001/12/05 14:53:34 hristov
5546f238	25	Destructor corRevision 1.60 2002/10/22 16:28:21 alibrary
	26	Introducing Riostream.h
	27
	28	Revision 1.59 2002/10/14 14:57:31 hristov
	29	Merging the VirtualMC branch to the main development branch (HEAD)
	30
	31	Revision 1.58.6.1 2002/06/10 15:12:46 hristov
	32	Merged with v3-08-02rected
b5d9757b	33
00827f3e	34	Revision 1.2 2001/11/07 14:50:31 hristov
	35	Minor correction of the Log part
	36
34a219bd	37	Revision 1.1 2001/11/02 15:37:26 hristov
	38	Digitizer class created. Code cleaning and bug fixes (J.Chudoba)
	39	*/
7118aef0	40	#include <Riostream.h>
b762c2f6	41
	42	#include <TTree.h>
	43	#include <TObjArray.h>
	44	#include <TFile.h>
	45	#include <TDirectory.h>
	46	#include <TParticle.h>
	47
	48	#include "AliRICHDigitizer.h"
	49	#include "AliRICHChamber.h"
	50	#include "AliHitMap.h"
	51	#include "AliRICHHitMapA1.h"
	52	#include "AliRICH.h"
	53	#include "AliRICHHit.h"
	54	#include "AliRICHSDigit.h"
	55	#include "AliRICHDigit.h"
	56	#include "AliRICHTransientDigit.h"
	57	#include "AliRun.h"
	58	#include "AliPDG.h"
	59	#include "AliRunDigitizer.h"
	60
	61	ClassImp(AliRICHDigitizer)
	62
	63	//___________________________________________
	64	AliRICHDigitizer::AliRICHDigitizer()
	65	{
	66	// Default constructor - don't use it
	67	fHits = 0;
	68	fSDigits = 0;
	69	fHitMap = 0;
	70	fTDList = 0;
	71	}
	72
	73	////////////////////////////////////////////////////////////////////////
	74	AliRICHDigitizer::AliRICHDigitizer(AliRunDigitizer* manager)
	75	:AliDigitizer(manager)
	76	{
	77	// ctor which should be used
	78	fHits = 0;
	79	fSDigits = 0;
	80	fHitMap = 0;
	81	fTDList = 0;
	82	fDebug = 0;
	83	if (GetDebug()>2)
	84	cerr<<"AliRICHDigitizer::AliRICHDigitizer"
	85	<<"(AliRunDigitizer* manager) was processed"<<endl;
	86	}
	87
	88	////////////////////////////////////////////////////////////////////////
	89	AliRICHDigitizer::~AliRICHDigitizer()
	90	{
	91	// Destructor
b5d9757b	92	if (fHits) {
	93	fHits->Delete();
	94	delete fHits;
	95	}
	96	if (fSDigits) {
	97	fSDigits->Delete();
	98	delete fSDigits;
	99	}
	100	for (Int_t i=0; i<kNCH; i++ )
	101	delete fHitMap[i];
	102	delete [] fHitMap;
	103	if (fTDList) {
	104	fTDList->Delete();
	105	delete fTDList;
00827f3e	106	}
b762c2f6	107	}
	108
	109	//------------------------------------------------------------------------
	110	Bool_t AliRICHDigitizer::Exists(const AliRICHSDigit *padhit)
	111	{
	112	return (fHitMap[fNch]->TestHit(padhit->PadX(),padhit->PadY()));
	113	}
	114
	115	//------------------------------------------------------------------------
	116	void AliRICHDigitizer::Update(AliRICHSDigit *padhit)
	117	{
	118	AliRICHTransientDigit *pdigit =
	119	static_cast<AliRICHTransientDigit*>(
	120	fHitMap[fNch]->GetHit(padhit->PadX(),padhit->PadY()));
	121
	122	// update charge
	123	//
	124	Int_t iqpad = Int_t(padhit->QPad()); // charge per pad
	125	pdigit->AddSignal(iqpad);
	126	pdigit->AddPhysicsSignal(iqpad);
	127
	128	// update list of tracks
	129	//
	130	Int_t track, charge;
	131	track = fTrack+fMask;
	132	if (fSignal) {
	133	charge = iqpad;
	134	} else {
	135	charge = kBgTag;
	136	}
	137	pdigit->UpdateTrackList(track,charge);
	138	}
	139
	140	//------------------------------------------------------------------------
	141	void AliRICHDigitizer::CreateNew(AliRICHSDigit *padhit)
	142	{
	143	fTDList->AddAtAndExpand(
	144	new AliRICHTransientDigit(fNch,fDigits),fCounter);
	145	fHitMap[fNch]->SetHit(padhit->PadX(),padhit->PadY(),fCounter);
	146
	147	AliRICHTransientDigit* pdigit =
	148	static_cast<AliRICHTransientDigit*>(fTDList->Last());
	149	// list of tracks
	150	Int_t track, charge;
	151	if (fSignal) {
	152	track = fTrack;
	153	charge = padhit->QPad();
	154	} else {
	155	track = kBgTag;
	156	charge = kBgTag;
	157	}
	158	pdigit->AddToTrackList(track,charge);
	159	fCounter++;
	160	}
	161
	162
	163	////////////////////////////////////////////////////////////////////////
	164	Bool_t AliRICHDigitizer::Init()
	165	{
	166	// Initialisation
	167	fHits = new TClonesArray("AliRICHHit",1000);
	168	fSDigits = new TClonesArray("AliRICHSDigit",1000);
	169	return kTRUE;
	170	}
171
172	////////////////////////////////////////////////////////////////////////
173	//void AliRICHDigitizer::Digitise(Int_t nev, Int_t flag)
174	void AliRICHDigitizer::Exec(Option_t* option)
175	{
176	TString optionString = option;
177	if (optionString.Data() == "deb") {
178	cout<<"AliMUONDigitizer::Exec: called with option deb "<<endl;
179	fDebug = 3;
180	}
181
182	AliRICHChamber* iChamber;
183	AliSegmentation* segmentation;
184
185	fTDList = new TObjArray;
186
187	AliRICH pRICH = (AliRICH ) gAlice->GetDetector("RICH");
188	pRICH->MakeBranchInTreeD(fManager->GetTreeD());
189	fHitMap= new AliHitMap* [kNCH];
190
191	for (Int_t i =0; i<kNCH; i++) {
192	iChamber= &(pRICH->Chamber(i));
193	segmentation=iChamber->GetSegmentationModel(1);
194	fHitMap[i] = new AliRICHHitMapA1(segmentation, fTDList);
195	}
196
197	// Loop over files to digitize
198	fSignal = kTRUE;
199	fCounter = 0;
200	for (Int_t inputFile=0; inputFile<fManager->GetNinputs();
201	inputFile++) {
202
203	// Connect RICH branches
204
205	if (inputFile > 0 ) fSignal = kFALSE;
206	TBranch *branchHits = 0;
207	TBranch *branchSDigits = 0;
208	TTree *treeH = fManager->GetInputTreeH(inputFile);
209	if (GetDebug()>2) {
210	cerr<<" inputFile "<<inputFile<<endl;
211	cerr<<" treeH, fHits "<<treeH<<" "<<fHits<<endl;
212	}
213	if (treeH && fHits) {
214	branchHits = treeH->GetBranch("RICH");
215	if (branchHits) {
216	fHits->Clear();
217	branchHits->SetAddress(&fHits);
218	}
219	else
220	Error("Exec","branch RICH was not found");
221	}
222	if (GetDebug()>2) cerr<<" branchHits = "<<branchHits<<endl;
223
224	if (treeH && fSDigits) {
225	branchSDigits = treeH->GetBranch("RICHSDigits");
226	if (branchSDigits)
227	branchSDigits->SetAddress(&fSDigits);
228	else
229	Error("exec","branch RICHSDigits was not found");
230	}
231	if (GetDebug()>2) cerr<<" branchSDigits = "<<branchSDigits<<endl;
232
233
234	//
235	// Loop over tracks
236	//
237
238	Int_t ntracks =(Int_t) treeH->GetEntries();
239	for (fTrack=0; fTrack<ntracks; fTrack++) {
240	fHits->Clear();
241	fSDigits->Clear();
242	branchHits->GetEntry(fTrack);
243	branchSDigits->GetEntry(fTrack);
244
245
246	//
247	// Loop over hits
248	for(Int_t i = 0; i < fHits->GetEntriesFast(); ++i) {
249	AliRICHHit* mHit = static_cast<AliRICHHit*>(fHits->At(i));
250	fNch = mHit->Chamber()-1; // chamber number
251	if (fNch >= kNCH) {
252	cerr<<"AliRICHDigitizer: chamber nr. fNch out of range: "<<fNch<<endl;
253	cerr<<" track: "<<fTrack<<endl;
254	continue;
255	}
256	iChamber = &(pRICH->Chamber(fNch));
257
258	//
259	// Loop over pad hits
260	for (AliRICHSDigit* mPad=
261	(AliRICHSDigit*)pRICH->FirstPad(mHit,fSDigits);
262	mPad;
263	mPad=(AliRICHSDigit*)pRICH->NextPad(fSDigits))
264	{
265	Int_t iqpad = mPad->QPad(); // charge per pad
266	fDigits[0]=mPad->PadX();
267	fDigits[1]=mPad->PadY();
268	fDigits[2]=iqpad;
269	fDigits[3]=iqpad;
270	fDigits[4]=mPad->HitNumber();
271
5546f238	272
5546f238	273
b762c2f6	274	// build the list of fired pads and update the info
	275	if (Exists(mPad)) {
	276	Update(mPad);
	277	} else {
	278	CreateNew(mPad);
	279	}
	280	} //end loop over clusters
	281	} // hit loop
	282	} // track loop
	283	} // end file loop
	284	if (GetDebug()>2) cerr<<"END OF FILE LOOP"<<endl;
	285
	286	Int_t tracks[kMAXTRACKSPERRICHDIGIT];
	287	Int_t charges[kMAXTRACKSPERRICHDIGIT];
	288	Int_t nentries=fTDList->GetEntriesFast();
	289
	290	for (Int_t nent=0;nent<nentries;nent++) {
	291	AliRICHTransientDigit transDigit=(AliRICHTransientDigit)fTDList->At(nent);
	292	if (transDigit==0) continue;
	293	Int_t ich=transDigit->GetChamber();
	294	Int_t q=transDigit->Signal();
	295	iChamber=&(pRICH->Chamber(ich));
	296	AliRICHResponse * response=iChamber->GetResponseModel();
	297	Int_t adcmax= (Int_t) response->MaxAdc();
	298
	299
	300	// add white noise and do zero-suppression and signal truncation (new electronics,old electronics gaus 1.2,0.2)
	301	//printf("Treshold: %d\n",iChamber->fTresh->GetHitIndex(transDigit->PadX(),transDigit->PadY()));
	302
	303	// tmp change
	304	// Int_t pedestal = iChamber->fTresh->GetHitIndex(transDigit->PadX(),transDigit->PadY());
	305	Int_t pedestal = 0;
	306
	307
	308	//printf("Pedestal:%d\n",pedestal);
	309	//Int_t pedestal=0;
	310	Float_t treshold = (pedestal + 4*2.2);
	311
	312	Float_t meanNoise = gRandom->Gaus(2.2, 0.3);
	313	Float_t noise = gRandom->Gaus(0, meanNoise);
	314	q+=(Int_t)(noise + pedestal);
	315	//q+=(Int_t)(noise);
	316	// magic number to be parametrised !!!
	317	if ( q <= treshold)
	318	{
	319	q = q - pedestal;
	320	continue;
	321	}
	322	q = q - pedestal;
	323	if ( q >= adcmax) q=adcmax;
	324	fDigits[0]=transDigit->PadX();
	325	fDigits[1]=transDigit->PadY();
	326	fDigits[2]=q;
	327	fDigits[3]=transDigit->Physics();
	328	fDigits[4]=transDigit->Hit();
	329
	330	Int_t nptracks = transDigit->GetNTracks();
	331
	332	// this was changed to accomodate the real number of tracks
	333	if (nptracks > kMAXTRACKSPERRICHDIGIT) {
	334	printf("Attention - tracks > 10 %d\n",nptracks);
	335	nptracks=kMAXTRACKSPERRICHDIGIT;
	336	}
	337	if (nptracks > 2) {
338	printf("Attention - tracks > 2 %d \n",nptracks);
339	}
340	for (Int_t tr=0;tr<nptracks;tr++) {
341	tracks[tr]=transDigit->GetTrack(tr);
342	charges[tr]=transDigit->GetCharge(tr);
5546f238	343	//printf("%f \n",charges[tr]);
b762c2f6	344	} //end loop over list of tracks for one pad
	345	if (nptracks < kMAXTRACKSPERRICHDIGIT ) {
	346	for (Int_t t=nptracks; t<kMAXTRACKSPERRICHDIGIT; t++) {
	347	tracks[t]=0;
	348	charges[t]=0;
	349	}
	350	}
	351	//write file
	352	//if (ich==2)
	353	//fprintf(points,"%4d, %4d, %4d\n",digits[0],digits[1],digits[2]);
	354
	355	// fill digits
	356	pRICH->AddDigits(ich,tracks,charges,fDigits);
5546f238	357
5546f238	358
b762c2f6	359	}
	360	fManager->GetTreeD()->Fill();
	361
5546f238	362	//pRICH->ResetDigits();
b762c2f6	363	fTDList->Delete(); // or fTDList->Clear(); ???
	364	for(Int_t ii=0;ii<kNCH;++ii) {
	365	if (fHitMap[ii]) {
	366	delete fHitMap[ii];
	367	fHitMap[ii]=0;
	368	}
	369	}
	370
	371	TClonesArray *richDigits;
	372	for (Int_t k=0;k<kNCH;k++) {
	373	richDigits = pRICH->DigitsAddress(k);
	374	Int_t ndigit=richDigits->GetEntriesFast();
	375	printf ("Chamber %d digits %d \n",k,ndigit);
	376	}
b762c2f6	377	fManager->GetTreeD()->Write(0,TObject::kOverwrite);
5546f238	378	pRICH->ResetDigits();
b762c2f6	379	delete [] fHitMap;
	380	delete fTDList;
	381
	382	if (fHits) fHits->Delete();
	383	if (fSDigits) fSDigits->Delete();
	384
	385	}