Changeset 1010 for trunk/source/geometry/divisions/src/G4PVDivision.cc

Timestamp:

Apr 22, 2009, 11:58:58 AM (15 years ago)

Author:

garnier

Message:

update

File:

• trunk/source/geometry/divisions/src/G4PVDivision.cc (modified) (7 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PVDivision.cc,v 1.21 2008/08/18 14:06:13 tnikitin Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4PVDivision.cc,v 1.22 2008/12/03 16:41:45 arce Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // class G4PVDivision Implementation file
@@ -74 +74 @@
   SetParameterisation(pMotherLogical, pAxis, nDivs,
                       width, offset, DivNDIVandWIDTH);
-  CheckAndSetParameters (pAxis,offset, pMotherLogical);
+  CheckAndSetParameters (pAxis, nDivs, width, offset,
+                         DivNDIVandWIDTH, pMotherLogical);
 }
 
@@ -104 +105 @@
   SetMotherLogical(pMotherLogical);
   SetParameterisation(pMotherLogical, pAxis, nDivs, 0., offset, DivNDIV);
-  CheckAndSetParameters (pAxis, offset, pMotherLogical);
+  CheckAndSetParameters (pAxis, nDivs, 0., offset, DivNDIV, pMotherLogical);
 }
 
@@ -134 +135 @@
   SetMotherLogical(pMotherLogical);
   SetParameterisation(pMotherLogical, pAxis, 0, width, offset, DivWIDTH);
-  CheckAndSetParameters (pAxis, offset, pMotherLogical);
+  CheckAndSetParameters (pAxis, 0, width, offset, DivWIDTH, pMotherLogical);
 }
 
@@ -140 +141 @@
 void
 G4PVDivision::CheckAndSetParameters( const EAxis pAxis,
+                                     const G4int nDivs,
+                                     const G4double width,
                                      const G4double offset, 
+                                           DivisionType divType,
                                      const G4LogicalVolume* pMotherLogical )
 {
-  fnReplicas = fparam->GetNoDiv();
- 
+  if( divType == DivWIDTH )
+  {
+    fnReplicas = fparam->GetNoDiv();
+  }
+  else
+  {
+    fnReplicas = nDivs;
+  }
   if (fnReplicas < 1 )
   {
@@ -151 +161 @@
   }
 
-  fwidth = fparam->GetWidth();
-
+  if( divType != DivNDIV)
+  {
+    fwidth = fparam->GetWidth();
+  }
+  else
+  {
+    fwidth = width;
+  }
   if( fwidth < 0 )
   {
@@ -202 +218 @@
   G4String msolType = pMotherLogical->GetSolid()->GetEntityType();
   G4String dsolType = GetLogicalVolume()->GetSolid()->GetEntityType();
-  if( msolType != dsolType )
+  if( msolType != dsolType && ( msolType != "G4Trd" || dsolType != "G4Trap" ) )
   {
     G4String message =
       "Incorrect solid type for division of volume " + GetName()
     + "    It is: " + msolType + ", while it should be: " + dsolType;
-    G4Exception("G4VDivisionParameterisation::CheckAndSetParameters()",
+    G4Exception("G4PVDivision::CheckAndSetParameters()",
                 "IllegalConstruct", FatalException, message );
   }