X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALv1.cxx;h=5a9f82b699d1a1fbf21aa2d316e5c92e96fddaec;hb=b7de6a56f05969bebd8e46e06892305973f5701e;hp=64169c4f81bdb4bd7beac36f09f5c028e62fc332;hpb=ffa6d63bef8d3ba10bb8d254a05d7db3cea6f9a1;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALv1.cxx b/EMCAL/AliEMCALv1.cxx index 64169c4f81b..5a9f82b699d 100644 --- a/EMCAL/AliEMCALv1.cxx +++ b/EMCAL/AliEMCALv1.cxx @@ -16,37 +16,29 @@ /* $Id$ */ //_________________________________________________________________________ -// Implementation version v1 of EMCAL Manager class -// An object of this class does not produce digits -// It is the one to use if you do want to produce outputs in TREEH -// +//*-- Implementation version v1 of EMCAL Manager class +//*-- An object of this class does not produce digits +//*-- It is the one to use if you do want to produce outputs in TREEH +//*-- //*-- Author: Sahal Yacoob (LBL /UCT) //*-- : Jennifer Klay (LBL) +// This Class not stores information on all particles prior to EMCAL entry - in order to facilitate analysis. +// This is done by setting fIShunt =2, and flagging all parents of particles entering the EMCAL. +// 15/02/2002 .... Yves Schutz +// 1. fSamplingFraction and fLayerToPreshowerRatio have been removed +// 2. Timing signal is collected and added to hit // --- ROOT system --- -#include "TPGON.h" -#include "TTUBS.h" -#include "TNode.h" -#include "TRandom.h" -#include "TTree.h" -#include "TGeometry.h" - +#include "TParticle.h" +#include "TVirtualMC.h" // --- Standard library --- -#include -#include -#include -#include -#include -#include // --- AliRoot header files --- - #include "AliEMCALv1.h" #include "AliEMCALHit.h" #include "AliEMCALGeometry.h" -#include "AliConst.h" #include "AliRun.h" #include "AliMC.h" @@ -56,19 +48,21 @@ ClassImp(AliEMCALv1) //______________________________________________________________________ AliEMCALv1::AliEMCALv1():AliEMCALv0(){ // ctor + } + //______________________________________________________________________ AliEMCALv1::AliEMCALv1(const char *name, const char *title): AliEMCALv0(name,title){ // Standard Creator. fHits= new TClonesArray("AliEMCALHit",1000); - gAlice->AddHitList(fHits); + gAlice->GetMCApp()->AddHitList(fHits); fNhits = 0; - fSamplingFraction = 12.9 ; - fIshunt = 1; // All hits are associated with primary particles + fIshunt = 2; // All hits are associated with particles entering the calorimeter } + //______________________________________________________________________ AliEMCALv1::~AliEMCALv1(){ // dtor @@ -83,8 +77,8 @@ AliEMCALv1::~AliEMCALv1(){ void AliEMCALv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t iparent, Float_t ienergy, Int_t id, Float_t * hits,Float_t * p){ // Add a hit to the hit list. - // An EMCAL hit is the sum of all hits in a single segment - // originating from the same enterring particle + // An EMCAL hit is the sum of all hits in a tower section + // originating from the same entering particle Int_t hitCounter; AliEMCALHit *newHit; @@ -92,17 +86,18 @@ void AliEMCALv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t ipa Bool_t deja = kFALSE; newHit = new AliEMCALHit(shunt, primary, tracknumber, iparent, ienergy, id, hits, p); - for ( hitCounter = fNhits-1; hitCounter >= 0 && !deja; hitCounter-- ) { + for ( hitCounter = fNhits-1; hitCounter >= 0 && !deja; hitCounter-- ) { curHit = (AliEMCALHit*) (*fHits)[hitCounter]; // We add hits with the same tracknumber, while GEANT treats // primaries succesively - if(curHit->GetPrimary() != primary) break; + if(curHit->GetPrimary() != primary) + break; if( *curHit == *newHit ) { *curHit = *curHit + *newHit; deja = kTRUE; - } // end if + } // end if } // end for hitCounter - + if ( !deja ) { new((*fHits)[fNhits]) AliEMCALHit(*newHit); fNhits++; @@ -112,49 +107,83 @@ void AliEMCALv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t ipa } //______________________________________________________________________ void AliEMCALv1::StepManager(void){ - // Accumulates hits as long as the track stays in a single - // crystal or PPSD gas Cell - Int_t id[2]; // (layer, phi, Eta) indices - Int_t absid; - // position wrt MRS and energy deposited - Float_t xyze[4]={0.,0.,0.,0.}; - Float_t pmom[4]={0.,0.,0.,0.}; - TLorentzVector pos; // Lorentz vector of the track current position. - TLorentzVector mom; // Lorentz vector of the track current momentum. - Int_t tracknumber = gAlice->CurrentTrack(); - Int_t primary = 0; - static Int_t iparent = 0; - static Float_t ienergy = 0; - Int_t copy = 0; - - - if(gMC->IsTrackEntering() && (strcmp(gMC->CurrentVolName(),"XALU") == 0)) // This Particle in enterring the Calorimeter - { - iparent = tracknumber; - gMC->TrackMomentum(mom); - ienergy = mom[3]; -} - if(gMC->CurrentVolID(copy) == gMC->VolId("XPHI") ) { // We are in a Scintillator Layer - - gMC->CurrentVolOffID(1, id[0]); // get the POLY copy number; - gMC->CurrentVolID(id[1]); // get the phi number inside the layer - primary = gAlice->GetPrimary(tracknumber); - gMC->TrackPosition(pos); - gMC->TrackMomentum(mom); - xyze[0] = pos[0]; - xyze[1] = pos[1]; - xyze[2] = pos[2]; - xyze[3] = fSamplingFraction*(gMC->Edep()); // Correct for sampling calorimeter - pmom[0] = mom[0]; - pmom[1] = mom[1]; - pmom[2] = mom[2]; - pmom[3] = mom[3]; + // Accumulates hits as long as the track stays in a tower + + Int_t id[2]; // (phi, Eta) indices + // position wrt MRS and energy deposited + Float_t xyzte[5]={0.,0.,0.,0.,0.};// position wrt MRS, time and energy deposited + Float_t pmom[4]={0.,0.,0.,0.}; + TLorentzVector pos; // Lorentz vector of the track current position. + TLorentzVector mom; // Lorentz vector of the track current momentum. + Int_t tracknumber = gAlice->GetMCApp()->GetCurrentTrackNumber(); + Int_t primary = 0; + static Int_t iparent = 0; + static Float_t ienergy = 0; + Int_t copy = 0; + + AliEMCALGeometry * geom = GetGeometry() ; + + if(gMC->IsTrackEntering() && (strcmp(gMC->CurrentVolName(),"XALU") == 0)){ // This Particle in enterring the Calorimeter + gMC->TrackPosition(pos) ; + xyzte[0] = pos[0] ; + xyzte[1] = pos[1] ; + xyzte[2] = pos[2] ; + if ( (xyzte[0]*xyzte[0] + xyzte[1]*xyzte[1]) + < (geom->GetEnvelop(0)+geom->GetGap2Active()+1.5 )*(geom->GetEnvelop(0)+geom->GetGap2Active()+1.5 ) ) { + iparent = tracknumber; + gMC->TrackMomentum(mom); + ienergy = mom[3]; + TParticle * part = 0 ; + Int_t parent = iparent ; + while ( parent != -1 ) { // <------------- flags this particle to be kept and + //all the ancestors of this particle + part = gAlice->GetMCApp()->Particle(parent) ; + part->SetBit(kKeepBit); + parent = part->GetFirstMother() ; + } + } + } + if(gMC->CurrentVolID(copy) == gMC->VolId("XPHI") ) { // We are in a Scintillator Layer - if(xyze[3] > 0.){// Track is inside the crystal and deposits some energy - absid = (id[0]-1)*(fGeom->GetNPhi()) + id[1]; - if((absid/fGeom->GetNPhi()) < (2*fGeom->GetNZ())) - {xyze[3] = 5*xyze[3]/6 ;} // Preshower readout must be scaled - AddHit(fIshunt, primary,tracknumber, iparent, ienergy, absid, xyze, pmom); + Float_t depositedEnergy ; + + if( (depositedEnergy = gMC->Edep()) > 0.){// Track is inside a scintillator and deposits some energy + + // use sampling fraction to get original energy --HG + depositedEnergy = depositedEnergy * geom->GetSampling(); + + gMC->TrackPosition(pos); + xyzte[0] = pos[0]; + xyzte[1] = pos[1]; + xyzte[2] = pos[2]; + xyzte[3] = gMC->TrackTime() ; + + gMC->TrackMomentum(mom); + pmom[0] = mom[0]; + pmom[1] = mom[1]; + pmom[2] = mom[2]; + pmom[3] = mom[3]; + + gMC->CurrentVolOffID(1, id[0]); // get the POLY copy number; + gMC->CurrentVolID(id[1]); // get the phi number inside the layer + + Int_t tower = (id[0]-1) % geom->GetNZ() + 1 + (id[1] - 1) * geom->GetNZ() ; + Int_t layer = static_cast((id[0]-1)/(geom->GetNZ())) + 1 ; + Int_t absid = tower; + Int_t nlayers = geom->GetNECLayers(); + if ((layer > nlayers)||(layer<1)) + Fatal("StepManager", "Wrong calculation of layer number: layer = %d > %d\n", layer, nlayers) ; + + + Float_t lightYield = depositedEnergy ; + xyzte[4] = lightYield ; + + primary = gAlice->GetMCApp()->GetPrimary(tracknumber); + + if (gDebug == 2) + printf("StepManager: id0 = %d, id1 = %d, absid = %d tower = %d layer = %d energy = %f\n", id[0], id[1], absid, tower, layer, xyzte[4]) ; + + AddHit(fIshunt, primary,tracknumber, iparent, ienergy, absid, xyzte, pmom); } // there is deposited energy -} + } }