X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=PHOS%2FAliPHOSv1.cxx;h=d4f8de8f63392e4dbc80995843155ec2332d123e;hb=362c9d61708912a81d77cb017e1d05fd1f9486a6;hp=bee94555dc3e5a66e64c90ffe49d983f6da04e85;hpb=15dfd8929cc449f4c0d849259583856bdec09007;p=u%2Fmrichter%2FAliRoot.git diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx index bee94555dc3..d4f8de8f633 100644 --- a/PHOS/AliPHOSv1.cxx +++ b/PHOS/AliPHOSv1.cxx @@ -15,46 +15,36 @@ /* $Id$ */ +/* History of cvs commits: + * + * $Log$ + */ + //_________________________________________________________________________ // Implementation version v1 of PHOS Manager class //--- -// Layout EMC + PPSD has name GPS2: -// Produces cumulated hits //--- // Layout EMC + CPV has name IHEP: // Produces hits for CPV, cumulated hits //--- -// Layout EMC + CPV + PPSD has name GPS: -// Produces hits for CPV, cumulated hits //--- //*-- Author: Yves Schutz (SUBATECH) // --- ROOT system --- - -#include "TBRIK.h" -#include "TNode.h" -#include "TRandom.h" -#include "TTree.h" -#include "TParticle.h" +#include +#include // --- Standard library --- -#include -#include // --- AliRoot header files --- - -#include "AliPHOSv1.h" -#include "AliPHOSHit.h" #include "AliPHOSCPVDigit.h" +#include "AliPHOSGeometry.h" +#include "AliPHOSHit.h" +#include "AliPHOSv1.h" #include "AliRun.h" -#include "AliConst.h" #include "AliMC.h" -#include "AliPHOSGeometry.h" -#include "AliPHOSQAIntCheckable.h" -#include "AliPHOSQAFloatCheckable.h" -#include "AliPHOSQAMeanChecker.h" ClassImp(AliPHOSv1) @@ -62,11 +52,6 @@ ClassImp(AliPHOSv1) AliPHOSv1::AliPHOSv1(): AliPHOSv0() { - // default ctor: initialze data memebers - fQAHitsMul = 0 ; - fQAHitsMulB = 0 ; - fQATotEner = 0 ; - fQATotEnerB = 0 ; fLightYieldMean = 0. ; fIntrinsicPINEfficiency = 0. ; @@ -98,7 +83,7 @@ AliPHOSv1::AliPHOSv1(const char *name, const char *title): // and the TreeD at the end of the event (branch is set in FinishEvent() ). fHits= new TClonesArray("AliPHOSHit",1000) ; - gAlice->AddHitList(fHits) ; + gAlice->GetMCApp()->AddHitList(fHits) ; fNhits = 0 ; @@ -122,67 +107,38 @@ AliPHOSv1::AliPHOSv1(const char *name, const char *title): fElectronsPerGeV = 2.77e+8 ; fAPDGain = 300. ; fLightFactor = fLightYieldMean * fIntrinsicPINEfficiency ; - fAPDFactor = (fRecalibrationFactor/100.) * fAPDGain ; - - - Int_t nb = GetGeometry()->GetNModules() ; - - // create checkables - fQAHitsMul = new AliPHOSQAIntCheckable("HitsM") ; - fQATotEner = new AliPHOSQAFloatCheckable("TotEn") ; - fQAHitsMulB = new TClonesArray("AliPHOSQAIntCheckable",nb) ; - fQAHitsMulB->SetOwner() ; - fQATotEnerB = new TClonesArray("AliPHOSQAFloatCheckable", nb); - fQATotEnerB->SetOwner() ; - char tempo[20] ; - Int_t i ; - for ( i = 0 ; i < nb ; i++ ) { - sprintf(tempo, "HitsMB%d", i+1) ; - new( (*fQAHitsMulB)[i]) AliPHOSQAIntCheckable(tempo) ; - sprintf(tempo, "TotEnB%d", i+1) ; - new( (*fQATotEnerB)[i] ) AliPHOSQAFloatCheckable(tempo) ; - } - - AliPHOSQAMeanChecker * hmc = new AliPHOSQAMeanChecker("HitsMul", 100. ,25.) ; - AliPHOSQAMeanChecker * emc = new AliPHOSQAMeanChecker("TotEner", 10. ,5.) ; - AliPHOSQAMeanChecker * bhmc = new AliPHOSQAMeanChecker("HitsMulB", 100. ,5.) ; - AliPHOSQAMeanChecker * bemc = new AliPHOSQAMeanChecker("TotEnerB", 2. ,.5) ; - - // associate checkables and checkers - fQAHitsMul->AddChecker(hmc) ; - fQATotEner->AddChecker(emc) ; - for ( i = 0 ; i < nb ; i++ ) { - (static_cast((*fQAHitsMulB)[i]))->AddChecker(bhmc) ; - (static_cast((*fQATotEnerB)[i]))->AddChecker(bemc) ; - } - + fAPDFactor = (fRecalibrationFactor/100.) * fAPDGain ; } //____________________________________________________________________________ AliPHOSv1::~AliPHOSv1() { // dtor - - if ( fHits) { + if ( fHits) { fHits->Delete() ; delete fHits ; fHits = 0 ; - } - - if ( fQAHitsMulB ) { - fQAHitsMulB->Delete() ; - delete fQAHitsMulB ; - } + } +} - if ( fQATotEnerB ) { - fQATotEnerB->Delete() ; - delete fQATotEnerB ; - } - +//____________________________________________________________________________ +void AliPHOSv1::Copy(TObject & base)const +{ + TObject::Copy(base) ; + AliPHOSv0::Copy(base) ; + AliPHOSv1 &phos = static_cast(base); + phos.fLightYieldMean = fLightYieldMean ; + phos.fIntrinsicPINEfficiency = fIntrinsicPINEfficiency ; + phos.fLightYieldAttenuation = fLightYieldAttenuation ; + phos.fRecalibrationFactor = fRecalibrationFactor ; + phos.fElectronsPerGeV = fElectronsPerGeV ; + phos.fAPDGain = fAPDGain ; + phos.fLightFactor = fLightFactor ; + phos.fAPDFactor = fAPDFactor ; } //____________________________________________________________________________ -void AliPHOSv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t Id, Float_t * hits) +void AliPHOSv1::AddHit(Int_t shunt, Int_t primary, Int_t Id, Float_t * hits) { // Add a hit to the hit list. // A PHOS hit is the sum of all hits in a single crystal from one primary and within some time gate @@ -193,7 +149,7 @@ void AliPHOSv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t Id, Bool_t deja = kFALSE ; AliPHOSGeometry * geom = GetGeometry() ; - newHit = new AliPHOSHit(shunt, primary, tracknumber, Id, hits) ; + newHit = new AliPHOSHit(shunt, primary, Id, hits) ; for ( hitCounter = fNhits-1 ; hitCounter >= 0 && !deja ; hitCounter-- ) { curHit = dynamic_cast((*fHits)[hitCounter]) ; @@ -210,14 +166,10 @@ void AliPHOSv1::AddHit(Int_t shunt, Int_t primary, Int_t tracknumber, Int_t Id, // get the block Id number Int_t relid[4] ; geom->AbsToRelNumbering(Id, relid) ; - // and fill the relevant QA checkable (only if in PbW04) - if ( relid[1] == 0 ) { - fQAHitsMul->Update(1) ; - (static_cast((*fQAHitsMulB)[relid[0]-1]))->Update(1) ; - } + fNhits++ ; } - + delete newHit; } @@ -227,8 +179,6 @@ void AliPHOSv1::FinishPrimary() // called at the end of each track (primary) by AliRun // hits are reset for each new track // accumulate the total hit-multiplicity -// if ( fQAHitsMul ) -// fQAHitsMul->Update( fHits->GetEntriesFast() ) ; } @@ -238,38 +188,8 @@ void AliPHOSv1::FinishEvent() // called at the end of each event by AliRun // accumulate the hit-multiplicity and total energy per block // if the values have been updated check it - - if ( fQATotEner ) { - if ( fQATotEner->HasChanged() ) { - fQATotEner->CheckMe() ; - fQATotEner->Reset() ; - } - } - - Int_t i ; - if ( fQAHitsMulB && fQATotEnerB ) { - for (i = 0 ; i < GetGeometry()->GetNModules() ; i++) { - AliPHOSQAIntCheckable * ci = static_cast((*fQAHitsMulB)[i]) ; - AliPHOSQAFloatCheckable* cf = static_cast((*fQATotEnerB)[i]) ; - if ( ci->HasChanged() ) { - ci->CheckMe() ; - ci->Reset() ; - } - if ( cf->HasChanged() ) { - cf->CheckMe() ; - cf->Reset() ; - } - } - } - // check the total multiplicity - - if ( fQAHitsMul ) { - if ( fQAHitsMul->HasChanged() ) { - fQAHitsMul->CheckMe() ; - fQAHitsMul->Reset() ; - } - } + AliDetector::FinishEvent(); } //____________________________________________________________________________ void AliPHOSv1::StepManager(void) @@ -282,13 +202,12 @@ void AliPHOSv1::StepManager(void) TLorentzVector pos ; // Lorentz vector of the track current position Int_t copy ; - Int_t tracknumber = gAlice->CurrentTrack() ; - Int_t primary = gAlice->GetPrimary( gAlice->CurrentTrack() ); TString name = GetGeometry()->GetName() ; Int_t moduleNumber ; - if( gMC->CurrentVolID(copy) == gMC->VolId("PCPQ") && + static Int_t idPCPQ = gMC->VolId("PCPQ"); + if( gMC->CurrentVolID(copy) == idPCPQ && (gMC->IsTrackEntering() ) && gMC->TrackCharge() != 0) { @@ -323,7 +242,7 @@ void AliPHOSv1::StepManager(void) moduleNumber--; TClonesArray *cpvDigits = new TClonesArray("AliPHOSCPVDigit",0); // array of digits for current hit - CPVDigitize(pmom,xyd,moduleNumber,cpvDigits); + CPVDigitize(pmom,xyd,cpvDigits); Float_t xmean = 0; Float_t zmean = 0; @@ -367,8 +286,9 @@ void AliPHOSv1::StepManager(void) xyzte[3] = gMC->TrackTime() ; xyzte[4] = cpvDigit->GetQpad() ; // amplitude in a pad - primary = -1; // No need in primary for CPV - AddHit(fIshunt, primary, tracknumber, absid, xyzte); + + Int_t primary = gAlice->GetMCApp()->GetPrimary( gAlice->GetMCApp()->GetCurrentTrackNumber() ); + AddHit(fIshunt, primary, absid, xyzte); if (cpvDigit->GetQpad() > 0.02) { xmean += cpvDigit->GetQpad() * (cpvDigit->GetXpad() + 0.5); @@ -384,8 +304,8 @@ void AliPHOSv1::StepManager(void) } - - if(gMC->CurrentVolID(copy) == gMC->VolId("PXTL") ) { // We are inside a PBWO crystal + static Int_t idPXTL = gMC->VolId("PXTL"); + if(gMC->CurrentVolID(copy) == idPXTL ) { // We are inside a PBWO crystal gMC->TrackPosition(pos) ; xyzte[0] = pos[0] ; @@ -402,14 +322,22 @@ void AliPHOSv1::StepManager(void) if ( gMC->IsTrackEntering() ){ Float_t xyzd[3] ; gMC -> Gmtod (xyzte, xyzd, 1); // transform coordinate from master to daughter system - if (xyzd[1] > GetGeometry()->GetCrystalSize(1)/2-0.002 || - xyzd[1] < -GetGeometry()->GetCrystalSize(1)/2+0.002) { - TParticle * part = 0 ; - Int_t parent = gAlice->CurrentTrack() ; - while ( parent != -1 ) { - part = gAlice->Particle(parent) ; + if (xyzd[1] < -GetGeometry()->GetCrystalSize(1)/2.+0.1){ //Entered close to forward surface + Int_t parent = gAlice->GetMCApp()->GetCurrentTrackNumber() ; + TParticle * part = gAlice->GetMCApp()->Particle(parent) ; + Float_t vert[3],vertd[3] ; + vert[0]=part->Vx() ; + vert[1]=part->Vy() ; + vert[2]=part->Vz() ; + gMC -> Gmtod (vert, vertd, 1); // transform coordinate from master to daughter system + if(vertd[1]<-GetGeometry()->GetCrystalSize(1)/2.-0.1){ //Particle is created in foront of PHOS + //0.1 to get rid of numerical errors part->SetBit(kKeepBit); - parent = part->GetFirstMother() ; + while ( parent != -1 ) { + part = gAlice->GetMCApp()->Particle(parent) ; + part->SetBit(kKeepBit); + parent = part->GetFirstMother() ; + } } } } @@ -441,21 +369,38 @@ void AliPHOSv1::StepManager(void) //Calculates de energy deposited in the crystal xyzte[4] = fAPDFactor * lightYield ; - // add current hit to the hit list - // Info("StepManager","%d %d", primary, tracknumber) ; - AddHit(fIshunt, primary,tracknumber, absid, xyzte); + Int_t primary ; + if(fIshunt == 2){ + primary = gAlice->GetMCApp()->GetCurrentTrackNumber() ; + TParticle * part = gAlice->GetMCApp()->Particle(primary) ; + while ( !part->TestBit(kKeepBit) ) { + primary = part->GetFirstMother() ; + if(primary == -1){ + primary = gAlice->GetMCApp()->GetPrimary( gAlice->GetMCApp()->GetCurrentTrackNumber() ); + break ; //there is a possibility that particle passed e.g. thermal isulator and hits a side + //surface of the crystal. In this case it may have no primary at all. + //We can not easily separate this case from the case when this is part of the shower, + //developed in the neighboring crystal. + } + part = gAlice->GetMCApp()->Particle(primary) ; + } + } + else + primary = gAlice->GetMCApp()->GetPrimary( gAlice->GetMCApp()->GetCurrentTrackNumber() ); + - // fill the relevant QA Checkables - fQATotEner->Update( xyzte[4] ) ; // total energy in PHOS - (static_cast((*fQATotEnerB)[moduleNumber-1]))->Update( xyzte[4] ) ; // energy in this block + // add current hit to the hit list + // Info("StepManager","%d %d", primary, tracknumber) ; + AddHit(fIshunt, primary, absid, xyzte); + } // there is deposited energy } // we are inside a PHOS Xtal } //____________________________________________________________________________ -void AliPHOSv1::CPVDigitize (TLorentzVector p, Float_t *zxhit, Int_t moduleNumber, TClonesArray *cpvDigits) +void AliPHOSv1::CPVDigitize (TLorentzVector p, Float_t *zxhit, TClonesArray *cpvDigits) { // ------------------------------------------------------------------------ // Digitize one CPV hit: