X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALEMCGeometry.cxx;h=640a48d18770d48da2ece087e91246b68e5a8655;hb=f09766dd4fbf7947bf2e32b683b8aca78c47300d;hp=4d8d58019ccc1d49dd645681be2d1d0c89a238d2;hpb=d7f5c01abab6ee176e95376d6a4f687d6ca2fde7;p=u%2Fmrichter%2FAliRoot.git diff --git a/EMCAL/AliEMCALEMCGeometry.cxx b/EMCAL/AliEMCALEMCGeometry.cxx index 4d8d58019cc..640a48d1877 100644 --- a/EMCAL/AliEMCALEMCGeometry.cxx +++ b/EMCAL/AliEMCALEMCGeometry.cxx @@ -370,7 +370,8 @@ void AliEMCALEMCGeometry::Init(const Text_t* mcname, const Text_t* mctitle){ fNCellsInModule = fNPHIdiv*fNETAdiv; fNCellsInSupMod = fNCellsInModule*fNPhi*fNZ; fNCells = fNCellsInSupMod*fNumberOfSuperModules; - if(GetKey110DEG()) fNCells -= fNCellsInSupMod; + if(GetKey110DEG() && !fGeoName.Contains("12SMV1")) fNCells -= fNCellsInSupMod; // SM 10 and 11 are 1/2 size on phi + if(GetKey110DEG() && fGeoName.Contains("12SMV1") ) fNCells -=2*(2 * fNCellsInSupMod / 3); // SM 10 and 11 are 1/3 size on phi fNPhiSuperModule = fNumberOfSuperModules/2; if(fNPhiSuperModule < 1) fNPhiSuperModule = 1; @@ -416,8 +417,8 @@ void AliEMCALEMCGeometry::Init(const Text_t* mcname, const Text_t* mctitle){ } } if(fNumberOfSuperModules > 10) { - fPhiBoundariesOfSM[11] = 190.*TMath::DegToRad(); - fPhiBoundariesOfSM[10] = fPhiBoundariesOfSM[11] - TMath::ATan2((fParSM[1]) , fIPDistance); + fPhiBoundariesOfSM[10] = fPhiBoundariesOfSM[0] + 20.*TMath::DegToRad()*5; // in the ideal case the phi-gap is constant + fPhiBoundariesOfSM[11] = fPhiBoundariesOfSM[10] + 2.*TMath::ATan2((fParSM[1])/3., fIPDistance); // one_third SMs fPhiCentersOfSM[5] = (fPhiBoundariesOfSM[10]+fPhiBoundariesOfSM[11])/2.; } @@ -475,7 +476,8 @@ void AliEMCALEMCGeometry::PrintGeometry() fParSM[0],fParSM[1],fParSM[2]); printf(" fPhiGapForSM %7.4f cm (%7.4f <- phi size in degree)\n", fPhiGapForSM, TMath::ATan2(fPhiGapForSM,fIPDistance)*TMath::RadToDeg()); - if(GetKey110DEG()) printf(" Last two modules have size 10 degree in phi (180 %7.5f(%7.2f) : center %7.5f(%7.2f) \n", i,