Changeset 965 for trunk


Ignore:
Timestamp:
Apr 6, 2009, 2:36:16 PM (15 years ago)
Author:
garnier
Message:

update g3tog4

Location:
trunk/source/g3tog4
Files:
79 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/g3tog4/GNUmakefile

    r817 r965  
    105105all: lib
    106106
    107 lib: libc libF
     107lib: cleanf libc libF
    108108
    109109ifneq ($(G4LIB_BUILD_SHARED),)

  • trunk/source/g3tog4/History

    r817 r965  
    1 $Id: History,v 1.61 2005/11/14 18:21:56 gcosmo Exp $
     1$Id: History,v 1.63 2008/11/17 08:34:11 gcosmo Exp $
    22
    33G3toG4 Modification History (reverse chronological order, please !)
    44--------------------------------------------------------------------
     5
     6g3tog4-V09-01-01 17-Nov-2008 G.Cosmo
     7- Fixed compilation warning for gcc-4.3.X in clparse.cc .
     8
     9g3tog4-V09-01-00 23-Jun-2008 G.Cosmo
     10- GNUmakefile: clean Fortran objects in 'lib' target before building
     11  the libraries.
    512
    613g3tog4-V07-01-01 14-Nov-2005 G.Cosmo

  • trunk/source/g3tog4/include/G3DetTable.hh

    r817 r965  
    2626//
    2727// $Id: G3DetTable.hh,v 1.9 2006/06/29 18:11:17 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G3DetTable class

  • trunk/source/g3tog4/include/G3DetTableEntry.hh

    r817 r965  
    2626//
    2727// $Id: G3DetTableEntry.hh,v 1.6 2006/06/29 18:11:23 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G3DetTableEntry class

  • trunk/source/g3tog4/include/G3Division.hh

    r817 r965  
    2626//
    2727// $Id: G3Division.hh,v 1.8 2006/06/29 18:11:49 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3EleTable.hh

    r817 r965  
    2626//
    2727// $Id: G3EleTable.hh,v 1.8 2006/06/29 18:11:51 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3G4Interface.hh

    r817 r965  
    2626//
    2727// $Id: G3G4Interface.hh,v 1.10 2006/06/29 18:11:54 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//   Interfaces for G3 equivalent routines

  • trunk/source/g3tog4/include/G3MatTable.hh

    r817 r965  
    2626//
    2727// $Id: G3MatTable.hh,v 1.13 2006/06/29 18:11:56 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3MatTableEntry.hh

    r817 r965  
    2626//
    2727// $Id: G3MatTableEntry.hh,v 1.6 2006/06/29 18:11:58 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3MedTable.hh

    r817 r965  
    2626//
    2727// $Id: G3MedTable.hh,v 1.13 2006/06/29 18:12:01 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3MedTableEntry.hh

    r817 r965  
    2626//
    2727// $Id: G3MedTableEntry.hh,v 1.6 2006/06/29 18:12:03 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3PartTable.hh

    r817 r965  
    2626//
    2727// $Id: G3PartTable.hh,v 1.10 2006/06/29 18:12:05 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3Pos.hh

    r817 r965  
    2626//
    2727// $Id: G3Pos.hh,v 1.11 2006/06/29 18:12:08 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3RotTable.hh

    r817 r965  
    2626//
    2727// $Id: G3RotTable.hh,v 1.15 2006/06/29 18:12:10 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3RotTableEntry.hh

    r817 r965  
    2626//
    2727// $Id: G3RotTableEntry.hh,v 1.6 2006/06/29 18:12:13 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3SensVolVector.hh

    r817 r965  
    2626//
    2727// $Id: G3SensVolVector.hh,v 1.7 2006/06/29 18:12:15 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// vector of logical volumes that were defined with

  • trunk/source/g3tog4/include/G3VolTable.hh

    r817 r965  
    2626//
    2727// $Id: G3VolTable.hh,v 1.18 2006/06/29 18:12:18 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3VolTableEntry.hh

    r817 r965  
    2626//
    2727// $Id: G3VolTableEntry.hh,v 1.9 2006/06/29 18:12:28 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3toG4.hh

    r817 r965  
    2626//
    2727// $Id: G3toG4.hh,v 1.9 2006/06/29 18:12:33 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// modified by I.Hrivnacova, 27 Sep 99

  • trunk/source/g3tog4/include/G3toG4.inc

    r817 r965  
    2626*   
    2727*     $Id: G3toG4.inc,v 1.4 2006/06/29 18:12:35 gunter Exp $
    28 *     GEANT4 tag $Name: $
     28*     GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929*   
    3030      integer maxlines

  • trunk/source/g3tog4/include/G3toG4BuildTree.hh

    r817 r965  
    2626//
    2727// $Id: G3toG4BuildTree.hh,v 1.8 2006/06/29 18:12:37 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3toG4MANY.hh

    r817 r965  
    2626//
    2727// $Id: G3toG4MANY.hh,v 1.3 2006/06/29 18:12:39 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3toG4MakeSolid.hh

    r817 r965  
    2626//
    2727// $Id: G3toG4MakeSolid.hh,v 1.7 2006/06/29 18:12:42 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// ----------------------

  • trunk/source/g3tog4/include/G3toG4RotationMatrix.hh

    r817 r965  
    2626//
    2727// $Id: G3toG4RotationMatrix.hh,v 1.6 2006/06/29 18:12:44 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929// ----------------------
    3030// Class description:

  • trunk/source/g3tog4/include/gcbank.inc

    r817 r965  
    2626*   
    2727*     $Id: gcbank.inc,v 1.4 2006/06/29 18:12:46 gunter Exp $
    28 *     GEANT4 tag $Name: $
     28*     GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929*   
    3030      INTEGER IQ,LQ,NZEBRA,IXSTOR,IXDIV,IXCONS,LMAIN,LR1,JCG

  • trunk/source/g3tog4/src/G3DetTable.cc

    r817 r965  
    2626//
    2727// $Id: G3DetTable.cc,v 1.12 2006/06/29 18:12:48 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030#include "globals.hh"

  • trunk/source/g3tog4/src/G3DetTableEntry.cc

    r817 r965  
    2626//
    2727// $Id: G3DetTableEntry.cc,v 1.5 2006/06/29 18:12:51 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030#include "globals.hh"

  • trunk/source/g3tog4/src/G3Division.cc

    r817 r965  
    2626//
    2727// $Id: G3Division.cc,v 1.17 2006/06/29 18:12:53 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, V.Berejnoi 13.10.99

  • trunk/source/g3tog4/src/G3EleTable.cc

    r817 r965  
    2626//
    2727// $Id: G3EleTable.cc,v 1.16 2006/06/29 18:12:55 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/g3tog4/src/G3MatTable.cc

    r817 r965  
    2626//
    2727// $Id: G3MatTable.cc,v 1.16 2006/06/29 18:12:57 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 27 Sep 99

  • trunk/source/g3tog4/src/G3MatTableEntry.cc

    r817 r965  
    2626//
    2727// $Id: G3MatTableEntry.cc,v 1.4 2006/06/29 18:13:00 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 27 Sep 99

  • trunk/source/g3tog4/src/G3MedTable.cc

    r817 r965  
    2626//
    2727// $Id: G3MedTable.cc,v 1.15 2006/06/29 18:13:03 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 27 Sep 99

  • trunk/source/g3tog4/src/G3MedTableEntry.cc

    r817 r965  
    2626//
    2727// $Id: G3MedTableEntry.cc,v 1.4 2006/06/29 18:13:06 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 27 Sep 99

  • trunk/source/g3tog4/src/G3NegVolPars.cc

    r817 r965  
    2626//
    2727// $Id: G3NegVolPars.cc,v 1.13 2006/06/29 18:13:08 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// modified by I. Hrivnacova, 13.10.99

  • trunk/source/g3tog4/src/G3PartTable.cc

    r817 r965  
    2626//
    2727// $Id: G3PartTable.cc,v 1.14 2006/06/29 18:13:10 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/g3tog4/src/G3Pos.cc

    r817 r965  
    2626//
    2727// $Id: G3Pos.cc,v 1.9 2006/06/29 18:13:12 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// modified by I.Hrivnacova, 13.10.99

  • trunk/source/g3tog4/src/G3RotTable.cc

    r817 r965  
    2626//
    2727// $Id: G3RotTable.cc,v 1.16 2006/06/29 18:13:15 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 27 Sep 99

  • trunk/source/g3tog4/src/G3RotTableEntry.cc

    r817 r965  
    2626//
    2727// $Id: G3RotTableEntry.cc,v 1.4 2006/06/29 18:13:17 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 27 Sep 99

  • trunk/source/g3tog4/src/G3VolTable.cc

    r817 r965  
    2626//
    2727// $Id: G3VolTable.cc,v 1.22 2006/06/29 18:13:20 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// modified by I.Hrivnacova, 13.10.99

  • trunk/source/g3tog4/src/G3VolTableEntry.cc

    r817 r965  
    2626//
    2727// $Id: G3VolTableEntry.cc,v 1.12 2006/06/29 18:13:22 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// modified by I.Hrivnacova, 13.10.99

  • trunk/source/g3tog4/src/G3fillParams.cc.archive

    r817 r965  
    77//
    88// $Id: G3fillParams.cc.archive,v 1.2 2003/06/16 16:50:54 gunter Exp $
    9 // GEANT4 tag $Name: $
     9// GEANT4 tag $Name: geant4-09-02-ref-02 $
    1010//
    1111// extracted from clparse.cc by I. Hrivnacova, 30.7.99

  • trunk/source/g3tog4/src/G3toG4BuildTree.cc

    r817 r965  
    2626//
    2727// $Id: G3toG4BuildTree.cc,v 1.20 2006/06/29 18:13:24 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// modified by I. Hrivnacova, 2.8.99

  • trunk/source/g3tog4/src/G3toG4MANY.cc

    r817 r965  
    2626//
    2727// $Id: G3toG4MANY.cc,v 1.2 2006/06/29 18:13:26 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// By I. Hrivnacova, 22.10.01

  • trunk/source/g3tog4/src/G3toG4MakeSolid.cc

    r817 r965  
    2626//
    2727// $Id: G3toG4MakeSolid.cc,v 1.10 2006/06/29 18:13:29 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// modified by I.Hrivnacova, V.Berejnoi 27 Sep 99

  • trunk/source/g3tog4/src/G3toG4RotationMatrix.cc

    r817 r965  
    2626//
    2727// $Id: G3toG4RotationMatrix.cc,v 1.4 2006/06/29 18:13:31 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#include "G3toG4RotationMatrix.hh"

  • trunk/source/g3tog4/src/G4BuildGeom.cc

    r817 r965  
    2626//
    2727// $Id: G4BuildGeom.cc,v 1.17 2006/06/29 18:13:34 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// modified by I. Hrivnacova, 13.10.99

  • trunk/source/g3tog4/src/G4ggclos.cc

    r817 r965  
    2626//
    2727// $Id: G4ggclos.cc,v 1.8 2006/06/29 18:13:37 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#include "G3toG4.hh"

  • trunk/source/g3tog4/src/G4gsatt.cc

    r817 r965  
    2626//
    2727// $Id: G4gsatt.cc,v 1.13 2006/06/29 18:13:39 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#include "globals.hh"

  • trunk/source/g3tog4/src/G4gsbool.cc

    r817 r965  
    2626//
    2727// $Id: G4gsbool.cc,v 1.2 2006/06/29 18:13:41 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 13.10.01

  • trunk/source/g3tog4/src/G4gsdet.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdet.cc,v 1.5 2006/06/29 18:13:43 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#include "globals.hh"

  • trunk/source/g3tog4/src/G4gsdeta.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdeta.cc,v 1.6 2006/06/29 18:13:45 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/g3tog4/src/G4gsdetd.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdetd.cc,v 1.8 2006/06/29 18:13:47 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#include "G3toG4.hh"

  • trunk/source/g3tog4/src/G4gsdeth.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdeth.cc,v 1.8 2006/06/29 18:13:49 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#include "G3toG4.hh"

  • trunk/source/g3tog4/src/G4gsdetu.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdetu.cc,v 1.6 2006/06/29 18:13:51 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#include "G3toG4.hh"

  • trunk/source/g3tog4/src/G4gsdetv.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdetv.cc,v 1.10 2006/06/29 18:13:53 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#include "G4ios.hh"

  • trunk/source/g3tog4/src/G4gsdk.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdk.cc,v 1.7 2006/06/29 18:13:55 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929
    3030#include "G4Decay.hh"

  • trunk/source/g3tog4/src/G4gsdvn.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdvn.cc,v 1.10 2006/06/29 18:13:57 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, V.Berejnoi, 29 Oct 99

  • trunk/source/g3tog4/src/G4gsdvn2.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdvn2.cc,v 1.8 2006/06/29 18:14:00 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, V.Berejnoi, 29 Oct 99

  • trunk/source/g3tog4/src/G4gsdvt.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdvt.cc,v 1.7 2006/06/29 18:14:03 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, V.Berejnoi, 29 Oct 99

  • trunk/source/g3tog4/src/G4gsdvt2.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdvt2.cc,v 1.7 2006/06/29 18:14:05 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, V.Berejnoi, 29 Oct 99

  • trunk/source/g3tog4/src/G4gsdvx.cc

    r817 r965  
    2626//
    2727// $Id: G4gsdvx.cc,v 1.5 2006/06/29 18:14:08 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, V.Berejnoi, 27 Sep 99

  • trunk/source/g3tog4/src/G4gsmate.cc

    r817 r965  
    2626//
    2727// $Id: G4gsmate.cc,v 1.12 2006/06/29 18:14:10 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 27 Sep 99

  • trunk/source/g3tog4/src/G4gsmixt.cc

    r817 r965  
    2626//
    2727// $Id: G4gsmixt.cc,v 1.13 2006/06/29 18:14:37 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 27 Sep 99

  • trunk/source/g3tog4/src/G4gspart.cc

    r817 r965  
    2626//
    2727// $Id: G4gspart.cc,v 1.7 2006/06/29 18:14:40 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030#include "G4ProcessManager.hh"

  • trunk/source/g3tog4/src/G4gspos.cc

    r817 r965  
    2626//
    2727// $Id: G4gspos.cc,v 1.13 2006/06/29 18:14:42 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 13.10.99

  • trunk/source/g3tog4/src/G4gsposp.cc

    r817 r965  
    2626//
    2727// $Id: G4gsposp.cc,v 1.16 2006/06/29 18:14:44 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 13.10.99

  • trunk/source/g3tog4/src/G4gsrotm.cc

    r817 r965  
    2626//
    2727// $Id: G4gsrotm.cc,v 1.12 2006/06/29 18:14:55 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030#include "G3toG4.hh"

  • trunk/source/g3tog4/src/G4gstmed.cc

    r817 r965  
    2626//
    2727// $Id: G4gstmed.cc,v 1.7 2006/06/29 18:15:02 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// The last G4int argument of G4gstmed(..) is used for sending

  • trunk/source/g3tog4/src/G4gstpar.cc

    r817 r965  
    2626//
    2727// $Id: G4gstpar.cc,v 1.8 2006/06/29 18:15:04 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030#include "G3toG4.hh"

  • trunk/source/g3tog4/src/G4gsvolu.cc

    r817 r965  
    2626//
    2727// $Id: G4gsvolu.cc,v 1.10 2006/06/29 18:15:06 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// by I.Hrivnacova, 13.10.99

  • trunk/source/g3tog4/src/clparse.cc

    r817 r965  
    2525//
    2626//
    27 // $Id: clparse.cc,v 1.18 2006/06/29 18:15:08 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: clparse.cc,v 1.19 2008/11/17 08:33:57 gcosmo Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// modified by I.Hrivnacova
    … …  
    4646std::ofstream ofile;
    4747
    48 extern "C" {
     48extern "C"
     49{
    4950#include <stdlib.h>
    5051}
    … …  
    5354
    5455G3VolTable G3Vol;
    55 G3MatTable G3Mat; // material G3 ID <-> G4 pointer table
    56 G3MedTable G3Med; // trk media G3 ID <-> G4 pointer table
    57 G3RotTable G3Rot; // rotation ID <-> G4 transform object table
     56G3MatTable G3Mat;   // material G3 ID <-> G4 pointer table
     57G3MedTable G3Med;   // trk media G3 ID <-> G4 pointer table
     58G3RotTable G3Rot;   // rotation ID <-> G4 transform object table
    5859G3PartTable G3Part; // particle ID <-> ParticleDefinition pointer
    59 G3DetTable G3Det; // sensitive detector name <-> pointer
    60 G3EleTable G3Ele; // element names table
     60G3DetTable G3Det;   // sensitive detector name <-> pointer
     61G3EleTable G3Ele;   // element names table
    6162G3SensVolVector G3SensVol; // vector of sensitive logical volumes
    6263char gSeparator('_');
    … …  
    7273
    7374// front-end decoders for G3 routines
     75//
    7476void PG4gsvolu(G4String *tokens);
    7577void PG4gspos (G4String *tokens);
    … …  
    9698void PG4ggclos();
    9799
    98 void G3CLRead(G4String & fname, char *select = 0){
    99 //
    100 //  G3CLRead
    101 //  Read the call List file, parse the tokens, and pass the token
    102 //  List to the Geant4 interpreter
    103 //
    104 //  fname: call List filename
    105 //
     100void G3CLRead(G4String & fname, char *select = 0)
     101{
     102  //
     103  //  G3CLRead
     104  //  Read the call List file, parse the tokens, and pass the token
     105  //  List to the Geant4 interpreter
     106  //
     107  //  fname: call List filename
    106108 
    107   G4String line;
    108   G4String tokens[1000];
    109 
    110   const char* ofname = "clparse.out";
    111   ofile.open(ofname);
    112   ofile << "Output file open\n";
    113 
    114   G4int count = 0;
    115   G4int ntokens = 0;
    116   std::ifstream istr(fname);
     109    G4String line;
     110    G4String tokens[1000];
     111
     112    const char* ofname = "clparse.out";
     113    ofile.open(ofname);
     114    ofile << "Output file open\n";
     115
     116    G4int count = 0;
     117    G4int ntokens = 0;
     118    std::ifstream istr(fname);
    117119   
    118   while (line.readLine(istr) && ! istr.eof()){
    119       count++;
    120       ntokens = G3CLTokens(&line,tokens);  // tokenize the line
    121       for (G4int i=0; i < ntokens; i++) ofile << tokens[i] << G4endl;
    122      
    123           // interpret the line as a Geant call
    124       G3CLEval(tokens, select);
    125   }
     120    while (line.readLine(istr) && ! istr.eof())
     121    {
     122        count++;
     123        ntokens = G3CLTokens(&line,tokens);  // tokenize the line
     124        for (G4int i=0; i < ntokens; i++)
     125        {
     126          ofile << tokens[i] << G4endl;
     127        }
     128
     129        // interpret the line as a Geant call
     130        //
     131        G3CLEval(tokens, select);
     132    }
    126133}
    127134
    128135
    129136G4int G3CLTokens(G4String *line, G4String tokens[])
    130 //
    131 // G3CLTokens
    132 //
    133 // Tokenize line, returning tokens in tokens[]. Items in ".."
    134 // are extracted as single tokens, despite embedded spaces.
    135 //
    136 {
     137{
     138  //
     139  // G3CLTokens
     140  //
     141  // Tokenize line, returning tokens in tokens[]. Items in ".."
     142  // are extracted as single tokens, despite embedded spaces.
     143
    137144    G4Tokenizer next(*line);
     145
    138146    // first tokenize using " to identify strings
     147    //
    139148    G4int itok = 0;
    140149    G4int ntokens = 0;
    141150    G4String token1, token2;
    142151    while (!(token1=next("\"")).isNull())
    143         {
    144             itok++;
    145             if (itok%2 == 0 ) // even: inside a string
    146                 {
    147                     tokens[ntokens++] = token1;
    148                 } else        // not in a quoted string: finish tokenization
    149                 {
    150                     G4Tokenizer lev2(token1);
    151                     while (!(token2=lev2()).isNull())
    152                         {
    153                             tokens[ntokens] = token2;
    154                             ntokens++;
    155                         }
    156                 }
     152    {
     153        itok++;
     154        if (itok%2 == 0 ) // even: inside a string
     155        {
     156            tokens[ntokens++] = token1;
    157157        }
     158        else              // not in a quoted string: finish tokenization
     159        {
     160            G4Tokenizer lev2(token1);
     161            while (!(token2=lev2()).isNull())
     162            {
     163                tokens[ntokens] = token2;
     164                ntokens++;
     165            }
     166        }
     167    }
    158168    return ntokens;
    159169}
    160170
     171
    161172void G3CLEval(G4String tokens[], char *select)
    162 //
    163 // G3CLEval
    164 //
    165 // Evaluate the token List as a Geant3 call, and execute it as
    166 // a Geant4 call.
    167 //
    168 {
     173{
     174  //
     175  // G3CLEval
     176  //
     177  // Evaluate the token List as a Geant3 call, and execute it as
     178  // a Geant4 call.
     179
    169180    const char* context = tokens[0];
    170181    const char* routine = tokens[1];
    171 
    172     // If context is selected, return unless context matches.
    173     if (select != 0 && select != "*") if ( strcmp(select,context) ) return;
     182    const char* wcard = "*";
     183
     184    // If context is selected, return unless context matches
     185    //
     186    if ((select != 0) && (select != wcard))
     187    {
     188      if ( strcmp(select,context) )  { return; }
     189    }
    174190
    175191    // Branch on Geant3 routine name
     192    //
    176193    ofile << "Do routine " << routine << " in context " << context << G4endl;
    177194   
    178     if ( !strcmp(routine,"GSVOLU") ) {
    179 //      volcount++;
    180 //      if (volcount == 1) {
    181 //        // Special handling of the first one, assumed to be global mother
    182 //        if ( GlobalMotherVolume == 0 ) {
    183 //        PG4gsvolu(&tokens[2]);
    184 //        } else {
    185 //          G4String gblmoth="Global mother";
    186 //          G3Vol.PutLV(&gblmoth,GlobalMotherVolume);
    187 //        }
    188 //      } else {
    189 //        PG4gsvolu(&tokens[2]);
    190 //      }
    191 //      if (volcount == 2) {
    192 //        G4String vname = tokens[2];
    193 //        SubsystemMotherVolume = G3Vol.GetLV(&vname);
    194 //      }
    195         { PG4gsvolu(&tokens[2]); return;}
    196     }
     195    if ( !strcmp(routine,"GSVOLU") ) { PG4gsvolu(&tokens[2]); return;}
    197196    if ( !strcmp(routine,"GSPOS") )  { PG4gspos (&tokens[2]); return;}
    198197    if ( !strcmp(routine,"GSPOSP") ) { PG4gsposp(&tokens[2]); return;}
    … …  
    220219
    221220void G3fillParams(G4String *tokens, const char *ptypes)
    222 //
    223 // G3fillParams
    224 //
    225 // Interpret tokens to fill call parameters, based on parameter
    226 //   types ptypes
    227 //
    228 {
     221{
     222  //
     223  // G3fillParams
     224  //
     225  // Interpret tokens to fill call parameters, based on parameter types ptypes
     226
    229227    // loop over ptypes
     228    //
    230229    G4int i =0, ipt = 0, k = 0;
    231230    G4int ni =0, nr = 0, ns = 0;
    232231    while (ptypes[i] != '\0')
    233         {
    234             switch (ptypes[i]) {
     232    {
     233        switch (ptypes[i])
     234        {
    235235            case 'i':
    236236                Ipar[ni] = atoi(tokens[ipt].data());
    … …  
    248248            case 'I':
    249249                for (k=0; k < narray; k++)
    250                     {
    251                         Ipar[ni] = atoi(tokens[ipt].data());
    252                         ni++; ipt++;
    253                     }
     250                {
     251                    Ipar[ni] = atoi(tokens[ipt].data());
     252                    ni++; ipt++;
     253                }
    254254                break;
    255255            case 'R':
    256256                for (k=0; k < narray; k++)
    257                     {
    258                         Rpar[nr] = atof(tokens[ipt].data());
    259                         nr++; ipt++;
    260                     }
     257                {
     258                    Rpar[nr] = atof(tokens[ipt].data());
     259                    nr++; ipt++;
     260                }
    261261                break;
    262262            case 'Q':
    263263                // special case of reading three successive R arrays
    264264                // into one (used in gsmixt)
     265                //
    265266                narray = 3 * std::abs(narray);
    266267                for (k=0; k < narray; k++)
    267                     {
    268                         Rpar[nr] = atof(tokens[ipt].data());
    269                         nr++; ipt++;
    270                     }
     268                {
     269                    Rpar[nr] = atof(tokens[ipt].data());
     270                    nr++; ipt++;
     271                }
    271272                break;
    272273            case 'S':
    273274                for (k=0; k < narray; k++)
    274                     {
    275                         Spar[ns] = tokens[ipt];
    276                         ns++; ipt++;
    277                     }
     275                {
     276                    Spar[ns] = tokens[ipt];
     277                    ns++; ipt++;
     278                }
    278279                break;
    279280            default:
    280281                ofile << "unidentified ptype '" << ptypes[i] << G4endl;
    281             };
    282             i++;
    283         }
    284 }
     282        };
     283        i++;
     284    }
     285}

  • trunk/source/g3tog4/src/g3routines.F

    r817 r965  
    2626*   
    2727*     $Id: g3routines.F,v 1.5 2006/06/29 18:15:10 gunter Exp $
    28 *     GEANT4 tag $Name: $
     28*     GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929*   
    3030#define CALL_GEANT

  • trunk/source/g3tog4/src/g3test.F.main

    r817 r965  
    77*   
    88*     $Id: g3test.F.main,v 1.2 1999/12/05 17:50:16 gcosmo Exp $
    9 *     GEANT4 tag $Name: $
     9*     GEANT4 tag $Name: geant4-09-02-ref-02 $
    1010*   
    1111*

  • trunk/source/g3tog4/src/g3tog4.F

    r817 r965  
    2626*   
    2727*     $Id: g3tog4.F,v 1.5 2006/06/29 18:15:12 gunter Exp $
    28 *     GEANT4 tag $Name: $
     28*     GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929*   
    3030*

  • trunk/source/g3tog4/src/g4geom.cc.main

    r817 r965  
    77//
    88// $Id: g4geom.cc.main,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
    9 // GEANT4 tag $Name: $
     9// GEANT4 tag $Name: geant4-09-02-ref-02 $
    1010//
    1111//   g4geom

  • trunk/source/g3tog4/src/jshape.F

    r817 r965  
    2626*   
    2727*     $Id: jshape.F,v 1.4 2006/06/29 18:15:14 gunter Exp $
    28 *     GEANT4 tag $Name: $
     28*     GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929*   
    3030*     

  • trunk/source/g3tog4/src/mztog4.F

    r817 r965  
    2626*   
    2727*     $Id: mztog4.F,v 1.4 2006/06/29 18:15:16 gunter Exp $
    28 *     GEANT4 tag $Name: $
     28*     GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929*   
    3030      subroutine mztog4

  • trunk/source/g3tog4/src/rztog4.F

    r817 r965  
    2626*   
    2727*     $Id: rztog4.F,v 1.4 2006/06/29 18:15:18 gunter Exp $
    28 *     GEANT4 tag $Name: $
     28*     GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929*   
    3030      program rztog4

  • trunk/source/g3tog4/src/tog4.F

    r817 r965  
    2626*   
    2727*     $Id: tog4.F,v 1.5 2006/06/29 18:15:21 gunter Exp $
    28 *     GEANT4 tag $Name: $
     28*     GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929*   
    3030      subroutine tog4
Note: See TracChangeset for help on using the changeset viewer.