Moving the alignment-related static methods from AliAlignObj to the new geometry...

diff --git a/EMCAL/MakeEMCALFullMisAlignment.C b/EMCAL/MakeEMCALFullMisAlignment.C
index 79237b50920992cf3318a8a25bb8b5924f144a4a..3436d84ed1405983af844de3453093a74ddb5f45 100644 (file)
--- a/EMCAL/MakeEMCALFullMisAlignment.C
+++ b/EMCAL/MakeEMCALFullMisAlignment.C
@@ -21,8 +21,8 @@ void MakeEMCALFullMisAlignment(){
   TString pathstr;
 
   Int_t iIndex=0; //let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity
   Int_t i;
   Int_t j=0;
 

diff --git a/EMCAL/MakeEMCALResMisAlignment.C b/EMCAL/MakeEMCALResMisAlignment.C
index 4b0317d32ef80930afdf03608f328cc74976e181..ff1dbc3871d1b491e54db3e9824edf70f2f4fccc 100644 (file)
--- a/EMCAL/MakeEMCALResMisAlignment.C
+++ b/EMCAL/MakeEMCALResMisAlignment.C
@@ -16,8 +16,8 @@ void MakeEMCALResMisAlignment(){
   TString pathstr;
 
   Int_t iIndex=0; // let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   Int_t i;
   Int_t j=0;

diff --git a/EMCAL/MakeEMCALZeroMisAlignment.C b/EMCAL/MakeEMCALZeroMisAlignment.C
index 29f9377a85cdec7c72b9e450438301592c52b985..c0db87e90403920b8b53541db9f274501ee2c381 100644 (file)
--- a/EMCAL/MakeEMCALZeroMisAlignment.C
+++ b/EMCAL/MakeEMCALZeroMisAlignment.C
@@ -16,8 +16,8 @@ void MakeEMCALZeroMisAlignment(){
   TString pathstr;
 
   Int_t iIndex=0; // let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   Int_t i;
   Int_t j=0;

diff --git a/EMCAL/macros/AlignmentDB/AliEMCALSetAlignment.C b/EMCAL/macros/AlignmentDB/AliEMCALSetAlignment.C
index 7003513a2712c4401055d79ab34fad52608082b0..5a981b5676069ef4b3f5b7f365b6ca4bf1c66120 100755 (executable)
--- a/EMCAL/macros/AlignmentDB/AliEMCALSetAlignment.C
+++ b/EMCAL/macros/AlignmentDB/AliEMCALSetAlignment.C
@@ -66,8 +66,8 @@ void IdealAlignment()
   // null shifts and rotations
 
   UShort_t iIndex=0;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
 
   TString basePath = "EMCAL/FullSupermodule"; 
   const Int_t nModules=10;
@@ -114,8 +114,8 @@ void ResidualAlignment()
   AliAlignObjAngles a;
 
   UShort_t iIndex=0;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
 
   Double_t sigmaTrans = 0.01; Double_t sigmaRot = 0.001;
   Double_t dx=0., dy=0., dz=0., dpsi=0., dtheta=0., dphi=0.;
@@ -169,8 +169,8 @@ void FullMisalignment()
   AliAlignObjAngles a;
 
   UShort_t iIndex=0;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
 
 
   Double_t sigmaTrans = 10.; Double_t sigmaRot = 0.1;

diff --git a/HLT/TRD/AliTRDtrackerHLT.cxx b/HLT/TRD/AliTRDtrackerHLT.cxx
index d508b9d263c7cc876c5ffc12a91fee60fe348f4d..d837b52ab54c6c8193b20f1121aed4d6acfae7dd 100644 (file)
--- a/HLT/TRD/AliTRDtrackerHLT.cxx
+++ b/HLT/TRD/AliTRDtrackerHLT.cxx
@@ -263,30 +263,30 @@ Int_t  AliTRDtrackerHLT::LocalToGlobalID(Int_t lid)
   Int_t  ichamber = fGeom->GetChamber(lid);
   Int_t  iplan    = fGeom->GetPlane(lid);
 
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kTRD1;
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kTRD1;
   switch (iplan) {
   case 0:
-    iLayer = AliAlignObj::kTRD1;
+    iLayer = AliGeomManager::kTRD1;
     break;
   case 1:
-    iLayer = AliAlignObj::kTRD2;
+    iLayer = AliGeomManager::kTRD2;
     break;
   case 2:
-    iLayer = AliAlignObj::kTRD3;
+    iLayer = AliGeomManager::kTRD3;
     break;
   case 3:
-    iLayer = AliAlignObj::kTRD4;
+    iLayer = AliGeomManager::kTRD4;
     break;
   case 4:
-    iLayer = AliAlignObj::kTRD5;
+    iLayer = AliGeomManager::kTRD5;
     break;
   case 5:
-    iLayer = AliAlignObj::kTRD6;
+    iLayer = AliGeomManager::kTRD6;
     break;
   };
 
   Int_t    modId = isector * fGeom->Ncham() + ichamber;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,modId);
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,modId);
 
   return volid;
 
@@ -300,29 +300,29 @@ Int_t  AliTRDtrackerHLT::GlobalToLocalID(Int_t gid)
   // 
 
   Int_t modId    = 0;
-  AliAlignObj::ELayerID layerId = AliAlignObj::VolUIDToLayer(gid,modId);
+  AliGeomManager::ELayerID layerId = AliGeomManager::VolUIDToLayer(gid,modId);
 
   Int_t isector  = modId / fGeom->Ncham();
   Int_t ichamber = modId % fGeom->Ncham();
   Int_t iLayer   = -1;
 
   switch (layerId) {
-  case AliAlignObj::kTRD1:
+  case AliGeomManager::kTRD1:
     iLayer = 0;
     break;
-  case AliAlignObj::kTRD2:
+  case AliGeomManager::kTRD2:
     iLayer = 1;
     break;
-  case AliAlignObj::kTRD3:
+  case AliGeomManager::kTRD3:
     iLayer = 2;
     break;
-  case AliAlignObj::kTRD4:
+  case AliGeomManager::kTRD4:
     iLayer = 3;
     break;
-  case AliAlignObj::kTRD5:
+  case AliGeomManager::kTRD5:
     iLayer = 4;
     break;
-  case AliAlignObj::kTRD6:
+  case AliGeomManager::kTRD6:
     iLayer = 5;
     break;
   default:
@@ -2776,29 +2776,29 @@ Bool_t AliTRDtrackerHLT::GetTrackPoint(Int_t index, AliTrackPoint &p) const
   Double_t global[3];
   fGeom->RotateBack(idet,local,global);
   p.SetXYZ(global[0],global[1],global[2]);
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kTRD1;
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kTRD1;
   switch (iplan) {
   case 0:
-    iLayer = AliAlignObj::kTRD1;
+    iLayer = AliGeomManager::kTRD1;
     break;
   case 1:
-    iLayer = AliAlignObj::kTRD2;
+    iLayer = AliGeomManager::kTRD2;
     break;
   case 2:
-    iLayer = AliAlignObj::kTRD3;
+    iLayer = AliGeomManager::kTRD3;
     break;
   case 3:
-    iLayer = AliAlignObj::kTRD4;
+    iLayer = AliGeomManager::kTRD4;
     break;
   case 4:
-    iLayer = AliAlignObj::kTRD5;
+    iLayer = AliGeomManager::kTRD5;
     break;
   case 5:
-    iLayer = AliAlignObj::kTRD6;
+    iLayer = AliGeomManager::kTRD6;
     break;
   };
   Int_t    modId = isector * fGeom->Ncham() + ichamber;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,modId);
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,modId);
   p.SetVolumeID(volid);
 
   return kTRUE;

diff --git a/HMPID/AliHMPIDTracker.cxx b/HMPID/AliHMPIDTracker.cxx
index de40205a57bac5efc8693a270601747b5d29ec8a..56d9dd923fbfc5b794246507f1a4dd7309a73e2e 100644 (file)
--- a/HMPID/AliHMPIDTracker.cxx
+++ b/HMPID/AliHMPIDTracker.cxx
@@ -33,7 +33,7 @@ Bool_t AliHMPIDTracker::GetTrackPoint(Int_t idx, AliTrackPoint& point) const
 //   Returns: status of operation  if FALSE then AliReconstruction::WriteAlignmentData() do not store this point to array of points for current track. 
   if(idx<0) return kFALSE; //no MIP cluster assigned to this track in PropagateBack()
   Int_t iCham=idx/1000000; Int_t iClu=idx%1000000;
-  point.SetVolumeID(AliAlignObj::LayerToVolUID(AliAlignObj::kHMPID,iCham-1));//layer and chamber number
+  point.SetVolumeID(AliGeomManager::LayerToVolUID(AliGeomManager::kHMPID,iCham-1));//layer and chamber number
   TClonesArray *pArr=(TClonesArray*)(*fClu)[iCham];
   AliHMPIDCluster *pClu=(AliHMPIDCluster*)pArr->UncheckedAt(iClu);//get pointer to cluster
   Double_t mars[3];

