Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / TRD / MakeTRDZeroMisAlignment.C

diff --git a/TRD/MakeTRDZeroMisAlignment.C b/TRD/MakeTRDZeroMisAlignment.C
index 255e98d33de9d3596a0d43f212d877c5db1c1aaa..07f10709754dc85a4836e41694ac31ddfd50d9d9 100644 (file)
--- a/TRD/MakeTRDZeroMisAlignment.C
+++ b/TRD/MakeTRDZeroMisAlignment.C
@@ -7,7 +7,7 @@ void MakeTRDZeroMisAlignment(){
    
   // Activate CDB storage and load geometry from CDB
   AliCDBManager* cdb = AliCDBManager::Instance();
-  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   cdb->SetRun(0);
   
   AliCDBStorage* storage = NULL;
@@ -33,7 +33,7 @@ void MakeTRDZeroMisAlignment(){
     AliGeomManager::LoadGeometry("geometry.root"); //load geom from default CDB storage
   }    
 
-  Int_t sActive[18]={0,0,1,1,1,0,1,0,0,0,0,1,1,0,1,1,0,0};
+  Int_t sActive[18]={1,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,1};
   Double_t dx=0.,dy=0.,dz=0.,rx=0.,ry=0.,rz=0.;
 
   Int_t j=0;
@@ -43,7 +43,7 @@ void MakeTRDZeroMisAlignment(){
   // create the supermodules' alignment objects
   for (Int_t iSect; iSect<18; iSect++) {
     TString sm_symname(Form("TRD/sm%02d",iSect));
-    if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue;
+    if( (TString(gSystem->Getenv("REALSETUP")) == TString("kTRUE")) && !sActive[iSect] ) continue;
     new(alobj[j++]) AliAlignObjParams(sm_symname.Data(),0,dx,dy,dz,rx,ry,rz,kTRUE);
   }
   
@@ -56,8 +56,8 @@ void MakeTRDZeroMisAlignment(){
        chId++;
        if ((iSect==13 || iSect==14 || iSect==15) && iCh==2) continue;
        volid = AliGeomManager::LayerToVolUID(iLayer,chId);
+       if( (TString(gSystem->Getenv("REALSETUP")) == TString("kTRUE")) && !sActive[iSect] ) continue;
        symname = AliGeomManager::SymName(volid);
-       if( (TString(gSystem->Getenv("PARTGEOM")) == TString("kTRUE")) && !sActive[iSect] ) continue;
        new(alobj[j++]) AliAlignObjParams(symname,volid,dx,dy,dz,rx,ry,rz,kTRUE);
       }
     }