Example macro for merging sets of alignment objects

[u/mrichter/AliRoot.git] / PHOS / AliPHOSGeometry.cxx

diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx
index b78404bd9fae34d99018c02d95cbacae422c7f48..ec31b1677a888ce508d85a4b8b30187c0ae3c551 100644 (file)
--- a/PHOS/AliPHOSGeometry.cxx
+++ b/PHOS/AliPHOSGeometry.cxx
@@ -32,6 +32,7 @@
 #include "TRotation.h" 
 #include "TParticle.h"
 #include <TGeoManager.h>
+#include <TGeoMatrix.h>
 
 // --- Standard library ---
 
@@ -53,6 +54,8 @@ AliPHOSGeometry::AliPHOSGeometry() :
                    fAngle(0.f),
                    fPHOSAngle(0),
                    fIPtoUpperCPVsurface(0),
+                   fCrystalShift(0),
+                   fCryCellShift(0),
                    fRotMatrixArray(0),
                    fGeometryEMCA(0),
                    fGeometryCPV(0),
@@ -70,6 +73,8 @@ AliPHOSGeometry::AliPHOSGeometry(const AliPHOSGeometry & rhs)
                      fAngle(rhs.fAngle),
                      fPHOSAngle(0),
                      fIPtoUpperCPVsurface(rhs.fIPtoUpperCPVsurface),
+                     fCrystalShift(rhs.fCrystalShift),
+                     fCryCellShift(rhs.fCryCellShift),
                      fRotMatrixArray(0),
                      fGeometryEMCA(0),
                      fGeometryCPV(0),
@@ -85,6 +90,8 @@ AliPHOSGeometry::AliPHOSGeometry(const Text_t* name, const Text_t* title)
                    fAngle(0.f),
                    fPHOSAngle(0),
                    fIPtoUpperCPVsurface(0),
+                   fCrystalShift(0),
+                   fCryCellShift(0),
                    fRotMatrixArray(0),
                    fGeometryEMCA(0),
                    fGeometryCPV(0),
@@ -111,11 +118,13 @@ void AliPHOSGeometry::Init(void)
   // Initializes the PHOS parameters :
   //  IHEP is the Protvino CPV (cathode pad chambers)
   
+/*
   TString test(GetName()) ; 
   if (test != "IHEP" && test != "noCPV") {
     AliFatal(Form("%s is not a known geometry (choose among IHEP)", 
                  test.Data() )) ; 
   }
+*/
 
   fgInit     = kTRUE ; 
 
@@ -274,7 +283,7 @@ Bool_t AliPHOSGeometry::AbsToRelNumbering(Int_t absId, Int_t * relid) const
   return rv ; 
 }
 //____________________________________________________________________________
-void AliPHOSGeometry::GetGlobal(const AliRecPoint* recPoint, TVector3 & gpos) const
+void AliPHOSGeometry::GetGlobal(const AliRecPoint* , TVector3 & ) const
 {
   AliFatal(Form("Please use GetGlobalPHOS(recPoint,gpos) instead of GetGlobal!"));
 }