X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONResponseTrigger.cxx;h=d1a8e1a45133c6551bacc9e318aa0d855f90af2c;hb=6a62da73fb1ac261f88e15bf2ed2f5172012ad8b;hp=5f055b4ea56f224f2c6cb724771dab88b4c54863;hpb=a572c9f400d89c760da5d72ec106645d174d13c0;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONResponseTrigger.cxx b/MUON/AliMUONResponseTrigger.cxx index 5f055b4ea56..d1a8e1a4513 100644 --- a/MUON/AliMUONResponseTrigger.cxx +++ b/MUON/AliMUONResponseTrigger.cxx @@ -30,8 +30,6 @@ #include "AliMUONGeometryTransformer.h" #include "AliMUONHit.h" #include "AliMUONConstants.h" -#include "AliMUONTriggerEfficiencyCells.h" -#include "AliMUONTriggerChamberEfficiency.h" #include "AliMpPad.h" #include "AliMpCathodType.h" @@ -70,8 +68,7 @@ namespace //------------------------------------------------------------------ AliMUONResponseTrigger::AliMUONResponseTrigger() - : AliMUONResponse(), - fTriggerEfficiency(0x0) + : AliMUONResponse() { /// Default constructor } @@ -105,8 +102,8 @@ AliMUONResponseTrigger::DisIntegrate(const AliMUONHit& hit, TList& digits, Float { twentyNano=1; } - - Bool_t isTrig[2]={kTRUE,kTRUE}; + + Int_t nboard=0; for ( Int_t cath = AliMp::kCath0; cath <= AliMp::kCath1; ++cath ) { @@ -129,7 +126,10 @@ AliMUONResponseTrigger::DisIntegrate(const AliMUONHit& hit, TList& digits, Float xhit,yhit,x,y,z,ix,iy)); continue; } - AliMUONDigit* d = new AliMUONDigit(detElemId,pad.GetLocalBoardId(0), + + if ( cath == AliMp::kCath0 ) nboard = pad.GetLocalBoardId(0); + + AliMUONDigit* d = new AliMUONDigit(detElemId,nboard, pad.GetLocalBoardChannel(0),cath); d->SetPadXY(ix,iy); @@ -137,36 +137,7 @@ AliMUONResponseTrigger::DisIntegrate(const AliMUONHit& hit, TList& digits, Float //this is not currently supported by the digit class. Change that or not ? d->SetCharge(twentyNano); - if(fTriggerEfficiency){ - if(cath==0){ - Int_t nboard = pad.GetLocalBoardId(0); - fTriggerEfficiency->IsTriggered(detElemId, nboard, - isTrig[0], isTrig[1]); - } - if(!isTrig[cath]) continue; - } digits.Add(d); } - -} - - -//_____________________________________________________________________________ -void -AliMUONResponseTrigger::InitTriggerEfficiency(AliMUONTriggerEfficiencyCells *triggerEfficiency) -{ -/// Initialize trigger chamber efficiency (on demand) - - if ( triggerEfficiency ) - { - AliDebug(1, "Will apply trigger efficiency"); - } - else - { - AliFatal("I was requested to apply trigger efficiency, but I could " - "not get it !"); - } - fTriggerEfficiency = new AliMUONTriggerChamberEfficiency(triggerEfficiency); - }