Merging differences if v1.2 and 1.3

diff --git a/PHOS/AliPHOSSurvey.cxx b/PHOS/AliPHOSSurvey.cxx
index de30aef04f580c0d69f3e797c5b45fc12cdc43b8..8f02825ccdcd9f2c2f5185122331e2af6804f0a1 100644 (file)
--- a/PHOS/AliPHOSSurvey.cxx
+++ b/PHOS/AliPHOSSurvey.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.3  2007/05/17 17:13:32  kharlov
+ * Coding convensions satisfied (T.Pocheptsov)
+ *
  * Revision 1.1  2007/04/19 15:47:20  kharlov
  * Add misalignment of strip units with AliPHOSSurvey class
  *
@@ -171,8 +174,8 @@ void AliPHOSSurvey::CreateAliAlignObjAngles(TClonesArray &array)
 
   AliPHOSEMCAGeometry * emcaGeom = phosGeom->GetEMCAGeometry();
   Int_t arrayInd = array.GetEntries(), iIndex = 0;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   for (Int_t module = 1; module <= phosGeom->GetNModules(); ++module) {
     for (Int_t i = 0, stripNum = 0; i < emcaGeom->GetNStripX(); ++i) {
@@ -198,8 +201,8 @@ void AliPHOSSurvey::CreateNullObjects(TClonesArray &array, const AliPHOSGeometry
   //Create null shifts and rotations.
   const AliPHOSEMCAGeometry * emcaGeom = phosGeom->GetEMCAGeometry();
   Int_t arrayInd = array.GetEntries(), iIndex = 0;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   for (Int_t module = 1; module <= phosGeom->GetNModules(); ++module)
     for (Int_t i = 0; i < emcaGeom->GetNStripX(); ++i)