From: rgrosso Date: Tue, 8 Sep 2009 12:22:53 +0000 (+0000) Subject: corrected assignment of return value in ApplyAlignObjsToGeom X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=c8687cb5b6762a4e202d94d870e8ff7420e20924;p=u%2Fmrichter%2FAliRoot.git corrected assignment of return value in ApplyAlignObjsToGeom --- diff --git a/STEER/AliGeomManager.cxx b/STEER/AliGeomManager.cxx index 98905378284..94d504c636c 100644 --- a/STEER/AliGeomManager.cxx +++ b/STEER/AliGeomManager.cxx @@ -1646,40 +1646,40 @@ Bool_t AliGeomManager::LoadAlignObjsFromCDBSingleDet(const char* detName, TObjAr //_____________________________________________________________________________ Bool_t AliGeomManager::ApplyAlignObjsToGeom(TObjArray& alignObjArray, Bool_t ovlpcheck) { - // Read collection of alignment objects (AliAlignObj derived) saved - // in the TClonesArray alObjArray and apply them to gGeoManager - // - alignObjArray.Sort(); - Int_t nvols = alignObjArray.GetEntriesFast(); + // Read collection of alignment objects (AliAlignObj derived) saved + // in the TClonesArray alObjArray and apply them to gGeoManager + // + alignObjArray.Sort(); + Int_t nvols = alignObjArray.GetEntriesFast(); - Bool_t flag = kTRUE; + Bool_t flag = kTRUE; - for(Int_t j=0; jApplyToGeometry(ovlpcheck); - if(!flag) + for(Int_t j=0; jGetSymName())); - }else{ - AliDebugClass(5,Form("Alignment object for volume %s applied successfully",alobj->GetSymName())); - } + AliAlignObj* alobj = (AliAlignObj*) alignObjArray.UncheckedAt(j); + if(!alobj->ApplyToGeometry(ovlpcheck)) + { + flag = kFALSE; + AliDebugClass(5,Form("Error applying alignment object for volume %s !",alobj->GetSymName())); + }else{ + AliDebugClass(5,Form("Alignment object for volume %s applied successfully",alobj->GetSymName())); + } - } + } - if (AliDebugLevelClass() > 5) { - fgGeometry->CheckOverlaps(0.001); - TObjArray* ovexlist = fgGeometry->GetListOfOverlaps(); - if(ovexlist->GetEntriesFast()){ - AliErrorClass("The application of alignment objects to the geometry caused huge overlaps/extrusions!"); - fgGeometry->PrintOverlaps(); - } - } + if (AliDebugLevelClass() > 5) { + fgGeometry->CheckOverlaps(0.001); + TObjArray* ovexlist = fgGeometry->GetListOfOverlaps(); + if(ovexlist->GetEntriesFast()){ + AliErrorClass("The application of alignment objects to the geometry caused huge overlaps/extrusions!"); + fgGeometry->PrintOverlaps(); + } + } - // Update the TGeoPhysicalNodes - fgGeometry->RefreshPhysicalNodes(); + // Update the TGeoPhysicalNodes + fgGeometry->RefreshPhysicalNodes(); - return flag; + return flag; }