dEdxSSDAQA added to PilotAnalysis

[u/mrichter/AliRoot.git] / MUON / AliMUONGeometryBuilder.cxx

diff --git a/MUON/AliMUONGeometryBuilder.cxx b/MUON/AliMUONGeometryBuilder.cxx
index e11326f69c2249e6ef828e3a1a5aeab34a48e3ff..713e71bd6329f4062b95c9c528ba613172c853eb 100644 (file)
--- a/MUON/AliMUONGeometryBuilder.cxx
+++ b/MUON/AliMUONGeometryBuilder.cxx
@@ -14,12 +14,13 @@
  **************************************************************************/
 
 // $Id$
-//
-// ----------------------------
+
+//-----------------------------------------------------------------------------
 // Class AliMUONGeometryBuilder
 // ----------------------------
 // Manager class for geometry construction via geometry builders.
 // Author: Ivana Hrivnacova, IPN Orsay
+//-----------------------------------------------------------------------------
 
 #include "AliMUONGeometryBuilder.h"
 #include "AliMUONVGeometryBuilder.h"   
@@ -30,10 +31,12 @@
 #include "AliMUONGeometryEnvelope.h"   
 #include "AliMUONGeometryEnvelopeStore.h"
 #include "AliMUONGeometryDetElement.h"
-#include "AliMUONGeometryStore.h"
 #include "AliMUONGeometryConstituent.h"
 
+#include "AliMpDEManager.h"
+
 #include "AliModule.h"
+#include "AliSimulation.h"
 #include "AliLog.h"
 #include "AliRun.h"
 
