From e42f0a9d9426d4283a36600b9c284e3bd967d943 Mon Sep 17 00:00:00 2001 From: gconesab Date: Fri, 22 Jul 2011 21:34:09 +0000 Subject: [PATCH] cosmetics --- EMCAL/AliEMCALSimParam.cxx | 72 +++++++++++++++++++------------------- EMCAL/AliEMCALSimParam.h | 68 +++++++++++++++++------------------ 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/EMCAL/AliEMCALSimParam.cxx b/EMCAL/AliEMCALSimParam.cxx index 7058633ac28..9940fa9f814 100644 --- a/EMCAL/AliEMCALSimParam.cxx +++ b/EMCAL/AliEMCALSimParam.cxx @@ -45,23 +45,23 @@ fA(0.), fB(0.), fECPrimThreshold(0.) //SDigitizer { - //Constructor - - //Parameters in Digitizer - fMeanPhotonElectron = 4400; // electrons per GeV - 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 + //Constructor + + //Parameters in Digitizer + fMeanPhotonElectron = 4400; // electrons per GeV + 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 + 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 + fNADCEC = (Int_t) TMath::Power(2,16) ; // number of channels in Tower ADC - 65536 - //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 } @@ -92,11 +92,11 @@ fECPrimThreshold(0.)//SDigitizer AliEMCALSimParam * AliEMCALSimParam::GetInstance(){ // Get Instance - if(!fgSimParam){ - fgSimParam = new AliEMCALSimParam() ; - } - - return fgSimParam ; + if(!fgSimParam){ + fgSimParam = new AliEMCALSimParam() ; + } + + return fgSimParam ; } @@ -115,23 +115,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, (fTimeNoise) = %f\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\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\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); } diff --git a/EMCAL/AliEMCALSimParam.h b/EMCAL/AliEMCALSimParam.h index ab3f955438b..77c6614dc7f 100644 --- a/EMCAL/AliEMCALSimParam.h +++ b/EMCAL/AliEMCALSimParam.h @@ -25,31 +25,31 @@ public: static AliEMCALSimParam * GetInstance() ; virtual void Print(Option_t * option="") const ; - //Parameters used in Digitizer - Int_t GetDigitThreshold() const { return fDigitThreshold ; } - Float_t GetPinNoise() const { return fPinNoise ; } + //Parameters used in Digitizer + Int_t GetDigitThreshold() const { return fDigitThreshold ; } + Float_t GetPinNoise() const { return fPinNoise ; } Double_t GetTimeNoise() const { return fTimeNoise ; } - Double_t GetTimeDelay() const { return fTimeDelay ; } - Double_t GetTimeResolutionPar0() const { return fTimeResolutionPar0 ; } - Double_t GetTimeResolutionPar1() const { return fTimeResolutionPar1 ; } - Int_t GetNADCEC() const { return fNADCEC ; } - Int_t GetMeanPhotonElectron() const { return fMeanPhotonElectron ; } - void SetDigitThreshold(Int_t val) { fDigitThreshold = val ; } - void SetPinNoise(Float_t val) { fPinNoise = val ; } + Double_t GetTimeDelay() const { return fTimeDelay ; } + Double_t GetTimeResolutionPar0() const { return fTimeResolutionPar0 ; } + Double_t GetTimeResolutionPar1() const { return fTimeResolutionPar1 ; } + Int_t GetNADCEC() const { return fNADCEC ; } + Int_t GetMeanPhotonElectron() const { return fMeanPhotonElectron ; } + void SetDigitThreshold(Int_t val) { fDigitThreshold = val ; } + void SetPinNoise(Float_t val) { fPinNoise = val ; } void SetTimeNoise(Float_t val) { fTimeNoise = val ; } - void SetTimeDelay(Double_t val) { fTimeDelay = val ; } - void SetTimeResolutionPar0(Double_t val){ fTimeResolutionPar0 = val ; } - void SetTimeResolutionPar1(Double_t val){ fTimeResolutionPar1 = val ; } - void SetNADCED(Int_t val) { fNADCEC = val ; } - void SetMeanPhotonElectron(Int_t val) { fMeanPhotonElectron = val ; } + void SetTimeDelay(Double_t val) { fTimeDelay = val ; } + void SetTimeResolutionPar0(Double_t val){ fTimeResolutionPar0 = val ; } + void SetTimeResolutionPar1(Double_t val){ fTimeResolutionPar1 = val ; } + void SetNADCED(Int_t val) { fNADCEC = val ; } + void SetMeanPhotonElectron(Int_t val) { fMeanPhotonElectron = val ; } - //Parameters used in SDigitizer - Float_t GetA() const { return fA ; } - Float_t GetB() const { return fB ; } - Float_t GetECPrimaryThreshold() const { return fECPrimThreshold ; } - void SetA(Float_t val) { fA = val ; } - void SetB(Float_t val) { fB = val ; } - void SetECPrimaryThreshold(Float_t val) { fECPrimThreshold = val ; } + //Parameters used in SDigitizer + Float_t GetA() const { return fA ; } + Float_t GetB() const { return fB ; } + Float_t GetECPrimaryThreshold() const { return fECPrimThreshold ; } + void SetA(Float_t val) { fA = val ; } + void SetB(Float_t val) { fB = val ; } + void SetECPrimaryThreshold(Float_t val) { fECPrimThreshold = val ; } private: @@ -57,20 +57,20 @@ private: static AliEMCALSimParam * fgSimParam ; // pointer to the unique instance of the class - // Digitizer - Int_t fDigitThreshold ; // Threshold for storing digits in EMC - Int_t fMeanPhotonElectron ; // number of photon electrons per GeV deposited energy - Float_t fPinNoise ; // Electronics noise in EMC, APD + // Digitizer + Int_t fDigitThreshold ; // Threshold for storing digits in EMC + Int_t fMeanPhotonElectron ; // number of photon electrons per GeV deposited energy + Float_t fPinNoise ; // Electronics noise in EMC, APD Double_t fTimeNoise ; // Electronics noise in EMC, time - Double_t fTimeDelay; // Time delay to reproduce data delay - Double_t fTimeResolutionPar0 ; // Time resolution of FEE electronics - Double_t fTimeResolutionPar1 ; // Time resolution of FEE electronics - Int_t fNADCEC ; // number of channels in EC section ADC + Double_t fTimeDelay; // Time delay to reproduce data delay + Double_t fTimeResolutionPar0 ; // Time resolution of FEE electronics + Double_t fTimeResolutionPar1 ; // Time resolution of FEE electronics + Int_t fNADCEC ; // number of channels in EC section ADC - // SDigitizer - Float_t fA ; // Pedestal parameter - Float_t fB ; // Slope Digitizition parameters - Float_t fECPrimThreshold ; // To store primary if EC Shower Elos > threshold + // SDigitizer + Float_t fA ; // Pedestal parameter + Float_t fB ; // Slope Digitizition parameters + Float_t fECPrimThreshold ; // To store primary if EC Shower Elos > threshold ClassDef(AliEMCALSimParam,5) }; -- 2.43.0