Changeset 1347 for trunk/source/geometry


Ignore:
Timestamp:
Dec 22, 2010, 3:52:27 PM (15 years ago)
Author:
garnier
Message:

geant4 tag 9.4

Location:
trunk/source/geometry
Files:
431 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/geometry/History

    r850 r1347  
    1 $Id: History,v 1.39 2007/05/18 11:10:43 gcosmo Exp $
     1$Id: History,v 1.42 2010/10/27 07:34:32 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    226226  Collecting subtags: field-V01-00-00, geomsolids-V01-00-00,
    227227                      geommng-V01-00-00 and geomvol-V01-00-00.
    228 
    229 Changes are now documented in the individual sub-category History files.
    230 ------------------------------------------------------------------------
     228- Changes are now documented in the individual sub-category History files.
    231229
    232230Nov  10,  99   John Apostolakis              geometry-V00-01-01
    233 
    234   geomsolids-V00-01-03
     231-------------------------------
     232- geomsolids-V00-01-03
    235233      which includes the following sub-tags:
    236234        geom-solids-csg-01-00-02-cand
    … …  
    238236        breps-V00-01-00
    239237        stepinterface-V00-01-00
    240 
    241    geomvol-01-01-01b
    242 
    243    geommng-V00-01-01
    244 
    245    field-V00-01-02   
    246 
    247 ===============================================================================
     238- geomvol-01-01-01b
     239- geommng-V00-01-01
     240- field-V00-01-02   
     241
     242###############################################################################
    248243  Geant4 1.0  , 1st STL-based release.
    249 ===============================================================================
     244###############################################################################
     245
    250246June  7,  99   John Apostolakis              geometry-01-00-06
    251 
     247-------------------------------
    252248- Tagged.
    253249
    254250June  7,  99   D. C. Williams
    255  CSG Pcon/Pgon (and supporting classes) :  several changes
     251-------------------------------
     252- CSG Pcon/Pgon (and supporting classes) :  several changes
    256253
    257254June  4,  99   S. Giani
    258  G4Trap                 : CalculateExtent fix
    259  G4SmartVoxelHeader.cc  : protection against inconsistent CalculateExtent
     255-------------------------------
     256- G4Trap                 : CalculateExtent fix
     257- G4SmartVoxelHeader.cc  : protection against inconsistent CalculateExtent
    260258
    261259May  21,  99   John Apostolakis              geometry-01-00-05
     260-------------------------------
    262261- Tagged.
    263262
    264263May  20,  99   S.Giani, S.Magni
    265 
    266   Fixes in BREP  Line, & (PCone, FCylindrical/FConical surf) respectively
    267   For more details see solids/BREP/History
    268 
    269   Also see changes mentioned in solids/CSG/History for CSG Pcon/Pgon
     264-------------------------------
     265- Fixes in BREP  Line, & (PCone, FCylindrical/FConical surf) respectively
     266- For more details see solids/BREP/History
     267- Also see changes mentioned in solids/CSG/History for CSG Pcon/Pgon
    270268
    271269May  19,  99   Frank  Behner
    272  
    273   Volumes: Further minor fixes for STL.
     270------------------------------- 
     271- Volumes: Further minor fixes for STL.
    274272
    275273May  12,  99   John Apostolakis              geometry-01-00-04
    276 
     274-------------------------------
    277275- Tagged.
    278276
    279277May  12,  99   Simone Giani
    280   Fixes to G4BREPSolidPolyhedra and G4FPlane.
     278-------------------------------
     279- Fixes to G4BREPSolidPolyhedra and G4FPlane.
    281280
    282281May  10,  99   Frank  Behner
    283   Changes in RW use for compatibility with RW/STL in
     282-------------------------------
     283- Changes in RW use for compatibility with RW/STL in
    284284        management/src/G4PhysicalVolumeStore.cc 
    285285        management/src/G4LogicalVolumeStore.cc
    … …  
    287287
    288288May   7,  98   John Apostolakis
    289 
    290   Changed G4Navigator to issue warning in the case of small inaccuracies
     289-------------------------------
     290- Changed G4Navigator to issue warning in the case of small inaccuracies
    291291   & cause fatal exception only for large deviations.
    292292
    293293May   3,  99   John Apostolakis              geometry-01-00-03
    294 
    295  Minor fixes
     294-------------------------------
     295- Minor fixes
    296296    In CSG solids:  Cons & Tubs  minor, and in PCon/PGon
    297297    For STL migration: PV-vol-store, NavLevel   (Frank Boehner)
    298298
    299299Apr  19,  99   John Apostolakis              geometry-01-00-02
    300 
    301  Small fixes to solids: consistency fix for CalculateExtent & tolerance
    302 
    303  CodeWarrior fixes (some) to magneticfield
    304 
     300-------------------------------
     301- Small fixes to solids: consistency fix for CalculateExtent & tolerance
     302- CodeWarrior fixes (some) to magneticfield
    305303
    306304Apr  15,  99   John Allison
    307 
    308   Added -I$(G4BASE)/intercoms/include to BREPS, Boolean abd CSG GNUmakefiles
    309             in preparation for move of G4VGraphicsScene to intercoms.
     305-------------------------------
     306- Added -I$(G4BASE)/intercoms/include to BREPS, Boolean abd CSG GNUmakefiles
     307  in preparation for move of G4VGraphicsScene to intercoms.
    310308
    311309Mar  19,  99   John Apostolakis              geometry-01-00-01
    312 
    313  Category tag using:
     310-------------------------------
     311- Category tag using:
    314312   solids:       [tag geomsolids-01-00-01]
    315313   volumes:      [tag geomsolids-01-00-01]
    … …  
    318316
    319317Mar  19,  99   John Apostolakis
    320 
    321  Summary of significant changes in sub-categories/sub-directories
    322    management:   [tag geommng-01-00-02 ]
     318-------------------------------
     319- Summary of significant changes in sub-categories/sub-directories
     320  management:   [tag geommng-01-00-02 ]
    323321      G4AffineTransform.icc InverseProduct fix (used in Navigator).
    324322
    325    [....  Add information here .... ? ]
    326 
    327 Jan  15,  99   John Apostolakis   
    328 
    329    Fixes in CSG solids (Cons by V.Grichine, CSG Pcone+Pgon by D.C.Williams)
     323Jan  15, 99    John Apostolakis   
     324-------------------------------
     325- Fixes in CSG solids (Cons by V.Grichine, CSG Pcone+Pgon by D.C.Williams)
    330326
    331327Jan  15,  99   Simone Giani      ( rec by JA. )
    332    Fixes in the creation of Smart Voxels:
    333 
    334   Less memory intensive and much more performant at initialisation.
    335    No worse, but a little faster at tracking time.  (G4SmartVoxelHeader)
     328-------------------------------
     329- Fixes in the creation of Smart Voxels:
     330- Less memory intensive and much more performant at initialisation.
     331  No worse, but a little faster at tracking time.  (G4SmartVoxelHeader)
    336332
    337333Jan  10,  99   John Apostolakis   ( geometry-01-00-01 to be done)
    338                                     geometry as in geant4-00-patch2
    339 
    340    Fixes in BREPs (Pcone, Pgon, ...)  see solids/BREPS/History
    341    includes the subtags
    342 
     334-------------------------------     geometry as in geant4-00-patch2
     335- Fixes in BREPs (Pcone, Pgon, ...)  see solids/BREPS/History
     336  includes the subtags
    343337      stepinterface-01-00-01     
    344338      step-01-00-01
    345339
    346 ===============================================================================
     340###############################################################################
    347341  Geant4.0.0  , 1st production release.
    348 ===============================================================================
     342###############################################################################
    349343
    350344Dec  11,  98   John Apostolakis   geometry-00-04-04
    351 
    352    Fixes in BREP Pcone, Pgon
    353             new csg versions of above too.
    354 
     345-------------------------------
     346- Fixes in BREP Pcone, Pgon new csg versions of above too.
    355347
    356348Dec   9,  98   John Apostolakis   geometry-00-04-03
    357 
    358    Fixes for
    359 
     349-------------------------------
     350- Fixes for:
    360351     - BrepPCone in constructor, FPlane, Cylindrical, Conical surfaces.
    361352                       Ellipse and others.
    … …  
    365356     - STEPinterface : several creators
    366357
    367 
    368358Dec   1,  98   John Apostolakis   geometry-00-04-02
    369 
    370   New code in solids/CSG (other implementation of Pgon, Pcon - not exercised)
     359-------------------------------
     360- New code in solids/CSG (other implementation of Pgon, Pcon - not exercised)
    371361
    372362Dec   1,  98   John Apostolakis   geometry-00-04-02minus
    373    Fixes in Boolean/src             portability
     363-------------------------------
     364- Fixes in Boolean/src             portability
    374365            BREPS/src               logical problems (bPcone, ConeSurf, Plane)
    375            
    376    Added History files in subdirectories.
    377 
     366- Added History files in subdirectories.
    378367
    379368Nov  27,  98   John Apostolakis   geometry-00-04-01
    380 
    381    Fixes in Boolean/src             code: logical fixes
     369-------------------------------
     370- Fixes in Boolean/src             code: logical fixes
    382371            magneticfield/include   interface problem
    383372                          src       printing in propagator (debug)
    … …  
    387376            management              no changes - but fixed versions (now head)
    388377
    389 =======
    390378Nov  19,  98   John Apostolakis   geometry-00-03-10
    391 
    392  - Fixes from Lionel in BREPS/STEP/STEPinterface
    393 
    394  - management/include/G4LogicalVolume.icc
    395     Deleted and readded same version to get CVS to see it on the head.
    396 
     379-------------------------------
     380- Fixes from Lionel in BREPS/STEP/STEPinterface
     381- management/include/G4LogicalVolume.icc
     382  Deleted and readded same version to get CVS to see it on the head.
    397383
    398384Nov  19,  98   John Apostolakis   geometry-00-03-09
    399 
    400  - Added field-00-03-03
     385-------------------------------
     386- Added field-00-03-03
    401387     (it fixes propagation and several steppers)
    402388
    403389Nov  13,  98   John Apostolakis   geometry-00-03-08
    404 
    405  - Added  ???
    406 
    407 ----------------------------------------------------------------------
     390-------------------------------
     391- Tagged.
     392
    408393Nov  12,  98   John Apostolakis   geometry-00-03-07
    409 
    410  - Tagged for the STT.
    411 
    412  - solids-00-03-02:
     394-------------------------------
     395- Tagged for the STT.
     396- solids-00-03-02:
    413397    i) New directory finally included:
    414398        solids/Boolean 
    … …  
    416400
    417401   ii) Fix in solids/CSG/src/G4Sphere.cc (V. Grichine).
    418 
    419  - field-00-03-02
     402- field-00-03-02
    420403     Many changes in Magnetic field to accomodate Electric Field.
    421 
    422   Still does not contain the fixes in geometry-00-03-03 (and later) in the
    423    following directories:
     404- Still does not contain the fixes in geometry-00-03-03 (and later) in the
     405  following directories:
    424406     BREPS,
    425407     STEP,
    426408     STEPinterface
    427 ----------------------------------------------------------------------------
    428409
    429410Nov   9,  98   John Apostolakis   geometry-00-03-06
    430 
    431  - Tagged for the STT.
    432 
     411-------------------------------
     412- Tagged for the STT.
    433413  Includes reorganisation of volumes
    434 
    435414  Still does not contain the fixes in geometry-00-03-03 (and later) in the
    436415   following directories:
    … …  
    438417       >all< of solids/Boolean
    439418
    440 ----------------------------------------------------------------------
    441 
    442 Oct  30,  98   John Apostolakis   geometry-00-03-03 -- NOT TESTED --
    443 
    444   New Boolean directory.
    445 
    446   Many fixes in BREPS:
     419Oct  30,  98   John Apostolakis   geometry-00-03-03
     420-------------------------------
     421- New Boolean directory.
     422- Many fixes in BREPS:
    447423     Deleted StepCopyData from all classes.
    448424     Replaced G4Point, Point3d and Point2d with G4Point3D
    449425     Fixes to BREPSolid for BoundingBoxes
    450426
    451 ----------------------------------------------------------------------
    452 
    453427Sept 23rd, 98  John Apostolakis
    454 
    455   G4Box:  Changed DistanceToIn to fix new problem.
    456 
    457   G4ParameterisedNavigation
    458   G4VoxelNavigation
    459           Fixed VoxelSafety computation for the case of the middle voxel of
    460        a set of equivalent (lowest-level) voxels.
     428-------------------------------
     429- G4Box: changed DistanceToIn to fix new problem.
     430- G4ParameterisedNavigation
     431- G4VoxelNavigation: fixed VoxelSafety computation for the case of the
     432  middle voxel of a set of equivalent (lowest-level) voxels.
    461433
    462434Sept 17th, 98  John Apostolakis    geometry-00-03-01
    463 
    464  Tag created.
     435-------------------------------
     436- Tag created.
    465437
    466438Sept 15th, 98  John Apostolakis
    467 
    468  In G4ParameterisedNavigation
    469 
     439-------------------------------
     440- In G4ParameterisedNavigation
    470441   i) Corrected ComputeSafety(...) which called ComputeVoxelSafety without
    471442     setting the fVoxelNode & fVoxelNodeNo to the ones at localpoint.
    472 
    473443     [ This produced incorrect safeties in some cases & resulted in an
    474444      assertion failure in testT08 because of an unexpected change of volume. ]
    475 
    476445  ii) ComputeStep: Fixed assertion check of blocked replica number.
    477446
    478 
    479447Aug  24th, 98  John Apostolakis  geometry-00-02-01
    480 
    481   Tagged.
     448-------------------------------
     449- Tagged.
    482450  Small fixes in BREPS, to allow compilation on different platforms.
    483451
    484 
    485 ==============================================================================
     452###############################################################################
    486453beta01 release
    487 ==============================================================================
     454###############################################################################
     455
    488456July 31st, 98  Peter Urban
    489 
    490   Several fixes for BREPS.
     457-------------------------------
     458- Several fixes for BREPS.
    491459
    492460
    493461July 29th, 98  John Apostolakis  (with Stefano Magni)
    494 
    495  G4BREPSolidPCone.cc : Cylindrical sections were incorrectly placed.
    496 
    497  G4ConicalSurface.cc
    498  G4CylindricalSurface.cc:
    499 
     462-------------------------------
     463- G4BREPSolidPCone.cc : Cylindrical sections were incorrectly placed.
     464- G4ConicalSurface.cc
     465  G4CylindricalSurface.cc:
    500466    The Inside functions are modified to try to use the Geant-4 tolerance.
    501467     --> must be checked further
    502468       [ The method is used by Intersect of respective surfaces in a
    503469         complicated manner. ]
    504 
    505  G4FConicalSurface.cc
     470- G4FConicalSurface.cc
    506471   - Fix to Bounding Box, which was incorrectly centered/placed.
    507472   - Fix to Intersect, to insure that only intersection in Finite extent of
    508473      Surface are found.
    509474
    510 
    511475July 28th, 98  John Apostolakis 
    512 
    513    In the Navigator location, the blocked Volume was not cleared when the
    514 navigator descended several levels in the tree. This would allows the same in another part of the tree to be wrongly blocked.
    515 
    516    In G4ParameterisedNavigation, the identity of the blocked Physical Volume
    517 was not checked! You would block replica number 3 of your parameterised volume
    518 although you exited replica number 3 of another volume!
    519 
    520  The above problems combined to allow BlockingList to be
    521 called with replicaNo = -1, which caused Linux/G++ & HP to dump core
    522 on program exit.
    523 
    524  Modified Files:
     476-------------------------------
     477- In the Navigator location, the blocked Volume was not cleared when the
     478  navigator descended several levels in the tree. This would allows the same
     479  in another part of the tree to be wrongly blocked.
     480- In G4ParameterisedNavigation, the identity of the blocked Physical Volume
     481  was not checked! You would block replica number 3 of your parameterised
     482  volume although you exited replica number 3 of another volume!
     483- The above problems combined to allow BlockingList to be called with
     484  replicaNo = -1, which caused Linux/G++ & HP to dump core on program exit.
     485  Modified Files:
    525486    G4Navigator.cc
    526487    G4ParameterisedNavigation.cc
    527 
    528  An assignment used to be an equality check by mistake. (Probably it was ok
    529 because it is redundant)
    530 
    531  Modified Files:
    532         G4VoxelNavigation.cc
    533 
    534 
    535 July 23rd, 98  John Apostolakis
    536 
    537 
    538  
     488- An assignment used to be an equality check by mistake.
     489  (Probably it was ok because it is redundant)
     490  Modified Files:
     491    G4VoxelNavigation.cc
     492
    539493June 26th, 98  John Apostolakis  geometry-00-06-05
    540 
    541   1)  Modified check in ComputeStep that pseudo-relocation is within safety:
     494-------------------------------
     495- 1)  Modified check in ComputeStep that pseudo-relocation is within safety:
    542496     i) no check is made is the move is within tolerance as it makes no sense
    543497         - on a boundary it would cause a volume change (where there was none.)
    … …  
    546500        This eliminates problems with this check, that produced assertion
    547501         failure in many example codes.
    548 
    549   2) NavigationHistory equality operator modified for efficiency (with P.Urban)
    550 
    551   3) G4Box     Problem in DistanceToIn reporting intersection where there was
     502- 2) NavigationHistory equality operator modified for efficiency (with P.Urban)
     503- 3) G4Box     Problem in DistanceToIn reporting intersection where there was
    552504               none has been given a more complete solution (V.Grichine)
    553505     G4Sphere  Exception problem fixed.  (V.Grichine)
    554506
    555 
    556507June 20th, 98  John Apostolakis  geometry-00-06-04
    557 
    558   1) I have added a check that any pseudo-relocation made between a
    559  call to Locate (the true Relocation) and the next call to ComputeStep
    560  (eg in a PostStepDoIt) is truly within safety.
    561 
    562   2) The Navigator's ComputeStep method now always returns infinity, when it
    563    does not limit the step
    564 
    565   3) G4Tubs.cc: Fixed surface normal (in R) which was not a unit vector.
    566 
     508-------------------------------
     509- 1) I have added a check that any pseudo-relocation made between a
     510     call to Locate (the true Relocation) and the next call to ComputeStep
     511     (eg in a PostStepDoIt) is truly within safety.
     512- 2) The Navigator's ComputeStep method now always returns infinity, when it
     513     does not limit the step
     514- 3) G4Tubs.cc: Fixed surface normal (in R) which was not a unit vector.
    567515
    568516June 18th, 98  John Apostolakis 
    569  
    570  In the Navigator:
     517-------------------------------
     518- In the Navigator:
    571519    1) Fix to allow lateral displacement (within safety) in PostStepDoIts
    572    without messaging the Navigator. 
     520       without messaging the Navigator. 
    573521    2) A first implementation of LocateGlobalPointWithinVolume
    574 
    575  A fix in NormalNavigation's Compute Step, to allow volumes that are "touched"
    576    to be tagged as entered.  (Ie, if the step is just long enough to arrive at
    577    the surface of a volume, the navigator can still enter it quickly.)
    578 
     522- A fix in NormalNavigation's Compute Step, to allow volumes that are "touched"
     523  to be tagged as entered.  (Ie, if the step is just long enough to arrive at
     524  the surface of a volume, the navigator can still enter it quickly.)
    579525
    580526June 12th, 98   John Apostolakis (geometry-00-06-03)
    581 
    582  Candidate fix to BREP PCone, constructing Conical Surfaces using different
     527-------------------------------
     528- Candidate fix to BREP PCone, constructing Conical Surfaces using different
    583529  starting point.
    584 
    585  Fix to ReplicaNavigation to temporarily patch "assertion" problem.
    586 
     530- Fix to ReplicaNavigation to temporarily patch "assertion" problem.
    587531
    588532June 10th, 98  John Apostolakis  (geometry-00-06-02)
    589 
    590  Added a new CSG Solid (G4Hype), a Hyperboloid by rotation       
    591 
    592  Bug fix to G4Box::DistanceToIn (which reported intersection where there
    593                                  was none).
    594  Bug fix to G4FConicalSurface and G4ConicalSurface to fix G4BREPSolidPCone.
    595  Correction to  to DistanceToOut of BREPSolid to ensure compatibility with
    596    convexity assumptions of Navigator
    597 
     533-------------------------------
     534- Added a new CSG Solid (G4Hype), a Hyperboloid by rotation       
     535- Bug fix to G4Box::DistanceToIn (which reported intersection where there
     536                                  was none).
     537- Bug fix to G4FConicalSurface and G4ConicalSurface to fix G4BREPSolidPCone.
     538  Correction to  to DistanceToOut of BREPSolid to ensure compatibility with
     539  convexity assumptions of Navigator
    598540
    599541June  8th, 98  John Apostolakis  (geometry-00-06-01)
    600 
    601  Created a tag for BREPS at the last point before merge with Peter's Developments.
    602 
    603  Modified
     542-------------------------------
     543- Created a tag for BREPS at the last point before merge with Peter's
     544  Developments.
     545  Modified
    604546    G4Navigator       and
    605547    G4NormalNavigation   G4ParameterisedNavigation
    606548    G4ReplicaNavigation  G4VoxelNavigation
    607 
    608549  to add ComputeSafety methods. These make a quick estimation of the
    609  safety and can/should be called for the final point of a step only.
    610 
     550  safety and can/should be called for the final point of a step only.
    611551
    612552June  3rd, 98  John Apostolakis
    613 
    614  G4Navigator:
    615 
    616     Added a new new method LocateGlobalPointWithinVolume that serves to notify
     553-------------------------------
     554- G4Navigator:
     555  Added a new new method LocateGlobalPointWithinVolume that serves to notify
    617556  the Navigator that a track has moved to the new Global point 'position'.
    618557  This point must be known to be within the current volume, probably because it
    … …  
    620559
    621560May   11th, 98  John Apostolakis
    622 
    623   G4PVPlacement:
    624     - Implemented additional (4th) constructor that takes a pointer to a
    625        logical mother volume and a G4Transform3D with the solid's rotation.
    626     - Also added a data member to store whether a RotationMatrix was created.
    627        This allows us to avoid a small memory leak in use of 2 constructors.
     561-------------------------------
     562- G4PVPlacement:
     563  - Implemented additional (4th) constructor that takes a pointer to a
     564    logical mother volume and a G4Transform3D with the solid's rotation.
     565  - Also added a data member to store whether a RotationMatrix was created.
     566    This allows us to avoid a small memory leak in use of 2 constructors.
    628567
    629568May    8th, 98  John Apostolakis
    630 
    631 -  History files created in magneticfield directory for this category.
    632     It will be used exclusively for the maintenance of information in
    633     this category. Only what impacts its interaction with the geometry
    634     (G4PropagatorInField) will be mentioned here.
    635 
    636 -  History file  has existed in solids/BREPS for slightly more detailed
    637     changes in that sub-category.
    638 
     569-------------------------------
     570- History files created in magneticfield directory for this category.
     571  It will be used exclusively for the maintenance of information in
     572  this category. Only what impacts its interaction with the geometry
     573  (G4PropagatorInField) will be mentioned here.
     574
     575- History file  has existed in solids/BREPS for slightly more detailed
     576  changes in that sub-category.
    639577
    640578April 29th, 98  John Apostolakis  (geometry-00-05-05)
    641 
    642 -  A significant logical error in G4VoxelNavigation::LocateNextVoxel was
     579-------------------------------
     580- A significant logical error in G4VoxelNavigation::LocateNextVoxel was
    643581  corrected: the search for the next voxel could ignore voxels at lower levels
    644 
    645 -  Small changes for DEC in GNUmakefile in BREPS & STEP
     582- Small changes for DEC in GNUmakefile in BREPS & STEP
    646583   * Removed -cfront option from GNUmakefile for DEC. -cfront
    647584      overrides ANSI standard rules in cxx-6.0.
    648585   * Cleaned up trivial warnings on DEC (Extraneous semicolons).
    649586
    650 
    651587April 27th, 98  John Apostolakis  (geometry-00-05-04)
    652 
     588-------------------------------
    653589- Tagged
    654590
    655591April 24th, 98  Jari Sulkimo       ( recorded by John Apostolakis here)
     592-------------------------------
    656593- Fixes in BREPs (see solids/BREP/History for details, by author)
    657594   * fixed scope bugs in for loops
    … …  
    660597
    661598April 23rd, 98  John Apostolakis  (geometry-00-05-03)
    662 
     599-------------------------------
    663600- Bug fixes to BREP code for Assembly level of STEP files
    664  (introduced in alpha05)
    665 
     601  (introduced in alpha05)
    666602- Renamed file G4Point3d.hh to G4Point3d.h (because of problems
    667603  on Windows NT in name clash with G4Point3D.hh).
    668604
    669 
    670605April 22nd, 98  John Apostolakis  (geom-05-02)
     606-------------------------------
    671607- Tagged.
    672608
    673609April 21st, 98  John Apostolakis  (geometry-00-05-01)
     610-------------------------------
    674611- Added SetAllParameters methods to G4Torus and G4Para.
    675612- All CSG solids now inherit from the new abstract class G4CSGSolid, instead
    676 of directly from G4VSolid.
     613  of directly from G4VSolid.
    677614- "const G4double" arguments have been changed to "G4double" for CSG methods.
    678615
    679616April 21st, 98  John Allison
     617-------------------------------
    680618- Slightly relaxed tolerance in G4Trap (for g3tog4).
    681619- Corrected G4BREPSolidPolyhedra.cc for graphics_reps/G4Polyhedron.
    … …  
    684622
    685623April 2, 98 G.Barrand
     624-------------------------------
    686625- STEP/dirobj.cc : #ifdef WIN32, do not compile opendir and closedir.
    687626
    688627March 24, 98 G.Barrand
     628-------------------------------
    689629- GNUmakefile : MAKESHLIB changed in G4MAKESHLIB
    690630
    691631March 13, 98   G.Cosmo (on behalf of S.Giani) - (geometry-00-04-05)
    692 
     632-------------------------------
    693633- Added G4VPVParameterisation.cc including default implementations
    694634  of ComputeSolid() and ComputeMaterial() missing previously (J.Apostolakis).
    695635- Included fixes for aCC compiler in BREPS and STEP (J.Sulkimo, G.Cosmo).
    696636
    697 
    698637March  9, 98  J. Apostolakis - (geometry-00-04-04)
    699 
     638-------------------------------
    700639- Small fix to G4BREPSolid.cc which was causing problems on HP-UX.
    701640  (Deleted use of floating point modulo for integers, with Jari S.)
    702 
    703641- G4Sphere:    further small corrections.
    704642
    705 
    706643March     5, 98    J. Apostolakis - (geometry-00-04-03)
    707 
     644-------------------------------
    708645- Parameterised Volume can now VARY the TYPE of SOLID and/or Material
    709    by copy number.  PVParameterisation classes can now compute these.
    710    The Navigator has been modified to compute solid and material, and
    711    to set them in the associated logical volume
    712 
     646  by copy number.  PVParameterisation classes can now compute these.
     647  The Navigator has been modified to compute solid and material, and
     648  to set them in the associated logical volume
    713649- Now able to process an extra level of STEP files, using new code in
    714     BREPs  (Jari Sulkimo).
    715 
     650  BREPs  (Jari Sulkimo).
    716651- Further cleanup of code in BREP category  (Peter Urban).
    717 
    718652- Small modification in solids/STEP/GNUmakefile for Win/NT port (S. Sadilov).
    719653
    720 
    721654March     4, 98    J. Apostolakis - (geometry-00-04-02)
    722 
     655-------------------------------
    723656- G4Sphere: corrected tests of the phi angle and with tolerance checking
    724 that compared squares of distances.
    725 
     657  that compared squares of distances.
    726658- The World volume can now be split into replicas. This not recommended, but
    727 the Navigator is now able to handle it.
    728 
     659  the Navigator is now able to handle it.
    729660- Cleanup of code in BREP category (Peter Urban & Jari Sulkimo)
    730661
    731 
    732662February 16, 98    J. Apostolakis - (geometry-00-04-01)
    733 
     663-------------------------------
    734664- Replicas and parameterised physical-volumes now store the copy number of
    735 their current copy. (It is valid only for physical volume in the hot tree).
    736 Navigation routines were modified to enable this.
    737 
     665  their current copy. (It is valid only for physical volume in the hot tree).
     666  Navigation routines were modified to enable this.
    738667
    739668February  4, 98    J. Apostolakis - (geometry-00-03-02)
    740 
     669-------------------------------
    741670- A few small changes were made to the Magnetic Field classes.
    742 This included one that allows it to work without repeatedly
    743 issuing an unneccessary warning. 
    744 
     671  This included one that allows it to work without repeatedly
     672  issuing an unneccessary warning. 
    745673- Small fixes to BREP and STEP parts help in fixing a problem
    746 with True/false on some platforms.
     674  with True/false on some platforms.
    747675
    748676January 28, 98 S. Sadilov
     677-------------------------------
    749678- Small modification in GNUmakefile for Win/NT port
    750679
    751 
    752680January  26, 98    J. Apostolakis - (geometry-00-03-01)
    753 
    754 i)  New implementation of G4NavigationHistory using G4NavigationLevel.
    755 This implementation allows for very fast copying of G4NavigationHistory,
    756 which is required in order to copy G4TouchableHistory.
    757 
    758 ii) Correction in G4ReplicaNavigation.cc in DistanceToOutPhi, influencing
    759 replicas divided in phi.
    760 
     681-------------------------------
     682- i)  New implementation of G4NavigationHistory using G4NavigationLevel.
     683      This implementation allows for very fast copying of G4NavigationHistory,
     684      which is required in order to copy G4TouchableHistory.
     685- ii) Correction in G4ReplicaNavigation.cc in DistanceToOutPhi, influencing
     686      replicas divided in phi.
    761687
    762688December 19, 97 G. Cosmo - (alpha03)
    763 
     689-------------------------------
    764690- Created.

  • trunk/source/geometry/benchmarks/BuildBoxWorld.hh

    r1316 r1347  
    2626//
    2727// $Id: BuildBoxWorld.hh,v 1.7 2006/06/29 18:15:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030#ifndef BUILDBOXWORLD_HH

  • trunk/source/geometry/benchmarks/BuildCalorimeter.hh

    r1316 r1347  
    2626//
    2727// $Id: BuildCalorimeter.hh,v 1.6 2006/06/29 18:15:26 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030#ifndef BUILDCALORIMETER_HH

  • trunk/source/geometry/benchmarks/Shoot.hh

    r1316 r1347  
    2626//
    2727// $Id: Shoot.hh,v 1.9 2006/06/29 18:15:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030#ifndef SHOOT_HH

  • trunk/source/geometry/benchmarks/calorimeter.cc

    r1316 r1347  
    2626//
    2727// $Id: calorimeter.cc,v 1.8 2006/06/29 18:15:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// calorimeter

  • trunk/source/geometry/benchmarks/replicaCal.cc

    r1316 r1347  
    2626//
    2727// $Id: replicaCal.cc,v 1.8 2006/06/29 18:15:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/benchmarks/shooter.cc

    r1316 r1347  
    2626//
    2727// $Id: shooter.cc,v 1.7 2006/06/29 18:15:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// shooter - perform test shots.

  • trunk/source/geometry/biasing/GNUmakefile

    r831 r1347  
    1 # $Id: GNUmakefile,v 1.4 2004/06/11 14:17:12 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.6 2010/10/27 07:34:32 gcosmo Exp $
    22# --------------------------------------------------------------------
    33# GNUmakefile for geometry/biasing library.  Gabriele Cosmo, 25/03/02.

  • trunk/source/geometry/biasing/History

    r831 r1347  
    1 $Id: History,v 1.45 2007/11/09 15:22:38 ahoward Exp $
     1$Id: History,v 1.47 2010/09/06 09:13:46 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     20September 6th, 2010 G.Cosmo geombias-V09-03-01
     21     - Fixed false-positive cases of invalid iterator in G4IStore and
     22       G4WeightWindowStore.
     23
     24July 2nd, 2010 G.Cosmo geombias-V09-03-00
     25     - G4IStore: corrected use of internal cell-importance iterator to avoid
     26       invalidation in methods GetImportance().
     27     - Corrected mispelled name for GetLowerWeight() method in classes
     28       G4WeightWindowStore and G4VWeightWindowStore. Fixed use of internal
     29       cell-importance iterator in G4WeightWindowStore::GetLowerWeight() to
     30       avoid cases of invalidation.
     31     - Fixed initialization of data in copy-constructor for G4GeometryCell
     32       and corrected mispelled name for data member pointer.
    1933
    2034November 9th, 2007 A.Howard geombias-V09-00-01

  • trunk/source/geometry/divisions/GNUmakefile

    r831 r1347  
    1 # $Id: GNUmakefile,v 1.4 2004/06/11 14:17:13 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.6 2010/10/27 07:34:32 gcosmo Exp $
    22# ----------------------------------------------------------------------
    33# GNUmakefile for geometry/divisions library.  Gabriele Cosmo, 16/06/03.

  • trunk/source/geometry/divisions/History

    r1228 r1347  
    1 $Id: History,v 1.31 2009/05/20 08:55:23 gcosmo Exp $
     1$Id: History,v 1.35 2010/11/10 09:16:33 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     20November, 9th, 2010          M.Asai (geomdiv-V09-03-02)
     21- Introducing G4ReplicatedSlice, allowing for gaps in between divided daughter
     22  volumes.
     23
     24September, 6th, 2010         G.Cosmo (geomdiv-V09-03-01)
     25- Removed obvious else statement in constructors of G4PVDivision.
     26
     27July, 2nd, 2010         G.Cosmo (geomdiv-V09-03-00)
     28- Improved logic in G4PVDivision constructors and in method
     29  G4PVDivisionFactory::CreatePVDivision() in case of invalid construct.
     30- Properly initialise Boolean flag 'bDivInTrap' in G4VParameterisationTrd
     31  constructor.
     32- G4ParameterisationTrd: disabled unreachable error message in method
     33  G4ParameterisationTrdX::CheckParametersValidity().
     34- Removed uninitialised member in G4ParameterisationTrdX and correction in
     35  method ComputeSolid().
     36- Get rid of unnecessary virtual specification for leaf classes in the
     37  hierarchy...
    1938
    2039May, 20th, 2009         I.Hrivnacova (geomdiv-V09-02-00)

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

    r1337 r1347  
    2626//
    2727// $Id: G4PVDivision.hh,v 1.14 2008/12/03 16:41:45 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4PVDivision

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

    r1337 r1347  
    2626//
    2727// $Id: G4PVDivisionFactory.hh,v 1.2 2006/06/29 18:18:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationBox.hh,v 1.6 2006/06/29 18:18:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationBox.hh,v 1.7 2010/07/02 10:46:27 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// classes G4ParameterisationBoxX,
    … …  
    5151
    5252// Dummy declarations to get rid of warnings ...
     53//
    5354class G4Cons;
    5455class G4Trd;
    … …  
    8081                            G4double offset, G4double step,
    8182                            G4VSolid* msolid, DivisionType divType );
    82  
    83     virtual ~G4ParameterisationBoxX();
    84 
    85     virtual G4double GetMaxParameter() const;
    86 
    87     virtual void ComputeTransformation( const G4int copyNo,
    88                                         G4VPhysicalVolume* physVol ) const;
     83   ~G4ParameterisationBoxX();
     84
     85    G4double GetMaxParameter() const;
     86
     87    void ComputeTransformation( const G4int copyNo,
     88                                      G4VPhysicalVolume* physVol ) const;
    8989    void ComputeDimensions(G4Box& box, const G4int copyNo,
    9090                           const G4VPhysicalVolume* physVol) const;
    … …  
    123123                            G4double offset, G4double step,
    124124                            G4VSolid* msolid, DivisionType divType );
    125     virtual ~G4ParameterisationBoxY();
    126 
    127     virtual G4double GetMaxParameter() const;
    128 
    129     virtual void ComputeTransformation( const G4int copyNo,
    130                                         G4VPhysicalVolume* physVol ) const;
     125   ~G4ParameterisationBoxY();
     126
     127    G4double GetMaxParameter() const;
     128
     129    void ComputeTransformation( const G4int copyNo,
     130                                      G4VPhysicalVolume* physVol ) const;
    131131
    132132    void ComputeDimensions(G4Box& box, const G4int copyNo,
    … …  
    166166                            G4double offset, G4double step,
    167167                            G4VSolid* msolid, DivisionType divType );
    168     virtual ~G4ParameterisationBoxZ();
    169 
    170     virtual G4double GetMaxParameter() const;
    171 
    172     virtual void ComputeTransformation( const G4int copyNo,
    173                                         G4VPhysicalVolume* physVol ) const;
     168   ~G4ParameterisationBoxZ();
     169
     170    G4double GetMaxParameter() const;
     171
     172    void ComputeTransformation( const G4int copyNo,
     173                                      G4VPhysicalVolume* physVol ) const;
    174174    void ComputeDimensions(G4Box& box, const G4int copyNo,
    175175                           const G4VPhysicalVolume* physVol) const;

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationCons.hh,v 1.6 2006/06/29 18:18:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationCons.hh,v 1.7 2010/07/02 10:46:27 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// classes G4ParameterisationConsRho,
    … …  
    5151
    5252// Dummy declarations to get rid of warnings ...
     53//
    5354class G4Trd;
    5455class G4Trap;
    … …  
    8182                               G4double offset, G4double step,
    8283                               G4VSolid* motherSolid, DivisionType divType );
    83     virtual ~G4ParameterisationConsRho();
    84 
    85     virtual G4double GetMaxParameter() const;
    86 
    87     virtual void ComputeTransformation( const G4int copyNo,
    88                                         G4VPhysicalVolume* physVol ) const;
     84   ~G4ParameterisationConsRho();
     85
     86    G4double GetMaxParameter() const;
     87
     88    void ComputeTransformation( const G4int copyNo,
     89                                      G4VPhysicalVolume* physVol ) const;
    8990    void ComputeDimensions( G4Cons& tubs, const G4int copyNo,
    9091                            const G4VPhysicalVolume* physVol) const;
    … …  
    123124                               G4double offset, G4double step,
    124125                               G4VSolid* motherSolid, DivisionType divType );
    125     virtual ~G4ParameterisationConsPhi();
    126 
    127     virtual G4double GetMaxParameter() const;
    128 
    129     virtual void ComputeTransformation( const G4int copyNo,
    130                                         G4VPhysicalVolume* physVol ) const;
     126   ~G4ParameterisationConsPhi();
     127
     128    G4double GetMaxParameter() const;
     129
     130    void ComputeTransformation( const G4int copyNo,
     131                                      G4VPhysicalVolume* physVol ) const;
    131132    void ComputeDimensions( G4Cons& tubs, const G4int copyNo,
    132133                            const G4VPhysicalVolume* physVol ) const;
    … …  
    165166                             G4double offset, G4double step,
    166167                             G4VSolid* motherSolid, DivisionType divType );
    167     virtual ~G4ParameterisationConsZ();
    168 
    169     virtual G4double GetMaxParameter() const;
    170 
    171     virtual void ComputeTransformation( const G4int copyNo,
    172                                         G4VPhysicalVolume* physVol ) const;
     168   ~G4ParameterisationConsZ();
     169
     170    G4double GetMaxParameter() const;
     171
     172    void ComputeTransformation( const G4int copyNo,
     173                                      G4VPhysicalVolume* physVol ) const;
    173174    void ComputeDimensions( G4Cons& tubs, const G4int copyNo,
    174175                            const G4VPhysicalVolume* physVol ) const;

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationPara.hh,v 1.7 2006/06/29 18:18:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationPara.hh,v 1.8 2010/07/02 10:46:27 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// classes G4ParameterisationParaX,
    … …  
    4949class G4VSolid;
    5050class G4VPhysicalVolume;
     51
    5152// Dummy declarations to get rid of warnings ...
     53//
    5254class G4Cons;
    5355class G4Cons;
    … …  
    7981                             G4double offset, G4double step,
    8082                             G4VSolid* msolid, DivisionType divType );
    81     virtual ~G4ParameterisationParaX();
    82 
    83     virtual G4double GetMaxParameter() const;
    84 
    85     virtual void ComputeTransformation( const G4int copyNo,
    86                                         G4VPhysicalVolume* physVol ) const;
     83   ~G4ParameterisationParaX();
     84
     85    G4double GetMaxParameter() const;
     86
     87    void ComputeTransformation( const G4int copyNo,
     88                                      G4VPhysicalVolume* physVol ) const;
    8789    void ComputeDimensions(G4Para& para, const G4int copyNo,
    8890                           const G4VPhysicalVolume* pv) const;
    … …  
    123125                             G4double offset, G4double step,
    124126                             G4VSolid* msolid, DivisionType divType );
    125     virtual ~G4ParameterisationParaY();
    126  
    127     virtual G4double GetMaxParameter() const;
    128 
    129     virtual void ComputeTransformation( const G4int copyNo,
    130                                         G4VPhysicalVolume* physVol ) const;
     127   ~G4ParameterisationParaY();
     128 
     129    G4double GetMaxParameter() const;
     130
     131    void ComputeTransformation( const G4int copyNo,
     132                                      G4VPhysicalVolume* physVol ) const;
    131133    void ComputeDimensions(G4Para& para, const G4int copyNo,
    132134                           const G4VPhysicalVolume* pv) const;
    … …  
    167169                             G4double offset, G4double step,
    168170                             G4VSolid* msolid, DivisionType divType );
    169     virtual ~G4ParameterisationParaZ();
    170 
    171     virtual G4double GetMaxParameter() const;
    172 
    173     virtual void ComputeTransformation( const G4int copyNo,
    174                                         G4VPhysicalVolume* physVol ) const;
     171   ~G4ParameterisationParaZ();
     172
     173    G4double GetMaxParameter() const;
     174
     175    void ComputeTransformation( const G4int copyNo,
     176                                      G4VPhysicalVolume* physVol ) const;
    175177    void ComputeDimensions(G4Para& para, const G4int copyNo,
    176178                           const G4VPhysicalVolume* pv) const;

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationPolycone.hh,v 1.8 2009/05/14 14:19:32 ivana Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationPolycone.hh,v 1.9 2010/07/02 10:46:27 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// classes G4ParameterisationPolyconeRho,
    … …  
    5151
    5252// Dummy declarations to get rid of warnings ...
     53//
    5354class G4Trd;
    5455class G4Trap;
    … …  
    8586                                   G4VSolid* motherSolid,
    8687                                   DivisionType divType );
    87     virtual ~G4ParameterisationPolyconeRho();
    88 
    89     virtual void CheckParametersValidity();
    90 
    91     virtual G4double GetMaxParameter() const;
    92 
    93     virtual void ComputeTransformation( const G4int copyNo,
    94                                         G4VPhysicalVolume* physVol ) const;
     88   ~G4ParameterisationPolyconeRho();
     89
     90    void CheckParametersValidity();
     91
     92    G4double GetMaxParameter() const;
     93
     94    void ComputeTransformation( const G4int copyNo,
     95                                      G4VPhysicalVolume* physVol ) const;
    9596    void ComputeDimensions( G4Polycone& pcone, const G4int copyNo,
    9697                            const G4VPhysicalVolume* physVol ) const;
    … …  
    134135                                   G4VSolid* motherSolid,
    135136                                   DivisionType divType );
    136     virtual ~G4ParameterisationPolyconePhi();
    137 
    138     virtual G4double GetMaxParameter() const;
    139 
    140     virtual void ComputeTransformation( const G4int copyNo,
    141                                         G4VPhysicalVolume* physVol ) const;
     137   ~G4ParameterisationPolyconePhi();
     138
     139    G4double GetMaxParameter() const;
     140
     141    void ComputeTransformation( const G4int copyNo,
     142                                      G4VPhysicalVolume* physVol ) const;
    142143    void ComputeDimensions( G4Polycone& pcone, const G4int copyNo,
    143144                            const G4VPhysicalVolume* physVol ) const;
    … …  
    181182                                 G4VSolid* motherSolid,
    182183                                 DivisionType divType );
    183     virtual ~G4ParameterisationPolyconeZ();
    184 
    185     virtual void CheckParametersValidity();
    186 
    187     virtual G4double GetMaxParameter() const;
    188 
    189     virtual void ComputeTransformation( const G4int copyNo,
    190                                         G4VPhysicalVolume* physVol ) const;
     184   ~G4ParameterisationPolyconeZ();
     185
     186    void CheckParametersValidity();
     187
     188    G4double GetMaxParameter() const;
     189
     190    void ComputeTransformation( const G4int copyNo,
     191                                      G4VPhysicalVolume* physVol ) const;
    191192    void ComputeDimensions( G4Polycone& pcone, const G4int copyNo,
    192193                            const G4VPhysicalVolume* physVol ) const;
    193194
    194   private: 
    195     G4double GetR(G4double z, G4double z1, G4double r1, G4double z2, G4double r2) const;
     195  private:
     196
     197    G4double GetR(G4double z, G4double z1, G4double r1,
     198                  G4double z2, G4double r2) const;
    196199    G4double GetRmin(G4double z, G4int nsegment) const;
    197200    G4double GetRmax(G4double z, G4int nsegment) const;
    198201
     202    // Dummy declarations to get rid of warnings ...
     203
     204    void ComputeDimensions (G4Trd&,const G4int,
     205                            const G4VPhysicalVolume*) const {}
     206    void ComputeDimensions (G4Trap&,const G4int,
     207                            const G4VPhysicalVolume*) const {}
     208    void ComputeDimensions (G4Box&,const G4int,
     209                            const G4VPhysicalVolume*) const {}
     210    void ComputeDimensions (G4Orb&,const G4int,
     211                            const G4VPhysicalVolume*) const {}
     212    void ComputeDimensions (G4Sphere&,const G4int,
     213                            const G4VPhysicalVolume*) const {}
     214    void ComputeDimensions (G4Torus&,const G4int,
     215                            const G4VPhysicalVolume*) const {}
     216    void ComputeDimensions (G4Para&,const G4int,
     217                            const G4VPhysicalVolume*) const {}
     218    void ComputeDimensions (G4Hype&,const G4int,
     219                            const G4VPhysicalVolume*) const {}
     220    void ComputeDimensions (G4Tubs&,const G4int,
     221                            const G4VPhysicalVolume*) const {}
     222    void ComputeDimensions (G4Cons&,const G4int,
     223                            const G4VPhysicalVolume*) const {}
     224    void ComputeDimensions (G4Polyhedra&,const G4int,
     225                            const G4VPhysicalVolume*) const {}
     226  private:
     227
    199228    G4int fNSegment;
    200229    G4PolyconeHistorical* fOrigParamMother;
    201 
    202     // Dummy declarations to get rid of warnings ...
    203 
    204     void ComputeDimensions (G4Trd&,const G4int,
    205                             const G4VPhysicalVolume*) const {}
    206     void ComputeDimensions (G4Trap&,const G4int,
    207                             const G4VPhysicalVolume*) const {}
    208     void ComputeDimensions (G4Box&,const G4int,
    209                             const G4VPhysicalVolume*) const {}
    210     void ComputeDimensions (G4Orb&,const G4int,
    211                             const G4VPhysicalVolume*) const {}
    212     void ComputeDimensions (G4Sphere&,const G4int,
    213                             const G4VPhysicalVolume*) const {}
    214     void ComputeDimensions (G4Torus&,const G4int,
    215                             const G4VPhysicalVolume*) const {}
    216     void ComputeDimensions (G4Para&,const G4int,
    217                             const G4VPhysicalVolume*) const {}
    218     void ComputeDimensions (G4Hype&,const G4int,
    219                             const G4VPhysicalVolume*) const {}
    220     void ComputeDimensions (G4Tubs&,const G4int,
    221                             const G4VPhysicalVolume*) const {}
    222     void ComputeDimensions (G4Cons&,const G4int,
    223                             const G4VPhysicalVolume*) const {}
    224     void ComputeDimensions (G4Polyhedra&,const G4int,
    225                             const G4VPhysicalVolume*) const {}
    226230};
    227231

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationPolyhedra.hh,v 1.9 2009/05/14 14:19:32 ivana Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationPolyhedra.hh,v 1.10 2010/07/02 10:46:27 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// classes G4ParameterisationPolyhedraRho,
    … …  
    5151
    5252// Dummy declarations to get rid of warnings ...
     53//
    5354class G4Trd;
    5455class G4Trap;
    … …  
    9192                                    G4VSolid* motherSolid,
    9293                                    DivisionType divType );
    93     virtual ~G4ParameterisationPolyhedraRho();
    94 
    95     virtual void CheckParametersValidity();
    96 
    97     virtual G4double GetMaxParameter() const;
    98 
    99     virtual void ComputeTransformation( const G4int copyNo,
    100                                         G4VPhysicalVolume* physVol ) const;
     94   ~G4ParameterisationPolyhedraRho();
     95
     96    void CheckParametersValidity();
     97
     98    G4double GetMaxParameter() const;
     99
     100    void ComputeTransformation( const G4int copyNo,
     101                                      G4VPhysicalVolume* physVol ) const;
    101102    void ComputeDimensions( G4Polyhedra& phedra, const G4int copyNo,
    102103                            const G4VPhysicalVolume* physVol ) const;
    … …  
    140141                                   G4VSolid* motherSolid,
    141142                                   DivisionType divType );
    142     virtual ~G4ParameterisationPolyhedraPhi();
    143 
    144     virtual void CheckParametersValidity();
    145 
    146     virtual G4double GetMaxParameter() const;
    147 
    148     virtual void ComputeTransformation( const G4int copyNo,
    149                                         G4VPhysicalVolume* physVol ) const;
     143   ~G4ParameterisationPolyhedraPhi();
     144
     145    void CheckParametersValidity();
     146
     147    G4double GetMaxParameter() const;
     148
     149    void ComputeTransformation( const G4int copyNo,
     150                                      G4VPhysicalVolume* physVol ) const;
    150151    void ComputeDimensions( G4Polyhedra& phedra, const G4int copyNo,
    151152                            const G4VPhysicalVolume* physVol ) const;
    … …  
    189190                                  G4VSolid* motherSolid,
    190191                                  DivisionType divType );
    191     virtual ~G4ParameterisationPolyhedraZ();
    192 
    193     virtual void CheckParametersValidity();
    194 
    195     virtual G4double GetMaxParameter() const;
    196 
    197     virtual void ComputeTransformation( const G4int copyNo,
    198                                         G4VPhysicalVolume* physVol ) const;
     192   ~G4ParameterisationPolyhedraZ();
     193
     194    void CheckParametersValidity();
     195
     196    G4double GetMaxParameter() const;
     197
     198    void ComputeTransformation( const G4int copyNo,
     199                                      G4VPhysicalVolume* physVol ) const;
    199200    void ComputeDimensions( G4Polyhedra& phedra, const G4int copyNo,
    200201                            const G4VPhysicalVolume* physVol ) const;
    201202
    202   private:
    203     G4double GetR(G4double z, G4double z1, G4double r1, G4double z2, G4double r2) const;
     203  private:
     204
     205    G4double GetR(G4double z, G4double z1, G4double r1,
     206                  G4double z2, G4double r2) const;
    204207    G4double GetRmin(G4double z, G4int nsegment) const;
    205208    G4double GetRmax(G4double z, G4int nsegment) const;
    206209
     210    // Dummy declarations to get rid of warnings ...
     211    void ComputeDimensions (G4Trd&,const G4int,
     212                            const G4VPhysicalVolume*) const {}
     213    void ComputeDimensions (G4Trap&,const G4int,
     214                            const G4VPhysicalVolume*) const {}
     215    void ComputeDimensions (G4Box&,const G4int,
     216                            const G4VPhysicalVolume*) const {}
     217    void ComputeDimensions (G4Sphere&,const G4int,
     218                            const G4VPhysicalVolume*) const {}
     219    void ComputeDimensions (G4Orb&,const G4int,
     220                            const G4VPhysicalVolume*) const {}
     221    void ComputeDimensions (G4Torus&,const G4int,
     222                            const G4VPhysicalVolume*) const {}
     223    void ComputeDimensions (G4Para&,const G4int,
     224                            const G4VPhysicalVolume*) const {}
     225    void ComputeDimensions (G4Hype&,const G4int,
     226                            const G4VPhysicalVolume*) const {}
     227    void ComputeDimensions (G4Tubs&,const G4int,
     228                            const G4VPhysicalVolume*) const {}
     229    void ComputeDimensions (G4Cons&,const G4int,
     230                            const G4VPhysicalVolume*) const {}
     231    void ComputeDimensions (G4Polycone&,const G4int,
     232                            const G4VPhysicalVolume*) const {}
     233  private:
     234
    207235    G4int fNSegment;
    208236    G4PolyhedraHistorical* fOrigParamMother;
    209 
    210     // Dummy declarations to get rid of warnings ...
    211     void ComputeDimensions (G4Trd&,const G4int,
    212                             const G4VPhysicalVolume*) const {}
    213     void ComputeDimensions (G4Trap&,const G4int,
    214                             const G4VPhysicalVolume*) const {}
    215     void ComputeDimensions (G4Box&,const G4int,
    216                             const G4VPhysicalVolume*) const {}
    217     void ComputeDimensions (G4Sphere&,const G4int,
    218                             const G4VPhysicalVolume*) const {}
    219     void ComputeDimensions (G4Orb&,const G4int,
    220                             const G4VPhysicalVolume*) const {}
    221     void ComputeDimensions (G4Torus&,const G4int,
    222                             const G4VPhysicalVolume*) const {}
    223     void ComputeDimensions (G4Para&,const G4int,
    224                             const G4VPhysicalVolume*) const {}
    225     void ComputeDimensions (G4Hype&,const G4int,
    226                             const G4VPhysicalVolume*) const {}
    227     void ComputeDimensions (G4Tubs&,const G4int,
    228                             const G4VPhysicalVolume*) const {}
    229     void ComputeDimensions (G4Cons&,const G4int,
    230                             const G4VPhysicalVolume*) const {}
    231     void ComputeDimensions (G4Polycone&,const G4int,
    232                             const G4VPhysicalVolume*) const {}
    233237};
    234238

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationTrd.hh,v 1.8 2008/12/03 16:48:48 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationTrd.hh,v 1.9 2010/07/02 10:46:27 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// classes G4ParameterisationTrdX
    … …  
    4545#define G4ParameterisationTrd_H 1
    4646
     47#include <vector>
     48
    4749#include "G4VDivisionParameterisation.hh"
    4850#include "G4VSolid.hh"
    … …  
    5153
    5254// Dummy declarations to get rid of warnings ...
     55//
    5356class G4Cons;
    5457class G4Box;
    … …  
    6164class G4Polycone;
    6265class G4Polyhedra;
    63 #include <vector>
    6466
    6567class G4VParameterisationTrd : public G4VDivisionParameterisation
    … …  
    7375    virtual ~G4VParameterisationTrd();
    7476
    75 
    76 protected:
    77   G4bool bDivInTrap;
     77  protected:
     78
     79    G4bool bDivInTrap;
    7880};
    7981
    … …  
    8587                            G4double width, G4double offset,
    8688                            G4VSolid* motherSolid, DivisionType divType );
    87     virtual ~G4ParameterisationTrdX();
    88 
    89     virtual void CheckParametersValidity();
    90 
    91     virtual G4double GetMaxParameter() const;
    92 
    93     virtual void ComputeTransformation(const G4int copyNo,
    94                                        G4VPhysicalVolume* physVol) const;
    95 
    96     virtual void ComputeDimensions(G4Trd& trd, const G4int copyNo,
    97                            const G4VPhysicalVolume* pv) const;
    98 
    99     virtual void ComputeDimensions(G4Trap& trd, const G4int copyNo,
     89   ~G4ParameterisationTrdX();
     90
     91    void CheckParametersValidity();
     92
     93    G4double GetMaxParameter() const;
     94
     95    void ComputeTransformation(const G4int copyNo,
     96                                     G4VPhysicalVolume* physVol) const;
     97
     98    void ComputeDimensions(G4Trd& trd, const G4int copyNo,
     99                           const G4VPhysicalVolume* pv) const;
     100
     101    void ComputeDimensions(G4Trap& trd, const G4int copyNo,
    100102                           const G4VPhysicalVolume* pv) const;
    101103 
    102     virtual G4VSolid*   ComputeSolid(const G4int, G4VPhysicalVolume *);
     104    G4VSolid*   ComputeSolid(const G4int, G4VPhysicalVolume *);
    103105
    104106
    … …  
    126128                            const G4VPhysicalVolume*) const {}
    127129
    128   void ComputeTrapParams();
    129  G4Trap* theTrap;
     130    void ComputeTrapParams();
    130131};
    131132
    … …  
    138139                            G4double width, G4double offset,
    139140                            G4VSolid* motherSolid, DivisionType divType );
    140     virtual ~G4ParameterisationTrdY();
    141 
    142     virtual void CheckParametersValidity();
    143 
    144     virtual G4double GetMaxParameter() const;
    145 
    146     virtual void ComputeTransformation(const G4int copyNo,
    147                                        G4VPhysicalVolume *physVol) const;
     141   ~G4ParameterisationTrdY();
     142
     143    void CheckParametersValidity();
     144
     145    G4double GetMaxParameter() const;
     146
     147    void ComputeTransformation(const G4int copyNo,
     148                                     G4VPhysicalVolume *physVol) const;
    148149 
    149150    void ComputeDimensions(G4Trd& trd, const G4int copyNo,
    … …  
    184185                            G4double width, G4double offset,
    185186                            G4VSolid* motherSolid, DivisionType divType );
    186     virtual ~G4ParameterisationTrdZ();
    187 
    188     virtual G4double GetMaxParameter() const;
    189 
    190     virtual void ComputeTransformation(const G4int copyNo,
    191                                        G4VPhysicalVolume* physVol) const;
     187   ~G4ParameterisationTrdZ();
     188
     189    G4double GetMaxParameter() const;
     190
     191    void ComputeTransformation(const G4int copyNo,
     192                                     G4VPhysicalVolume* physVol) const;
    192193    void ComputeDimensions(G4Trd& trd, const G4int copyNo,
    193194                           const G4VPhysicalVolume* pv) const;

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationTubs.hh,v 1.6 2006/06/29 18:18:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationTubs.hh,v 1.7 2010/07/02 10:46:27 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// classes G4ParameterisationTubsRho
    … …  
    5050
    5151// Dummy declarations to get rid of warnings ...
     52//
    5253class G4Trd;
    5354class G4Trap;
    … …  
    7980                               G4double offset, G4double step,
    8081                               G4VSolid* motherSolid, DivisionType divType );
    81     virtual ~G4ParameterisationTubsRho();
    82 
    83     virtual G4double GetMaxParameter() const;
    84 
    85     virtual void ComputeTransformation(const G4int copyNo,
    86                                        G4VPhysicalVolume* physVol) const;
     82   ~G4ParameterisationTubsRho();
     83
     84    G4double GetMaxParameter() const;
     85
     86    void ComputeTransformation(const G4int copyNo,
     87                                     G4VPhysicalVolume* physVol) const;
    8788    void ComputeDimensions(G4Tubs& tubs, const G4int copyNo,
    8889                           const G4VPhysicalVolume* physVol) const;
    … …  
    122123                               G4double offset, G4double step,
    123124                               G4VSolid* motherSolid, DivisionType divType );
    124     virtual ~G4ParameterisationTubsPhi();
    125 
    126     virtual G4double GetMaxParameter() const;
    127 
    128     virtual void ComputeTransformation(const G4int copyNo,
    129                                        G4VPhysicalVolume* physVol) const;
     125   ~G4ParameterisationTubsPhi();
     126
     127    G4double GetMaxParameter() const;
     128
     129    void ComputeTransformation(const G4int copyNo,
     130                                     G4VPhysicalVolume* physVol) const;
    130131    void ComputeDimensions(G4Tubs& tubs, const G4int copyNo,
    131132                           const G4VPhysicalVolume* physVol) const;
    … …  
    165166                             G4double offset, G4double step,
    166167                             G4VSolid* motherSolid, DivisionType divType );
    167     virtual ~G4ParameterisationTubsZ();
    168 
    169     virtual G4double GetMaxParameter() const;
    170 
    171     virtual void ComputeTransformation(const G4int copyNo,
    172                                        G4VPhysicalVolume* physVol) const;
     168   ~G4ParameterisationTubsZ();
     169
     170    G4double GetMaxParameter() const;
     171
     172    void ComputeTransformation(const G4int copyNo,
     173                                     G4VPhysicalVolume* physVol) const;
    173174    void ComputeDimensions(G4Tubs& tubs, const G4int copyNo,
    174175                           const G4VPhysicalVolume* physVol) const;

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4VDivisionParameterisation.hh,v 1.11 2007/05/11 13:26:26 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VDivisionParameterisation.hh,v 1.13 2010/11/10 09:15:48 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4VDivisionParameterisation
    … …  
    3939// 09.05.01 - P.Arce, Initial version
    4040// 08.04.04 - I.Hrivnacova, Implemented reflection
     41// 21.04.10 - M.Asai, Added gaps
    4142//---------------------------------------------------------------------
    4243#ifndef G4VDivisionParameterisation_H
    … …  
    7475    inline void SetType(const G4String& type);
    7576    inline G4int VolumeFirstCopyNo() const;
    76  
     77    inline void SetHalfGap(G4double hg);
     78    inline G4double GetHalfGap() const;
     79
    7780  protected:  // with description
    7881
    … …  
    107110
    108111    G4double kCarTolerance;
     112
     113    G4double fhgap;
    109114};
    110115

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4VDivisionParameterisation.icc,v 1.4 2006/06/29 18:18:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VDivisionParameterisation.icc,v 1.5 2010/11/10 09:15:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4VDivisionParameterisation Inline Implementation file
    … …  
    7979  return theVoluFirstCopyNo;
    8080}
     81
     82inline
     83void G4VDivisionParameterisation::SetHalfGap(G4double hg)
     84{
     85   fhgap = hg;
     86}
     87
     88inline
     89G4double G4VDivisionParameterisation::GetHalfGap() const
     90{
     91   return fhgap;
     92}

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4PVDivision.cc,v 1.22 2008/12/03 16:41:45 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PVDivision.cc,v 1.24 2010/09/06 09:28:24 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4PVDivision Implementation file
    … …  
    6262    G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
    6363                FatalException, message_1);
     64    return;
    6465  }
    6566  if (pLogical == pMotherLogical)
    6667  {
    67     G4String message_2 =
    68       "Cannot place a volume inside itself! Volume: " + pName;
     68    G4String message_2 = "Cannot place a volume inside itself! Volume: "+ pName;
    6969    G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
    7070                FatalException, message_2);
    … …  
    9090  if (!pMotherLogical)
    9191  {
    92     G4String message_1 =
    93       "NULL pointer specified as mother! Volume: " + pName;
     92    G4String message_1 = "NULL pointer specified as mother! Volume: " + pName;
    9493    G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
    9594                FatalException, message_1);
     95    return;
    9696  }
    9797  if (pLogical == pMotherLogical)
    9898  {
    99     G4String message_2 =
    100       "Cannot place a volume inside itself! Volume: " + pName;
     99    G4String message_2 = "Cannot place a volume inside itself! Volume: "+ pName;
    101100    G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
    102101                FatalException, message_2);
    … …  
    120119  if (!pMotherLogical)
    121120  {
    122     G4String message_1 =
    123       "NULL pointer specified as mother! Volume: " + pName;
     121    G4String message_1 = "NULL pointer specified as mother! Volume: " + pName;
    124122    G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
    125123                FatalException, message_1);
     124    return;
    126125  }
    127126  if (pLogical == pMotherLogical)
    128127  {
    129     G4String message_2 =
    130       "Cannot place a volume inside itself! Volume: " + pName;
     128    G4String message_2 = "Cannot place a volume inside itself! Volume: "+ pName;
    131129    G4Exception("G4PVDivision::G4PVDivision()", "InvalidSetup",
    132130                FatalException, message_2);

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4PVDivisionFactory.cc,v 1.2 2006/06/29 18:18:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PVDivisionFactory.cc,v 1.3 2010/07/02 10:46:27 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4PVDivisionFactory Implementation file
    … …  
    137137                "WrongType", FatalException,
    138138                "Unexpected parameterisation type !");
     139    return 0;
    139140  }
     141  else
     142  {
     143    EAxis axis = divParam->GetAxis();
     144    G4int nofDivisions = divParam->GetNoDiv();
     145    G4double width = divParam->GetWidth();
     146    G4double offset = divParam->GetOffset();
    140147
    141   EAxis axis = divParam->GetAxis();
    142   G4int nofDivisions = divParam->GetNoDiv();
    143   G4double width = divParam->GetWidth();
    144   G4double offset = divParam->GetOffset();
    145 
    146   return new G4PVDivision(pName, pLogical, pMotherLogical,
    147                           axis, nofDivisions, width, offset);
     148    return new G4PVDivision(pName, pLogical, pMotherLogical,
     149                            axis, nofDivisions, width, offset);
     150  }
    148151}   
    149152

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationBox.cc,v 1.10 2006/06/29 18:18:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationBox.cc,v 1.12 2010/11/10 09:15:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4ParameterisationBox Implementation file
    … …  
    3232// 26.05.03 - P.Arce, Initial version
    3333// 08.04.04 - I.Hrivnacova, Implemented reflection
     34// 21.04.10 - M.Asai, Added gaps
    3435// --------------------------------------------------------------------
    3536
    … …  
    152153  G4Box* msol = (G4Box*)(fmotherSolid);
    153154
    154   G4double pDx = fwidth/2.;
     155  G4double pDx = fwidth/2. - fhgap;
    155156  G4double pDy = msol->GetYHalfLength();
    156157  G4double pDz = msol->GetZHalfLength();
    … …  
    254255
    255256  G4double pDx = msol->GetXHalfLength();
    256   G4double pDy = fwidth/2.;
     257  G4double pDy = fwidth/2. - fhgap;
    257258  G4double pDz = msol->GetZHalfLength();
    258259
    … …  
    356357  G4double pDx = msol->GetXHalfLength();
    357358  G4double pDy = msol->GetYHalfLength();
    358   G4double pDz = fwidth/2.;
     359  G4double pDz = fwidth/2. - fhgap;
    359360
    360361  box.SetXHalfLength( pDx );

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationCons.cc,v 1.9 2006/06/29 18:18:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationCons.cc,v 1.11 2010/11/10 09:15:58 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4ParameterisationCons Implementation file
    … …  
    3232// 26.05.03 - P.Arce, Initial version
    3333// 08.04.04 - I.Hrivnacova, Implemented reflection
     34// 21.04.10 - M.Asai, Added gaps
    3435// --------------------------------------------------------------------
    3536
    … …  
    188189  G4double pDz = msol->GetZHalfLength();
    189190
     191  G4double d_half_gap = fhgap * pRMax2 / pRMax1;
    190192  //- already rotated  double pSR = foffset + copyNo*fwidth;
    191193  G4double pSPhi = msol->GetStartPhiAngle();
    192194  G4double pDPhi = msol->GetDeltaPhiAngle();;
    193195
    194   cons.SetInnerRadiusMinusZ( pRMin1 );
    195   cons.SetOuterRadiusMinusZ( pRMax1 );
    196   cons.SetInnerRadiusPlusZ( pRMin2 );
    197   cons.SetOuterRadiusPlusZ( pRMax2 );
     196  cons.SetInnerRadiusMinusZ( pRMin1 + fhgap );
     197  cons.SetOuterRadiusMinusZ( pRMax1 - fhgap );
     198  cons.SetInnerRadiusPlusZ( pRMin2 + d_half_gap );
     199  cons.SetOuterRadiusPlusZ( pRMax2 - d_half_gap );
    198200  cons.SetZHalfLength( pDz );
    199201  cons.SetStartPhiAngle( pSPhi );
    … …  
    295297
    296298  //- already rotated  double pSPhi = foffset + copyNo*fwidth;
    297   G4double pSPhi = foffset + msol->GetStartPhiAngle();
    298   G4double pDPhi = fwidth;
     299  G4double pSPhi = foffset + msol->GetStartPhiAngle() + fhgap;
     300  G4double pDPhi = fwidth - 2.*fhgap;
    299301
    300302  cons.SetInnerRadiusMinusZ( pRMin1 );
    … …  
    396398  G4Cons* msol = (G4Cons*)(fmotherSolid);
    397399
    398   G4double mHalfLength = msol->GetZHalfLength();
     400  G4double mHalfLength = msol->GetZHalfLength() - fhgap;
    399401  G4double aRInner = (msol->GetInnerRadiusPlusZ()
    400402                   - msol->GetInnerRadiusMinusZ()) / (2*mHalfLength);
    … …  
    405407  G4double bROuter = (msol->GetOuterRadiusPlusZ()
    406408                   + msol->GetOuterRadiusMinusZ()) / 2;
    407   G4double xMinusZ = -mHalfLength + OffsetZ() + fwidth*copyNo;
    408   G4double xPlusZ  = -mHalfLength + OffsetZ() + fwidth*(copyNo+1);
     409  G4double xMinusZ = -mHalfLength + OffsetZ() + fwidth*copyNo + fhgap;
     410  G4double xPlusZ  = -mHalfLength + OffsetZ() + fwidth*(copyNo+1) - fhgap;
    409411  cons.SetInnerRadiusMinusZ( aRInner * xMinusZ + bRInner );
    410412  cons.SetOuterRadiusMinusZ( aROuter * xMinusZ + bROuter );
    … …  
    412414  cons.SetOuterRadiusPlusZ( aROuter * xPlusZ + bROuter );
    413415 
    414   G4double pDz = fwidth / 2.;
     416  G4double pDz = fwidth / 2. - fhgap;
    415417  G4double pSPhi = msol->GetStartPhiAngle();
    416418  G4double pDPhi = msol->GetDeltaPhiAngle();

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationPara.cc,v 1.11 2006/06/29 18:18:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationPara.cc,v 1.13 2010/11/10 09:16:03 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4ParameterisationPara Implementation file
    … …  
    3232// 26.05.03 - P.Arce, Initial version
    3333// 08.04.04 - I.Hrivnacova, Implemented reflection
     34// 21.04.10 - M.Asai, Added gaps
    3435// --------------------------------------------------------------------
    3536
    … …  
    162163
    163164  //---- Get
    164   G4double pDx = fwidth/2.;
     165  G4double pDx = fwidth/2. - fhgap;
    165166  G4double pDy = msol->GetYHalfLength();
    166167  G4double pDz = msol->GetZHalfLength();
    … …  
    265266  //---- Get
    266267  G4double pDx = msol->GetXHalfLength();
    267   G4double pDy = fwidth/2.;
     268  G4double pDy = fwidth/2. - fhgap;
    268269  G4double pDz = msol->GetZHalfLength();
    269270  G4double pAlpha = std::atan(msol->GetTanAlpha());
    … …  
    366367  G4double pDx = msol->GetXHalfLength();
    367368  G4double pDy = msol->GetYHalfLength();
     369  G4double pDz = fwidth/2. - fhgap;
    368370  G4double pAlpha = std::atan(msol->GetTanAlpha());
    369371  G4double pTheta = msol->GetSymAxis().theta();
    370372  G4double pPhi = msol->GetSymAxis().phi();
    371   G4double pDz = fwidth/2.;
    372373 
    373374  para.SetAllParameters ( pDx, pDy, pDz, pAlpha, pTheta, pPhi );

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

    r1337 r1347  
    2626//
    2727// $Id: G4ParameterisationPolycone.cc,v 1.17 2009/05/18 19:30:29 ivana Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4ParameterisationPolycone Implementation file

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

    r1337 r1347  
    2626//
    2727// $Id: G4ParameterisationPolyhedra.cc,v 1.19 2009/05/20 08:35:52 ivana Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4ParameterisationPolyhedra Implementation file

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationTrd.cc,v 1.16 2008/12/18 12:57:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationTrd.cc,v 1.19 2010/11/10 09:16:08 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4ParameterisationTrd Implementation file
    … …  
    3232// 26.05.03 - P.Arce, Initial version
    3333// 08.04.04 - I.Hrivnacova, Implemented reflection
     34// 21.04.10 - M.Asai, Added gaps
    3435// --------------------------------------------------------------------
    3536
    … …  
    5051                        G4double offset, G4VSolid* msolid,
    5152                        DivisionType divType )
    52   :  G4VDivisionParameterisation( axis, nDiv, width, offset, divType, msolid )
     53  :  G4VDivisionParameterisation( axis, nDiv, width, offset, divType, msolid ),
     54     bDivInTrap(false)
    5355{
    5456  G4Trd* msol = (G4Trd*)(msolid);
    … …  
    141143  G4ThreeVector origin(0.,0.,0.);
    142144  G4double posi;
    143   if( !bDivInTrap ) {
     145  if( !bDivInTrap )
     146  {
    144147    posi = -mdx + foffset + (copyNo+0.5)*fwidth;
    145   } else {
     148  }
     149  else
     150  {
    146151    G4double aveHL = (msol->GetXHalfLength1()+msol->GetXHalfLength2())/2.;
    147152    posi = - aveHL + foffset + (copyNo+0.5)*aveHL/fnDiv*2;
    … …  
    181186  G4double pDy2 = msol->GetYHalfLength2();
    182187  G4double pDz = msol->GetZHalfLength();
    183   G4double pDx = fwidth/2.;
     188  G4double pDx = fwidth/2. - fhgap;
    184189 
    185190  trd.SetAllParameters ( pDx, pDx, pDy1, pDy2, pDz );
    … …  
    203208  else
    204209  {
    205     return theTrap;
     210    return fmotherSolid;
    206211  }
    207212}
    … …  
    232237                          alp,
    233238                          pDy2,
    234                           pDx1,
    235                           pDx2,
     239                          pDx1 - fhgap,
     240                          pDx2 - fhgap * pDx2/pDx1,
    236241                          alp);
    237242
    … …  
    249254{
    250255  G4VDivisionParameterisation::CheckParametersValidity();
    251 
     256/*
    252257  G4Trd* msol = (G4Trd*)(fmotherSolid);
    253258
    … …  
    258263  if( std::fabs(mpDx1 - mpDx2) > kCarTolerance )
    259264  {
    260     return;
    261 
    262265    G4cerr << "ERROR - G4ParameterisationTrdX::CheckParametersValidity()"
    263266           << G4endl
    … …  
    270273                "Invalid solid specification. NOT supported.");
    271274  }
     275*/
    272276}
    273277
    … …  
    370374  G4double pDx2 = msol->GetXHalfLength2();
    371375  G4double pDz = msol->GetZHalfLength();
    372   G4double pDy = fwidth/2.;
     376  G4double pDy = fwidth/2. - fhgap;
    373377 
    374378  trd.SetAllParameters ( pDx1, pDx2, pDy, pDy, pDz );
    … …  
    501505  G4double pDy1 = msol->GetYHalfLength1();
    502506  G4double DDy = (msol->GetYHalfLength2() - msol->GetYHalfLength1() );
    503   G4double pDz = fwidth/2.;
     507  G4double pDz = fwidth/2. - fhgap;
    504508  G4double zLength = 2*msol->GetZHalfLength();
    505509 
    506   trd.SetAllParameters( pDx1+DDx*(OffsetZ()+copyNo*fwidth)/zLength,
    507                         pDx1+DDx*(OffsetZ()+(copyNo+1)*fwidth)/zLength,
    508                         pDy1+DDy*(OffsetZ()+copyNo*fwidth)/zLength,
    509                         pDy1+DDy*(OffsetZ()+(copyNo+1)*fwidth)/zLength, pDz );
     510  trd.SetAllParameters( pDx1+DDx*(OffsetZ()+copyNo*fwidth+fhgap)/zLength,
     511                        pDx1+DDx*(OffsetZ()+(copyNo+1)*fwidth-fhgap)/zLength,
     512                        pDy1+DDy*(OffsetZ()+copyNo*fwidth+fhgap)/zLength,
     513                        pDy1+DDy*(OffsetZ()+(copyNo+1)*fwidth-fhgap)/zLength, pDz );
    510514
    511515#ifdef G4DIVDEBUG

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisationTubs.cc,v 1.8 2006/06/29 18:18:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisationTubs.cc,v 1.10 2010/11/10 09:16:13 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4ParameterisationTubs Implementation file
    … …  
    3232// 26.05.03 - P.Arce, Initial version
    3333// 08.04.04 - I.Hrivnacova, Implemented reflection
     34// 21.04.10 - M.Asai, Added gaps
    3435// --------------------------------------------------------------------
    3536
    … …  
    156157  G4Tubs* msol = (G4Tubs*)(fmotherSolid);
    157158
    158   G4double pRMin = msol->GetInnerRadius() + foffset + fwidth * copyNo;
    159   G4double pRMax = msol->GetInnerRadius() + foffset + fwidth * (copyNo+1);
     159  G4double pRMin = msol->GetInnerRadius() + foffset + fwidth * copyNo + fhgap;
     160  G4double pRMax = msol->GetInnerRadius() + foffset + fwidth * (copyNo+1) - fhgap;
    160161  G4double pDz = msol->GetZHalfLength();
    161162  //- already rotated  G4double pSR = foffset + copyNo*fwidth;
    … …  
    269270  G4double pDz = msol->GetZHalfLength();
    270271  //----- already rotated in 'ComputeTransformation'
    271   G4double pSPhi = msol->GetStartPhiAngle();
    272   G4double pDPhi = fwidth;
     272  G4double pSPhi = msol->GetStartPhiAngle() + fhgap;
     273  G4double pDPhi = fwidth - 2.*fhgap;
    273274
    274275  tubs.SetInnerRadius( pRMin );
    … …  
    379380  G4double pRMax = msol->GetOuterRadius();
    380381  //  G4double pDz = msol->GetZHalfLength() / GetNoDiv();
    381   G4double pDz = fwidth/2.;
     382  G4double pDz = fwidth/2. - fhgap;
    382383  G4double pSPhi = msol->GetStartPhiAngle();
    383384  G4double pDPhi = msol->GetDeltaPhiAngle();

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

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4VDivisionParameterisation.cc,v 1.14 2008/12/03 16:41:15 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VDivisionParameterisation.cc,v 1.16 2010/11/10 09:16:18 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4VDivisionParameterisation Implementation file
    … …  
    3232// 26.05.03 - P.Arce, Initial version
    3333// 08.04.04 - I.Hrivnacova, Implemented reflection
     34// 21.04.10 - M.Asai, Added gaps
    3435// --------------------------------------------------------------------
    3536
    … …  
    5051  : faxis(axis), fnDiv( nDiv), fwidth(step), foffset(offset),
    5152    fDivisionType(divType), fmotherSolid( motherSolid ), fReflectedSolid(false),
    52     fDeleteSolid(false) 
     53    fDeleteSolid(false), theVoluFirstCopyNo(1), fhgap(0.)
    5354{
    5455#ifdef G4DIVDEBUG
    … …  
    6162  }
    6263#endif
    63 
    64   theVoluFirstCopyNo = 1;
    6564  kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
    6665}

  • trunk/source/geometry/divisions/test/ExDivisions/exampleDiv.cc

    r1316 r1347  
    2626//
    2727// $Id: exampleDiv.cc,v 1.4 2009/05/18 13:49:53 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/divisions/test/ExDivisions/include/ExDivDetectorConstruction.hh

    r1316 r1347  
    2626//
    2727// $Id: ExDivDetectorConstruction.hh,v 1.3 2006/06/29 18:19:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/include/ExDivEventAction.hh

    r1316 r1347  
    2626//
    2727// $Id: ExDivEventAction.hh,v 1.2 2006/06/29 18:19:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/include/ExDivPhysicsList.hh

    r1316 r1347  
    2626//
    2727// $Id: ExDivPhysicsList.hh,v 1.2 2006/06/29 18:19:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/include/ExDivPrimaryGeneratorAction.hh

    r1316 r1347  
    2626//
    2727// $Id: ExDivPrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:19:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/include/ExDivRunAction.hh

    r1316 r1347  
    2626//
    2727// $Id: ExDivRunAction.hh,v 1.2 2006/06/29 18:19:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/include/ExDivSteppingAction.hh

    r1316 r1347  
    2626//
    2727// $Id: ExDivSteppingAction.hh,v 1.2 2006/06/29 18:19:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/include/ExDivSteppingVerbose.hh

    r1316 r1347  
    2626//
    2727// $Id: ExDivSteppingVerbose.hh,v 1.2 2006/06/29 18:19:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//   This class manages the verbose outputs in G4SteppingManager.

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivDetectorConstruction.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivDetectorConstruction.cc,v 1.3 2006/06/29 18:19:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivEventAction.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivEventAction.cc,v 1.2 2006/06/29 18:19:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivPhysicsList.cc

    r1316 r1347  
    2525//
    2626//
    27 // $Id: ExDivPhysicsList.cc,v 1.2 2006/06/29 18:19:57 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     27// $Id: ExDivPhysicsList.cc,v 1.3 2010/06/16 08:51:13 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    150150#include "G4PhotoElectricEffect.hh"
    151151
    152 #include "G4MultipleScattering.hh"
     152#include "G4eMultipleScattering.hh"
     153#include "G4hMultipleScattering.hh"
     154#include "G4MuMultipleScattering.hh"
    153155
    154156#include "G4eIonisation.hh"
    … …  
    182184    } else if (particleName == "e-") {
    183185      //electron
    184       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
     186      pmanager->AddProcess(new G4eMultipleScattering,-1, 1,1);
    185187      pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
    186188      pmanager->AddProcess(new G4eBremsstrahlung,   -1,-1,3);     
    … …  
    188190    } else if (particleName == "e+") {
    189191      //positron
    190       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
     192      pmanager->AddProcess(new G4eMultipleScattering,-1, 1,1);
    191193      pmanager->AddProcess(new G4eIonisation,       -1, 2,2);
    192194      pmanager->AddProcess(new G4eBremsstrahlung,   -1,-1,3);
    … …  
    196198               particleName == "mu-"    ) {
    197199      //muon 
    198       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
     200      pmanager->AddProcess(new G4MuMultipleScattering,-1, 1,1);
    199201      pmanager->AddProcess(new G4MuIonisation,      -1, 2,2);
    200202      pmanager->AddProcess(new G4MuBremsstrahlung,  -1,-1,3);
    … …  
    205207               (particle->GetParticleName() != "chargedgeantino")) {
    206208      //all others charged particles except geantino
    207       pmanager->AddProcess(new G4MultipleScattering,-1, 1,1);
     209      pmanager->AddProcess(new G4hMultipleScattering,-1, 1,1);
    208210      pmanager->AddProcess(new G4hIonisation,       -1, 2,2);
    209211      ///pmanager->AddProcess(new G4hUserSpecialCuts,  -1,-1,3);     

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivPrimaryGeneratorAction.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivPrimaryGeneratorAction.cc,v 1.3 2006/06/29 18:19:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivRunAction.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivRunAction.cc,v 1.2 2006/06/29 18:20:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivSteppingAction.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivSteppingAction.cc,v 1.2 2006/06/29 18:20:04 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivSteppingVerbose.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivSteppingVerbose.cc,v 1.2 2006/06/29 18:20:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivTesterBox.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivTesterBox.cc,v 1.3 2006/06/29 18:20:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class ExDivTesterBox Implementation file

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivTesterCons.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivTesterCons.cc,v 1.3 2006/06/29 18:20:10 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class ExDivTesterCons Implementation file

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivTesterPara.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivTesterPara.cc,v 1.3 2006/06/29 18:20:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class ExDivTesterPara Implementation file

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivTesterPolycone.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivTesterPolycone.cc,v 1.3 2006/06/29 18:20:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class ExDivTesterPolycone Implementation file

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivTesterPolyhedra.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivTesterPolyhedra.cc,v 1.3 2006/06/29 18:20:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class ExDivTesterPolyhedra Implementation file

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivTesterTrd.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivTesterTrd.cc,v 1.3 2006/06/29 18:20:28 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class ExDivTesterTrd Implementation file

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExDivTesterTubs.cc

    r1316 r1347  
    2626//
    2727// $Id: ExDivTesterTubs.cc,v 1.3 2006/06/29 18:20:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class ExDivTesterTubs Implementation file

  • trunk/source/geometry/divisions/test/ExDivisions/src/ExVDivTester.cc

    r1316 r1347  
    2626//
    2727// $Id: ExVDivTester.cc,v 1.7 2009/05/16 09:15:33 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class ExVDivTester Implementation file

  • trunk/source/geometry/divisions/test/testG4PVDivision.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4PVDivision.cc,v 1.5 2009/05/14 14:19:32 ivana Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// test for G4PVDivision classes

  • trunk/source/geometry/magneticfield/History

    r1340 r1347  
    1 $Id: History,v 1.152 2010/09/10 16:02:44 japost Exp $
     1$Id: History,v 1.153 2010/09/14 07:57:13 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
    1920Sep 10th,  2010 J.Apostolakis - field-V09-03-03
    2021-----------------------------
    … …  
    2526Sep 10th,  2010 J.Apostolakis - field-V09-03-02
    2627-----------------------------
     28- New class G4MonopoleEq for rhs of d(pc)/ds propagation in field
     29  in SI units (V.Grichine).
    2730- Fixed passing of time in G4NystromRK4
    2831

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTDetectorConstruction.hh

    r1199 r1347  
    3232//
    3333// $Id: NTSTDetectorConstruction.hh,v 1.3 2006/06/29 18:25:23 gunter Exp $
    34 // GEANT4 tag $Name: HEAD $
     34// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3535//
    3636

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTDetectorMessenger.hh

    r1199 r1347  
    3232//
    3333// $Id: NTSTDetectorMessenger.hh,v 1.3 2006/06/29 18:25:26 gunter Exp $
    34 // GEANT4 tag $Name: HEAD $
     34// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3535//
    3636//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTEventAction.hh

    r1199 r1347  
    3434//
    3535// $Id: NTSTEventAction.hh,v 1.3 2006/06/29 18:25:28 gunter Exp $
    36 // GEANT4 tag $Name: HEAD $
     36// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3737//
    3838//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTEventActionMessenger.hh

    r1199 r1347  
    2525//
    2626// $Id: NTSTEventActionMessenger.hh,v 1.3 2006/06/29 18:25:30 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTGunGenerator.hh

    r1199 r1347  
    2525//
    2626// $Id: NTSTGunGenerator.hh,v 1.4 2006/12/12 10:21:16 japost Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTGunMessenger.hh

    r1199 r1347  
    2525//
    2626// $Id: NTSTGunMessenger.hh,v 1.3 2006/06/29 18:25:38 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTPhysicsList.hh

    r1199 r1347  
    2525//
    2626// $Id: NTSTPhysicsList.hh,v 1.3 2006/06/29 18:25:42 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTPhysicsListMessenger.hh

    r1199 r1347  
    2525//
    2626// $Id: NTSTPhysicsListMessenger.hh,v 1.3 2006/06/29 18:25:45 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTPrimaryGeneratorAction.hh

    r1199 r1347  
    2727// generators and invokes the one specified by the messenger
    2828
    29 // GEANT4 tag $Name: HEAD $
     29// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3030//
    3131//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTRunAction.hh

    r1199 r1347  
    2525//
    2626// $Id: NTSTRunAction.hh,v 1.3 2006/06/29 18:25:57 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTSteppingAction.hh

    r1199 r1347  
    2525//
    2626// $Id: NTSTSteppingAction.hh,v 1.3 2006/06/29 18:25:59 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/include/NTSTVisManager.hh

    r1199 r1347  
    2525//
    2626// $Id: NTSTVisManager.hh,v 1.3 2006/06/29 18:26:01 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTDetectorMessenger.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTDetectorMessenger.cc,v 1.3 2006/06/29 18:26:08 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTEventAction.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTEventAction.cc,v 1.6 2006/06/29 18:26:10 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTEventActionMessenger.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTEventActionMessenger.cc,v 1.3 2006/06/29 18:26:12 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTGunGenerator.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTGunGenerator.cc,v 1.5 2006/06/29 18:26:16 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTGunMessenger.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTGunMessenger.cc,v 1.4 2006/06/29 18:26:18 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTPhysicsList.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTPhysicsList.cc,v 1.5 2006/06/29 18:26:22 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTPhysicsListMessenger.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTPhysicsListMessenger.cc,v 1.3 2006/06/29 18:26:24 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTRunAction.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTRunAction.cc,v 1.4 2006/06/29 18:26:33 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTSteppingAction.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTSteppingAction.cc,v 1.4 2006/06/29 18:26:35 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/NTST/src/NTSTVisManager.cc

    r1199 r1347  
    2525//
    2626// $Id: NTSTVisManager.cc,v 1.3 2006/06/29 18:26:38 gunter Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/geometry/magneticfield/test/OtherFields/include/G4DELPHIMagField.hh

    r1199 r1347  
    2626//
    2727// $Id: G4DELPHIMagField.hh,v 1.2 2006/06/29 18:26:45 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/OtherFields/include/G4HarmonicPolMagField.hh

    r1199 r1347  
    2626//
    2727// $Id: G4HarmonicPolMagField.hh,v 1.2 2006/06/29 18:26:47 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/OtherFields/include/G4LineCurrentMagField.hh

    r1199 r1347  
    2626//
    2727// $Id: G4LineCurrentMagField.hh,v 1.3 2006/06/29 18:26:50 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/OtherFields/include/G4QuadrupoleMagField.hh

    r1199 r1347  
    2626//
    2727// $Id: G4QuadrupoleMagField.hh,v 1.3 2006/06/29 18:26:52 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/OtherFields/src/G4DELPHIMagField.cc

    r1199 r1347  
    2626//
    2727// $Id: G4DELPHIMagField.cc,v 1.4 2006/06/29 18:26:54 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/OtherFields/src/G4HarmonicPolMagField.cc

    r1199 r1347  
    2626//
    2727// $Id: G4HarmonicPolMagField.cc,v 1.3 2006/06/29 18:26:56 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/OtherFields/src/G4LineCurrentMagField.cc

    r1199 r1347  
    2626//
    2727// $Id: G4LineCurrentMagField.cc,v 1.4 2006/06/29 18:26:58 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/OtherFields/src/G4QuadrupoleMagField.cc

    r1199 r1347  
    2626//
    2727// $Id: G4QuadrupoleMagField.cc,v 1.3 2006/06/29 18:27:00 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/OtherFields/testDelphiField.cc

    r1231 r1347  
    2626//
    2727// $Id: testDelphiField.cc,v 1.7 2006/06/29 18:26:40 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/magneticfield/test/OtherFields/testHarmonicPolMagField.cc

    r1231 r1347  
    2626//
    2727// $Id: testHarmonicPolMagField.cc,v 1.7 2006/06/29 18:26:43 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/magneticfield/test/field02/field02.cc

    r1231 r1347  
    2626//
    2727// $Id: field02.cc,v 1.2 2006/06/29 18:27:02 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02CalorHit.hh

    r1199 r1347  
    2626//
    2727// $Id: F02CalorHit.hh,v 1.3 2006/06/29 18:27:05 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02CalorimeterSD.hh

    r1199 r1347  
    2626//
    2727// $Id: F02CalorimeterSD.hh,v 1.2 2006/06/29 18:27:07 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02DetectorConstruction.hh

    r1199 r1347  
    2626//
    2727// $Id: F02DetectorConstruction.hh,v 1.2 2006/06/29 18:27:09 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02DetectorMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F02DetectorMessenger.hh,v 1.2 2006/06/29 18:27:11 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02ElectroMagneticField.hh

    r1199 r1347  
    2626//
    2727// $Id: F02ElectroMagneticField.hh,v 1.2 2006/06/29 18:27:13 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02EventAction.hh

    r1199 r1347  
    2626//
    2727// $Id: F02EventAction.hh,v 1.2 2006/06/29 18:27:15 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02EventActionMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F02EventActionMessenger.hh,v 1.2 2006/06/29 18:27:17 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02FieldMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F02FieldMessenger.hh,v 1.2 2006/06/29 18:27:19 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02PhysicsList.hh

    r1199 r1347  
    2626//
    2727// $Id: F02PhysicsList.hh,v 1.2 2006/06/29 18:27:21 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field02/include/F02PhysicsListMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F02PhysicsListMessenger.hh,v 1.2 2006/06/29 18:27:24 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02PrimaryGeneratorAction.hh

    r1199 r1347  
    2626//
    2727// $Id: F02PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:27:26 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02PrimaryGeneratorMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F02PrimaryGeneratorMessenger.hh,v 1.2 2006/06/29 18:27:28 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02RunAction.hh

    r1199 r1347  
    2626//
    2727// $Id: F02RunAction.hh,v 1.4 2006/06/29 18:27:30 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02RunMessenger.hh

    r1199 r1347  
    2727//
    2828// $Id: F02RunMessenger.hh,v 1.3 2006/06/29 18:27:32 gunter Exp $
    29 // GEANT4 tag $Name: HEAD $
     29// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3030//
    3131//

  • trunk/source/geometry/magneticfield/test/field02/include/F02StepCut.hh

    r1199 r1347  
    2626//
    2727// $Id: F02StepCut.hh,v 1.2 2006/06/29 18:27:34 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02SteppingAction.hh

    r1199 r1347  
    2626//
    2727// $Id: F02SteppingAction.hh,v 1.2 2006/06/29 18:27:36 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/include/F02SteppingMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F02SteppingMessenger.hh,v 1.2 2006/06/29 18:27:38 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field02/include/F02SteppingVerbose.hh

    r1199 r1347  
    2626//
    2727// $Id: F02SteppingVerbose.hh,v 1.2 2006/06/29 18:27:40 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/magneticfield/test/field02/include/F02VisManager.hh

    r1199 r1347  
    2626//
    2727// $Id: F02VisManager.hh,v 1.2 2006/06/29 18:27:42 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02CalorHit.cc

    r1199 r1347  
    2626//
    2727// $Id: F02CalorHit.cc,v 1.2 2006/06/29 18:27:44 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02CalorimeterSD.cc

    r1199 r1347  
    2626//
    2727// $Id: F02CalorimeterSD.cc,v 1.3 2006/06/29 18:27:46 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02DetectorConstruction.cc

    r1199 r1347  
    2626//
    2727// $Id: F02DetectorConstruction.cc,v 1.4 2006/06/29 18:27:49 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02DetectorMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F02DetectorMessenger.cc,v 1.3 2006/06/29 18:27:51 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02ElectroMagneticField.cc

    r1199 r1347  
    2626//
    2727// $Id: F02ElectroMagneticField.cc,v 1.4 2006/06/29 18:27:53 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/magneticfield/test/field02/src/F02EventAction.cc

    r1199 r1347  
    2626//
    2727// $Id: F02EventAction.cc,v 1.6 2006/06/29 18:27:55 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02EventActionMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F02EventActionMessenger.cc,v 1.3 2006/06/29 18:27:58 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02FieldMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F02FieldMessenger.cc,v 1.3 2006/06/29 18:28:01 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02PhysicsList.cc

    r1199 r1347  
    2626//
    2727// $Id: F02PhysicsList.cc,v 1.4 2006/06/29 18:28:04 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field02/src/F02PhysicsListMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F02PhysicsListMessenger.cc,v 1.3 2006/06/29 18:28:06 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02PrimaryGeneratorAction.cc

    r1199 r1347  
    2626//
    2727// $Id: F02PrimaryGeneratorAction.cc,v 1.4 2006/06/29 18:28:09 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02PrimaryGeneratorMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F02PrimaryGeneratorMessenger.cc,v 1.3 2006/06/29 18:28:11 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02RunAction.cc

    r1199 r1347  
    2626//
    2727// $Id: F02RunAction.cc,v 1.6 2006/06/29 18:28:13 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02RunMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F02RunMessenger.cc,v 1.4 2006/06/29 18:28:15 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02StepCut.cc

    r1199 r1347  
    2626//
    2727// $Id: F02StepCut.cc,v 1.2 2006/06/29 18:28:17 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field02/src/F02SteppingAction.cc

    r1199 r1347  
    2626//
    2727// $Id: F02SteppingAction.cc,v 1.6 2006/06/29 18:28:19 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02SteppingMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F02SteppingMessenger.cc,v 1.2 2006/06/29 18:28:21 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field02/src/F02SteppingVerbose.cc

    r1199 r1347  
    2626//
    2727// $Id: F02SteppingVerbose.cc,v 1.4 2006/06/29 18:28:37 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field02/src/F02VisManager.cc

    r1199 r1347  
    2626//
    2727// $Id: F02VisManager.cc,v 1.2 2006/06/29 18:28:53 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/field03.cc

    r1231 r1347  
    2626//
    2727// $Id: field03.cc,v 1.2 2006/06/29 18:28:57 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03CalorHit.hh

    r1199 r1347  
    2626//
    2727// $Id: F03CalorHit.hh,v 1.2 2006/06/29 18:28:59 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03CalorimeterSD.hh

    r1199 r1347  
    2626//
    2727// $Id: F03CalorimeterSD.hh,v 1.2 2006/06/29 18:29:09 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03DetectorConstruction.hh

    r1199 r1347  
    2626//
    2727// $Id: F03DetectorConstruction.hh,v 1.2 2006/06/29 18:29:11 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03DetectorMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F03DetectorMessenger.hh,v 1.2 2006/06/29 18:29:14 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03ElectroMagneticField.hh

    r1199 r1347  
    2626//
    2727// $Id: F03ElectroMagneticField.hh,v 1.2 2006/06/29 18:29:16 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03EventAction.hh

    r1199 r1347  
    2626//
    2727// $Id: F03EventAction.hh,v 1.2 2006/06/29 18:29:18 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03EventActionMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F03EventActionMessenger.hh,v 1.2 2006/06/29 18:29:20 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03FieldMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F03FieldMessenger.hh,v 1.2 2006/06/29 18:29:33 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03PhysicsList.hh

    r1199 r1347  
    2626//
    2727// $Id: F03PhysicsList.hh,v 1.2 2006/06/29 18:29:35 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field03/include/F03PhysicsListMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F03PhysicsListMessenger.hh,v 1.2 2006/06/29 18:29:37 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03PrimaryGeneratorAction.hh

    r1199 r1347  
    2626//
    2727// $Id: F03PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:29:39 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03PrimaryGeneratorMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F03PrimaryGeneratorMessenger.hh,v 1.2 2006/06/29 18:29:41 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03RunAction.hh

    r1199 r1347  
    2626//
    2727// $Id: F03RunAction.hh,v 1.3 2006/06/29 18:29:43 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03RunMessenger.hh

    r1199 r1347  
    2727//
    2828// $Id: F03RunMessenger.hh,v 1.2 2006/06/29 18:29:45 gunter Exp $
    29 // GEANT4 tag $Name: HEAD $
     29// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3030//
    3131//

  • trunk/source/geometry/magneticfield/test/field03/include/F03StepCut.hh

    r1199 r1347  
    2626//
    2727// $Id: F03StepCut.hh,v 1.2 2006/06/29 18:29:47 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03SteppingAction.hh

    r1199 r1347  
    2626//
    2727// $Id: F03SteppingAction.hh,v 1.2 2006/06/29 18:29:49 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/include/F03SteppingMessenger.hh

    r1199 r1347  
    2626//
    2727// $Id: F03SteppingMessenger.hh,v 1.2 2006/06/29 18:29:51 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field03/include/F03SteppingVerbose.hh

    r1199 r1347  
    2626//
    2727// $Id: F03SteppingVerbose.hh,v 1.2 2006/06/29 18:29:53 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/magneticfield/test/field03/include/F03VisManager.hh

    r1199 r1347  
    2626//
    2727// $Id: F03VisManager.hh,v 1.2 2006/06/29 18:29:55 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03CalorHit.cc

    r1199 r1347  
    2626//
    2727// $Id: F03CalorHit.cc,v 1.2 2006/06/29 18:29:57 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03CalorimeterSD.cc

    r1199 r1347  
    2626//
    2727// $Id: F03CalorimeterSD.cc,v 1.2 2006/06/29 18:29:59 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03DetectorConstruction.cc

    r1199 r1347  
    2626//
    2727// $Id: F03DetectorConstruction.cc,v 1.2 2006/06/29 18:30:01 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03DetectorMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F03DetectorMessenger.cc,v 1.3 2006/06/29 18:30:03 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03ElectroMagneticField.cc

    r1199 r1347  
    2626//
    2727// $Id: F03ElectroMagneticField.cc,v 1.2 2006/06/29 18:30:05 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/magneticfield/test/field03/src/F03EventAction.cc

    r1199 r1347  
    2626//
    2727// $Id: F03EventAction.cc,v 1.4 2006/06/29 18:30:07 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03EventActionMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F03EventActionMessenger.cc,v 1.3 2006/06/29 18:30:10 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03FieldMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F03FieldMessenger.cc,v 1.3 2006/06/29 18:30:12 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03PhysicsList.cc

    r1199 r1347  
    2626//
    2727// $Id: F03PhysicsList.cc,v 1.3 2006/06/29 18:30:14 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field03/src/F03PhysicsListMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F03PhysicsListMessenger.cc,v 1.3 2006/06/29 18:30:17 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03PrimaryGeneratorAction.cc

    r1199 r1347  
    2626//
    2727// $Id: F03PrimaryGeneratorAction.cc,v 1.3 2006/06/29 18:30:19 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03PrimaryGeneratorMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F03PrimaryGeneratorMessenger.cc,v 1.3 2006/06/29 18:30:21 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03RunAction.cc

    r1199 r1347  
    2626//
    2727// $Id: F03RunAction.cc,v 1.4 2006/06/29 18:30:23 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03RunMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F03RunMessenger.cc,v 1.3 2006/06/29 18:30:25 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03StepCut.cc

    r1199 r1347  
    2626//
    2727// $Id: F03StepCut.cc,v 1.2 2006/06/29 18:30:27 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field03/src/F03SteppingAction.cc

    r1199 r1347  
    2626//
    2727// $Id: F03SteppingAction.cc,v 1.4 2006/06/29 18:30:29 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field03/src/F03SteppingMessenger.cc

    r1199 r1347  
    2626//
    2727// $Id: F03SteppingMessenger.cc,v 1.2 2006/06/29 18:30:31 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field03/src/F03SteppingVerbose.cc

    r1199 r1347  
    2626//
    2727// $Id: F03SteppingVerbose.cc,v 1.3 2006/06/29 18:30:33 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....

  • trunk/source/geometry/magneticfield/test/field03/src/F03VisManager.cc

    r1199 r1347  
    2626//
    2727// $Id: F03VisManager.cc,v 1.2 2006/06/29 18:30:35 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field06/exampleS5.cc

    r1231 r1347  
    2626//
    2727// $Id: exampleS5.cc,v 1.2 2007/05/02 14:59:26 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field06/include/MyExDetectorConstruction.hh

    r1199 r1347  
    2626//
    2727// $Id: MyExDetectorConstruction.hh,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field06/include/MyExEventAction.hh

    r1199 r1347  
    2626//
    2727// $Id: MyExEventAction.hh,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field06/include/MyExPhysicsList.hh

    r1199 r1347  
    2626//
    2727// $Id: MyExPhysicsList.hh,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field06/include/MyExPrimaryGeneratorAction.hh

    r1199 r1347  
    2626//
    2727// $Id: MyExPrimaryGeneratorAction.hh,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field06/include/MyExRunAction.hh

    r1199 r1347  
    2626//
    2727// $Id: MyExRunAction.hh,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field06/include/MyExSteppingAction.hh

    r1199 r1347  
    2626//
    2727// $Id: MyExSteppingAction.hh,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field06/src/MyExDetectorConstruction.cc

    r1199 r1347  
    2626//
    2727// $Id: MyExDetectorConstruction.cc,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field06/src/MyExEventAction.cc

    r1199 r1347  
    2626//
    2727// $Id: MyExEventAction.cc,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field06/src/MyExPhysicsList.cc

    r1199 r1347  
    2626//
    2727// $Id: MyExPhysicsList.cc,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/field06/src/MyExPrimaryGeneratorAction.cc

    r1199 r1347  
    2626//
    2727// $Id: MyExPrimaryGeneratorAction.cc,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/magneticfield/test/field06/src/MyExRunAction.cc

    r1199 r1347  
    2626//
    2727// $Id: MyExRunAction.cc,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/magneticfield/test/field06/src/MyExSteppingAction.cc

    r1199 r1347  
    2626//
    2727// $Id: MyExSteppingAction.cc,v 1.1 2006/11/28 15:19:42 tnikitin Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/magneticfield/test/test.sh

    r1199 r1347  
    55#
    66# $Id: test.sh,v 1.9 2006/11/14 15:11:28 japost Exp $
    7 # $Name: geant4-09-02-cand-01 $
     7# $Name: geant4-09-04-ref-00 $
    88#
    99

  • trunk/source/geometry/magneticfield/test/testProElectroMagField.cc

    r1231 r1347  
    2626//
    2727// $Id: testProElectroMagField.cc,v 1.16 2006/06/29 18:25:00 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/magneticfield/test/testProPerpSpin.cc

    r1231 r1347  
    2626//
    2727// $Id: testProPerpSpin.cc,v 1.17 2006/06/29 18:25:02 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/magneticfield/test/testPropagateMagField.cc

    r1231 r1347  
    2626//
    2727// $Id: testPropagateMagField.cc,v 1.33 2009/11/05 13:18:05 japost Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/magneticfield/test/testPropagateSpin.cc

    r1231 r1347  
    2626//
    2727// $Id: testPropagateSpin.cc,v 1.17 2006/06/29 18:25:06 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// 

  • trunk/source/geometry/management/GNUmakefile

    r1340 r1347  
    1 # $Id: GNUmakefile,v 1.6 2010/10/19 10:18:01 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.7 2010/10/27 07:34:32 gcosmo Exp $
    22# -----------------------------------------------------------------------
    33# GNUmakefile for geometry/management library.  Gabriele Cosmo, 16/11/96.
    … …  
    1212include $(G4INSTALL)/config/architecture.gmk
    1313
    14 CPPFLAGS += -DG4ALLOC_EXPORT
     14CPPFLAGS += -DG4GEOM_ALLOC_EXPORT
    1515CPPFLAGS += -I$(G4BASE)/graphics_reps/include \
    1616            -I$(G4BASE)/intercoms/include \

  • trunk/source/geometry/management/test/TestAssemblyVolume/include/TstVADetectorConstruction.hh

    r1316 r1347  
    2626//
    2727// $Id: TstVADetectorConstruction.hh,v 1.6 2006/06/29 18:34:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/include/TstVADetectorMessenger.hh

    r1316 r1347  
    2626//
    2727// $Id: TstVADetectorMessenger.hh,v 1.5 2006/06/29 18:34:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/include/TstVAEventAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TstVAEventAction.hh,v 1.5 2006/06/29 18:34:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/include/TstVAEventActionMessenger.hh

    r1316 r1347  
    2626//
    2727// $Id: TstVAEventActionMessenger.hh,v 1.5 2006/06/29 18:34:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/include/TstVAPhysicsList.hh

    r1316 r1347  
    2626//
    2727// $Id: TstVAPhysicsList.hh,v 1.5 2006/06/29 18:34:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/include/TstVAPrimaryGeneratorAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TstVAPrimaryGeneratorAction.hh,v 1.5 2006/06/29 18:34:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/include/TstVAPrimaryGeneratorMessenger.hh

    r1316 r1347  
    2626//
    2727// $Id: TstVAPrimaryGeneratorMessenger.hh,v 1.5 2006/06/29 18:34:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/include/TstVARunAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TstVARunAction.hh,v 1.5 2006/06/29 18:34:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/include/TstVASteppingAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TstVASteppingAction.hh,v 1.6 2006/06/29 18:34:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/src/TstVADetectorConstruction.cc

    r1316 r1347  
    2626//
    2727// $Id: TstVADetectorConstruction.cc,v 1.12 2006/06/29 18:34:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/src/TstVADetectorMessenger.cc

    r1316 r1347  
    2626//
    2727// $Id: TstVADetectorMessenger.cc,v 1.6 2006/06/29 18:34:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/src/TstVAEventAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TstVAEventAction.cc,v 1.8 2006/06/29 18:34:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/src/TstVAEventActionMessenger.cc

    r1316 r1347  
    2626//
    2727// $Id: TstVAEventActionMessenger.cc,v 1.6 2006/06/29 18:34:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/src/TstVAPhysicsList.cc

    r1316 r1347  
    2626//
    2727// $Id: TstVAPhysicsList.cc,v 1.6 2006/06/29 18:34:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/src/TstVAPrimaryGeneratorAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TstVAPrimaryGeneratorAction.cc,v 1.7 2006/06/29 18:34:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/src/TstVAPrimaryGeneratorMessenger.cc

    r1316 r1347  
    2626//
    2727// $Id: TstVAPrimaryGeneratorMessenger.cc,v 1.5 2006/06/29 18:34:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/src/TstVARunAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TstVARunAction.cc,v 1.5 2006/06/29 18:34:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/src/TstVASteppingAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TstVASteppingAction.cc,v 1.7 2006/06/29 18:34:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------

  • trunk/source/geometry/management/test/TestAssemblyVolume/testAssemblyVolume.cc

    r1316 r1347  
    2626//
    2727// $Id: testAssemblyVolume.cc,v 1.6 2006/06/29 18:34:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/management/test/TestDrawVox/include/TstDrawVox01SteppingAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TstDrawVox01SteppingAction.hh,v 1.5 2006/06/29 18:35:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/management/test/TestDrawVox/src/TstDrawVox01SteppingAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TstDrawVox01SteppingAction.cc,v 1.6 2006/06/29 18:35:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/management/test/TestDrawVox/testDrawVox.cc

    r1316 r1347  
    2626//
    2727// $Id: testDrawVox.cc,v 1.5 2006/06/29 18:34:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/GNUmakefile

    r831 r1347  
    1 # $Id: GNUmakefile,v 1.5 2007/11/23 13:30:47 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.7 2010/10/27 07:34:32 gcosmo Exp $
    22# --------------------------------------------------------------------
    33# GNUmakefile for geometry/volumes library.  Gabriele Cosmo, 16/11/96.

  • trunk/source/geometry/navigation/History

    r1315 r1347  
    1 $Id: History,v 1.139 2010/03/08 13:57:48 gcosmo Exp $
     1$Id: History,v 1.152 2010/12/15 13:47:10 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     20December 15th, 2010 - G.Cosmo (geomnav-V09-03-10)
     21-----------------------------
     22- Added inline method for creation of a touchable-history given a navigation
     23  history as argument. Required for clients like G4ScoreSplittingProcess, to
     24  avoid external symbols exporting on generation of DLLs.
     25
     26November 19th, 2010 - G.Cosmo (geomnav-V09-03-09)
     27-----------------------------
     28- Removed unused variable in G4RegularNavigation.
     29
     30November 15th, 2010 - G.Cosmo (geomnav-V09-03-08)
     31-----------------------------
     32- Restored trials for zero steps to 10 in G4Navigator, as originally.
     33
     34November 12th, 2010 - G.Cosmo (geomnav-V09-03-07)
     35-----------------------------
     36- Cleared compilation warnings for unused parameters; temporarily commented out.
     37
     38November 11th, 2010 - G.Cosmo (geomnav-V09-03-06)
     39-----------------------------
     40- Set trials for zero steps to 5 before activating push in G4Navigator;
     41  increased unit value to 100 times kCarTolerance to make push more effective.
     42
     43November 10th, 2010 - G.Cosmo (geomnav-V09-03-05)
     44-----------------------------
     45- Reduced trials for zero steps from 10 to 3 for activating tolerance push
     46  in G4Navigator.
     47- Added possibility to switch off push notifications in G4Navigator; also
     48  added related UI command.
     49
     50November 9th, 2010 - P.Arce
     51---------------------------
     52- Added new class G4PartialPhantomParameterisation allowing for envelopes
     53  of different types other than box for regular geometries, so that relaxing
     54  the restriction for voxels to completely fill the envelope container.
     55  Adapted G4PhantomParameterisation, G4RegularNavigation and G4Navigator
     56  accordingly.
     57
     58November 4th, 2010 - G.Cosmo
     59----------------------------
     60- Added new class G4NavigationLogger for "check-mode" verbosity. Reorganised
     61  verbosity formatting for voxel and normal navigation.
     62
     63November 3rd, 2010 - J.Apostolakis
     64----------------------------------
     65- Added prototype class G4VoxelSafety for computation of exact safety.
     66
     67September 6th, 2010 - G.Cosmo (geomnav-V09-03-04)
     68-----------------------------
     69- Added missing initialization for 'fNewSafety' and 'fTrueMinStep' in
     70  G4MultiNavigator constructor.
     71
     72September 3rd, 2010 - G.Cosmo (geomnav-V09-03-03)
     73-----------------------------
     74- Fixed typo in signature of ComputeStepSkippingEqualMaterials() in
     75  G4RegularNavigation.
     76
     77August 19th, 2010 - T.Nikitina (geomnav-V09-03-02)
     78------------------------------
     79- Fix in G4GeomTestSegment::FindSomePoints(), to address problem report #980.
     80
     81July 12th, 2010 - G.Cosmo (geomnav-V09-03-01)
     82-------------------------
     83- Fixed array out of bound error in G4MultipleNavigator and G4PathFinder
     84  constructors (J.Apostolakis).
     85- Fixed cout precision restoring in G4BrentLocator, G4PropagatorInField,
     86  G4SimpleLocator, G4VIntersectionLocator and G4MultiLevelLocator.
     87- Removed unused private data members in G4MultiLevelLocator.
     88- Replaced use of DBL_MAX for distances with kInfinity in G4MultiNavigator
     89  and G4Navigator internals.
     90- Exchanged conditions for initialization of members in G4TransportationManager
     91  constructor.
     92- Added dummy initialisation of members in constructors in G4MultiNavigator,
     93  G4ParameterisedNavigation, G4PathFinder, G4PhantomParameterisation,
     94  G4RegularNavigation.
    1995
    2096March 8th, 2010 - G.Cosmo (geomnav-V09-03-00)

  • trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.hh

    r1337 r1347  
    2626//
    2727// $Id: G4AuxiliaryNavServices.hh,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4AuxiliaryNavServices.icc

    r1337 r1347  
    2626//
    2727// $Id: G4AuxiliaryNavServices.icc,v 1.4 2007/05/22 07:48:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4BrentLocator.hh

    r1337 r1347  
    2626//
    2727// $Id: G4BrentLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Class G4BrentLocator

  • trunk/source/geometry/navigation/include/G4DrawVoxels.hh

    r1337 r1347  
    2626//
    2727// $Id: G4DrawVoxels.hh,v 1.3 2006/06/29 18:35:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4ErrorPropagationNavigator.hh

    r1337 r1347  
    2626//
    2727// $Id: G4ErrorPropagationNavigator.hh,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4GeomTestErrorList.hh

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestErrorList.hh,v 1.3 2006/06/29 18:35:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestLogger.hh

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestLogger.hh,v 1.3 2006/06/29 18:35:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestOverlapList.hh

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestOverlapList.hh,v 1.3 2006/06/29 18:35:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestOvershootList.hh

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestOvershootList.hh,v 1.3 2006/06/29 18:35:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestPoint.hh

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestPoint.hh,v 1.3 2006/06/29 18:35:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestSegment.hh

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestSegment.hh,v 1.4 2007/05/11 13:43:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestStreamLogger.hh

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestStreamLogger.hh,v 1.3 2006/06/29 18:35:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestVolPoint.hh

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestVolPoint.hh,v 1.3 2006/06/29 18:35:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeomTestVolume.hh

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestVolume.hh,v 1.3 2006/06/29 18:35:57 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4GeometryMessenger.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4GeometryMessenger.hh,v 1.4 2006/06/29 18:35:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4GeometryMessenger.hh,v 1.5 2010/11/10 14:06:40 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------
    … …  
    7878    void SetVerbosity(G4String newValue);
    7979    void SetCheckMode(G4String newValue);
     80    void SetPushFlag(G4String newValue);
    8081    void LineTest();
    8182    void RecursiveLineTest();
    … …  
    8889    G4UIcmdWith3VectorAndUnit *posCmd, *dirCmd;
    8990    G4UIcmdWith3Vector        *grzCmd, *cyzCmd;
    90     G4UIcmdWithABool          *chkCmd, *linCmd, *grdCmd, *cylCmd, *runCmd;
     91    G4UIcmdWithABool          *chkCmd, *pchkCmd, *linCmd,
     92                              *grdCmd, *cylCmd, *runCmd;
    9193    G4UIcmdWithoutParameter   *recCmd, *resCmd;
    9294    G4UIcmdWithADoubleAndUnit *tolCmd;

  • trunk/source/geometry/navigation/include/G4MultiLevelLocator.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4MultiLevelLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4MultiLevelLocator.hh,v 1.3 2010/07/13 15:59:42 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    7878     G4FieldTrack* ptrInterMedFT[max_depth+1];
    7979       // Used to store intermediate tracks values in case of too slow progress
    80 
    81      G4int maxNumberOfStepsForIntersection;
    82      G4int maxNumberOfCallsToReIntegration;
    83      G4int maxNumberOfCallsToReIntegration_depth;
    84        //  Counters for Statistics about Location and ReIntegrations
    8580};
    8681

  • trunk/source/geometry/navigation/include/G4MultiNavigator.hh

    r1337 r1347  
    2626//
    2727// $Id: G4MultiNavigator.hh,v 1.5 2008/10/24 14:00:03 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4Navigator.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4Navigator.hh,v 1.29 2009/11/30 11:59:52 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4Navigator.hh,v 1.34 2010/12/15 13:46:39 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    200200  inline G4GRSSolid* CreateGRSSolid() const;
    201201  inline G4TouchableHistory* CreateTouchableHistory() const;
     202  inline G4TouchableHistory* CreateTouchableHistory(const G4NavigationHistory*) const;
    202203    // `Touchable' creation methods: caller has deletion responsibility.
    203204
    … …  
    241242    // verifications and more strict correctness conditions.
    242243    // Is effective only with G4VERBOSE set.
    243   inline G4bool IsCheckModeActive() { return fCheck; }
     244  inline G4bool IsCheckModeActive() const;
     245  inline void   SetPushVerbosity(G4bool mode);
     246    // Set/unset verbosity for pushed tracks (default is true).
    244247
    245248  void PrintState() const;
    … …  
    263266    //         9 (ready to abandon), 10 (abandoned)
    264267
    265   // inline
    266268  void SetSavedState();
    267   // ( fValidExitNormal, fExitNormal, fExiting, fEntering,
    268   //   fBlockedPhysicalVolume, fBlockedReplicaNo, fLastStepWasZero);
    269   // inline
     269    // ( fValidExitNormal, fExitNormal, fExiting, fEntering,
     270    //   fBlockedPhysicalVolume, fBlockedReplicaNo, fLastStepWasZero);
    270271  void RestoreSavedState();
    271272    // Copy aspects of the state, to enable a non-state changing
    272273    //  call to ComputeStep
    273 
    274  public:  // with description
    275274
    276275  inline G4ThreeVector GetCurrentLocalCoordinate() const;
    … …  
    283282    // Compute+return the local->global translation/rotation of current volume.
    284283
     284  inline void EnableBestSafety( G4bool value= false );
     285    // Enable best-possible evaluation of isotropic safety
     286
    285287 protected:  // with description
     288
    286289  inline G4ThreeVector ComputeLocalPoint(const G4ThreeVector& rGlobPoint) const;
    287290    // Return position vector in local coordinate system, given a position
    … …  
    310313    // o Recompute transforms and/or solids of replicated/parameterised
    311314    //   volumes.
     315
     316 private:
     317
     318  void ComputeStepLog(const G4ThreeVector& pGlobalpoint,
     319                            G4double moveLenSq) const;
     320    // Log and checks for steps larger than the tolerance
    312321
    313322 protected:  // without description
    … …  
    434443  G4bool fCheck;
    435444    // Check-mode flag  [if true, more strict checks are performed].
    436   G4bool fPushed;
    437     // Push flag  [if true, means a stuck particle has been pushed].
     445  G4bool fPushed, fWarnPush;
     446    // Push flags  [if true, means a stuck particle has been pushed].
    438447
    439448  // Helpers/Utility classes

  • trunk/source/geometry/navigation/include/G4Navigator.icc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4Navigator.icc,v 1.15 2007/10/18 14:18:36 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4Navigator.icc,v 1.18 2010/12/15 13:46:39 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    308308
    309309// ********************************************************************
     310// CreateTouchableHistory(history)
     311//
     312// `Touchable' creation method: caller has deletion responsibility
     313// ********************************************************************
     314//
     315inline
     316G4TouchableHistory*
     317G4Navigator::CreateTouchableHistory(const G4NavigationHistory* history) const
     318{
     319  return new G4TouchableHistory(*history);
     320}
     321
     322// ********************************************************************
    310323// LocateGlobalPointAndUpdateTouchableHandle
    311324// ********************************************************************
    … …  
    450463
    451464// ********************************************************************
     465// IsCheckModeActive
     466// ********************************************************************
     467//
     468inline
     469G4bool G4Navigator::IsCheckModeActive() const
     470{
     471  return fCheck;
     472}
     473
     474// ********************************************************************
     475// SetPushVerbosity
     476// ********************************************************************
     477//
     478inline
     479void G4Navigator::SetPushVerbosity(G4bool mode)
     480{
     481  fWarnPush = mode;
     482}
     483
     484// ********************************************************************
    452485// SeverityOfZeroStepping
    453486//
    … …  
    485518  return severity;
    486519}
     520
     521// ********************************************************************
     522// EnableBestSafety
     523// ********************************************************************
     524//
     525inline void G4Navigator::EnableBestSafety( G4bool value )
     526{
     527  fvoxelNav.EnableBestSafety( value );
     528}

  • trunk/source/geometry/navigation/include/G4NormalNavigation.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4NormalNavigation.hh,v 1.4 2006/06/29 18:36:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4NormalNavigation.hh,v 1.6 2010/11/04 08:57:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4242#define G4NORMALNAVIGATION_HH
    4343
     44#include <iomanip>
     45
    4446#include "G4NavigationHistory.hh"
     47#include "G4NavigationLogger.hh"
    4548#include "G4VPhysicalVolume.hh"
    4649#include "G4LogicalVolume.hh"
    … …  
    8992                            const G4double pMaxLength=DBL_MAX );
    9093
    91     inline G4int GetVerboseLevel();
     94    inline G4int GetVerboseLevel() const;
    9295    inline void  SetVerboseLevel(G4int level);
    9396      // Get/Set Verbose(ness) level.
    … …  
    102105
    103106    G4bool fCheck;
    104     G4int  fVerbose;
     107    G4NavigationLogger* fLogger;
    105108};
    106109

  • trunk/source/geometry/navigation/include/G4NormalNavigation.icc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4NormalNavigation.icc,v 1.4 2006/06/29 18:36:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4NormalNavigation.icc,v 1.5 2010/11/04 08:57:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    9494}
    9595
     96// ********************************************************************
     97// GetVerboseLevel
     98// ********************************************************************
     99//
    96100inline
    97 G4int G4NormalNavigation::GetVerboseLevel()
     101G4int G4NormalNavigation::GetVerboseLevel() const
    98102{
    99   return fVerbose;
     103  return fLogger->GetVerboseLevel();
    100104}
    101105
     106// ********************************************************************
     107// SetVerboseLevel
     108// ********************************************************************
     109//
    102110inline
    103111void G4NormalNavigation::SetVerboseLevel(G4int level)
    104112{
    105   fVerbose = level;
     113  fLogger->SetVerboseLevel(level);
    106114}
    107115
     116// ********************************************************************
     117// CheckMode
     118// ********************************************************************
     119//
    108120inline
    109121void G4NormalNavigation::CheckMode(G4bool mode)

  • trunk/source/geometry/navigation/include/G4ParameterisedNavigation.hh

    r1337 r1347  
    2626//
    2727// $Id: G4ParameterisedNavigation.hh,v 1.6 2007/11/09 16:06:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4ParameterisedNavigation.icc

    r1337 r1347  
    2626//
    2727// $Id: G4ParameterisedNavigation.icc,v 1.7 2007/11/09 16:06:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4PathFinder.hh

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PathFinder.hh,v 1.34 2007/11/02 12:28:31 japost Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PathFinder.hh,v 1.35 2010/07/13 15:59:42 gcosmo Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// class G4PathFinder
    … …  
    259259   // State for Step numbers
    260260   G4int         fLastStepNo, fCurrentStepNo;
    261    G4bool        fParticleIsLooping;
    262261
    263262   G4int         fVerboseLevel;            // For debuging purposes
    264 
    265    G4int         fMax_loop_count;
    266      // Limit for the number of sub-steps taken in one call to ComputeStep
    267263
    268264   G4TransportationManager* fpTransportManager; // Cache for frequent use

  • trunk/source/geometry/navigation/include/G4PhantomParameterisation.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4PhantomParameterisation.hh,v 1.5 2009/05/19 18:27:03 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PhantomParameterisation.hh,v 1.6 2010/11/09 15:43:15 arce Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    117117      // voxels fill it completely.
    118118
    119     G4int GetReplicaNo( const G4ThreeVector& localPoint,
     119    virtual G4int GetReplicaNo( const G4ThreeVector& localPoint,
    120120                        const G4ThreeVector& localDir );
    121121      // Get the voxel number corresponding to the point in the container
    … …  
    167167      // Check that the copy number is within limits.
    168168
    169   private:
     169  protected:
    170170
    171171    G4double fVoxelHalfX,fVoxelHalfY,fVoxelHalfZ;

  • trunk/source/geometry/navigation/include/G4PhantomParameterisation.icc

    r1337 r1347  
    2626//
    2727// $Id: G4PhantomParameterisation.icc,v 1.1 2007/10/17 19:13:58 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//--------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4PropagatorInField.hh

    r1337 r1347  
    2626//
    2727// $Id: G4PropagatorInField.hh,v 1.19 2009/11/13 17:34:26 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4PropagatorInField.icc

    r1337 r1347  
    2626//
    2727// $Id: G4PropagatorInField.icc,v 1.16 2009/11/13 17:34:26 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4RegularNavigation.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4RegularNavigation.hh,v 1.2 2007/10/18 14:18:36 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4RegularNavigation.hh,v 1.4 2010/09/03 16:29:43 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    8787 
    8888    G4double ComputeStepSkippingEqualMaterials(
    89                           const G4ThreeVector localPoint,
     89                                G4ThreeVector& localPoint,
    9090                          const G4ThreeVector& globalDirection,
    9191                          const G4double currentProposedStepLength,
    … …  
    116116    // Set and Get methods
    117117
    118     void SetVerboseLevel(G4int level) { fVerbose = level; }
    119     void CheckMode(G4bool mode) { fCheck = mode; }
     118    void SetVerboseLevel(G4int level) { fverbose = level; }
     119    void CheckMode(G4bool mode) { fcheck = mode; }
    120120    void SetNormalNavigation( G4NormalNavigation* fnormnav )
    121121      { fnormalNav = fnormnav; }
    … …  
    123123  private:
    124124
    125     G4int fVerbose;
    126     G4bool fCheck;
     125    G4int fverbose;
     126    G4bool fcheck;
    127127
    128128    G4NormalNavigation* fnormalNav;

  • trunk/source/geometry/navigation/include/G4RegularNavigationHelper.hh

    r1337 r1347  
    2626//
    2727// $Id: G4RegularNavigationHelper.hh,v 1.1 2009/01/27 09:31:29 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/include/G4ReplicaNavigation.hh

    r1337 r1347  
    2626//
    2727// $Id: G4ReplicaNavigation.hh,v 1.6 2007/05/18 07:31:09 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4ReplicaNavigation.icc

    r1337 r1347  
    2626//
    2727// $Id: G4ReplicaNavigation.icc,v 1.5 2006/06/29 18:36:22 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4SafetyHelper.hh

    r1337 r1347  
    2626//
    2727// $Id: G4SafetyHelper.hh,v 1.7 2007/05/02 15:32:13 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4SimpleLocator.hh

    r1337 r1347  
    2626//
    2727// $Id: G4SimpleLocator.hh,v 1.2 2008/10/29 14:31:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4TransportationManager.hh

    r1337 r1347  
    2626//
    2727// $Id: G4TransportationManager.hh,v 1.12 2007/04/20 15:28:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4TransportationManager

  • trunk/source/geometry/navigation/include/G4TransportationManager.icc

    r1337 r1347  
    2626//
    2727// $Id: G4TransportationManager.icc,v 1.10 2007/04/20 15:28:37 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929// ------------------------------------------------------------
    3030//  GEANT 4  inlined function members implementation

  • trunk/source/geometry/navigation/include/G4VIntersectionLocator.hh

    r1337 r1347  
    2626//
    2727// $Id: G4VIntersectionLocator.hh,v 1.6 2009/11/30 11:39:15 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4VIntersectionLocator.icc

    r1337 r1347  
    2626//
    2727// $Id: G4VIntersectionLocator.icc,v 1.3 2008/11/14 18:26:35 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/include/G4VoxelNavigation.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4VoxelNavigation.hh,v 1.5 2007/05/11 13:43:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VoxelNavigation.hh,v 1.8 2010/11/04 12:13:30 japost Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4444#include "geomdefs.hh"
    4545#include "G4NavigationHistory.hh"
     46#include "G4NavigationLogger.hh"
    4647#include "G4AffineTransform.hh"
    4748#include "G4VPhysicalVolume.hh"
    … …  
    5152
    5253#include "G4BlockingList.hh"
     54
     55class G4VoxelSafety;
    5356
    5457// Required for inline implementation
    … …  
    98101
    99102    inline G4int GetVerboseLevel() const;
    100     inline void  SetVerboseLevel(G4int level);
     103    void  SetVerboseLevel(G4int level);
    101104      // Get/Set Verbose(ness) level.
    102105      // [if level>0 && G4VERBOSE, printout can occur]
    … …  
    107110      // Is effective only with G4VERBOSE set.
    108111
     112    inline void  EnableBestSafety( G4bool flag= false );
     113      // Enable best-possible evaluation of isotropic safety
     114
    109115  protected:
    110116
    … …  
    113119                            const G4ThreeVector& localDirection,
    114120                            const G4double currentStep );
     121
     122    G4SmartVoxelNode* VoxelLocateLight( G4SmartVoxelHeader* pHead,
     123                                        const G4ThreeVector& localPoint ) const;
     124
     125  private:  // Logging functions
     126
     127    void PreComputeStepLog  (const G4VPhysicalVolume* motherPhysical,
     128                                   G4double motherSafety,
     129                             const G4ThreeVector& localPoint);
     130    void AlongComputeStepLog(const G4VSolid* sampleSolid,
     131                             const G4ThreeVector& samplePoint,
     132                             const G4ThreeVector& sampleDirection,
     133                             const G4ThreeVector& localDirection,
     134                                   G4double sampleSafety,
     135                                   G4double sampleStep);
     136    void PostComputeStepLog (const G4VSolid* motherSolid,
     137                             const G4ThreeVector& localPoint,
     138                             const G4ThreeVector& localDirection,
     139                                   G4double motherStep,
     140                                   G4double motherSafety);
     141    void ComputeSafetyLog   (const G4VSolid* solid,
     142                             const G4ThreeVector& point,
     143                                   G4double safety,
     144                                   G4bool banner);
     145    inline void PrintDaughterLog (const G4VSolid* sampleSolid,
     146                                  const G4ThreeVector& samplePoint,
     147                                        G4double sampleSafety,
     148                                        G4double sampleStep);   
     149  protected:
    115150
    116151    G4BlockingList fBList;
    … …  
    147182    //
    148183
     184    G4VoxelSafety  *fpVoxelSafety;
     185    //  Helper object for Voxel Safety
     186
    149187    G4bool fCheck;
    150     G4int  fVerbose;
    151     G4double kCarTolerance;
     188    G4bool fBestSafety;
     189
     190    G4NavigationLogger* fLogger;
     191      // Verbosity logger
    152192};
    153193

  • trunk/source/geometry/navigation/include/G4VoxelNavigation.icc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4VoxelNavigation.icc,v 1.4 2006/06/29 18:36:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VoxelNavigation.icc,v 1.7 2010/11/04 17:38:17 japost Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    6767    }
    6868    else if ( targetNodeNo>=targetHeaderNoSlices )
    69          {
    70            targetNodeNo = targetHeaderNoSlices-1;
    71          }
     69    {
     70      targetNodeNo = targetHeaderNoSlices-1;
     71    }
    7272    // Stack info for stepping
    7373    //
    … …  
    169169G4int G4VoxelNavigation::GetVerboseLevel() const
    170170{
    171   return fVerbose;
    172 }
    173 
    174 // ********************************************************************
    175 // SetVerboseLevel
    176 // ********************************************************************
    177 //
    178 inline
    179 void  G4VoxelNavigation::SetVerboseLevel(G4int level)
    180 {
    181   fVerbose = level;
     171  return fLogger->GetVerboseLevel();
    182172}
    183173
    … …  
    191181  fCheck = mode;
    192182}
     183
     184// ********************************************************************
     185// EnableBestSafety
     186// ********************************************************************
     187//
     188inline
     189void  G4VoxelNavigation::EnableBestSafety(G4bool flag)
     190{
     191  fBestSafety = flag;
     192}

  • trunk/source/geometry/navigation/src/G4AuxiliaryNavServices.cc

    r1337 r1347  
    2525//
    2626// $Id: G4AuxiliaryNavServices.cc,v 1.3 2006/06/29 18:36:32 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/src/G4BrentLocator.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4BrentLocator.cc,v 1.8 2009/05/15 12:55:48 tnikitin Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4BrentLocator.cc,v 1.9 2010/07/13 15:59:42 gcosmo Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Class G4BrentLocator implementation
    … …  
    142142  G4bool restoredFullEndpoint = false;
    143143
     144  G4int oldprc;  // cout, cerr precision
    144145  G4int substep_no = 0;
    145146   
    … …  
    505506                   << GetEpsilonStepFor() << G4endl;
    506507          }
    507           G4cerr.precision(20);
     508          oldprc = G4cerr.precision(20);
    508509          G4cerr << " Point A (Curve start)     is " << CurveStartPointVelocity
    509510                 << G4endl;
    … …  
    529530                 << GetEpsilonStepFor() <<" DeltaInters= "
    530531                 << GetDeltaIntersectionFor() << G4endl;
     532          G4cerr.precision( oldprc );
    531533
    532534          G4Exception("G4BrentLocator::EstimateIntersectionPoint()",
    … …  
    728730                 -1.0, NewSafety, substep_no);
    729731    G4cout << G4endl;
    730     G4cout.precision( 10 );
     732    oldprc = G4cout.precision( 10 );
    731733    G4double done_len = CurrentA_PointVelocity.GetCurveLength();
    732734    G4double full_len = CurveEndPointVelocity.GetCurveLength();
    … …  
    736738           << " out of " << full_len << " required." << G4endl;
    737739    G4cout << "        Remaining length = " << full_len - done_len << G4endl;
     740    G4cout.precision( oldprc );
    738741
    739742    G4Exception("G4BrentLocator::EstimateIntersectionPoint()",
    … …  
    743746  else if( substep_no >= warn_substeps )
    744747  { 
    745     G4int oldprc= G4cout.precision( 10 );
     748    oldprc= G4cout.precision( 10 );
    746749    G4cout << "WARNING - G4BrentLocator::EstimateIntersectionPoint()"
    747750           << G4endl

  • trunk/source/geometry/navigation/src/G4DrawVoxels.cc

    r1337 r1347  
    2626//
    2727// $Id: G4DrawVoxels.cc,v 1.4 2006/06/29 18:36:34 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/src/G4ErrorPropagationNavigator.cc

    r1337 r1347  
    2626//
    2727// $Id: G4ErrorPropagationNavigator.cc,v 1.2 2008/10/24 14:00:03 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/src/G4GeomTestErrorList.cc

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestErrorList.cc,v 1.3 2006/06/29 18:36:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/src/G4GeomTestOverlapList.cc

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestOverlapList.cc,v 1.3 2006/06/29 18:36:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/src/G4GeomTestOvershootList.cc

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestOvershootList.cc,v 1.3 2006/06/29 18:36:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/src/G4GeomTestPoint.cc

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestPoint.cc,v 1.3 2006/06/29 18:36:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/src/G4GeomTestSegment.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4GeomTestSegment.cc,v 1.11 2007/11/16 09:39:14 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4GeomTestSegment.cc,v 1.13 2010/08/20 09:03:54 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------
    … …  
    275275  G4bool entering;
    276276  G4double vSurfN;
    277   // G4cout<<"Entering Find Some Points vSearch="<<vSearch<<" p="<<p<<G4endl;
    278   //
     277 
    279278  // Look for nearest intersection point in the specified
    280279  // direction and return if there isn't one
    … …  
    283282  switch(solid->Inside(p)) {
    284283    case kInside:
    285        dist = solid->DistanceToOut(p,vSearch);
    286        // G4cout<<"Inside DistToOut="<<dist<<G4endl;
     284      dist = solid->DistanceToOut(p,vSearch);
    287285      if (dist >= kInfinity) {
    288286        logger->SolidProblem( solid,
    … …  
    290288        return;
    291289      }
    292      
    293290      s += sign*dist;
    294291      entering = false;
    … …  
    296293    case kOutside:
    297294      dist = solid->DistanceToIn(p,vSearch);
    298       //G4cout<<"Outside DistToIn="<<dist<<G4endl;
    299295      if (dist >= kInfinity) return;
    300      
    301296      s += sign*dist;
    302297      entering = true;
    303298      break;
    304299    case kSurface:
    305       vSurfN=vSearch.dot(solid->SurfaceNormal(p));
    306       if(std::abs(vSurfN)<kCarTolerance)vSurfN=0;
     300      vSurfN=v.dot(solid->SurfaceNormal(p));
     301      if(std::fabs(vSurfN)<kCarTolerance)vSurfN=0;
    307302      entering = (vSurfN < 0);
    308       //G4cout<<"Surface SurfN="<<solid->SurfaceNormal(p)<<" v.dotN="<<vSurfN<<" entering="<<entering<<G4endl;
    309303      break;
    310304    default:
    … …  
    361355      //
    362356      points.push_back( G4GeomTestPoint( p, s, entering==forward ) );
    363       //G4cout<<"Add point p"<<p<<" s="<<s<<" entering="<<entering<<G4endl;
     357     
    364358    }
    365359   
    … …  
    369363    if (entering) {
    370364      dist = solid->DistanceToOut(p,vSearch);
    371       //G4cout<<"if entering distToOut="<<dist<<G4endl;
    372365      if (dist >= kInfinity) {
    373366        logger->SolidProblem( solid,
    … …  
    389382        return;
    390383      }
    391 
    392        if(std::abs(dist)<=kCarTolerance){
    393           G4double push = 1E-6;
    394           s += sign*push;
    395           p = p0 + s*v;
    396           EInside inside = solid->Inside(p);
    397           if (inside == kOutside) {
    398           entering = false;
    399           break;
    400         }
    401       }
    402 
    403      
     384           
    404385      entering = false;
    405386    }
    406387    else {
    407388      dist = solid->DistanceToIn(p,vSearch);
    408       //G4cout<<"if exiting distToIn="<<dist<<G4endl;
    409389      if (dist >= kInfinity) return;
    410390     

  • trunk/source/geometry/navigation/src/G4GeomTestStreamLogger.cc

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestStreamLogger.cc,v 1.3 2006/06/29 18:36:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/src/G4GeomTestVolPoint.cc

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestVolPoint.cc,v 1.3 2006/06/29 18:36:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/src/G4GeomTestVolume.cc

    r1337 r1347  
    2626//
    2727// $Id: G4GeomTestVolume.cc,v 1.6 2007/11/16 09:39:14 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/navigation/src/G4GeometryMessenger.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4GeometryMessenger.cc,v 1.5 2006/06/29 18:36:57 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4GeometryMessenger.cc,v 1.6 2010/11/10 14:06:40 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------
    … …  
    106106  chkCmd->AvailableForStates(G4State_Idle);
    107107
     108  pchkCmd = new G4UIcmdWithABool( "/geometry/navigator/push_notify", this );
     109  pchkCmd->SetGuidance( "Set navigator verbosity push notifications." );
     110  pchkCmd->SetGuidance( "This allows to disable/re-enable verbosity in" );
     111  pchkCmd->SetGuidance( "navigation, when tracks may get stuck and require" );
     112  pchkCmd->SetGuidance( "one artificial push along the direction by the" );
     113  pchkCmd->SetGuidance( "navigator. Notification is active by default." );
     114  pchkCmd->SetGuidance( "NOTE: this command has effect -only- if Geant4 has" );
     115  pchkCmd->SetGuidance( "      been installed with the G4VERBOSE flag set!" );
     116  pchkCmd->SetParameterName("pushFlag",true);
     117  pchkCmd->SetDefaultValue(true);
     118  pchkCmd->AvailableForStates(G4State_Idle);
     119
    108120  //
    109121  // Geometry verification test commands
    … …  
    244256  delete cyzCmd; delete cfzCmd; delete cfrCmd; delete cylCmd;
    245257  delete tolCmd;
    246   delete resCmd; delete verbCmd; delete chkCmd;
     258  delete resCmd; delete verbCmd; delete pchkCmd; delete chkCmd;
    247259  delete geodir; delete navdir; delete testdir;
    248260  delete tvolume; delete tlogger;
    … …  
    423435  G4Navigator* navigator = tmanager->GetNavigatorForTracking();
    424436  navigator->CheckMode(mode);
     437}
     438
     439//
     440// Set navigator verbosity for push notifications
     441//
     442void
     443G4GeometryMessenger::SetPushFlag(G4String input)
     444{
     445  G4bool mode = pchkCmd->GetNewBoolValue(input);
     446  G4Navigator* navigator = tmanager->GetNavigatorForTracking();
     447  navigator->SetPushVerbosity(mode);
    425448}
    426449

  • trunk/source/geometry/navigation/src/G4MultiLevelLocator.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4MultiLevelLocator.cc,v 1.5 2008/12/11 10:01:02 tnikitin Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4MultiLevelLocator.cc,v 1.6 2010/07/13 15:59:42 gcosmo Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Class G4MultiLevelLocator implementation
    … …  
    120120
    121121  G4int substep_no = 0;
    122    
     122
     123  G4int oldprc;   // cout/cerr precision settings
     124
    123125  // Limits for substep number
    124126  //
    … …  
    156158
    157159#ifdef G4DEBUG_FIELD
    158   static G4double tolerance= 1.0e-8;
     160  static const G4double tolerance = 1.0e-8 * mm;
    159161  G4ThreeVector  StartPosition= CurveStartPointVelocity.GetPosition();
    160   if( (TrialPoint - StartPosition).mag() < tolerance * mm )
     162  if( (TrialPoint - StartPosition).mag() < tolerance)
    161163  {
    162164     G4cerr << "WARNING - G4MultiLevelLocator::EstimateIntersectionPoint()"
    … …  
    455457                   << GetEpsilonStepFor() << G4endl;
    456458          }
    457           G4cerr.precision(20);
     459          oldprc = G4cerr.precision(20);
    458460          G4cerr << " Point A (Curve start)   is " << CurveStartPointVelocity
    459461                 << G4endl;
    … …  
    474476          G4cerr << "        Substep depth no= "<< substep_no_p  << " Depth= "
    475477                 << depth << G4endl;
     478          G4cerr.precision(oldprc);
    476479
    477480          G4Exception("G4MultiLevelLocator::EstimateIntersectionPoint()",
    … …  
    691694#endif
    692695
    693     G4cout.precision( 10 );
     696    oldprc = G4cout.precision( 10 );
    694697    G4double done_len = CurrentA_PointVelocity.GetCurveLength();
    695698    G4double full_len = CurveEndPointVelocity.GetCurveLength();
    … …  
    699702           << " out of " << full_len << " required." << G4endl;
    700703    G4cout << "        Remaining length = " << full_len - done_len << G4endl;
     704    G4cout.precision( oldprc );
    701705
    702706    G4Exception("G4MultiLevelLocator::EstimateIntersectionPoint()",
    … …  
    706710  else if( substep_no >= warn_substeps )
    707711  { 
    708     G4int oldprc= G4cout.precision( 10 );
     712    oldprc = G4cout.precision( 10 );
    709713    G4cout << "WARNING - G4MultiLevelLocator::EstimateIntersectionPoint()"
    710714           << G4endl

  • trunk/source/geometry/navigation/src/G4MultiNavigator.cc

    r921 r1347  
    2525//
    2626//
    27 // $Id: G4MultiNavigator.cc,v 1.8 2008/10/24 14:00:03 gcosmo Exp $
     27// $Id: G4MultiNavigator.cc,v 1.11 2010/09/06 09:49:15 gcosmo Exp $
    2828// GEANT4 tag $ Name:  $
    2929//
    … …  
    4848//
    4949G4MultiNavigator::G4MultiNavigator()
    50   : G4Navigator()
     50  : G4Navigator(), fLastMassWorld(0)
    5151{
    5252  fNoActiveNavigators= 0;
    53   G4ThreeVector Big3Vector( DBL_MAX, DBL_MAX, DBL_MAX );
     53  G4ThreeVector Big3Vector( kInfinity, kInfinity, kInfinity );
    5454  fLastLocatedPosition = Big3Vector;
    5555  fSafetyLocation  = Big3Vector;
    … …  
    5858  fMinSafety_PreStepPt=  -1.0;
    5959  fMinSafety_atSafLocation= -1.0;
    60   fMinSafety= -DBL_MAX; 
    61   fMinStep=   -DBL_MAX; 
    62 
    63   for(register int num=0; num<= fMaxNav; ++num )
     60  fMinSafety= -kInfinity; 
     61  fTrueMinStep= fMinStep= -kInfinity; 
     62
     63  for(register int num=0; num< fMaxNav; ++num )
    6464  {
    6565    fpNavigator[num] =  0;   
    6666    fLimitTruth[num] = false;
    6767    fLimitedStep[num] = kUndefLimited;
    68     fCurrentStepSize[num] = -1.0;
     68    fCurrentStepSize[num] = fNewSafety[num] = -1.0;
    6969    fLocatedVolume[num] = 0;
    7070  }
    … …  
    9494{
    9595  G4double safety= 0.0, step=0.0;
    96   G4double minSafety= DBL_MAX, minStep= DBL_MAX;
     96  G4double minSafety= kInfinity, minStep= kInfinity;
    9797
    9898#ifdef G4DEBUG_NAVIGATION
    … …  
    115115  for( register int num=0; num< fNoActiveNavigators; ++pNavigatorIter,++num )
    116116  {
    117      safety= DBL_MAX;
     117     safety= kInfinity;
    118118
    119119     step= (*pNavigatorIter)->ComputeStep( initialPosition,
    … …  
    189189                                   ELimited &limitedStep)
    190190{
    191   G4int navigatorNo=-1;
    192 
    193   if( navigatorId <= fNoActiveNavigators )
    194   {
    195      navigatorNo= navigatorId;
    196   }
    197   else
     191  if( navigatorId > fNoActiveNavigators )
    198192  {
    199193     G4cerr << "ERROR - G4MultiNavigator::ObtainFinalStep()"
    … …  
    206200
    207201  // Prepare the information to return
    208   pNewSafety  = fNewSafety[ navigatorNo ];
    209   limitedStep = fLimitedStep[ navigatorNo ];
     202  //
     203  pNewSafety  = fNewSafety[ navigatorId ];
     204  limitedStep = fLimitedStep[ navigatorId ];
    210205  minStep= fMinStep;
    211206
    212   // if( (minStep==kInfinity) || (fVerbose > 1) ){
    213 #ifdef G4DEBUG_NAVIGATION
    214   if( fVerbose > 1 ){
    215      G4cout << " G4MultiNavigator::ComputeStep returns " << fCurrentStepSize[ navigatorNo ]
    216             << " for Navigator " << navigatorNo << " Limited step = " << limitedStep
     207#ifdef G4DEBUG_NAVIGATION
     208  if( fVerbose > 1 )
     209  {
     210     G4cout << " G4MultiNavigator::ComputeStep returns "
     211            << fCurrentStepSize[ navigatorId ]
     212            << " for Navigator " << navigatorId
     213            << " Limited step = " << limitedStep
    217214            << " Safety(mm) = " << pNewSafety / mm << G4endl;
    218215  }
    219216#endif
    220217
    221   return fCurrentStepSize[ navigatorNo ];
     218  return fCurrentStepSize[ navigatorId ];
    222219}
    223220
    … …  
    428425    // Recompute safety for the relevant point
    429426
    430     G4double minSafety = DBL_MAX, safety = DBL_MAX;
     427    G4double minSafety = kInfinity, safety = kInfinity;
    431428 
    432429    std::vector<G4Navigator*>::iterator pNavigatorIter;

  • trunk/source/geometry/navigation/src/G4Navigator.cc

    r1058 r1347  
    2525//
    2626//
    27 // $Id: G4Navigator.cc,v 1.39 2009/05/08 06:47:32 tnikitin Exp $
     27// $Id: G4Navigator.cc,v 1.46 2010/11/15 14:03:27 gcosmo Exp $
    2828// GEANT4 tag $ Name:  $
    2929//
    … …  
    4747G4Navigator::G4Navigator()
    4848  : fWasLimitedByGeometry(false), fVerbose(0),
    49     fTopPhysical(0), fCheck(false), fPushed(false)
     49    fTopPhysical(0), fCheck(false), fPushed(false), fWarnPush(true)
    5050{
    5151  fActive= false;
    … …  
    128128
    129129#ifdef G4VERBOSE
    130   G4int oldcoutPrec = G4cout.precision(8);
    131130  if( fVerbose > 2 )
    132131  {
     132    G4int oldcoutPrec = G4cout.precision(8);
    133133    G4cout << "*** G4Navigator::LocateGlobalPointAndSetup: ***" << G4endl;
    134134    G4cout << "    Called with arguments: " << G4endl
    … …  
    140140      PrintState();
    141141    }
     142    G4cout.precision(oldcoutPrec);
    142143  }
    143144#endif
    … …  
    195196              break;
    196197            case kParameterised:
    197               if( fBlockedPhysicalVolume->GetRegularStructureId() != 1 )
     198              if( fBlockedPhysicalVolume->GetRegularStructureId() == 0 )
    198199              {
    199200                G4VSolid *pSolid;
    … …  
    360361    //
    361362    targetPhysical = fHistory.GetTopVolume();
     363    if (!targetPhysical) { break; }
    362364    targetLogical = targetPhysical->GetLogicalVolume();
    363365    switch( CharacteriseDaughters(targetLogical) )
    … …  
    452454  if( fVerbose == 4 )
    453455  {
    454     G4cout.precision(6);
     456    G4int oldcoutPrec = G4cout.precision(8);
    455457    G4String curPhysVol_Name("None");
    456     if (targetPhysical!=0)
    457     {
    458       curPhysVol_Name = targetPhysical->GetName();
    459     }
     458    if (targetPhysical)  { curPhysVol_Name = targetPhysical->GetName(); }
    460459    G4cout << "    Return value = new volume = " << curPhysVol_Name << G4endl;
    461460    G4cout << "    ----- Upon exiting:" << G4endl;
    … …  
    465464    G4cout << "    History = " << G4endl << fHistory << G4endl << G4endl;
    466465#endif
    467   }
    468   G4cout.precision(oldcoutPrec);
     466    G4cout.precision(oldcoutPrec);
     467  }
    469468#endif
    470469
    … …  
    627626{
    628627  G4ThreeVector localDirection = ComputeLocalAxis(pDirection);
    629   G4double Step = DBL_MAX;
     628  G4double Step = kInfinity;
    630629  G4VPhysicalVolume  *motherPhysical = fHistory.GetTopVolume();
    631630  G4LogicalVolume *motherLogical = motherPhysical->GetLogicalVolume();
    … …  
    635634
    636635#ifdef G4VERBOSE
    637   G4int oldcoutPrec= G4cout.precision(8);
    638   G4int oldcerrPrec= G4cerr.precision(10);
    639636  if( fVerbose > 0 )
    640637  {
    … …  
    654651#endif
    655652  }
    656 
    657   static G4double fAccuracyForWarning   = kCarTolerance,
    658                   fAccuracyForException = 1000*kCarTolerance;
    659653#endif
    660654
    … …  
    670664    {
    671665#ifdef G4VERBOSE
    672       //  The following checks only make sense if the move is larger
    673       //  than the tolerance.
    674       //
    675       G4ThreeVector OriginalGlobalpoint =
    676                     fHistory.GetTopTransform().Inverse().
    677                     TransformPoint(fLastLocatedPointLocal);
    678 
    679       G4double shiftOriginSafSq = (fPreviousSftOrigin-pGlobalpoint).mag2();
    680 
    681       // Check that the starting point of this step is
    682       // within the isotropic safety sphere of the last point
    683       // to a accuracy/precision  given by fAccuracyForWarning.
    684       //   If so give warning.
    685       //   If it fails by more than fAccuracyForException exit with error.
    686       //
    687       if( shiftOriginSafSq >= sqr(fPreviousSafety) )
    688       {
    689         G4double shiftOrigin = std::sqrt(shiftOriginSafSq);
    690         G4double diffShiftSaf = shiftOrigin - fPreviousSafety;
    691 
    692         if( diffShiftSaf > fAccuracyForWarning )
    693         {
    694           G4Exception("G4Navigator::ComputeStep()",
    695                       "UnexpectedPositionShift", JustWarning,
    696                       "Accuracy ERROR or slightly inaccurate position shift.");
    697           G4cerr << "     The Step's starting point has moved "
    698                  << std::sqrt(moveLenSq)/mm << " mm " << G4endl
    699                  << "     since the last call to a Locate method." << G4endl;
    700           G4cerr << "     This has resulted in moving "
    701                  << shiftOrigin/mm << " mm "
    702                  << " from the last point at which the safety "
    703                  << "     was calculated " << G4endl;
    704           G4cerr << "     which is more than the computed safety= "
    705                  << fPreviousSafety/mm << " mm  at that point." << G4endl;
    706           G4cerr << "     This difference is "
    707                  << diffShiftSaf/mm << " mm." << G4endl
    708                  << "     The tolerated accuracy is "
    709                  << fAccuracyForException/mm << " mm." << G4endl;
    710 
    711           static G4int warnNow = 0;
    712           if( ((++warnNow % 100) == 1) )
    713           {
    714             G4cerr << "  This problem can be due to either " << G4endl;
    715             G4cerr << "    - a process that has proposed a displacement"
    716                    << " larger than the current safety , or" << G4endl;
    717             G4cerr << "    - inaccuracy in the computation of the safety"
    718                    << G4endl;
    719             G4cerr << "  We suggest that you " << G4endl
    720                    << "   - find i) what particle is being tracked, and "
    721                    << " ii) through what part of your geometry " << G4endl
    722                    << "      for example by re-running this event with "
    723                    << G4endl
    724                    << "         /tracking/verbose 1 "  << G4endl
    725                    << "    - check which processes you declare for"
    726                    << " this particle (and look at non-standard ones)"
    727                    << G4endl
    728                    << "   - in case, create a detailed logfile"
    729                    << " of this event using:" << G4endl
    730                    << "         /tracking/verbose 6 "
    731                    << G4endl;
    732           }
    733         }
    734 #ifdef G4DEBUG_NAVIGATION
    735         else
    736         {
    737           G4cerr << "WARNING - G4Navigator::ComputeStep()" << G4endl
    738                  << "          The Step's starting point has moved "
    739                  << std::sqrt(moveLenSq) << "," << G4endl
    740                  << "          which has taken it to the limit of"
    741                  << " the current safety. " << G4endl;
    742         }
    743 #endif
    744       }
    745       G4double safetyPlus = fPreviousSafety + fAccuracyForException;
    746       if ( shiftOriginSafSq > sqr(safetyPlus) )
    747       {
    748         G4cerr << "ERROR - G4Navigator::ComputeStep()" << G4endl
    749                << "        Position has shifted considerably without"
    750                << " notifying the navigator !" << G4endl
    751                << "        Tolerated safety: " << safetyPlus << G4endl
    752                << "        Computed shift  : " << shiftOriginSafSq << G4endl;
    753         G4Exception("G4Navigator::ComputeStep()",
    754                     "SignificantPositionShift", JustWarning,
    755                     "May lead to a crash or unreliable results.");
    756       }
    757 #endif  // end G4VERBOSE
    758 
     666      ComputeStepLog(pGlobalpoint, moveLenSq);
     667#endif
    759668      // Relocate the point within the same volume
    760669      //
    … …  
    784693        else
    785694        {
    786           if( motherPhysical->GetRegularStructureId() != 1 )
     695          if( motherPhysical->GetRegularStructureId() == 0 )
    787696          {
    788697            Step = fnormalNav.ComputeStep(fLastLocatedPointLocal,
    … …  
    811720            // reset the history topvolume to world.
    812721            //
    813             if(fHistory.GetTopVolume()->GetRegularStructureId() != 1 )
     722            if(fHistory.GetTopVolume()->GetRegularStructureId() == 0 )
    814723            {
    815724              G4Exception("G4Navigator::ComputeStep()",
    … …  
    944853       // Act to recover this stuck track. Pushing it along direction
    945854       //
    946        Step += 0.9*kCarTolerance;
     855       Step += 100*kCarTolerance;
    947856#ifdef G4VERBOSE
    948        if (!fPushed)
     857       if ((!fPushed) && (fWarnPush))
    949858       {
    950859         G4cerr << "WARNING - G4Navigator::ComputeStep()" << G4endl
    … …  
    1048957    G4cout << "    Safety = " << pNewSafety << G4endl;
    1049958  }
    1050   G4cout.precision(oldcoutPrec);
    1051   G4cerr.precision(oldcerrPrec);
    1052959#endif
    1053960
    … …  
    11121019  fBlockedReplicaNo      = -1;
    11131020
    1114   fLastLocatedPointLocal = G4ThreeVector( DBL_MAX, -DBL_MAX, 0.0 );
     1021  fLastLocatedPointLocal = G4ThreeVector( kInfinity, -kInfinity, 0.0 );
    11151022  fLocatedOutsideWorld   = false;
    11161023}
    … …  
    11321039  G4VPVParameterisation *pParam;
    11331040
    1134   mother = fHistory.GetVolume(0);
    11351041  for ( i=1; i<=cdepth; i++ )
    11361042  {
    … …  
    14081314
    14091315// ********************************************************************
     1316// ComputeStepLog
     1317// ********************************************************************
     1318//
     1319void G4Navigator::ComputeStepLog(const G4ThreeVector& pGlobalpoint,
     1320                                       G4double moveLenSq) const
     1321{
     1322  //  The following checks only make sense if the move is larger
     1323  //  than the tolerance.
     1324
     1325  static const G4double fAccuracyForWarning   = kCarTolerance,
     1326                        fAccuracyForException = 1000*kCarTolerance;
     1327
     1328  G4ThreeVector OriginalGlobalpoint = fHistory.GetTopTransform().Inverse().
     1329                                      TransformPoint(fLastLocatedPointLocal);
     1330
     1331  G4double shiftOriginSafSq = (fPreviousSftOrigin-pGlobalpoint).mag2();
     1332
     1333  // Check that the starting point of this step is
     1334  // within the isotropic safety sphere of the last point
     1335  // to a accuracy/precision  given by fAccuracyForWarning.
     1336  //   If so give warning.
     1337  //   If it fails by more than fAccuracyForException exit with error.
     1338  //
     1339  if( shiftOriginSafSq >= sqr(fPreviousSafety) )
     1340  {
     1341    G4double shiftOrigin = std::sqrt(shiftOriginSafSq);
     1342    G4double diffShiftSaf = shiftOrigin - fPreviousSafety;
     1343
     1344    if( diffShiftSaf > fAccuracyForWarning )
     1345    {
     1346      G4int oldcoutPrec= G4cout.precision(8);
     1347      G4int oldcerrPrec= G4cerr.precision(10);
     1348      G4Exception("G4Navigator::ComputeStep()",
     1349                  "UnexpectedPositionShift", JustWarning,
     1350                  "Accuracy error or slightly inaccurate position shift.");
     1351      G4cerr << "     The Step's starting point has moved "
     1352             << std::sqrt(moveLenSq)/mm << " mm " << G4endl
     1353             << "     since the last call to a Locate method." << G4endl;
     1354      G4cerr << "     This has resulted in moving "
     1355             << shiftOrigin/mm << " mm "
     1356             << " from the last point at which the safety "
     1357             << "     was calculated " << G4endl;
     1358      G4cerr << "     which is more than the computed safety= "
     1359             << fPreviousSafety/mm << " mm  at that point." << G4endl;
     1360      G4cerr << "     This difference is "
     1361             << diffShiftSaf/mm << " mm." << G4endl
     1362             << "     The tolerated accuracy is "
     1363             << fAccuracyForException/mm << " mm." << G4endl;
     1364
     1365      static G4int warnNow = 0;
     1366      if( ((++warnNow % 100) == 1) )
     1367      {
     1368        G4cerr << "  This problem can be due to either " << G4endl;
     1369        G4cerr << "    - a process that has proposed a displacement"
     1370               << " larger than the current safety , or" << G4endl;
     1371        G4cerr << "    - inaccuracy in the computation of the safety"
     1372                   << G4endl;
     1373        G4cerr << "  We suggest that you " << G4endl
     1374               << "   - find i) what particle is being tracked, and "
     1375               << " ii) through what part of your geometry " << G4endl
     1376               << "      for example by re-running this event with "
     1377               << G4endl
     1378               << "         /tracking/verbose 1 "  << G4endl
     1379               << "    - check which processes you declare for"
     1380               << " this particle (and look at non-standard ones)"
     1381               << G4endl
     1382               << "   - in case, create a detailed logfile"
     1383               << " of this event using:" << G4endl
     1384               << "         /tracking/verbose 6 "
     1385               << G4endl;
     1386      }
     1387      G4cout.precision(oldcoutPrec);
     1388      G4cerr.precision(oldcerrPrec);
     1389    }
     1390#ifdef G4DEBUG_NAVIGATION
     1391    else
     1392    {
     1393      G4cerr << "WARNING - G4Navigator::ComputeStep()" << G4endl
     1394             << "          The Step's starting point has moved "
     1395             << std::sqrt(moveLenSq) << "," << G4endl
     1396             << "          which has taken it to the limit of"
     1397             << " the current safety. " << G4endl;
     1398    }
     1399#endif
     1400  }
     1401  G4double safetyPlus = fPreviousSafety + fAccuracyForException;
     1402  if ( shiftOriginSafSq > sqr(safetyPlus) )
     1403  {
     1404    G4cerr << "ERROR - G4Navigator::ComputeStep()" << G4endl
     1405           << "        Position has shifted considerably without"
     1406           << " notifying the navigator !" << G4endl
     1407           << "        Tolerated safety: " << safetyPlus << G4endl
     1408           << "        Computed shift  : " << shiftOriginSafSq << G4endl;
     1409    G4Exception("G4Navigator::ComputeStep()",
     1410                "SignificantPositionShift", JustWarning,
     1411                "May lead to a crash or unreliable results.");
     1412  }
     1413}
     1414
     1415// ********************************************************************
    14101416// Operator <<
    14111417// ********************************************************************

  • trunk/source/geometry/navigation/src/G4NormalNavigation.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4NormalNavigation.cc,v 1.9 2007/05/11 13:43:59 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4NormalNavigation.cc,v 1.11 2010/11/04 08:57:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    3838#include "G4AffineTransform.hh"
    3939
    40 #include <iomanip>
    41 
    4240// ********************************************************************
    4341// Constructor
    … …  
    4543//
    4644G4NormalNavigation::G4NormalNavigation()
    47   : fCheck(false), fVerbose(0)
    48 {
     45  : fCheck(false)
     46{
     47  fLogger = new G4NavigationLogger("G4NormalNavigation");
    4948}
    5049
    … …  
    5453//
    5554G4NormalNavigation::~G4NormalNavigation()
    56 {;}
     55{
     56  delete fLogger;
     57}
    5758
    5859// ********************************************************************
    … …  
    9091 
    9192#ifdef G4VERBOSE
    92   static G4int precVerf= 20;  // Precision
    9393  if ( fCheck )
    9494  {
    95     if( fVerbose == 1 )
    96     {
    97       G4cout << "*** G4NormalNavigation::ComputeStep(): ***" << G4endl
    98              << "    Invoked DistanceToOut(p) for mother solid: "
    99              << motherSolid->GetName()
    100              << ". Solid replied: " << motherSafety << G4endl
    101              << "    For local point p: " << localPoint << G4endl
    102              << "    To be considered as 'mother safety'." << G4endl;
    103     }
    104     if ( motherSafety < 0.0 )
    105     {
    106       G4cerr << "ERROR - G4NormalNavigation::ComputeStep()" << G4endl
    107              << "        Current solid " << motherSolid->GetName()
    108              << " gave negative safety: " << motherSafety << G4endl
    109              << "        for the current (local) point " << localPoint
    110              << G4endl;
    111       motherSolid->DumpInfo();
    112       G4Exception("G4NormalNavigation::ComputeStep()",
    113                   "NegativeSafetyMotherVol", FatalException,
    114                   "Negative Safety In Voxel Navigation !" );
    115     }
    116     if( motherSolid->Inside(localPoint)==kOutside )
    117     {
    118       G4cout << "WARNING - G4NormalNavigation::ComputeStep()" << G4endl
    119              << "          Point " << localPoint
    120              << " is outside current volume " << motherPhysical->GetName()
    121              << G4endl;
    122       G4double estDistToSolid= motherSolid->DistanceToIn(localPoint);
    123       G4cout << "          Estimated isotropic distance to solid (distToIn)= "
    124              << estDistToSolid << G4endl;
    125       if( estDistToSolid > 100.0 * motherSolid->GetTolerance() )
    126       {
    127         motherSolid->DumpInfo();
    128         G4Exception("G4NormalNavigation::ComputeStep()",
    129                     "FarOutsideCurrentVolume", FatalException,
    130                     "Point is far outside Current Volume !" );
    131       }
    132       else
    133         G4Exception("G4NormalNavigation::ComputeStep()", "OutsideCurrentVolume",
    134                     JustWarning, "Point is a little outside Current Volume.");
    135     }
    136 
    137     // Verification / verbosity
    138     //
    139     if ( fVerbose > 1 )
    140     {
    141       G4int oldprec = G4cout.precision(precVerf);
    142       G4cout << " G4NormalNavigation::ComputeStep()"
    143              << " - Information on mother / key daughters ..." << G4endl;
    144       G4cout << " Type   " << std::setw(12) << "Solid-Name"   << " "
    145              << std::setw(3*(6+precVerf))   << " local point" << " "
    146              << std::setw(4+precVerf)       << "solid-Safety" << " "
    147              << std::setw(4+precVerf)       << "solid-Step"   << " "
    148              << std::setw(17)               << "distance Method "
    149              << std::setw(3*(6+precVerf))   << " local direction" << " "
    150              << G4endl;
    151       G4cout << " Mother " << std::setw(12) << motherSolid->GetName() << " "
    152              << std::setw(4+precVerf)       << localPoint   << " "
    153              << std::setw(4+precVerf)       << motherSafety << " "
    154              << G4endl;
    155       G4cout.precision(oldprec);
    156     }
    157 
     95    fLogger->PreComputeStepLog(motherPhysical, motherSafety, localPoint);
    15896  }
    15997#endif
    … …  
    193131      const G4double sampleSafety =
    194132              sampleSolid->DistanceToIn(samplePoint);
     133#ifdef G4VERBOSE
     134      if( fCheck )
     135      {
     136        fLogger->PrintDaughterLog(sampleSolid, samplePoint, sampleSafety, 0);
     137      }
     138#endif
    195139      if ( sampleSafety<ourSafety )
    196140      {
    … …  
    202146        const G4double sampleStep =
    203147                sampleSolid->DistanceToIn(samplePoint,sampleDirection);
    204 #ifdef G4VERBOSE
    205         if(( fCheck ) && ( fVerbose == 1 ))
     148
     149#ifdef G4VERBOSE
     150        if( fCheck )
    206151        {
    207           G4cout << "*** G4NormalNavigation::ComputeStep(): ***" << G4endl
    208                  << "    Invoked DistanceToIn(p,v) for daughter solid: "
    209                  << sampleSolid->GetName()
    210                  << ". Solid replied: " << sampleStep << G4endl
    211                  << "    For local point p: " << samplePoint << G4endl
    212                  << "    Direction v: " << sampleDirection
    213                  << ", to be considered as 'daughter step'." << G4endl;
     152          fLogger->PrintDaughterLog(sampleSolid, samplePoint,
     153                                    sampleSafety, sampleStep);
    214154        }
    215155#endif
    … …  
    221161          *pBlockedPhysical = samplePhysical;
    222162          blockedReplicaNo  = -1;
    223 
    224 #ifdef G4VERBOSE
    225           // Check to see that the resulting point is indeed in/on volume.
    226           // This check could eventually be made only for successful candidate.
    227 
    228           if ( ( fCheck ) && ( sampleStep < kInfinity ) )
     163#ifdef G4VERBOSE
     164          if( fCheck )
    229165          {
    230             G4ThreeVector intersectionPoint;
    231             intersectionPoint= samplePoint + sampleStep * sampleDirection;
    232             EInside insideIntPt= sampleSolid->Inside(intersectionPoint);
    233             G4String solidResponse = "-kInside-";
    234             if (insideIntPt == kOutside)
    235               solidResponse = "-kOutside-";
    236             else if (insideIntPt == kSurface)
    237               solidResponse = "-kSurface-";
    238             if( fVerbose == 1 )
    239             {
    240               G4cout << "*** G4NormalNavigation::ComputeStep(): ***" << G4endl
    241                      << "    Invoked Inside() for solid: "
    242                      << sampleSolid->GetName()
    243                      << ". Solid replied: " << solidResponse << G4endl
    244                      << "    For point p: " << intersectionPoint
    245                      << ", considered as 'intersection' point." << G4endl;
    246             }
    247             if ( insideIntPt != kSurface )
    248             {
    249               G4int oldcoutPrec = G4cout.precision(16);
    250               G4cout << "WARNING - G4NormalNavigation::ComputeStep()" << G4endl
    251                      << "          Inaccurate DistanceToIn for solid "
    252                      << sampleSolid->GetName() << G4endl;
    253               G4cout << "          Solid gave DistanceToIn = " << sampleStep
    254                      << " yet returns " << solidResponse
    255                      << " for this point !" << G4endl;
    256               G4cout << "          Point = " << intersectionPoint << G4endl;
    257               if ( insideIntPt != kInside )
    258                 G4cout << "        DistanceToIn(p) = "
    259                        << sampleSolid->DistanceToIn(intersectionPoint)
    260                        << G4endl;
    261               if ( insideIntPt != kOutside )
    262                 G4cout << "        DistanceToOut(p) = "
    263                        << sampleSolid->DistanceToOut(intersectionPoint)
    264                        << G4endl;
    265               G4Exception("G4NormalNavigation::ComputeStep()",
    266                           "InaccurateDistanceToIn", JustWarning,
    267                           "Navigator gets conflicting response from Solid.");
    268               G4cout.precision(oldcoutPrec);
    269             }
    270           }
    271 
    272           // Verification / verbosity
    273           //
    274           if ( fVerbose > 1 )
    275           {
    276             G4int oldprec = G4cout.precision(precVerf);
    277             G4cout << " Daught "
    278                    << std::setw(12)         << sampleSolid->GetName() << " "
    279                    << std::setw(4+precVerf) << samplePoint  << " "
    280                    << std::setw(4+precVerf) << sampleSafety << " "
    281                    << std::setw(4+precVerf) << sampleStep   << " "
    282                    << std::setw(16)         << "distanceToIn" << " "
    283                    << std::setw(4+precVerf) << localDirection << " "
    284                    << G4endl;
    285             G4cout.precision(oldprec);
     166            fLogger->AlongComputeStepLog(sampleSolid, samplePoint,
     167              sampleDirection, localDirection, sampleSafety, sampleStep);
    286168          }
    287169#endif
    … …  
    313195      if ( fCheck )
    314196      {
    315         if( fVerbose == 1 )
    316         {
    317           G4cout << "*** G4NormalNavigation::ComputeStep(): ***" << G4endl
    318                  << "    Invoked DistanceToOut(p,v,...) for mother solid: "
    319                  << motherSolid->GetName()
    320                  << ". Solid replied: " << motherStep << G4endl
    321                  << "    For local point p: " << localPoint << G4endl
    322                  << "    Direction v: " << localDirection
    323                  << ", to be considered as 'mother step'." << G4endl;
    324         }
    325         if( ( motherStep < 0.0 ) || ( motherStep >= kInfinity) )
    326         {
    327           G4cerr << "ERROR - G4NormalNavigation::ComputeStep()" << G4endl
    328                  << "        Problem in Navigation"  << G4endl
    329                  << "        Point (local coordinates): "
    330                  << localPoint << G4endl
    331                  << "        Local Direction: " << localDirection << G4endl
    332                  << "        Solid: " << motherSolid->GetName() << G4endl;
    333           motherSolid->DumpInfo();
    334           G4Exception("G4NormalNavigation::ComputeStep()",
    335                       "PointDistOutInvalid", FatalException,
    336                       "Current point is outside the current solid !");
    337         }
    338       }
    339       if ( fVerbose > 1 )
    340       {
    341         G4int oldprec = G4cout.precision(precVerf);
    342         G4cout << " Mother " << std::setw(12) << motherSolid->GetName() << " "
    343                << std::setw(4+precVerf)       << localPoint   << " "
    344                << std::setw(4+precVerf)       << motherSafety << " "
    345                << std::setw(4+precVerf)       << motherStep   << " "
    346                << std::setw(16)               << "distanceToOut" << " "
    347                << std::setw(4+precVerf)       << localDirection << " "
    348                << G4endl;
    349         G4cout.precision(oldprec);     
     197        fLogger->PostComputeStepLog(motherSolid, localPoint, localDirection,
     198                                    motherStep, motherSafety);
    350199      }
    351200#endif
    … …  
    399248
    400249#ifdef G4VERBOSE
    401   if(( fCheck ) && ( fVerbose == 1 ))
    402   {
    403     G4cout << "*** G4NormalNavigation::ComputeSafety(): ***" << G4endl
    404            << "    Invoked DistanceToOut(p) for mother solid: "
    405            << motherSolid->GetName()
    406            << ". Solid replied: " << motherSafety << G4endl
    407            << "    For local point p: " << localPoint
    408            << ", to be considered as 'mother safety'." << G4endl;
     250  if( fCheck )
     251  {
     252    fLogger->ComputeSafetyLog(motherSolid, localPoint, motherSafety, true);
    409253  }
    410254#endif
    … …  
    430274    }
    431275#ifdef G4VERBOSE
    432     if(( fCheck ) && ( fVerbose == 1 ))
    433     {
    434       G4cout << "*** G4NormalNavigation::ComputeSafety(): ***" << G4endl
    435              << "    Invoked DistanceToIn(p) for daughter solid: "
    436              << sampleSolid->GetName()
    437              << ". Solid replied: " << sampleSafety << G4endl
    438              << "    For local point p: " << samplePoint
    439              << ", to be considered as 'daughter safety'." << G4endl;
     276    if(fCheck)
     277    {
     278      fLogger->ComputeSafetyLog(sampleSolid, samplePoint, sampleSafety, false);
    440279    }
    441280#endif

  • trunk/source/geometry/navigation/src/G4ParameterisedNavigation.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ParameterisedNavigation.cc,v 1.12 2007/11/09 16:06:02 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ParameterisedNavigation.cc,v 1.13 2010/07/13 15:59:42 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    5858//
    5959G4ParameterisedNavigation::G4ParameterisedNavigation()
    60   : fVoxelHeader(0)
     60  : fVoxelAxis(kUndefined), fVoxelNoSlices(0), fVoxelSliceWidth(0.),
     61    fVoxelNodeNo(0), fVoxelHeader(0)
    6162{
    6263}

  • trunk/source/geometry/navigation/src/G4PathFinder.cc

    r1058 r1347  
    2525//
    2626//
    27 // $Id: G4PathFinder.cc,v 1.62 2009/05/13 23:20:54 japost Exp $
     27// $Id: G4PathFinder.cc,v 1.64 2010/07/13 15:59:42 gcosmo Exp $
    2828// GEANT4 tag $ Name:  $
    2929//
    … …  
    6969G4PathFinder::G4PathFinder()
    7070  : fEndState( G4ThreeVector(), G4ThreeVector(), 0., 0., 0., 0., 0.),
     71    fFieldExertedForce(false),
    7172    fRelocatedPoint(true),
    72     fLastStepNo(-1),
     73    fLastStepNo(-1), fCurrentStepNo(-1),
    7374    fVerboseLevel(0)
    7475{
    … …  
    9192   fMinSafety_atSafLocation= -1.0;
    9293   fMinStep=   -1.0;
     94   fTrueMinStep= -1.0;
     95   fPreStepCenterRenewed= false;
    9396   fNewTrack= false;
    9497   fNoGeometriesLimiting= 0;
    9598
    96    for( register int num=0; num<= fMaxNav; ++num )
     99   for( register int num=0; num< fMaxNav; ++num )
    97100   {
    98101      fpNavigator[num] =  0;   

  • trunk/source/geometry/navigation/src/G4PhantomParameterisation.cc

    r1058 r1347  
    2525//
    2626//
    27 // $Id: G4PhantomParameterisation.cc,v 1.6 2009/05/20 08:27:10 gcosmo Exp $
     27// $Id: G4PhantomParameterisation.cc,v 1.7 2010/07/13 15:59:42 gcosmo Exp $
    2828// GEANT4 tag $ Name:$
    2929//
    … …  
    4545//------------------------------------------------------------------
    4646G4PhantomParameterisation::G4PhantomParameterisation()
    47 {
    48   // Initialise data
    49   //
    50   fMaterialIndices = 0;
    51   fContainerWallX = 0.;
    52   fContainerWallY = 0.;
    53   fContainerWallZ = 0.;
    54 
     47  : fVoxelHalfX(0.), fVoxelHalfY(0.), fVoxelHalfZ(0.),
     48    fNoVoxelX(0), fNoVoxelY(0), fNoVoxelZ(0), fNoVoxelXY(0), fNoVoxel(0),
     49    fMaterialIndices(0), fContainerSolid(0),
     50    fContainerWallX(0.), fContainerWallY(0.), fContainerWallZ(0.),
     51    bSkipEqualMaterials(true)
     52{
    5553  kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
    56 
    57   bSkipEqualMaterials = 1;
    5854}
    5955

  • trunk/source/geometry/navigation/src/G4PropagatorInField.cc

    r1315 r1347  
    3636// 17.03.97 John Apostolakis,   renaming new set functions being added
    3737//
    38 // $Id: G4PropagatorInField.cc,v 1.51 2010/03/08 13:57:34 gcosmo Exp $
     38// $Id: G4PropagatorInField.cc,v 1.52 2010/07/13 15:59:42 gcosmo Exp $
    3939// GEANT4 tag $ Name:  $
    4040// ---------------------------------------------------------------------------
    … …  
    470470                                        G4VPhysicalVolume*   startVolume)
    471471{
    472   const G4int verboseLevel= fVerboseLevel;
     472  const G4int verboseLevel=fVerboseLevel;
    473473  const G4ThreeVector StartPosition       = StartFT.GetPosition();
    474474  const G4ThreeVector StartUnitVelocity   = StartFT.GetMomentumDir();
    … …  
    477477
    478478  G4double step_len = CurrentFT.GetCurveLength() - StartFT.GetCurveLength();
     479
     480  G4int oldprec;   // cout/cerr precision settings
    479481     
    480   if( ((stepNo == 0) && (verboseLevel <3))
    481       || (verboseLevel >= 3) )
    482   {
    483     static G4int noPrecision= 4;
    484     G4cout.precision(noPrecision);
    485     // G4cout.setf(ios_base::fixed,ios_base::floatfield);
     482  if( ((stepNo == 0) && (verboseLevel <3)) || (verboseLevel >= 3) )
     483  {
     484    oldprec = G4cout.precision(4);
    486485    G4cout << std::setw( 6)  << " "
    487486           << std::setw( 25) << " Current Position  and  Direction" << " "
    … …  
    495494           << std::setw( 7) << " N_y " << " "
    496495           << std::setw( 7) << " N_z " << " " ;
    497     //            << G4endl;
    498     G4cout     // << " >>> "
    499            << std::setw( 7) << " Delta|N|" << " "
    500       //   << std::setw( 7) << " Delta(N_z) " << " "
     496    G4cout << std::setw( 7) << " Delta|N|" << " "
    501497           << std::setw( 9) << "StepLen" << " " 
    502498           << std::setw(12) << "StartSafety" << " " 
    503499           << std::setw( 9) << "PhsStep" << " "; 
    504     if( startVolume ) {
    505       G4cout << std::setw(18) << "NextVolume" << " ";
    506     }
     500    if( startVolume )
     501      { G4cout << std::setw(18) << "NextVolume" << " "; }
     502    G4cout.precision(oldprec);
    507503    G4cout << G4endl;
    508504  }
    509   if((stepNo == 0) && (verboseLevel <=3)){
    510      // Recurse to print the start values
    511      //
    512      printStatus( StartFT, StartFT, -1.0, safety, -1, startVolume);
    513    }
    514    if( verboseLevel <= 3 )
    515    {
    516      if( stepNo >= 0)
    517        G4cout << std::setw( 4) << stepNo << " ";
    518      else
    519        G4cout << std::setw( 5) << "Start" ;
    520      G4cout.precision(8);
    521      G4cout << std::setw(10) << CurrentFT.GetCurveLength() << " ";
    522      G4cout.precision(8);
    523      G4cout << std::setw(10) << CurrentPosition.x() << " "
    524             << std::setw(10) << CurrentPosition.y() << " "
    525             << std::setw(10) << CurrentPosition.z() << " ";
    526      G4cout.precision(4);
    527      G4cout << std::setw( 7) << CurrentUnitVelocity.x() << " "
    528             << std::setw( 7) << CurrentUnitVelocity.y() << " "
    529             << std::setw( 7) << CurrentUnitVelocity.z() << " ";
    530      //  G4cout << G4endl;
    531      //     G4cout << " >>> " ;
    532      G4cout.precision(3);
    533      G4cout << std::setw( 7) << CurrentFT.GetMomentum().mag()- StartFT.GetMomentum().mag() << " ";
    534      //   << std::setw( 7) << CurrentUnitVelocity.z() - InitialUnitVelocity.z() << " ";
    535      G4cout << std::setw( 9) << step_len << " ";
    536      G4cout << std::setw(12) << safety << " ";
    537      if( requestStep != -1.0 )
    538        G4cout << std::setw( 9) << requestStep << " ";
    539      else
    540        G4cout << std::setw( 9) << "Init/NotKnown" << " ";
    541 
    542      if( startVolume != 0)
    543      {
    544        G4cout << std::setw(12) << startVolume->GetName() << " ";
    545      }
    546 #if 0
    547      else
    548      {
    549        if( step_len != -1 )
    550          G4cout << std::setw(12) << "OutOfWorld" << " ";
    551        else
    552          G4cout << std::setw(12) << "NotGiven" << " ";
    553      }
    554 #endif
    555 
    556      G4cout << G4endl;
    557    }
    558    else // if( verboseLevel > 3 )
    559    {
    560      //  Multi-line output
    561        
    562      G4cout << "Step taken was " << step_len 
    563             << " out of PhysicalStep = " <<  requestStep << G4endl;
    564      G4cout << "Final safety is: " << safety << G4endl;
    565 
    566      G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag()
    567             << G4endl;
    568      G4cout << G4endl;
    569    }
     505  if((stepNo == 0) && (verboseLevel <=3))
     506  {
     507    // Recurse to print the start values
     508    //
     509    printStatus( StartFT, StartFT, -1.0, safety, -1, startVolume);
     510  }
     511  if( verboseLevel <= 3 )
     512  {
     513    if( stepNo >= 0)
     514      { G4cout << std::setw( 4) << stepNo << " "; }
     515    else
     516      { G4cout << std::setw( 5) << "Start" ; }
     517    oldprec = G4cout.precision(8);
     518    G4cout << std::setw(10) << CurrentFT.GetCurveLength() << " ";
     519    G4cout.precision(8);
     520    G4cout << std::setw(10) << CurrentPosition.x() << " "
     521           << std::setw(10) << CurrentPosition.y() << " "
     522           << std::setw(10) << CurrentPosition.z() << " ";
     523    G4cout.precision(4);
     524    G4cout << std::setw( 7) << CurrentUnitVelocity.x() << " "
     525           << std::setw( 7) << CurrentUnitVelocity.y() << " "
     526           << std::setw( 7) << CurrentUnitVelocity.z() << " ";
     527    G4cout.precision(3);
     528    G4cout << std::setw( 7)
     529           << CurrentFT.GetMomentum().mag()-StartFT.GetMomentum().mag() << " ";
     530    G4cout << std::setw( 9) << step_len << " ";
     531    G4cout << std::setw(12) << safety << " ";
     532    if( requestStep != -1.0 )
     533      { G4cout << std::setw( 9) << requestStep << " "; }
     534    else
     535      { G4cout << std::setw( 9) << "Init/NotKnown" << " "; }
     536    if( startVolume != 0)
     537      { G4cout << std::setw(12) << startVolume->GetName() << " "; }
     538    G4cout.precision(oldprec);
     539    G4cout << G4endl;
     540  }
     541  else // if( verboseLevel > 3 )
     542  {
     543    //  Multi-line output
     544     
     545    G4cout << "Step taken was " << step_len 
     546           << " out of PhysicalStep = " <<  requestStep << G4endl;
     547    G4cout << "Final safety is: " << safety << G4endl;
     548    G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag()
     549           << G4endl;
     550    G4cout << G4endl;
     551  }
    570552}
    571553

  • trunk/source/geometry/navigation/src/G4RegularNavigation.cc

    r1058 r1347  
    2525//
    2626//
    27 // $Id: G4RegularNavigation.cc,v 1.9 2009/01/27 09:31:29 gcosmo Exp $
     27// $Id: G4RegularNavigation.cc,v 1.15 2010/11/19 15:13:39 gcosmo Exp $
    2828// GEANT4 tag $ Name:$
    2929//
    … …  
    4545//------------------------------------------------------------------
    4646G4RegularNavigation::G4RegularNavigation()
    47   : fVerbose(1), fCheck(true)
     47  : fverbose(false), fcheck(false), fnormalNav(0)
    4848{
    4949  kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
    … …  
    122122//------------------------------------------------------------------
    123123G4double G4RegularNavigation::ComputeStepSkippingEqualMaterials(
    124                                 G4ThreeVector localPoint,
     124                                      G4ThreeVector& localPoint,
    125125                                const G4ThreeVector& localDirection,
    126126                                const G4double currentProposedStepLength,
    … …  
    291291                                  const G4ThreeVector& globalPoint,
    292292                                  const G4ThreeVector* globalDirection,
    293                                   const G4bool pLocatedOnEdge,
     293                                  const G4bool, // pLocatedOnEdge,
    294294                                  G4ThreeVector& localPoint )
    295295{
    296   G4SmartVoxelHeader *motherVoxelHeader;
    297296  G4VPhysicalVolume *motherPhysical, *pPhysical;
    298297  G4PhantomParameterisation *pParam;
    299298  G4LogicalVolume *motherLogical;
    300   G4VSolid *pSolid;
    301299  G4ThreeVector localDir;
    302300  G4int replicaNo;
    … …  
    304302  motherPhysical = history.GetTopVolume();
    305303  motherLogical = motherPhysical->GetLogicalVolume();
    306   motherVoxelHeader = motherLogical->GetVoxelHeader();
    307304 
    308305  pPhysical = motherLogical->GetDaughter(0);
    309306  pParam = (G4PhantomParameterisation*)(pPhysical->GetParameterisation());
    310307 
    311   pSolid = pParam->GetContainerSolid();
    312  
    313308  // Save parent history in touchable history
    314309  // ... for use as parent t-h in ComputeMaterial method of param
    … …  
    327322  }
    328323
    329   // Check that track is not on the surface and check that track is not
    330   // exiting the voxel parent volume
    331   //
    332   if ( !G4AuxiliaryNavServices::CheckPointOnSurface(pSolid, localPoint,
    333           globalDirection, history.GetTopTransform(), pLocatedOnEdge)
    334      || G4AuxiliaryNavServices::CheckPointExiting(pSolid, localPoint,
    335           globalDirection, history.GetTopTransform() ) )
    336   {
    337   }
    338   else
    339   {
    340     // Enter this daughter
    341     //
    342     replicaNo = pParam->GetReplicaNo( localPoint, localDir );
    343 
    344     if( replicaNo < 0 || replicaNo >= G4int(pParam->GetNoVoxel()) )
    345     {
    346       return false;
    347     }
    348 
    349     // Set the correct copy number in physical
    350     //
    351     pPhysical->SetCopyNo(replicaNo);
    352     pParam->ComputeTransformation(replicaNo,pPhysical);
    353 
    354     history.NewLevel(pPhysical, kParameterised, replicaNo );
    355     localPoint = history.GetTopTransform().TransformPoint(globalPoint);
    356 
    357     // Set the correct solid and material in Logical Volume
    358     //
    359     G4LogicalVolume *pLogical = pPhysical->GetLogicalVolume();
     324  // Enter this daughter
     325  //
     326  replicaNo = pParam->GetReplicaNo( localPoint, localDir );
     327
     328  if( replicaNo < 0 || replicaNo >= G4int(pParam->GetNoVoxel()) )
     329  {
     330    return false;
     331  }
     332
     333  // Set the correct copy number in physical
     334  //
     335  pPhysical->SetCopyNo(replicaNo);
     336  pParam->ComputeTransformation(replicaNo,pPhysical);
     337
     338  history.NewLevel(pPhysical, kParameterised, replicaNo );
     339  localPoint = history.GetTopTransform().TransformPoint(globalPoint);
     340
     341  // Set the correct solid and material in Logical Volume
     342  //
     343  G4LogicalVolume *pLogical = pPhysical->GetLogicalVolume();
    360344     
    361     pLogical->UpdateMaterial(pParam->ComputeMaterial(replicaNo,
    362                              pPhysical, &parentTouchable) );
    363     return true;
    364   }
    365 
    366   return false;
    367 }
     345  pLogical->UpdateMaterial(pParam->ComputeMaterial(replicaNo,
     346                           pPhysical, &parentTouchable) );
     347  return true;
     348}

  • trunk/source/geometry/navigation/src/G4ReplicaNavigation.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4ReplicaNavigation.cc,v 1.19 2008/04/28 15:39:55 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4ReplicaNavigation.cc,v 1.20 2010/07/13 15:59:42 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    10391039    G4Exception("G4ReplicaNavigation::BackLocate()", "InvalidSetup",
    10401040                FatalException, "The World volume must be a Placement!");
     1041    return kInside;
    10411042  }
    10421043

  • trunk/source/geometry/navigation/src/G4SimpleLocator.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4SimpleLocator.cc,v 1.5 2008/12/11 10:27:58 tnikitin Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4SimpleLocator.cc,v 1.6 2010/07/13 15:59:42 gcosmo Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Class G4SimpleLocator implementation
    … …  
    105105
    106106  G4int substep_no = 0;
     107
     108  G4int oldprc;  // cout/cerr precision settings
    107109
    108110  // Limits for substep number
    … …  
    358360                  << GetEpsilonStepFor() << G4endl;
    359361         }
    360          G4cerr.precision(20);
     362         oldprc = G4cerr.precision(20);
    361363         G4cerr << " Point A (Curve start)   is " << CurveStartPointVelocity
    362364                << G4endl;
    … …  
    373375         G4cerr << "        LocateIntersection parameters are : Substep no= "
    374376                << substep_no << G4endl;
     377         G4cerr.precision(oldprc);
    375378
    376379         G4Exception("G4SimpleLocator::EstimateIntersectionPoint()",
    … …  
    452455                 -1.0, NewSafety, substep_no);
    453456    G4cout << G4endl;
    454     G4cout.precision( 10 );
     457    oldprc = G4cout.precision(10);
    455458    G4double done_len = CurrentA_PointVelocity.GetCurveLength();
    456459    G4double full_len = CurveEndPointVelocity.GetCurveLength();
    … …  
    460463           << " out of " << full_len << " required." << G4endl;
    461464    G4cout << "        Remaining length = " << full_len - done_len << G4endl;
     465    G4cout.precision(oldprc);
    462466
    463467    G4Exception("G4SimpleLocator::EstimateIntersectionPoint()",
    … …  
    467471  else if( substep_no >= warn_substeps )
    468472  { 
    469     G4int oldprc= G4cout.precision( 10 );
     473    oldprc= G4cout.precision(10);
    470474    G4cout << "WARNING - G4SimpleLocator::EstimateIntersectionPoint()"
    471475           << G4endl
    … …  
    475479           << "          Warning level = " << warn_substeps
    476480           << " and maximum substeps = " << max_substeps << G4endl;
     481    G4cout.precision(oldprc);
    477482    G4Exception("G4SimpleLocator::EstimateIntersectionPoint()",
    478483                "DifficultyToLocateIntersection", JustWarning,
    479484                "Many substeps while trying to locate intersection.");
    480     G4cout.precision( oldprc );
    481485  }
    482486  return  !there_is_no_intersection; //  Success or failure

  • trunk/source/geometry/navigation/src/G4TransportationManager.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4TransportationManager.cc,v 1.15 2007/04/12 11:51:48 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4TransportationManager.cc,v 1.16 2010/07/13 15:59:42 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    5656G4TransportationManager::G4TransportationManager()
    5757{
    58   if (!fTransportationManager)
    59   {
    60     // Create the navigator for tracking and activate it; add to collections
    61     //
    62     G4Navigator* trackingNavigator = new G4Navigator();
    63     trackingNavigator->Activate(true);
    64     fNavigators.push_back(trackingNavigator);
    65     fActiveNavigators.push_back(trackingNavigator);
    66     fWorlds.push_back(trackingNavigator->GetWorldVolume()); // NULL registered
    67 
    68     fGeomMessenger     = new G4GeometryMessenger(this);
    69     fFieldManager      = new G4FieldManager();
    70     fPropagatorInField = new G4PropagatorInField(trackingNavigator,
    71                                                  fFieldManager);
    72     fSafetyHelper      = new G4SafetyHelper();
    73   }
    74   else
     58  if (fTransportationManager)
    7559  {
    7660    G4cerr << "Only ONE instance of G4TransportationManager is allowed!"
    … …  
    8064                "Only ONE instance of G4TransportationManager is allowed!");
    8165  }
     66
     67  // Create the navigator for tracking and activate it; add to collections
     68  //
     69  G4Navigator* trackingNavigator = new G4Navigator();
     70  trackingNavigator->Activate(true);
     71  fNavigators.push_back(trackingNavigator);
     72  fActiveNavigators.push_back(trackingNavigator);
     73  fWorlds.push_back(trackingNavigator->GetWorldVolume()); // NULL registered
     74
     75  fGeomMessenger    = new G4GeometryMessenger(this);
     76  fFieldManager     = new G4FieldManager();
     77  fPropagatorInField= new G4PropagatorInField(trackingNavigator,fFieldManager);
     78  fSafetyHelper     = new G4SafetyHelper();
    8279}
    8380
    … …  
    329326   std::vector<G4Navigator*>::iterator pNav =
    330327     std::find(fNavigators.begin(), fNavigators.end(), aNavigator);
    331    if (pNav == fNavigators.end())
     328   if (pNav != fNavigators.end())
     329   {
     330      (*pNav)->Activate(false);
     331   }
     332   else
    332333   {
    333334      G4String message
    … …  
    337338                  "NoEffect", JustWarning, message);
    338339   }
    339    else
    340    {
    341       (*pNav)->Activate(false);
    342    }
     340
    343341   std::vector<G4Navigator*>::iterator pActiveNav =
    344342     std::find(fActiveNavigators.begin(), fActiveNavigators.end(), aNavigator);

  • trunk/source/geometry/navigation/src/G4VIntersectionLocator.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4VIntersectionLocator.cc,v 1.7 2009/11/27 15:21:59 japost Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4VIntersectionLocator.cc,v 1.8 2010/07/13 15:59:42 gcosmo Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Class G4VIntersectionLocator implementation
    … …  
    8383
    8484  G4double step_len = CurrentFT.GetCurveLength() - StartFT.GetCurveLength();
    85      
     85  G4int oldprc;  // cout/cerr precision settings
     86
    8687  if( ((stepNo == 0) && (verboseLevel <3)) || (verboseLevel >= 3) )
    8788  {
    88     static G4int noPrecision= 4;
    89     G4cout.precision(noPrecision);
    90     // G4cout.setf(ios_base::fixed,ios_base::floatfield);
     89    oldprc = G4cout.precision(4);
    9190    G4cout << std::setw( 6)  << " "
    9291           << std::setw( 25) << " Current Position  and  Direction" << " "
    … …  
    10099           << std::setw( 7) << " N_y " << " "
    101100           << std::setw( 7) << " N_z " << " " ;
    102     //            << G4endl;
    103     G4cout     // << " >>> "
    104            << std::setw( 7) << " Delta|N|" << " "
    105       //   << std::setw( 7) << " Delta(N_z) " << " "
     101    G4cout << std::setw( 7) << " Delta|N|" << " "
    106102           << std::setw( 9) << "StepLen" << " " 
    107103           << std::setw(12) << "StartSafety" << " " 
    108104           << std::setw( 9) << "PhsStep" << " "; 
    109  
    110105    G4cout << G4endl;
     106    G4cout.precision(oldprc);
    111107  }
    112108  if((stepNo == 0) && (verboseLevel <=3))
    … …  
    126122       G4cout << std::setw( 5) << "Start" ;
    127123    }
    128     G4cout.precision(8);
     124    oldprc = G4cout.precision(8);
    129125    G4cout << std::setw(10) << CurrentFT.GetCurveLength() << " ";
    130     G4cout.precision(8);
    131126    G4cout << std::setw(10) << CurrentPosition.x() << " "
    132127           << std::setw(10) << CurrentPosition.y() << " "
    … …  
    136131           << std::setw( 7) << CurrentUnitVelocity.y() << " "
    137132           << std::setw( 7) << CurrentUnitVelocity.z() << " ";
    138      //  G4cout << G4endl;
    139      //     G4cout << " >>> " ;
    140      G4cout.precision(3);
    141      G4cout << std::setw( 7)
    142             << CurrentFT.GetMomentum().mag()- StartFT.GetMomentum().mag()
    143             << " ";
    144      //   << std::setw( 7)
    145      //   << CurrentUnitVelocity.z() - InitialUnitVelocity.z() << " ";
    146      G4cout << std::setw( 9) << step_len << " ";
    147      G4cout << std::setw(12) << safety << " ";
    148      if( requestStep != -1.0 )
    149      {
    150        G4cout << std::setw( 9) << requestStep << " ";
    151      }
    152      else
    153      {
    154        G4cout << std::setw( 9) << "Init/NotKnown" << " ";
    155      }
    156      G4cout << G4endl;
    157    }
    158    else // if( verboseLevel > 3 )
    159    {
    160      //  Multi-line output
     133    G4cout.precision(3);
     134    G4cout << std::setw( 7)
     135           << CurrentFT.GetMomentum().mag()- StartFT.GetMomentum().mag()
     136           << " ";
     137    G4cout << std::setw( 9) << step_len << " ";
     138    G4cout << std::setw(12) << safety << " ";
     139    if( requestStep != -1.0 )
     140    {
     141      G4cout << std::setw( 9) << requestStep << " ";
     142    }
     143    else
     144    {
     145      G4cout << std::setw( 9) << "Init/NotKnown" << " ";
     146    }
     147    G4cout << G4endl;
     148    G4cout.precision(oldprc);
     149  }
     150  else // if( verboseLevel > 3 )
     151  {
     152    //  Multi-line output
    161153       
    162      G4cout << "Step taken was " << step_len 
    163             << " out of PhysicalStep= " <<  requestStep << G4endl;
    164      G4cout << "Final safety is: " << safety << G4endl;
    165 
    166      G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag()
    167             << G4endl;
    168      G4cout << G4endl;
    169    }
     154    G4cout << "Step taken was " << step_len 
     155           << " out of PhysicalStep= " <<  requestStep << G4endl;
     156    G4cout << "Final safety is: " << safety << G4endl;
     157    G4cout << "Chord length = " << (CurrentPosition-StartPosition).mag()
     158           << G4endl;
     159    G4cout << G4endl;
     160  }
    170161}
    171162

  • trunk/source/geometry/navigation/src/G4VoxelNavigation.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4VoxelNavigation.cc,v 1.9 2008/11/14 18:26:35 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VoxelNavigation.cc,v 1.13 2010/11/04 18:18:00 japost Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    3737#include "G4VoxelNavigation.hh"
    3838#include "G4GeometryTolerance.hh"
     39#include "G4VoxelSafety.hh"
    3940
    4041// ********************************************************************
    … …  
    4344//
    4445G4VoxelNavigation::G4VoxelNavigation()
    45   : fVoxelDepth(-1),
     46  : fBList(), fVoxelDepth(-1),
    4647    fVoxelAxisStack(kNavigatorVoxelStackMax,kXAxis),
    4748    fVoxelNoSlicesStack(kNavigatorVoxelStackMax,0),
    … …  
    4950    fVoxelNodeNoStack(kNavigatorVoxelStackMax,0),
    5051    fVoxelHeaderStack(kNavigatorVoxelStackMax,(G4SmartVoxelHeader*)0),
    51     fVoxelNode(0),
    52     fCheck(false),
    53     fVerbose(0)
     52    fVoxelNode(0), fpVoxelSafety(0), fCheck(false), fBestSafety(false)
    5453{
    55   kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
     54  fLogger = new G4NavigationLogger("G4VoxelNavigation");
     55  fpVoxelSafety = new G4VoxelSafety ();
    5656}
    5757
    … …  
    6262G4VoxelNavigation::~G4VoxelNavigation()
    6363{
    64 #ifdef G4DEBUG_NAVIGATION
    65   G4cout << "G4VoxelNavigation::~G4VoxelNavigation() called." << G4endl;
    66 #endif
     64  delete fpVoxelSafety;
     65  delete fLogger;
    6766}
    6867
    … …  
    110109  if ( fCheck )
    111110  {
    112     if(fVerbose == 1 )
    113     {
    114       G4cout << "*** G4VoxelNavigation::ComputeStep(): ***" << G4endl
    115              << "    Invoked DistanceToOut(p) for mother solid: "
    116              << motherSolid->GetName()
    117              << ". Solid replied: " << motherSafety << G4endl
    118              << "    For local point p: " << localPoint
    119              << ", to be considered as 'mother safety'." << G4endl;
    120     }
    121     if( motherSafety < 0.0 )
    122     {
    123       G4cout << "ERROR - G4VoxelNavigation::ComputeStep()" << G4endl
    124              << "        Current solid " << motherSolid->GetName()
    125              << " gave negative safety: " << motherSafety << G4endl
    126              << "        for the current (local) point " << localPoint
    127              << G4endl;
    128       motherSolid->DumpInfo();
    129       G4Exception("G4VoxelNavigation::ComputeStep()",
    130                   "NegativeSafetyMotherVol", FatalException,
    131                   "Negative Safety In Voxel Navigation !" );
    132     }
    133     if( motherSolid->Inside(localPoint)==kOutside )
    134     {
    135       G4cout << "WARNING - G4VoxelNavigation::ComputeStep()" << G4endl
    136              << "          Point " << localPoint
    137              << " is outside current volume " << motherPhysical->GetName()
    138              << G4endl;
    139       G4double  estDistToSolid= motherSolid->DistanceToIn(localPoint);
    140       G4cout << "          Estimated isotropic distance to solid (distToIn)= "
    141              << estDistToSolid << G4endl;
    142       if( estDistToSolid > 100.0 * kCarTolerance )
    143       {
    144         motherSolid->DumpInfo();
    145         G4Exception("G4VoxelNavigation::ComputeStep()",
    146                     "FarOutsideCurrentVolume", FatalException,
    147                     "Point is far outside Current Volume !");
    148       }
    149       else
    150         G4Exception("G4VoxelNavigation::ComputeStep()", "OutsideCurrentVolume",
    151                     JustWarning, "Point is a little outside Current Volume.");
    152     }
     111    fLogger->PreComputeStepLog (motherPhysical, motherSafety, localPoint);
    153112  }
    154113#endif
    … …  
    204163                     sampleSolid->DistanceToIn(samplePoint);
    205164#ifdef G4VERBOSE
    206           if(( fCheck ) && ( fVerbose == 1 ))
     165          if( fCheck )
    207166          {
    208             G4cout << "*** G4VoxelNavigation::ComputeStep(): ***" << G4endl
    209                    << "    Invoked DistanceToIn(p) for daughter solid: "
    210                    << sampleSolid->GetName()
    211                    << ". Solid replied: " << sampleSafety << G4endl
    212                    << "    For local point p: " << samplePoint
    213                    << ", to be considered as 'daughter safety'." << G4endl;
     167            fLogger->PrintDaughterLog(sampleSolid,samplePoint,sampleSafety,0);
    214168          }
    215169#endif
    … …  
    224178                     sampleSolid->DistanceToIn(samplePoint, sampleDirection);
    225179#ifdef G4VERBOSE
    226             if(( fCheck ) && ( fVerbose == 1 ))
     180            if( fCheck )
    227181            {
    228               G4cout << "*** G4VoxelNavigation::ComputeStep(): ***" << G4endl
    229                      << "    Invoked DistanceToIn(p,v) for daughter solid: "
    230                      << sampleSolid->GetName()
    231                      << ". Solid replied: " << sampleStep << G4endl
    232                      << "    For local point p: " << samplePoint << G4endl
    233                      << "    Direction v: " << sampleDirection
    234                      << ", to be considered as 'daughter step'." << G4endl;
     182              fLogger->PrintDaughterLog(sampleSolid, samplePoint,
     183                                        sampleSafety, sampleStep);
    235184            }
    236185#endif
    … …  
    247196              // candidate.
    248197
    249               if ( ( fCheck ) && ( sampleStep < kInfinity ) )
     198              if ( fCheck )
    250199              {
    251                 G4ThreeVector intersectionPoint;
    252                 intersectionPoint= samplePoint + sampleStep * sampleDirection;
    253                 EInside insideIntPt= sampleSolid->Inside(intersectionPoint);
    254                 G4String solidResponse = "-kInside-";
    255                 if (insideIntPt == kOutside)
    256                   { solidResponse = "-kOutside-"; }
    257                 else if (insideIntPt == kSurface)
    258                   { solidResponse = "-kSurface-"; }
    259                 if( fVerbose == 1 )
    260                 {
    261                   G4cout << "*** G4VoxelNavigation::ComputeStep(): ***"<<G4endl
    262                          << "    Invoked Inside() for solid: "
    263                          << sampleSolid->GetName()
    264                          << ". Solid replied: " << solidResponse << G4endl
    265                          << "    For point p: " << intersectionPoint
    266                          << ", considered as 'intersection' point." << G4endl;
    267                 }
    268                 G4double safetyIn= -1, safetyOut= -1;  //  Set to invalid values
    269                 G4double newDistIn= -1,  newDistOut= -1;
    270                 if( insideIntPt != kInside )
    271                 {
    272                   safetyIn= sampleSolid->DistanceToIn(intersectionPoint);
    273                   newDistIn= sampleSolid->DistanceToIn(intersectionPoint,
    274                                                        sampleDirection);
    275                 }
    276                 if( insideIntPt != kOutside )
    277                 {
    278                   safetyOut= sampleSolid->DistanceToOut(intersectionPoint);
    279                   newDistOut= sampleSolid->DistanceToOut(intersectionPoint,
    280                                                          sampleDirection);
    281                 }
    282                 if( insideIntPt != kSurface )
    283                 {
    284                   G4int oldcoutPrec = G4cout.precision(16);
    285                   G4cout << "WARNING - G4VoxelNavigation::ComputeStep()"
    286                          << G4endl
    287                          << "          Inaccurate solid DistanceToIn"
    288                          << " for solid " << sampleSolid->GetName() << G4endl;
    289                   G4cout << "          Solid gave DistanceToIn = "
    290                          << sampleStep << " yet returns " << solidResponse
    291                          << " for this point !" << G4endl;
    292                   G4cout << "          Point = " << intersectionPoint << G4endl;
    293                   G4cout << "          Safety values: " << G4endl;
    294                   if ( insideIntPt != kInside )
    295                   {
    296                     G4cout << "          DistanceToIn(p)  = " << safetyIn
    297                            << G4endl;
    298                   }
    299                   if ( insideIntPt != kOutside )
    300                   {
    301                     G4cout << "          DistanceToOut(p) = " << safetyOut
    302                            << G4endl;
    303                   }
    304                   G4Exception("G4VoxelNavigation::ComputeStep()",
    305                               "InaccurateDistanceToIn", JustWarning,
    306                               "Conflicting response from Solid.");
    307                   G4cout.precision(oldcoutPrec);
    308                 }
    309                 else
    310                 { 
    311                   // If it is on the surface, *ensure* that either DistanceToIn
    312                   // or DistanceToOut returns a finite value ( >= Tolerance).
    313                   //
    314                   if( std::max( newDistIn, newDistOut ) <= kCarTolerance )
    315                   {
    316                     G4cout << "ERROR - G4VoxelNavigation::ComputeStep()"
    317                        << G4endl
    318                        << "  Identified point for which the solid "
    319                        << sampleSolid->GetName() << G4endl
    320                        << "  has MAJOR problem:  " << G4endl
    321                        << "  --> Both DistanceToIn(p,v) and DistanceToOut(p,v) "
    322                        << "return Zero, an equivalent value or negative value."
    323                        << G4endl;
    324                     G4cout << "    Solid: " << sampleSolid << G4endl;
    325                     G4cout << "    Point p= " << intersectionPoint << G4endl;
    326                     G4cout << "    Direction v= " << sampleDirection << G4endl;
    327                     G4cout << "    DistanceToIn(p,v)     = " << newDistIn
    328                            << G4endl;
    329                     G4cout << "    DistanceToOut(p,v,..) = " << newDistOut
    330                            << G4endl;
    331                     G4cout << "    Safety values: " << G4endl;
    332                     G4cout << "      DistanceToIn(p)  = " << safetyIn
    333                            << G4endl;
    334                     G4cout << "      DistanceToOut(p) = " << safetyOut
    335                            << G4endl;
    336                     G4Exception("G4VoxelNavigation::ComputeStep()",
    337                               "DistanceToInAndOutAreZero", FatalException,
    338                               "Zero from both Solid DistanceIn and Out(p,v).");
    339                   }
    340                 }
     200                fLogger->AlongComputeStepLog (sampleSolid, samplePoint,
     201                  sampleDirection, localDirection, sampleSafety, sampleStep);
    341202              }
    342203#endif
    … …  
    378239          if ( fCheck )
    379240          {
    380             if(fVerbose == 1)
    381             {
    382               G4cout << "*** G4VoxelNavigation::ComputeStep(): ***" << G4endl
    383                      << "    Invoked DistanceToOut(p,v,...) for mother solid: "
    384                      << motherSolid->GetName()
    385                      << ". Solid replied: " << motherStep << G4endl
    386                      << "    For local point p: " << localPoint << G4endl
    387                      << "    Direction v: " << localDirection
    388                      << ", to be considered as 'mother step'." << G4endl;
    389             }
    390             if( ( motherStep < 0.0 ) || ( motherStep >= kInfinity) )
    391             {
    392               G4int oldPrOut= G4cout.precision(16);
    393               G4int oldPrErr= G4cerr.precision(16);
    394               G4cerr << "ERROR - G4VoxelNavigation::ComputeStep()" << G4endl
    395                      << "        Problem in Navigation"  << G4endl
    396                      << "        Point (local coordinates): "
    397                      << localPoint << G4endl
    398                      << "        Local Direction: " << localDirection << G4endl
    399                      << "        Solid: " << motherSolid->GetName() << G4endl;
    400               motherSolid->DumpInfo();
    401               G4Exception("G4VoxelNavigation::ComputeStep()",
    402                           "PointOutsideCurrentVolume", FatalException,
    403                           "Current point is outside the current solid !");
    404               G4cout.precision(oldPrOut);
    405               G4cerr.precision(oldPrErr);
    406             }
     241            fLogger->PostComputeStepLog(motherSolid, localPoint, localDirection,
     242                                        motherStep, motherSafety);
    407243          }
    408244#endif
    … …  
    480316  }
    481317  else if (maxCurNodeNoDelta < minCurNodeNoDelta)
    482        {
    483          voxelSafety = maxCurNodeNoDelta*curNodeWidth;
    484          voxelSafety += maxCurCommonDelta;
    485         }
    486         else    // (maxCurNodeNoDelta == minCurNodeNoDelta)
    487         {
    488           voxelSafety = minCurNodeNoDelta*curNodeWidth;
    489           voxelSafety += std::min(minCurCommonDelta,maxCurCommonDelta);
    490         }
     318  {
     319    voxelSafety = maxCurNodeNoDelta*curNodeWidth;
     320    voxelSafety += maxCurCommonDelta;
     321  }
     322  else    // (maxCurNodeNoDelta == minCurNodeNoDelta)
     323  {
     324    voxelSafety = minCurNodeNoDelta*curNodeWidth;
     325    voxelSafety += std::min(minCurCommonDelta,maxCurCommonDelta);
     326  }
    491327
    492328  // Compute isotropic safety to boundaries of previous levels
    … …  
    552388 
    553389  G4double currentDistance = currentStep;
     390  static const G4double sigma = 0.5*G4GeometryTolerance::GetInstance()
     391                                    ->GetSurfaceTolerance();
    554392
    555393  // Determine if end of Step within current voxel
    … …  
    567405    minVal = workMinExtent+workNodeNo*workNodeWidth;
    568406
    569     if ( minVal<=workCoord+kCarTolerance*0.5 )
     407    if ( minVal<=workCoord+sigma )
    570408    {
    571409      maxVal = minVal+workNodeWidth;
    572       if ( maxVal<=workCoord-kCarTolerance*0.5 )
     410      if ( maxVal<=workCoord-sigma )
    573411      {
    574412        // Must consider next voxel
    … …  
    607445    minVal = workMinExtent+fVoxelNode->GetMinEquivalentSliceNo()*workNodeWidth;
    608446
    609     if ( minVal<=workCoord+kCarTolerance*0.5 )
     447    if ( minVal<=workCoord+sigma )
    610448    {
    611449      maxVal = workMinExtent+(fVoxelNode->GetMaxEquivalentSliceNo()+1)
    612450                            *workNodeWidth;
    613       if ( maxVal<=workCoord-kCarTolerance*0.5 )
     451      if ( maxVal<=workCoord-sigma )
    614452      {
    615453        newNodeNo = fVoxelNode->GetMaxEquivalentSliceNo()+1;
    … …  
    710548G4VoxelNavigation::ComputeSafety(const G4ThreeVector& localPoint,
    711549                                 const G4NavigationHistory& history,
    712                                  const G4double )
     550                                 const G4double       maxLength)
    713551{
    714552  G4VPhysicalVolume *motherPhysical, *samplePhysical;
    … …  
    725563  motherSolid = motherLogical->GetSolid();
    726564
     565  if( fBestSafety )
     566  {
     567    return fpVoxelSafety->ComputeSafety( localPoint,*motherPhysical,maxLength );
     568  }
     569
    727570  //
    728571  // Compute mother safety
    … …  
    733576
    734577#ifdef G4VERBOSE
    735   if(( fCheck ) && ( fVerbose == 1 ))
    736   {
    737     G4cout << "*** G4VoxelNavigation::ComputeSafety(): ***" << G4endl
    738            << "    Invoked DistanceToOut(p) for mother solid: "
    739            << motherSolid->GetName()
    740            << ". Solid replied: " << motherSafety << G4endl
    741            << "    For local point p: " << localPoint
    742            << ", to be considered as 'mother safety'." << G4endl;
     578  if( fCheck )
     579  {
     580    fLogger->ComputeSafetyLog (motherSolid, localPoint, motherSafety, true);
    743581  }
    744582#endif
    … …  
    772610    }
    773611#ifdef G4VERBOSE
    774     if(( fCheck ) && ( fVerbose == 1 ))
    775     {
    776       G4cout << "*** G4VoxelNavigation::ComputeSafety(): ***" << G4endl
    777              << "    Invoked DistanceToIn(p) for daughter solid: "
    778              << sampleSolid->GetName()
    779              << ". Solid replied: " << sampleSafety << G4endl
    780              << "    For local point p: " << samplePoint
    781              << ", to be considered as 'daughter safety'." << G4endl;
     612    if( fCheck )
     613    {
     614      fLogger->ComputeSafetyLog (sampleSolid,samplePoint,sampleSafety,false);
    782615    }
    783616#endif
    … …  
    790623  return ourSafety;
    791624}
     625
     626// ********************************************************************
     627// SetVerboseLevel
     628// ********************************************************************
     629//
     630void  G4VoxelNavigation::SetVerboseLevel(G4int level)
     631{
     632  if( fLogger )       fLogger->SetVerboseLevel(level);
     633  if( fpVoxelSafety)  fpVoxelSafety->SetVerboseLevel( level );
     634}

  • trunk/source/geometry/navigation/test/ApproxEqual.hh

    r1316 r1347  
    2626//
    2727// $Id: ApproxEqual.hh,v 1.4 2006/06/29 18:37:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/navigation/test/MyMultiNavigator.hh

    r1316 r1347  
    2626//
    2727// $Id: MyMultiNavigator.hh,v 1.1 2006/11/11 01:35:38 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Class to help test Multi-navigator geometry

  • trunk/source/geometry/navigation/test/testG4MultiNavigator1.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4MultiNavigator1.cc,v 1.1 2006/11/11 01:35:38 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/test/testG4Navigator1.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Navigator1.cc,v 1.5 2006/06/29 18:37:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/test/testG4Navigator2.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Navigator2.cc,v 1.6 2007/03/23 18:33:08 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/test/testG4Navigator3.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Navigator3.cc,v 1.5 2006/06/29 18:37:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/test/testG4Navigator4.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Navigator4.cc,v 1.5 2006/06/29 18:37:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/test/testG4Navigator5.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Navigator5.cc,v 1.6 2006/06/29 18:37:26 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/test/testG4Navigator6.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Navigator6.cc,v 1.5 2006/06/29 18:37:28 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/test/testG4NestedParameterisedNav.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4NestedParameterisedNav.cc,v 1.6 2006/06/29 18:37:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/navigation/test/testG4PathFinder.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4PathFinder.cc,v 1.8 2007/02/13 16:15:34 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/BREPS/GNUmakefile

    r831 r1347  
    1 # $Id: GNUmakefile,v 1.5 2004/06/11 14:17:16 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.7 2010/10/27 07:34:32 gcosmo Exp $
    22# ------------------------------------------------------------
    33# GNUmakefile for BREPS library.  Gabriele Cosmo, 15/11/96.

  • trunk/source/geometry/solids/BREPS/History

    r850 r1347  
    1 $Id: History,v 1.70 2008/07/08 10:01:13 gcosmo Exp $
     1$Id: History,v 1.79 2010/11/23 15:15:11 gcosmo Exp $
    22----------------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     2023/11/2010 : G.Cosmo           breps-V09-03-07 and V09-03-06
     21- Fixed remaining cases of pointer handling in experimental G4BezierSurface
     22  code.
     23
     2401/11/2010 : G.Cosmo           breps-V09-03-05
     25- Fixed cases of null pointer forward in G4BREPSolid, G4BREPSolidPolyhedra
     26  and G4BezierSurface classes.
     27
     2820/10/2010 : G.Cosmo           breps-V09-03-04
     29- Implemented Clone() virtual method for all solids, returning a pointer
     30  to a dynamically allocated copy of the solid. To be used by Geant4-MT.
     31
     3222/09/2010 : G. Cosmo          breps-V09-03-03
     33- Implemented copy-constructor and assignment operator for solids classes
     34  to facilitate conversion to Geant4-MT.
     35
     3606/09/2010 : G. Cosmo          breps-V09-03-02
     37- Fixed possible leak in G4BREPSolid::IsConvex() method.
     38- Corrected possible dereferencing of null pointer in method
     39  G4BREPSolidSphere::DistanceToOut().
     40- Corrected deletion of internal data in G4BSplineCurve::Project() method.
     41- Fixed possible leak in G4BezierSurface::ClipSurface() method, and fixed
     42  case of dereferenciation of null pointer.
     43- Fixed leak in destructor of G4ToroidalSurface.
     44- Added dummy initialisation of static data in G4BoundingBox3D,
     45  G4ProjectedSurface and G4Surface.
     46
     4713/07/2010 : G. Cosmo          breps-V09-03-01
     48- Fixed compilation warning on Linux for G4Surface...
     49
     5005/07/2010 : G. Cosmo          breps-V09-03-00
     51- G4Hyperbola: corrected signature to internal Init() function to avoid
     52  parameter passed by value.
     53- G4Assembly: corrected case of invalid iterator in destructor.
     54- G4BREPSolid: corrected logic in IsConvex(), avoiding explicit memory leak.
     55- G4BSplineCurve: corrected initialization of null pointer in Project();
     56  removed useless typedef.
     57- G4CompositeCurve, G4SurfaceBoundary: corrected cases of invalid iterator.
     58- G4OsloMatrix: fixed leak in construction of G4PointMatrix.
     59- Added fake initializations to constructors in G4BREPSolid, G4Assembly,
     60  G4BREPSolidPCone, G4BREPSolidPolyhedra, G4BSplineSurface, G4BezierSurface,
     61  G4BoundingBox3D, G4CircularCurve, G4Curve, G4CurvePoint, G4Ellipse,
     62  G4FCylindricalSurface, G4FPlane, G4Hyperbola, G4KnotVector, G4OsloMatrix,
     63  G4Parabola, G4ProjectedSurface, G4Ray, G4RectangularTrimmedSurface,
     64  G4Surface, G4ToroidalSurface.
     65- Code cleanup in G4ConicalSurface, GCylindricalSurface and G4SpericalSurface.
    1966
    206708/07/2008 : G. Cosmo          breps-V09-01-02

  • trunk/source/geometry/solids/BREPS/test/CurveTest.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: CurveTest.cc,v 1.6 2006/06/29 18:43:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/CurveTestFunction.hh

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: CurveTestFunction.hh,v 1.9 2007/05/18 10:31:11 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/G4BREPIOtest.cc

    r1316 r1347  
    2525//
    2626// $Id: G4BREPIOtest.cc,v 1.6 2006/06/29 18:43:05 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// ----------------------------------------------------------------------

  • trunk/source/geometry/solids/BREPS/test/G4BREPSolidBoxTest.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: G4BREPSolidBoxTest.cc,v 1.9 2006/06/29 18:43:07 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/G4BREPSolidConeTest.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: G4BREPSolidConeTest.cc,v 1.11 2006/06/29 18:43:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/G4BREPSolidCylinderTest.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: G4BREPSolidCylinderTest.cc,v 1.11 2006/06/29 18:43:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/G4BREPSolidPConeTest.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: G4BREPSolidPConeTest.cc,v 1.16 2006/06/29 18:43:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/G4BREPSolidPolyhedraTest.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: G4BREPSolidPolyhedraTest.cc,v 1.12 2006/06/29 18:43:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/G4BREPSolidSphereTest.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: G4BREPSolidSphereTest.cc,v 1.10 2006/06/29 18:43:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/G4BREPSolidTorusTest.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: G4BREPSolidTorusTest.cc,v 1.10 2006/06/29 18:43:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/G4FPlaneTest.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: G4FPlaneTest.cc,v 1.8 2007/05/18 10:31:11 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/BREPS/test/testG4BREPSolidOpenPCone.cc

    r1316 r1347  
    2626//////////////////////////////////////////////////////////////////////////
    2727// $Id: testG4BREPSolidOpenPCone.cc,v 1.7 2006/06/29 18:43:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//////////////////////////////////////////////////////////////////////////
    3030//

  • trunk/source/geometry/solids/Boolean/GNUmakefile

    r831 r1347  
    1 # $Id: GNUmakefile,v 1.6 2005/05/09 13:44:58 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.8 2010/10/27 07:34:32 gcosmo Exp $
    22# ----------------------------------------------------------------
    33# GNUmakefile for geometry/CSG library.  Gabriele Cosmo, 16/11/96.

  • trunk/source/geometry/solids/Boolean/History

    r1315 r1347  
    11
    2 $Id: History,v 1.64 2010/05/11 15:04:01 gcosmo Exp $
     2$Id: History,v 1.67 2010/10/20 07:31:58 gcosmo Exp $
    33-------------------------------------------------------------------
    44
    … …  
    2020     * Reverse chronological order (last date on top), please *
    2121     ----------------------------------------------------------
     22
     23 October 19, 2010  G.Cosmo                geom-bool-V09-03-03
     24  - Implemented Clone() virtual method for all solids, returning a pointer
     25    to a dynamically allocated copy of the solid. To be used by Geant4-MT.
     26
     27 September 22, 2010  G.Cosmo              geom-bool-V09-03-02
     28  - Implemented copy-constructor and assignment operator for concrete
     29    solids classes to facilitate conversion to Geant4-MT.
     30
     31 July 7, 2010  G.Cosmo                    geom-bool-V09-03-01
     32  - Simplified logic in G4UnionSolid::Inside() to exclude obvious
     33    conditional cases.
    2234
    2335 May 11, 2010  J.Allison                  geom-bool-V09-03-00

  • trunk/source/geometry/solids/Boolean/test/ApproxEqual.hh

    r1316 r1347  
    2626//
    2727// $Id: ApproxEqual.hh,v 1.6 2006/06/29 18:43:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/GNUmakefile

    r831 r1347  
    1 # $Id: GNUmakefile,v 1.7 2005/05/09 13:47:24 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.9 2010/10/27 07:34:32 gcosmo Exp $
    22# ----------------------------------------------------------------
    33# GNUmakefile for geometry/CSG library.  Gabriele Cosmo, 16/11/96.

  • trunk/source/geometry/solids/CSG/History

    r1315 r1347  
    1 $Id: History,v 1.121 2010/05/25 09:19:02 gcosmo Exp $
     1$Id: History,v 1.135 2010/11/23 14:46:11 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     20Nov 23, 2010  G.Cosmo                    geom-csg-V09-03-14 & V09-03-12
     21- Fixed one left cases of cout precision restoring in G4Sphere.
     22
     23Oct 19, 2010  G.Cosmo                    geom-csg-V09-03-11
     24- Implemented Clone() virtual method for all solids, returning a pointer to a
     25  dynamically allocated copy of the solid. To be used by Geant4-MT.
     26
     27Sep 23, 2010  G.Cosmo                    geom-csg-V09-03-10
     28- Initialize fpPolyhedron to zero in G4CSGSolid copy-ctor and operator=().
     29
     30Sep 22, 2010  G.Cosmo                    geom-csg-V09-03-09
     31- Relaxed checking condition on SetOuterRadius() method to avoid
     32  restrictions in order of calls for modifiers.
     33
     34Sep 17, 2010  G.Cosmo                    geom-csg-V09-03-08
     35- Implemented copy-constructor and assignment operator for all solids
     36  to facilitate conversion to Geant4-MT.
     37
     38Sep 17, 2010  G.Cosmo                    geom-csg-V09-03-07
     39- Added missing validity checks on radii to modifiers in G4Tubs.
     40
     41Sep 07, 2010  G.Cosmo                    geom-csg-V09-03-06
     42- Fix within G4CSGDEBUG code for restoring cout precision.
     43
     44Aug 23, 2010  G.Cosmo                    geom-csg-V09-03-05
     45- G4Cons: fixed trivial compilation warning on Linux.
     46
     47Aug 19, 2010  T.Nikitina                 geom-csg-V09-03-04
     48- G4Torus: fix in DistanceToOut(p,v,...) to address problem report #1081.
     49
     50Jul 12, 2010  G.Cosmo                    geom-csg-V09-03-03
     51- Fixed condition in G4Tubs::Inside(p) for point on surface (T.Nikitina).
     52- Corrected use of std::fabs() in place of std::abs() in G4Tubs, G4Cons,
     53  G4Sphere and G4Torus. Use pre-computed half-tolerance constants in G4Torus.
     54
     55Jul 08, 2010  G.Cosmo                    geom-csg-V09-03-02
     56- Improved initialisation logic in constructor for: G4Box, G4Cons, G4Orb,
     57  G4Para, G4Sphere, G4Torus, G4Trap, G4Trd, G4Tubs.
     58- Corrected cases of not-restored cout precision in: G4Box, G4Cons, G4Orb,
     59  G4Para, G4Torus, G4Trap, G4Tubs.
     60- G4Torus: fixed call to internal method for finding roots, to avoid copy
     61  of sdt::vector() by parameters. Some cleanup to avoid unnecessary protected
     62  section and virtual table.
     63- Updated unit test for G4Sphere (V.Grichine).
    1964
    2065May 25, 2010  G.Cosmo                    geom-csg-V09-03-01

  • trunk/source/geometry/solids/CSG/test/ApproxEqual.hh

    r1316 r1347  
    2626//
    2727// $Id: ApproxEqual.hh,v 1.5 2006/06/29 18:45:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Box.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Box.cc,v 1.9 2006/06/29 18:45:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Cons1.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Cons1.cc,v 1.8 2007/04/23 13:58:39 grichine Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Cons2.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Cons2.cc,v 1.21 2009/11/12 10:40:45 tnikitin Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Simple test of G4Cons

  • trunk/source/geometry/solids/CSG/test/testG4Orb.cc

    r1316 r1347  
    2626
    2727// $Id: testG4Orb.cc,v 1.7 2009/01/29 16:54:51 grichine Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// G4Orb Test File

  • trunk/source/geometry/solids/CSG/test/testG4Para1.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Para1.cc,v 1.8 2006/06/29 18:46:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030 

  • trunk/source/geometry/solids/CSG/test/testG4Para2.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Para2.cc,v 1.6 2006/06/29 18:46:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Test of G4Para

  • trunk/source/geometry/solids/CSG/test/testG4Sphere.cc

    r1316 r1347  
    2525//
    2626
    27 // $Id: testG4Sphere.cc,v 1.29 2009/05/14 13:22:44 tnikitin Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     27// $Id: testG4Sphere.cc,v 1.30 2010/03/24 09:50:03 grichine Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// G4Sphere Test File
    … …  
    9696{
    9797    G4double kAngTolerance = G4GeometryTolerance::GetInstance()->GetAngularTolerance();
    98 
     98    EInside inside;
    9999    G4int i, iMax;
    100100    G4double Dist, vol, volCheck;
    … …  
    292292   G4ThreeVector vb830(0.1644697995,0.18507236,0.9688642354);
    293293
     294
     295   G4Sphere      s18_03_10("s18_03_10", 47*mm, 48*mm, 0*deg, 200*deg, 80*deg, 100*deg);
     296   G4ThreeVector p18_03_10(43.37539710867407*mm, 16.12036885157033*mm, -8.224548565698871*mm);
     297   G4ThreeVector v18_03_10(-0.4161958548132512, 0.6603942936714858, -0.6250283092167956);
     298
     299   inside = s18_03_10.Inside(p18_03_10) ;
     300   G4cout<<"s18_03_10.Inside(p18_03_10 ... = "<<OutputInside(inside)<<G4endl ;
     301
     302
     303
    294304#ifdef NDEBUG
    295305    G4Exception("FAIL: *** Assertions must be compiled in! ***");
    … …  
    347357// Check G4Sphere::Inside
    348358
    349     EInside inside = s7.Inside(G4ThreeVector(1399.984667238032,
     359    inside = s7.Inside(G4ThreeVector(1399.984667238032,
    350360                                             5.9396696802500299,
    351361                                            -2.7661927818688308)  ) ;
    … …  
    501511     Dist=sn22.DistanceToOut(G4ThreeVector(-45.,0.,0.),vx,calcNorm,pgoodNorm,pNorm);
    502512     assert(ApproxEqual(Dist,45.));
    503      G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(0.,49.,0),G4ThreeVector(0,-1,0))<<G4endl;
    504      G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(-45.,0.,0),G4ThreeVector(1,0,0))<<G4endl;
     513G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(0.,49.,0),G4ThreeVector(0,-1,0))<<G4endl;
     514G4cout<<"Dist from Center ="<<sn22.DistanceToOut(G4ThreeVector(-45.,0.,0),G4ThreeVector(1,0,0))<<G4endl;
    505515
    506516     //
    … …  
    10491059                           G4double  d,    G4ThreeVector dir,    EInside  exp);
    10501060
    1051         G4Sphere SpAroundX("SpAroundX",  10.*mm, 1000.*mm, -1.0*degree, 2.0*degree, 0.*degree, 180.0*degree );
     1061  G4Sphere SpAroundX("SpAroundX",  10.*mm, 1000.*mm, -1.0*degree, 2.0*degree, 0.*degree, 180.0*degree );
    10521062
    10531063        G4double  sinOneDeg = std::sin( 1.0 * degree );
    … …  
    10911101
    10921102        // Try the edges 
    1093         G4ThreeVector  NegEdgePt( radOne * std::cos(-270.0*degree), radOne * std::sin(-270.0*degree), 0.0);
     1103  G4ThreeVector  NegEdgePt( radOne * std::cos(-270.0*degree), radOne * std::sin(-270.0*degree), 0.0);
    10941104        G4ThreeVector  PosEdgePt( radOne * std::cos(10.0*degree), radOne * std::sin(10.0*degree), 0.0);
    10951105

  • trunk/source/geometry/solids/CSG/test/testG4Sphere2.cc

    r1316 r1347  
    2626
    2727// $Id: testG4Sphere2.cc,v 1.6 2007/05/18 10:24:32 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// G4Sphere Test File

  • trunk/source/geometry/solids/CSG/test/testG4Torus.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Torus.cc,v 1.16 2007/05/18 10:24:32 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Trap.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Trap.cc,v 1.13 2006/06/29 18:46:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/CSG/test/testG4Trd.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Trd.cc,v 1.10 2006/06/29 18:46:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030 

  • trunk/source/geometry/solids/CSG/test/testG4Tubs.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Tubs.cc,v 1.22 2008/11/05 13:56:30 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/specific/GNUmakefile

    r831 r1347  
    1 # $Id: GNUmakefile,v 1.6 2007/05/23 09:31:15 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.8 2010/10/27 07:34:32 gcosmo Exp $
    22# ----------------------------------------------------------------------------
    33# GNUmakefile for geometry/solids/specific library.  Gabriele Cosmo, 05/04/00.

  • trunk/source/geometry/solids/specific/History

    r1337 r1347  
    1 $Id: History,v 1.171 2010/06/16 08:46:50 gcosmo Exp $
     1$Id: History,v 1.186 2010/11/26 13:36:35 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     2026-Nov-2010  T.Nikitina (geom-specific-V09-03-20)
     21- Fixes in G4GenericTrap reported by SBT unit test in SurfaceNormal(),
     22  DistanceToPlane() and VisExtent().
     23
     2416-Nov-2010  T.Nikitina (geom-specific-V09-03-19)
     25- G4EllipticalCone: fixes in DistanceToIn(p,v) and DistanceToOut(p,v) for
     26  correct handling of point on the surface.
     27  Corrected formula for SurfaceNormal(p).
     28
     2910-Nov-2010  T.Nikitina (geom-specific-V09-03-18)
     30- Added checks on crossing of vertices and too big twisted angle in
     31  G4GenericTrap.
     32- Fixed case of division by zero in G4TwistedTubs.
     33- Added unit test for G4Polyhedra.
     34
     3502-Nov-2010  G.Cosmo (geom-specific-V09-03-17)
     36- More fixes on Coverity reports for G4TessellatedSolid and G4ReduciblePolygon.
     37
     3820-Oct-2010  G.Cosmo (geom-specific-V09-03-16)
     39- Implemented Clone() virtual method for all solids, returning a pointer
     40  to a dynamically allocated copy of the solid. To be used by Geant4-MT.
     41
     4223-Sep-2010  G.Cosmo (geom-specific-V09-03-15)
     43- Initialize fpPolyhedron to zero in copy-ctor and operator=().
     44- Completed implementation of copy-ctor and operator=() for facets.
     45
     4620-Sep-2010  G.Cosmo (geom-specific-V09-03-14)
     47- Implemented copy-constructor and assignment operator for all solids
     48  to facilitate conversion to Geant4-MT.
     49
     5008-Sep-2010  G.Cosmo (geom-specific-V09-03-13)
     51- Correction to previous fix in G4ReduciblePolygon to avoid deleting current
     52  'vertexHead' pointer.
     53
     5407-Sep-2010  G.Cosmo (geom-specific-V09-03-12)
     55- Fix within G4CSGDEBUG code for restoring cout precision.
     56- Fix in G4ReduciblePolygon::RemoveRedundantVertices() to avoid potential
     57  case of dereferencing freed pointer.
     58
     5919-Aug-2010  T.Nikitina (geom-specific-V09-03-11)
     60- G4EllipticalTube: extended implementation of SurfaceNormal(p) in agreement
     61  with canonical form. Added unit test testG4EllipticalTube.cc.
     62
     6316-Jul-2010  G.Cosmo (geom-specific-V09-03-10)
     64- Fixed cases of division by zero in G4VTwistSurface and G4TwistBoxSide.
     65- Use INT_MAX as initialisation for max limits in G4SolidExtentList.
     66
     6712-Jul-2010  G.Cosmo (geom-specific-V09-03-09)
     68- Added dummy initialization to members in struct
     69  G4PolyPhiFace::G4PolyPhiFaceEdge, struct G4ReduciblePolygon::ABVertex.
     70  G4Ellipsoid, G4EllipticalTube, G4EnclosingCylinder, G4ExtrudedSolid, G4Hype,
     71  G4IntersectingCone, G4Paraboloid, G4PolyPhiFace, G4Polycone, G4PolyconeSide,
     72  G4Polyhedra, G4PolyhedraSide, G4QuadrangularFacet, G4ReduciblePolygon,
     73  G4TessellatedSolid, G4TriangularFacet, G4TwistBoxSide, G4TwistTrapAlphaSide,
     74  G4TwistTrapFlatSide, G4TwistTrapParallelSide, G4TwistTubsFlatSide,
     75  G4TwistTubsHypeSide, G4TwistTubsSide, G4TwistedTubs, G4VCSGfaceted, G4VFacet,
     76  G4VTwistSurface, G4VTwistedFaceted.
     77- Fixed case of dereferencing null pointer in methods
     78  G4EllipticalTube::DistanceToOut(p,v), G4VCSGfaceted::DistanceToIn(p,v)
     79  and G4VCSGfaceted::DistanceToOut(p,v).
     80- Fixed unecessary object copy as argument in method
     81  G4PolyhedraSide::IntersectSidePlane().
     82- Avoid possible case of derefencing null pointer in G4ReduciblePolygon
     83  RemoveDuplicateVertices() and RemoveRedundantVertices() methods.
     84- Replaced calls to std::abs() with std::fabs() where suitable.
    1985
    208616-Jun-2010  G.Cosmo (geom-specific-V09-03-08)

  • trunk/source/geometry/solids/specific/test/ApproxEqual.hh

    r1316 r1347  
    2626//
    2727// $Id: ApproxEqual.hh,v 1.4 2006/06/29 18:49:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/specific/test/testG4Ellipsoid.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Ellipsoid.cc,v 1.5 2007/02/09 12:05:51 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// testG4Ellipsoid

  • trunk/source/geometry/solids/specific/test/testG4ExtrudedSolid.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4ExtrudedSolid.cc,v 1.4 2008/02/27 12:33:20 ivana Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// testG4ExtrudedSolid

  • trunk/source/geometry/solids/specific/test/testG4Hype.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Hype.cc,v 1.8 2006/06/29 18:49:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/TExCad.cc

    r1316 r1347  
    2626//
    2727// $Id: TExCad.cc,v 1.2 2006/06/29 18:49:57 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01DetectorConstruction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01DetectorConstruction.hh,v 1.2 2006/06/29 18:49:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01PhysicsList.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01PhysicsList.hh,v 1.2 2006/06/29 18:50:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01PrimaryGeneratorAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:50:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01RunAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01RunAction.hh,v 1.2 2006/06/29 18:50:05 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/include/TEx01VisManager.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01VisManager.hh,v 1.2 2006/06/29 18:50:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01DetectorConstruction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01DetectorConstruction.cc,v 1.3 2007/05/18 10:36:48 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01PhysicsList.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01PhysicsList.cc,v 1.2 2006/06/29 18:50:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01PrimaryGeneratorAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 18:50:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01RunAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01RunAction.cc,v 1.2 2006/06/29 18:50:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Cad/src/TEx01VisManager.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01VisManager.cc,v 1.3 2007/05/18 10:36:48 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/TExMixed.cc

    r1316 r1347  
    2626//
    2727// $Id: TExMixed.cc,v 1.2 2006/06/29 18:50:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/include/TEx01DetectorConstruction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01DetectorConstruction.hh,v 1.2 2006/06/29 18:51:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/include/TEx01PhysicsList.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01PhysicsList.hh,v 1.2 2006/06/29 18:51:22 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/include/TEx01PrimaryGeneratorAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:51:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/include/TEx01RunAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01RunAction.hh,v 1.2 2006/06/29 18:51:26 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/src/TEx01DetectorConstruction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01DetectorConstruction.cc,v 1.2 2006/06/29 18:51:28 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/src/TEx01PhysicsList.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01PhysicsList.cc,v 1.2 2006/06/29 18:51:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/src/TEx01PrimaryGeneratorAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 18:51:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Mixed/src/TEx01RunAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01RunAction.cc,v 1.2 2006/06/29 18:51:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/TExQuadr.cc

    r1316 r1347  
    2626//
    2727// $Id: TExQuadr.cc,v 1.2 2006/06/29 18:51:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01DetectorConstruction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01DetectorConstruction.hh,v 1.2 2006/06/29 18:51:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01PhysicsList.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01PhysicsList.hh,v 1.2 2006/06/29 18:51:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01PrimaryGeneratorAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:51:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01RunAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01RunAction.hh,v 1.2 2006/06/29 18:51:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/include/TEx01VisManager.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01VisManager.hh,v 1.2 2006/06/29 18:51:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01DetectorConstruction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01DetectorConstruction.cc,v 1.3 2007/05/18 10:39:04 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01PhysicsList.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01PhysicsList.cc,v 1.2 2006/06/29 18:51:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01PrimaryGeneratorAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 18:51:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01RunAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01RunAction.cc,v 1.2 2006/06/29 18:52:05 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Quadr/src/TEx01VisManager.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01VisManager.cc,v 1.3 2007/05/18 10:39:04 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/TExTria.cc

    r1316 r1347  
    2626//
    2727// $Id: TExTria.cc,v 1.2 2006/06/29 18:52:11 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01DetectorConstruction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01DetectorConstruction.hh,v 1.2 2006/06/29 18:52:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01PhysicsList.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01PhysicsList.hh,v 1.2 2006/06/29 18:52:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01PrimaryGeneratorAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01PrimaryGeneratorAction.hh,v 1.2 2006/06/29 18:52:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01RunAction.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01RunAction.hh,v 1.2 2006/06/29 18:52:19 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/include/TEx01VisManager.hh

    r1316 r1347  
    2626//
    2727// $Id: TEx01VisManager.hh,v 1.2 2006/06/29 18:52:21 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01DetectorConstruction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01DetectorConstruction.cc,v 1.5 2007/05/18 10:40:29 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01PhysicsList.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01PhysicsList.cc,v 1.2 2006/06/29 18:52:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01PrimaryGeneratorAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01PrimaryGeneratorAction.cc,v 1.2 2006/06/29 18:52:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01RunAction.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01RunAction.cc,v 1.2 2006/06/29 18:52:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/specific/test/testG4Tess_Tria/src/TEx01VisManager.cc

    r1316 r1347  
    2626//
    2727// $Id: TEx01VisManager.cc,v 1.3 2007/05/18 10:40:29 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/specific/test/testG4Tet.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Tet.cc,v 1.3 2006/06/29 18:49:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/solids/specific/test/testPointOnSurfacePoly.cc

    r1316 r1347  
    2626//
    2727// $Id: testPointOnSurfacePoly.cc,v 1.3 2008/04/25 08:50:00 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/OpticalEscape/AXPETDemonstrator.cc

    r1316 r1347  
    2626//
    2727// $Id: AXPETDemonstrator.cc,v 1.1 2008/09/03 13:34:03 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/OpticalEscape/src/AXPETDetectorConstruction.cc

    r1316 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: AXPETDetectorConstruction.cc,v 1.1 2008/09/03 13:34:03 gcosmo Exp $
     26// $Id: AXPETDetectorConstruction.cc,v 1.2 2010/11/16 13:35:53 tnikitin Exp $
    2727// ------------------------------------------------------------
    2828// Geant4 class implementation file
    … …  
    5252#include "G4Trd.hh"
    5353#include "G4Tet.hh"
     54#include "G4GenericTrap.hh"
     55#include "G4TessellatedSolid.hh"
     56#include "G4ExtrudedSolid.hh"
    5457
    5558#include "G4Polycone.hh"
    … …  
    6063#include "G4TwistedTrd.hh"
    6164#include "G4TwistedTrap.hh"
     65
     66#include "G4TwoVector.hh"
     67#include "G4TriangularFacet.hh"
     68#include "G4QuadrangularFacet.hh"
    6269
    6370#include "G4BooleanSolid.hh"
    … …  
    488495  else if ( val == "Tet" )
    489496  {
    490 
    491       G4ThreeVector pzero(0,0,0);
    492       G4ThreeVector pnt1(1.,0.,0.),pnt2(0,1.,0.), pnt3(0,0.,1.);
    493       G4Tet   t1( "aTet", pzero, pnt1, pnt2, pnt3);
     497    G4ThreeVector anchor = G4ThreeVector(  0,    0, 0);
     498    G4ThreeVector     p2 = G4ThreeVector(1.0,  0.5, 0);
     499    G4ThreeVector     p3 = G4ThreeVector(0.5,  1.0, 0);
     500    G4ThreeVector     p4 = G4ThreeVector(0.5,  0.5, 1.0);
     501   
     502    aVolume = new G4Tet("aTet",anchor,p2,p3,p4);
    494503  }
    495504  else if ( val == "Trap")
    … …  
    539548
    540549  }
     550
     551 else if (val == "TwistedBox")
     552  {
     553    aVolume = new G4TwistedBox("aTwistedBox",40*deg,0.5,1.0,1.5);
     554  }
     555  else if (val == "TwistedTrd")
     556  {
     557    aVolume = new G4TwistedTrd("aTwistedTrd",0.5,1.0,0.8,1.5,1.8,20*deg);
     558  }
     559  else if (val == "TwistedTrap")
     560  {
     561    aVolume = new G4TwistedTrap("aTwistedTrap",40*deg,0.5,1.0,0.8,1.5);
     562  }
     563  else if ( val == "TwistedTrap2")
     564  {
     565    aVolume = new G4TwistedTrap("aTwistedTrap2",
     566                                   20*deg,    // twist angle
     567                                   0.80,         // half z length
     568                                   10*deg,      // direction between end planes
     569                                   40*deg,        // defined by polar and azimutal angles.
     570                                   0.8,        // half y length at -pDz
     571                                   1.1,        // half x length at -pDz,-pDy
     572                                   1.6,        // half x length at -pDz,+pDy
     573                                   0.8,        // half y length at +pDz
     574                                   1.1,         // half x length at +pDz,-pDy
     575                                   1.6,        // half x length at +pDz,+pDy
     576                                   -50*deg        // tilt angle at +pDz
     577                                   ) ;
     578  }
     579  else if ( val == "TwistedTubs")
     580  {
     581    aVolume = new G4TwistedTubs("aTwistedTubs",10.*deg,1.0,2.,4.,171.*deg);
     582
     583  }
     584 else if (val == "GenericTrap" ){
     585   std::vector<G4TwoVector> vertices;
     586   vertices.push_back(G4TwoVector( -4.5, -4.5));
     587   vertices.push_back(G4TwoVector( -4.5,  4.5));
     588   vertices.push_back(G4TwoVector(  4.5,  4.5));
     589   vertices.push_back(G4TwoVector(  4.5, -4.5));
     590   vertices.push_back(G4TwoVector( -3.5, -3.5));
     591   vertices.push_back(G4TwoVector( -3.5,  3.5));
     592   vertices.push_back(G4TwoVector(  3.5,  3.5));
     593   vertices.push_back(G4TwoVector(  3.5, -2.5));     
     594   aVolume = new G4GenericTrap("aGenTrd",4.,vertices);
     595  }
     596else if(val == "TessellatedSolid")
     597  {
     598    G4double targetSize = 2.;
     599    G4TessellatedSolid* aVolume1 = new G4TessellatedSolid("aTessellatedSolid");
     600    G4TriangularFacet *facet1 = new
     601    G4TriangularFacet (G4ThreeVector(-targetSize,-targetSize,        0.0),
     602                     G4ThreeVector(+targetSize,-targetSize,        0.0),
     603                     G4ThreeVector(        0.0,        0.0,+targetSize),
     604                     ABSOLUTE);
     605    G4TriangularFacet *facet2 = new
     606    G4TriangularFacet (G4ThreeVector(+targetSize,-targetSize,        0.0),
     607                     G4ThreeVector(+targetSize,+targetSize,        0.0),
     608                     G4ThreeVector(        0.0,        0.0,+targetSize),
     609                     ABSOLUTE);
     610    G4TriangularFacet *facet3 = new
     611    G4TriangularFacet (G4ThreeVector(+targetSize,+targetSize,        0.0),
     612                     G4ThreeVector(-targetSize,+targetSize,        0.0),
     613                     G4ThreeVector(        0.0,        0.0,+targetSize),
     614                     ABSOLUTE);
     615    G4TriangularFacet *facet4 = new
     616    G4TriangularFacet (G4ThreeVector(-targetSize,+targetSize,        0.0),
     617                     G4ThreeVector(-targetSize,-targetSize,        0.0),
     618                     G4ThreeVector(        0.0,        0.0,+targetSize),
     619                     ABSOLUTE);
     620    G4QuadrangularFacet *facet5 = new
     621    G4QuadrangularFacet (G4ThreeVector(-targetSize,-targetSize,        0.0),
     622                     G4ThreeVector(-targetSize,+targetSize,        0.0),
     623                     G4ThreeVector(+targetSize,+targetSize,        0.0),
     624                     G4ThreeVector(+targetSize,-targetSize,        0.0),
     625                     ABSOLUTE);
     626
     627    aVolume1->AddFacet((G4VFacet*) facet1);
     628    aVolume1->AddFacet((G4VFacet*) facet2);
     629    aVolume1->AddFacet((G4VFacet*) facet3);
     630    aVolume1->AddFacet((G4VFacet*) facet4);
     631    aVolume1->AddFacet((G4VFacet*) facet5);
     632 
     633    aVolume1->SetSolidClosed(true);
     634
     635    aVolume = aVolume1;
     636
     637  }
     638  else if (val == "ExtrudedSolid")
     639  {
     640   std::vector<G4TwoVector> polygon;
     641   polygon.push_back(G4TwoVector(-3., -3.0));
     642   polygon.push_back(G4TwoVector(-3.,  3.0));
     643   polygon.push_back(G4TwoVector( 3.,  3.0));
     644   polygon.push_back(G4TwoVector( 3., -3.0));
     645   polygon.push_back(G4TwoVector( 1.5, -3.0));
     646   polygon.push_back(G4TwoVector( 1.5,  1.5));
     647   polygon.push_back(G4TwoVector(-1.5,  1.5));
     648   polygon.push_back(G4TwoVector(-1.5, -3.0));
     649 
     650   std::vector<G4ExtrudedSolid::ZSection> zsections;
     651   zsections.push_back(G4ExtrudedSolid::ZSection(-4.0, G4TwoVector(-2.0, 1.0), 1.5));
     652   zsections.push_back(G4ExtrudedSolid::ZSection( 1.0, G4TwoVector(  0,  0), 0.5));
     653   zsections.push_back(G4ExtrudedSolid::ZSection( 1.5, G4TwoVector(  0,  0), 0.7));
     654   zsections.push_back(G4ExtrudedSolid::ZSection( 4.0, G4TwoVector( 2.0, 2.0), 0.9));
     655
     656   aVolume = new G4ExtrudedSolid("aExtrudedSolid", polygon, zsections);
     657  }
     658
     659
    541660  else
    542661    { G4cout <<"DetectorConstruction tried to select "<<val<<G4endl;

  • trunk/source/geometry/solids/test/OpticalEscape/src/AXPETDetectorMessenger.cc

    r1316 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: AXPETDetectorMessenger.cc,v 1.1 2008/09/03 13:34:03 gcosmo Exp $
     26// $Id: AXPETDetectorMessenger.cc,v 1.2 2010/11/16 13:36:00 tnikitin Exp $
    2727// ------------------------------------------------------------
    2828// Geant4 class implementation file
    … …  
    5656  selDetCmd->SetDefaultValue("Tubs");
    5757
    58  selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere  Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube");
     58 selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere  Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube Tet GenericTrap TwistedBox TwistedTrd TwistedTrap TwistedTubs TessellatedSolid ExtrudedSolid");
    5959  selDetCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
    6060

  • trunk/source/geometry/solids/test/OpticalEscape/src/AXPETPhysicsList.cc

    r1316 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: AXPETPhysicsList.cc,v 1.1 2008/09/03 13:34:03 gcosmo Exp $
     26// $Id: AXPETPhysicsList.cc,v 1.2 2010/11/16 13:38:09 tnikitin Exp $
    2727// ------------------------------------------------------------
    2828// Geant4 class implementation file
    … …  
    129129#include "G4PhotoElectricEffect.hh"
    130130
    131 #include "G4MultipleScattering.hh"
     131#include "G4eMultipleScattering.hh"
     132#include "G4MuMultipleScattering.hh"
     133#include "G4hMultipleScattering.hh"
    132134
    133135#include "G4eIonisation.hh"
    … …  
    159161    //electron
    160162      // Construct processes for electron
    161       pmanager->AddProcess(new G4MultipleScattering(),-1, 1, 1);
     163      pmanager->AddProcess(new G4eMultipleScattering(),-1, 1, 1);
    162164      pmanager->AddProcess(new G4eIonisation(),       -1, 2, 2);
    163165      pmanager->AddProcess(new G4eBremsstrahlung(),   -1, 3, 3);
    … …  
    166168    //positron
    167169      // Construct processes for positron
    168       pmanager->AddProcess(new G4MultipleScattering(),-1, 1, 1);
     170      pmanager->AddProcess(new G4eMultipleScattering(),-1, 1, 1);
    169171      pmanager->AddProcess(new G4eIonisation(),       -1, 2, 2);
    170172      pmanager->AddProcess(new G4eBremsstrahlung(),   -1, 3, 3);
    … …  
    175177    //muon
    176178     // Construct processes for muon
    177      pmanager->AddProcess(new G4MultipleScattering(),-1, 1, 1);
     179     pmanager->AddProcess(new G4MuMultipleScattering(),-1, 1, 1);
    178180     pmanager->AddProcess(new G4MuIonisation(),      -1, 2, 2);
    179181     pmanager->AddProcess(new G4MuBremsstrahlung(),  -1, 3, 3);
    … …  
    184186          (particle->GetParticleName() != "chargedgeantino")) {
    185187     // all others charged particles except geantino
    186        pmanager->AddProcess(new G4MultipleScattering(),-1,1,1);
     188       pmanager->AddProcess(new G4hMultipleScattering(),-1,1,1);
    187189       pmanager->AddProcess(new G4hIonisation(),       -1,2,2);
    188190     }
    … …  
    222224    G4String particleName = particle->GetParticleName();
    223225    if (theCerenkovProcess->IsApplicable(*particle)) {
    224       // pmanager->AddContinuousProcess(theCerenkovProcess);
    225226        pmanager->AddProcess(theCerenkovProcess);
    226227        pmanager->SetProcessOrdering(theCerenkovProcess,idxPostStep);

  • trunk/source/geometry/solids/test/SolidsChecker/SolidsChecker.cc

    r1316 r1347  
    2626//
    2727// $Id: SolidsChecker.cc,v 1.4 2006/10/20 14:51:40 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/include/Sc01EventActionMessenger.hh

    r1316 r1347  
    2626//
    2727// $Id: Sc01EventActionMessenger.hh,v 1.2 2006/06/29 18:53:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/include/Sc01VisManager.hh

    r1316 r1347  
    2626//
    2727// $Id: Sc01VisManager.hh,v 1.2 2006/06/29 18:53:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/include/SteppingAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SteppingAction.hh,v 1.2 2006/06/29 18:53:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/src/Sc01EventActionMessenger.cc

    r1316 r1347  
    2626//
    2727// $Id: Sc01EventActionMessenger.cc,v 1.2 2006/06/29 18:54:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/src/Sc01VisManager.cc

    r1316 r1347  
    2626//
    2727// $Id: Sc01VisManager.cc,v 1.3 2007/05/18 11:03:28 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SolidsChecker/src/SteppingAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SteppingAction.cc,v 1.3 2006/06/29 18:54:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceChecker/SurfaceChecker.cc

    r1316 r1347  
    2626//
    2727// $Id: SurfaceChecker.cc,v 1.3 2006/10/20 14:43:18 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCDetectorConstruction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCDetectorConstruction.hh,v 1.6 2006/12/13 15:43:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCEventAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCEventAction.hh,v 1.2 2006/06/29 18:54:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCMagneticField.hh

    r1316 r1347  
    2626//
    2727// $Id: SCMagneticField.hh,v 1.2 2006/06/29 18:54:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCPhysicsList.hh

    r1316 r1347  
    2626//
    2727// $Id: SCPhysicsList.hh,v 1.2 2006/06/29 18:54:29 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCPrimaryGeneratorAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCPrimaryGeneratorAction.hh,v 1.3 2006/06/29 18:54:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCRunAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCRunAction.hh,v 1.2 2006/06/29 18:54:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCSteppingAction.hh

    r1316 r1347  
    2626//
    2727// $Id: SCSteppingAction.hh,v 1.2 2006/06/29 18:54:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCSteppingVerbose.hh

    r1316 r1347  
    2626//
    2727// $Id: SCSteppingVerbose.hh,v 1.2 2006/06/29 18:54:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//   This class manages the verbose outputs in G4SteppingManager.

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCTrackerHit.hh

    r1316 r1347  
    2626//
    2727// $Id: SCTrackerHit.hh,v 1.2 2006/06/29 18:54:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCTrackerSD.hh

    r1316 r1347  
    2626//
    2727// $Id: SCTrackerSD.hh,v 1.2 2006/06/29 18:54:41 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/include/SCVisManager.hh

    r1316 r1347  
    2626//
    2727// $Id: SCVisManager.hh,v 1.2 2006/06/29 18:54:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCDetectorConstruction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCDetectorConstruction.cc,v 1.9 2007/07/18 14:38:48 tnikitin Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCEventAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCEventAction.cc,v 1.2 2006/06/29 18:54:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCMagneticField.cc

    r1316 r1347  
    2626//
    2727// $Id: SCMagneticField.cc,v 1.2 2006/06/29 18:54:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929// 
    3030//   User Field class implementation.

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCPhysicsList.cc

    r1316 r1347  
    2626//
    2727// $Id: SCPhysicsList.cc,v 1.2 2006/06/29 18:54:55 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCPrimaryGeneratorAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCPrimaryGeneratorAction.cc,v 1.8 2006/12/13 15:43:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCRunAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCRunAction.cc,v 1.2 2006/06/29 18:54:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCSteppingAction.cc

    r1316 r1347  
    2626//
    2727// $Id: SCSteppingAction.cc,v 1.2 2006/06/29 18:55:01 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCSteppingVerbose.cc

    r1316 r1347  
    2626//
    2727// $Id: SCSteppingVerbose.cc,v 1.2 2006/06/29 18:55:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCSurfacePoint.hh

    r1316 r1347  
    2626//
    2727// $Id: SCSurfacePoint.hh,v 1.2 2006/06/29 18:55:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCTrackerHit.cc

    r1316 r1347  
    2626//
    2727// $Id: SCTrackerHit.cc,v 1.2 2006/06/29 18:55:09 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCTrackerSD.cc

    r1316 r1347  
    2626//
    2727// $Id: SCTrackerSD.cc,v 1.2 2006/06/29 18:55:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/source/geometry/solids/test/SurfaceChecker/src/SCVisManager.cc

    r1316 r1347  
    2626//
    2727// $Id: SCVisManager.cc,v 1.3 2007/05/18 11:04:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/SurfaceVisTest/SurfaceVisTest.cc

    r1316 r1347  
    4141
    4242//a pre-built physics list
    43 #include "QGSP_EMV.hh"
     43#include "QGSP_BERT_EMV.hh"
    4444
    4545//My includes
    … …  
    6969
    7070        //Set mandatory initialization and user action classes
    71         runManager->SetUserInitialization(new QGSP_EMV);
     71        runManager->SetUserInitialization(new QGSP_BERT_EMV);
    7272       
    7373        runManager->SetUserInitialization(new DetectorConstruction);

  • trunk/source/geometry/solids/test/SurfaceVisTest/src/DetectorConstruction.cc

    r1316 r1347  
    5151#include "G4Trd.hh"
    5252#include "G4Tet.hh"
     53#include "G4GenericTrap.hh"
     54#include "G4TessellatedSolid.hh"
     55#include "G4ExtrudedSolid.hh"
    5356
    5457#include "G4Polycone.hh"
    … …  
    6871
    6972#include "G4BREPSolidBox.hh"
     73#include "G4TwoVector.hh"
     74#include "G4TriangularFacet.hh"
     75#include "G4QuadrangularFacet.hh"
    7076
    7177#include "G4LogicalVolume.hh"
    … …  
    497503  else if ( val == "Tet" )
    498504  {
    499 
     505    //   G4ThreeVector anchor = G4ThreeVector(0, 0, 0);
     506    //G4ThreeVector     p2 = G4ThreeVector(10*cm, 5*cm , 0);
     507    //G4ThreeVector     p3 = G4ThreeVector(5*cm,10*cm,0);
     508    //G4ThreeVector     p4 = G4ThreeVector(5*cm,5*cm  ,10*cm);
     509   
     510    //aVolume = new G4Tet("aTet",anchor,p2,p3,p4);
    500511      G4ThreeVector pzero(0,0,0);
    501512      G4ThreeVector pnt1(10.*cm,0.*cm,0.*cm),pnt2(5.0*cm,10.*cm,0.*cm), pnt3(5.*cm,5.*cm,10.*cm);
    502513      G4bool  goodTet;
    503       G4Tet   t1( "aTet", pzero, pnt1, pnt2, pnt3, &goodTet);
     514      aVolume= new G4Tet( "aTet", pzero, pnt1, pnt2, pnt3, &goodTet);
    504515  }
    505516  else if ( val == "Trap")
    … …  
    549560
    550561  }
     562  else if (val == "GenericTrap" ){
     563   std::vector<G4TwoVector> vertices;
     564   vertices.push_back(G4TwoVector( -4.5*cm, -4.5*cm));
     565   vertices.push_back(G4TwoVector( -4.5*cm,  4.5*cm));
     566   vertices.push_back(G4TwoVector(  4.5*cm,  4.5*cm));
     567   vertices.push_back(G4TwoVector(  4.5*cm, -4.5*cm));
     568   vertices.push_back(G4TwoVector( -3.5*cm, -3.5*cm));
     569   vertices.push_back(G4TwoVector( -3.5*cm,  3.5*cm));
     570   vertices.push_back(G4TwoVector(  3.5*cm,  3.5*cm));
     571   vertices.push_back(G4TwoVector(  3.5*cm, -2.5*cm));     
     572   aVolume = new G4GenericTrap("aGenTrd",14.*cm,vertices);
     573  }
     574
     575 else if(val == "TessellatedSolid")
     576  {
     577    G4double targetSize = 10.*cm;
     578    G4TessellatedSolid* aVolume1 = new G4TessellatedSolid("aTessellatedSolid");
     579    G4TriangularFacet *facet1 = new
     580    G4TriangularFacet (G4ThreeVector(-targetSize,-targetSize,        0.0),
     581                     G4ThreeVector(+targetSize,-targetSize,        0.0),
     582                     G4ThreeVector(        0.0,        0.0,+targetSize),
     583                     ABSOLUTE);
     584    G4TriangularFacet *facet2 = new
     585    G4TriangularFacet (G4ThreeVector(+targetSize,-targetSize,        0.0),
     586                     G4ThreeVector(+targetSize,+targetSize,        0.0),
     587                     G4ThreeVector(        0.0,        0.0,+targetSize),
     588                     ABSOLUTE);
     589    G4TriangularFacet *facet3 = new
     590    G4TriangularFacet (G4ThreeVector(+targetSize,+targetSize,        0.0),
     591                     G4ThreeVector(-targetSize,+targetSize,        0.0),
     592                     G4ThreeVector(        0.0,        0.0,+targetSize),
     593                     ABSOLUTE);
     594    G4TriangularFacet *facet4 = new
     595    G4TriangularFacet (G4ThreeVector(-targetSize,+targetSize,        0.0),
     596                     G4ThreeVector(-targetSize,-targetSize,        0.0),
     597                     G4ThreeVector(        0.0,        0.0,+targetSize),
     598                     ABSOLUTE);
     599    G4QuadrangularFacet *facet5 = new
     600    G4QuadrangularFacet (G4ThreeVector(-targetSize,-targetSize,        0.0),
     601                     G4ThreeVector(-targetSize,+targetSize,        0.0),
     602                     G4ThreeVector(+targetSize,+targetSize,        0.0),
     603                     G4ThreeVector(+targetSize,-targetSize,        0.0),
     604                     ABSOLUTE);
     605
     606    aVolume1->AddFacet((G4VFacet*) facet1);
     607    aVolume1->AddFacet((G4VFacet*) facet2);
     608    aVolume1->AddFacet((G4VFacet*) facet3);
     609    aVolume1->AddFacet((G4VFacet*) facet4);
     610    aVolume1->AddFacet((G4VFacet*) facet5);
     611 
     612    aVolume1->SetSolidClosed(true);
     613
     614    aVolume = aVolume1;
     615
     616  }
     617  else if (val == "ExtrudedSolid")
     618  {
     619   std::vector<G4TwoVector> polygon;
     620   polygon.push_back(G4TwoVector(-3.*cm, -3.0*cm));
     621   polygon.push_back(G4TwoVector(-3.*cm,  3.0*cm));
     622   polygon.push_back(G4TwoVector( 3.*cm,  3.0*cm));
     623   polygon.push_back(G4TwoVector( 3.*cm, -3.0*cm));
     624   polygon.push_back(G4TwoVector( 1.5*cm, -3.0*cm));
     625   polygon.push_back(G4TwoVector( 1.5*cm,  1.5*cm));
     626   polygon.push_back(G4TwoVector(-1.5*cm,  1.5*cm));
     627   polygon.push_back(G4TwoVector(-1.5*cm, -3.0*cm));
     628 
     629   std::vector<G4ExtrudedSolid::ZSection> zsections;
     630   zsections.push_back(G4ExtrudedSolid::ZSection(-4.0*cm, G4TwoVector(-2.0*cm, 1.0*cm), 1.5));
     631   zsections.push_back(G4ExtrudedSolid::ZSection( 1.0*cm, G4TwoVector(  0*cm,  0*cm), 0.5));
     632   zsections.push_back(G4ExtrudedSolid::ZSection( 1.5*cm, G4TwoVector(  0*cm,  0*cm), 0.7));
     633   zsections.push_back(G4ExtrudedSolid::ZSection( 4.0*cm, G4TwoVector( 2.0*cm, 2.0*cm), 0.9));
     634
     635   aVolume = new G4ExtrudedSolid("aExtrudedSolid", polygon, zsections);
     636  }
     637   else if (val == "TwistedBox")
     638  {
     639    aVolume = new G4TwistedBox("aTwistedBox",40*deg,5*cm,10*cm,15*cm);
     640  }
     641  else if (val == "TwistedTrd")
     642  {
     643    aVolume = new G4TwistedTrd("aTwistedTrd",5*cm,10*cm,8*cm,15*cm,18*cm,20*deg);
     644  }
     645  else if (val == "TwistedTrap")
     646  {
     647    aVolume = new G4TwistedTrap("aTwistedTrap",40*deg,5*cm,10*cm,8*cm,15*cm);
     648  }
     649  else if ( val == "TwistedTrap2")
     650  {
     651    aVolume = new G4TwistedTrap("aTwistedTrap2",
     652                                   20*deg,    // twist angle
     653                                   80*cm,         // half z length
     654                                   10*deg,      // direction between end planes
     655                                   40*deg,        // defined by polar and azimutal angles.
     656                                   8*cm,        // half y length at -pDz
     657                                   11*cm,        // half x length at -pDz,-pDy
     658                                   16*cm,        // half x length at -pDz,+pDy
     659                                   8*cm,        // half y length at +pDz
     660                                   11*cm,         // half x length at +pDz,-pDy
     661                                   16*cm,        // half x length at +pDz,+pDy
     662                                   -50*deg        // tilt angle at +pDz
     663                                   ) ;
     664  }
     665  else if ( val == "TwistedTubs")
     666  {
     667    aVolume = new G4TwistedTubs("aTwistedTubs",10.*deg,1*cm,2*cm,4*cm,171.*deg);
     668
     669  }
    551670  else
    552671    { G4cout <<"DetectorConstruction tried to select "<<val<<G4endl;

  • trunk/source/geometry/solids/test/SurfaceVisTest/src/DetectorMessenger.cc

    r1316 r1347  
    4848  selDetCmd->SetDefaultValue("Polyhedra");
    4949
    50  selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere  Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube");
     50 selDetCmd->SetCandidates("Trap Trd Tet Sphere HalfSphere HollowSphere HalfHollowSphere  Ring Shell Orb Box Cons manyCons Tubs Hype Torus Para Paraboloid Polycone PolyconeGen PolyconeGenComplex Polyhedra PolyhedraGen PolyhedraGenComplex BREPBox Trd b1Ib2 b1Ub2 b1Sb2 b1Ub1 b1Ib1 b1Sb1 Ellipsoid EllipticalCone EllipticalTube GenericTrap TwistedBox TwistedTrd TwistedTrap TwistedTubs TessellatedSolid ExtrudedSolid Tet ");
    5151  selDetCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
    5252

  • trunk/source/geometry/solids/test/SurfaceVisTest/src/RunMessenger.cc

    r1316 r1347  
    2626//
    2727// $Id: RunMessenger.cc,v 1.1 2008/05/15 14:01:08 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/testPointOnSurface.cc

    r1316 r1347  
    2626//
    2727// $Id: testPointOnSurface.cc,v 1.5 2007/02/12 11:29:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/testSolidComparisons.cc

    r1316 r1347  
    2626//
    2727// $Id: testSolidComparisons.cc,v 1.6 2007/05/18 11:06:34 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/solids/test/testSurfaceArea.cc

    r1316 r1347  
    2626//
    2727// $Id: testSurfaceArea.cc,v 1.2 2007/02/12 11:29:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/solids/test/testSurfaceAreaCube.cc

    r1316 r1347  
    2626//
    2727// $Id: testSurfaceAreaCube.cc,v 1.1 2006/10/20 14:38:52 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// --------------------------------------------------------------------

  • trunk/source/geometry/volumes/GNUmakefile

    r831 r1347  
    1 # $Id: GNUmakefile,v 1.7 2004/06/11 14:17:19 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.10 2010/12/15 17:05:05 gcosmo Exp $
    22# --------------------------------------------------------------------
    33# GNUmakefile for geometry/volumes library.  Gabriele Cosmo, 16/11/96.
    … …  
    1212include $(G4INSTALL)/config/architecture.gmk
    1313
     14ifdef G4LIB_BUILD_DLL
     15  CPPFLAGS += -DG4LIB_BUILD_DLL
     16endif
    1417CPPFLAGS += -DG4GEOM_ALLOC_EXPORT
    1518CPPFLAGS += -I$(G4BASE)/graphics_reps/include \

  • trunk/source/geometry/volumes/History

    r1315 r1347  
    1 $Id: History,v 1.170 2010/04/23 10:27:49 gcosmo Exp $
     1$Id: History,v 1.173 2010/12/15 17:05:06 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1717     * Reverse chronological order (last date on top), please *
    1818     ----------------------------------------------------------
     19
     20December 15th, 2010 G.Cosmo - geomvol-V09-03-09
     21- Use normal allocator if building DLLs on Windows.
     22
     23September 6th, 2010 G.Cosmo - geomvol-V09-03-08
     24- Fixed false-positive cases for initialization in copy-constructor of
     25  G4GRSSolid amd G4GRSVolume.
     26
     27Jul 5th, 2010       G.Cosmo - geomvol-V09-03-07
     28- G4GRSSolid, G4GRSVolume: safer initialisation in copy constructor.
     29- G4PVPlacement, G4PVReplica: added fake initialisation for all members in
     30  specialized constructor for I/O persistency. Added fake return statements
     31  after exceptions.
     32- G4NavigationHistory: restore original implementation for constructor.
    1933
    2034Apr 23rd, 2010      G.Cosmo - geomvol-V09-03-06

  • trunk/source/geometry/volumes/test/ApproxEqual.hh

    r1316 r1347  
    2626//
    2727// $Id: ApproxEqual.hh,v 1.7 2006/06/29 18:58:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/volumes/test/testExitNormalNav.cc

    r1316 r1347  
    2626//
    2727// $Id: testExitNormalNav.cc,v 1.7 2006/06/29 18:58:25 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//   Testing the product of Exit Normal of the Navigator for

  • trunk/source/geometry/volumes/test/testG4AffineTransform.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4AffineTransform.cc,v 1.9 2006/06/29 18:58:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/volumes/test/testG4BlockingList.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4BlockingList.cc,v 1.4 2006/06/29 18:58:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/volumes/test/testG4NavigationHistory.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4NavigationHistory.cc,v 1.9 2007/02/13 17:24:59 japost Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/volumes/test/testG4NestedParameterised.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4NestedParameterised.cc,v 1.5 2006/06/29 18:58:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/volumes/test/testG4Parameterised.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Parameterised.cc,v 1.10 2006/06/29 18:58:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/volumes/test/testG4ParameterisedMaterial.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4ParameterisedMaterial.cc,v 1.9 2006/06/29 18:58:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/volumes/test/testG4ParameterisedSolid1.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4ParameterisedSolid1.cc,v 1.13 2006/06/29 18:58:43 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/volumes/test/testG4ReplicaNavigation.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4ReplicaNavigation.cc,v 1.11 2006/06/29 18:58:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/volumes/test/testG4SmartVoxelProxy.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4SmartVoxelProxy.cc,v 1.4 2006/06/29 18:58:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/volumes/test/testG4SmartVoxels.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4SmartVoxels.cc,v 1.5 2006/06/29 18:58:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030

  • trunk/source/geometry/volumes/test/testG4TouchableHandle.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4TouchableHandle.cc,v 1.8 2006/06/29 18:58:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/volumes/test/testG4Touchables.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Touchables.cc,v 1.10 2006/06/29 18:58:56 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/volumes/test/testG4Volumes.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4Volumes.cc,v 1.10 2006/06/29 18:58:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/geometry/volumes/test/testG4VoxelLimits.cc

    r1316 r1347  
    2626//
    2727// $Id: testG4VoxelLimits.cc,v 1.4 2006/06/29 18:59:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030
Note: See TracChangeset for help on using the changeset viewer.