**************************************************************************/
// $Id$
-//
-// ----------------------------
+
+//-----------------------------------------------------------------------------
// Class AliMUONGeometryTransformer
// ----------------------------
// Top container class for geometry transformations
// Author: Ivana Hrivnacova, IPN Orsay
+//-----------------------------------------------------------------------------
#include "AliMUONGeometryTransformer.h"
#include "AliMUONGeometryModuleTransformer.h"
#include "AliMUONGeometryDetElement.h"
-#include "AliMUONGeometryStore.h"
#include "AliMUONGeometryBuilder.h"
+#include "AliMpDEManager.h"
+#include "AliMpConstants.h"
+#include "AliMpExMap.h"
+#include "AliMpCDB.h"
+
#include "AliLog.h"
#include "AliAlignObjMatrix.h"
#include "AliAlignObj.h"
#include <TGeoManager.h>
#include <TGeoPhysicalNode.h>
#include <TFile.h>
+#include <TString.h>
#include <sstream>
/// \cond CLASSIMP
ClassImp(AliMUONGeometryTransformer)
/// \endcond
+
+const TString AliMUONGeometryTransformer::fgkDefaultDetectorName = "MUON";
//______________________________________________________________________________
-AliMUONGeometryTransformer::AliMUONGeometryTransformer(Bool_t isOwner)
+AliMUONGeometryTransformer::AliMUONGeometryTransformer()
+
: TObject(),
+ fDetectorName(fgkDefaultDetectorName),
fModuleTransformers(0),
fMisAlignArray(0)
{
/// Standard constructor
// Create array for geometry modules
- fModuleTransformers = new TObjArray();
- fModuleTransformers->SetOwner(isOwner);
+ fModuleTransformers = new TObjArray(100);
+ fModuleTransformers->SetOwner(true);
}
//______________________________________________________________________________
-AliMUONGeometryTransformer::AliMUONGeometryTransformer()
+AliMUONGeometryTransformer::AliMUONGeometryTransformer(TRootIOCtor* /*ioCtor*/)
: TObject(),
+ fDetectorName(),
fModuleTransformers(0),
fMisAlignArray(0)
{
// private methods
//
+//_____________________________________________________________________________
+Bool_t AliMUONGeometryTransformer::LoadMapping() const
+{
+/// Load mapping from CDB
+
+ if ( ! AliMpCDB::LoadMpSegmentation() )
+ {
+ AliFatal("Could not access mapping from OCDB !");
+ return false;
+ }
+
+ return true;
+}
+
//_____________________________________________________________________________
AliMUONGeometryModuleTransformer*
AliMUONGeometryTransformer::GetModuleTransformerNonConst(
}
-//______________________________________________________________________________
-void AliMUONGeometryTransformer::FillModuleVolPath(Int_t moduleId,
- const TString& volPath)
-{
-/// Create module with the given moduleId and volPath
-
- // Get/Create geometry module transformer
- AliMUONGeometryModuleTransformer* moduleTransformer
- = GetModuleTransformerNonConst(moduleId, false);
-
- if ( !moduleTransformer ) {
- moduleTransformer = new AliMUONGeometryModuleTransformer(moduleId);
- AddModuleTransformer(moduleTransformer);
- }
- moduleTransformer->SetVolumePath(volPath);
-}
-
-//______________________________________________________________________________
-void AliMUONGeometryTransformer::FillDetElemVolPath(Int_t detElemId,
- const TString& volPath)
-{
-/// Create detection element with the given detElemId and volPath
-
- // Module Id
- Int_t moduleId = AliMUONGeometryStore::GetModuleId(detElemId);
-
- // Get detection element store
- AliMUONGeometryStore* detElements =
- GetModuleTransformer(moduleId)->GetDetElementStore();
-
- // Add detection element
- AliMUONGeometryDetElement* detElement
- = new AliMUONGeometryDetElement(detElemId, volPath);
- detElements->Add(detElemId, detElement);
-}
-
-
//______________________________________________________________________________
void AliMUONGeometryTransformer::FillModuleTransform(Int_t moduleId,
Double_t x, Double_t y, Double_t z,
{
/// Fill the transformation of the module.
- // Get/Create geometry module transformer
- moduleId--;
- // Modules numbers in the file are starting from 1
-
AliMUONGeometryModuleTransformer* moduleTransformer
= GetModuleTransformerNonConst(moduleId, false);
/// Fill the transformation of the detection element.
// Module Id
- Int_t moduleId = AliMUONGeometryStore::GetModuleId(detElemId);
+ Int_t moduleId = AliMpDEManager::GetGeomModuleId(detElemId);
// Get module transformer
const AliMUONGeometryModuleTransformer* kModuleTransformer
detElement->SetGlobalTransformation(globalTransform);
}
-//______________________________________________________________________________
-Bool_t
-AliMUONGeometryTransformer::ReadVolPaths(ifstream& in)
-{
-/// Read modules and detection element volume paths from stream
-
- Int_t id;
- TString key, volumePath;
- in >> key;
-
- while ( !in.eof() ) {
-
- in >> id >> volumePath;
-
- // cout << "id=" << id << " "
- // << "volPath= " << volumePath
- // << endl;
-
- if ( key == TString("CH") )
- FillModuleVolPath(id, volumePath);
-
- else if ( key == TString("DE") )
- FillDetElemVolPath(id, volumePath);
-
- else {
- AliFatal(Form("%s key not recognized", key.Data()));
- return false;
- }
- in >> key;
- }
-
- return true;
-}
-
//______________________________________________________________________________
TString AliMUONGeometryTransformer::ReadModuleTransforms(ifstream& in)
{
/// Read and fill modules transformations from the stream.
/// Return true, if reading finished correctly.
- TString key("CH");
- while ( key == TString("CH") ) {
+ TString key(AliMUONGeometryModuleTransformer::GetModuleNamePrefix());
+ while ( key == AliMUONGeometryModuleTransformer::GetModuleNamePrefix() ) {
Int_t id;
Double_t x, y, z;
Double_t a1, a2, a3, a4, a5, a6;
/// Read detection elements transformations from the stream.
/// Return true, if reading finished correctly.
- TString key("DE");
- while ( key == TString("DE") ) {
+ TString key(AliMUONGeometryDetElement::GetDENamePrefix());
+ while ( key == AliMUONGeometryDetElement::GetDENamePrefix() ) {
// Input data
Int_t detElemId;
return key;
}
-//______________________________________________________________________________
-Bool_t
-AliMUONGeometryTransformer::LoadTransforms(TGeoManager* tgeoManager)
-{
-/// Load transformations for defined modules and detection elements
-/// from the root file
-
- if ( !tgeoManager) {
- AliFatal("No TGeoManager defined.");
- return false;
- }
-
- for (Int_t i=0; i<fModuleTransformers->GetEntriesFast(); i++) {
- AliMUONGeometryModuleTransformer* moduleTransformer
- = (AliMUONGeometryModuleTransformer*)fModuleTransformers->At(i);
-
- // Module path
- TString path = moduleTransformer->GetVolumePath();
-
- // Make physical node
- TGeoPhysicalNode* moduleNode = tgeoManager->MakePhysicalNode(path);
- if ( ! moduleNode ) {
- AliErrorStream()
- << "Module id: " << moduleTransformer->GetModuleId()
- << " volume path: " << path << " not found in geometry." << endl;
- return false;
- }
-
- // Set matrix from physical node
- TGeoHMatrix matrix = *moduleNode->GetMatrix();
- moduleTransformer->SetTransformation(matrix);
-
- // Loop over detection elements
- AliMUONGeometryStore* detElements
- = moduleTransformer->GetDetElementStore();
-
- for (Int_t j=0; j<detElements->GetNofEntries(); j++) {
- AliMUONGeometryDetElement* detElement
- = (AliMUONGeometryDetElement*)detElements->GetEntry(j);
-
- // Det element path
- TString dePath = detElement->GetVolumePath();
-
- // Make physical node
- TGeoPhysicalNode* deNode = tgeoManager->MakePhysicalNode(dePath);
- if ( ! deNode ) {
- AliErrorStream()
- << "Det element id: " << detElement->GetId()
- << " volume path: " << path << " not found in geometry." << endl;
- return false;
- }
-
- // Set global matrix from physical node
- TGeoHMatrix globalMatrix = *deNode->GetMatrix();
- detElement->SetGlobalTransformation(globalMatrix);
-
- // Set local matrix
- TGeoHMatrix localMatrix =
- AliMUONGeometryBuilder::Multiply(
- matrix.Inverse(), globalMatrix );
- detElement->SetLocalTransformation(localMatrix);
- }
- }
- return true;
-}
-
-//______________________________________________________________________________
-Bool_t
-AliMUONGeometryTransformer::ReadVolPaths(const TString& fileName)
-{
-/// Read detection element volume paths from a file.
-/// Return true, if reading finished correctly.
-
- // File path
- TString filePath = gSystem->Getenv("ALICE_ROOT");
- filePath += "/MUON/data/";
- filePath += fileName;
-
- // Open input file
- ifstream in(filePath, ios::in);
- if (!in) {
- cerr << filePath << endl;
- AliFatal("File not found.");
- return false;
- }
-
- ReadVolPaths(in);
- return true;
-}
-
//______________________________________________________________________________
Bool_t
AliMUONGeometryTransformer::ReadTransformations(const TString& fileName)
TString key;
in >> key;
while ( !in.eof() ) {
- if (key == TString("CH"))
+ if ( key == AliMUONGeometryModuleTransformer::GetModuleNamePrefix() )
key = ReadModuleTransforms(in);
- else if (key == TString("DE"))
+ else if ( key == AliMUONGeometryDetElement::GetDENamePrefix() )
key = ReadDetElemTransforms(in);
else {
AliFatal(Form("%s key not recognized", key.Data()));
//______________________________________________________________________________
Bool_t
-AliMUONGeometryTransformer::ReadTransformations2(const TString& fileName)
+AliMUONGeometryTransformer::LoadTransformations()
{
-/// Read transformations from root geometry file.
-/// Return true, if reading finished correctly.
+/// Load transformations for defined modules and detection elements
+/// using AliGeomManager
- // File path
- TString filePath = gSystem->Getenv("ALICE_ROOT");
- filePath += "/MUON/data/";
- filePath += fileName;
-
- // Load root geometry
- TGeoManager* tgeoManager = TGeoManager::Import(fileName);
+ if ( ! AliGeomManager::GetGeometry() ) {
+ AliFatal("Geometry has to be laoded in AliGeomManager first.");
+ return false;
+ }
- // Retrieve matrices
- LoadTransforms(tgeoManager);
+ for (Int_t i=0; i<fModuleTransformers->GetEntriesFast(); i++) {
+ AliMUONGeometryModuleTransformer* moduleTransformer
+ = (AliMUONGeometryModuleTransformer*)fModuleTransformers->At(i);
- return true;
-}
+ // Module symbolic name
+ TString symname = GetModuleSymName(moduleTransformer->GetModuleId());
+
+ // Set matrix from physical node
+ TGeoHMatrix* matrix = AliGeomManager::GetMatrix(symname);
+ if ( ! matrix ) {
+ AliErrorStream() << "Geometry module matrix not found." << endl;
+ return false;
+ }
+ moduleTransformer->SetTransformation(*matrix);
+
+ // Loop over detection elements
+ AliMpExMap* detElements = moduleTransformer->GetDetElementStore();
+
+ for (Int_t j=0; j<detElements->GetSize(); j++) {
+ AliMUONGeometryDetElement* detElement
+ = (AliMUONGeometryDetElement*)detElements->GetObject(j);
+
+ // Det element symbolic name
+ TString symname = GetDESymName(detElement->GetId());
+
+ // Set global matrix from physical node
+ TGeoHMatrix* globalMatrix = AliGeomManager::GetMatrix(symname);
+ if ( ! globalMatrix ) {
+ AliErrorStream() << "Detection element matrix not found." << endl;
+ return false;
+ }
+ detElement->SetGlobalTransformation(*globalMatrix);
+
+ // Set local matrix
+ TGeoHMatrix localMatrix =
+ AliMUONGeometryBuilder::Multiply(
+ (*matrix).Inverse(), (*globalMatrix) );
+ detElement->SetLocalTransformation(localMatrix);
+ }
+ }
+ return true;
+}
//______________________________________________________________________________
void AliMUONGeometryTransformer::WriteTransform(ofstream& out,
<< setw(8) << setprecision(4) << a6 << " " << endl;
}
-//______________________________________________________________________________
-void AliMUONGeometryTransformer::WriteModuleVolPaths(ofstream& out) const
-{
-/// Write module volume paths for all module transformers
-
- for (Int_t i=0; i<fModuleTransformers->GetEntriesFast(); i++) {
- AliMUONGeometryModuleTransformer* moduleTransformer
- = (AliMUONGeometryModuleTransformer*)fModuleTransformers->At(i);
-
- // Write data on out
- out << "CH "
- << setw(4) << moduleTransformer->GetModuleId() << " "
- << moduleTransformer->GetVolumePath() << endl;
- }
- out << endl;
-}
-
-//______________________________________________________________________________
-void AliMUONGeometryTransformer::WriteDetElemVolPaths(ofstream& out) const
-{
-/// Write detection element volume paths for all detection elements in all
-/// module transformers
-
- for (Int_t i=0; i<fModuleTransformers->GetEntriesFast(); i++) {
- AliMUONGeometryModuleTransformer* moduleTransformer
- = (AliMUONGeometryModuleTransformer*)fModuleTransformers->At(i);
- AliMUONGeometryStore* detElements
- = moduleTransformer->GetDetElementStore();
-
- for (Int_t j=0; j<detElements->GetNofEntries(); j++) {
- AliMUONGeometryDetElement* detElement
- = (AliMUONGeometryDetElement*)detElements->GetEntry(j);
-
- // Write data on out
- out << "DE "
- << setw(4) << detElement->GetId() << " "
- << detElement->GetVolumePath() << endl;
- }
- out << endl;
- }
-}
-
//______________________________________________________________________________
void AliMUONGeometryTransformer::WriteModuleTransforms(ofstream& out) const
{
= moduleTransformer->GetTransformation();
// Write data on out
- out << "CH "
- << setw(4) << moduleTransformer->GetModuleId() + 1;
+ out << AliMUONGeometryModuleTransformer::GetModuleNamePrefix() << " "
+ << setw(4) << moduleTransformer->GetModuleId();
WriteTransform(out, transform);
}
for (Int_t i=0; i<fModuleTransformers->GetEntriesFast(); i++) {
AliMUONGeometryModuleTransformer* moduleTransformer
= (AliMUONGeometryModuleTransformer*)fModuleTransformers->At(i);
- AliMUONGeometryStore* detElements
- = moduleTransformer->GetDetElementStore();
+ AliMpExMap* detElements = moduleTransformer->GetDetElementStore();
- for (Int_t j=0; j<detElements->GetNofEntries(); j++) {
+ for (Int_t j=0; j<detElements->GetSize(); j++) {
AliMUONGeometryDetElement* detElement
- = (AliMUONGeometryDetElement*)detElements->GetEntry(j);
+ = (AliMUONGeometryDetElement*)detElements->GetObject(j);
const TGeoMatrix* transform
= detElement->GetLocalTransformation();
// Write data on out
- out << "DE " << setw(4) << detElement->GetId();
+ out << AliMUONGeometryDetElement::GetDENamePrefix() << " "
+ << setw(4) << detElement->GetId();
WriteTransform(out, transform);
}
}
}
-//
-// public functions
-//
-
//______________________________________________________________________________
-Bool_t
-AliMUONGeometryTransformer::ReadGeometryData(
- const TString& volPathFileName,
- const TString& transformFileName)
+TString AliMUONGeometryTransformer::GetModuleSymName(Int_t moduleId) const
{
-/// Read geometry data from given files;
-/// if transformFileName has ".root" extension, the transformations
-/// are loaded from root geometry file, otherwise ASCII file
-/// format is supposed
+/// Return the module symbolic name (use for alignment)
- Bool_t result1 = ReadVolPaths(volPathFileName);
-
- // Get file extension
- std::string fileName = transformFileName.Data();
- std::string rootExt = fileName.substr(fileName.size()-5, fileName.size());
- Bool_t result2;
- if ( rootExt != ".root" )
- result2 = ReadTransformations(transformFileName);
- else
- result2 = ReadTransformations2(transformFileName);
-
- return result1 && result2;
+ return "/" + fDetectorName + "/"
+ + AliMUONGeometryModuleTransformer::GetModuleName(moduleId);
}
//______________________________________________________________________________
-Bool_t
-AliMUONGeometryTransformer::ReadGeometryData(
- const TString& volPathFileName,
- TGeoManager* tgeoManager)
+TString AliMUONGeometryTransformer::GetDESymName(Int_t detElemId) const
{
-/// Load geometry data from root geometry using defined
-/// volume paths from file
+/// Return the detection element symbolic name (used for alignment)
- Bool_t result1 = ReadVolPaths(volPathFileName);
+ // Module Id
+ Int_t moduleId = AliMpDEManager::GetGeomModuleId(detElemId);
- Bool_t result2 = LoadTransforms(tgeoManager);
-
- return result1 && result2;
+ return GetModuleSymName(moduleId) + "/"
+ + AliMUONGeometryDetElement::GetDEName(detElemId);
}
+//
+// public functions
+//
+
//______________________________________________________________________________
Bool_t
-AliMUONGeometryTransformer::WriteGeometryData(
- const TString& volPathFileName,
- const TString& transformFileName,
- const TString& misalignFileName) const
+AliMUONGeometryTransformer::LoadGeometryData(const TString& fileName)
{
-/// Write geometry data into given files
+/// Read geometry data either from ASCII file with transformations or
+/// from root geometry file (if fileName has ".root" extension)
- Bool_t result1 = WriteVolumePaths(volPathFileName);
- Bool_t result2 = WriteTransformations(transformFileName);
-
- Bool_t result3 = true;
- if ( misalignFileName != "" )
- result3 = WriteMisAlignmentData(misalignFileName);
+ CreateModules();
+
+ // Get file extension
+ std::string fileName2 = fileName.Data();
+ std::string rootExt = fileName2.substr(fileName2.size()-5, fileName2.size());
- return result1 && result2 && result3;
-}
-
+ if ( rootExt != ".root" )
+ return ReadTransformations(fileName);
+ else {
+ // Load root geometry
+ AliGeomManager::LoadGeometry(fileName.Data());
+ return LoadTransformations();
+ }
+}
+
//______________________________________________________________________________
Bool_t
-AliMUONGeometryTransformer::WriteVolumePaths(const TString& fileName) const
+AliMUONGeometryTransformer::LoadGeometryData()
{
-/// Write volume paths for modules and detection element volumes into a file.
-/// Return true, if writing finished correctly.
+/// Load geometry data from already loaded Root geometry using AliGeomManager
- // No writing
- // if builder is not associated with any geometry module
- if (fModuleTransformers->GetEntriesFast() == 0) return false;
-
- // File path
- TString filePath = gSystem->Getenv("ALICE_ROOT");
- filePath += "/MUON/data/";
- filePath += fileName;
-
- // Open output file
- ofstream out(filePath, ios::out);
- if (!out) {
- cerr << filePath << endl;
- AliError("File not found.");
+ if ( ! AliGeomManager::GetGeometry() ) {
+ AliErrorStream() << "Geometry has not been loaded in AliGeomManager" << endl;
return false;
- }
-#if !defined (__DECCXX)
- out.setf(std::ios::fixed);
-#endif
- WriteModuleVolPaths(out);
- WriteDetElemVolPaths(out);
-
- return true;
+ }
+
+ CreateModules();
+
+ return LoadTransformations();
}
//______________________________________________________________________________
{
/// Add the module transformer to the array
- fModuleTransformers->AddAt(moduleTransformer,
- moduleTransformer->GetModuleId());
+ // Expand the size if not sufficient
+ Int_t moduleId = moduleTransformer->GetModuleId();
+ if ( moduleId >= fModuleTransformers->GetSize() )
+ fModuleTransformers->Expand(moduleId+1);
+
+ fModuleTransformers->AddAt(moduleTransformer, moduleId);
}
//_____________________________________________________________________________
return;
}
- // Get path
- TString path = kTransformer->GetVolumePath();
-
// Get unique align object ID
- Int_t volId = AliAlignObj::LayerToVolUID(AliAlignObj::kMUON, moduleId);
+ Int_t volId = AliGeomManager::LayerToVolUID(AliGeomManager::kMUON, moduleId);
// Create mis align matrix
TClonesArray& refArray =*fMisAlignArray;
Int_t pos = fMisAlignArray->GetEntriesFast();
- new (refArray[pos]) AliAlignObjMatrix(path.Data(), volId,
+ new (refArray[pos]) AliAlignObjMatrix(GetModuleSymName(moduleId), volId,
const_cast<TGeoHMatrix&>(matrix),kTRUE);
}
return;
}
- // Get path
- TString path = kDetElement->GetVolumePath();
-
// Get unique align object ID
- Int_t volId = AliAlignObj::LayerToVolUID(AliAlignObj::kMUON, detElemId);
+ Int_t volId = AliGeomManager::LayerToVolUID(AliGeomManager::kMUON, detElemId);
// Create mis align matrix
TClonesArray& refArray =*fMisAlignArray;
Int_t pos = fMisAlignArray->GetEntriesFast();
- new(refArray[pos]) AliAlignObjMatrix(path.Data(), volId,
+ new(refArray[pos]) AliAlignObjMatrix(GetDESymName(detElemId), volId,
const_cast<TGeoHMatrix&>(matrix),kTRUE);
}
+//______________________________________________________________________________
+void AliMUONGeometryTransformer::CreateModules()
+{
+/// Create modules and their detection elements using info from mapping;
+/// but do not fill matrices
+
+ // Load mapping as its info is used to define modules & DEs
+ LoadMapping();
+
+ // Loop over geometry module
+ for (Int_t moduleId = 0; moduleId < AliMpConstants::NofGeomModules(); ++moduleId ) {
+
+ // Create geometry module transformer
+ AliMUONGeometryModuleTransformer* moduleTransformer
+ = new AliMUONGeometryModuleTransformer(moduleId);
+ AddModuleTransformer(moduleTransformer);
+ }
+
+ // Loop over detection elements
+ AliMpDEIterator it;
+ for ( it.First(); ! it.IsDone(); it.Next() ) {
+
+ Int_t detElemId = it.CurrentDEId();
+ Int_t moduleId = AliMpDEManager::GetGeomModuleId(detElemId);
+
+ // Get detection element store
+ AliMpExMap* detElements =
+ GetModuleTransformer(moduleId)->GetDetElementStore();
+
+ // Add detection element
+ AliMUONGeometryDetElement* detElement
+ = new AliMUONGeometryDetElement(detElemId);
+ detElements->Add(detElemId, detElement);
+ }
+}
+
+//_____________________________________________________________________________
+void AliMUONGeometryTransformer::AddAlignableVolumes() const
+{
+/// Set symbolic names and matrices to alignable objects to TGeo
+
+ if ( ! gGeoManager ) {
+ AliWarning("TGeoManager not defined.");
+ return;
+ }
+
+ // Modules
+ for (Int_t i=0; i<fModuleTransformers->GetEntriesFast(); i++) {
+ AliMUONGeometryModuleTransformer* module
+ = (AliMUONGeometryModuleTransformer*)fModuleTransformers->At(i);
+
+ // Set module symbolic name
+ TGeoPNEntry* pnEntry
+ = gGeoManager->SetAlignableEntry(GetModuleSymName(module->GetModuleId()),
+ module->GetVolumePath());
+ if ( ! pnEntry ) {
+ AliErrorStream()
+ << "Volume path for geometry module "
+ << module->GetModuleId()
+ << " not found in geometry." << endl;
+ }
+ else {
+ // Set module matrix
+ pnEntry->SetMatrix(new TGeoHMatrix(*module->GetTransformation()));
+ // the matrix will be deleted via TGeoManager
+ }
+
+ // Detection elements
+ AliMpExMap* detElements = module->GetDetElementStore();
+
+ for (Int_t j=0; j<detElements->GetSize(); j++) {
+ AliMUONGeometryDetElement* detElement
+ = (AliMUONGeometryDetElement*)detElements->GetObject(j);
+
+ // Set detection element symbolic name
+ TGeoPNEntry* pnEntry
+ = gGeoManager->SetAlignableEntry(GetDESymName(detElement->GetId()),
+ detElement->GetVolumePath());
+ if ( ! pnEntry ) {
+ AliErrorStream()
+ << "Volume path for detection element "
+ << detElement->GetId()
+ << " not found in geometry." << endl;
+ }
+ else {
+ // Set detection element matrix
+ pnEntry->SetMatrix(new TGeoHMatrix(*detElement->GetGlobalTransformation()));
+ // the matrix will be deleted via TGeoManager
+ }
+ }
+ }
+}
+
//_____________________________________________________________________________
TClonesArray* AliMUONGeometryTransformer::CreateZeroAlignmentData() const
{
AliMUONGeometryModuleTransformer* module
= (AliMUONGeometryModuleTransformer*)fModuleTransformers->At(i);
- TString path = module->GetVolumePath();
Int_t moduleId = module->GetModuleId();
// Align object ID
- Int_t volId = AliAlignObj::LayerToVolUID(AliAlignObj::kMUON, moduleId);
+ Int_t volId = AliGeomManager::LayerToVolUID(AliGeomManager::kMUON, moduleId);
// Create mis align matrix
Int_t pos = array->GetEntriesFast();
- new (refArray[pos]) AliAlignObjMatrix(path.Data(), volId, matrix, kTRUE);
+ new (refArray[pos]) AliAlignObjMatrix(GetModuleSymName(moduleId), volId, matrix, kTRUE);
}
// Detection elements
for (Int_t i=0; i<fModuleTransformers->GetEntriesFast(); i++) {
AliMUONGeometryModuleTransformer* moduleTransformer
= (AliMUONGeometryModuleTransformer*)fModuleTransformers->At(i);
- AliMUONGeometryStore* detElements
- = moduleTransformer->GetDetElementStore();
+ AliMpExMap* detElements = moduleTransformer->GetDetElementStore();
- for (Int_t j=0; j<detElements->GetNofEntries(); j++) {
+ for (Int_t j=0; j<detElements->GetSize(); j++) {
AliMUONGeometryDetElement* detElement
- = (AliMUONGeometryDetElement*)detElements->GetEntry(j);
+ = (AliMUONGeometryDetElement*)detElements->GetObject(j);
- TString path = detElement->GetVolumePath();
Int_t detElemId = detElement->GetId();
// Align object ID
- Int_t volId = AliAlignObj::LayerToVolUID(AliAlignObj::kMUON, detElemId);
+ Int_t volId = AliGeomManager::LayerToVolUID(AliGeomManager::kMUON, detElemId);
// Create mis align matrix
Int_t pos = array->GetEntriesFast();
- new (refArray[pos]) AliAlignObjMatrix(path.Data(), volId, matrix, kTRUE);
+ new (refArray[pos]) AliAlignObjMatrix(GetDESymName(detElemId), volId, matrix, kTRUE);
}
}
return array;
}
+//_____________________________________________________________________________
+void AliMUONGeometryTransformer::ClearMisAlignmentData()
+{
+/// Clear the array of misalignment data
+
+ if ( ! fMisAlignArray ) return;
+
+ fMisAlignArray->Delete();
+}
+
//_____________________________________________________________________________
void AliMUONGeometryTransformer::Global2Local(Int_t detElemId,
Float_t xg, Float_t yg, Float_t zg,
/// Return the geometry module transformer specified by detection element ID
// Get module index
- Int_t index = AliMUONGeometryStore::GetModuleId(detElemId);
+ Int_t index = AliMpDEManager::GetGeomModuleId(detElemId);
return GetModuleTransformer(index, warn);
}