X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTriggerCircuit.cxx;h=767dfc3909aa2341e261c069ca257b00200db61f;hb=46559989c90689617af6db51f34d5df74d2ee12f;hp=fd0e4f9d3849c346b7d58a966b3fb056e7f897a1;hpb=30178c30974cdd6a3b59f09e4d479925642e175b;p=u%2Fmrichter%2FAliRoot.git diff --git a/MUON/AliMUONTriggerCircuit.cxx b/MUON/AliMUONTriggerCircuit.cxx index fd0e4f9d384..767dfc3909a 100644 --- a/MUON/AliMUONTriggerCircuit.cxx +++ b/MUON/AliMUONTriggerCircuit.cxx @@ -23,6 +23,8 @@ #include "AliMUONTriggerConstants.h" #include "AliSegmentation.h" #include "AliMUONChamber.h" +#include "AliMUONConstants.h" +#include "AliLog.h" ClassImp(AliMUONTriggerCircuit) @@ -54,7 +56,7 @@ AliMUONTriggerCircuit::AliMUONTriggerCircuit(const AliMUONTriggerCircuit& theMUO { // Protected copy constructor - Fatal("AliMUONTriggerCircuit", "Not implemented."); + AliFatal("Not implemented."); } //---------------------------------------------------------------------- @@ -65,7 +67,7 @@ AliMUONTriggerCircuit::operator=(const AliMUONTriggerCircuit& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -384,7 +386,9 @@ Float_t AliMUONTriggerCircuit::PtCal(Int_t istripX, Int_t idev, Int_t istripY){ Float_t yPosX2=fYpos21[istripX2]; Float_t xPosY1=fXpos11[istripY]; - Float_t zf=975., z1=1603.5, z2=1703.5; + Float_t zf=975.; + Float_t z1=AliMUONConstants::DefaultChamberZ(10); + Float_t z2=AliMUONConstants::DefaultChamberZ(12); Float_t thetaDev=(1./zf)*(yPosX1*z2-yPosX2*z1)/(z2-z1); Float_t xf=xPosY1*zf/z1; Float_t yf=yPosX2-((yPosX2-yPosX1)*(z2-zf))/(z2-z1);