Corrected UInt_t <-> Int_t conversion

[u/mrichter/AliRoot.git] / TPC / AliTPCParam.cxx

diff --git a/TPC/AliTPCParam.cxx b/TPC/AliTPCParam.cxx
index c7e055574b077a8e0d4d195d6a20c751cbace7c6..7835205c877c843f864c6761051c8806845b5248 100644 (file)
--- a/TPC/AliTPCParam.cxx
+++ b/TPC/AliTPCParam.cxx
@@ -624,6 +624,11 @@ Bool_t AliTPCParam::ReadGeoMatrices(){
   fClusterMatrix = new TGeoHMatrix*[fNSector];
   if (fGlobalMatrix) delete [] fGlobalMatrix;
   fGlobalMatrix = new TGeoHMatrix*[fNSector];
+  for (Int_t isec=0; isec<fNSector; isec++) {
+    fGlobalMatrix[isec] = 0;
+    fClusterMatrix[isec]= 0;
+    fTrackingMatrix[isec]=0;
+  }   
   //
   for (Int_t isec=0; isec<fNSector; isec++) {
     fGlobalMatrix[isec] = 0;
@@ -642,13 +647,19 @@ Bool_t AliTPCParam::ReadGeoMatrices(){
     }
 
     UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
-    const char *symname = AliGeomManager::SymName(volid);
-    TGeoPNEntry* pne = gGeoManager->GetAlignableEntry(symname);
-    const char *path = symname;
-    if(pne) path=pne->GetTitle();
-    if (!gGeoManager->cd(path)) return kFALSE;      
+    TGeoPNEntry* pne = gGeoManager->GetAlignableEntryByUID(volid);
+    if(!pne)
+    {
+      AliError(Form("Alignable entry for volume ID %d not in geometry. Exiting!",volid));
+      return kFALSE;
+    }
+    const char *path = pne->GetTitle();
+    if (!gGeoManager->cd(path)) return kFALSE;
     TGeoHMatrix *m = gGeoManager->GetCurrentMatrix();
- 
+    // Since GEANT4 does not allow reflections, in this case the reflection
+    // component if the matrix is embedded by TGeo inside TGeoScaledShape
+    if (gGeoManager->GetCurrentVolume()->GetShape()->IsReflected()) 
+       m->ReflectZ(kFALSE, kTRUE);
     //
     TGeoRotation mchange; 
     mchange.RotateY(90); mchange.RotateX(90);