Add consistent geometry for simulation

diff --git a/ANALYSIS/TenderSupplies/AliPHOSTenderSupply.cxx b/ANALYSIS/TenderSupplies/AliPHOSTenderSupply.cxx
index e176a957c740a6dc4ac078f3a1190fe1222a88ab..f0c9099fd3d8e9c5d6c1db6462dd9d3a4630f20f 100644 (file)
--- a/ANALYSIS/TenderSupplies/AliPHOSTenderSupply.cxx
+++ b/ANALYSIS/TenderSupplies/AliPHOSTenderSupply.cxx
@@ -159,7 +159,10 @@ void AliPHOSTenderSupply::InitTender()
   //Init geometry 
   if(!fPHOSGeo){
     AliOADBContainer geomContainer("phosGeo");
-    geomContainer.InitFromFile("$ALICE_ROOT/OADB/PHOS/PHOSGeometry.root","PHOSRotationMatrixes");
+    if(fIsMC) //use excatly the same geometry as in simulation
+      geomContainer.InitFromFile("$ALICE_ROOT/OADB/PHOS/PHOSMCGeometry.root","PHOSMCRotationMatrixes");
+    else //Use best approaximation to real geometry
+      geomContainer.InitFromFile("$ALICE_ROOT/OADB/PHOS/PHOSGeometry.root","PHOSRotationMatrixes");
     TObjArray *matrixes = (TObjArray*)geomContainer.GetObject(runNumber,"PHOSRotationMatrixes");
     fPHOSGeo =  AliPHOSGeometry::GetInstance("IHEP") ;
     for(Int_t mod=0; mod<5; mod++) {
@@ -167,7 +170,7 @@ void AliPHOSTenderSupply::InitTender()
       fPHOSGeo->SetMisalMatrix(((TGeoHMatrix*)matrixes->At(mod)),mod) ;
       printf(".........Adding Matrix(%d), geo=%p\n",mod,fPHOSGeo) ;
       ((TGeoHMatrix*)matrixes->At(mod))->Print() ;
-    }
+    } 
   }
   
   //Init Bad channels map

diff --git a/OADB/PHOS/PHOSMCGeometry.root b/OADB/PHOS/PHOSMCGeometry.root
new file mode 100644 (file)
index 0000000..c619b49
Binary files /dev/null and b/OADB/PHOS/PHOSMCGeometry.root differ