Modifying the queries for AliRoot version, used to fill the related fill in OCDB...

[u/mrichter/AliRoot.git] / macros / MakeAllDETsResMisAlignment.C

diff --git a/macros/MakeAllDETsResMisAlignment.C b/macros/MakeAllDETsResMisAlignment.C
index fb9a284c0905e0a022776be41e3c40ac7fd17b3b..63f1482e55ae6ae429e3915aa84c9860caa1206d 100644 (file)
--- a/macros/MakeAllDETsResMisAlignment.C
+++ b/macros/MakeAllDETsResMisAlignment.C
@@ -1,4 +1,6 @@
-void MakeAllDETsResMisAlignment(Char_t* CDBstorage = "local://$HOME/Residual"){
+#include "ARVersion.h"
+
+void MakeAllDETsResMisAlignment(Char_t* CDBstorage = "local://$HOME/ResidualMisAlignment", Bool_t partialGeom=kFALSE){
   // Make residual misalignment objects for all detectors
   // Pass different "CDBstorage" argument if needed (e.g. to fill
   // conditions' data base on alien) or set it to null string to have
@@ -7,24 +9,57 @@ void MakeAllDETsResMisAlignment(Char_t* CDBstorage = "local://$HOME/Residual"){
   // in charge of producing the residual misalignment objects as 
   // $ALICE_ROOT/DET/MakeDETResidualMisAlignment.C
   //
+  const char* macroname="MakeAllDETsResMisAlignment.C";
+
   TString strStorage(CDBstorage);
   if(strStorage.IsNull()){
     gSystem->Setenv("TOCDB","kFALSE");
   }else{  
     gSystem->Setenv("TOCDB","kTRUE");
     gSystem->Setenv("STORAGE",strStorage.Data());
-    gSystem->Setenv("ARVERSION","v4-05-08");
+    gSystem->Setenv("ARVERSION",ALIROOT_SVN_BRANCH);
+  }
+  if(partialGeom){
+    gSystem->Setenv("PARTGEOM","kTRUE");
+  }else{
+    gSystem->Setenv("PARTGEOM","kFALSE");
   }
 
-  if(!AliGeomManager::GetGeometry()){
-    if(!(AliCDBManager::Instance())->IsDefaultStorageSet())
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
-      AliCDBManager::Instance()->SetRun(0);
-    AliGeomManager::LoadGeometry();
+  // Load geometry from CDB updating it if we are producing the
+  // alignment objects for the CDB
+  AliCDBManager* cdb = AliCDBManager::Instance();
+  if(!cdb->IsDefaultStorageSet()) cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  cdb->SetRun(0);
+  
+  if(strStorage.IsNull()){ //if we produce the objects into a file
+    AliGeomManager::LoadGeometry(); //load geom from default CDB storage
+  }else{ // if we produce the objects in a CDB storage
+    // update geometry in it
+    Info(macroname,"Updating geometry in CDB storage %s",strStorage.Data());
+    gROOT->ProcessLine(".L $ALICE_ROOT/GRP/UpdateCDBIdealGeom.C");
+    if(partialGeom){
+      UpdateCDBIdealGeom(strStorage.Data(),"$ALICE_ROOT/macros/Config_PDC06.C");
+    }else{
+      UpdateCDBIdealGeom(strStorage.Data(),"$ALICE_ROOT/macros/Config.C");
+    }
+    // load the same geometry from given CDB storage
+    AliCDBPath path("GRP","Geometry","Data");
+    AliCDBStorage* storage = cdb->GetStorage(strStorage.Data());
+    AliCDBEntry *entry = storage->Get(path.GetPath(),cdb->GetRun());
+    if(!entry) Fatal(macroname,"Couldn't load geometry data from CDB!");
+    entry->SetOwner(0);
+    TGeoManager* geom = (TGeoManager*) entry->GetObject();
+    if (!geom) Fatal(macroname,"Couldn't find TGeoManager in the specified CDB entry!");
+    AliGeomManager::SetGeometry(geom);
   }
+  
+  // run macro for non-sensitive modules
+  // (presently generates only FRAME alignment objects)
+  gSystem->Exec("aliroot -b -q $ALICE_ROOT/GRP/MakeSTRUCTResMisAlignment.C");
 
-  TString dets="EMCAL,FMD,HMPID,ITS,MUON,PHOS,PMD,T0,TOF,TPC,TRD,VZERO,ZDC";
-  TObjArray *detArray = dets.Tokenize(',');
+  // run macros for sensitive modules
+  TString sModules="EMCAL,FMD,HMPID,ITS,MUON,PMD,PHOS,T0,TRD,TPC,TOF,VZERO,ZDC";
+  TObjArray *detArray = sModules.Tokenize(',');
   TIter iter(detArray);
   TObjString *ostr;
   TString exec_det_macro;
@@ -42,3 +77,4 @@ void MakeAllDETsResMisAlignment(Char_t* CDBstorage = "local://$HOME/Residual"){
 
   return;
 }
+