diff --git a/HMPID/MakeHMPIDFullMisAlignment.C b/HMPID/MakeHMPIDFullMisAlignment.C
index dad424ac0e26b963a7ac91a318c87f24c9613897..66bf6897d32bed65bf916b8f9384ae73f025ae32 100644 (file)
--- a/HMPID/MakeHMPIDFullMisAlignment.C
+++ b/HMPID/MakeHMPIDFullMisAlignment.C
@@ -11,12 +11,12 @@ void MakeHMPIDFullMisAlignment(){
 
   AliAlignObjMatrix o;
  
-  Int_t idHMPID =  AliAlignObj::kHMPID;
+  Int_t idHMPID =  AliGeomManager::kHMPID;
   for (Int_t iCh = 0; iCh < 7; iCh++) {
     dX     = (pRnd->Uniform()-0.5)*sigmaTrans;    dY     = (pRnd->Uniform()-0.5)*sigmaTrans;    dZ     = (pRnd->Uniform()-0.5)*sigmaTrans;
     dPsi   = (pRnd->Uniform()-0.5)*sigmaRot;    dTheta = (pRnd->Uniform()-0.5)*sigmaRot;    dPhi   = (pRnd->Uniform()-0.5)*sigmaRot;
-    new((*pCA)[iCh]) AliAlignObjMatrix(AliAlignObj::SymName(idHMPID,iCh),
-       AliAlignObj::LayerToVolUID(idHMPID,iCh),dX,dY,dZ,dPsi,dTheta,dPhi,kTRUE);
+    new((*pCA)[iCh]) AliAlignObjMatrix(AliGeomManager::SymName(idHMPID,iCh),
+       AliGeomManager::LayerToVolUID(idHMPID,iCh),dX,dY,dZ,dPsi,dTheta,dPhi,kTRUE);
   }
 
 //   pCA->Print();

diff --git a/HMPID/MakeHMPIDResMisAlignment.C b/HMPID/MakeHMPIDResMisAlignment.C
index 08aea4fd92b0555120753d5c433bfc6bd847d8a4..3ac26aa11ec9434063a73d750c09c1b46438457a 100644 (file)
--- a/HMPID/MakeHMPIDResMisAlignment.C
+++ b/HMPID/MakeHMPIDResMisAlignment.C
@@ -11,11 +11,11 @@ void MakeHMPIDResMisAlignment(){
 
   AliAlignObjMatrix o;
  
-  Int_t idHMPID =  AliAlignObj::kHMPID;
+  Int_t idHMPID =  AliGeomManager::kHMPID;
   for (Int_t iCh = 0; iCh < 7; iCh++) {
     dX     = (pRnd->Uniform()-0.5)*sigmaTrans;    dY     = (pRnd->Uniform()-0.5)*sigmaTrans;    dZ     = (pRnd->Uniform()-0.5)*sigmaTrans;
     dPsi   = (pRnd->Uniform()-0.5)*sigmaRot;    dTheta = (pRnd->Uniform()-0.5)*sigmaRot;    dPhi   = (pRnd->Uniform()-0.5)*sigmaRot;
-    new((*pCA)[iCh]) AliAlignObjMatrix(AliAlignObj::SymName(idHMPID,iCh),AliAlignObj::LayerToVolUID(idHMPID,iCh),dX,dY,dZ,dPsi,dTheta,dPhi,kTRUE);
+    new((*pCA)[iCh]) AliAlignObjMatrix(AliGeomManager::SymName(idHMPID,iCh),AliGeomManager::LayerToVolUID(idHMPID,iCh),dX,dY,dZ,dPsi,dTheta,dPhi,kTRUE);
   }
 
 //   pCA->Print();

diff --git a/HMPID/MakeHMPIDZeroMisAlignment.C b/HMPID/MakeHMPIDZeroMisAlignment.C
index 4a10b0b9c975da320fddf75b3c31b3a08297b70f..e6e40fe71dd9bca8538f1e7a1d2a868445f40ac3 100644 (file)
--- a/HMPID/MakeHMPIDZeroMisAlignment.C
+++ b/HMPID/MakeHMPIDZeroMisAlignment.C
@@ -7,9 +7,9 @@ void MakeHMPIDZeroMisAlignment(){
 
   Double_t dX=0.,dY=0.,dZ=0.,dPsi=0.,dTheta=0.,dPhi=0.;
  
-  Int_t idHMPID =  AliAlignObj::kHMPID;
+  Int_t idHMPID =  AliGeomManager::kHMPID;
   for (Int_t iCh = 0; iCh < 7; iCh++) {
-    new((*pCA)[iCh]) AliAlignObjMatrix(AliAlignObj::SymName(idHMPID,iCh),AliAlignObj::LayerToVolUID(idHMPID,iCh),dX,dY,dZ,dPsi,dTheta,dPhi,kTRUE);
+    new((*pCA)[iCh]) AliAlignObjMatrix(AliGeomManager::SymName(idHMPID,iCh),AliGeomManager::LayerToVolUID(idHMPID,iCh),dX,dY,dZ,dPsi,dTheta,dPhi,kTRUE);
   }
 
 //   pCA->Print();

diff --git a/ITS/AliITSRecPoint.cxx b/ITS/AliITSRecPoint.cxx
index abd86e619cab7996fd85742e347fa07fbdac11c0..7c45b67fd348a1f56c06c16b37eeb790bf0b0f01 100644 (file)
--- a/ITS/AliITSRecPoint.cxx
+++ b/ITS/AliITSRecPoint.cxx
@@ -55,7 +55,7 @@ fDeltaProb(0)
 
 //________________________________________________________________________
 AliITSRecPoint::AliITSRecPoint(Int_t *lab,Float_t *hit, Int_t *info, Bool_t local):
-AliCluster(AliAlignObj::LayerToVolUID((info[2]+AliAlignObj::kSPD1),lab[3]&0x3FF),hit,0,0,lab),
+AliCluster(AliGeomManager::LayerToVolUID((info[2]+AliGeomManager::kSPD1),lab[3]&0x3FF),hit,0,0,lab),
 fXloc(0),
 fZloc(0),
 fdEdX(0),

diff --git a/ITS/AliITSgeomTGeo.cxx b/ITS/AliITSgeomTGeo.cxx
index 8f379e37cbd3a80ef66a9f16c5ad89e74f3ff28a..5c3a94931e8af5bdc61fa7057d6340cf5b1b42f3 100644 (file)
--- a/ITS/AliITSgeomTGeo.cxx
+++ b/ITS/AliITSgeomTGeo.cxx
@@ -166,7 +166,7 @@ const char* AliITSgeomTGeo::GetSymName(Int_t index)
   Int_t lay, index2;
   if (!GetLayer(index,lay,index2)) return NULL;
 
-  return AliAlignObj::SymName((AliAlignObj::ELayerID)((lay-1)+AliAlignObj::kSPD1),index2);
+  return AliGeomManager::SymName((AliGeomManager::ELayerID)((lay-1)+AliGeomManager::kSPD1),index2);
 }
 
 //______________________________________________________________________
@@ -232,7 +232,7 @@ Bool_t AliITSgeomTGeo::GetOrigMatrix(Int_t index, TGeoHMatrix &m)
   const char *symname = GetSymName(index);
   if (!symname) return kFALSE;
 
-  return AliAlignObj::GetOrigGlobalMatrix(symname,m);
+  return AliGeomManager::GetOrigGlobalMatrix(symname,m);
 }
 
 //______________________________________________________________________

diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx
index 0323d1f4ac46e8b043d0bf9415d242fb868beb03..2923c45c727a487f896bc18abf53b9b777f0cc37 100644 (file)
--- a/ITS/AliITStrackerMI.cxx
+++ b/ITS/AliITStrackerMI.cxx
@@ -594,31 +594,31 @@ Bool_t AliITStrackerMI::GetTrackPoint(Int_t index, AliTrackPoint& p) const {
   cl->GetGlobalCov(cov);
   p.SetXYZ(xyz, cov);
 
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer; 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; 
   switch (l) {
   case 0:
-    iLayer = AliAlignObj::kSPD1;
+    iLayer = AliGeomManager::kSPD1;
     break;
   case 1:
-    iLayer = AliAlignObj::kSPD2;
+    iLayer = AliGeomManager::kSPD2;
     break;
   case 2:
-    iLayer = AliAlignObj::kSDD1;
+    iLayer = AliGeomManager::kSDD1;
     break;
   case 3:
-    iLayer = AliAlignObj::kSDD2;
+    iLayer = AliGeomManager::kSDD2;
     break;
   case 4:
-    iLayer = AliAlignObj::kSSD1;
+    iLayer = AliGeomManager::kSSD1;
     break;
   case 5:
-    iLayer = AliAlignObj::kSSD2;
+    iLayer = AliGeomManager::kSSD2;
     break;
   default:
     AliWarning(Form("Wrong layer index in ITS (%d) !",l));
     break;
   };
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,idet);
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,idet);
   p.SetVolumeID((UShort_t)volid);
   return kTRUE;
 }

diff --git a/ITS/MakeITSFullMisAlignment.C b/ITS/MakeITSFullMisAlignment.C
index d73ca51d04e073c8788261b4b8f16f7a0cf815a2..8e3ad7c1a5d720222257251284febf502f3a4182 100644 (file)
--- a/ITS/MakeITSFullMisAlignment.C
+++ b/ITS/MakeITSFullMisAlignment.C
@@ -30,57 +30,57 @@ void MakeITSFullMisAlignment(){
   AliAlignObjAngles* its_alobj = (AliAlignObjAngles*) array->UncheckedAt(0);
   its_alobj->ApplyToGeometry();
 
-  for ( Int_t l = AliAlignObj::kSPD1; l <= AliAlignObj::kSSD2; l++) {
+  for ( Int_t l = AliGeomManager::kSPD1; l <= AliGeomManager::kSSD2; l++) {
     
-    printf("%i modules in layer %i\n", AliAlignObj::LayerSize(l), l);
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(l); iModule++) {
+    printf("%i modules in layer %i\n", AliGeomManager::LayerSize(l), l);
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(l); iModule++) {
 
       dpsi   = rnd->Gaus(0., rot);
       dtheta = rnd->Gaus(0., rot);
       dphi   = rnd->Gaus(0., rot);
 
-      AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer; 
+      AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; 
       switch (l) {
       case 1: {
-       iLayer = AliAlignObj::kSPD1;
+       iLayer = AliGeomManager::kSPD1;
        dx = rnd->Gaus(0., spdXY + mecanicalPrec);
        dy = rnd->Gaus(0., spdXY + mecanicalPrec);
        dz = rnd->Gaus(0., spdZ + mecanicalPrec);
       }; break;
       case 2: {
-       iLayer = AliAlignObj::kSPD2;
+       iLayer = AliGeomManager::kSPD2;
        dx = rnd->Gaus(0., spdXY + mecanicalPrec);
        dy = rnd->Gaus(0., spdXY + mecanicalPrec);
        dz = rnd->Gaus(0., spdZ + mecanicalPrec);
       }; break;
       case 3: {
-       iLayer = AliAlignObj::kSDD1;
+       iLayer = AliGeomManager::kSDD1;
        dx = rnd->Gaus(0., sddXYZ + mecanicalPrec);
        dy = rnd->Gaus(0., sddXYZ + mecanicalPrec);
        dz = rnd->Gaus(0., sddXYZ + mecanicalPrec);
       }; break;
       case 4: {
-       iLayer = AliAlignObj::kSDD2;
+       iLayer = AliGeomManager::kSDD2;
        dx = rnd->Gaus(0., sddXYZ + mecanicalPrec);
        dy = rnd->Gaus(0., sddXYZ + mecanicalPrec);
        dz = rnd->Gaus(0., sddXYZ + mecanicalPrec);
       }; break;
       case 5: {
-       iLayer = AliAlignObj::kSSD1;
+       iLayer = AliGeomManager::kSSD1;
        dx = rnd->Gaus(0., ssdXY + mecanicalPrec);
        dy = rnd->Gaus(0., ssdXY + mecanicalPrec);
        dz = rnd->Gaus(0., ssdZ + mecanicalPrec);
       }; break;
       case 6: {
-       iLayer = AliAlignObj::kSSD2;
+       iLayer = AliGeomManager::kSSD2;
        dx = rnd->Gaus(0., ssdXY + mecanicalPrec);
        dy = rnd->Gaus(0., ssdXY + mecanicalPrec);
        dz = rnd->Gaus(0., ssdZ + mecanicalPrec);
       }; break;
       default: Printf("Wrong layer index in ITS (%d) !",l);
       };
-      UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      const char *symname = AliAlignObj::SymName(volid);
+      UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char *symname = AliGeomManager::SymName(volid);
 
       new(alobj[j++]) AliAlignObjAngles(symname, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
 

diff --git a/ITS/MakeITSResMisAlignment.C b/ITS/MakeITSResMisAlignment.C
index 14ca76cb75c82f56bb474493d069390e10f156b5..c8771761cf15fdcf7a752d74d633b4545e19be18 100644 (file)
--- a/ITS/MakeITSResMisAlignment.C
+++ b/ITS/MakeITSResMisAlignment.C
@@ -21,7 +21,7 @@ void MakeITSResMisAlignment(){
   AliAlignObjAngles a;
 
   Double_t dx=0., dy=0., dz=0., dpsi=0., dtheta=0., dphi=0.;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer; 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; 
 
   Int_t j = 0;
 
@@ -30,58 +30,58 @@ void MakeITSResMisAlignment(){
   its_alobj->ApplyToGeometry();
 
 
-  for ( Int_t l = AliAlignObj::kSPD1; l <= AliAlignObj::kSSD2; l++) {
+  for ( Int_t l = AliGeomManager::kSPD1; l <= AliGeomManager::kSSD2; l++) {
     
-    printf("%i modules in layer %i\n", AliAlignObj::LayerSize(l), l);
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(l); iModule++) {
+    printf("%i modules in layer %i\n", AliGeomManager::LayerSize(l), l);
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(l); iModule++) {
 
       dpsi   = rnd->Gaus(0., rot);
       dtheta = rnd->Gaus(0., rot);
       dphi   = rnd->Gaus(0., rot);
 
-      iLayer = AliAlignObj::kInvalidLayer; 
+      iLayer = AliGeomManager::kInvalidLayer; 
 
       switch (l) {
       case 1: {
-       iLayer = AliAlignObj::kSPD1;
+       iLayer = AliGeomManager::kSPD1;
        dx = rnd->Gaus(0., spdXY);
        dy = rnd->Gaus(0., spdXY);
        dz = rnd->Gaus(0., spdZ);
       }; break;
       case 2: {
-       iLayer = AliAlignObj::kSPD2;
+       iLayer = AliGeomManager::kSPD2;
        dx = rnd->Gaus(0., spdXY);
        dy = rnd->Gaus(0., spdXY);
        dz = rnd->Gaus(0., spdZ);
       }; break;
       case 3: {
-       iLayer = AliAlignObj::kSDD1;
+       iLayer = AliGeomManager::kSDD1;
        dx = rnd->Gaus(0., sddXYZ);
        dy = rnd->Gaus(0., sddXYZ);
        dz = rnd->Gaus(0., sddXYZ);
       }; break;
       case 4: {
-       iLayer = AliAlignObj::kSDD2;
+       iLayer = AliGeomManager::kSDD2;
        dx = rnd->Gaus(0., sddXYZ);
        dy = rnd->Gaus(0., sddXYZ);
        dz = rnd->Gaus(0., sddXYZ);
       }; break;
       case 5: {
-       iLayer = AliAlignObj::kSSD1;
+       iLayer = AliGeomManager::kSSD1;
        dx = rnd->Gaus(0., ssdXY);
        dy = rnd->Gaus(0., ssdXY);
        dz = rnd->Gaus(0., ssdZ);
       }; break;
       case 6: {
-       iLayer = AliAlignObj::kSSD2;
+       iLayer = AliGeomManager::kSSD2;
        dx = rnd->Gaus(0., ssdXY);
        dy = rnd->Gaus(0., ssdXY);
        dz = rnd->Gaus(0., ssdZ);
       }; break;
       default: Printf("Wrong layer index in ITS (%d) !",l);
       };
-      UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      const char *symname = AliAlignObj::SymName(volid);
+      UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char *symname = AliGeomManager::SymName(volid);
 
       new(alobj[j]) AliAlignObjAngles(symname, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
       j++;

diff --git a/ITS/MakeITSZeroMisAlignment.C b/ITS/MakeITSZeroMisAlignment.C
index 79720c3d65b44542e3c5fecb971832c3117ac3e9..e10d17b18ff05b7f7f27369d01088467e41e48bf 100644 (file)
--- a/ITS/MakeITSZeroMisAlignment.C
+++ b/ITS/MakeITSZeroMisAlignment.C
@@ -10,43 +10,43 @@ void MakeITSZeroMisAlignment(){
   AliAlignObjAngles a;
 
   Double_t dx=0., dy=0., dz=0., dpsi=0., dtheta=0., dphi=0., globalZ=0.;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer; 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; 
 
   Int_t j = 0;
 
   new(alobj[j]) AliAlignObjAngles("ITS", 0, dx, dy, globalZ, dpsi, dtheta, dphi, kTRUE);
   j++;
 
-  for ( Int_t l = AliAlignObj::kSPD1; l <= AliAlignObj::kSSD2; l++) {
+  for ( Int_t l = AliGeomManager::kSPD1; l <= AliGeomManager::kSSD2; l++) {
     
-    printf("%i modules in layer %i\n", AliAlignObj::LayerSize(l), l);
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(l); iModule++) {
+    printf("%i modules in layer %i\n", AliGeomManager::LayerSize(l), l);
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(l); iModule++) {
 
-      iLayer = AliAlignObj::kInvalidLayer; 
+      iLayer = AliGeomManager::kInvalidLayer; 
 
       switch (l) {
       case 1: {
-       iLayer = AliAlignObj::kSPD1;
+       iLayer = AliGeomManager::kSPD1;
       }; break;
       case 2: {
-       iLayer = AliAlignObj::kSPD2;
+       iLayer = AliGeomManager::kSPD2;
       }; break;
       case 3: {
-       iLayer = AliAlignObj::kSDD1;
+       iLayer = AliGeomManager::kSDD1;
       }; break;
       case 4: {
-       iLayer = AliAlignObj::kSDD2;
+       iLayer = AliGeomManager::kSDD2;
       }; break;
       case 5: {
-       iLayer = AliAlignObj::kSSD1;
+       iLayer = AliGeomManager::kSSD1;
       }; break;
       case 6: {
-       iLayer = AliAlignObj::kSSD2;
+       iLayer = AliGeomManager::kSSD2;
       }; break;
       default: Printf("Wrong layer index in ITS (%d) !",l);
       };
-      UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      const char *symname = AliAlignObj::SymName(volid);
+      UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char *symname = AliGeomManager::SymName(volid);
 
       new(alobj[j]) AliAlignObjAngles(symname, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
       j++;

diff --git a/MUON/AliMUONGeometryTransformer.cxx b/MUON/AliMUONGeometryTransformer.cxx
index 9665ec067b4540315f13a8c2327269d544b7cc16..3ff6521f6a102c2fbbb3c7657adaedeabf514e83 100644 (file)
--- a/MUON/AliMUONGeometryTransformer.cxx
+++ b/MUON/AliMUONGeometryTransformer.cxx
@@ -830,7 +830,7 @@ void  AliMUONGeometryTransformer::AddMisAlignModule(Int_t moduleId,
   }   
   
   // 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;
@@ -858,7 +858,7 @@ void  AliMUONGeometryTransformer::AddMisAlignDetElement(Int_t detElemId,
   }   
   
   // 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;
@@ -935,7 +935,7 @@ TClonesArray* AliMUONGeometryTransformer::CreateZeroAlignmentData() const
     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();
@@ -955,7 +955,7 @@ TClonesArray* AliMUONGeometryTransformer::CreateZeroAlignmentData() const
       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();

diff --git a/PHOS/AliPHOSSurvey.cxx b/PHOS/AliPHOSSurvey.cxx
index 0e3c2aba885458be5ea7af6b2fe8a6f3f9373543..d3d2e9c2ff7f7c0d4f1c82af3839238a8f55477b 100644 (file)
--- a/PHOS/AliPHOSSurvey.cxx
+++ b/PHOS/AliPHOSSurvey.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.1  2007/04/19 15:47:20  kharlov
+ * Add misalignment of strip units with AliPHOSSurvey class
+ *
  */
 
 // Objects of this class read txt file with survey (photogrammetry) data
@@ -148,8 +151,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) {
@@ -175,8 +178,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)

diff --git a/PHOS/MakePHOSFullMisAlignment.C b/PHOS/MakePHOSFullMisAlignment.C
index e433b941f6fece965888ab64cd9d34f3185d1de0..30cc94aae28566bafd203043da7957ac1d162066 100644 (file)
--- a/PHOS/MakePHOSFullMisAlignment.C
+++ b/PHOS/MakePHOSFullMisAlignment.C
@@ -15,8 +15,8 @@ void MakePHOSFullMisAlignment(){
   Double_t dpsi=0., dtheta=0., dphi=0.;
   Double_t displacement = 10;
   Int_t iIndex=0; //let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
   Int_t i=0 ;
 
   // Alignment for 5 PHOS modules

diff --git a/PHOS/MakePHOSResMisAlignment.C b/PHOS/MakePHOSResMisAlignment.C
index 16ecbdf24e8599e53ccac50205d6b9391ea16702..5b4bee37fc12af5d9dc99c895bf316a6a90013c1 100644 (file)
--- a/PHOS/MakePHOSResMisAlignment.C
+++ b/PHOS/MakePHOSResMisAlignment.C
@@ -15,8 +15,8 @@ void MakePHOSResMisAlignment(){
   Double_t dpsi=0., dtheta=0., dphi=0.;
   Double_t displacement = 0.2;
   Int_t iIndex=0; // let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
  
   Int_t i=0 ;
   // Alignment for 5 PHOS modules

diff --git a/PHOS/MakePHOSZeroMisAlignment.C b/PHOS/MakePHOSZeroMisAlignment.C
index 42d02fbea8d83e496fd390bd959e4f01e72c5db0..86a9d54fcc63bd6fbae29707aec30bbe1e6cde58 100644 (file)
--- a/PHOS/MakePHOSZeroMisAlignment.C
+++ b/PHOS/MakePHOSZeroMisAlignment.C
@@ -14,8 +14,8 @@ void MakePHOSZeroMisAlignment(){
    
   Double_t dx=0., dy=0., dz=0., dpsi=0., dtheta=0., dphi=0.;
   Int_t iIndex=0; // let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
  
   Int_t i=0 ;
   // Alignment for 5 PHOS modules

diff --git a/PHOS/macros/AlignmentDB/AliPHOSSetAlignment.C b/PHOS/macros/AlignmentDB/AliPHOSSetAlignment.C
index 595d14e025fff28ec8aa8c416e95d9718e784cab..a63f2b5d5908dddd65d547ead70e3751eae3c390 100644 (file)
--- a/PHOS/macros/AlignmentDB/AliPHOSSetAlignment.C
+++ b/PHOS/macros/AlignmentDB/AliPHOSSetAlignment.C
@@ -66,8 +66,8 @@ void IdealAlignment()
   // null shifts and rotations
 
   UShort_t iIndex=0;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
 
   TString basePath = "PHOS/Module"; 
   const Int_t nModules=5;
@@ -110,8 +110,8 @@ void ResidualAlignment()
   Double_t displacement = 0.2;
 
   UShort_t iIndex=0;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
 
   // Alignment for 5 PHOS modules
   new(alobj[0]) AliAlignObjAngles("PHOS/Module1",
@@ -171,8 +171,8 @@ void FullMisalignment()
   Double_t displacement = 10;
 
   UShort_t iIndex=0;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
 
   // Alignment for 5 PHOS modules
   new(alobj[0]) AliAlignObjAngles("PHOS/Module1",

diff --git a/PMD/AliPMDAlObjRnd.C b/PMD/AliPMDAlObjRnd.C
index ec69783c2d28440983288c0af2f89e2b232fd420..b1a01f31c61eacf1f26470bab36457c741045715 100644 (file)
--- a/PMD/AliPMDAlObjRnd.C
+++ b/PMD/AliPMDAlObjRnd.C
@@ -92,9 +92,9 @@ void AliPMDAlObjRnd(Float_t max_trans=1.0, Float_t max_rot=0.1)
   AliAlignObjAngles o;
   
   UShort_t iIndex=0;
-//   AliAlignObj::ELayerID iLayer = AliAlignObj::kTOF;
+//   AliGeomManager::ELayerID iLayer = AliGeomManager::kTOF;
 
-//   UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
+//   UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
 
   new(alobj[0]) AliAlignObjAngles(Sector1, iIndex, dx14, dy14, dz14, dpsi14, dtheta14, dphi14);
   new(alobj[1]) AliAlignObjAngles(Sector2, iIndex, dx14, dy14, dz14, dpsi14, dtheta14, dphi14);

diff --git a/PMD/MakePMDFullMisAlignment.C b/PMD/MakePMDFullMisAlignment.C
index 4bf94c77801bd77e3b2297a8199a76702df15916..5a943859df997f05f9e2593c32ad080aae9a490a 100644 (file)
--- a/PMD/MakePMDFullMisAlignment.C
+++ b/PMD/MakePMDFullMisAlignment.C
@@ -94,8 +94,8 @@ void MakePMDFullMisAlignment(){
   AliAlignObjAngles o;
   
   Int_t iIndex=0; //let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   new(alobj[0]) AliAlignObjAngles(Sector1, volid, dx14, dy14, dz14, dpsi14, dtheta14, dphi14, kFALSE);
   new(alobj[1]) AliAlignObjAngles(Sector2, volid, dx14, dy14, dz14, dpsi14, dtheta14, dphi14, kFALSE);

diff --git a/PMD/MakePMDResMisAlignment.C b/PMD/MakePMDResMisAlignment.C
index 7b7f0aa13c0676d5c0dcdff85acaab2e5dc7c314..ff658f9dc991ca9b5b25fdf9ab5bcbfa9604ae66 100644 (file)
--- a/PMD/MakePMDResMisAlignment.C
+++ b/PMD/MakePMDResMisAlignment.C
@@ -93,8 +93,8 @@ void MakePMDResMisAlignment(){
   AliAlignObjAngles o;
   
   Int_t iIndex=0; //  let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   new(alobj[0]) AliAlignObjAngles(Sector1, volid, dx14, dy14, dz14, dpsi14, dtheta14, dphi14, kFALSE);
   new(alobj[1]) AliAlignObjAngles(Sector2, volid, dx14, dy14, dz14, dpsi14, dtheta14, dphi14, kFALSE);

diff --git a/PMD/MakePMDZeroMisAlignment.C b/PMD/MakePMDZeroMisAlignment.C
index f1d635d85cf9fbd13a29a78f7af53ca5705a0558..b178f3fe0282f5cadf9a208c58ad06aa1de17453 100644 (file)
--- a/PMD/MakePMDZeroMisAlignment.C
+++ b/PMD/MakePMDZeroMisAlignment.C
@@ -44,8 +44,8 @@ void MakePMDZeroMisAlignment(){
   AliAlignObjAngles o;
   
   Int_t iIndex=0; //  let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
   Double_t dx=0., dy=0., dz=0., dpsi=0., dtheta=0., dphi=0.;
   Int_t i, j=0;
 

diff --git a/T0/MakeT0FullMisAlignment.C b/T0/MakeT0FullMisAlignment.C
index 67b08cddeca9245247866838fd64cb170e5f4860..0ea0274927f1d445a57d87e3e3654f6fcb8d38ce 100644 (file)
--- a/T0/MakeT0FullMisAlignment.C
+++ b/T0/MakeT0FullMisAlignment.C
@@ -16,8 +16,8 @@ void MakeT0FullMisAlignment(){
   TString symName, sn;
 
   Int_t 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);
 
   Int_t j=0;
   for (Int_t imod=0; imod<24; imod++){

diff --git a/T0/MakeT0ResMisAlignment.C b/T0/MakeT0ResMisAlignment.C
index 49c4f62c7cb206ab9577afa373afed6b6e37141a..db62a31ac36353c3417c9cd7d699158c57636b89 100644 (file)
--- a/T0/MakeT0ResMisAlignment.C
+++ b/T0/MakeT0ResMisAlignment.C
@@ -17,8 +17,8 @@ void MakeT0ResMisAlignment(){
   TString symName, sn;
 
   Int_t 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);
 
   Int_t j=0;
   for (Int_t imod=0; imod<24; imod++){

diff --git a/T0/MakeT0ZeroMisAlignment.C b/T0/MakeT0ZeroMisAlignment.C
index c684c56fb9f610a8cb6a2e720f9a7fa1f1b53a3b..eded0620e17a2f69e42261b316e4ee4ce1b5dd04 100644 (file)
--- a/T0/MakeT0ZeroMisAlignment.C
+++ b/T0/MakeT0ZeroMisAlignment.C
@@ -11,8 +11,8 @@ void MakeT0ZeroMisAlignment(){
   TString symName, sn;
 
   Int_t 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);
 
   Int_t j=0;
   for (Int_t imod=0; imod<24; imod++)

diff --git a/TOF/AliTOFAlignment.cxx b/TOF/AliTOFAlignment.cxx
index f5b9be31549a78a7d544d10480e76ad3fbabfa1e..b691e1419b7e2008cd68685d9c08e07827fdb786 100644 (file)
--- a/TOF/AliTOFAlignment.cxx
+++ b/TOF/AliTOFAlignment.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.15  2007/05/03 09:25:10  decaro
+Coding convention: RN13 violation -> suppression
+
 Revision 1.14  2007/04/18 14:49:54  arcelli
 Some code cleanup, added more debug info
 
@@ -157,11 +160,11 @@ void AliTOFAlignment::Smear( Float_t *tr, Float_t *rot)
   TRandom *rnd   = new TRandom(1567);
  
   Int_t nSMTOF = 18;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
   UShort_t iIndex=0; //dummy volume index
-  //  AliAlignObj::ELayerID iLayer = AliAlignObj::kTOF;
+  //  AliGeomManager::ELayerID iLayer = AliGeomManager::kTOF;
   //  Int_t iIndex=1; //dummy volume index
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
   Int_t i;
   for (i = 0; i<nSMTOF ; i++) {
     Char_t  path[100];
@@ -193,9 +196,9 @@ void AliTOFAlignment::Align( Float_t *tr, Float_t *rot)
 
 
   Int_t nSMTOF = 18;
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
   UShort_t iIndex=0; //dummy volume index
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy volume identity 
   Int_t i;
   for (i = 0; i<nSMTOF ; i++) {
 
@@ -463,8 +466,8 @@ void AliTOFAlignment::AlignFromSurvey()
 
   fTOFAlignObjArray = new TObjArray(kMaxAlignObj);
   Int_t index=0; //let all SM modules have index=0
-  AliAlignObj::ELayerID layer = AliAlignObj::kInvalidLayer;
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(layer,index); //dummy vol id 
+  AliGeomManager::ELayerID layer = AliGeomManager::kInvalidLayer;
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(layer,index); //dummy vol id 
   
   for(Int_t iSM=0;iSM<18;iSM++){
 

diff --git a/TOF/AliTOFtracker.cxx b/TOF/AliTOFtracker.cxx
index ba1f27b6b8a55f667337486b4df86a308d9f51d9..a89240bb0067312c77f0ec7d699d971fe7739dda 100644 (file)
--- a/TOF/AliTOFtracker.cxx
+++ b/TOF/AliTOFtracker.cxx
@@ -858,7 +858,7 @@ Bool_t AliTOFtracker::GetTrackPoint(Int_t index, AliTrackPoint& p) const
   Int_t idet = (2*(nStripC+nStripB)+nStripA)*isector +
                stripOffset +
                istrip;
-  UShort_t volid = AliAlignObj::LayerToVolUID(AliAlignObj::kTOF,idet);
+  UShort_t volid = AliGeomManager::LayerToVolUID(AliGeomManager::kTOF,idet);
   p.SetVolumeID((UShort_t)volid);
   return kTRUE;
 }

diff --git a/TOF/MakeTOFFullMisAlignment.C b/TOF/MakeTOFFullMisAlignment.C
index 02bddee17e59e2295e69112261c2f821009933d2..327584ce2369b9af13a93207ed80476beb288557 100644 (file)
--- a/TOF/MakeTOFFullMisAlignment.C
+++ b/TOF/MakeTOFFullMisAlignment.C
@@ -9,8 +9,8 @@ void MakeTOFFullMisAlignment(){
   AliAlignObjAngles a;
   Double_t sfdpsi=0.,sfdtheta=0.,sfdphi=0.;
   Int_t iIndex=0; //let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t dvoluid = AliAlignObj::LayerToVolUID(iLayer,iIndex); //dummy vol id 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t dvoluid = AliGeomManager::LayerToVolUID(iLayer,iIndex); //dummy vol id 
 
   // FRAME part !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   const char* basepath ="ALIC_1/B077_1/BSEGMO";
@@ -138,7 +138,7 @@ void MakeTOFFullMisAlignment(){
   gGeoManager=0x0;
   TGeoManager::Import("/home/rgrosso/MacroAllineamento010207/geom_misalBSEGMO_tofSM.root");
   // tof strips as in residual
-  AliAlignObj::ELayerID idTOF = AliAlignObj::kTOF;
+  AliGeomManager::ELayerID idTOF = AliGeomManager::kTOF;
 
   Double_t sdx=0.; 
   Double_t sdy=0.; 
@@ -147,14 +147,14 @@ void MakeTOFFullMisAlignment(){
   TRandom *rnds   = new TRandom(4357);
   sigmatr = 0.1; // max shift in cm w.r.t. local ideal RS
 
-  for(i=0; i<AliAlignObj::LayerSize(idTOF); i++) {
+  for(i=0; i<AliGeomManager::LayerSize(idTOF); i++) {
     sdx = 0;
     sdy = rnds->Gaus(0.,sigmatr);
     sdz = rnds->Gaus(0.,sigmatr);
     sdpsi = 0.;
     sdtheta = 0.;
     sdphi = 0.;
-    new(alobj[j++]) AliAlignObjAngles(AliAlignObj::SymName(idTOF,i), AliAlignObj::LayerToVolUID(idTOF,i), sdx, sdy, sdz, sdpsi, sdtheta, sdphi, kFALSE);
+    new(alobj[j++]) AliAlignObjAngles(AliGeomManager::SymName(idTOF,i), AliGeomManager::LayerToVolUID(idTOF,i), sdx, sdy, sdz, sdpsi, sdtheta, sdphi, kFALSE);
   }
 
   if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){

diff --git a/TOF/MakeTOFResMisAlignment.C b/TOF/MakeTOFResMisAlignment.C
index 58a2eed31fbc24be34c8ff7158dd646e36e28ba5..5b3150dce089f877856dd61827c71b09edaf3068 100644 (file)
--- a/TOF/MakeTOFResMisAlignment.C
+++ b/TOF/MakeTOFResMisAlignment.C
@@ -9,7 +9,7 @@ void MakeTOFResMisAlignment(){
 
   AliAlignObjAngles a;
 
-  AliAlignObj::ELayerID idTOF = AliAlignObj::kTOF;
+  AliGeomManager::ELayerID idTOF = AliGeomManager::kTOF;
   Int_t i;
   Int_t j=0;
   Double_t dx=0.; 
@@ -19,14 +19,14 @@ void MakeTOFResMisAlignment(){
   TRandom *rnd   = new TRandom(4357);
   Double_t sigmatr = 0.1; // max shift in cm w.r.t. local ideal RS
 
-  for(i=0; i<AliAlignObj::LayerSize(idTOF); i++) {
+  for(i=0; i<AliGeomManager::LayerSize(idTOF); i++) {
     dx = 0;
     dy = rnd->Gaus(0.,sigmatr);
     dz = rnd->Gaus(0.,sigmatr);
     dpsi = 0.;
     dtheta = 0.;
     dphi = 0.;
-    new(alobj[j]) AliAlignObjAngles(AliAlignObj::SymName(idTOF,i), AliAlignObj::LayerToVolUID(idTOF,i), dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
+    new(alobj[j]) AliAlignObjAngles(AliGeomManager::SymName(idTOF,i), AliGeomManager::LayerToVolUID(idTOF,i), dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
     j++;
   }
 

diff --git a/TOF/MakeTOFZeroMisAlignment.C b/TOF/MakeTOFZeroMisAlignment.C
index 985ef7f409f1a224a9d31861667a7214a4275dcd..93f5d98baca390a6b890d04192a3a816c5ab59cb 100644 (file)
--- a/TOF/MakeTOFZeroMisAlignment.C
+++ b/TOF/MakeTOFZeroMisAlignment.C
@@ -9,13 +9,13 @@ void MakeTOFZeroMisAlignment(){
 
   AliAlignObjAngles a;
 
-  AliAlignObj::ELayerID idTOF = AliAlignObj::kTOF;
+  AliGeomManager::ELayerID idTOF = AliGeomManager::kTOF;
   Int_t i;
   Int_t j=0;
   Double_t dx=0., dy=0., dz=0., dpsi=0., dtheta=0., dphi=0.;
 
-  for(i=0; i<AliAlignObj::LayerSize(idTOF); i++) {
-    new(alobj[j++]) AliAlignObjAngles(AliAlignObj::SymName(idTOF,i), AliAlignObj::LayerToVolUID(idTOF,i), dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+  for(i=0; i<AliGeomManager::LayerSize(idTOF); i++) {
+    new(alobj[j++]) AliAlignObjAngles(AliGeomManager::SymName(idTOF,i), AliGeomManager::LayerToVolUID(idTOF,i), dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
 
   if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){

diff --git a/TPC/AliTPCParam.cxx b/TPC/AliTPCParam.cxx
index af21dcfed34fb19bace77833e6f7b19ed6c672e2..b4f098277ea15105d333a82670f25972af814992 100644 (file)
--- a/TPC/AliTPCParam.cxx
+++ b/TPC/AliTPCParam.cxx
@@ -628,20 +628,20 @@ Bool_t AliTPCParam::ReadGeoMatrices(){
     fGlobalMatrix[isec] = 0;
     fClusterMatrix[isec]= 0;
     fTrackingMatrix[isec]=0;   
-    AliAlignObj::ELayerID iLayer;
+    AliGeomManager::ELayerID iLayer;
     Int_t iModule;
 
     if(isec<fNInnerSector) {
-      iLayer = AliAlignObj::kTPC1;
+      iLayer = AliGeomManager::kTPC1;
       iModule = isec;
     }
     else {
-      iLayer = AliAlignObj::kTPC2;
+      iLayer = AliGeomManager::kTPC2;
       iModule = isec - fNInnerSector;
     }
 
-    UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-    const char *symname = AliAlignObj::SymName(volid);
+    UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+    const char *symname = AliGeomManager::SymName(volid);
     TGeoPNEntry* pne = gGeoManager->GetAlignableEntry(symname);
     const char *path = symname;
     if(pne) path=pne->GetTitle();

diff --git a/TPC/AliTPCtrackerMI.cxx b/TPC/AliTPCtrackerMI.cxx
index 0fff3dd37e967ccc45fb9a46a6c732e06bc33f64..bd88035b494c51fdc4d67637810b192436c8467c 100644 (file)
--- a/TPC/AliTPCtrackerMI.cxx
+++ b/TPC/AliTPCtrackerMI.cxx
@@ -1669,17 +1669,17 @@ Bool_t AliTPCtrackerMI::GetTrackPoint(Int_t index, AliTrackPoint &p ) const
   cov[4] = 0.;
   cov[5] = sigmaZ2;
   p.SetXYZ(x,y,xyz[2],cov);
-  AliAlignObj::ELayerID iLayer;
+  AliGeomManager::ELayerID iLayer;
   Int_t idet;
   if (sector < fParam->GetNInnerSector()) {
-    iLayer = AliAlignObj::kTPC1;
+    iLayer = AliGeomManager::kTPC1;
     idet = sector;
   }
   else {
-    iLayer = AliAlignObj::kTPC2;
+    iLayer = AliGeomManager::kTPC2;
     idet = sector - fParam->GetNInnerSector();
   }
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,idet);
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,idet);
   p.SetVolumeID(volid);
   return kTRUE;
 }

diff --git a/TPC/Cal/AliTPCCreateDummyCDB.C b/TPC/Cal/AliTPCCreateDummyCDB.C
index 4eebe753dffd499f3421d8d4dc3e38f06ca03faf..f9e906db01abf349efed57a6b2eb29835f6c515c 100644 (file)
--- a/TPC/Cal/AliTPCCreateDummyCDB.C
+++ b/TPC/Cal/AliTPCCreateDummyCDB.C
@@ -135,8 +135,8 @@ void GenerateRndTPC(Float_t sigmatrx=0., Float_t sigmatry=0, Float_t sigmatrz=0,
   TRandom *rnd   = new TRandom(4357);
   AliAlignObjAngles o;
   Int_t j = 0;
-  for (Int_t iLayer = AliAlignObj::kTPC1; iLayer <= AliAlignObj::kTPC2; iLayer++) {
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
+  for (Int_t iLayer = AliGeomManager::kTPC1; iLayer <= AliGeomManager::kTPC2; iLayer++) {
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(iLayer); iModule++) {
 
       Float_t dx = (rnd->Uniform()-0.5)*sigmatrx;
       Float_t dy = (rnd->Uniform()-0.5)*sigmatry;
@@ -145,8 +145,8 @@ void GenerateRndTPC(Float_t sigmatrx=0., Float_t sigmatry=0, Float_t sigmatrz=0,
       Float_t dtheta = (rnd->Uniform()-0.5)*sigmarot;
       Float_t dphi = (rnd->Uniform()-0.5)*sigmarot;
 
-      UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      const char *path = AliAlignObj::GetVolPath(volid);
+      UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char *path = AliGeomManager::GetVolPath(volid);
       new(alobj[j]) AliAlignObjAngles(path, volid, dx, dy, dz, dpsi, dtheta, dphi);
       j++;
     }

diff --git a/TPC/MakeTPCFullMisAlignment.C b/TPC/MakeTPCFullMisAlignment.C
index f558ba94be0a33fc9e1c954e5e97da283ac5471e..7e864fffc156cd7f68669d2384555be30bd90779 100644 (file)
--- a/TPC/MakeTPCFullMisAlignment.C
+++ b/TPC/MakeTPCFullMisAlignment.C
@@ -18,8 +18,8 @@ void MakeTPCFullMisAlignment(){
   Float_t sigmatr=0.01;
   Float_t sigmarot = 0.006;
 
-  for (Int_t iLayer = AliAlignObj::kTPC1; iLayer <= AliAlignObj::kTPC2; iLayer++) {
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
+  for (Int_t iLayer = AliGeomManager::kTPC1; iLayer <= AliGeomManager::kTPC2; iLayer++) {
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(iLayer); iModule++) {
 
       dx = rnd->Gaus(0,sigmatr);
       dy = rnd->Gaus(0,sigmatr);
@@ -28,8 +28,8 @@ void MakeTPCFullMisAlignment(){
       dtheta = rnd->Gaus(0,sigmarot);
       dphi = rnd->Gaus(0,sigmarot);
 
-      UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      const char *symname = AliAlignObj::SymName(volid);
+      UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char *symname = AliGeomManager::SymName(volid);
       new(alobj[j++]) AliAlignObjAngles(symname, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
     }
   }

diff --git a/TPC/MakeTPCResMisAlignment.C b/TPC/MakeTPCResMisAlignment.C
index 1ed99415e46722432274d15b1429d86ce6fb40ec..f6f635ea7513ee57f94b239683cc87340e049eca 100644 (file)
--- a/TPC/MakeTPCResMisAlignment.C
+++ b/TPC/MakeTPCResMisAlignment.C
@@ -17,8 +17,8 @@ void MakeTPCResMisAlignment(){
   // sigma rotation = 0.1 mrad
   Float_t sigmatr=0.01;
   Float_t sigmarot = 0.006;
-  for (Int_t iLayer = AliAlignObj::kTPC1; iLayer <= AliAlignObj::kTPC2; iLayer++) {
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
+  for (Int_t iLayer = AliGeomManager::kTPC1; iLayer <= AliGeomManager::kTPC2; iLayer++) {
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(iLayer); iModule++) {
 
       dx = rnd->Gaus(0,sigmatr);
       dy = rnd->Gaus(0,sigmatr);
@@ -27,8 +27,8 @@ void MakeTPCResMisAlignment(){
       dtheta = rnd->Gaus(0,sigmarot);
       dphi = rnd->Gaus(0,sigmarot);
 
-      UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      const char *symname = AliAlignObj::SymName(volid);
+      UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char *symname = AliGeomManager::SymName(volid);
       new(alobj[j]) AliAlignObjAngles(symname, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
       j++;
     }

diff --git a/TPC/MakeTPCZeroMisAlignment.C b/TPC/MakeTPCZeroMisAlignment.C
index e3a48aad4adaf9a8afd33dc40f9e8cdba4c278bc..3af90ecbda182b012c42decbb9ff568c7d61a627 100644 (file)
--- a/TPC/MakeTPCZeroMisAlignment.C
+++ b/TPC/MakeTPCZeroMisAlignment.C
@@ -12,11 +12,11 @@ void MakeTPCZeroMisAlignment(){
   Int_t j = 0;
 
   // RS = local
-  for (Int_t iLayer = AliAlignObj::kTPC1; iLayer <= AliAlignObj::kTPC2; iLayer++) {
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
+  for (Int_t iLayer = AliGeomManager::kTPC1; iLayer <= AliGeomManager::kTPC2; iLayer++) {
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(iLayer); iModule++) {
 
-      UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      const char *symname = AliAlignObj::SymName(volid);
+      UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char *symname = AliGeomManager::SymName(volid);
       new(alobj[j]) AliAlignObjAngles(symname, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
       j++;
     }

diff --git a/TRD/AliTRDalignment.h b/TRD/AliTRDalignment.h
index 4bdcd6f136c144faa4e021f524f38b718cf2f341..dd85fb63a6b5f34603ec5c7f94d2a133392fbcef 100644 (file)
--- a/TRD/AliTRDalignment.h
+++ b/TRD/AliTRDalignment.h
@@ -88,9 +88,9 @@ class AliTRDalignment : public TObject {
   // module number, 0-89
   int GetMod(int ch) const                           {return 5*GetSec(ch)+GetSta(ch);                           } 
   // layer number, 9-14
-  int GetLay(int ch) const                           {return AliAlignObj::kTRD1+GetPla(ch);                     }
+  int GetLay(int ch) const                           {return AliGeomManager::kTRD1+GetPla(ch);                     }
   // volume id
-  UShort_t GetVoi(int ch) const                      {return AliAlignObj::LayerToVolUID(GetLay(ch),GetMod(ch)); }
+  UShort_t GetVoi(int ch) const                      {return AliGeomManager::LayerToVolUID(GetLay(ch),GetMod(ch)); }
   // symbolic name of a supermodule
   char *GetSmName(int sm) const                      {return Form("TRD/sm%02d",sm);                             }
   // symbolic name of a chamber

diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx
index a765085238438bfb5385f2681234f077b40f61bf..fbb6f80fabc189b3bd6f7301eb4fddbbd6d97f5d 100644 (file)
--- a/TRD/AliTRDgeometry.cxx
+++ b/TRD/AliTRDgeometry.cxx
@@ -1540,11 +1540,11 @@ Bool_t AliTRDgeometry::ReadGeoMatrices()
   fMatrixGeo             = new TObjArray(kNdet);
   AliAlignObjAngles o;
 
-  for (Int_t iLayer = AliAlignObj::kTRD1; iLayer <= AliAlignObj::kTRD6; iLayer++) {
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
+  for (Int_t iLayer = AliGeomManager::kTRD1; iLayer <= AliGeomManager::kTRD6; iLayer++) {
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(iLayer); iModule++) {
 
-      UShort_t     volid   = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      const char  *symname = AliAlignObj::SymName(volid);
+      UShort_t     volid   = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char  *symname = AliGeomManager::SymName(volid);
       TGeoPNEntry *pne     = gGeoManager->GetAlignableEntry(symname);
       const char  *path    = symname;
       if (pne) {
@@ -1554,7 +1554,7 @@ Bool_t AliTRDgeometry::ReadGeoMatrices()
         return kFALSE;
       }
       TGeoHMatrix *m         = gGeoManager->GetCurrentMatrix();
-      Int_t        iLayerTRD = iLayer - AliAlignObj::kTRD1;
+      Int_t        iLayerTRD = iLayer - AliGeomManager::kTRD1;
       Int_t        isector   = Nsect() - 1 - (iModule/Ncham());
       Int_t        ichamber  = Ncham() - 1 - (iModule%Ncham());
       Int_t        lid       = GetDetector(iLayerTRD,ichamber,isector);    

diff --git a/TRD/AliTRDtracker.cxx b/TRD/AliTRDtracker.cxx
index a180ce49322cd2e24c41175b0f747519d8c76d8c..32a621d5e1954a9d197762926efb21f2e3035fea 100644 (file)
--- a/TRD/AliTRDtracker.cxx
+++ b/TRD/AliTRDtracker.cxx
@@ -264,30 +264,30 @@ Int_t  AliTRDtracker::LocalToGlobalID(Int_t lid)
   Int_t  ichamber = fGeom->GetChamber(lid);
   Int_t  iplan    = fGeom->GetPlane(lid);
 
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kTRD1;
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kTRD1;
   switch (iplan) {
   case 0:
-    iLayer = AliAlignObj::kTRD1;
+    iLayer = AliGeomManager::kTRD1;
     break;
   case 1:
-    iLayer = AliAlignObj::kTRD2;
+    iLayer = AliGeomManager::kTRD2;
     break;
   case 2:
-    iLayer = AliAlignObj::kTRD3;
+    iLayer = AliGeomManager::kTRD3;
     break;
   case 3:
-    iLayer = AliAlignObj::kTRD4;
+    iLayer = AliGeomManager::kTRD4;
     break;
   case 4:
-    iLayer = AliAlignObj::kTRD5;
+    iLayer = AliGeomManager::kTRD5;
     break;
   case 5:
-    iLayer = AliAlignObj::kTRD6;
+    iLayer = AliGeomManager::kTRD6;
     break;
   };
 
   Int_t    modId = isector * fGeom->Ncham() + ichamber;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,modId);
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,modId);
 
   return volid;
 
@@ -301,29 +301,29 @@ Int_t  AliTRDtracker::GlobalToLocalID(Int_t gid)
   // 
 
   Int_t modId    = 0;
-  AliAlignObj::ELayerID layerId = AliAlignObj::VolUIDToLayer(gid,modId);
+  AliGeomManager::ELayerID layerId = AliGeomManager::VolUIDToLayer(gid,modId);
 
   Int_t isector  = modId / fGeom->Ncham();
   Int_t ichamber = modId % fGeom->Ncham();
   Int_t iLayer   = -1;
 
   switch (layerId) {
-  case AliAlignObj::kTRD1:
+  case AliGeomManager::kTRD1:
     iLayer = 0;
     break;
-  case AliAlignObj::kTRD2:
+  case AliGeomManager::kTRD2:
     iLayer = 1;
     break;
-  case AliAlignObj::kTRD3:
+  case AliGeomManager::kTRD3:
     iLayer = 2;
     break;
-  case AliAlignObj::kTRD4:
+  case AliGeomManager::kTRD4:
     iLayer = 3;
     break;
-  case AliAlignObj::kTRD5:
+  case AliGeomManager::kTRD5:
     iLayer = 4;
     break;
-  case AliAlignObj::kTRD6:
+  case AliGeomManager::kTRD6:
     iLayer = 5;
     break;
   default:
@@ -2758,29 +2758,29 @@ Bool_t AliTRDtracker::GetTrackPoint(Int_t index, AliTrackPoint &p) const
   Double_t global[3];
   fGeom->RotateBack(idet,local,global);
   p.SetXYZ(global[0],global[1],global[2]);
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kTRD1;
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kTRD1;
   switch (iplan) {
   case 0:
-    iLayer = AliAlignObj::kTRD1;
+    iLayer = AliGeomManager::kTRD1;
     break;
   case 1:
-    iLayer = AliAlignObj::kTRD2;
+    iLayer = AliGeomManager::kTRD2;
     break;
   case 2:
-    iLayer = AliAlignObj::kTRD3;
+    iLayer = AliGeomManager::kTRD3;
     break;
   case 3:
-    iLayer = AliAlignObj::kTRD4;
+    iLayer = AliGeomManager::kTRD4;
     break;
   case 4:
-    iLayer = AliAlignObj::kTRD5;
+    iLayer = AliGeomManager::kTRD5;
     break;
   case 5:
-    iLayer = AliAlignObj::kTRD6;
+    iLayer = AliGeomManager::kTRD6;
     break;
   };
   Int_t    modId = isector * fGeom->Ncham() + ichamber;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,modId);
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,modId);
   p.SetVolumeID(volid);
 
   return kTRUE;

diff --git a/TRD/MakeTRDFullMisAlignment.C b/TRD/MakeTRDFullMisAlignment.C
index b1cedd648f536525e1290cf4e56c768503f0dc95..271b606cfd289dc0cee7c0f544c37498c9e7540f 100644 (file)
--- a/TRD/MakeTRDFullMisAlignment.C
+++ b/TRD/MakeTRDFullMisAlignment.C
@@ -59,8 +59,8 @@ void MakeTRDFullMisAlignment(){
   TGeoManager::Import("/home/rgrosso/MacroAllineamento010207/geom_misalBSEGMO_trdSM.root");
   // create the chambers' alignment objects
   ran = new TRandom(4357);
-  for (Int_t iLayer = AliAlignObj::kTRD1; iLayer <= AliAlignObj::kTRD6; iLayer++) {
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
+  for (Int_t iLayer = AliGeomManager::kTRD1; iLayer <= AliGeomManager::kTRD6; iLayer++) {
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(iLayer); iModule++) {
       ran->Rannor(dx,rx);
       ran->Rannor(dy,ry);
       ran->Rannor(dz,rz);
@@ -70,8 +70,8 @@ void MakeTRDFullMisAlignment(){
       rx*=chrx;
       ry*=chry;
       rz*=chrz;
-      volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      symname = AliAlignObj::SymName(volid);
+      volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      symname = AliGeomManager::SymName(volid);
       new(alobj[j++]) AliAlignObjAngles(symname,volid,dx,dy,dz,rx,ry,rz,kFALSE);
     }
   }

diff --git a/TRD/MakeTRDResMisAlignment.C b/TRD/MakeTRDResMisAlignment.C
index 80783c31589133d10bc12f55b4f88f7540e86772..420ed9bd9a0334b477bedbe03f2156d86289c43f 100644 (file)
--- a/TRD/MakeTRDResMisAlignment.C
+++ b/TRD/MakeTRDResMisAlignment.C
@@ -25,8 +25,8 @@ void MakeTRDResMisAlignment(){
   const char *path;
 
   // create the chambers' alignment objects
-  for (Int_t iLayer = AliAlignObj::kTRD1; iLayer <= AliAlignObj::kTRD6; iLayer++) {
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
+  for (Int_t iLayer = AliGeomManager::kTRD1; iLayer <= AliGeomManager::kTRD6; iLayer++) {
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(iLayer); iModule++) {
       ran.Rannor(dx,rx);
       ran.Rannor(dy,ry);
       ran.Rannor(dz,rz);
@@ -36,8 +36,8 @@ void MakeTRDResMisAlignment(){
       rx*=chrx;
       ry*=chry;
       rz*=chrz;
-      volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      symname = AliAlignObj::SymName(volid);
+      volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      symname = AliGeomManager::SymName(volid);
       new(alobj[j++]) AliAlignObjAngles(symname,volid,dx,dy,dz,rx,ry,rz,kFALSE);
     }
   }

diff --git a/TRD/MakeTRDZeroMisAlignment.C b/TRD/MakeTRDZeroMisAlignment.C
index c1cd7c512675a446aa2e19e1ab504e6d2d700db8..e226f6df0166717f57e2c915ab6a56df46b45f98 100644 (file)
--- a/TRD/MakeTRDZeroMisAlignment.C
+++ b/TRD/MakeTRDZeroMisAlignment.C
@@ -16,10 +16,10 @@ void MakeTRDZeroMisAlignment(){
   const char *symname;
 
   // create the chambers' alignment objects
-  for (Int_t iLayer = AliAlignObj::kTRD1; iLayer <= AliAlignObj::kTRD6; iLayer++) {
-    for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
-      volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
-      symname = AliAlignObj::SymName(volid);
+  for (Int_t iLayer = AliGeomManager::kTRD1; iLayer <= AliGeomManager::kTRD6; iLayer++) {
+    for (Int_t iModule = 0; iModule < AliGeomManager::LayerSize(iLayer); iModule++) {
+      volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      symname = AliGeomManager::SymName(volid);
       new(alobj[j++]) AliAlignObjAngles(symname,volid,dx,dy,dz,rx,ry,rz,kTRUE);
     }
   }

diff --git a/VZERO/MakeVZEROFullMisAlignment.C b/VZERO/MakeVZEROFullMisAlignment.C
index 9462ffcb75164f275c08fed97df555df939a7ea7..6a61de0774dd1a8e5a040fb3c7f0ad178ec7f19e 100644 (file)
--- a/VZERO/MakeVZEROFullMisAlignment.C
+++ b/VZERO/MakeVZEROFullMisAlignment.C
@@ -20,8 +20,8 @@ void MakeVZEROFullMisAlignment(){
   const char *V0left="VZERO/V0A";
 
   Int_t iIndex=0; //let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   dx = rnd->Gaus(0.,sigmatr);
   dy = rnd->Gaus(0.,sigmatr);

diff --git a/VZERO/MakeVZEROResMisAlignment.C b/VZERO/MakeVZEROResMisAlignment.C
index 8fe1671371b635bcc4cd8f58d07cd55e555946c8..1d746a9dd0d5c1dfc26a6267966904a67ccc3d51 100644 (file)
--- a/VZERO/MakeVZEROResMisAlignment.C
+++ b/VZERO/MakeVZEROResMisAlignment.C
@@ -18,8 +18,8 @@ void MakeVZEROResMisAlignment(){
   const char *V0left="VZERO/V0A";
 
   Int_t 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);
 
   dx = rnd->Gaus(0.,sigmatr);
   dy = rnd->Gaus(0.,sigmatr);

diff --git a/VZERO/MakeVZEROZeroMisAlignment.C b/VZERO/MakeVZEROZeroMisAlignment.C
index db4ca3d41068db826ae27e2584d60544784d1d56..6acae820061ec4170bbf4625210a96fda73f2626 100644 (file)
--- a/VZERO/MakeVZEROZeroMisAlignment.C
+++ b/VZERO/MakeVZEROZeroMisAlignment.C
@@ -12,8 +12,8 @@ void MakeVZEROZeroMisAlignment(){
   Double_t dx, dy, dz, dpsi, dtheta, dphi;
 
   Int_t 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);
 
   TString V0right("VZERO/V0C");
   new(alobj[0]) AliAlignObjAngles(V0right.Data(), volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);

diff --git a/VZERO/VZEROSurveyToAlignment.C b/VZERO/VZEROSurveyToAlignment.C
index 4a562a4086e1f7e0f452fa8efdcddf476aff2c40..caaec2c064a40a25b9995a6919dd01bd80726b60 100644 (file)
--- a/VZERO/VZEROSurveyToAlignment.C
+++ b/VZERO/VZEROSurveyToAlignment.C
@@ -220,7 +220,7 @@ void VZEROSurveyToAlignment(){
  Int_t index = 0;
  
  // if the volume is in the look-up table use something like this instead:
- // AliAlignObj::LayerToVolUID(AliAlignObj::kTOF,i); 
+ // AliGeomManager::LayerToVolUID(AliGeomManager::kTOF,i); 
  
  //AliAlignObjMatrix* mobj[0] = new AliAlignObjMatrix("VZERO/V0C",index,gdelta,kTRUE);
  

diff --git a/ZDC/AliZDCPreprocessor.cxx b/ZDC/AliZDCPreprocessor.cxx
index 19fb791184e9275df008da21cdebf046e0f4d8fc..72027eaf3eca83a8523447b0b2afb5d79eda5132 100644 (file)
--- a/ZDC/AliZDCPreprocessor.cxx
+++ b/ZDC/AliZDCPreprocessor.cxx
@@ -85,8 +85,8 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
   const char *ZDCn2="ZDC/NeutronZDC2";
   const char *ZDCp2="ZDC/ProtonZDC2";
   UShort_t 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);
   //
   new(alobj[0]) AliAlignObjAngles(ZDCn1, volid, dx, dyZN1, dz, dpsi, dtheta, dphi, kTRUE);
   new(alobj[1]) AliAlignObjAngles(ZDCp1, volid, dx, dyZP1, dz, dpsi, dtheta, dphi, kTRUE);

diff --git a/ZDC/MakeZDCFullMisAlignment.C b/ZDC/MakeZDCFullMisAlignment.C
index 762b1ef96c4be73c0d3ef1b2cde1c204945df3c8..0f369282e97c19bb85501ae791ee6498df1ee902 100644 (file)
--- a/ZDC/MakeZDCFullMisAlignment.C
+++ b/ZDC/MakeZDCFullMisAlignment.C
@@ -16,8 +16,8 @@ void MakeZDCFullMisAlignment(){
   const char *ZDCp="ZDC/ProtonZDC";
 
   Int_t iIndex=0; //let all modules have index=0 in a layer with no LUT
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer;
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iIndex);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
   new(alobj[0]) AliAlignObjAngles(ZDCn, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   new(alobj[1]) AliAlignObjAngles(ZDCp, volid, dx, dy, dz, dpsi, dtheta, dphi,kTRUE);

diff --git a/ZDC/MakeZDCResMisAlignment.C b/ZDC/MakeZDCResMisAlignment.C
index 6f9e33a576b8ab793f11ff4f0677dab81dbd6244..f87e7c644b9cc735d6c7e8f24df40fc61657a18f 100644 (file)
--- a/ZDC/MakeZDCResMisAlignment.C
+++ b/ZDC/MakeZDCResMisAlignment.C
@@ -16,8 +16,8 @@ void MakeZDCResMisAlignment(){
   const char *ZDCp="ZDC/ProtonZDC";
 
   UShort_t 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);
 
   new(alobj[0]) AliAlignObjAngles(ZDCn, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   new(alobj[1]) AliAlignObjAngles(ZDCp, volid, dx, dy, dz, dpsi, dtheta, dphi,kTRUE);

diff --git a/ZDC/MakeZDCZeroMisAlignment.C b/ZDC/MakeZDCZeroMisAlignment.C
index 9de321f7e4c376fe668beaaa12ac759a988a9464..4fe27992faccefcf7399232a720c3fd6217e5aac 100644 (file)
--- a/ZDC/MakeZDCZeroMisAlignment.C
+++ b/ZDC/MakeZDCZeroMisAlignment.C
@@ -16,8 +16,8 @@ void MakeZDCZeroMisAlignment(){
   const char *ZDCp="ZDC/ProtonZDC";
 
   UShort_t 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);
 
   new(alobj[0]) AliAlignObjAngles(ZDCn, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   new(alobj[1]) AliAlignObjAngles(ZDCp, volid, dx, dy, dz, dpsi, dtheta, dphi,kTRUE);

diff --git a/macros/SurveyToAlignmentExample.C b/macros/SurveyToAlignmentExample.C
index 3c3e9ed23cb936a42f6e07051a34d6215fb7eebb..2baa518fa99405ba35cbeec7c5937b620b57318f 100644 (file)
--- a/macros/SurveyToAlignmentExample.C
+++ b/macros/SurveyToAlignmentExample.C
@@ -233,7 +233,7 @@ void SurveyToAlignmentExampleA(){
 //  gdelta.MultiplyLeft(&ng);
 //  Int_t index = 0;
 //  // if the volume is in the look-up table use something like this instead:
-//  // AliAlignObj::LayerToVolUID(AliAlignObj::kTOF,i); 
+//  // AliGeomManager::LayerToVolUID(AliGeomManager::kTOF,i); 
 //  AliAlignObjMatrix* mobj = new AliAlignObjMatrix("symname",index,gdelta,kTRUE);
  
 }