Updated names of the environment variables (no dollar sign). Gaussian distribution...

diff --git a/EMCAL/MakeEMCALFullMisAlignment.C b/EMCAL/MakeEMCALFullMisAlignment.C
index 563cf1600e482fef4cdc366711851d653b87d264..79237b50920992cf3318a8a25bb8b5924f144a4a 100644 (file)
--- a/EMCAL/MakeEMCALFullMisAlignment.C
+++ b/EMCAL/MakeEMCALFullMisAlignment.C
@@ -51,7 +51,7 @@ void MakeEMCALFullMisAlignment(){
     new(alobj[j++]) AliAlignObjAngles(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("EMCALfullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -60,13 +60,13 @@ void MakeEMCALFullMisAlignment(){
     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("Jennifer Clay");
     md->SetComment("Full misalignment for EMCAL");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("EMCAL/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/EMCAL/MakeEMCALResMisAlignment.C b/EMCAL/MakeEMCALResMisAlignment.C
index 8f16e8efe727cc7465a1f1fc0dcbefccd760faa9..4b0317d32ef80930afdf03608f328cc74976e181 100644 (file)
--- a/EMCAL/MakeEMCALResMisAlignment.C
+++ b/EMCAL/MakeEMCALResMisAlignment.C
@@ -53,7 +53,7 @@ void MakeEMCALResMisAlignment(){
     new(alobj[j++]) AliAlignObjAngles(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("EMCALresidualMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -62,13 +62,13 @@ void MakeEMCALResMisAlignment(){
     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("Jennifer Clay");
     md->SetComment("Residual misalignment for EMCAL, produced with sigmatr=0.05 and sigmarot=0.3 in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("EMCAL/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/EMCAL/MakeEMCALZeroMisAlignment.C b/EMCAL/MakeEMCALZeroMisAlignment.C
index 5e9d194a846991f0fc6015fb9e089db224d06e82..29f9377a85cdec7c72b9e450438301592c52b985 100644 (file)
--- a/EMCAL/MakeEMCALZeroMisAlignment.C
+++ b/EMCAL/MakeEMCALZeroMisAlignment.C
@@ -34,7 +34,7 @@ void MakeEMCALZeroMisAlignment(){
     new(alobj[j++]) AliAlignObjAngles(pathstr, volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("EMCALzeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -43,13 +43,13 @@ void MakeEMCALZeroMisAlignment(){
     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("Jennifer Clay");
     md->SetComment("Zero misalignment for EMCAL");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("EMCAL/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/FMD/MakeFMDFullMisAlignment.C b/FMD/MakeFMDFullMisAlignment.C
index bc8c6bb31292aa24e87675ecbbb06bd0abbf47e5..3703439377775e606abab7e75376b5257f4ed47f 100644 (file)
--- a/FMD/MakeFMDFullMisAlignment.C
+++ b/FMD/MakeFMDFullMisAlignment.C
@@ -5,12 +5,12 @@ void MakeFMDFullMisAlignment(){
   // needed for the constructors with local coordinates not to fail
   
   gSystem->Load("libFMDutil.so");
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     AliFMDAlignFaker faker(AliFMDAlignFaker::kAll, "geometry.root","FMDfullMisalignment.root");
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
+    const char* Storage = gSystem->Getenv("STORAGE");
     AliFMDAlignFaker faker(AliFMDAlignFaker::kAll, "geometry.root", Storage);
   }
 

diff --git a/FMD/MakeFMDResMisAlignment.C b/FMD/MakeFMDResMisAlignment.C
index a880ac5e20b367dccb568becdf4afd42ba3f45b2..f3fc50c6d21896e9f7b14b558b8c85995f16473e 100644 (file)
--- a/FMD/MakeFMDResMisAlignment.C
+++ b/FMD/MakeFMDResMisAlignment.C
@@ -5,12 +5,12 @@ void MakeFMDResMisAlignment()
   if(!gGeoManager) TGeoManager::Import("geometry.root");
   
   gSystem->Load("libFMDutil.so");
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     AliFMDAlignFaker faker(AliFMDAlignFaker::kAll, "geometry.root","FMDresidualMisalignment.root");
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
+    const char* Storage = gSystem->Getenv("STORAGE");
     AliFMDAlignFaker faker(AliFMDAlignFaker::kAll, "geometry.root", Storage);
   }
 

diff --git a/FMD/MakeFMDZeroMisAlignment.C b/FMD/MakeFMDZeroMisAlignment.C
index db21d2df8dcfd9d1a68565c330da5964f949a4b3..5dd40746bc7adc529be9c1090ef70cb4aaa1c71d 100644 (file)
--- a/FMD/MakeFMDZeroMisAlignment.C
+++ b/FMD/MakeFMDZeroMisAlignment.C
@@ -5,12 +5,12 @@ void MakeFMDZeroMisAlignment()
   if(!gGeoManager) TGeoManager::Import("geometry.root");
   
   gSystem->Load("libFMDutil.so");
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     AliFMDAlignFaker faker(AliFMDAlignFaker::kAll, "geometry.root","FMDAlignObjs.root");
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
+    const char* Storage = gSystem->Getenv("STORAGE");
     AliFMDAlignFaker faker(AliFMDAlignFaker::kAll, "geometry.root", Storage);
   }
 

diff --git a/HMPID/MakeHMPIDFullMisAlignment.C b/HMPID/MakeHMPIDFullMisAlignment.C
index dad1e74205957138f4f41a2e53b61d924d11a87f..dad424ac0e26b963a7ac91a318c87f24c9613897 100644 (file)
--- a/HMPID/MakeHMPIDFullMisAlignment.C
+++ b/HMPID/MakeHMPIDFullMisAlignment.C
@@ -21,7 +21,7 @@ void MakeHMPIDFullMisAlignment(){
 
 //   pCA->Print();
   
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("HMPIDfullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -30,13 +30,13 @@ void MakeHMPIDFullMisAlignment(){
     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 *pMeta= new AliCDBMetaData();  
     pMeta->SetResponsible("HMPID Expert");
     pMeta->SetComment("Full alignment objects for HMPID produced with sigmaTrans=1mm and sigmaRot=1mrad");
-    pMeta->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    pMeta->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("HMPID/Align/Data",0,9999999);
     storage->Put(pCA,id,pMeta);
   }

diff --git a/HMPID/MakeHMPIDResMisAlignment.C b/HMPID/MakeHMPIDResMisAlignment.C
index 3de1a7aa5b207d01fd51f6ef221ffaac01e65c4f..08aea4fd92b0555120753d5c433bfc6bd847d8a4 100644 (file)
--- a/HMPID/MakeHMPIDResMisAlignment.C
+++ b/HMPID/MakeHMPIDResMisAlignment.C
@@ -20,7 +20,7 @@ void MakeHMPIDResMisAlignment(){
 
 //   pCA->Print();
   
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("HMPIDresidualMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -29,13 +29,13 @@ void MakeHMPIDResMisAlignment(){
     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 *pMeta= new AliCDBMetaData();  
     pMeta->SetResponsible("HMPID Expert");
     pMeta->SetComment("Residual alignment objects for HMPID produced with sigmaTrans=1mm and sigmaRot=1mrad");
-    pMeta->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    pMeta->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("HMPID/Align/Data",0,9999999);
     storage->Put(pCA,id,pMeta);
   }

diff --git a/HMPID/MakeHMPIDZeroMisAlignment.C b/HMPID/MakeHMPIDZeroMisAlignment.C
index 981ecadb6d8ecbd9c9d2176033c997f8286cb893..4a10b0b9c975da320fddf75b3c31b3a08297b70f 100644 (file)
--- a/HMPID/MakeHMPIDZeroMisAlignment.C
+++ b/HMPID/MakeHMPIDZeroMisAlignment.C
@@ -14,7 +14,7 @@ void MakeHMPIDZeroMisAlignment(){
 
 //   pCA->Print();
   
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("HMPIDzeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -23,13 +23,13 @@ void MakeHMPIDZeroMisAlignment(){
     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 *pMeta= new AliCDBMetaData();  
     pMeta->SetResponsible("HMPID Expert");
     pMeta->SetComment("Zero alignment objects for HMPID");
-    pMeta->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    pMeta->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("HMPID/Align/Data",0,9999999);
     storage->Put(pCA,id,pMeta);
   }

diff --git a/ITS/MakeITSFullMisAlignment.C b/ITS/MakeITSFullMisAlignment.C
index cf64e03ee2790cc9fa59bbd82f5d03eb71592898..d73ca51d04e073c8788261b4b8f16f7a0cf815a2 100644 (file)
--- a/ITS/MakeITSFullMisAlignment.C
+++ b/ITS/MakeITSFullMisAlignment.C
@@ -87,7 +87,7 @@ void MakeITSFullMisAlignment(){
     }
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("ITSfullMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}
@@ -95,13 +95,13 @@ void MakeITSFullMisAlignment(){
     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);
   }

diff --git a/ITS/MakeITSResMisAlignment.C b/ITS/MakeITSResMisAlignment.C
index 891777c664556d9cf88e010d884ae2c3c312792c..14ca76cb75c82f56bb474493d069390e10f156b5 100644 (file)
--- a/ITS/MakeITSResMisAlignment.C
+++ b/ITS/MakeITSResMisAlignment.C
@@ -89,7 +89,7 @@ void MakeITSResMisAlignment(){
     }
   }
 
-  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";}
@@ -97,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);
   }

diff --git a/ITS/MakeITSZeroMisAlignment.C b/ITS/MakeITSZeroMisAlignment.C
index af0360bd8e9bd77e2f78b7c0f5ae102bfa58705f..79720c3d65b44542e3c5fecb971832c3117ac3e9 100644 (file)
--- a/ITS/MakeITSZeroMisAlignment.C
+++ b/ITS/MakeITSZeroMisAlignment.C
@@ -54,7 +54,7 @@ void MakeITSZeroMisAlignment(){
     }
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("ITSzeroMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}
@@ -62,13 +62,13 @@ void MakeITSZeroMisAlignment(){
     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 zero ITS misalignment");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("ITS/Align/Data",0,9999999);
     storage->Put(array,id, md);
   }

diff --git a/MUON/MakeMUONFullMisAlignment.C b/MUON/MakeMUONFullMisAlignment.C
index 39c1bc192324ed5f49361cf0cca1847b031ca513..2d599c983beb18212ab9f21588f9f75e4f890727 100644 (file)
--- a/MUON/MakeMUONFullMisAlignment.C
+++ b/MUON/MakeMUONFullMisAlignment.C
@@ -47,7 +47,7 @@ void MakeMUONFullMisAlignment(Bool_t volpaths = true,
     = misAligner.MisAlign(builder->GetTransformer(), true);
   TClonesArray* array = newTransform->GetMisAlignmentData();
   
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // Create a File to store the alignment data
     TFile f("MUONfullMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}
@@ -58,14 +58,14 @@ void MakeMUONFullMisAlignment(Bool_t volpaths = true,
     array->Delete();
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
+    const char* Storage = gSystem->Getenv("STORAGE");
     
     AliCDBManager* cdbManager = AliCDBManager::Instance();
     AliCDBStorage* storage = cdbManager->GetStorage(Storage);
     AliCDBMetaData* cdbData = new AliCDBMetaData();
     cdbData->SetResponsible("Dimuon Offline project");
     cdbData->SetComment("MUON alignment objects with full misalignment");
-    cdbData->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    cdbData->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("MUON/Align/Data", 0, 9999999); 
     storage->Put(array, id, cdbData);
     

diff --git a/MUON/MakeMUONResMisAlignment.C b/MUON/MakeMUONResMisAlignment.C
index ecc57a60b2581cc00eb157326cb0f3455252972a..595b7901fbbce332c41215fff458096c69c8b74d 100644 (file)
--- a/MUON/MakeMUONResMisAlignment.C
+++ b/MUON/MakeMUONResMisAlignment.C
@@ -47,7 +47,7 @@ void MakeMUONResMisAlignment(Bool_t volpaths = true,
     = misAligner.MisAlign(builder->GetTransformer(), true);
   TClonesArray* array = newTransform->GetMisAlignmentData();
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // Create a File to store the alignment data
     TFile f("MUONresidualMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}
@@ -57,13 +57,13 @@ void MakeMUONResMisAlignment(Bool_t volpaths = true,
     f.Close();
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
+    const char* Storage = gSystem->Getenv("STORAGE");
     AliCDBManager* cdbManager = AliCDBManager::Instance();
     AliCDBStorage* storage = cdbManager->GetStorage(Storage);
     AliCDBMetaData* cdbData = new AliCDBMetaData();
     cdbData->SetResponsible("Dimuon Offline project");
     cdbData->SetComment("MUON alignment objects with residual misalignment");
-    cdbData->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    cdbData->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("MUON/Align/Data", 0, 9999999); 
     storage->Put(array, id, cdbData);
   }

diff --git a/MUON/MakeMUONZeroMisAlignment.C b/MUON/MakeMUONZeroMisAlignment.C
index 6f4c92432ec9ced47a2ab359842ee89ec68b2cd3..e4dbe03bb3ef7d1caa40f979e2ff61902a6180ba 100644 (file)
--- a/MUON/MakeMUONZeroMisAlignment.C
+++ b/MUON/MakeMUONZeroMisAlignment.C
@@ -40,16 +40,16 @@ void MakeMUONZeroMisAlignment(Bool_t volpaths = false,
     builder->WriteSVMaps();
   }  
 
-  cout << "Generating residual misalignment data in  MUON/ZeroMisAlignCDB/Data..." << endl;
+  cout << "Generating zero misalignment data in  MUON/ZeroMisAlignCDB/Data..." << endl;
   
   AliMUONGeometryMisAligner misAligner(0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
   AliMUONGeometryTransformer* newTransform 
     = misAligner.MisAlign(builder->GetTransformer(), true);
   TClonesArray* array = newTransform->GetMisAlignmentData();
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // Create a File to store the alignment data
-    TFile f("MUONresidualMisalignment.root","RECREATE");
+    TFile f("MUONzeroMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}
     
     f.cd();
@@ -57,13 +57,13 @@ void MakeMUONZeroMisAlignment(Bool_t volpaths = false,
     f.Close();
   }else{
     // save in CDB storage
-    const char* Storage = gSystem->Getenv("$STORAGE");
+    const char* Storage = gSystem->Getenv("STORAGE");
     AliCDBManager* cdbManager = AliCDBManager::Instance();
     AliCDBStorage* storage = cdbManager->GetStorage(Storage);
     AliCDBMetaData* cdbData = new AliCDBMetaData();
     cdbData->SetResponsible("Dimuon Offline project");
-    cdbData->SetComment("MUON alignment objects with residual misalignment");
-    cdbData->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    cdbData->SetComment("MUON alignment objects with zero misalignment");
+    cdbData->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("MUON/Align/Data", 0, 9999999); 
     storage->Put(array, id, cdbData);
   }

diff --git a/PHOS/MakePHOSFullMisAlignment.C b/PHOS/MakePHOSFullMisAlignment.C
index 723b417682eb368889296e30a61deb7a7196d895..668f7955c8c644716a782ef92af19b1ea174be66 100644 (file)
--- a/PHOS/MakePHOSFullMisAlignment.C
+++ b/PHOS/MakePHOSFullMisAlignment.C
@@ -44,7 +44,7 @@ void MakePHOSFullMisAlignment(){
 
   // *************************    2nd step    ***************
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("PHOSfullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -53,13 +53,13 @@ void MakePHOSFullMisAlignment(){
     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("Yuri Kharlov");
     md->SetComment("Alignment objects for fully misaligned geometry");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("PHOS/Align/Data",0,9999999);
     storage->Put(array,id, md);
   }

diff --git a/PHOS/MakePHOSResMisAlignment.C b/PHOS/MakePHOSResMisAlignment.C
index 27b0208002d96dc730d2a96345a61dbd351627ec..a84d6c83aee495fb7799c3cf3ea4ec242fce163d 100644 (file)
--- a/PHOS/MakePHOSResMisAlignment.C
+++ b/PHOS/MakePHOSResMisAlignment.C
@@ -42,7 +42,7 @@ void MakePHOSResMisAlignment(){
        volid, 0., 0., +displacement, dpsi, dtheta, dphi, kTRUE);
 
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("PHOSresidualMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -51,13 +51,13 @@ void MakePHOSResMisAlignment(){
     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("Yuri Kharlov");
     md->SetComment("Alignment objects for slightly misaligned geometry (residual misalignment");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("PHOS/Align/Data",0,9999999);
     storage->Put(array,id, md);
   }

diff --git a/PHOS/MakePHOSZeroMisAlignment.C b/PHOS/MakePHOSZeroMisAlignment.C
index fb87b20a85324dba76c76236db13dbdeff167f66..42511326bb3a695bef1c9f35fb05b2f3c990d1b7 100644 (file)
--- a/PHOS/MakePHOSZeroMisAlignment.C
+++ b/PHOS/MakePHOSZeroMisAlignment.C
@@ -41,7 +41,7 @@ void MakePHOSZeroMisAlignment(){
        volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
 
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("PHOSzeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -50,13 +50,13 @@ void MakePHOSZeroMisAlignment(){
     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("Yuri Kharlov");
     md->SetComment("Zero misalignment objects");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("PHOS/Align/Data",0,9999999);
     storage->Put(array,id, md);
   }

diff --git a/PMD/MakePMDFullMisAlignment.C b/PMD/MakePMDFullMisAlignment.C
index 36bcd6a38bbf38fa0665f9ab4b88318fc4c05e0e..4bf94c77801bd77e3b2297a8199a76702df15916 100644 (file)
--- a/PMD/MakePMDFullMisAlignment.C
+++ b/PMD/MakePMDFullMisAlignment.C
@@ -102,7 +102,7 @@ void MakePMDFullMisAlignment(){
   new(alobj[2]) AliAlignObjAngles(Sector3, volid, dx23, dy23, dz23, dpsi23, dtheta23, dphi23, kFALSE);
   new(alobj[3]) AliAlignObjAngles(Sector4, volid, dx23, dy23, dz23, dpsi23, dtheta23, dphi23, kFALSE);
   
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // Create a File to store the alignment data
     TFile f("PMDfullMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}    
@@ -111,13 +111,13 @@ void MakePMDFullMisAlignment(){
     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("");
     md->SetComment("Full misalignment for PMD, produced with sigmatr=0.1 and sigmarot=0.1 in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("PMD/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/PMD/MakePMDResMisAlignment.C b/PMD/MakePMDResMisAlignment.C
index 06bc9add6c8496bbb359790f53117f6fee210fed..7b7f0aa13c0676d5c0dcdff85acaab2e5dc7c314 100644 (file)
--- a/PMD/MakePMDResMisAlignment.C
+++ b/PMD/MakePMDResMisAlignment.C
@@ -101,7 +101,7 @@ void MakePMDResMisAlignment(){
   new(alobj[2]) AliAlignObjAngles(Sector3, volid, dx23, dy23, dz23, dpsi23, dtheta23, dphi23, kFALSE);
   new(alobj[3]) AliAlignObjAngles(Sector4, volid, dx23, dy23, dz23, dpsi23, dtheta23, dphi23, kFALSE);
   
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // Create a File to store the alignment data
     TFile f("PMDresidualMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}
@@ -111,13 +111,13 @@ void MakePMDResMisAlignment(){
     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("");
     md->SetComment("Residual misalignment for PMD, produced with sigmatr=0.1 and sigmarot=0.1 in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("PMD/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/PMD/MakePMDZeroMisAlignment.C b/PMD/MakePMDZeroMisAlignment.C
index 93d4f0dabded0ee3b1b46fb330e447f778b5ce35..f1d635d85cf9fbd13a29a78f7af53ca5705a0558 100644 (file)
--- a/PMD/MakePMDZeroMisAlignment.C
+++ b/PMD/MakePMDZeroMisAlignment.C
@@ -54,7 +54,7 @@ void MakePMDZeroMisAlignment(){
     new(alobj[j++]) AliAlignObjAngles(snSector.Data(), volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // Create a File to store the alignment data
     TFile f("PMDzeroMisalignment.root","RECREATE");
     if(!f) {cerr<<"cannot open file for output\n";}
@@ -64,13 +64,13 @@ void MakePMDZeroMisAlignment(){
     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("");
     md->SetComment("Zero misalignment for PMD");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("PMD/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/STEER/AliAlignObj.cxx b/STEER/AliAlignObj.cxx
index 4741862d78a821a0e1b8e321be6f9e602d4f8b38..88a0a065f32796180faae0a0d547eb14b3b73af5 100644 (file)
--- a/STEER/AliAlignObj.cxx
+++ b/STEER/AliAlignObj.cxx
@@ -668,10 +668,10 @@ Bool_t AliAlignObj::ApplyToGeometry()
     path = pne->GetTitle();
     node = gGeoManager->MakeAlignablePN(pne);
   }else{
-    AliWarning(Form("The symbolic volume name %s does not correspond to a physical entry. Using it as a volume path!",symname));
+    AliDebug(1,Form("The symbolic volume name %s does not correspond to a physical entry. Using it as a volume path!",symname));
     path=symname;
     if (!gGeoManager->CheckPath(path)) {
-      AliError(Form("Volume path %s not valid!",path));
+      AliDebug(1,Form("Volume path %s not valid!",path));
       return kFALSE;
     }
     if (gGeoManager->GetListOfPhysicalNodes()->FindObject(path)) {

diff --git a/T0/MakeT0FullMisAlignment.C b/T0/MakeT0FullMisAlignment.C
index 67b08cddeca9245247866838fd64cb170e5f4860..b76cc1ad9d1932ceac9af2c5c0148f9f5a931579 100644 (file)
--- a/T0/MakeT0FullMisAlignment.C
+++ b/T0/MakeT0FullMisAlignment.C
@@ -39,7 +39,7 @@ void MakeT0FullMisAlignment(){
     new(alobj[j++]) AliAlignObjAngles(symName.Data(), volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
   
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("T0fullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -48,13 +48,13 @@ void MakeT0FullMisAlignment(){
     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("Tomasz Malkiewicz");
     md->SetComment("Full misalignment for T0, produced with sigmatr=0.05 and sigmarot=0.3 in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("T0/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/T0/MakeT0ResMisAlignment.C b/T0/MakeT0ResMisAlignment.C
index 49c4f62c7cb206ab9577afa373afed6b6e37141a..5f61b9e197d2c684ef428816e33c8764d3c99d06 100644 (file)
--- a/T0/MakeT0ResMisAlignment.C
+++ b/T0/MakeT0ResMisAlignment.C
@@ -40,7 +40,7 @@ void MakeT0ResMisAlignment(){
     new(alobj[j++]) AliAlignObjAngles(symName.Data(), volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
   
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("T0residualMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -49,13 +49,13 @@ void MakeT0ResMisAlignment(){
     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("Tomasz Malkiewicz");
     md->SetComment("Residual misalignment for T0, produced with sigmatr=0.05 and sigmarot=0.3 in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("T0/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/T0/MakeT0ZeroMisAlignment.C b/T0/MakeT0ZeroMisAlignment.C
index c684c56fb9f610a8cb6a2e720f9a7fa1f1b53a3b..f4228dbd04962cfb07f23dac6c0cdf2b4285d744 100644 (file)
--- a/T0/MakeT0ZeroMisAlignment.C
+++ b/T0/MakeT0ZeroMisAlignment.C
@@ -28,7 +28,7 @@ void MakeT0ZeroMisAlignment(){
       new(alobj[j++]) AliAlignObjAngles(symName.Data(), volid, dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
     }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("T0zeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -37,13 +37,13 @@ void MakeT0ZeroMisAlignment(){
     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("Tomasz Malkiewicz");
     md->SetComment("Zero misalignment for T0, produced with sigmatr=0.05 and sigmarot=0.3 in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("T0/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/TOF/MakeTOFFullMisAlignment.C b/TOF/MakeTOFFullMisAlignment.C
index dae74df76ab77847123bd0d2f377dbd12084580c..bfe54c8dbcfce6193af1b0ba8f1019783655328c 100644 (file)
--- a/TOF/MakeTOFFullMisAlignment.C
+++ b/TOF/MakeTOFFullMisAlignment.C
@@ -157,7 +157,7 @@ void MakeTOFFullMisAlignment(){
     new(alobj[j++]) AliAlignObjAngles(AliAlignObj::SymName(idTOF,i), AliAlignObj::LayerToVolUID(idTOF,i), sdx, sdy, sdz, sdpsi, sdtheta, sdphi, kFALSE);
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("TOFfullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -166,13 +166,13 @@ void MakeTOFFullMisAlignment(){
     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("Silvia Arcelli");
     md->SetComment("Full misalignment for TOF and FRAME");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("TOF/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/TOF/MakeTOFResMisAlignment.C b/TOF/MakeTOFResMisAlignment.C
index 9205201f46cb9c0e39763480ebddb439ba0889c3..58a2eed31fbc24be34c8ff7158dd646e36e28ba5 100644 (file)
--- a/TOF/MakeTOFResMisAlignment.C
+++ b/TOF/MakeTOFResMisAlignment.C
@@ -30,7 +30,7 @@ void MakeTOFResMisAlignment(){
     j++;
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("TOFresidualMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -39,13 +39,13 @@ void MakeTOFResMisAlignment(){
     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("Silvia Arcelli");
     md->SetComment("Residual misalignment for TOF, sigmatr=1mm in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("TOF/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/TOF/MakeTOFZeroMisAlignment.C b/TOF/MakeTOFZeroMisAlignment.C
index c7e8fe0b204841c6786a7db02092aca13856369d..985ef7f409f1a224a9d31861667a7214a4275dcd 100644 (file)
--- a/TOF/MakeTOFZeroMisAlignment.C
+++ b/TOF/MakeTOFZeroMisAlignment.C
@@ -18,7 +18,7 @@ void MakeTOFZeroMisAlignment(){
     new(alobj[j++]) AliAlignObjAngles(AliAlignObj::SymName(idTOF,i), AliAlignObj::LayerToVolUID(idTOF,i), dx, dy, dz, dpsi, dtheta, dphi, kTRUE);
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("TOFzeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -27,7 +27,7 @@ void MakeTOFZeroMisAlignment(){
     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();

diff --git a/TPC/MakeTPCFullMisAlignment.C b/TPC/MakeTPCFullMisAlignment.C
index 84a7c9a5562470e74871e444f55604c241e2d39c..f558ba94be0a33fc9e1c954e5e97da283ac5471e 100644 (file)
--- a/TPC/MakeTPCFullMisAlignment.C
+++ b/TPC/MakeTPCFullMisAlignment.C
@@ -21,12 +21,12 @@ void MakeTPCFullMisAlignment(){
   for (Int_t iLayer = AliAlignObj::kTPC1; iLayer <= AliAlignObj::kTPC2; iLayer++) {
     for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
 
-      dx = (rnd->Uniform()-0.5)*sigmatr;
-      dy = (rnd->Uniform()-0.5)*sigmatr;
-      dz = (rnd->Uniform()-0.5)*sigmatr;
-      dpsi = (rnd->Uniform()-0.5)*sigmarot;
-      dtheta = (rnd->Uniform()-0.5)*sigmarot;
-      dphi = (rnd->Uniform()-0.5)*sigmarot;
+      dx = rnd->Gaus(0,sigmatr);
+      dy = rnd->Gaus(0,sigmatr);
+      dz = rnd->Gaus(0,sigmatr);
+      dpsi = rnd->Gaus(0,sigmarot);
+      dtheta = rnd->Gaus(0,sigmarot);
+      dphi = rnd->Gaus(0,sigmarot);
 
       UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
       const char *symname = AliAlignObj::SymName(volid);
@@ -35,7 +35,7 @@ void MakeTPCFullMisAlignment(){
   }
 
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("TPCfullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -44,13 +44,13 @@ void MakeTPCFullMisAlignment(){
     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("Marian Ivanov");
     md->SetComment("Full misalignment for TPC, sigmatr=0.01 and sigmarot=0.6 in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("TPC/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/TPC/MakeTPCResMisAlignment.C b/TPC/MakeTPCResMisAlignment.C
index 3b1d7ffea615a73dd4f8a2fa19c4ca25b5fd0004..1ed99415e46722432274d15b1429d86ce6fb40ec 100644 (file)
--- a/TPC/MakeTPCResMisAlignment.C
+++ b/TPC/MakeTPCResMisAlignment.C
@@ -20,12 +20,12 @@ void MakeTPCResMisAlignment(){
   for (Int_t iLayer = AliAlignObj::kTPC1; iLayer <= AliAlignObj::kTPC2; iLayer++) {
     for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer); iModule++) {
 
-      dx = (rnd->Uniform()-0.5)*sigmatr;
-      dy = (rnd->Uniform()-0.5)*sigmatr;
-      dz = (rnd->Uniform()-0.5)*sigmatr;
-      dpsi = (rnd->Uniform()-0.5)*sigmarot;
-      dtheta = (rnd->Uniform()-0.5)*sigmarot;
-      dphi = (rnd->Uniform()-0.5)*sigmarot;
+      dx = rnd->Gaus(0,sigmatr);
+      dy = rnd->Gaus(0,sigmatr);
+      dz = rnd->Gaus(0,sigmatr);
+      dpsi = rnd->Gaus(0,sigmarot);
+      dtheta = rnd->Gaus(0,sigmarot);
+      dphi = rnd->Gaus(0,sigmarot);
 
       UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,iModule);
       const char *symname = AliAlignObj::SymName(volid);
@@ -35,7 +35,7 @@ void MakeTPCResMisAlignment(){
   }
 
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("TPCresidualMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -44,13 +44,13 @@ void MakeTPCResMisAlignment(){
     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("Marian Ivanov");
     md->SetComment("Residual misalignment for TPC, sigmatr=0.01 and sigmarot=0.6 in the local RS");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("TPC/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/TPC/MakeTPCZeroMisAlignment.C b/TPC/MakeTPCZeroMisAlignment.C
index 6e63c9c2378b3a8ad2dee7c0332951ae1a3ee33a..e3a48aad4adaf9a8afd33dc40f9e8cdba4c278bc 100644 (file)
--- a/TPC/MakeTPCZeroMisAlignment.C
+++ b/TPC/MakeTPCZeroMisAlignment.C
@@ -23,7 +23,7 @@ void MakeTPCZeroMisAlignment(){
   }
 
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("TPCzeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -32,13 +32,13 @@ void MakeTPCZeroMisAlignment(){
     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("Marian Ivanov");
     md->SetComment("Zero misalignment for TPC");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("TPC/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/TRD/MakeTRDFullMisAlignment.C b/TRD/MakeTRDFullMisAlignment.C
index 0c146e1308b79096b3fac0f516b6c1899ce06fb5..b1cedd648f536525e1290cf4e56c768503f0dc95 100644 (file)
--- a/TRD/MakeTRDFullMisAlignment.C
+++ b/TRD/MakeTRDFullMisAlignment.C
@@ -76,7 +76,7 @@ void MakeTRDFullMisAlignment(){
     }
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("TRDfullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -85,13 +85,13 @@ void MakeTRDFullMisAlignment(){
     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("Dariusz Miskowiec");
     md->SetComment("Full misalignment for TRD");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("TRD/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/TRD/MakeTRDResMisAlignment.C b/TRD/MakeTRDResMisAlignment.C
index a5a38c0f3b69eceaf3fa724fd2f1bde567e67345..80783c31589133d10bc12f55b4f88f7540e86772 100644 (file)
--- a/TRD/MakeTRDResMisAlignment.C
+++ b/TRD/MakeTRDResMisAlignment.C
@@ -42,7 +42,7 @@ void MakeTRDResMisAlignment(){
     }
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("TRDresidualMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -51,13 +51,13 @@ void MakeTRDResMisAlignment(){
     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("Dariusz Miskowiec");
     md->SetComment("Residual misalignment for TRD");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("TRD/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/TRD/MakeTRDZeroMisAlignment.C b/TRD/MakeTRDZeroMisAlignment.C
index c1112e565a664af3ef2f017550f9f80cb432862d..c1cd7c512675a446aa2e19e1ab504e6d2d700db8 100644 (file)
--- a/TRD/MakeTRDZeroMisAlignment.C
+++ b/TRD/MakeTRDZeroMisAlignment.C
@@ -24,7 +24,7 @@ void MakeTRDZeroMisAlignment(){
     }
   }
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("TRDzeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -33,13 +33,13 @@ void MakeTRDZeroMisAlignment(){
     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("Dariusz Miskowiec");
     md->SetComment("Zero misalignment for TRD");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("TRD/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/VZERO/MakeVZEROFullMisAlignment.C b/VZERO/MakeVZEROFullMisAlignment.C
index d5c649faf52a7371fb0ca7ba790fd851bb22f6d2..9462ffcb75164f275c08fed97df555df939a7ea7 100644 (file)
--- a/VZERO/MakeVZEROFullMisAlignment.C
+++ b/VZERO/MakeVZEROFullMisAlignment.C
@@ -40,7 +40,7 @@ void MakeVZEROFullMisAlignment(){
   new(alobj[1]) AliAlignObjAngles(V0left, volid, dx, dy, dz, dpsi, dtheta,
                                   dphi,kFALSE);
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("V0fullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -49,13 +49,13 @@ void MakeVZEROFullMisAlignment(){
     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("Brigitte Cheynis");
     md->SetComment("Alignment objects for V0 full misalignment");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("VZERO/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/VZERO/MakeVZEROResMisAlignment.C b/VZERO/MakeVZEROResMisAlignment.C
index 3ffa15292ffa35ff25cc98c622618f2b77e2b829..8fe1671371b635bcc4cd8f58d07cd55e555946c8 100644 (file)
--- a/VZERO/MakeVZEROResMisAlignment.C
+++ b/VZERO/MakeVZEROResMisAlignment.C
@@ -36,7 +36,7 @@ void MakeVZEROResMisAlignment(){
   dphi = rnd->Gaus(0.,sigmarot);
   new(alobj[1]) AliAlignObjAngles(V0left, volid, dx, dy, dz, dpsi, dtheta, dphi,kFALSE);
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("V0residualMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -45,13 +45,13 @@ void MakeVZEROResMisAlignment(){
     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("Brigitte Cheynis");
     md->SetComment("Alignment objects for V0 residual misalignment");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("VZERO/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/VZERO/MakeVZEROZeroMisAlignment.C b/VZERO/MakeVZEROZeroMisAlignment.C
index c8f537d48dff02a924e665474cb82d3b71d75b62..db4ca3d41068db826ae27e2584d60544784d1d56 100644 (file)
--- a/VZERO/MakeVZEROZeroMisAlignment.C
+++ b/VZERO/MakeVZEROZeroMisAlignment.C
@@ -20,7 +20,7 @@ void MakeVZEROZeroMisAlignment(){
   TString V0left("VZERO/V0A");
   new(alobj[1]) AliAlignObjAngles(V0left.Data(), volid, dx, dy, dz, dpsi, dtheta, dphi,kTRUE);
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save on file
     TFile f("V0zeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -29,13 +29,13 @@ void MakeVZEROZeroMisAlignment(){
     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("Brigitte Cheynis");
     md->SetComment("Alignment objects for V0 zero-misalignment");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("VZERO/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/ZDC/MakeZDCFullMisAlignment.C b/ZDC/MakeZDCFullMisAlignment.C
index d80a995097b074c946e60aa7b5e2090275a32341..762b1ef96c4be73c0d3ef1b2cde1c204945df3c8 100644 (file)
--- a/ZDC/MakeZDCFullMisAlignment.C
+++ b/ZDC/MakeZDCFullMisAlignment.C
@@ -22,7 +22,7 @@ void MakeZDCFullMisAlignment(){
   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);
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save in file
     TFile f("ZDCfullMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -31,13 +31,13 @@ void MakeZDCFullMisAlignment(){
     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("Chiara Oppedisano");
     md->SetComment("Alignment objects for ZDC full misalignment");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("ZDC/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/ZDC/MakeZDCResMisAlignment.C b/ZDC/MakeZDCResMisAlignment.C
index 0f043f14325afee7f6efbd30c02333fca2606463..6f9e33a576b8ab793f11ff4f0677dab81dbd6244 100644 (file)
--- a/ZDC/MakeZDCResMisAlignment.C
+++ b/ZDC/MakeZDCResMisAlignment.C
@@ -22,7 +22,7 @@ void MakeZDCResMisAlignment(){
   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);
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save in file
     TFile f("ZDCresidualMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -31,13 +31,13 @@ void MakeZDCResMisAlignment(){
     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("Chiara Oppedisano");
     md->SetComment("Alignment objects for ZDC residual misalignment");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("ZDC/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/ZDC/MakeZDCZeroMisAlignment.C b/ZDC/MakeZDCZeroMisAlignment.C
index 2e27bba9aa640d565b44f62fce7f6ccd2b533067..9de321f7e4c376fe668beaaa12ac759a988a9464 100644 (file)
--- a/ZDC/MakeZDCZeroMisAlignment.C
+++ b/ZDC/MakeZDCZeroMisAlignment.C
@@ -22,7 +22,7 @@ void MakeZDCZeroMisAlignment(){
   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);
 
-  if(!gSystem->Getenv("$TOCDB")){
+  if( gSystem->Getenv("TOCDB") != TString("kTRUE") ){
     // save in file
     TFile f("ZDCzeroMisalignment.root","RECREATE");
     if(!f) cerr<<"cannot open file for output\n";
@@ -31,13 +31,13 @@ void MakeZDCZeroMisAlignment(){
     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("Chiara Oppedisano");
     md->SetComment("Alignment objects for ZDC zero misalignment");
-    md->SetAliRootVersion(gSystem->Getenv("$ARVERSION"));
+    md->SetAliRootVersion(gSystem->Getenv("ARVERSION"));
     AliCDBId id("ZDC/Align/Data",0,9999999);
     storage->Put(array,id,md);
   }

diff --git a/macros/MakeAllDETsFullMisAlignment.C b/macros/MakeAllDETsFullMisAlignment.C
index f02e1819203f9dc1d20145194950e06ab89b005a..3a9cf544c4f6a507512dfcf9865ad035c3ee0a87 100644 (file)
--- a/macros/MakeAllDETsFullMisAlignment.C
+++ b/macros/MakeAllDETsFullMisAlignment.C
@@ -9,11 +9,11 @@ void MakeAllDETsFullMisAlignment(Char_t* CDBstorage = "local://$HOME/Full"){
   //
   TString strStorage(CDBstorage);
   if(strStorage.IsNull()){
-    gSystem->Setenv("$TOCDB","kFALSE");
+    gSystem->Setenv("TOCDB","kFALSE");
   }else{  
-    gSystem->Setenv("$TOCDB","kTRUE");
-    gSystem->Setenv("$STORAGE",strStorage.Data());
-    gSystem->Setenv("$ARVERSION","v4-04-Release");
+    gSystem->Setenv("TOCDB","kTRUE");
+    gSystem->Setenv("STORAGE",strStorage.Data());
+    gSystem->Setenv("ARVERSION","v4-05-08");
   }
 
   // if not already present, create geometry file needed by those detectors
@@ -26,7 +26,6 @@ void MakeAllDETsFullMisAlignment(Char_t* CDBstorage = "local://$HOME/Full"){
   }
 
   TString dets = "EMCAL,FMD,ITS,MUON,PHOS,PMD,HMPID,T0,TOF,TPC,TRD,VZERO,ZDC";
-//   TString dets = "ABSO,DIPO,FMD,FRAME,HALL,ITS,MAG,MUON,PHOS,PIPE,PMD,HMPID,SHIL,T0,TOF,TPC,TRD,ZDC,EMCAL,ACORDE,VZERO";
   TObjArray *detArray = dets.Tokenize(',');
   TIter iter(detArray);
   TObjString *ostr;

diff --git a/macros/MakeAllDETsResMisAlignment.C b/macros/MakeAllDETsResMisAlignment.C
index 261f801895bdc2068ac4cbdddd28273f76e2cc50..59c71f1fedc69e116a5ba4f68aae4dda2c18ccef 100644 (file)
--- a/macros/MakeAllDETsResMisAlignment.C
+++ b/macros/MakeAllDETsResMisAlignment.C
@@ -4,16 +4,16 @@ void MakeAllDETsResMisAlignment(Char_t* CDBstorage = "local://$HOME/Residual"){
   // conditions' data base on alien) or set it to null string to have
   // the objects saved locally on file 
   // This macro defines the default name and place for the detector-macros
-  // in charge of producing the full misalignment objects as 
+  // in charge of producing the residual misalignment objects as 
   // $ALICE_ROOT/DET/MakeDETResidualMisAlignment.C
   //
   TString strStorage(CDBstorage);
   if(strStorage.IsNull()){
-    gSystem->Setenv("$TOCDB","kFALSE");
+    gSystem->Setenv("TOCDB","kFALSE");
   }else{  
-    gSystem->Setenv("$TOCDB","kTRUE");
-    gSystem->Setenv("$STORAGE",strStorage.Data());
-    gSystem->Setenv("$ARVERSION","v4-04-Release");
+    gSystem->Setenv("TOCDB","kTRUE");
+    gSystem->Setenv("STORAGE",strStorage.Data());
+    gSystem->Setenv("ARVERSION","v4-05-08");
   }
 
   // if not already present, create geometry file needed by those detectors

diff --git a/macros/MakeAllDETsZeroMisAlignment.C b/macros/MakeAllDETsZeroMisAlignment.C
index 698293934ded736d9322af949795224103ad3d23..5f74035a8a721a10959f2eb52743cee1ace61898 100644 (file)
--- a/macros/MakeAllDETsZeroMisAlignment.C
+++ b/macros/MakeAllDETsZeroMisAlignment.C
@@ -6,11 +6,11 @@ void MakeAllDETsZeroMisAlignment(Char_t* CDBstorage = "local://$HOME/Zero"){
   //
   TString strStorage(CDBstorage);
   if(strStorage.IsNull()){
-    gSystem->Setenv("$TOCDB","kFALSE");
+    gSystem->Setenv("TOCDB","kFALSE");
   }else{  
-    gSystem->Setenv("$TOCDB","kTRUE");
-    gSystem->Setenv("$STORAGE",strStorage.Data());
-    gSystem->Setenv("$ARVERSION","v4-04-Release");
+    gSystem->Setenv("TOCDB","kTRUE");
+    gSystem->Setenv("STORAGE",strStorage.Data());
+    gSystem->Setenv("ARVERSION","v4-05-08");
   }
 
   // if not already present, create geometry file needed by those detectors