@@ -240,7 +243,7 @@ void AliMUONGeometryBuilder::CreateGeometryWithTGeo()
   if (fAlign) {
     // Read transformations from ASCII data file  
     fGeometry->GetTransformer()
-      ->ReadGeometryData(fgkDefaultVolPathsFileName, fTransformFileName);
+      ->LoadGeometryData(fTransformFileName);
   }    
  
   for (Int_t i=0; i<fGeometryBuilders->GetEntriesFast(); i++) {
@@ -252,6 +255,7 @@ void AliMUONGeometryBuilder::CreateGeometryWithTGeo()
     // Create geometry + envelopes
     //
     builder->CreateGeometry();
+    builder->SetVolumes();
     if (!fAlign) builder->SetTransformations();
     
     // Place module volumes and envelopes
@@ -281,6 +285,20 @@ void AliMUONGeometryBuilder::CreateGeometryWithTGeo()
         AliMUONGeometryEnvelope* env 
          = (AliMUONGeometryEnvelope*)kEnvelopes->At(k);
          
+       // Check consistency of detElemId and module Id
+       if ( env->GetUniqueID() > 0 && 
+            AliMpDEManager::GetGeomModuleId(env->GetUniqueID()) 
+            != geometry->GetModuleId() ) {
+            
+         AliErrorStream() 
+           << "Detection element " << env->GetUniqueID() 
+           << " is being placed in geometry module " << geometry->GetModuleId()
+           << " but should go in " 
+           << AliMpDEManager::GetGeomModuleId(env->GetUniqueID())
+           <<  endl;
+         AliFatal("Inconsistent IDs");
+       }          
+         
         const TGeoCombiTrans* kEnvTrans = env->GetTransformation();
         const char* only = "ONLY";
         if (env->IsMANY()) only = "MANY";
@@ -334,8 +352,7 @@ void AliMUONGeometryBuilder::CreateGeometryWithoutTGeo()
 
   if (fAlign) {
     // Read transformations from ASCII data file  
-    fGeometry->GetTransformer()
-      ->ReadGeometryData(fgkDefaultVolPathsFileName, fTransformFileName);
+    fGeometry->GetTransformer()->LoadGeometryData(fTransformFileName);
   }     
 
   for (Int_t i=0; i<fGeometryBuilders->GetEntriesFast(); i++) {
@@ -378,6 +395,20 @@ void AliMUONGeometryBuilder::CreateGeometryWithoutTGeo()
         AliMUONGeometryEnvelope* env 
          = (AliMUONGeometryEnvelope*)kEnvelopes->At(k);
          
+       // Check consistency of detElemId and module Id
+       if ( env->GetUniqueID() > 0 && 
+            AliMpDEManager::GetGeomModuleId(env->GetUniqueID()) 
+            != geometry->GetModuleId() ) {
+            
+         AliErrorStream() 
+           << "Detection element " << env->GetUniqueID() 
+           << " is being placed in geometry module " << geometry->GetModuleId()
+           << " but should go in " 
+           << AliMpDEManager::GetGeomModuleId(env->GetUniqueID())
+           <<  endl;
+         AliFatal("Inconsistent IDs");
+       }          
+         
         const TGeoCombiTrans* kEnvTrans = env->GetTransformation();
         const char* only = "ONLY";
         if (env->IsMANY()) only = "MANY";
@@ -500,13 +531,23 @@ void AliMUONGeometryBuilder::CreateGeometry()
 {
 /// Construct geometry using geometry builders.
 
-  if ( gMC->IsRootGeometrySupported() && 
-       TString(gMC->ClassName()) != "TGeant4" ) {
+  if ( gMC->IsRootGeometrySupported() ) {
        
    CreateGeometryWithTGeo();
   } 
   else
    CreateGeometryWithoutTGeo();
+
+  for (Int_t i=0; i<fGeometryBuilders->GetEntriesFast(); i++) {
+
+    // Get the builder
+    AliMUONVGeometryBuilder* builder
+      = (AliMUONVGeometryBuilder*)fGeometryBuilders->At(i);
+ 
+    // Update detection elements from built geometry
+    Bool_t create = ! fAlign;
+    builder->UpdateDetElements(create);
+  }
 }
 
 //_____________________________________________________________________________
@@ -531,16 +572,14 @@ void AliMUONGeometryBuilder::InitGeometry(const TString& svmapFileName)
 /// Initialize geometry
 
   // Load alignement data from geometry if geometry is read from Root file
-  if ( gAlice->IsRootGeometry() ) {
+  if ( AliSimulation::Instance()->IsGeometryFromFile() ) {
     fAlign = true;
-
-    fGeometry->GetTransformer()
-      ->ReadGeometryData(fgkDefaultVolPathsFileName, gGeoManager);
-  }    
+    fGeometry->GetTransformer()->LoadGeometryData();
+ }    
 
   // Read sensitive volume map from a file
   fGeometry->ReadSVMap(svmapFileName);
-      
+
   // Set the chamber (sensitive region) GEANT identifier
   //
   for (Int_t i=0; i<fGeometryBuilders->GetEntriesFast(); i++) {
@@ -551,17 +590,21 @@ void AliMUONGeometryBuilder::InitGeometry(const TString& svmapFileName)
 
     // Set sensitive volumes with each builder
     builder->SetSensitiveVolumes();
-
-    if (!fAlign)  {
-      // Create detection elements from built geometry
-      builder->CreateDetElements();
-    }  
   }  
 }
 
+//________________________________________________________________
+void AliMUONGeometryBuilder::UpdateInternalGeometry()
+{
+/// Update geometry after applying mis-alignment:
+/// reload transformations in geometry builder.
+
+  fGeometry->GetTransformer()->LoadTransformations();
+}
+
 //______________________________________________________________________________
 void AliMUONGeometryBuilder::WriteSVMaps(const TString& fileName, 
-                                         Bool_t rebuild)
+                                         Bool_t rebuild, Bool_t writeEnvelopes)
 {
 /// Write sensitive volume maps into files per builder
 
@@ -573,10 +616,6 @@ void AliMUONGeometryBuilder::WriteSVMaps(const TString& fileName,
       AliMUONVGeometryBuilder* builder
         = (AliMUONVGeometryBuilder*)fGeometryBuilders->At(i);
 
-      Bool_t writeEnvelopes = false;
-      if ( gMC->IsRootGeometrySupported() &&
-           TString(gMC->ClassName()) != "TGeant4") writeEnvelopes = true;
-
       builder->RebuildSVMaps(writeEnvelopes);
     }