#include <TBrowser.h>
#include <TObjectTable.h>
#include <TRandom.h>
+#include <TF1.h>
#include <cassert>
// --- AliRoot header files ---
#include "AliEMCALDigitizer.h"
#include "AliEMCALSDigitizer.h"
#include "AliEMCALGeometry.h"
-#include "AliEMCALTick.h"
+//#include "AliEMCALTick.h"
+#include "AliEMCALCalibData.h"
+#include "AliEMCALSimParam.h"
+#include "AliEMCALRawDigit.h"
+
+namespace
+{
+ Double_t HeavisideTheta(Double_t x)
+ {
+ Double_t signal = 0.;
+
+ if (x > 0.) signal = 1.;
+
+ return signal;
+ }
+
+ Double_t AnalogFastORFunction(Double_t *x, Double_t *par)
+ {
+ Double_t v0 = par[0];
+ Double_t t0 = par[1];
+ Double_t tr = par[2];
+
+ Double_t R1 = 1000.;
+ Double_t C1 = 33e-12;
+ Double_t R2 = 1800;
+ Double_t C2 = 22e-12;
+
+ Double_t t = x[0];
+
+ return (((0.8*(-((TMath::Power(C1,2)*C2*TMath::Power(TMath::E(),(-t + t0)/(C1*R1))*
+ TMath::Power(R1,2)*R2)/(C1*R1 - C2*R2)) +
+ C1*C2*R1*R2*(1 - (C2*TMath::Power(TMath::E(),(-t + t0)/(C2*R2))*R2)/(-(C1*R1) + C2*R2)))*v0*
+ HeavisideTheta(t - t0))/tr
+ - (0.8*(C1*C2*R1*R2 -
+ (TMath::Power(C1,2)*C2*TMath::Power(TMath::E(),(-1.*t + t0 + 1.25*tr)/(C1*R1))*
+ TMath::Power(R1,2)*R2)/(C1*R1 - C2*R2) +
+ (C1*TMath::Power(C2,2)*TMath::Power(TMath::E(),(-1.*t + t0 + 1.25*tr)/(C2*R2))*
+ R1*TMath::Power(R2,2))/(C1*R1 - C2*R2))*v0*
+ HeavisideTheta(t - t0 - 1.25*tr))/tr)/(C2*R1));
+ }
+}
ClassImp(AliEMCALDigitizer)
fEventNames(0x0),
fDigitThreshold(0),
fMeanPhotonElectron(0),
- fPedestal(0),
- fSlope(0),
+// fPedestal(0), //Not used, remove?
+// fSlope(0), //Not used, remove?
fPinNoise(0),
+ fTimeDelay(0),
fTimeResolution(0),
- fTimeThreshold(0),
- fTimeSignalLength(0),
+// fTimeThreshold(0), //Not used, remove?
+// fTimeSignalLength(0), //Not used, remove?
fADCchannelEC(0),
fADCpedestalEC(0),
fNADCEC(0),
fEventNames(0),
fDigitThreshold(0),
fMeanPhotonElectron(0),
- fPedestal(0),
- fSlope(0),
+// fPedestal(0),//Not used, remove?
+// fSlope(0), //Not used, remove?
fPinNoise(0),
+ fTimeDelay(0),
fTimeResolution(0),
- fTimeThreshold(0),
- fTimeSignalLength(0),
+// fTimeThreshold(0), //Not used, remove?
+// fTimeSignalLength(0), //Not used, remove?
fADCchannelEC(0),
fADCpedestalEC(0),
fNADCEC(0),
fEventNames(d.fEventNames),
fDigitThreshold(d.fDigitThreshold),
fMeanPhotonElectron(d.fMeanPhotonElectron),
- fPedestal(d.fPedestal),
- fSlope(d.fSlope),
+// fPedestal(d.fPedestal), //Not used, remove?
+// fSlope(d.fSlope), //Not used, remove?
fPinNoise(d.fPinNoise),
+ fTimeDelay(d.fTimeDelay),
fTimeResolution(d.fTimeResolution),
- fTimeThreshold(d.fTimeThreshold),
- fTimeSignalLength(d.fTimeSignalLength),
+// fTimeThreshold(d.fTimeThreshold), //Not used, remove?
+// fTimeSignalLength(d.fTimeSignalLength), //Not used, remove?
fADCchannelEC(d.fADCchannelEC),
fADCpedestalEC(d.fADCpedestalEC),
fNADCEC(d.fNADCEC),
fCalibData(d.fCalibData)
{
// copyy ctor
- }
+}
//____________________________________________________________________________
AliEMCALDigitizer::AliEMCALDigitizer(AliRunDigitizer * rd)
fInput(0),
fInputFileNames(0),
fEventNames(0),
- fDigitThreshold(0.),
+ fDigitThreshold(0),
fMeanPhotonElectron(0),
- fPedestal(0),
- fSlope(0.),
- fPinNoise(0),
+// fPedestal(0), //Not used, remove?
+// fSlope(0.), //Not used, remove?
+ fPinNoise(0.),
+ fTimeDelay(0.),
fTimeResolution(0.),
- fTimeThreshold(0),
- fTimeSignalLength(0),
+// fTimeThreshold(0), //Not used, remove?
+// fTimeSignalLength(0), //Not used, remove?
fADCchannelEC(0),
fADCpedestalEC(0),
fNADCEC(0),
AliEMCALDigitizer::~AliEMCALDigitizer()
{
//dtor
- if (AliRunLoader::GetRunLoader()) {
+ if (AliRunLoader::Instance()) {
AliLoader *emcalLoader=0;
- if ((emcalLoader = AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL")))
+ if ((emcalLoader = AliRunLoader::Instance()->GetDetectorLoader("EMCAL")))
emcalLoader->CleanDigitizer();
}
else
AliDebug(1," no runloader present");
+
delete [] fInputFileNames ;
delete [] fEventNames ;
-
+
}
//____________________________________________________________________________
void AliEMCALDigitizer::Digitize(Int_t event)
{
-
+
// Makes the digitization of the collected summable digits
// for this it first creates the array of all EMCAL modules
// filled with noise and after that adds contributions from
// back to an energy in GeV before adding it to the Digit
//
static int nEMC=0; //max number of digits possible
-
- AliRunLoader *rl = AliRunLoader::GetRunLoader();
+
+ AliRunLoader *rl = AliRunLoader::Instance();
AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(rl->GetDetectorLoader("EMCAL"));
+
+ if(emcalLoader){
Int_t readEvent = event ;
// fManager is data member from AliDigitizer
if (fManager)
readEvent = dynamic_cast<AliStream*>(fManager->GetInputStream(0))->GetCurrentEventNumber() ;
AliDebug(1,Form("Adding event %d from input stream 0 %s %s",
- readEvent, GetTitle(), fEventFolderName.Data())) ;
+ readEvent, GetTitle(), fEventFolderName.Data())) ;
rl->GetEvent(readEvent);
-
+
TClonesArray * digits = emcalLoader->Digits() ;
digits->Delete() ; //correct way to clear array when memory is
- //allocated by objects stored in array
-
+ //allocated by objects stored in array
+
// Load Geometry
AliEMCALGeometry *geom = 0;
- if (rl->GetAliRun()) {
+ if (!rl->GetAliRun()) {
+ AliFatal("Could not get AliRun from runLoader");
+ }
+ else{
AliEMCAL * emcal = (AliEMCAL*)rl->GetAliRun()->GetDetector("EMCAL");
geom = emcal->GetGeometry();
+ nEMC = geom->GetNCells();
+ AliDebug(1,Form("nEMC %i (number cells in EMCAL) | %s \n", nEMC, geom->GetName()));
}
- else
- AliFatal("Could not get AliRun from runLoader");
-
- nEMC = geom->GetNCells();
- AliDebug(1,Form("nEMC %i (number cells in EMCAL) | %s \n", nEMC, geom->GetName()));
- Int_t absID ;
-
+ Int_t absID = -1 ;
+
digits->Expand(nEMC) ;
-
+
// get first the sdigitizer from the tasks list (must have same name as the digitizer)
if ( !emcalLoader->SDigitizer() )
emcalLoader->LoadSDigitizer();
AliEMCALSDigitizer * sDigitizer = dynamic_cast<AliEMCALSDigitizer*>(emcalLoader->SDigitizer());
- if ( !sDigitizer )
+ if (!sDigitizer )
+ {
Fatal("Digitize", "SDigitizer with name %s %s not found", fEventFolderName.Data(), GetTitle() ) ;
-
- //take all the inputs to add together and load the SDigits
- TObjArray * sdigArray = new TObjArray(fInput) ;
- sdigArray->AddAt(emcalLoader->SDigits(), 0) ;
- Int_t i ;
-
- for(i = 1 ; i < fInput ; i++){
- TString tempo(fEventNames[i]) ;
- tempo += i ;
-
- AliRunLoader * rl2 = AliRunLoader::GetRunLoader(tempo) ;
-
- if (rl2==0)
- rl2 = AliRunLoader::Open(fInputFileNames[i], tempo) ;
-
- if (fManager)
- readEvent = dynamic_cast<AliStream*>(fManager->GetInputStream(i))->GetCurrentEventNumber() ;
- Info("Digitize", "Adding event %d from input stream %d %s %s", readEvent, i, fInputFileNames[i].Data(), tempo.Data()) ;
- rl2->LoadSDigits();
- rl2->GetEvent(readEvent);
- AliEMCALLoader *emcalLoader2 = dynamic_cast<AliEMCALLoader*>(rl2->GetDetectorLoader("EMCAL"));
- sdigArray->AddAt(emcalLoader2->SDigits(), i) ;
}
-
- //Find the first tower with signal
- Int_t nextSig = nEMC + 1 ;
- TClonesArray * sdigits ;
- for(i = 0 ; i < fInput ; i++){
- sdigits = dynamic_cast<TClonesArray *>(sdigArray->At(i)) ;
- if ( !sdigits->GetEntriesFast() )
- continue ;
- Int_t curNext = dynamic_cast<AliEMCALDigit *>(sdigits->At(0))->GetId() ;
- if(curNext < nextSig)
- nextSig = curNext ;
- AliDebug(1,Form("input %i : #sdigits %i \n",
- i, sdigits->GetEntriesFast()));
- }
- AliDebug(1,Form("FIRST tower with signal %i \n", nextSig));
-
- TArrayI index(fInput) ;
- index.Reset() ; //Set all indexes to zero
-
- AliEMCALDigit * digit ;
- AliEMCALDigit * curSDigit ;
-
- // TClonesArray * ticks = new TClonesArray("AliEMCALTick",1000) ;
-
- //Put Noise contribution
- for(absID = 0; absID < nEMC; absID++){ // Nov 30, 2006 by PAI; was from 1 to nEMC
- Float_t energy = 0 ;
- // amplitude set to zero, noise will be added later
- new((*digits)[absID]) AliEMCALDigit( -1, -1, absID, 0, TimeOfNoise() ); // absID-1->absID
- //look if we have to add signal?
- digit = dynamic_cast<AliEMCALDigit *>(digits->At(absID)); // absID-1->absID
-
- if(absID==nextSig){
- //Add SDigits from all inputs
- // ticks->Clear() ;
- //Int_t contrib = 0 ;
-
- //Follow PHOS and comment out this timing model til a better one
- //can be developed - JLK 28-Apr-2008
-
- //Float_t a = digit->GetAmp() ;
- //Float_t b = TMath::Abs( a /fTimeSignalLength) ;
- //Mark the beginning of the signal
- //new((*ticks)[contrib++]) AliEMCALTick(digit->GetTime(),0, b);
- //Mark the end of the signal
- //new((*ticks)[contrib++]) AliEMCALTick(digit->GetTime()+fTimeSignalLength, -a, -b);
-
- // Calculate time as time of the largest digit
- Float_t time = digit->GetTime() ;
- Float_t aTime= digit->GetAmp() ;
+ else
+ {
+ //take all the inputs to add together and load the SDigits
+ TObjArray * sdigArray = new TObjArray(fInput) ;
+ sdigArray->AddAt(emcalLoader->SDigits(), 0) ;
+
+ Int_t i ;
+ for(i = 1 ; i < fInput ; i++){
+ TString tempo(fEventNames[i]) ;
+ tempo += i ;
- // loop over input
- for(i = 0; i< fInput ; i++){ //loop over (possible) merge sources
- if(dynamic_cast<TClonesArray *>(sdigArray->At(i))->GetEntriesFast() > index[i] )
- curSDigit = dynamic_cast<AliEMCALDigit*>(dynamic_cast<TClonesArray *>(sdigArray->At(i))->At(index[i])) ;
- else
- curSDigit = 0 ;
- //May be several digits will contribute from the same input
- while(curSDigit && (curSDigit->GetId() == absID)){
- //Shift primary to separate primaries belonging different inputs
- Int_t primaryoffset ;
- if(fManager)
- primaryoffset = fManager->GetMask(i) ;
- else
- primaryoffset = i ;
- curSDigit->ShiftPrimary(primaryoffset) ;
-
- //Remove old timing model - JLK 28-April-2008
- //a = curSDigit->GetAmp() ;
- //b = a /fTimeSignalLength ;
- //new((*ticks)[contrib++]) AliEMCALTick(curSDigit->GetTime(),0, b);
- //new((*ticks)[contrib++]) AliEMCALTick(curSDigit->GetTime()+fTimeSignalLength, -a, -b);
- if(curSDigit->GetAmp()>aTime) {
- aTime = curSDigit->GetAmp();
- time = curSDigit->GetTime();
- }
-
- *digit = *digit + *curSDigit ; //adds amplitudes of each digit
-
- index[i]++ ;
- if( dynamic_cast<TClonesArray *>(sdigArray->At(i))->GetEntriesFast() > index[i] )
- curSDigit = dynamic_cast<AliEMCALDigit*>(dynamic_cast<TClonesArray *>(sdigArray->At(i))->At(index[i])) ;
- else
- curSDigit = 0 ;
- }
- }
- //Here we convert the summed amplitude to an energy in GeV
- energy = sDigitizer->Calibrate(digit->GetAmp()) ; // GeV
- // add fluctuations for photo-electron creation
- energy *= static_cast<Float_t>(gRandom->Poisson(fMeanPhotonElectron)) / static_cast<Float_t>(fMeanPhotonElectron) ;
-
- //calculate and set time
- //New timing model needed - JLK 28-April-2008
- //Float_t time = FrontEdgeTime(ticks) ;
- digit->SetTime(time) ;
-
- //Find next signal module
- nextSig = nEMC + 1 ;
- for(i = 0 ; i < fInput ; i++){
- sdigits = dynamic_cast<TClonesArray *>(sdigArray->At(i)) ;
- Int_t curNext = nextSig ;
- if(sdigits->GetEntriesFast() > index[i] ){
- curNext = dynamic_cast<AliEMCALDigit *>(sdigits->At(index[i]))->GetId() ;
- }
- if(curNext < nextSig) nextSig = curNext ;
+ AliRunLoader * rl2 = AliRunLoader::GetRunLoader(tempo) ;
+
+ if (rl2==0)
+ rl2 = AliRunLoader::Open(fInputFileNames[i], tempo) ;
+
+ if (fManager)
+ readEvent = dynamic_cast<AliStream*>(fManager->GetInputStream(i))->GetCurrentEventNumber() ;
+ Info("Digitize", "Adding event %d from input stream %d %s %s", readEvent, i, fInputFileNames[i].Data(), tempo.Data()) ;
+ rl2->LoadSDigits();
+ rl2->GetEvent(readEvent);
+ if(rl2->GetDetectorLoader("EMCAL"))
+ {
+ AliEMCALLoader *emcalLoader2 = dynamic_cast<AliEMCALLoader*>(rl2->GetDetectorLoader("EMCAL"));
+ if(emcalLoader2) sdigArray->AddAt(emcalLoader2->SDigits(), i) ;
+ else AliFatal("EMCAL Loader of second event not available!");
}
+ else Fatal("Digitize", "Loader of second input not found");
}
- // add the noise now
- energy += TMath::Abs(gRandom->Gaus(0., fPinNoise)) ;
- // JLK 26-June-2008
- //Now digitize the energy according to the sDigitizer method,
- //which merely converts the energy to an integer. Later we will
- //check that the stored value matches our allowed dynamic ranges
- digit->SetAmp(sDigitizer->Digitize(energy)) ;
- AliDebug(10,Form(" absID %5i energy %f nextSig %5i\n",
- absID, energy, nextSig));
- } // for(absID = 0; absID < nEMC; absID++)
-
- //ticks->Delete() ;
- //delete ticks ;
-
- //JLK is it better to call Clear() here?
- delete sdigArray ; //We should not delete its contents
-
- //remove digits below thresholds
- for(i = 0 ; i < nEMC ; i++){
- digit = dynamic_cast<AliEMCALDigit*>( digits->At(i) ) ;
- Float_t threshold = fDigitThreshold ; //this is in GeV
- //need to calibrate digit amplitude to energy in GeV for comparison
- if(sDigitizer->Calibrate( digit->GetAmp() ) < threshold)
- digits->RemoveAt(i) ;
- else
- digit->SetTime(gRandom->Gaus(digit->GetTime(),fTimeResolution) ) ;
- }
-
- digits->Compress() ;
-
- Int_t ndigits = digits->GetEntriesFast() ;
-
- //JLK 26-June-2008
- //After we have done the summing and digitizing to create the
- //digits, now we want to calibrate the resulting amplitude to match
- //the dynamic range of our real data.
- Float_t energy=0;
- for (i = 0 ; i < ndigits ; i++) {
- digit = dynamic_cast<AliEMCALDigit *>( digits->At(i) ) ;
- digit->SetIndexInList(i) ;
- energy = sDigitizer->Calibrate(digit->GetAmp()) ;
- digit->SetAmp(DigitizeEnergy(energy, digit->GetId()) ) ;
+
+ //Find the first tower with signal
+ Int_t nextSig = nEMC + 1 ;
+ TClonesArray * sdigits ;
+ for(i = 0 ; i < fInput ; i++){
+
+ sdigits = dynamic_cast<TClonesArray *>(sdigArray->At(i)) ;
+ if(sdigits){
+ if (sdigits->GetEntriesFast() ){
+ AliEMCALDigit *sd = dynamic_cast<AliEMCALDigit *>(sdigits->At(0));
+ if(sd){
+ Int_t curNext = sd->GetId() ;
+ if(curNext < nextSig)
+ nextSig = curNext ;
+ AliDebug(1,Form("input %i : #sdigits %i \n",
+ i, sdigits->GetEntriesFast()));
+
+ }//First entry is not NULL
+ else {
+ Info("Digitize", "NULL sdigit pointer");
+ continue;
+ }
+ }//There is at least one entry
+ else {
+ Info("Digitize", "NULL sdigits array");
+ continue;
+ }
+ }// SDigits array exists
+ else {
+ Info("Digitizer","Null sdigit pointer");
+ continue;
+ }
+ }// input loop
+ AliDebug(1,Form("FIRST tower with signal %i \n", nextSig));
+
+ TArrayI index(fInput) ;
+ index.Reset() ; //Set all indexes to zero
+
+ AliEMCALDigit * digit ;
+ AliEMCALDigit * curSDigit ;
+
+ // TClonesArray * ticks = new TClonesArray("AliEMCALTick",1000) ;
+
+ //Put Noise contribution
+ for(absID = 0; absID < nEMC; absID++){ // Nov 30, 2006 by PAI; was from 1 to nEMC
+ Float_t energy = 0 ;
+ // amplitude set to zero, noise will be added later
+ new((*digits)[absID]) AliEMCALDigit( -1, -1, absID, 0., TimeOfNoise(),kFALSE); // absID-1->absID
+ //look if we have to add signal?
+
+ digit = dynamic_cast<AliEMCALDigit *>(digits->At(absID)); // absID-1->absID
+
+ if (digit) {
+
+ if(absID==nextSig){
+ //Add SDigits from all inputs
+ // ticks->Clear() ;
+ //Int_t contrib = 0 ;
+
+ //Follow PHOS and comment out this timing model til a better one
+ //can be developed - JLK 28-Apr-2008
+
+ //Float_t a = digit->GetAmplitude() ;
+ //Float_t b = TMath::Abs( a /fTimeSignalLength) ;
+ //Mark the beginning of the signal
+ //new((*ticks)[contrib++]) AliEMCALTick(digit->GetTime(),0, b);
+ //Mark the end of the signal
+ //new((*ticks)[contrib++]) AliEMCALTick(digit->GetTime()+fTimeSignalLength, -a, -b);
+
+ // Calculate time as time of the largest digit
+ Float_t time = digit->GetTime() ;
+ Float_t aTime= digit->GetAmplitude() ;
+
+ // loop over input
+ for(i = 0; i< fInput ; i++){ //loop over (possible) merge sources
+ TClonesArray* sdtclarr = dynamic_cast<TClonesArray *>(sdigArray->At(i));
+ if(sdtclarr) {
+ Int_t sDigitEntries = sdtclarr->GetEntriesFast();
+
+ if(sDigitEntries > index[i] )
+ curSDigit = dynamic_cast<AliEMCALDigit*>(sdtclarr->At(index[i])) ;
+ else
+ curSDigit = 0 ;
+
+ //May be several digits will contribute from the same input
+ while(curSDigit && (curSDigit->GetId() == absID)){
+ //Shift primary to separate primaries belonging different inputs
+ Int_t primaryoffset ;
+ if(fManager)
+ primaryoffset = fManager->GetMask(i) ;
+ else
+ primaryoffset = i ;
+ curSDigit->ShiftPrimary(primaryoffset) ;
+
+ //Remove old timing model - JLK 28-April-2008
+ //a = curSDigit->GetAmplitude() ;
+ //b = a /fTimeSignalLength ;
+ //new((*ticks)[contrib++]) AliEMCALTick(curSDigit->GetTime(),0, b);
+ //new((*ticks)[contrib++]) AliEMCALTick(curSDigit->GetTime()+fTimeSignalLength, -a, -b);
+ if(curSDigit->GetAmplitude()>aTime) {
+ aTime = curSDigit->GetAmplitude();
+ time = curSDigit->GetTime();
+ }
+
+ *digit = *digit + *curSDigit ; //adds amplitudes of each digit
+
+ index[i]++ ;
+ if( sDigitEntries > index[i] )
+ curSDigit = dynamic_cast<AliEMCALDigit*>(sdtclarr->At(index[i])) ;
+ else
+ curSDigit = 0 ;
+ }// while
+ }// source exists
+ }// loop over merging sources
+
+ //Here we convert the summed amplitude to an energy in GeV
+ energy = sDigitizer->Calibrate(digit->GetAmplitude()) ; // GeV
+ // add fluctuations for photo-electron creation
+ energy *= static_cast<Float_t>(gRandom->Poisson(fMeanPhotonElectron)) / static_cast<Float_t>(fMeanPhotonElectron) ;
+
+ //calculate and set time
+ //New timing model needed - JLK 28-April-2008
+ //Float_t time = FrontEdgeTime(ticks) ;
+ digit->SetTime(time) ;
+
+ //Find next signal module
+ nextSig = nEMC + 1 ;
+ for(i = 0 ; i < fInput ; i++){
+ sdigits = dynamic_cast<TClonesArray *>(sdigArray->At(i)) ;
+ if(sdigits){
+ Int_t curNext = nextSig ;
+ AliEMCALDigit * tmpdigit = dynamic_cast<AliEMCALDigit *>(sdigits->At(index[i]));
+ if(sdigits->GetEntriesFast() > index[i] && tmpdigit){
+ curNext = tmpdigit->GetId() ;
+ }
+ if(curNext < nextSig) nextSig = curNext ;
+ }// sdigits exist
+ } // input loop
+
+ }//absID==nextSig
+
+ // add the noise now
+ energy += TMath::Abs(gRandom->Gaus(0., fPinNoise)) ;
+ // JLK 26-June-2008
+ //Now digitize the energy according to the sDigitizer method,
+ //which merely converts the energy to an integer. Later we will
+ //check that the stored value matches our allowed dynamic ranges
+ digit->SetAmplitude(sDigitizer->Digitize(energy)) ;
+ AliDebug(10,Form(" absID %5i energy %f nextSig %5i\n",
+ absID, energy, nextSig));
+ }// Digit pointer exists
+ else{
+ Info("Digitizer","Digit pointer is null");
+ }
+ } // for(absID = 0; absID < nEMC; absID++)
+
+ //ticks->Delete() ;
+ //delete ticks ;
+
+ //JLK is it better to call Clear() here?
+ delete sdigArray ; //We should not delete its contents
+
+ //remove digits below thresholds
+ // until 10-02-2010 remove digits with energy smaller than fDigitThreshold 3*fPinNoise
+ // now, remove digits with Digitized ADC smaller than fDigitThreshold = 3
+ Float_t energy=0;
+ for(i = 0 ; i < nEMC ; i++){
+ digit = dynamic_cast<AliEMCALDigit*>( digits->At(i) ) ;
+ if(digit){
+ //First get the energy in GeV units.
+ energy = sDigitizer->Calibrate(digit->GetAmplitude()) ;
+ //Then digitize using the calibration constants of the ocdb
+ Float_t ampADC = DigitizeEnergy(energy, digit->GetId()) ;
+ //if(ampADC>2)printf("Digit energy %f, amp %d, amp cal %d, threshold %d\n",energy,digit->GetAmplitude(),ampADC,fDigitThreshold);
+ if(ampADC < fDigitThreshold)
+ digits->RemoveAt(i) ;
+ else
+ digit->SetTime(gRandom->Gaus(digit->GetTime(),fTimeResolution) ) ;
+ }// digit exists
+ } // digit loop
+
+ digits->Compress() ;
+
+ Int_t ndigits = digits->GetEntriesFast() ;
+
+ //JLK 26-June-2008
+ //After we have done the summing and digitizing to create the
+ //digits, now we want to calibrate the resulting amplitude to match
+ //the dynamic range of our real data.
+ for (i = 0 ; i < ndigits ; i++) {
+ digit = dynamic_cast<AliEMCALDigit *>( digits->At(i) ) ;
+ if(digit){
+ digit->SetIndexInList(i) ;
+ energy = sDigitizer->Calibrate(digit->GetAmplitude()) ;
+ digit->SetAmplitude(DigitizeEnergy(energy, digit->GetId()) ) ;
+ //Add delay to time
+ digit->SetTime(digit->GetTime()+fTimeDelay) ;
+ // printf("digit amplitude set at end: i %d, amp %f\n",i,digit->GetAmplitude());
+ }// digit exists
+ }//Digit loop
+
+ }//SDigitizer not null
}
+ else AliFatal("EMCALLoader is NULL!") ;
}
// //_____________________________________________________________________
-Int_t AliEMCALDigitizer::DigitizeEnergy(Float_t energy, Int_t AbsId)
+Float_t AliEMCALDigitizer::DigitizeEnergy(Float_t energy, Int_t AbsId)
{
// JLK 26-June-2008
// Returns digitized value of the energy in a cell absId
// Load Geometry
const AliEMCALGeometry * geom = AliEMCALGeometry::GetInstance();
- if (geom==0)
+ Float_t channel = -999;
+
+ if (geom==0){
AliFatal("Did not get geometry from EMCALLoader");
-
- Int_t iSupMod = -1;
- Int_t nModule = -1;
- Int_t nIphi = -1;
- Int_t nIeta = -1;
- Int_t iphi = -1;
- Int_t ieta = -1;
- Int_t channel = -999;
-
- Bool_t bCell = geom->GetCellIndex(AbsId, iSupMod, nModule, nIphi, nIeta) ;
- if(!bCell)
- Error("DigitizeEnergy","Wrong cell id number : AbsId %i ", AbsId) ;
- geom->GetCellPhiEtaIndexInSModule(iSupMod,nModule,nIphi, nIeta,iphi,ieta);
-
- if(fCalibData) {
- fADCpedestalEC = fCalibData->GetADCpedestal(iSupMod,ieta,iphi);
- fADCchannelEC = fCalibData->GetADCchannel(iSupMod,ieta,iphi);
}
+ else {
+ Int_t iSupMod = -1;
+ Int_t nModule = -1;
+ Int_t nIphi = -1;
+ Int_t nIeta = -1;
+ Int_t iphi = -1;
+ Int_t ieta = -1;
+ Bool_t bCell = geom->GetCellIndex(AbsId, iSupMod, nModule, nIphi, nIeta) ;
+ if(!bCell)
+ Error("DigitizeEnergy","Wrong cell id number : AbsId %i ", AbsId) ;
+ geom->GetCellPhiEtaIndexInSModule(iSupMod,nModule,nIphi, nIeta,iphi,ieta);
- channel = static_cast<Int_t> (TMath::Ceil( (energy + fADCpedestalEC)/fADCchannelEC )) ;
+ if(fCalibData) {
+ fADCpedestalEC = fCalibData->GetADCpedestal(iSupMod,ieta,iphi);
+ fADCchannelEC = fCalibData->GetADCchannel(iSupMod,ieta,iphi);
+ }
+
+ //channel = static_cast<Int_t> (TMath::Floor( (energy + fADCpedestalEC)/fADCchannelEC )) ;
+ channel = (energy + fADCpedestalEC)/fADCchannelEC ;
+
+ if(channel > fNADCEC )
+ channel = fNADCEC ;
+ }// geometry exists
- if(channel > fNADCEC )
- channel = fNADCEC ;
return channel ;
}
if(strstr(option,"tim"))
gBenchmark->Start("EMCALDigitizer");
- AliRunLoader *rl = AliRunLoader::GetRunLoader();
+ AliRunLoader *rl = AliRunLoader::Instance();
AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(rl->GetDetectorLoader("EMCAL"));
-
- // Post Digitizer to the white board
- emcalLoader->PostDigitizer(this) ;
-
- if (fLastEvent == -1) {
- fLastEvent = rl->GetNumberOfEvents() - 1 ;
+ Int_t nEvents = 0;
+ if(!emcalLoader){
+ AliFatal("Did not get the Loader");
}
- else if (fManager)
- fLastEvent = fFirstEvent ; // what is this ??
-
- Int_t nEvents = fLastEvent - fFirstEvent + 1;
- Int_t ievent;
-
- rl->LoadSDigits("EMCAL");
- for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
+ else{
+ // Post Digitizer to the white board
+ emcalLoader->PostDigitizer(this) ;
- rl->GetEvent(ievent);
-
- Digitize(ievent) ; //Add prepared SDigits to digits and add the noise
+ if (fLastEvent == -1) {
+ fLastEvent = rl->GetNumberOfEvents() - 1 ;
+ }
+ else if (fManager)
+ fLastEvent = fFirstEvent ; // what is this ??
+
+ nEvents = fLastEvent - fFirstEvent + 1;
+ Int_t ievent = -1;
- WriteDigits() ;
+ TClonesArray* digitsTMP = new TClonesArray("AliEMCALDigit", 32*96);
+ TClonesArray* digitsTRG = new TClonesArray("AliEMCALRawDigit", 32*96);
- if(strstr(option,"deb"))
- PrintDigits(option);
- if(strstr(option,"table")) gObjectTable->Print();
+ rl->LoadSDigits("EMCAL");
+ for (ievent = fFirstEvent; ievent <= fLastEvent; ievent++) {
+
+ rl->GetEvent(ievent);
+
+ Digitize(ievent) ; //Add prepared SDigits to digits and add the noise
+
+ WriteDigits() ;
+
+ //Trigger Digits
+ //-------------------------------------
+
- //increment the total number of Digits per run
- fDigitsInRun += emcalLoader->Digits()->GetEntriesFast() ;
- }
+ Digits2FastOR(digitsTMP, digitsTRG);
+
+ WriteDigits(digitsTRG);
+
+ (emcalLoader->TreeD())->Fill();
+
+ emcalLoader->WriteDigits( "OVERWRITE");
+ emcalLoader->WriteDigitizer("OVERWRITE");
+
+ Unload();
+
+ digitsTRG ->Delete();
+ digitsTMP ->Delete();
+
+ //-------------------------------------
+
+ if(strstr(option,"deb"))
+ PrintDigits(option);
+ if(strstr(option,"table")) gObjectTable->Print();
+
+ //increment the total number of Digits per run
+ fDigitsInRun += emcalLoader->Digits()->GetEntriesFast() ;
+ }//loop
+
+ emcalLoader->CleanDigitizer() ;
+
+ }//loader exists
- emcalLoader->CleanDigitizer() ;
-
if(strstr(option,"tim")){
gBenchmark->Stop("EMCALDigitizer");
AliInfo(Form("Exec: took %f seconds for Digitizing %f seconds per event",
}
//____________________________________________________________________________
-Float_t AliEMCALDigitizer::FrontEdgeTime(TClonesArray * ticks)
-{
- // Returns the shortest time among all time ticks
-
- ticks->Sort() ; //Sort in accordance with times of ticks
- TIter it(ticks) ;
- AliEMCALTick * ctick = (AliEMCALTick *) it.Next() ;
- Float_t time = ctick->CrossingTime(fTimeThreshold) ;
+void AliEMCALDigitizer::Digits2FastOR(TClonesArray* digitsTMP, TClonesArray* digitsTRG)
+{
+ // FEE digits afterburner to produce TRG digits
+ // we are only interested in the FEE digit deposited energy
+ // to be converted later into a voltage value
- AliEMCALTick * t ;
- while((t=(AliEMCALTick*) it.Next())){
- if(t->GetTime() < time) //This tick starts before crossing
- *ctick+=*t ;
- else
- return time ;
-
- time = ctick->CrossingTime(fTimeThreshold) ;
+ // push the FEE digit to its associated FastOR (numbered from 0:95)
+ // TRU is in charge of summing module digits
+
+ AliRunLoader *runLoader = AliRunLoader::Instance();
+
+ AliRun* run = runLoader->GetAliRun();
+
+ AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(runLoader->GetDetectorLoader("EMCAL"));
+ if(!emcalLoader){
+ AliFatal("Did not get the Loader");
}
- return time ;
+ else {
+ AliEMCAL* emcal = dynamic_cast<AliEMCAL*>(run->GetDetector("EMCAL"));
+ if(emcal){
+ AliEMCALGeometry* geom = emcal->GetGeometry();
+
+ // build FOR from simulated digits
+ // and xfer to the corresponding TRU input (mapping)
+
+ TClonesArray* digits = emcalLoader->Digits();
+
+ TIter NextDigit(digits);
+ while (AliEMCALDigit* digit = (AliEMCALDigit*)NextDigit())
+ {
+ Int_t id = digit->GetId();
+
+ Int_t trgid;
+ if (geom && geom->GetFastORIndexFromCellIndex(id , trgid))
+ {
+ AliDebug(1,Form("trigger digit id: %d from cell id: %d\n",trgid,id));
+
+ AliEMCALDigit* d = static_cast<AliEMCALDigit*>(digitsTMP->At(trgid));
+
+ if (!d)
+ {
+ new((*digitsTMP)[trgid]) AliEMCALDigit(*digit);
+ d = (AliEMCALDigit*)digitsTMP->At(trgid);
+ d->SetId(trgid);
+ }
+ else
+ {
+ *d = *d + *digit;
+ }
+ }
+ }
+
+ if (AliDebugLevel()) printf("Number of TRG digits: %d\n",digitsTMP->GetEntriesFast());
+
+ Int_t nSamples = 32;
+ Int_t *timeSamples = new Int_t[nSamples];
+
+ NextDigit = TIter(digitsTMP);
+ while (AliEMCALDigit* digit = (AliEMCALDigit*)NextDigit())
+ {
+ if (digit)
+ {
+ Int_t id = digit->GetId();
+ Float_t time = digit->GetTime();
+
+ Double_t depositedEnergy = 0.;
+ for (Int_t j = 1; j <= digit->GetNprimary(); j++) depositedEnergy += digit->GetDEPrimary(j);
+
+ if (AliDebugLevel()) printf("Deposited Energy: %f\n", depositedEnergy);
+
+ // FIXME: Check digit time!
+ if (depositedEnergy)
+ {
+ DigitalFastOR(time, depositedEnergy, timeSamples, nSamples);
+
+ for (Int_t j=0;j<nSamples;j++)
+ {
+ timeSamples[j] = ((j << 12) & 0xFF000) | (timeSamples[j] & 0xFFF);
+ }
+
+ new((*digitsTRG)[digitsTRG->GetEntriesFast()]) AliEMCALRawDigit(id, timeSamples, nSamples);
+ }
+ }
+ }
+
+ delete [] timeSamples;
+ }// AliEMCAL exists
+ else AliFatal("Could not get AliEMCAL");
+ }// loader exists
+
}
+//____________________________________________________________________________
+void AliEMCALDigitizer::DigitalFastOR( Double_t time, Double_t dE, Int_t timeSamples[], Int_t nSamples )
+{
+ // parameters:
+ // id: 0..95
+ const Int_t reso = 11; // 11-bit resolution ADC
+ const Double_t vFSR = 1; // Full scale input voltage range
+ const Double_t Ne = 125; // signal of the APD per MeV of energy deposit in a tower: 125 photo-e-/MeV @ M=30
+ const Double_t vA = .136e-6; // CSP output range: 0.136uV/e-
+ const Double_t rise = 40e-9; // rise time (10-90%) of the FastOR signal before shaping
+
+ const Double_t kTimeBinWidth = 25E-9; // sampling frequency (40MHz)
+
+ Double_t vV = 1000. * dE * Ne * vA; // GeV 2 MeV
+
+ TF1 signalF("signal", AnalogFastORFunction, 0, nSamples * kTimeBinWidth, 3);
+ signalF.SetParameter( 0, vV );
+ signalF.SetParameter( 1, time ); // FIXME: when does the signal arrive? Might account for cable lengths
+ signalF.SetParameter( 2, rise );
+
+ for (Int_t iTime=0; iTime<nSamples; iTime++)
+ {
+ // FIXME: add noise (probably not simply Gaussian) according to DA measurements
+ // probably plan an access to OCDB
+
+ timeSamples[iTime] = int((TMath::Power(2, reso) / vFSR) * signalF.Eval(iTime * kTimeBinWidth) + 0.5);
+ }
+}
+
+
+//____________________________________________________________________________
+//Float_t AliEMCALDigitizer::FrontEdgeTime(TClonesArray * ticks)
+//{
+// // Returns the shortest time among all time ticks
+//
+// ticks->Sort() ; //Sort in accordance with times of ticks
+// TIter it(ticks) ;
+// AliEMCALTick * ctick = (AliEMCALTick *) it.Next() ;
+// Float_t time = ctick->CrossingTime(fTimeThreshold) ;
+//
+// AliEMCALTick * t ;
+// while((t=(AliEMCALTick*) it.Next())){
+// if(t->GetTime() < time) //This tick starts before crossing
+// *ctick+=*t ;
+// else
+// return time ;
+//
+// time = ctick->CrossingTime(fTimeThreshold) ;
+// }
+// return time ;
+//}
+//
+
//____________________________________________________________________________
Bool_t AliEMCALDigitizer::Init()
{
// Makes all memory allocations
fInit = kTRUE ;
- AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
+ AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::Instance()->GetDetectorLoader("EMCAL"));
if ( emcalLoader == 0 ) {
Fatal("Init", "Could not obtain the AliEMCALLoader");
void AliEMCALDigitizer::InitParameters()
{
// Parameter initialization for digitizer
- // Tune parameters - 24-nov-04; Apr 29, 2007
- // New parameters JLK 14-Apr-2008
-
- fMeanPhotonElectron = 4400; // electrons per GeV
- fPinNoise = 0.037; // pin noise in GEV from analysis test beam data
- if (fPinNoise == 0. )
+
+ // Get the parameters from the OCDB via the loader
+ AliRunLoader *rl = AliRunLoader::Instance();
+ AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(rl->GetDetectorLoader("EMCAL"));
+ AliEMCALSimParam * simParam = 0x0;
+ if(emcalLoader) simParam = emcalLoader->SimulationParameters();
+
+ if(!simParam){
+ simParam = AliEMCALSimParam::GetInstance();
+ AliWarning("Simulation Parameters not available in OCDB?");
+ }
+
+ fMeanPhotonElectron = simParam->GetMeanPhotonElectron();//4400; // electrons per GeV
+ fPinNoise = simParam->GetPinNoise();//0.012; // pin noise in GeV from analysis test beam data
+ if (fPinNoise < 0.0001 )
Warning("InitParameters", "No noise added\n") ;
- fDigitThreshold = fPinNoise * 3; // 3 * sigma
- fTimeResolution = 0.3e-9 ; // 300 psc
- fTimeSignalLength = 1.0e-9 ;
+ fDigitThreshold = simParam->GetDigitThreshold(); //fPinNoise * 3; // 3 * sigma
+ fTimeResolution = simParam->GetTimeResolution(); //0.6e-9 ; // 600 pc
+ fTimeDelay = simParam->GetTimeDelay(); //600e-9 ; // 600 ns
// These defaults are normally not used.
// Values are read from calibration database instead
- fADCchannelEC = 0.0153; // Update 24 Apr 2007: 250./16/1024 - width of one ADC channel in GeV
- fADCpedestalEC = 0.0 ; // GeV
- fNADCEC = (Int_t) TMath::Power(2,16) ; // number of channels in Tower ADC - 65536
+ fADCchannelEC = 0.0153; // Update 24 Apr 2007: 250./16/1024 - width of one ADC channel in GeV
+ fADCpedestalEC = 0.0 ; // GeV
+
+ fNADCEC = simParam->GetNADCEC();//(Int_t) TMath::Power(2,16) ; // number of channels in Tower ADC - 65536
+
+ AliDebug(2,Form("Mean Photon Electron %d, Noise %f, Digit Threshold %d,Time Resolution %g,NADCEC %d",
+ fMeanPhotonElectron,fPinNoise,fDigitThreshold,fTimeResolution,fNADCEC));
- fTimeThreshold = 0.001*10000000 ; // Means 1 MeV in terms of SDigits amplitude ??
+ // Not used anymore, remove?
+ // fTimeSignalLength = 1.0e-9 ;
+ // fTimeThreshold = 0.001*10000000 ; // Means 1 MeV in terms of SDigits amplitude ??
}
return ;
}
// looking for the file which contains SDigits
- AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
- TString fileName( emcalLoader->GetSDigitsFileName() ) ;
+ AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::Instance()->GetDetectorLoader("EMCAL"));
+
+ if(!emcalLoader){
+ AliFatal("Did not get the Loader");
+ }
+ else{
+ TString fileName( emcalLoader->GetSDigitsFileName() ) ;
if ( eventFolderName != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name
fileName = fileName.ReplaceAll(".root", "") + "_" + eventFolderName + ".root" ;
if ( (gSystem->AccessPathName(fileName)) ) {
delete [] fInputFileNames ;
fInputFileNames = new TString[fInput+1] ;
fInputFileNames[fInput-1] = tempo ;
-
+
tempo = fEventNames[fInput-1] ;
delete [] fEventNames ;
fEventNames = new TString[fInput+1] ;
fEventNames[fInput-1] = tempo ;
-
+
fInputFileNames[fInput] = alirunFileName ;
fEventNames[fInput] = eventFolderName ;
fInput++ ;
+
+ }// Loader exits
+
}
//__________________________________________________________________
nStreams = GetNInputStreams() ;
else
nStreams = fInput ;
+
+ AliRunLoader *rl=0;
Int_t index = 0 ;
-
- AliRunLoader *rl=0;
-
for (index = 0 ; index < nStreams ; index++) {
TString tempo(fEventNames[index]) ;
tempo += index ;
if ((rl = AliRunLoader::GetRunLoader(tempo)) == 0)
- rl = AliRunLoader::Open(fInputFileNames[index], tempo) ;
+ rl = AliRunLoader::Open(fInputFileNames[index], tempo) ;
AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(rl->GetDetectorLoader("EMCAL"));
- TString fileName( emcalLoader->GetSDigitsFileName() ) ;
- if ( fEventNames[index] != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name
- fileName = fileName.ReplaceAll(".root", "") + "_" + fEventNames[index] + ".root" ;
- printf ("Adding SDigits from %s %s\n", fInputFileNames[index].Data(), fileName.Data()) ;
+ if(emcalLoader){
+ TString fileName( emcalLoader->GetSDigitsFileName() ) ;
+ if ( fEventNames[index] != AliConfig::GetDefaultEventFolderName()) // only if not the default folder name
+ fileName = fileName.ReplaceAll(".root", "") + "_" + fEventNames[index] + ".root" ;
+ printf ("Adding SDigits from %s %s\n", fInputFileNames[index].Data(), fileName.Data()) ;
+ }//loader
}
- AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
+ AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::Instance()->GetDetectorLoader("EMCAL"));
+
+ if(emcalLoader) printf("\nWriting digits to %s", emcalLoader->GetDigitsFileName().Data()) ;
+ else printf("\nNULL LOADER");
- printf("\nWriting digits to %s", emcalLoader->GetDigitsFileName().Data()) ;
-
printf("\nWith following parameters:\n") ;
printf(" Electronics noise in EMC (fPinNoise) = %f\n", fPinNoise) ;
- printf(" Threshold in EMC (fDigitThreshold) = %f\n", fDigitThreshold) ;
+ printf(" Threshold in Tower (fDigitThreshold) = %d\n", fDigitThreshold) ;
printf("---------------------------------------------------\n") ;
}
else
{
//utility method for printing digit information
- AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
- TClonesArray * digits = emcalLoader->Digits() ;
- TClonesArray * sdigits = emcalLoader->SDigits() ;
-
- printf("\n #Digits: %d : sdigits %d ", digits->GetEntriesFast(), sdigits->GetEntriesFast()) ;
- printf("\n event %d", emcalLoader->GetRunLoader()->GetEventNumber());
-
- if(strstr(option,"all")){
- //loop over digits
- AliEMCALDigit * digit;
- printf("\nEMC digits (with primaries):\n") ;
- printf("\n Id Amplitude Time Index Nprim: Primaries list \n") ;
- Int_t index ;
- for (index = 0 ; index < digits->GetEntries() ; index++) {
- digit = dynamic_cast<AliEMCALDigit *>(digits->At(index)) ;
- printf("\n%6d %8d %6.5e %4d %2d : ",
- digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ;
- Int_t iprimary;
- for (iprimary=0; iprimary<digit->GetNprimary(); iprimary++) {
- printf("%d ",digit->GetPrimary(iprimary+1) ) ;
- }
- }
- }
- printf("\n");
+ AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::Instance()->GetDetectorLoader("EMCAL"));
+ if(emcalLoader){
+ TClonesArray * digits = emcalLoader->Digits() ;
+ TClonesArray * sdigits = emcalLoader->SDigits() ;
+
+ printf("\n #Digits: %d : sdigits %d ", digits->GetEntriesFast(), sdigits->GetEntriesFast()) ;
+ printf("\n event %d", emcalLoader->GetRunLoader()->GetEventNumber());
+
+ if(strstr(option,"all")){
+ //loop over digits
+ AliEMCALDigit * digit;
+ printf("\nEMC digits (with primaries):\n") ;
+ printf("\n Id Amplitude Time Index Nprim: Primaries list \n") ;
+ Int_t index ;
+ for (index = 0 ; index < digits->GetEntries() ; index++) {
+ digit = dynamic_cast<AliEMCALDigit *>(digits->At(index)) ;
+ if(digit){
+ printf("\n%6d %8f %6.5e %4d %2d : ",
+ digit->GetId(), digit->GetAmplitude(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ;
+ Int_t iprimary;
+ for (iprimary=0; iprimary<digit->GetNprimary(); iprimary++) {
+ printf("%d ",digit->GetPrimary(iprimary+1) ) ;
+ }
+ }// digit exists
+ }// loop
+ }
+ printf("\n");
+ }// loader exists
+ else printf("NULL LOADER, cannot print\n");
}
//__________________________________________________________________
if ((rl = AliRunLoader::GetRunLoader(tempo)))
rl->GetDetectorLoader("EMCAL")->UnloadSDigits() ;
}
- AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
- emcalLoader->UnloadDigits() ;
+ AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::Instance()->GetDetectorLoader("EMCAL"));
+ if(emcalLoader)emcalLoader->UnloadDigits() ;
+ else AliFatal("Did not get the loader");
}
//_________________________________________________________________________________________
void AliEMCALDigitizer::WriteDigits()
{
-
+
// Makes TreeD in the output file.
// Check if branch already exists:
// if yes, exit without writing: ROOT TTree does not support overwriting/updating of
// else creates branch with Digits, named "EMCAL", title "...",
// and branch "AliEMCALDigitizer", with the same title to keep all the parameters
// and names of files, from which digits are made.
-
- AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::GetRunLoader()->GetDetectorLoader("EMCAL"));
-
- const TClonesArray * digits = emcalLoader->Digits() ;
- TTree * treeD = emcalLoader->TreeD();
- if ( !treeD ) {
- emcalLoader->MakeDigitsContainer();
- treeD = emcalLoader->TreeD();
- }
-
- // -- create Digits branch
- Int_t bufferSize = 32000 ;
- TBranch * digitsBranch = 0;
- if ((digitsBranch = treeD->GetBranch("EMCAL"))) {
- digitsBranch->SetAddress(&digits);
- AliWarning("Digits Branch already exists. Not all digits will be visible");
- }
- else
- treeD->Branch("EMCAL","TClonesArray",&digits,bufferSize);
- //digitsBranch->SetTitle(fEventFolderName);
- treeD->Fill() ;
- emcalLoader->WriteDigits("OVERWRITE");
- emcalLoader->WriteDigitizer("OVERWRITE");
-
- Unload() ;
+ AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::Instance()->GetDetectorLoader("EMCAL"));
+
+ if(emcalLoader){
+ const TClonesArray * digits = emcalLoader->Digits() ;
+ TTree * treeD = emcalLoader->TreeD();
+ if ( !treeD ) {
+ emcalLoader->MakeDigitsContainer();
+ treeD = emcalLoader->TreeD();
+ }
+
+ // -- create Digits branch
+ Int_t bufferSize = 32000 ;
+ TBranch * digitsBranch = 0;
+ if ((digitsBranch = treeD->GetBranch("EMCAL"))) {
+ digitsBranch->SetAddress(&digits);
+ AliWarning("Digits Branch already exists. Not all digits will be visible");
+ }
+ else
+ treeD->Branch("EMCAL","TClonesArray",&digits,bufferSize);
+ //digitsBranch->SetTitle(fEventFolderName);
+
+ // treeD->Fill() ;
+ /*
+ emcalLoader->WriteDigits("OVERWRITE");
+ emcalLoader->WriteDigitizer("OVERWRITE");
+
+ Unload() ;
+ */
+
+ }// loader exists
+ else AliFatal("Loader not available");
+}
+//__________________________________________________________________
+void AliEMCALDigitizer::WriteDigits(TClonesArray* digits, const char* branchName)
+{
+ //
+ AliEMCALLoader *emcalLoader = dynamic_cast<AliEMCALLoader*>(AliRunLoader::Instance()->GetDetectorLoader("EMCAL"));
+ if(emcalLoader){
+
+ TTree* treeD = emcalLoader->TreeD();
+ if (!treeD)
+ {
+ emcalLoader->MakeDigitsContainer();
+ treeD = emcalLoader->TreeD();
+ }
+
+ // -- create Digits branch
+ Int_t bufferSize = 32000;
+
+ if (TBranch* triggerBranch = treeD->GetBranch(branchName))
+ {
+ triggerBranch->SetAddress(&digits);
+ }
+ else
+ {
+ treeD->Branch(branchName,"TClonesArray",&digits,bufferSize);
+ }
+
+ // treeD->Fill();
+ }// loader exists
+ else AliFatal("Loader not available");
}
//__________________________________________________________________
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff