Fixes to SPD and support geometry (B. Nilsen)

[u/mrichter/AliRoot.git] / ITS / MakeITSResMisAlignment.C

diff --git a/ITS/MakeITSResMisAlignment.C b/ITS/MakeITSResMisAlignment.C
index cfbd0d81b14228a537e0e9eaba563b9bf5a1456b..c8771761cf15fdcf7a752d74d633b4545e19be18 100644 (file)
--- a/ITS/MakeITSResMisAlignment.C
+++ b/ITS/MakeITSResMisAlignment.C
@@ -21,72 +21,75 @@ 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;
-  new(alobj[j]) AliAlignObjAngles("ALIC_1/ITSV_1", 0, dx, dy, globalZ, dpsi, dtheta, dphi, kTRUE);
-  j++;
 
-  for ( Int_t l = AliAlignObj::kSPD1; l <= AliAlignObj::kSSD2; l++) {
+  new(alobj[j++]) AliAlignObjAngles("ITS", 0, dx, dy, globalZ, dpsi, dtheta, dphi, kTRUE);
+  AliAlignObjAngles* its_alobj = (AliAlignObjAngles*) array->UncheckedAt(0);
+  its_alobj->ApplyToGeometry();
+
+
+  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 *path = AliAlignObj::SymName(volid);
+      UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iModule);
+      const char *symname = AliGeomManager::SymName(volid);
 
-      new(alobj[j]) AliAlignObjAngles(path, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
+      new(alobj[j]) AliAlignObjAngles(symname, volid, dx, dy, dz, dpsi, dtheta, dphi, kFALSE);
       j++;
 
     }
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("ITSresidualMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}
@@ -94,13 +97,13 @@ void MakeITSResMisAlignment(){
     f.Close();
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
+    const char* Storage = gSystem->Getenv("STORAGE");
     AliCDBManager *CDB = AliCDBManager::Instance();
     AliCDBStorage* storage = CDB->GetStorage(Storage);
     AliCDBMetaData *md= new AliCDBMetaData();
     md->SetResponsible("Ludovic Gaudichet");
     md->SetComment("Alignment objects with actual ITS misalignment");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("ITS/Align/Data",0,9999999);
     storage->Put(array,id, md);
   }