X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=EMCAL%2FAliEMCALv1.cxx;h=5a9f82b699d1a1fbf21aa2d316e5c92e96fddaec;hp=061196cde784b7d393a69fea07def0cd1c900ed0;hb=7d74eaca1dc9e82865701c94892f5c99bcc60ae2;hpb=642f15cfce9ebda2ff71a55c5edb8d9bc0c729c4 diff --git a/EMCAL/AliEMCALv1.cxx b/EMCAL/AliEMCALv1.cxx index 061196cde78..5a9f82b699d 100644 --- a/EMCAL/AliEMCALv1.cxx +++ b/EMCAL/AliEMCALv1.cxx @@ -16,13 +16,12 @@ /* $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. @@ -31,30 +30,17 @@ // 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" ClassImp(AliEMCALv1) @@ -71,7 +57,7 @@ AliEMCALv1::AliEMCALv1(const char *name, const char *title): // Standard Creator. fHits= new TClonesArray("AliEMCALHit",1000); - gAlice->AddHitList(fHits); + gAlice->GetMCApp()->AddHitList(fHits); fNhits = 0; fIshunt = 2; // All hits are associated with particles entering the calorimeter @@ -91,7 +77,7 @@ 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 tower section (PRE, ECAL, HCAL) + // An EMCAL hit is the sum of all hits in a tower section // originating from the same entering particle Int_t hitCounter; @@ -100,7 +86,7 @@ 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 @@ -109,9 +95,9 @@ void AliEMCALv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t ipa if( *curHit == *newHit ) { *curHit = *curHit + *newHit; deja = kTRUE; - } // end if + } // end if } // end for hitCounter - + if ( !deja ) { new((*fHits)[fNhits]) AliEMCALHit(*newHit); fNhits++; @@ -121,16 +107,15 @@ 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 + // Accumulates hits as long as the track stays in a tower - Int_t id[2]; // (layer, phi, Eta) indices + 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->GetCurrentTrackNumber(); + Int_t tracknumber = gAlice->GetMCApp()->GetCurrentTrackNumber(); Int_t primary = 0; static Int_t iparent = 0; static Float_t ienergy = 0; @@ -152,7 +137,7 @@ void AliEMCALv1::StepManager(void){ Int_t parent = iparent ; while ( parent != -1 ) { // <------------- flags this particle to be kept and //all the ancestors of this particle - part = gAlice->Particle(parent) ; + part = gAlice->GetMCApp()->Particle(parent) ; part->SetBit(kKeepBit); parent = part->GetFirstMother() ; } @@ -164,6 +149,9 @@ void AliEMCALv1::StepManager(void){ 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]; @@ -181,27 +169,21 @@ void AliEMCALv1::StepManager(void){ 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 ; - if (layer <= geom->GetNPRLayers() ) - absid += geom->GetNZ() * geom->GetNPhi() ; - else if (layer > geom->GetNECLayers() ) - absid += 2 * geom->GetNZ() * geom->GetNPhi() ; - else { - Int_t nlayers = geom->GetNPRLayers()+ geom->GetNECLayers()+ geom->GetNHCLayers() ; - if (layer > nlayers) - Fatal("StepManager", "Wrong calculation of layer number: layer = %d > %d\n", layer, nlayers) ; - } + 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->GetPrimary(tracknumber); + primary = gAlice->GetMCApp()->GetPrimary(tracknumber); if (gDebug == 2) - Info("StepManager", "id0 = %d, id1 = %d, absid = %d tower = %d layer = %d energy = %f\n", id[0], id[1], absid, tower, layer, xyzte[4]) ; + 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); + AddHit(fIshunt, primary,tracknumber, iparent, ienergy, absid, xyzte, pmom); } // there is deposited energy } }