Important fix for composite shapes for a bug affecting ComputeNormal when a...

Important fix for composite shapes for a bug affecting ComputeNormal when a call to FindNode or Safety is issued after FindNextBoundary. Affected the transport of optical photons with the G4 interface


git-svn-id: http://root.cern.ch/svn/root/trunk@45983 27541ba8-7e3a-0410-8455-c3a389f83636

geom/geom/src/TGeoBoolNode.cxx

@@ -443,7 +443,7 @@ void TGeoUnion::ComputeBBox(Double_t &dx, Double_t &dy, Double_t &dz, Double_t *
    origin[1] = 0.5*(ymin+ymax);
    dz = 0.5*(zmax-zmin);
    origin[2] = 0.5*(zmin+zmax);
-}   
+}
 
 //______________________________________________________________________________
 Bool_t TGeoUnion::Contains(Double_t *point) const
@@ -453,13 +453,9 @@ Bool_t TGeoUnion::Contains(Double_t *point) const
    TGeoBoolNode *node = (TGeoBoolNode*)this;
    fLeftMat->MasterToLocal(point, &local[0]);
    Bool_t inside = fLeft->Contains(&local[0]);
-   if (inside) {
-      node->SetSelected(1);
-      return kTRUE;
-   }   
+   if (inside) return kTRUE;
    fRightMat->MasterToLocal(point, &local[0]);
    inside = fRight->Contains(&local[0]);
-   if (inside) node->SetSelected(2);
    return inside;
 }
 
@@ -877,11 +873,9 @@ Bool_t TGeoSubtraction::Contains(Double_t *point) const
    TGeoBoolNode *node = (TGeoBoolNode*)this;
    fLeftMat->MasterToLocal(point, &local[0]);
    Bool_t inside = fLeft->Contains(&local[0]);
-   if (inside) node->SetSelected(1);
-   else return kFALSE;
+   if (!inside) return kFALSE;
    fRightMat->MasterToLocal(point, &local[0]);
    inside = !fRight->Contains(&local[0]);
-   if (!inside) node->SetSelected(2);
    return inside;
 }