From d968cee03c535de1f09a4ac9496b4026b3b903a7 Mon Sep 17 00:00:00 2001 From: schutz Date: Tue, 22 Jan 2002 07:35:46 +0000 Subject: [PATCH] Change thresholds ans noise parameters --- EMCAL/AliEMCALDigitizer.cxx | 34 +++++++++++++++++----------------- EMCAL/AliEMCALDigitizer.h | 7 ++++--- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx index 7420072faa8..d73fad79ab4 100644 --- a/EMCAL/AliEMCALDigitizer.cxx +++ b/EMCAL/AliEMCALDigitizer.cxx @@ -87,18 +87,18 @@ ClassImp(AliEMCALDigitizer) fSDigitizer = 0 ; fNinputs = 1 ; - fPinNoise = 0.01 ; - fEMCDigitThreshold = 0.01 ; + fPinNoise = 0.00001 ; + fTowerDigitThreshold = 0.001 ; fTimeResolution = 0.5e-9 ; fTimeSignalLength = 1.0e-9 ; - fPreShowerDigitThreshold = fEMCDigitThreshold/100. ; - fADCchannelTower = 0.0030; // width of one ADC channel in GeV + fPreShowerDigitThreshold = fTowerDigitThreshold/25. ; + fADCchannelTower = 0.003; // width of one ADC channel in GeV fADCpedestalTower = 0.005 ; // pedestal of ADC fNADCTower = (Int_t) TMath::Power(2,16) ; // number of channels in Tower ADC - fADCchannelPreSho = 0.0030 ; // width of one ADC channel in Pre Shower + fADCchannelPreSho = 0.0003 ; // width of one ADC channel in Pre Shower fADCpedestalPreSho = 0.005 ; // pedestal of ADC - fNADCPreSho = (Int_t) TMath::Power(2,16); // number of channels in Pre Shower ADC + fNADCPreSho = (Int_t) TMath::Power(2,12); // number of channels in Pre Shower ADC fTimeThreshold = 0.001*10000000 ; //Means 1 MeV in terms of SDigits amplitude fManager = 0 ; @@ -112,19 +112,19 @@ Bool_t AliEMCALDigitizer::Init() fSDigitizer = 0 ; fNinputs = 1 ; - fPinNoise = 0.01 ; - fEMCDigitThreshold = 0.01 ; + fPinNoise = 0.00001 ; + fTowerDigitThreshold = 0.001 ; fTimeResolution = 0.5e-9 ; fTimeSignalLength = 1.0e-9 ; - fPreShowerDigitThreshold = fEMCDigitThreshold/100. ; + fPreShowerDigitThreshold = fTowerDigitThreshold/25. ; fInitialized = kFALSE ; - fADCchannelTower = 0.0030; // width of one ADC channel in GeV - fADCpedestalTower = 0.005 ; // + fADCchannelTower = 0.003; // width of one ADC channel in GeV + fADCpedestalTower = 0.005 ; // GeV fNADCTower = (Int_t) TMath::Power(2,16) ; // number of channels in Tower ADC - fADCchannelPreSho = 0.0030 ; // width of one ADC channel in Pre Shower + fADCchannelPreSho = 0.0003 ; // width of one ADC channel in Pre Shower fADCpedestalPreSho = 0.005 ; // - fNADCPreSho = (Int_t) TMath::Power(2,16); // number of channels in Pre ShowerADC + fNADCPreSho = (Int_t) TMath::Power(2,12); // number of channels in Pre ShowerADC fTimeThreshold = 0.001*10000000 ; //Means 1 MeV in terms of SDigits amplitude @@ -246,7 +246,7 @@ void AliEMCALDigitizer::Digitize(const Int_t event) { input++ ; } - //Find the first crystall with signal + //Find the first tower with signal Int_t nextSig = 200000 ; Int_t i; for(i=0; iGaus(0., fPinNoise) ; + Float_t noise = gRandom->Gaus(0., fPinNoise); new((*digits)[absID-1]) AliEMCALDigit( -1, -1, absID,sDigitizer->Digitize(noise), TimeOfNoise() ) ; //look if we have to add signal? if(absID==nextSig){ @@ -342,7 +342,7 @@ void AliEMCALDigitizer::Digitize(const Int_t event) { //remove digits below thresholds for(absID = 0; absID < nEMC/2 ; absID++){ - if(sDigitizer->Calibrate(((AliEMCALDigit*)digits->At(absID))->GetAmp()) < fEMCDigitThreshold) + if(sDigitizer->Calibrate(((AliEMCALDigit*)digits->At(absID))->GetAmp()) < fTowerDigitThreshold) digits->RemoveAt(absID) ; else digit->SetTime(gRandom->Gaus(digit->GetTime(),fTimeResolution) ) ; @@ -556,7 +556,7 @@ void AliEMCALDigitizer::Print(Option_t* option)const { cout << endl ; cout << "With following parameters: " << endl ; cout << " Electronics noise in EMC (fPinNoise) = " << fPinNoise << endl ; - cout << " Threshold in EMC (fEMCDigitThreshold) = " << fEMCDigitThreshold << endl; + cout << " Threshold in EMC (fTowerDigitThreshold) = " << fTowerDigitThreshold << endl; cout << " Threshold in PreShower (fPreShowerDigitThreshold) = " << fPreShowerDigitThreshold << endl ; ; cout << "---------------------------------------------------" << endl ; } diff --git a/EMCAL/AliEMCALDigitizer.h b/EMCAL/AliEMCALDigitizer.h index d69e811a6a2..9b7f4c2d739 100644 --- a/EMCAL/AliEMCALDigitizer.h +++ b/EMCAL/AliEMCALDigitizer.h @@ -13,6 +13,7 @@ //_________________________________________________________________________ +#include // --- ROOT system --- #include "TObjString.h" @@ -38,7 +39,7 @@ public: void Digitize(const Int_t); // Make Digits from SDigits stored in fSDigits void Exec(Option_t *option); // Supervising method - const Float_t GetEMCThreshold() const { return fEMCDigitThreshold;} + const Float_t GetTowerThreshold() const { return fTowerDigitThreshold;} const Float_t GetPedestal() const { return fPedestal; } const Float_t GetPinNoise() const { return fPinNoise;} const Float_t GetSlope() const { return fSlope; } @@ -52,7 +53,7 @@ public: virtual void Print(Option_t* option)const ; void Reset() ; //restarts starts event processing from 0 event(s) const Int_t GetDigitsInRun() const { return fDigitsInRun; } ; - void SetEMCThreshold(Float_t EMCThreshold) {fEMCDigitThreshold = EMCThreshold;} + void SetTowerThreshold(Float_t EMCThreshold) {fTowerDigitThreshold = EMCThreshold;} void SetPinNoise(Float_t PinNoise ) {fPinNoise = PinNoise;} void SetSDigitsBranch(const char* file) ; @@ -86,7 +87,7 @@ private: Float_t fSlope ; // read from SDigitizer Float_t fPinNoise ; // Electronics noise in EMC - Float_t fEMCDigitThreshold ; // Threshold for storing digits in EMC + Float_t fTowerDigitThreshold ; // Threshold for storing digits in EMC Float_t fPreShowerDigitThreshold ; // Threshold for Preshower digits Float_t fTimeResolution ; // Time resolution of FEE electronics -- 2.39.3