#include <TGeoManager.h>
#include <TGeoPhysicalNode.h>
#include "AliAlignObj.h"
-#include "AliAlignObjAngles.h"
+#include "AliAlignObjParams.h"
#include "AliLog.h"
ClassImp(AliTPCParam)
//
//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];
if (!gGeoManager){
AliFatal("Geo manager not initialized\n");
}
- AliAlignObjAngles o;
+ AliAlignObjParams o;
//
if (fTrackingMatrix) delete [] fTrackingMatrix;
fTrackingMatrix = new TGeoHMatrix*[fNSector];
fGlobalMatrix[isec] = 0;
fClusterMatrix[isec]= 0;
fTrackingMatrix[isec]=0;
- AliAlignObj::ELayerID iLayer;
+ AliGeomManager::ELayerID iLayer;
Int_t iModule;
if(isec<fNInnerSector) {
- iLayer = AliAlignObj::kTPC1;
+ iLayer = AliGeomManager::kTPC1;
iModule = isec;
}
else {
- iLayer = AliAlignObj::kTPC2;
+ iLayer = AliGeomManager::kTPC2;
iModule = isec - fNInnerSector;
}
- UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
- const char *symname = AliAlignObj::SymName(volid);
+ 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();
return kTRUE;
}
+TGeoHMatrix * AliTPCParam::Tracking2LocalMatrix(const TGeoHMatrix * geoMatrix, Int_t sector) const{
+ //
+ // make local to tracking matrix
+ //
+ Double_t sectorAngle = 20.*(sector%18)+10;
+ TGeoHMatrix *newMatrix = new TGeoHMatrix();
+ newMatrix->RotateZ(sectorAngle);
+ newMatrix->MultiplyLeft(&(geoMatrix->Inverse()));
+ return newMatrix;
+}
+
+
+
Bool_t AliTPCParam::GetStatus() const
{
if (center){
center[0] = kROCcenterIn;
center[1] = 0;
- center[2] = -5.51;
+ center[2] = -5.51-0.08;
}
return kROCcenterIn;
}
if (center){
center[0] = kROCcenterOut;
center[1] = 0;
- center[2] = -5.61;
+ center[2] = -5.61-0.08;
}
return kROCcenterOut;
}