Bug #92237 fixed as Barth suggested

[u/mrichter/AliRoot.git] / ZDC / MakeZDCResMisAlignment.C

diff --git a/ZDC/MakeZDCResMisAlignment.C b/ZDC/MakeZDCResMisAlignment.C
index ea80762eaea0435bfbde40ac190b139607e62122..89bd4ae496b95bcdc2e04351ca88aa1c065eba32 100644 (file)
--- a/ZDC/MakeZDCResMisAlignment.C
+++ b/ZDC/MakeZDCResMisAlignment.C
@@ -1,34 +1,29 @@
 void MakeZDCResMisAlignment(){
   // Create TClonesArray of residual misalignment objects for ZDC
   // 
-  if(!AliGeomManager::GetGeometry()){
-    if(!(AliCDBManager::Instance())->IsDefaultStorageSet())
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
-      AliCDBManager::Instance()->SetRun(0);
-    AliGeomManager::LoadGeometry();
-  }
-  // needed for the constructors with local coordinates not to fail
+  const char* macroname = "MakeZDCResMisAlignment.C";
 
   TClonesArray *array = new TClonesArray("AliAlignObjParams",10);
   TClonesArray &alobj = *array;
 
-  AliAlignObjParams a;
-
   Double_t dx=0., dy=0.05, dz=0.;
   Double_t dpsi=0., dtheta=0., dphi=0.;
 
-  const char *ZDCn="ZDC/NeutronZDC";
-  const char *ZDCp="ZDC/ProtonZDC";
+  const char *ZDCCn="ZDC/NeutronZDC_C";
+  const char *ZDCCp="ZDC/ProtonZDC_C";
+  const char *ZDCAn="ZDC/NeutronZDC_A";
+  const char *ZDCAp="ZDC/ProtonZDC_A";
 
   UShort_t iIndex=0;
   AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
   UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
 
-  new(alobj[0]) AliAlignObjParams(ZDCn, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
-  new(alobj[1]) AliAlignObjParams(ZDCp, volid, dx, dy, dz, dpsi, dtheta, dphi,kTRUE);
+  new(alobj[0]) AliAlignObjParams(ZDCCn, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+  new(alobj[1]) AliAlignObjParams(ZDCCp, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+  new(alobj[2]) AliAlignObjParams(ZDCAn, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
+  new(alobj[3]) AliAlignObjParams(ZDCAp, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
 
-  const char* macroname = "MakeZDCResMisAlignment.C";
-  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
+  if( TString(gSystem->Getenv("TOCDB")) != TString("kTRUE") ){
     // save in file
     const char* filename = "ZDCresidualMisalignment.root";
     TFile f(filename,"RECREATE");