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

geant4 tag 9.4

Location:
trunk/source/persistency/ascii
Files:
95 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/persistency/ascii/GNUmakefile

    r1035 r1347  
    1 # $Id: GNUmakefile,v 1.3 2008/11/21 16:27:42 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
    22# -----------------------------------------------------------------------
    33# GNUmakefile for persistency library.  Gabriele Cosmo, 16/11/96.

  • trunk/source/persistency/ascii/History

    r1337 r1347  
    1 $Id: History,v 1.14 2010/06/14 15:09:34 gcosmo Exp $
     1$Id: History,v 1.19 2010/12/15 11:32:48 arce Exp $
    22-------------------------------------------------------------------
    33     =========================================================
    … …  
    1616     * Reverse chronological order (last date on top), please *
    1717     ----------------------------------------------------------
     18
     1915 December, 10 P.Arce (ascii-V09-03-05)
     20- Introduced fixes for Coverity reports...
     21 
     227 November, 10  G.Cosmo (ascii-V09-03-04)
     23- Removed wrong assumption for NULL pointer condition previously introduced
     24  in G4tgbVolume. Fixes crash in example P03.
     25
     262 November, 10  G.Cosmo (ascii-V09-03-03)
     27- Fixed minor left Coverity reports.
     28
     2913 October, 10  G.Cosmo (ascii-V09-03-02)
     30- Synchronised HEAD revision with current production code.
     31- Added missing static data initialisation to constructors in G4tgrFileIn,
     32  G4tgbGeometryDumper, G4tgbIsotope, G4tgbMaterial, G4tgbMaterialSimple,
     33  G4tgbPlaceParameterisation, G4tgbVolume, G4tgrElementFromIsotopes,
     34  G4tgrElementSimple, G4tgrIsotope, G4tgrMaterial, G4tgrMaterialSimple,
     35  G4tgrPlace, G4tgrPlaceDivRep, G4tgrRotationMatrix, G4tgrVolume.
     36- Fixed potential cases of dereferencing a NULL pointer in G4tgbMaterialMgr,
     37- Fixed cases of unreachable code in G4tbrVolumeMgr.
     38- Fixed leaks in G4tgrFileReader.
     39- G4tgrUtils: fixed logic in WordIsUnit() and fixed restoring of cout
     40  precision in Dump3v().
     41
     423 September, 10  G.Cosmo (ascii-V09-03-01)
     43- Fixed signature for std::map in G4tgrVolumeMgr.hh..
     44- Added missing inclusion of <sstream> header in G4tgrFileIn.cc.
    1845
    194614 June, 10  G.Cosmo (ascii-V09-03-00)

  • trunk/source/persistency/ascii/include/G4tgbDetectorBuilder.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbDetectorBuilder.hh,v 1.2.6.1 2010/06/14 15:09:19 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbDetectorBuilder.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbDetectorConstruction.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbDetectorConstruction.hh,v 1.2 2008/12/18 12:58:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbDetectorConstruction.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbElement.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbElement.hh,v 1.2 2008/12/18 12:58:04 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbElement.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbIsotope.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbIsotope.hh,v 1.2 2008/12/18 12:58:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbIsotope.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbMaterial.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterial.hh,v 1.5 2008/12/18 12:58:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterial.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbMaterialMgr.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialMgr.hh,v 1.4 2008/12/18 12:58:10 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialMgr.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbMaterialMixture.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialMixture.hh,v 1.2 2008/12/18 12:58:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialMixture.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByNoAtoms.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialMixtureByNoAtoms.hh,v 1.3 2008/12/18 12:58:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialMixtureByNoAtoms.hh,v 1.4 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByVolume.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialMixtureByVolume.hh,v 1.4 2008/12/18 12:58:16 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialMixtureByVolume.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbMaterialMixtureByWeight.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialMixtureByWeight.hh,v 1.2 2008/12/18 12:58:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialMixtureByWeight.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbMaterialSimple.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialSimple.hh,v 1.2 2008/12/18 12:58:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialSimple.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbPlaceParamCircle.hh

    r1337 r1347  
    2626//
    2727// $Id: G4tgbPlaceParamCircle.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbPlaceParamLinear.hh

    r1337 r1347  
    2626//
    2727// $Id: G4tgbPlaceParamLinear.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbPlaceParamSquare.hh

    r1337 r1347  
    2626//
    2727// $Id: G4tgbPlaceParamSquare.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbPlaceParameterisation.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbPlaceParameterisation.hh,v 1.4 2008/11/21 15:37:18 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbPlaceParameterisation.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbRotationMatrix.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbRotationMatrix.hh,v 1.2 2008/12/18 12:58:22 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbRotationMatrix.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbRotationMatrixMgr.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbRotationMatrixMgr.hh,v 1.2 2008/12/18 12:58:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbRotationMatrixMgr.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbVolume.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbVolume.hh,v 1.4 2008/12/18 12:58:26 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbVolume.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgbVolumeMgr.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbVolumeMgr.hh,v 1.3 2008/12/18 12:58:28 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbVolumeMgr.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrElement.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrElement.hh,v 1.2 2008/12/18 12:58:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrElement.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrElementFromIsotopes.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrElementFromIsotopes.hh,v 1.6 2008/12/18 12:58:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrElementFromIsotopes.hh,v 1.7 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrElementSimple.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrElementSimple.hh,v 1.6 2008/12/18 12:58:34 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrElementSimple.hh,v 1.7 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrEvaluator.hh

    r1337 r1347  
    2626//
    2727// $Id: G4tgrEvaluator.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrFileIn.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrFileIn.hh,v 1.3 2008/12/18 12:58:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrFileIn.hh,v 1.5 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    7777  private:
    7878
    79     G4tgrFileIn( const G4String& name ) : theName(name) {}
     79    G4tgrFileIn( const G4String& name ) : theCurrentFile(-1), theName(name) {}
    8080
    8181  private:

  • trunk/source/persistency/ascii/include/G4tgrFileReader.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrFileReader.hh,v 1.2 2008/11/12 08:41:19 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrFileReader.hh,v 1.4 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrIsotope.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrIsotope.hh,v 1.4 2008/12/18 12:58:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrIsotope.hh,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrLineProcessor.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrLineProcessor.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrLineProcessor.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrMaterial.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrMaterial.hh,v 1.5 2008/12/18 12:58:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrMaterial.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrMaterialFactory.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrMaterialFactory.hh,v 1.2 2008/12/18 12:58:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrMaterialFactory.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrMaterialMixture.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrMaterialMixture.hh,v 1.2 2008/12/18 12:58:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrMaterialMixture.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrMaterialSimple.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrMaterialSimple.hh,v 1.2 2008/12/18 12:58:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrMaterialSimple.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrMessenger.hh

    r1337 r1347  
    2626//
    2727// $Id: G4tgrMessenger.hh,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrParameterMgr.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrParameterMgr.hh,v 1.2 2008/12/18 12:58:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrParameterMgr.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrPlace.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrPlace.hh,v 1.4 2008/12/18 12:58:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrPlace.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrPlaceDivRep.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrPlaceDivRep.hh,v 1.5 2008/12/18 12:58:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrPlaceDivRep.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrPlaceParameterisation.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrPlaceParameterisation.hh,v 1.7 2008/12/18 12:58:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrPlaceParameterisation.hh,v 1.8 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrPlaceSimple.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrPlaceSimple.hh,v 1.5 2008/12/18 12:58:56 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrPlaceSimple.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrRotationMatrix.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrRotationMatrix.hh,v 1.5 2008/12/18 12:58:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrRotationMatrix.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrRotationMatrixFactory.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrRotationMatrixFactory.hh,v 1.2 2008/12/18 12:59:00 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrRotationMatrixFactory.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrSolid.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrSolid.hh,v 1.2 2008/12/18 12:59:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrSolid.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrSolidBoolean.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrSolidBoolean.hh,v 1.2 2008/12/18 12:59:04 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrSolidBoolean.hh,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrUtils.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrUtils.hh,v 1.6 2008/12/18 12:59:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrUtils.hh,v 1.8 2010/12/15 11:29:54 arce Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    6464    static G4bool IsInteger( const G4double val,
    6565                             const G4double precision = 1.e-6 );
    66     static G4bool WordIsUnit( const G4String& word );
    67     static G4bool WordIsFunction( const G4String& word );
     66    static G4bool IsFunction( const G4String& word );
    6867      // Checks that every character in a G4String is a number
    6968      // (also '.' or exponencial notation: 'E')

  • trunk/source/persistency/ascii/include/G4tgrVolume.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrVolume.hh,v 1.10 2009/11/23 11:38:54 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrVolume.hh,v 1.11 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrVolumeAssembly.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrVolumeAssembly.hh,v 1.5 2008/12/18 12:59:10 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrVolumeAssembly.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrVolumeDivision.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrVolumeDivision.hh,v 1.5 2008/12/18 12:59:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrVolumeDivision.hh,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/include/G4tgrVolumeMgr.hh

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrVolumeMgr.hh,v 1.5 2008/12/18 12:59:14 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrVolumeMgr.hh,v 1.8 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    5353#include <map>
    5454
    55 typedef std::map< const G4String, const G4tgrSolid* > G4mapssol;
    56 typedef std::map< const G4String, const G4tgrVolume* > G4mapsvol;
     55typedef std::map< G4String, G4tgrSolid* > G4mapssol;
     56typedef std::map< G4String, G4tgrVolume* > G4mapsvol;
    5757typedef std::multimap< const G4String, const G4tgrPlace* > G4mmapspl;
    5858

  • trunk/source/persistency/ascii/src/G4tgbDetectorBuilder.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbDetectorBuilder.cc,v 1.4 2008/12/18 12:59:16 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbDetectorBuilder.cc,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbDetectorConstruction.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbDetectorConstruction.cc,v 1.4 2008/12/18 12:59:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbDetectorConstruction.cc,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbElement.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbElement.cc,v 1.4 2008/12/18 12:59:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbElement.cc,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbGeometryDumper.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbGeometryDumper.cc,v 1.12 2009/11/19 13:29:04 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbGeometryDumper.cc,v 1.15 2010/11/02 11:13:05 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    8181//------------------------------------------------------------------------
    8282G4tgbGeometryDumper::G4tgbGeometryDumper()
    83 {
    84 
    85   theRotationNumber = 0;
     83  : theFile(0), theRotationNumber(0)
     84{
    8685}
    8786
    … …  
    649648  } else if (solidType == "REFLECTEDSOLID") {
    650649    G4ReflectedSolid* solidrefl = dynamic_cast<G4ReflectedSolid*>(solid);
     650    if (!solidrefl)
     651    {
     652      G4Exception("G4tgbGeometryDumper::DumpSolid()",
     653                  "InvalidType", FatalException, "Invalid reflected solid!");
     654      return solidName;
     655    }
    651656    G4VSolid* solidori = solidrefl->GetConstituentMovedSolid();
    652657    DumpSolid( solidori );
    … …  
    669674{
    670675  G4BooleanSolid * bso = dynamic_cast < G4BooleanSolid * > (so);
     676  if (!bso)  { return; }
    671677  G4VSolid* solid0 = bso->GetConstituentSolid( 0 );
    672678  G4VSolid* solid1 = bso->GetConstituentSolid( 1 );
    … …  
    676682  {
    677683    solid1Disp = dynamic_cast<G4DisplacedSolid*>(solid1);
    678     solid1 = solid1Disp->GetConstituentMovedSolid();
     684    if (solid1Disp)  { solid1 = solid1Disp->GetConstituentMovedSolid(); }
    679685  }
    680686  DumpSolid( solid0 );
    … …  
    736742  if (solidType == "BOX")  {
    737743    const G4Box * sb = dynamic_cast < const G4Box*>(so);
    738     params.push_back( sb->GetXHalfLength() );
    739     params.push_back( sb->GetYHalfLength() );
    740     params.push_back( sb->GetZHalfLength() );
    741 
     744    if (sb) {
     745      params.push_back( sb->GetXHalfLength() );
     746      params.push_back( sb->GetYHalfLength() );
     747      params.push_back( sb->GetZHalfLength() );
     748    }
    742749  } else if (solidType == "TUBS") {
    743750    const G4Tubs * tu = dynamic_cast < const G4Tubs * > (so);
    744     params.push_back( tu->GetInnerRadius()   );
    745     params.push_back( tu->GetOuterRadius()   );
    746     params.push_back( tu->GetZHalfLength()   );
    747     params.push_back( tu->GetStartPhiAngle()/deg );
    748     params.push_back( tu->GetDeltaPhiAngle()/deg );
    749    
     751    if (tu) {
     752      params.push_back( tu->GetInnerRadius()   );
     753      params.push_back( tu->GetOuterRadius()   );
     754      params.push_back( tu->GetZHalfLength()   );
     755      params.push_back( tu->GetStartPhiAngle()/deg );
     756      params.push_back( tu->GetDeltaPhiAngle()/deg );
     757    }
    750758  } else if (solidType == "TRAP") {
    751759    const G4Trap * trp = dynamic_cast < const G4Trap * > (so);
    752     G4ThreeVector symAxis(trp->GetSymAxis());
    753     G4double theta, phi;
    754     theta = symAxis.theta()/deg;
    755     phi = symAxis.phi()/deg;
    756     params.push_back( trp->GetZHalfLength() );
    757     params.push_back( theta );
    758     params.push_back( phi);
    759     params.push_back( trp->GetYHalfLength1() );
    760     params.push_back( trp->GetXHalfLength1() );
    761     params.push_back( trp->GetXHalfLength2() );   
    762     params.push_back( std::atan(trp->GetTanAlpha1())/deg );
    763     params.push_back( trp->GetYHalfLength2()    );
    764     params.push_back( trp->GetXHalfLength3()    );
    765     params.push_back( trp->GetXHalfLength4()    );   
    766     params.push_back( std::atan(trp->GetTanAlpha2())/deg );
    767 
     760    if (trp) {
     761      G4ThreeVector symAxis(trp->GetSymAxis());
     762      G4double theta = symAxis.theta()/deg;
     763      G4double phi = symAxis.phi()/deg;
     764      params.push_back( trp->GetZHalfLength() );
     765      params.push_back( theta );
     766      params.push_back( phi);
     767      params.push_back( trp->GetYHalfLength1() );
     768      params.push_back( trp->GetXHalfLength1() );
     769      params.push_back( trp->GetXHalfLength2() );   
     770      params.push_back( std::atan(trp->GetTanAlpha1())/deg );
     771      params.push_back( trp->GetYHalfLength2()    );
     772      params.push_back( trp->GetXHalfLength3()    );
     773      params.push_back( trp->GetXHalfLength4()    );   
     774      params.push_back( std::atan(trp->GetTanAlpha2())/deg );
     775    }
    768776  } else if (solidType == "TRD") {
    769777    const G4Trd * tr = dynamic_cast < const G4Trd * > (so);
    770     params.push_back( tr->GetXHalfLength1() );
    771     params.push_back( tr->GetXHalfLength2() );
    772     params.push_back( tr->GetYHalfLength1() );
    773     params.push_back( tr->GetYHalfLength2() );
    774     params.push_back( tr->GetZHalfLength());
    775 
     778    if (tr) {
     779      params.push_back( tr->GetXHalfLength1() );
     780      params.push_back( tr->GetXHalfLength2() );
     781      params.push_back( tr->GetYHalfLength1() );
     782      params.push_back( tr->GetYHalfLength2() );
     783      params.push_back( tr->GetZHalfLength());
     784    }
    776785  } else if (solidType == "PARA") {
    777786    const G4Para * para = dynamic_cast < const G4Para * > (so);
    778     double phi;
    779     if(para->GetSymAxis().z()!=1.0)
    780       { phi = std::atan(para->GetSymAxis().y()/para->GetSymAxis().x()); }
    781     else
    782       { phi = 0; }
    783     params.push_back( para->GetXHalfLength());
    784     params.push_back(  para->GetYHalfLength());
    785     params.push_back( para->GetZHalfLength());
    786     params.push_back( std::atan(para->GetTanAlpha())/deg);
    787     params.push_back( std::acos(para->GetSymAxis().z())/deg);
    788     params.push_back( phi/deg);
    789    
     787    if (para) {
     788      G4double phi = 0.;
     789      if(para->GetSymAxis().z()!=1.0)
     790        { phi = std::atan(para->GetSymAxis().y()/para->GetSymAxis().x()); }
     791      params.push_back( para->GetXHalfLength());
     792      params.push_back(  para->GetYHalfLength());
     793      params.push_back( para->GetZHalfLength());
     794      params.push_back( std::atan(para->GetTanAlpha())/deg);
     795      params.push_back( std::acos(para->GetSymAxis().z())/deg);
     796      params.push_back( phi/deg);
     797    }
    790798  } else if (solidType == "CONS") {
    791799    const G4Cons * cn = dynamic_cast < const G4Cons * > (so);
    792     params.push_back( cn->GetInnerRadiusMinusZ() );
    793     params.push_back( cn->GetOuterRadiusMinusZ() );
    794     params.push_back( cn->GetInnerRadiusPlusZ()  );   
    795     params.push_back( cn->GetOuterRadiusPlusZ()  );
    796     params.push_back( cn->GetZHalfLength() );
    797     params.push_back( cn->GetStartPhiAngle()/deg  );
    798     params.push_back( cn->GetDeltaPhiAngle()/deg  );
    799 
     800    if (cn) {
     801      params.push_back( cn->GetInnerRadiusMinusZ() );
     802      params.push_back( cn->GetOuterRadiusMinusZ() );
     803      params.push_back( cn->GetInnerRadiusPlusZ()  );   
     804      params.push_back( cn->GetOuterRadiusPlusZ()  );
     805      params.push_back( cn->GetZHalfLength() );
     806      params.push_back( cn->GetStartPhiAngle()/deg  );
     807      params.push_back( cn->GetDeltaPhiAngle()/deg  );
     808    }
    800809  } else if (solidType == "SPHERE") {
    801810    const G4Sphere * sphere = dynamic_cast < const G4Sphere * > (so);
    802     params.push_back( sphere->GetInnerRadius());
    803     params.push_back( sphere->GetOuterRadius());
    804     params.push_back( sphere->GetStartPhiAngle()/deg);
    805     params.push_back( sphere->GetDeltaPhiAngle()/deg);
    806     params.push_back( sphere->GetStartThetaAngle()/deg);
    807     params.push_back( sphere->GetDeltaThetaAngle()/deg);
    808 
     811    if (sphere) {
     812      params.push_back( sphere->GetInnerRadius());
     813      params.push_back( sphere->GetOuterRadius());
     814      params.push_back( sphere->GetStartPhiAngle()/deg);
     815      params.push_back( sphere->GetDeltaPhiAngle()/deg);
     816      params.push_back( sphere->GetStartThetaAngle()/deg);
     817      params.push_back( sphere->GetDeltaThetaAngle()/deg);
     818    }
    809819  } else if (solidType == "ORB") {
    810820    const G4Orb * orb = dynamic_cast < const G4Orb * > (so);
    811     params.push_back( orb->GetRadius());
    812    
     821    if (orb) {
     822      params.push_back( orb->GetRadius());
     823    }
    813824  } else if (solidType == "TORUS") {
    814825    const G4Torus * torus = dynamic_cast < const G4Torus * > (so);
    815     params.push_back( torus->GetRmin());
    816     params.push_back( torus->GetRmax());
    817     params.push_back( torus->GetRtor());
    818     params.push_back( torus->GetSPhi()/deg);
    819     params.push_back( torus->GetDPhi()/deg);
    820  
     826    if (torus) {
     827      params.push_back( torus->GetRmin());
     828      params.push_back( torus->GetRmax());
     829      params.push_back( torus->GetRtor());
     830      params.push_back( torus->GetSPhi()/deg);
     831      params.push_back( torus->GetDPhi()/deg);
     832    }
    821833  } else if (solidType == "POLYCONE") {
    822834    //--- Dump RZ corners, as original parameters will not be present
    823835    //    if it was build from RZ corners
    824836    const G4Polycone * pc = dynamic_cast < const G4Polycone * > (so);
     837    if (pc) {
     838      G4double angphi = pc->GetStartPhi()/deg;
     839      if( angphi > 180*deg )  { angphi -= 360*deg; }
     840      G4int ncor = pc->GetNumRZCorner();
     841      params.push_back( angphi );
     842      params.push_back( pc->GetOriginalParameters()->Opening_angle/deg );
     843      params.push_back( ncor );
    825844   
    826     G4double angphi = pc->GetStartPhi()/deg;
    827     if( angphi > 180*deg )  { angphi -= 360*deg; }
    828     G4int ncor = pc->GetNumRZCorner();
    829     params.push_back( angphi );
    830     params.push_back( pc->GetOriginalParameters()->Opening_angle/deg );
    831     params.push_back( ncor );
    832    
    833     for( G4int ii = 0; ii < ncor; ii++ )
    834     {
    835       params.push_back( pc->GetCorner(ii).r );
    836       params.push_back( pc->GetCorner(ii).z );
    837     }
    838    
    839    
     845      for( G4int ii = 0; ii < ncor; ii++ )
     846      {
     847        params.push_back( pc->GetCorner(ii).r );
     848        params.push_back( pc->GetCorner(ii).z );
     849      }
     850    }
    840851  } else if (solidType == "POLYHEDRA") {
    841852    //--- Dump RZ corners, as original parameters will not be present
    842853    //    if it was build from RZ corners
    843854    const G4Polyhedra * ph = (dynamic_cast < const G4Polyhedra * > (so));
     855    if (ph) {
     856      G4double angphi = ph->GetStartPhi()/deg;
     857      if( angphi > 180*deg ) angphi -= 360*deg;
     858
     859      G4int ncor = ph->GetNumRZCorner();
    844860   
    845     G4double angphi = ph->GetStartPhi()/deg;
    846     if( angphi > 180*deg ) angphi -= 360*deg;
    847 
    848     G4int ncor = ph->GetNumRZCorner();
    849    
    850     params.push_back( angphi );
    851     params.push_back( ph->GetOriginalParameters()->Opening_angle/deg );
    852     params.push_back( ph->GetNumSide() );
    853     params.push_back( ncor );
    854 
    855     for( G4int ii = 0; ii < ncor; ii++ )
    856     {
    857        params.push_back( ph->GetCorner(ii).r );
    858        params.push_back( ph->GetCorner(ii).z );
    859     }
    860 
     861      params.push_back( angphi );
     862      params.push_back( ph->GetOriginalParameters()->Opening_angle/deg );
     863      params.push_back( ph->GetNumSide() );
     864      params.push_back( ncor );
     865
     866      for( G4int ii = 0; ii < ncor; ii++ )
     867      {
     868         params.push_back( ph->GetCorner(ii).r );
     869         params.push_back( ph->GetCorner(ii).z );
     870      }
     871    }
    861872  } else if (solidType == "ELLIPTICALTUBE") {
    862873    const G4EllipticalTube * eltu =
    863874          dynamic_cast < const G4EllipticalTube * > (so);
    864     params.push_back( eltu->GetDx());
    865     params.push_back( eltu->GetDy());
    866     params.push_back( eltu->GetDz());
    867 
     875    if (eltu) {
     876      params.push_back( eltu->GetDx());
     877      params.push_back( eltu->GetDy());
     878      params.push_back( eltu->GetDz());
     879    }
    868880  } else if (solidType == "ELLIPSOID" ){
    869881    const G4Ellipsoid* dso = dynamic_cast < const G4Ellipsoid * > (so);
    870     params.push_back( dso->GetSemiAxisMax(0)  );
    871     params.push_back( dso->GetSemiAxisMax(1)  );
    872     params.push_back( dso->GetSemiAxisMax(2)  );
    873     params.push_back( dso->GetZBottomCut()   );
    874     params.push_back( dso->GetZTopCut() );
    875 
     882    if (dso) {
     883      params.push_back( dso->GetSemiAxisMax(0)  );
     884      params.push_back( dso->GetSemiAxisMax(1)  );
     885      params.push_back( dso->GetSemiAxisMax(2)  );
     886      params.push_back( dso->GetZBottomCut()   );
     887      params.push_back( dso->GetZTopCut() );
     888    }
    876889  } else if (solidType == "ELLIPTICAL_CONE") {
    877890    const G4EllipticalCone * elco =
    878891          dynamic_cast < const G4EllipticalCone * > (so);
    879     params.push_back( elco-> GetSemiAxisX() );
    880     params.push_back( elco-> GetSemiAxisY() );
    881     params.push_back( elco-> GetZMax() );
    882     params.push_back( elco-> GetZTopCut() );
    883 
     892    if (elco) {
     893      params.push_back( elco-> GetSemiAxisX() );
     894      params.push_back( elco-> GetSemiAxisY() );
     895      params.push_back( elco-> GetZMax() );
     896      params.push_back( elco-> GetZTopCut() );
     897    }
    884898  } else if (solidType == "HYPE") {
    885899    const G4Hype* hype = dynamic_cast < const G4Hype * > (so);
    886     params.push_back( hype->GetInnerRadius());
    887     params.push_back( hype->GetOuterRadius());
    888     params.push_back( hype->GetInnerStereo()/deg);
    889     params.push_back( hype->GetOuterStereo()/deg);
    890     params.push_back( 2*hype->GetZHalfLength());
    891 
     900    if (hype) {
     901      params.push_back( hype->GetInnerRadius());
     902      params.push_back( hype->GetOuterRadius());
     903      params.push_back( hype->GetInnerStereo()/deg);
     904      params.push_back( hype->GetOuterStereo()/deg);
     905      params.push_back( 2*hype->GetZHalfLength());
     906    }
    892907//  } else if( solidType == "TET" ) {
    893908
    894909  } else if( solidType == "TWISTEDBOX" ) {
    895910    const G4TwistedBox* tbox = dynamic_cast < const G4TwistedBox * > (so);
    896     params.push_back( tbox->GetPhiTwist()/deg );
    897     params.push_back( tbox->GetXHalfLength() );
    898     params.push_back( tbox->GetYHalfLength() );
    899     params.push_back( tbox->GetZHalfLength() );
    900 
     911    if (tbox) {
     912      params.push_back( tbox->GetPhiTwist()/deg );
     913      params.push_back( tbox->GetXHalfLength() );
     914      params.push_back( tbox->GetYHalfLength() );
     915      params.push_back( tbox->GetZHalfLength() );
     916    }
    901917  } else if( solidType == "TWISTEDTRAP" ) {
    902918    const G4TwistedTrap * ttrap = dynamic_cast < const G4TwistedTrap * > (so);
    903     params.push_back( ttrap->GetPhiTwist()/deg );
    904     params.push_back( ttrap->GetZHalfLength() );
    905     params.push_back( ttrap->GetPolarAngleTheta()/deg );
    906     params.push_back( ttrap->GetAzimuthalAnglePhi()/deg );
    907     params.push_back( ttrap->GetY1HalfLength() );
    908     params.push_back( ttrap->GetX1HalfLength() );
    909     params.push_back( ttrap->GetX2HalfLength() );   
    910     params.push_back( ttrap->GetY2HalfLength()    );
    911     params.push_back( ttrap->GetX3HalfLength()    );
    912     params.push_back( ttrap->GetX4HalfLength()    );   
    913     params.push_back( ttrap->GetTiltAngleAlpha()/deg );
    914    
     919    if (ttrap) {
     920      params.push_back( ttrap->GetPhiTwist()/deg );
     921      params.push_back( ttrap->GetZHalfLength() );
     922      params.push_back( ttrap->GetPolarAngleTheta()/deg );
     923      params.push_back( ttrap->GetAzimuthalAnglePhi()/deg );
     924      params.push_back( ttrap->GetY1HalfLength() );
     925      params.push_back( ttrap->GetX1HalfLength() );
     926      params.push_back( ttrap->GetX2HalfLength() );   
     927      params.push_back( ttrap->GetY2HalfLength()    );
     928      params.push_back( ttrap->GetX3HalfLength()    );
     929      params.push_back( ttrap->GetX4HalfLength()    );   
     930      params.push_back( ttrap->GetTiltAngleAlpha()/deg );
     931    }
    915932  } else if( solidType == "TWISTEDTRD" ) {
    916933    const G4TwistedTrd * ttrd = dynamic_cast < const G4TwistedTrd * > (so);
    917     params.push_back( ttrd->GetX1HalfLength());
    918     params.push_back( ttrd->GetX2HalfLength() );
    919     params.push_back( ttrd->GetY1HalfLength() );
    920     params.push_back( ttrd->GetY2HalfLength() );
    921     params.push_back( ttrd->GetZHalfLength() );
    922     params.push_back( ttrd->GetPhiTwist()/deg );
    923  
     934    if (ttrd) {
     935      params.push_back( ttrd->GetX1HalfLength());
     936      params.push_back( ttrd->GetX2HalfLength() );
     937      params.push_back( ttrd->GetY1HalfLength() );
     938      params.push_back( ttrd->GetY2HalfLength() );
     939      params.push_back( ttrd->GetZHalfLength() );
     940      params.push_back( ttrd->GetPhiTwist()/deg );
     941    }
    924942  } else if( solidType == "TWISTEDTUBS" ) {
    925943    const G4TwistedTubs * ttub = dynamic_cast < const G4TwistedTubs * > (so);
    926     params.push_back( ttub->GetInnerRadius()   );
    927     params.push_back( ttub->GetOuterRadius()   );
    928     params.push_back( ttub->GetZHalfLength()   );
    929     params.push_back( ttub->GetDPhi()/deg );
    930     params.push_back( ttub->GetPhiTwist()/deg );
    931 
     944    if (ttub) {
     945      params.push_back( ttub->GetInnerRadius()   );
     946      params.push_back( ttub->GetOuterRadius()   );
     947      params.push_back( ttub->GetZHalfLength()   );
     948      params.push_back( ttub->GetDPhi()/deg );
     949      params.push_back( ttub->GetPhiTwist()/deg );
     950    }
    932951  }
    933952  else
    … …  
    945964G4String G4tgbGeometryDumper::DumpRotationMatrix( G4RotationMatrix* rotm )
    946965{
     966  if (!rotm)  { rotm = new G4RotationMatrix(); }
     967
    947968  G4double de = MatDeterminant(rotm);
    948  
    949969  G4String rotName = LookForExistingRotation( rotm );
    950970  if( rotName != "" )  { return rotName; }
    951 
    952   if (!rotm)  { rotm = new G4RotationMatrix(); }
    953971
    954972  G4ThreeVector v(1.,1.,1.);

  • trunk/source/persistency/ascii/src/G4tgbIsotope.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbIsotope.cc,v 1.4 2008/12/18 12:59:24 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbIsotope.cc,v 1.6 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4040//----------------------------------------------------------------------
    4141G4tgbIsotope::G4tgbIsotope()
     42  : theTgrIsot(0), theG4Isot(0)
    4243{
    4344}

  • trunk/source/persistency/ascii/src/G4tgbMaterial.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterial.cc,v 1.2 2008/12/18 12:59:26 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterial.cc,v 1.5 2010/12/15 11:29:54 arce Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4141// -------------------------------------------------------------------------
    4242G4tgbMaterial::G4tgbMaterial()
     43  : theTgrMate(0), theG4Mate(0)
    4344{
    4445}
    … …  
    5152// -------------------------------------------------------------------------
    5253G4tgbMaterial::G4tgbMaterial( G4tgrMaterial* hg )
     54  : theTgrMate(hg), theG4Mate(0)
    5355{
    54   theTgrMate = hg;
    55   theG4Mate = 0;
    5656}
    5757

  • trunk/source/persistency/ascii/src/G4tgbMaterialMgr.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialMgr.cc,v 1.5 2008/12/18 12:59:28 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialMgr.cc,v 1.7 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    151151    } else if( tgr->GetType() == "MaterialMixtureByVolume" ) {
    152152      tgb = new G4tgbMaterialMixtureByVolume( tgr );
    153     }
     153    } else {
     154      return;
     155    }
    154156    theG4tgbMaterials[tgb->GetName()] = tgb;
    155157  }

  • trunk/source/persistency/ascii/src/G4tgbMaterialMixture.cc

    r1337 r1347  
    2626//
    2727// $Id: G4tgbMaterialMixture.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByNoAtoms.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialMixtureByNoAtoms.cc,v 1.6 2008/12/18 12:59:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialMixtureByNoAtoms.cc,v 1.7 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByVolume.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialMixtureByVolume.cc,v 1.8 2008/12/18 12:59:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialMixtureByVolume.cc,v 1.9 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbMaterialMixtureByWeight.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialMixtureByWeight.cc,v 1.4 2008/12/18 12:59:34 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialMixtureByWeight.cc,v 1.5 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbMaterialSimple.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbMaterialSimple.cc,v 1.5 2008/12/18 12:59:36 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbMaterialSimple.cc,v 1.7 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4141// -------------------------------------------------------------------------
    4242G4tgbMaterialSimple::G4tgbMaterialSimple()
     43  : theZ(0.), theA(0.)
    4344{
    4445}

  • trunk/source/persistency/ascii/src/G4tgbPlaceParamCircle.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbPlaceParamCircle.cc,v 1.5 2008/12/03 16:16:01 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbPlaceParamCircle.cc,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbPlaceParamLinear.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbPlaceParamLinear.cc,v 1.5 2008/12/03 16:16:01 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbPlaceParamLinear.cc,v 1.6 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbPlaceParamSquare.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbPlaceParamSquare.cc,v 1.6 2008/12/03 16:16:01 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbPlaceParamSquare.cc,v 1.7 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbPlaceParameterisation.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbPlaceParameterisation.cc,v 1.4 2008/11/21 15:37:18 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbPlaceParameterisation.cc,v 1.6 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// class G4tgbPlaceParameterisation
    … …  
    4545G4tgbPlaceParameterisation::
    4646G4tgbPlaceParameterisation( G4tgrPlaceParameterisation* tgrParam)
     47  : theNCopies(0), theAxis(kUndefined)
    4748{
    4849  theRotationMatrix = G4tgbRotationMatrixMgr::GetInstance()
    … …  
    5253G4tgbPlaceParameterisation::~G4tgbPlaceParameterisation()
    5354{
     55  delete theRotationMatrix;
    5456}
    5557

  • trunk/source/persistency/ascii/src/G4tgbRotationMatrix.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbRotationMatrix.cc,v 1.8 2008/12/18 12:59:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbRotationMatrix.cc,v 1.10 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4343// -------------------------------------------------------------------------
    4444G4tgbRotationMatrix::G4tgbRotationMatrix()
     45  : theTgrRM(0), theG4RM(0)
    4546{
    4647}
    … …  
    5556// -------------------------------------------------------------------------
    5657G4tgbRotationMatrix::G4tgbRotationMatrix( G4tgrRotationMatrix* tgr )
     58  : theTgrRM(tgr), theG4RM(0)
    5759{
    58   theTgrRM = tgr;
    5960}
    6061

  • trunk/source/persistency/ascii/src/G4tgbRotationMatrixMgr.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbRotationMatrixMgr.cc,v 1.2 2008/12/18 12:59:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbRotationMatrixMgr.cc,v 1.3 2010/10/13 07:56:55 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgbVolume.cc

    r1228 r1347  
    2424// ********************************************************************
    2525//
     26//
     27// $Id: G4tgbVolume.cc,v 1.23 2010/11/05 08:58:36 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2629//
    2730//
    … …  
    110113//-------------------------------------------------------------------
    111114G4tgbVolume::G4tgbVolume()
     115  : theTgrVolume(0), theG4AssemblyVolume(0)
    112116{
    113117}
    … …  
    155159        g4vmgr->RegisterMe( logvol );
    156160        g4vmgr->RegisterChildParentLVs( logvol, parentLV );
    157        
    158       }
    159     }
     161      }
     162      else
     163      {
     164        return;
     165      }
     166    }
     167    else
     168    {
     169      return;
     170    }
    160171  }
    161172  //--- Construct PhysVol
    … …  
    291302      G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
    292303                  "InvalidSetup", FatalException, ErrMessage);
     304      return 0;
    293305    }
    294306   
    … …  
    367379      G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
    368380                  "InvalidSetup", FatalException, ErrMessage);
     381      return 0;
    369382    }
    370383
    … …  
    427440      G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
    428441                  "InvalidSetup", FatalException, ErrMessage);
     442      return 0;
    429443    }
    430444   
    … …  
    655669        G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
    656670                    "InvalidSetup", FatalException, ErrMessage);
     671        return 0;
    657672      }
    658673     
    … …  
    679694          G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
    680695                      "InvalidSetup", FatalException, ErrMessage);
     696          return 0;
    681697        }
    682698        facet = new G4TriangularFacet( pt0, vt1, vt2, vertexType );
    … …  
    705721          G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
    706722                      "InvalidSetup", FatalException, ErrMessage);
     723          return 0;
    707724        }
    708725        facet = new G4QuadrangularFacet( pt0, vt1, vt2, vt3, vertexType );
    … …  
    716733        G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
    717734                    "InvalidSetup", FatalException, ErrMessage);
     735        return 0;
    718736      }
    719737     
    … …  
    748766  {
    749767    const G4tgrSolidBoolean* solb = dynamic_cast<const G4tgrSolidBoolean*>(sol);
     768    if (!solb)
     769    {
     770      G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
     771                  "InvalidSetup", FatalException, "Invalid Solid pointer");
     772      return 0;
     773    }
    750774    G4VSolid* sol1 = FindOrConstructG4Solid( solb->GetSolid(0));
    751775    G4VSolid* sol2 = FindOrConstructG4Solid( solb->GetSolid(1));
    … …  
    771795      G4Exception("G4tgbVolume::FindOrConstructG4Solid()",
    772796                  "InvalidSetup", FatalException, ErrMessage);
     797      return 0;
    773798    }
    774799  }
    … …  
    779804    G4Exception("G4tgbVolume::FindOrConstructG4Solid()", "NotImplemented",
    780805                FatalException, ErrMessage);
     806    return 0;
    781807  }
    782808 
    … …  
    10691095          G4Exception("G4tgbVolume::ConstructG4PhysVol", "WrongArgument",
    10701096                      FatalException, ErrMessage);
     1097          return 0;
    10711098        }
    10721099#ifdef G4VERBOSE
    … …  
    12491276          }
    12501277#endif
    1251 
    12521278        }
    12531279      }
    … …  
    13841410    G4Exception("G4tgbVolume::BuildSolidForDivision()", "NotImplemented",
    13851411                FatalException, ErrMessage);
     1412    return 0;
    13861413  }
    13871414

  • trunk/source/persistency/ascii/src/G4tgbVolumeMgr.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgbVolumeMgr.cc,v 1.5 2008/12/18 12:59:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgbVolumeMgr.cc,v 1.10 2010/12/15 11:29:54 arce Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    185185
    186186  G4VSolid* oldSolid = 0;
    187   G4mmssol::const_iterator mmsscite;
    188187  std::pair<G4mmssol::iterator, G4mmssol::iterator> mmssdi;
    189188  mmssdi = theSolids.equal_range( name );
    190189
    191   for( mmsscite = mmssdi.first; mmsscite != mmssdi.second; mmsscite++ )
    192   {
    193 #ifdef G4VERBOSE
    194   if( G4tgrMessenger::GetVerboseLevel() >= 2 )
    195   {
    196     G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid finding "
    197            << name << G4endl;
    198   }
     190  if( mmssdi.first != mmssdi.second ) { // check there is a solid found
     191    G4mmssol::const_iterator mmsscite = mmssdi.first;
     192
     193#ifdef G4VERBOSE
     194    if( G4tgrMessenger::GetVerboseLevel() >= 2 )
     195    {
     196      G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid finding "
     197             << name << G4endl;
     198    }
    199199#endif
    200200    /*
    … …  
    214214    oldSolid = (*mmsscite).second;
    215215#ifdef G4VERBOSE
    216   if( G4tgrMessenger::GetVerboseLevel() >= 1 )
    217   {
    218     G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid already found "
    219            << name << G4endl;
    220   }
    221 #endif
    222     break;
     216    if( G4tgrMessenger::GetVerboseLevel() >= 1 )
     217    {
     218      G4cout << " G4tgbVolumeMgr::FindG4Solid() - Solid already found "
     219             << name << G4endl;
     220    }
     221#endif
    223222  }
    224223 
    … …  
    226225  if( G4tgrMessenger::GetVerboseLevel() >= 2 )
    227226  {
    228     G4cout << " G4tgbVolumeMgr::FindG4Solid() - Old solid: "
    229            << oldSolid << G4endl;
    230   }
    231 #endif
     227      G4cout << " G4tgbVolumeMgr::FindG4Solid() - Old solid: "
     228             << oldSolid << G4endl;
     229  }
     230#endif
     231
    232232  return oldSolid;
    233233}

  • trunk/source/persistency/ascii/src/G4tgrElement.cc

    r1337 r1347  
    2626//
    2727// $Id: G4tgrElement.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrElementFromIsotopes.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrElementFromIsotopes.cc,v 1.5 2008/12/18 12:59:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrElementFromIsotopes.cc,v 1.7 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4242// -------------------------------------------------------------------------
    4343G4tgrElementFromIsotopes::G4tgrElementFromIsotopes()
     44  : theNoIsotopes(0)
    4445{
    4546}

  • trunk/source/persistency/ascii/src/G4tgrElementSimple.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrElementSimple.cc,v 1.5 2008/12/18 12:59:48 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrElementSimple.cc,v 1.7 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4141// -------------------------------------------------------------------------
    4242G4tgrElementSimple::G4tgrElementSimple()
     43  : theZ(0.), theA(0.)
    4344{
    4445}

  • trunk/source/persistency/ascii/src/G4tgrEvaluator.cc

    r1337 r1347  
    2626//
    2727// $Id: G4tgrEvaluator.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrFileIn.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrFileIn.cc,v 1.9 2008/12/18 12:59:50 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrFileIn.cc,v 1.13 2010/12/15 11:29:54 arce Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    3939#include <iostream>
    4040#include <fstream>
     41#include <sstream>
    4142
    4243#include "G4tgrFileIn.hh"
    … …  
    5051//-----------------------------------------------------------------------
    5152G4tgrFileIn::G4tgrFileIn()
     53  : theCurrentFile(-1), theName("")
    5254{
    5355}
    … …  
    5759G4tgrFileIn::~G4tgrFileIn()
    5860{
    59   return;
     61/*
    6062  std::vector<G4tgrFileIn*>::const_iterator vfcite;
    6163  for( vfcite = theInstances.begin(); vfcite != theInstances.end(); vfcite++)
    … …  
    6365    delete *vfcite;
    6466  }
     67*/
    6568}
    6669

  • trunk/source/persistency/ascii/src/G4tgrFileReader.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrFileReader.cc,v 1.4 2008/11/12 08:44:07 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrFileReader.cc,v 1.7 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    6565G4tgrFileReader::~G4tgrFileReader()
    6666{
     67  delete theLineProcessor;
    6768  delete theInstance;
    6869}

  • trunk/source/persistency/ascii/src/G4tgrIsotope.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrIsotope.cc,v 1.5 2008/12/18 12:59:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrIsotope.cc,v 1.7 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4242//-------------------------------------------------------------
    4343G4tgrIsotope::G4tgrIsotope()
     44  : theName(""), theZ(0), theN(0), theA(0.)
    4445{
    4546}

  • trunk/source/persistency/ascii/src/G4tgrLineProcessor.cc

    r1035 r1347  
    158158      G4Exception("G4tgrLineProcessor::ProcessLine()", "Material not found",
    159159                  FatalException, G4tgrUtils::GetString( wl[1] ) );
     160      return false;
    160161    }
    161162    mate->SetIonisationMeanExcitationEnergy( G4tgrUtils::GetDouble( wl[2] ) );

  • trunk/source/persistency/ascii/src/G4tgrMaterial.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrMaterial.cc,v 1.3 2008/11/21 15:37:18 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrMaterial.cc,v 1.5 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4040// -------------------------------------------------------------------------
    4141G4tgrMaterial::G4tgrMaterial()
     42   : theName("Material"), theDensity(0.), theNoComponents(0),
     43     theMateType("Material"), theIonisationMeanExcitationEnergy(-1.)
    4244{
    43   theIonisationMeanExcitationEnergy = -1.;
    4445}
    4546

  • trunk/source/persistency/ascii/src/G4tgrMaterialFactory.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrMaterialFactory.cc,v 1.4 2008/12/18 12:59:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrMaterialFactory.cc,v 1.5 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrMaterialMixture.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrMaterialMixture.cc,v 1.7 2008/12/18 12:59:56 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrMaterialMixture.cc,v 1.8 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrMaterialSimple.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrMaterialSimple.cc,v 1.7 2008/12/18 12:59:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrMaterialSimple.cc,v 1.9 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4242//-------------------------------------------------------------
    4343G4tgrMaterialSimple::G4tgrMaterialSimple()
    44   : name("MaterialSimple")
     44  : name("MaterialSimple"), theA(0.), theZ(0.)
    4545{
    4646}

  • trunk/source/persistency/ascii/src/G4tgrMessenger.cc

    r1337 r1347  
    2626//
    2727// $Id: G4tgrMessenger.cc,v 1.1 2008/10/23 14:43:43 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrParameterMgr.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrParameterMgr.cc,v 1.6 2008/12/18 13:00:00 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrParameterMgr.cc,v 1.7 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrPlace.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrPlace.cc,v 1.3 2008/11/03 17:04:41 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrPlace.cc,v 1.6 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    3939// -------------------------------------------------------------------------
    4040G4tgrPlace::G4tgrPlace()
     41   : theVolume(0), theParentName(""), theCopyNo(0), theType("")
    4142{
    4243}

  • trunk/source/persistency/ascii/src/G4tgrPlaceDivRep.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrPlaceDivRep.cc,v 1.4 2008/11/21 15:37:18 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrPlaceDivRep.cc,v 1.7 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4242//-------------------------------------------------------------
    4343G4tgrPlaceDivRep::G4tgrPlaceDivRep()
     44  : theNDiv(0), theWidth(0.), theAxis(kUndefined),
     45    theOffset(0.), theDivType(DivByNdivAndWidth)
    4446{
    45   theOffset = 0.;
    4647}
    4748

  • trunk/source/persistency/ascii/src/G4tgrPlaceParameterisation.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrPlaceParameterisation.cc,v 1.6 2008/12/18 13:00:02 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrPlaceParameterisation.cc,v 1.8 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrPlaceSimple.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrPlaceSimple.cc,v 1.5 2008/12/18 13:00:04 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrPlaceSimple.cc,v 1.7 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrRotationMatrix.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrRotationMatrix.cc,v 1.5 2008/12/18 13:00:06 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrRotationMatrix.cc,v 1.7 2010/10/13 15:20:01 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4242// -------------------------------------------------------------------------
    4343G4tgrRotationMatrix::G4tgrRotationMatrix()
     44  : theName("Rotation-Matrix"), theInputType(rm9)
    4445{
    4546}
    … …  
    5354
    5455// -------------------------------------------------------------------------
    55 G4tgrRotationMatrix::G4tgrRotationMatrix( const std::vector<G4String>& wl )
     56G4tgrRotationMatrix::G4tgrRotationMatrix( const std::vector<G4String>& wl )
     57  : theInputType(rm9)
    5658{
    5759  theName = G4tgrUtils::GetString( wl[1] );

  • trunk/source/persistency/ascii/src/G4tgrRotationMatrixFactory.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrRotationMatrixFactory.cc,v 1.2 2008/12/18 13:00:08 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrRotationMatrixFactory.cc,v 1.3 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrSolid.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrSolid.cc,v 1.6 2008/12/18 13:00:10 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrSolid.cc,v 1.7 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrSolidBoolean.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrSolidBoolean.cc,v 1.4 2008/12/18 13:00:12 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrSolidBoolean.cc,v 1.5 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrUtils.cc

    r1035 r1347  
    7878G4bool G4tgrUtils::IsNumber( const G4String& str)
    7979{
    80   G4int isnum = 1;
     80  G4int isnum = true;
    8181  G4int numE = 0;
    8282  for(size_t ii=0; ii<str.length(); ii++)
    … …  
    9090        if(numE != 0 || ii == str.length()-1)
    9191        {
    92           isnum = 0;
     92          isnum = false;
    9393          break;
    9494        }
    … …  
    9797      else
    9898      {
    99         isnum = 0;
     99        isnum = false;
    100100        break;
    101101      }
    … …  
    123123void G4tgrUtils::Dump3v( const G4ThreeVector& vec, const char* msg)
    124124{
    125   G4cout << msg << std::setprecision(8) << vec << G4endl;
     125  G4cout << msg << std::setprecision(8)
     126         << vec << std::setprecision(6) << G4endl;
    126127}
    127128
    … …  
    346347        //----- Check if it is a function
    347348        G4bool bWordOK = false;     
    348         if( G4tgrUtils::WordIsFunction( word ) )
     349        if( G4tgrUtils::IsFunction( word ) )
    349350        {
    350351          //--- It must be followed by '('
    … …  
    360361        //----- Check if it is a unit     
    361362        }
    362         else if( G4tgrUtils::WordIsUnit( word ) )
     363        else if( !G4tgrUtils::IsNumber( word ) )
    363364        {
    364365          //--- It must be preceded by a *
    … …  
    550551
    551552//-------------------------------------------------------------
    552 G4bool G4tgrUtils::WordIsUnit( const G4String& word )
    553 {
    554   return !IsNumber(word);
    555   if(    word == "mm"
    556       || word == "cm"
    557       || word == "m"
    558       || word == "km"
    559       || word == "millimeter"
    560       || word == "centimeter"
    561       || word == "meter"
    562       || word == "kilometer"
    563       || word == "parsec"
    564       || word == "micrometer"
    565       || word == "nanometer"
    566       || word == "angstrom"
    567       || word == "fermi"
    568       || word == "nm"
    569       || word == "um"
    570       || word == "pc"
    571       || word == "radian"
    572       || word == "milliradian"
    573       || word == "degree"
    574       || word == "rad"
    575       || word == "mrad"
    576       || word == "deg"
    577       || word == "ns"
    578       || word == "curie"
    579       || word == "curie"   )
    580   {
    581     return true;
    582   }
    583   else
    584   {
    585     return false;
    586   }
    587 }
    588 
    589 
    590 //-------------------------------------------------------------
    591 G4bool G4tgrUtils::WordIsFunction( const G4String& word )
     553G4bool G4tgrUtils::IsFunction( const G4String& word )
    592554{
    593555  if(    word == "sin"

  • trunk/source/persistency/ascii/src/G4tgrVolume.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrVolume.cc,v 1.10 2009/11/23 11:36:29 arce Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrVolume.cc,v 1.13 2010/12/15 11:29:54 arce Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    4949//-------------------------------------------------------------
    5050G4tgrVolume::G4tgrVolume()
     51  : theName(""), theType(""),
     52    theMaterialName(""), theSolid(0), theVisibility(false),
     53    theRGBColour(0), theCheckOverlaps(false)
    5154{
    5255}
    … …  
    5659G4tgrVolume::~G4tgrVolume()
    5760{
     61  delete [] theRGBColour;
    5862}
    5963
    … …  
    104108#endif
    105109    }
    106 
    107110}
    108111

  • trunk/source/persistency/ascii/src/G4tgrVolumeAssembly.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrVolumeAssembly.cc,v 1.6 2008/12/18 13:00:18 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrVolumeAssembly.cc,v 1.7 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrVolumeDivision.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrVolumeDivision.cc,v 1.6 2008/12/18 13:00:20 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrVolumeDivision.cc,v 1.7 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/persistency/ascii/src/G4tgrVolumeMgr.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4tgrVolumeMgr.cc,v 1.7 2008/12/18 13:00:22 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4tgrVolumeMgr.cc,v 1.10 2010/10/13 07:56:56 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//
    … …  
    373373
    374374  //---------- construct the children of this VOL
    375   std::pair<G4mmapspl::const_iterator, G4mmapspl::const_iterator> children
     375  std::pair<G4mmapspl::iterator, G4mmapspl::iterator> children
    376376    = GetChildren( vol->GetName() );
    377377  G4mmapspl::const_iterator cite;
Note: See TracChangeset for help on using the changeset viewer.