skim task first usable version

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

diff --git a/TPC/AliTPCParam.cxx b/TPC/AliTPCParam.cxx
index e3e242cb18763cf2c8ad61019cc1327e1c4d3cd1..7835205c877c843f864c6761051c8806845b5248 100644 (file)
--- a/TPC/AliTPCParam.cxx
+++ b/TPC/AliTPCParam.cxx
@@ -33,7 +33,7 @@
 #include <TGeoManager.h>
 #include <TGeoPhysicalNode.h>
 #include "AliAlignObj.h"
-#include "AliAlignObjAngles.h"
+#include "AliAlignObjParams.h"
 #include "AliLog.h"
 
 ClassImp(AliTPCParam)
@@ -196,7 +196,8 @@ Int_t  AliTPCParam::Transform0to1(Float_t *xyz, Int_t * index)  const
       if (xyz[2]<0)    sector+=(fNOuterSector>>1);            
     }
     else   
-      if (xyz[2]<0) sector+=(fNInnerSector>>1);    
+      if (xyz[2]<0) sector+=(fNInnerSector>>1);  
+  if (sector<0 || sector>=fNSector) AliError(Form("Wrong sector %d",sector));
   index[1]=sector; // calculated sector number
   index[0]=1; // indicates system after transformation
   return sector;
@@ -595,8 +596,8 @@ Bool_t AliTPCParam::Update()
   //
   //response data
   //
-  if (fResponseBin==0) delete [] fResponseBin;
-  if (fResponseWeight==0) delete [] fResponseBin;
+  if (fResponseBin) delete [] fResponseBin;
+  if (fResponseWeight) delete [] fResponseWeight;
   fResponseBin    = new Int_t[3*fNResponseMax];
   fResponseWeight = new Float_t[fNResponseMax];
 
@@ -615,7 +616,7 @@ Bool_t AliTPCParam::ReadGeoMatrices(){
   if (!gGeoManager){
     AliFatal("Geo manager not initialized\n");
   }
-  AliAlignObjAngles o;
+  AliAlignObjParams o;
   //
   if (fTrackingMatrix) delete [] fTrackingMatrix;
   fTrackingMatrix = new TGeoHMatrix*[fNSector];
@@ -623,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;
@@ -641,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);
@@ -804,7 +816,7 @@ Float_t AliTPCParam::GetChamberCenter(Int_t isec, Float_t * center) const
     if (center){
       center[0] = kROCcenterIn;
       center[1] = 0; 
-      center[2] = -5.51; 
+      center[2] = -5.51-0.08; 
     }
     return kROCcenterIn;
   }
@@ -812,7 +824,7 @@ Float_t AliTPCParam::GetChamberCenter(Int_t isec, Float_t * center) const
     if (center){
       center[0] = kROCcenterOut;
       center[1] = 0; 
-      center[2] = -5.61; 
+      center[2] = -5.61-0.08; 
     }
     return kROCcenterOut;
   }