Import Geant4 8.1.0 source tree

source/geometry/solids/specific/include/G4Ellipsoid.icc

@@ -1,28 +1,31 @@
 //
 // ********************************************************************
-// * DISCLAIMER                                                       *
+// * License and Disclaimer                                           *
 // *                                                                  *
-// * The following disclaimer summarizes all the specific disclaimers *
-// * of contributors to this software. The specific disclaimers,which *
-// * govern, are listed with their locations in:                      *
-// *   http://cern.ch/geant4/license                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
 // *                                                                  *
 // * Neither the authors of this software system, nor their employing *
 // * institutes,nor the agencies providing financial support for this *
 // * work  make  any representation or  warranty, express or implied, *
 // * regarding  this  software system or assume any liability for its *
-// * use.                                                             *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
 // *                                                                  *
-// * This  code  implementation is the  intellectual property  of the *
-// * GEANT4 collaboration.                                            *
-// * By copying,  distributing  or modifying the Program (or any work *
-// * based  on  the Program)  you indicate  your  acceptance of  this *
-// * statement, and all its terms.                                    *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
 //
-// $Id: G4Ellipsoid.icc,v 1.3 2005/07/04 13:32:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-08-00 $
+// $Id: G4Ellipsoid.icc,v 1.6 2006/06/29 18:46:47 gunter Exp $
+// GEANT4 tag $Name: geant4-08-01 $
 //
 //
 // --------------------------------------------------------------------
@@ -56,17 +59,22 @@ void G4Ellipsoid::SetSemiAxis (G4double newxSemiAxis,
 {
   xSemiAxis= newxSemiAxis; ySemiAxis= newySemiAxis; zSemiAxis= newzSemiAxis;
   semiAxisMax = xSemiAxis > ySemiAxis ? xSemiAxis : ySemiAxis;
-  if (zSemiAxis > semiAxisMax) { semiAxisMax= zSemiAxis; } 
+  if (zSemiAxis > semiAxisMax) { semiAxisMax= zSemiAxis; }
   if (zBottomCut < -zSemiAxis) { zBottomCut = -zSemiAxis; }
   if (zTopCut > +zSemiAxis) { zTopCut = +zSemiAxis; }
 }
 
 void G4Ellipsoid::SetZCuts (G4double newzBottomCut, G4double newzTopCut)
 {
-  zBottomCut = newzBottomCut;
-  zTopCut = newzTopCut;
-  if (zBottomCut < -zSemiAxis) { zBottomCut = -zSemiAxis; }
-  if (zTopCut > +zSemiAxis) { zTopCut = +zSemiAxis; }
+  if (newzBottomCut < -zSemiAxis)
+    { zBottomCut = -zSemiAxis; }
+  else
+    { zBottomCut = newzBottomCut; }
+
+  if (newzTopCut > +zSemiAxis)
+    { zTopCut = +zSemiAxis; }
+  else
+    { zTopCut = newzTopCut; }
 }
 
 inline