Ignore:
Timestamp:
Sep 10, 2008, 5:40:37 PM (17 years ago)
Author:
garnier
Message:

geant4.8.2 beta

Location:
trunk/source/geometry/divisions
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/divisions/History

    r831 r850  
    1 $Id: History,v 1.26 2007/05/18 07:27:40 gcosmo Exp $
     1$Id: History,v 1.28 2008/08/18 16:14:13 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     20August, 18th, 2008      T.Nikitina  (geomdiv-V09-01-01)
     21- Corrected initialisation for 'fnReplicas' and 'fwidth' data members in
     22  CheckAndSetParameters(), to make use of precomputed values retrieved from
     23  parameterisations; simplified method signature.
     24
     25July, 25th, 2008        I.Hrivnacova  (geomdiv-V09-01-00)
     26- Corrected error message in G4VDivisionParameterisation::CheckNDivAndWidth().
    1927
    2028May, 18th, 2007         G.Cosmo  (geomdiv-V08-03-01)

  • trunk/source/geometry/divisions/include/G4PVDivision.hh

    r831 r850  
    2525//
    2626//
    27 // $Id: G4PVDivision.hh,v 1.12 2006/06/29 18:18:07 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4PVDivision.hh,v 1.13 2008/08/18 14:06:01 tnikitin Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4PVDivision
    … …  
    145145
    146146    void CheckAndSetParameters( const EAxis pAxis,
    147                                 const G4int nDivs,
    148                                 const G4double width,
    149147                                const G4double offset,
    150                                       DivisionType divType,
    151148                                const G4LogicalVolume* pMotherLogical );
    152149

  • trunk/source/geometry/divisions/include/G4PVDivisionFactory.hh

    r831 r850  
    2626//
    2727// $Id: G4PVDivisionFactory.hh,v 1.2 2006/06/29 18:18:09 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//

  • trunk/source/geometry/divisions/include/G4ParameterisationBox.hh

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationBox.hh,v 1.6 2006/06/29 18:18:11 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// classes G4ParameterisationBoxX,

  • trunk/source/geometry/divisions/include/G4ParameterisationCons.hh

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationCons.hh,v 1.6 2006/06/29 18:18:13 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// classes G4ParameterisationConsRho,

  • trunk/source/geometry/divisions/include/G4ParameterisationPara.hh

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationPara.hh,v 1.7 2006/06/29 18:18:15 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// classes G4ParameterisationParaX,

  • trunk/source/geometry/divisions/include/G4ParameterisationPolycone.hh

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationPolycone.hh,v 1.7 2006/06/29 18:18:18 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// classes G4ParameterisationPolyconeRho,

  • trunk/source/geometry/divisions/include/G4ParameterisationPolyhedra.hh

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationPolyhedra.hh,v 1.8 2006/06/29 18:18:20 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// classes G4ParameterisationPolyhedraRho,

  • trunk/source/geometry/divisions/include/G4ParameterisationTrd.hh

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationTrd.hh,v 1.7 2006/06/29 18:18:22 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// classes G4ParameterisationTrdX

  • trunk/source/geometry/divisions/include/G4ParameterisationTubs.hh

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationTubs.hh,v 1.6 2006/06/29 18:18:24 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// classes G4ParameterisationTubsRho

  • trunk/source/geometry/divisions/include/G4VDivisionParameterisation.hh

    r831 r850  
    2626//
    2727// $Id: G4VDivisionParameterisation.hh,v 1.11 2007/05/11 13:26:26 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4VDivisionParameterisation

  • trunk/source/geometry/divisions/include/G4VDivisionParameterisation.icc

    r831 r850  
    2626//
    2727// $Id: G4VDivisionParameterisation.icc,v 1.4 2006/06/29 18:18:29 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4VDivisionParameterisation Inline Implementation file

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

    r831 r850  
    2525//
    2626//
    27 // $Id: G4PVDivision.cc,v 1.20 2006/06/29 18:18:31 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4PVDivision.cc,v 1.21 2008/08/18 14:06:13 tnikitin Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4PVDivision Implementation file
    … …  
    7474  SetParameterisation(pMotherLogical, pAxis, nDivs,
    7575                      width, offset, DivNDIVandWIDTH);
    76   CheckAndSetParameters (pAxis, nDivs, width, offset,
    77                          DivNDIVandWIDTH, pMotherLogical);
     76  CheckAndSetParameters (pAxis,offset, pMotherLogical);
    7877}
    7978
    … …  
    105104  SetMotherLogical(pMotherLogical);
    106105  SetParameterisation(pMotherLogical, pAxis, nDivs, 0., offset, DivNDIV);
    107   CheckAndSetParameters (pAxis, nDivs, 0., offset, DivNDIV, pMotherLogical);
     106  CheckAndSetParameters (pAxis, offset, pMotherLogical);
    108107}
    109108
    … …  
    135134  SetMotherLogical(pMotherLogical);
    136135  SetParameterisation(pMotherLogical, pAxis, 0, width, offset, DivWIDTH);
    137   CheckAndSetParameters (pAxis, 0, width, offset, DivWIDTH, pMotherLogical);
     136  CheckAndSetParameters (pAxis, offset, pMotherLogical);
    138137}
    139138
    … …  
    141140void
    142141G4PVDivision::CheckAndSetParameters( const EAxis pAxis,
    143                                      const G4int nDivs,
    144                                      const G4double width,
    145142                                     const G4double offset,
    146                                            DivisionType divType,
    147143                                     const G4LogicalVolume* pMotherLogical )
    148144{
    149   if( divType == DivWIDTH )
    150   {
    151     fnReplicas = fparam->GetNoDiv();
    152   }
    153   else
    154   {
    155     fnReplicas = nDivs;
    156   }
     145  fnReplicas = fparam->GetNoDiv();
     146 
    157147  if (fnReplicas < 1 )
    158148  {
    … …  
    161151  }
    162152
    163   if( divType != DivNDIV)
    164   {
    165     fwidth = fparam->GetWidth();
    166   }
    167   else
    168   {
    169     fwidth = width;
    170   }
     153  fwidth = fparam->GetWidth();
     154
    171155  if( fwidth < 0 )
    172156  {

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

    r831 r850  
    2626//
    2727// $Id: G4PVDivisionFactory.cc,v 1.2 2006/06/29 18:18:33 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4PVDivisionFactory Implementation file

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

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationBox.cc,v 1.10 2006/06/29 18:18:35 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4ParameterisationBox Implementation file

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

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationCons.cc,v 1.9 2006/06/29 18:18:38 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4ParameterisationCons Implementation file

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

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationPara.cc,v 1.11 2006/06/29 18:18:42 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4ParameterisationPara Implementation file

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

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationPolycone.cc,v 1.15 2006/06/29 18:18:44 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4ParameterisationPolycone Implementation file

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

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationPolyhedra.cc,v 1.16 2007/05/18 07:27:23 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4ParameterisationPolyhedra Implementation file

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

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationTrd.cc,v 1.14 2006/06/29 18:18:48 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4ParameterisationTrd Implementation file

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

    r831 r850  
    2626//
    2727// $Id: G4ParameterisationTubs.cc,v 1.8 2006/06/29 18:18:50 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4ParameterisationTubs Implementation file

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

    r831 r850  
    2525//
    2626//
    27 // $Id: G4VDivisionParameterisation.cc,v 1.12 2007/05/11 13:26:26 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4VDivisionParameterisation.cc,v 1.13 2008/07/25 16:23:35 ivana Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4VDivisionParameterisation Implementation file
    … …  
    163163           << " has too big offset + width*nDiv = " << G4endl
    164164           << "        " << foffset + fwidth*fnDiv << " > "
    165            << foffset << ". Width = "
     165           << maxPar << ". Width = "
    166166           << G4endl
    167167           << "        " << fwidth << ". nDiv = " << fnDiv << " !"
Note: See TracChangeset for help on using the changeset viewer.