]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Make use of list of active detectors from GRP to avoid trying misalignment for inacti...
authorrgrosso <rgrosso@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 6 Sep 2008 08:13:07 +0000 (08:13 +0000)
committerrgrosso <rgrosso@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 6 Sep 2008 08:13:07 +0000 (08:13 +0000)
STEER/AliGeomManager.cxx
STEER/AliReconstruction.cxx

index 877ab6b4229d07835a7353ca312d4f7bcc160400..a2fde10fb2b4c9b72daf563ae5b7b5a2d99816b2 100644 (file)
@@ -1597,7 +1597,7 @@ Bool_t AliGeomManager::ApplyAlignObjsToGeom(TObjArray& alignObjArray, Bool_t ovl
     flag = alobj->ApplyToGeometry(ovlpcheck);
     if(!flag)
     {
-      AliErrorClass(Form("Error applying alignment object for volume %s !",alobj->GetSymName()));
+      AliWarningClass(Form("Error applying alignment object for volume %s !",alobj->GetSymName()));
     }else{
       AliDebugClass(5,Form("Alignment object for volume %s applied successfully",alobj->GetSymName()));
     }
index d1fd78b8728dacc327216c29c051d356208ef35b..97a7298179dcdd95cc1bece1c7121cec3db17526 100644 (file)
@@ -923,6 +923,7 @@ Bool_t AliReconstruction::InitGRP() {
     fFillESD = MatchDetectorList(fFillESD,detMask);
     fQADetectors = MatchDetectorList(fQADetectors,detMask);
     fLoadCDB = MatchDetectorList(fLoadCDB,detMask);
+    fLoadAlignData = MatchDetectorList(fLoadAlignData,detMask);
   }
 
   AliInfo("===================================================================================");
@@ -1164,6 +1165,12 @@ void AliReconstruction::Begin(TTree *)
     AliSysInfo::AddStamp("CheckGeom");
   }
 
+  if (!InitGRP()) {
+    Abort("InitGRP", TSelector::kAbortProcess);
+    return;
+  }
+  AliSysInfo::AddStamp("InitGRP");
+
   if (!MisalignGeometry(fLoadAlignData)) {
     Abort("MisalignGeometry", TSelector::kAbortProcess);
     return;
@@ -1171,12 +1178,6 @@ void AliReconstruction::Begin(TTree *)
   AliCDBManager::Instance()->UnloadFromCache("GRP/Geometry/Data");
   AliSysInfo::AddStamp("MisalignGeom");
 
-  if (!InitGRP()) {
-    Abort("InitGRP", TSelector::kAbortProcess);
-    return;
-  }
-  AliSysInfo::AddStamp("InitGRP");
-
   if (!LoadCDB()) {
     Abort("LoadCDB", TSelector::kAbortProcess);
     return;