Changeset 850 for trunk/source/geometry/divisions/src

Timestamp:

Sep 10, 2008, 5:40:37 PM (16 years ago)

Author:

garnier

Message:

geant4.8.2 beta

Location:

trunk/source/geometry/divisions/src

Files:

• G4PVDivision.cc (modified) (6 diffs)
• G4PVDivisionFactory.cc (modified) (1 diff)
• G4ParameterisationBox.cc (modified) (1 diff)
• G4ParameterisationCons.cc (modified) (1 diff)
• G4ParameterisationPara.cc (modified) (1 diff)
• G4ParameterisationPolycone.cc (modified) (1 diff)
• G4ParameterisationPolyhedra.cc (modified) (1 diff)
• G4ParameterisationTrd.cc (modified) (1 diff)
• G4ParameterisationTubs.cc (modified) (1 diff)
• G4VDivisionParameterisation.cc (modified) (2 diffs)

trunk/source/geometry/divisions/src/G4PVDivision.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4PVDivision.cc,v 1.20 2006/06/29 18:18:31 gunter Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4PVDivision.cc,v 1.21 2008/08/18 14:06:13 tnikitin Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4PVDivision Implementation file
@@ -74 +74 @@
   SetParameterisation(pMotherLogical, pAxis, nDivs,
                       width, offset, DivNDIVandWIDTH);
-  CheckAndSetParameters (pAxis, nDivs, width, offset,
-                         DivNDIVandWIDTH, pMotherLogical);
+  CheckAndSetParameters (pAxis,offset, pMotherLogical);
 }
 
@@ -105 +104 @@
   SetMotherLogical(pMotherLogical);
   SetParameterisation(pMotherLogical, pAxis, nDivs, 0., offset, DivNDIV);
-  CheckAndSetParameters (pAxis, nDivs, 0., offset, DivNDIV, pMotherLogical);
+  CheckAndSetParameters (pAxis, offset, pMotherLogical);
 }
 
@@ -135 +134 @@
   SetMotherLogical(pMotherLogical);
   SetParameterisation(pMotherLogical, pAxis, 0, width, offset, DivWIDTH);
-  CheckAndSetParameters (pAxis, 0, width, offset, DivWIDTH, pMotherLogical);
+  CheckAndSetParameters (pAxis, offset, pMotherLogical);
 }
 
@@ -141 +140 @@
 void
 G4PVDivision::CheckAndSetParameters( const EAxis pAxis,
-                                     const G4int nDivs,
-                                     const G4double width,
                                      const G4double offset, 
-                                           DivisionType divType,
                                      const G4LogicalVolume* pMotherLogical )
 {
-  if( divType == DivWIDTH )
-  {
-    fnReplicas = fparam->GetNoDiv();
-  }
-  else
-  {
-    fnReplicas = nDivs;
-  }
+  fnReplicas = fparam->GetNoDiv();
+ 
   if (fnReplicas < 1 )
   {
@@ -161 +151 @@
   }
 
-  if( divType != DivNDIV)
-  {
-    fwidth = fparam->GetWidth();
-  }
-  else
-  {
-    fwidth = width;
-  }
+  fwidth = fparam->GetWidth();
+
   if( fwidth < 0 )
   {

trunk/source/geometry/divisions/src/G4PVDivisionFactory.cc

@@ -26 +26 @@
 //
 // $Id: G4PVDivisionFactory.cc,v 1.2 2006/06/29 18:18:33 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4PVDivisionFactory Implementation file

trunk/source/geometry/divisions/src/G4ParameterisationBox.cc

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationBox.cc,v 1.10 2006/06/29 18:18:35 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4ParameterisationBox Implementation file

trunk/source/geometry/divisions/src/G4ParameterisationCons.cc

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationCons.cc,v 1.9 2006/06/29 18:18:38 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4ParameterisationCons Implementation file

trunk/source/geometry/divisions/src/G4ParameterisationPara.cc

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationPara.cc,v 1.11 2006/06/29 18:18:42 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4ParameterisationPara Implementation file

trunk/source/geometry/divisions/src/G4ParameterisationPolycone.cc

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationPolycone.cc,v 1.15 2006/06/29 18:18:44 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4ParameterisationPolycone Implementation file

trunk/source/geometry/divisions/src/G4ParameterisationPolyhedra.cc

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationPolyhedra.cc,v 1.16 2007/05/18 07:27:23 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4ParameterisationPolyhedra Implementation file

trunk/source/geometry/divisions/src/G4ParameterisationTrd.cc

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationTrd.cc,v 1.14 2006/06/29 18:18:48 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4ParameterisationTrd Implementation file

trunk/source/geometry/divisions/src/G4ParameterisationTubs.cc

@@ -26 +26 @@
 //
 // $Id: G4ParameterisationTubs.cc,v 1.8 2006/06/29 18:18:50 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4ParameterisationTubs Implementation file

trunk/source/geometry/divisions/src/G4VDivisionParameterisation.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VDivisionParameterisation.cc,v 1.12 2007/05/11 13:26:26 gcosmo Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4VDivisionParameterisation.cc,v 1.13 2008/07/25 16:23:35 ivana Exp $
+// GEANT4 tag $Name: HEAD $
 //
 // class G4VDivisionParameterisation Implementation file
@@ -163 +163 @@
            << " has too big offset + width*nDiv = " << G4endl
            << "        " << foffset + fwidth*fnDiv << " > "
-           << foffset << ". Width = "
+           << maxPar << ". Width = "
            << G4endl
            << "        " << fwidth << ". nDiv = " << fnDiv << " !"