X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALSimParam.cxx;h=45f36c4e843fe4a13edb47a0416daac806208fb9;hb=93950a262d2b8cee4a635aed053ff02d45aee819;hp=d0e6de8ea886c769b6b9f37701fd52b8244c2325;hpb=33a52e5553fb3380f2e3b3a1f66f0e8416850e24;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALSimParam.cxx b/EMCAL/AliEMCALSimParam.cxx
index d0e6de8ea88..45f36c4e843 100644
--- a/EMCAL/AliEMCALSimParam.cxx
+++ b/EMCAL/AliEMCALSimParam.cxx
@@ -35,30 +35,35 @@ AliEMCALSimParam::AliEMCALSimParam() :
 TNamed(),    
 fDigitThreshold(0),
 fMeanPhotonElectron(0),
+fGainFluctuations(0),
 fPinNoise(0),
-fTimeResolution(0),
-//fTimeThreshold(0),    
-//fTimeSignalLength(0),
+fTimeNoise(0),
+fTimeDelay(0),
+fTimeResolutionPar0(0),
+fTimeResolutionPar1(0),
 fNADCEC(0),//Digitizer
 fA(0.),
 fB(0.),
 fECPrimThreshold(0.) //SDigitizer   
 {
-	//Constructor 
+  //Constructor 
+
+  //Parameters in Digitizer
+  fMeanPhotonElectron = 4400;    // electrons per GeV 
+  fGainFluctuations   = 15.;     // obtained empiricaly to match beam test, from Paraskevi Ganoti   
+  fPinNoise           = 0.012;   // APD noise in GeV from analysis test beam data 
+  fDigitThreshold     = 3;       // 3 ADC counts not anymore cut in energy: //fPinNoise * 3; // 3 * sigma
+  fTimeNoise          = 1.28e-5; // time noise in s
+  fTimeResolutionPar0 = 0.26666; // From F. Blanco: 0.51639^2
+  fTimeResolutionPar1 = 1.45861; // From F. Blanco: 1.20773^2
+  fTimeDelay          = 600e-9 ; // 600 ns
+
+  fNADCEC             = (Int_t) TMath::Power(2,16) ; // number of channels in Tower ADC - 65536
 	
-	//Parameters in Digitizer
-	fMeanPhotonElectron = 4400;  // electrons per GeV 
-	fPinNoise           = 0.012; // pin noise in GeV from analysis test beam data 
-	fDigitThreshold     = fPinNoise * 3; // 3 * sigma
-	fTimeResolution     = 0.6e-9 ; // 600 psc
-	//fTimeSignalLength   = 1.0e-9 ;
-	fNADCEC             = (Int_t) TMath::Power(2,16) ; // number of channels in Tower ADC - 65536
-	//fTimeThreshold      = 0.001*10000000 ; // Means 1 MeV in terms of SDigits amplitude ??
-	
-	//SDigitizer
-	fA                  = 0;
-	fB                  = 1.e+6; // Dynamic range now 2 TeV
-	fECPrimThreshold    = 0.05;  // GeV	// threshold for deposit energy of hit
+  //SDigitizer
+  fA                  = 0;
+  fB                  = 1.e+6; // Dynamic range now 2 TeV
+  fECPrimThreshold    = 0.05;  // GeV	// threshold for deposit energy of hit
 	
 }
 
@@ -68,10 +73,12 @@ AliEMCALSimParam::AliEMCALSimParam(const AliEMCALSimParam& ):
 TNamed(),
 fDigitThreshold(0),
 fMeanPhotonElectron(0),
+fGainFluctuations(0),
 fPinNoise(0),
-fTimeResolution(0),
-//fTimeThreshold(0),    
-//fTimeSignalLength(0),//Digitizer
+fTimeNoise(0),
+fTimeDelay(0),
+fTimeResolutionPar0(0),
+fTimeResolutionPar1(0),
 fNADCEC(0),
 fA(0.),
 fB(0.),
@@ -88,11 +95,11 @@ fECPrimThreshold(0.)//SDigitizer
 AliEMCALSimParam * AliEMCALSimParam::GetInstance(){
 // Get Instance
 
-	if(!fgSimParam){
-		fgSimParam = new AliEMCALSimParam() ;
-	}
-	
-	return fgSimParam ;
+  if(!fgSimParam){
+  	fgSimParam = new AliEMCALSimParam() ;
+  }
+  
+  return fgSimParam ;
 	
 }
 
@@ -111,21 +118,23 @@ AliEMCALSimParam& AliEMCALSimParam::operator = (const AliEMCALSimParam& simParam
 //-----------------------------------------------------------------------------
 void AliEMCALSimParam::Print(Option_t *) const
 {
-	// Print simulation parameters to stdout
-	
-	printf("=== Parameters in Digitizer === \n");
-	printf("\t Electronics noise in EMC (fPinNoise)       = %f\n", fPinNoise) ;
-    printf("\t Threshold  in EMC  (fDigitThreshold)       = %f\n", fDigitThreshold)  ;
-	printf("\t Time Resolution (fTimeResolution)          = %g\n", fTimeResolution) ;
-    printf("\t Mean Photon-Electron (fMeanPhotonElectron) = %d\n", fMeanPhotonElectron)  ;
-	printf("\t N channels in EC section ADC (fNADCEC)     = %d\n", fNADCEC) ;
-
-	printf("\n");
-	
-	printf("=== Parameters in SDigitizer === \n");
-	printf("\t sdigitization parameters       A = %f\n",     fA);
-	printf("\t                                B = %f\n",     fB);
-	printf("\t Threshold for EC Primary assignment  = %f\n", fECPrimThreshold);
+  // Print simulation parameters to stdout
+ 
+  printf("=== Parameters in Digitizer === \n");
+  printf("\t Electronics noise in EMC (fPinNoise)       = %f, (fTimeNoise) = %e\n", fPinNoise, fTimeNoise) ;
+  printf("\t Threshold  in EMC  (fDigitThreshold)       = %d\n", fDigitThreshold)  ;
+  printf("\t Time Resolution (fTimeResolutionPar0)      = %g\n", fTimeResolutionPar0) ;
+  printf("\t Time Resolution (fTimeResolutionPar1)      = %g\n", fTimeResolutionPar1) ;
+  printf("\t Time Delay (fTimeDelay)                    = %g\n", fTimeDelay) ;
+  printf("\t Mean Photon-Electron (fMeanPhotonElectron) = %d, Gain Fluc. (fGainFluctuations) %2.1f\n", fMeanPhotonElectron,fGainFluctuations)  ;
+  printf("\t N channels in EC section ADC (fNADCEC)     = %d\n", fNADCEC) ;
+
+  printf("\n");
+
+  printf("=== Parameters in SDigitizer === \n");
+  printf("\t sdigitization parameters       A = %f\n",     fA);
+  printf("\t                                B = %f\n",     fB);
+  printf("\t Threshold for EC Primary assignment  = %f\n", fECPrimThreshold);
 	
 }