lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 4.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:18:25 +02:00
parent 36c080dca6
commit 921d3b1cda
3990 changed files with 185376 additions and 82884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/GNUmakefile
+4 -1
View File
@@ -33,7 +33,7 @@ include $(G4INSTALL)/config/globlib.gmk
# --------------------------------------------------------------
.PHONY : all global clean clean_libs cleandb
.PHONY : all global clean clean_libs cleandb test
# if G4ODBMS flag is not defined, override the target "all" then exit
ifndef G4ODBMS
@@ -54,3 +54,6 @@ newdb:
@$(HEP_ODBMS_DIR)/etc/getdb $(HEP_ODBMS_DIR)/schema/HEP_BASE \
$(G4SCHEMA_BOOT) $(G4SCHEMA_FDID)
test:
@echo "G4DDLX_FLAGS = $(G4DDLX_FLAGS)"
source/persistency/History
+11
View File
@@ -15,6 +15,17 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
7 December, 01 Y.Morita (persistency-V03-02-02)
- added G4Pglobals.hh to G4PVHits and G4PVDigits for g++ 2.95.2 headers
6 July, 01 Y.Morita (persistency-V03-02-01)
- added more SRM descriptions
4 July, 01 Y.Morita (persistency-V03-02-00)
- STL migration:
modified: G4Pglobals.hh, G4PGeometryObjectMap.ddl, G4PGeometryObjectMap.cc
removed: G4VPhysVolRefArray.hh, G4LogVolRefArray.hh G4VSolidRefArray.hh
21 June, 01 Y.Morita (persistency-V03-01-00)
- new tag for release 3.2
source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PDCofThisEvent.ddl,v 1.6.2.1 2001/06/28 19:11:23 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PDCofThisEvent.ddl,v 1.7 2001/07/11 10:02:13 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/digits+hits/digits/include/G4PVDigit.ddl
+3 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVDigit.ddl,v 1.3.4.1 2001/06/28 19:11:23 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVDigit.ddl,v 1.5 2001/12/07 03:49:10 morita Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
@@ -34,6 +34,7 @@
#ifndef G4PVDigit_h
#define G4PVDigit_h 1
#include "G4Pglobals.hh"
#include "G4PersistentSchema.hh"
#include "G4VDigi.hh"
source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVDigitsCollection.ddl,v 1.6.4.1 2001/06/28 19:11:23 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVDigitsCollection.ddl,v 1.7 2001/07/11 10:02:13 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentDigitMan.hh,v 1.7.4.1 2001/06/28 19:11:23 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentDigitMan.hh,v 1.8 2001/07/11 10:02:13 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PDCofThisEvent.cc,v 1.3.8.1 2001/06/28 19:11:23 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PDCofThisEvent.cc,v 1.4 2001/07/11 10:02:13 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "G4PDCofThisEvent.hh"
source/persistency/digits+hits/digits/src/G4PVDigit.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVDigit.cc,v 1.2.8.1 2001/06/28 19:11:23 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVDigit.cc,v 1.3 2001/07/11 10:02:13 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "G4PVDigit.hh"
source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVDigitsCollection.cc,v 1.3.8.1 2001/06/28 19:11:24 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVDigitsCollection.cc,v 1.4 2001/07/11 10:02:13 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// G4PVDigitsCollection
source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentDigitMan.cc,v 1.5.2.1 2001/06/28 19:11:24 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentDigitMan.cc,v 1.6 2001/07/11 10:02:14 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PersistentDigitMan
//
source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PHCofThisEvent.ddl,v 1.10.2.1 2001/06/28 19:11:24 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PHCofThisEvent.ddl,v 1.11 2001/07/11 10:02:14 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/digits+hits/hits/include/G4PVHit.ddl
+3 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVHit.ddl,v 1.7.4.1 2001/06/28 19:11:24 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVHit.ddl,v 1.9 2001/12/07 03:48:59 morita Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
@@ -34,6 +34,7 @@
#ifndef G4PVHit_h
#define G4PVHit_h 1
#include "G4Pglobals.hh"
#include "G4PersistentSchema.hh"
#include "G4VHit.hh"
source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVHitsCollection.ddl,v 1.14.4.1 2001/06/28 19:11:25 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVHitsCollection.ddl,v 1.15 2001/07/11 10:02:14 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentHitMan.hh,v 1.6.4.1 2001/06/28 19:11:25 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentHitMan.hh,v 1.7 2001/07/11 10:02:14 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PHCofThisEvent.cc,v 1.6.8.1 2001/06/28 19:11:25 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PHCofThisEvent.cc,v 1.7 2001/07/11 10:02:14 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "G4PHCofThisEvent.hh"
source/persistency/digits+hits/hits/src/G4PVHit.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVHit.cc,v 1.4.8.1 2001/06/28 19:11:25 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVHit.cc,v 1.5 2001/07/11 10:02:14 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "G4PVHit.hh"
source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVHitsCollection.cc,v 1.8.8.1 2001/06/28 19:11:25 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVHitsCollection.cc,v 1.9 2001/07/11 10:02:15 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// G4PVHitsCollection
source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentHitMan.cc,v 1.5.2.1 2001/06/28 19:11:25 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentHitMan.cc,v 1.6 2001/07/11 10:02:15 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PersistentHitMan
//
source/persistency/events/include/G4PEvent.ddl
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PEvent.ddl,v 1.11.2.1 2001/06/28 19:11:25 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PEvent.ddl,v 1.12 2001/07/11 10:02:15 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/events/include/G4PPrimaryParticle.ddl
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PPrimaryParticle.ddl,v 1.2.4.1 2001/06/28 19:11:26 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PPrimaryParticle.ddl,v 1.3 2001/07/11 10:02:15 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#ifndef G4PPrimaryParticle_h
source/persistency/events/include/G4PPrimaryVertex.ddl
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PPrimaryVertex.ddl,v 1.10.2.1 2001/06/28 19:11:26 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PPrimaryVertex.ddl,v 1.11 2001/07/11 10:02:15 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/events/include/G4PersistentEventMan.hh
+4 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentEventMan.hh,v 1.11.4.1 2001/06/28 19:11:26 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentEventMan.hh,v 1.13 2001/07/11 10:02:15 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
@@ -78,9 +78,10 @@ class G4PersistentEventMan
G4int f_currentEventID;
HepRef(G4PEvent) f_currentPEvent;
public:
public: // With description
inline G4int CurrentEventID()
{ return f_currentEventID; }
// Returns the current event id
private:
G4bool Store( HepDbApplication* dbApp,
source/persistency/events/src/G4PEvent.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PEvent.cc,v 1.12.2.1 2001/06/28 19:11:26 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PEvent.cc,v 1.13 2001/07/11 10:02:16 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// G4PEvent
source/persistency/events/src/G4PPrimaryParticle.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PPrimaryParticle.cc,v 1.2.2.1 2001/06/28 19:11:26 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PPrimaryParticle.cc,v 1.3 2001/07/11 10:02:16 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "G4PPrimaryParticle.hh"
source/persistency/events/src/G4PPrimaryVertex.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PPrimaryVertex.cc,v 1.8.2.1 2001/06/28 19:11:26 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PPrimaryVertex.cc,v 1.9 2001/07/11 10:02:16 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "G4PPrimaryVertex.hh"
source/persistency/events/src/G4PersistentEventMan.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentEventMan.cc,v 1.16.2.1 2001/06/28 19:11:26 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentEventMan.cc,v 1.17 2001/07/11 10:02:16 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PersistentEventMan
//
source/persistency/geometry/GNUmakefile
+2 -2
View File
@@ -5,8 +5,8 @@
# order of SUBDIRS are important for creating header files.
# don't mess it up!
SUBDIRS = global solids/CSG solids/Boolean management
SUBLIBS = G4pgeomGlobal G4pcsg G4pgeomBoolean G4pgeomn
SUBDIRS = global solids/CSG solids/specific solids/Boolean management
SUBLIBS = G4pgeomGlobal G4pcsg G4pspecsolids G4pgeomBoolean G4pgeomn
ifndef G4INSTALL
G4INSTALL = ../../..
source/persistency/geometry/global/include/G4PAffineTransform.ddl
+8 -5
View File
@@ -21,11 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PAffineTransform.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
// $Id: G4PAffineTransform.ddl,v 1.6 2001/07/11 10:02:16 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// persistenet class of G4AffineTransform
//
// History:
// 10.11.99 Y.Morita, initial creation
@@ -41,11 +42,13 @@ class G4AffineTransform;
class G4PAffineTransform
: public HepPersObj
{
public:
public: // With description
G4PAffineTransform( const G4AffineTransform aTrans );
~G4PAffineTransform();
// Constructor and Destructor
G4AffineTransform MakeTransientObject();
// Creates a transient G4AffineTransform object
private:
G4Pdouble rxx,rxy,rxz;
source/persistency/geometry/global/include/G4PVSolid.ddl
+17 -7
View File
@@ -21,12 +21,13 @@
// ********************************************************************
//
//
// $Id: G4PVSolid.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PVSolid
// $Id: G4PVSolid.ddl,v 1.6 2001/07/11 10:02:17 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
// Persistent version of the abstract base class for G4VSolid.
// History:
// 19.06.98 A.Kimura Converted from G4VSolid.hh
// 20.06.98 A.Kimura Clean up
@@ -45,23 +46,32 @@
class G4PVSolid;
class G4PVSolid : public HepPersObj {
public:
class G4PVSolid
: public HepPersObj
{
public: // With description
G4PVSolid();
G4PVSolid(const G4String& name);
virtual ~G4PVSolid();
// Constructor and Destructor
virtual G4VSolid* MakeTransientObject() const = 0;
// Creates a transient G4VSolid object. Must be implemented in
// user class which inherits which class.
G4bool operator==( const G4PVSolid& s) const
{
return (this==&s) ? true : false;
}
// Comparison operator.
G4String GetName() const;
void SetName(const G4String& name);
// Get and set the name of the solid.
virtual G4GeometryType GetEntityType() const = 0;
// Returns the geometry entity type of the solid. Must be
// implemented in user class which inherits which class.
private:
source/persistency/geometry/global/src/G4PAffineTransform.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PAffineTransform.cc,v 1.2.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PAffineTransform.cc,v 1.3 2001/07/11 10:02:17 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PAffineTransform
//
source/persistency/geometry/global/src/G4PVSolid.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVSolid.cc,v 1.2.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVSolid.cc,v 1.3 2001/07/11 10:02:18 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PVSolid
//
source/persistency/geometry/management/include/G4LogVolRefArray.hh
-76
View File
@@ -1,76 +0,0 @@
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4LogVolRefArray.hh,v 1.1.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
// class description:
//
// This is a class which implements G4RWTPtrVector with
// G4LogicalVolume.
//
// History:
// 00.11.17 Y.Morita Initial version
#ifndef G4LogVolRefArray_hh
#define G4LogVolRefArray_hh 1
#include "g4rw/tpvector.h"
#include "globals.hh"
#include "G4LogicalVolume.hh"
typedef G4RWTPtrVector<G4LogicalVolume> G4LogVolRefVArray;
class G4LogVolRefArray
{
public: // with description
G4LogVolRefArray();
~G4LogVolRefArray();
// The constructor and the destructor.
private:
G4LogVolRefVArray transLogVolPtrs;
public: // with description
inline void Insert(G4int i, G4LogicalVolume* aVol)
{ transLogVolPtrs[i] = aVol; }
// Insert aVol as i-th element.
inline G4LogicalVolume* Get(G4int i)
{ return transLogVolPtrs[i]; }
// return the i-th element.
inline void Resize(size_t n)
{ transLogVolPtrs.resize(n); }
// Resize the vector with n.
};
G4LogVolRefArray::G4LogVolRefArray()
{;}
G4LogVolRefArray::~G4LogVolRefArray()
{;}
#endif
source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
+11 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PGeometryObjectMap.ddl,v 1.7.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PGeometryObjectMap.ddl,v 1.9 2001/07/11 10:02:18 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class description:
@@ -53,6 +53,8 @@
#include "G4Pglobals.hh"
#include "g4std/vector"
#include "G4VPhysicalVolume.hh"
#include "G4LogicalVolume.hh"
#include "G4VSolid.hh"
@@ -67,9 +69,13 @@ class G4PLogicalVolume;
class G4PVSolid;
#pragma ooclassref G4PVSolid "G4PVSolid_ref.hh"
class G4VPhysVolRefArray;
class G4LogVolRefArray;
class G4VSolidRefArray;
typedef G4std::vector<G4LogicalVolume*> G4LogVolRefArray;
typedef G4std::vector<G4VPhysicalVolume*> G4VPhysVolRefArray;
typedef G4std::vector<G4VSolid*> G4VSolidRefArray;
typedef G4std::vector<G4LogicalVolume*>::iterator G4LogVolRefArrayItr;
typedef G4std::vector<G4VPhysicalVolume*>::iterator G4VPhysVolRefArrayItr;
typedef G4std::vector<G4VSolid*>::iterator G4VSolidRefArrayItr;
typedef d_Varray< d_Ref<G4PVPhysicalVolume> > G4PVPhysVolRefVArray;
typedef d_Varray< d_Ref<G4PLogicalVolume> > G4PLogVolRefVArray;
source/persistency/geometry/management/include/G4PLogicalVolume.ddl
+16 -11
View File
@@ -21,13 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PLogicalVolume.ddl,v 1.9.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PLogicalVolume
// P-verson of the class G4LogicalVolume
// Takashi.Sasaki@kek.jp
// $Id: G4PLogicalVolume.ddl,v 1.11 2001/07/11 10:02:18 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of the class G4LogicalVolume.
#ifndef G4PLOGICALVOLUME_DDL
#define G4PLOGICALVOLUME_DDL 1
@@ -51,25 +50,29 @@ typedef d_Varray< d_Ref<G4PVPhysicalVolume> > G4PVPhysVolRefVArray;
class G4PLogicalVolume: public HepPersObj
{
public:
public: // With description
G4PLogicalVolume( const G4LogicalVolume* aLogicalVolume,
HepRef(G4PVSolid) persSolid);
~G4PLogicalVolume();
// Constructor and Destructor
G4LogicalVolume* MakeTransientObject(G4VSolid* aSolid,
G4Material* aMaterial);
// Creates a transient G4LogicalVolume object.
HepRef(G4PVSolid) GetSolid();
void SetSolid( HepRef(G4PVSolid) pSolid );
// Get or set the pointer of persistent solid object.
public:
public: // With description
G4int GetNoDaughters() const;
HepRef(G4PVPhysicalVolume) GetDaughter(const G4int i) const;
void AddDaughter(HepRef(G4PVPhysicalVolume) p);
G4bool IsDaughter(const HepRef(G4PVPhysicalVolume) p) const;
void RemoveDaughter(const HepRef(G4PVPhysicalVolume) p);
// Methods to handle association of persistent physical volume.
private:
private:
G4PVPhysVolRefVArray fDaughters;
// G4MagneticField* fMagneticField;
// G4Material* fMaterial;
@@ -85,11 +88,13 @@ private:
G4Pint NoOfDaughters;
public:
public: // With description
inline void SetMaterialName(G4String aName)
{ fMaterialName = aName; }
inline G4String GetMaterialName()
{ return (G4String) fMaterialName; }
// Set and Get methods for the associated material name.
};
#endif
source/persistency/geometry/management/include/G4PPVParameterised.ddl
+13 -13
View File
@@ -21,13 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PPVParameterised.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PPVParameterised
//
// Persistent-capable class of G4PVParameterised
//
// $Id: G4PPVParameterised.ddl,v 1.6 2001/07/11 10:02:18 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4PVParameterised.
// History:
// 05.11.99 Y.Morita First non-stub version
@@ -40,17 +39,18 @@
class G4PPVParameterised
: public G4PPVReplica
{
public:
G4PPVParameterised(G4VPhysicalVolume *PhysVol,
public: // With description
G4PPVParameterised(G4VPhysicalVolume *PhysVol,
HepRef(G4PLogicalVolume) persLogVol);
~G4PPVParameterised();
// Constructor and Destructor
~G4PPVParameterised();
G4VPhysicalVolume* MakeTransientObject(
G4VPhysicalVolume* MakeTransientObject(
G4LogicalVolume* aLogical,
G4VPhysicalVolume* aMother );
// Creates a transient physical volume object.
private:
private:
// d_Ref<G4VPVParameterisation> fparam;
};
source/persistency/geometry/management/include/G4PPVPlacement.ddl
+10 -7
View File
@@ -21,11 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PPVPlacement.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
//
// P-versieon of G4PVPlacement Takashi.Sasaki@kek.jp
// $Id: G4PPVPlacement.ddl,v 1.6 2001/07/11 10:02:18 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4PVPlacement.
#ifndef G4PPVPLACEMENT_DDL
#define G4PPVPLACEMENT_DDL 1
@@ -40,18 +41,20 @@ class G4PLogicalVolume;
class G4PPVPlacement : public G4PVPhysicalVolume
{
public:
public: // With description
G4PPVPlacement( G4VPhysicalVolume *PhysVol,
HepRef(G4PLogicalVolume) persLogVol);
~G4PPVPlacement();
// Constructor and Destructor
G4VPhysicalVolume* MakeTransientObject(
G4LogicalVolume* aLogical,
G4VPhysicalVolume* aMother );
// Make a transient G4PVPlacement object.
virtual G4bool IsMany() const;
virtual G4int GetCopyNo() const;
// Returns the multiplicity of the volume.
protected:
virtual void SetCopyNo(G4int CopyNo);
source/persistency/geometry/management/include/G4PPVReplica.ddl
+9 -9
View File
@@ -21,14 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PPVReplica.ddl,v 1.5.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PPVReplica
//
// $Id: G4PPVReplica.ddl,v 1.7 2001/07/11 10:02:19 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent-capable class of G4PVReplica
//
// History:
// 05.11.99 Y.Morita First non-stub version
@@ -47,18 +45,20 @@
class G4PPVReplica
: public G4PVPhysicalVolume
{
public:
public: // With description
G4PPVReplica( G4VPhysicalVolume *PhysVol,
HepRef(G4PLogicalVolume) persLogVol);
~G4PPVReplica();
// Constructor and Destructor
G4VPhysicalVolume* MakeTransientObject(
G4LogicalVolume* aLogical,
G4VPhysicalVolume* aMother );
// Creates a transient G4PVReplica object.
virtual G4bool IsMany() const;
virtual G4int GetCopyNo() const;
// Returns the multiplicity of the volume.
protected:
virtual void SetCopyNo(G4int CopyNo);
source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
+19 -14
View File
@@ -21,11 +21,11 @@
// ********************************************************************
//
//
// $Id: G4PVPhysicalVolume.ddl,v 1.5.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PVPhysicalVolume
// $Id: G4PVPhysicalVolume.ddl,v 1.7 2001/07/11 10:02:19 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4VPhysicalVolume.
#ifndef G4PVPHYSICALVOLUME_DDL
#define G4PVPHYSICALVOLUME_DDL 1
@@ -52,38 +52,43 @@ class G4PLogicalVolume;
class G4PVPhysicalVolume: public HepPersObj
{
public:
public: // With description
G4PVPhysicalVolume();
G4PVPhysicalVolume( const G4VPhysicalVolume *PhysVol,
const HepRef(G4PLogicalVolume) persLogVol);
// Destructor
~G4PVPhysicalVolume();
//
// Constructor and Destructor
void SetMother(const HepRef(G4PVPhysicalVolume) persMother);
// Set the persistent mother volume.
G4VPhysicalVolume* MakeTransientObject(
G4LogicalVolume* aLogical,
G4VPhysicalVolume* aMother );
// Creates a transient G4VPhysicalVolume object.
// Access functions
G4PString GetName();
void SetName(const G4PString aName);
// Get and set the name of the volume.
G4RotationMatrix* GetRotation();
G4ThreeVector& GetTranslation();
void SetRotation(const G4RotationMatrix* aRot);
// Get and set the rotation matrix.
G4ThreeVector& GetTranslation();
void SetTranslation(G4ThreeVector atrans);
// Get and set the translation vector.
HepRef(G4PLogicalVolume) GetLogicalVolume();
// Returns the pointer to the persistent logical volume.
// Define equality by equal addresses only.
G4bool operator == (const G4PVPhysicalVolume& p) const;
// Define equality by equal addresses only.
// Functions required of subclasses
virtual G4bool IsMany() const = 0;
virtual G4int GetCopyNo() const = 0;
virtual void SetCopyNo(G4int CopyNo) = 0;
// Functions required of subclasses
protected:
d_Varray<d_Double> frot;
source/persistency/geometry/management/include/G4PersistentGeomMan.hh
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentGeomMan.hh,v 1.10.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentGeomMan.hh,v 1.11 2001/07/11 10:02:19 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/geometry/management/include/G4VPhysVolRefArray.hh
-76
View File
@@ -1,76 +0,0 @@
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4VPhysVolRefArray.hh,v 1.1.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
// class description:
//
// This is a class which implements G4RWTPtrVector with
// G4VPhysicalVolume.
//
// History:
// 00.11.17 Y.Morita Initial version
#ifndef G4VPhysVolRefArray_hh
#define G4VPhysVolRefArray_hh 1
#include "g4rw/tpvector.h"
#include "globals.hh"
#include "G4VPhysicalVolume.hh"
typedef G4RWTPtrVector<G4VPhysicalVolume> G4VPhysVolRefVArray;
class G4VPhysVolRefArray
{
public: // with description
G4VPhysVolRefArray();
~G4VPhysVolRefArray();
// The constructor and the destructor.
private:
G4VPhysVolRefVArray transPhysVolPtrs;
public: // with description
inline void Insert(G4int i, G4VPhysicalVolume* aVol)
{ transPhysVolPtrs[i] = aVol; }
// Insert aVol as i-th element.
inline G4VPhysicalVolume* Get(G4int i)
{ return transPhysVolPtrs[i]; }
// return the i-th element.
inline void Resize(size_t n)
{ transPhysVolPtrs.resize(n); }
// Resize the vector with n.
};
G4VPhysVolRefArray::G4VPhysVolRefArray()
{;}
G4VPhysVolRefArray::~G4VPhysVolRefArray()
{;}
#endif
source/persistency/geometry/management/include/G4VSolidRefArray.hh
-76
View File
@@ -1,76 +0,0 @@
//
// ********************************************************************
// * DISCLAIMER *
// * *
// * The following disclaimer summarizes all the specific disclaimers *
// * of contributors to this software. The specific disclaimers,which *
// * govern, are listed with their locations in: *
// * http://cern.ch/geant4/license *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. *
// * *
// * This code implementation is the intellectual property of the *
// * GEANT4 collaboration. *
// * By copying, distributing or modifying the Program (or any work *
// * based on the Program) you indicate your acceptance of this *
// * statement, and all its terms. *
// ********************************************************************
//
//
// $Id: G4VSolidRefArray.hh,v 1.1.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
// class description:
//
// This is a class which implements G4RWTPtrVector with
// G4VSolid.
//
// History:
// 00.11.17 Y.Morita Initial version
#ifndef G4VSolidRefArray_hh
#define G4VSolidRefArray_hh 1
#include "g4rw/tpvector.h"
#include "globals.hh"
#include "G4VSolid.hh"
typedef G4RWTPtrVector<G4VSolid> G4VSolidRefVArray;
class G4VSolidRefArray
{
public: // with description
G4VSolidRefArray();
~G4VSolidRefArray();
// The constructor and the destructor.
private:
G4VSolidRefVArray transSolidPtrs;
public: // with description
inline void Insert(G4int i, G4VSolid* aSolid)
{ transSolidPtrs[i] = aSolid; }
// Insert aVol as i-th element.
inline G4VSolid* Get(G4int i)
{ return transSolidPtrs[i]; }
// return the i-th element.
inline void Resize(size_t n)
{ transSolidPtrs.resize(n); }
// Resize the vector with n.
};
G4VSolidRefArray::G4VSolidRefArray()
{;}
G4VSolidRefArray::~G4VSolidRefArray()
{;}
#endif
source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
+29 -36
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PGeometryObjectMap.cc,v 1.7.2.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PGeometryObjectMap.cc,v 1.9 2001/07/11 10:02:19 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PGeometryObjectMap
//
@@ -40,10 +40,6 @@
#include "G4PLogicalVolume.hh"
#include "G4PVSolid.hh"
#include "G4VPhysVolRefArray.hh"
#include "G4LogVolRefArray.hh"
#include "G4VSolidRefArray.hh"
G4PGeometryObjectMap::G4PGeometryObjectMap()
: noPhysVol(0),noLogVol(0),noSolids(0)
{
@@ -75,7 +71,7 @@ HepRef(G4PVPhysicalVolume) G4PGeometryObjectMap::LookUp(
assert(inGeomObj != 0);
for(G4int i=0;i<noPhysVol;i++)
{
if( transPhysVolPtrs->Get(i) == inGeomObj )
if( (*transPhysVolPtrs)[i] == inGeomObj )
{
return persPhysVolPtrs[i];
}
@@ -93,8 +89,7 @@ void G4PGeometryObjectMap::Add( G4VPhysicalVolume* inGeomObj,
{
// assert( inGeomObj == aGeomObj );
noPhysVol++;
transPhysVolPtrs->Resize(noPhysVol);
transPhysVolPtrs->Insert(noPhysVol-1, inGeomObj);
transPhysVolPtrs->push_back(inGeomObj);
persPhysVolPtrs.insert_element(outGeomObj);
}
}
@@ -109,7 +104,7 @@ G4VPhysicalVolume* G4PGeometryObjectMap::LookUp(
{
if( persPhysVolPtrs[i] == inGeomObj )
{
return transPhysVolPtrs->Get(i);
return (*transPhysVolPtrs)[i];
}
}
@@ -120,11 +115,11 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVPhysicalVolume) inGeomObj,
G4VPhysicalVolume* outGeomObj )
{
assert(inGeomObj != 0);
for(G4int i=0;i<noPhysVol;i++)
for(G4int i=0; i<noPhysVol; i++)
{
if( persPhysVolPtrs[i] == inGeomObj )
{
transPhysVolPtrs->Insert(i, outGeomObj);
(*transPhysVolPtrs)[i]= outGeomObj;
break;
}
G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
@@ -139,7 +134,7 @@ HepRef(G4PLogicalVolume) G4PGeometryObjectMap::LookUp(
assert(inGeomObj != 0);
for(G4int i=0;i<noLogVol;i++)
{
if( transLogVolPtrs->Get(i) == inGeomObj )
if( (*transLogVolPtrs)[i] == inGeomObj )
{
return persLogVolPtrs[i];
}
@@ -157,8 +152,7 @@ void G4PGeometryObjectMap::Add( G4LogicalVolume* inGeomObj,
{
// assert( inGeomObj == aGeomObj );
noLogVol++;
transLogVolPtrs->Resize(noLogVol);
transLogVolPtrs->Insert(noLogVol-1, inGeomObj);
transLogVolPtrs->push_back(inGeomObj);
persLogVolPtrs.insert_element(outGeomObj);
}
}
@@ -173,7 +167,7 @@ G4LogicalVolume* G4PGeometryObjectMap::LookUp(
{
if( persLogVolPtrs[i] == inGeomObj )
{
return transLogVolPtrs->Get(i);
return (*transLogVolPtrs)[i];
}
}
@@ -184,11 +178,11 @@ void G4PGeometryObjectMap::Add( HepRef(G4PLogicalVolume) inGeomObj,
G4LogicalVolume* outGeomObj )
{
assert(inGeomObj != 0);
for(G4int i=0;i<noLogVol;i++)
for(G4int i=0; i<noLogVol; i++)
{
if( persLogVolPtrs[i] == inGeomObj )
{
transLogVolPtrs->Insert(i, outGeomObj);
(*transLogVolPtrs)[i] = outGeomObj;
break;
}
G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
@@ -209,14 +203,14 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
for(G4int i=0;i<noSolids;i++)
{
#ifdef G4PERSISTENCY_DEBUG
G4VSolid* tmpSolid = transSolidPtrs->Get(i);
G4VSolid* tmpSolid = (*transSolidPtrs)[i];
cout << "[" << i << "] transSolidPtrs[i]=" << tmpSolid <<G4endl;
cout << " persSolidPtrs[i]=";
HepRef(G4PVSolid) tmpPSolid = persSolidPtrs[i];
tmpPSolid.print();
#endif
if( transSolidPtrs->Get(i) == inGeomObj )
if( (*transSolidPtrs)[i] == inGeomObj )
{
return persSolidPtrs[i];
}
@@ -234,8 +228,7 @@ void G4PGeometryObjectMap::Add( G4VSolid* inGeomObj,
{
// assert( inGeomObj == aGeomObj );
noSolids++;
transSolidPtrs->Resize(noSolids);
transSolidPtrs->Insert(noSolids-1, inGeomObj);
transSolidPtrs->push_back(inGeomObj);
persSolidPtrs.insert_element(outGeomObj);
}
}
@@ -260,12 +253,12 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
cout << "[" << i << "] persSolidPtrs[i]=";
HepRef(G4PVSolid) tmpPSolid = persSolidPtrs[i];
tmpPSolid.print();
G4VSolid* tmpSolid = transSolidPtrs->Get(i);
G4VSolid* tmpSolid = (*transSolidPtrs)[i];
cout << " transSolidPtrs[i]=" << tmpSolid <<G4endl;
#endif
if( persSolidPtrs[i] == inGeomObj )
{
return transSolidPtrs->Get(i);
return (*transSolidPtrs)[i];
}
}
@@ -276,11 +269,11 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVSolid) inGeomObj,
G4VSolid* outGeomObj )
{
assert(inGeomObj != 0);
for(G4int i=0;i<noSolids;i++)
for(G4int i=0; i<noSolids; i++)
{
if( persSolidPtrs[i] == inGeomObj )
{
transSolidPtrs->Insert(i, outGeomObj);
(*transSolidPtrs)[i] = outGeomObj;
break;
}
G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
@@ -293,7 +286,7 @@ G4VSolid* G4PGeometryObjectMap::GetSolid(G4int i)
{
if( i >= 0 && i < noSolids)
{
return transSolidPtrs->Get(i);
return (*transSolidPtrs)[i];
}
else
{
@@ -315,30 +308,30 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::GetPSolid(G4int i)
void G4PGeometryObjectMap::InitTransientMap()
{
transPhysVolPtrs->Resize(noPhysVol);
transLogVolPtrs->Resize(noLogVol);
transSolidPtrs->Resize(noSolids);
transPhysVolPtrs->resize(noPhysVol);
transLogVolPtrs->resize(noLogVol);
transSolidPtrs->resize(noSolids);
#ifdef G4PERSISTENCY_DEBUG
cout << "G4PGeometryObjectMap::InitTransientMap()" << G4endl;
cout << " -- noPhysVol: " << noPhysVol << G4endl;
cout << " -- transPhysVolPtrs.length: " << transPhysVolPtrs->length() << G4endl;
cout << " -- transLogVolPtrs.length: " << transLogVolPtrs->length() << G4endl;
cout << " -- transSolidPtrs.length: " << transSolidPtrs->length() << G4endl;
cout << " -- transPhysVolPtrs.length: " << transPhysVolPtrs->size() << G4endl;
cout << " -- transLogVolPtrs.length: " << transLogVolPtrs->size() << G4endl;
cout << " -- transSolidPtrs.length: " << transSolidPtrs->size() << G4endl;
#endif
G4int i;
for(i=0;i<noPhysVol;i++)
{
transPhysVolPtrs->Insert(i, 0);
transPhysVolPtrs->push_back(0);
}
for(i=0;i<noLogVol;i++)
{
transLogVolPtrs->Insert(i, 0);
transLogVolPtrs->push_back(0);
}
for(i=0;i<noSolids;i++)
{
transSolidPtrs->Insert(i, 0);
transSolidPtrs->push_back(0);
}
}
source/persistency/geometry/management/src/G4PLogicalVolume.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PLogicalVolume.cc,v 1.6.2.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PLogicalVolume.cc,v 1.7 2001/07/11 10:02:20 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// Takashi.Sasaki@kek.jp
source/persistency/geometry/management/src/G4PPVParameterised.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PPVParameterised.cc,v 1.3.2.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PPVParameterised.cc,v 1.4 2001/07/11 10:02:20 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
//
source/persistency/geometry/management/src/G4PPVPlacement.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PPVPlacement.cc,v 1.2.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PPVPlacement.cc,v 1.3 2001/07/11 10:02:20 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
//
source/persistency/geometry/management/src/G4PPVReplica.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PPVReplica.cc,v 1.2.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PPVReplica.cc,v 1.3 2001/07/11 10:02:20 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
//
source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PVPhysicalVolume.cc,v 1.4.2.1 2001/06/28 19:11:29 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PVPhysicalVolume.cc,v 1.5 2001/07/11 10:02:20 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// Takashi.Sasaki@kek.jp
source/persistency/geometry/management/src/G4PersistentGeomMan.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentGeomMan.cc,v 1.15.2.1 2001/06/28 19:11:29 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentGeomMan.cc,v 1.16 2001/07/11 10:02:20 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PersistentGeomMan
//
source/persistency/geometry/solids/Boolean/include/G4PBooleanSolid.ddl
+10 -3
View File
@@ -20,9 +20,14 @@
// * statement, and all its terms. *
// ********************************************************************
//
// Persistent base class for solids created by boolean operations
// between other solids
//
// $Id: G4PBooleanSolid.ddl,v 1.6 2001/07/11 10:02:21 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent base class for solids created by boolean operations
// between other solids
// History:
// 10.11.99 Y.Morita, Initial Creation
@@ -35,15 +40,17 @@
class G4PBooleanSolid
: public G4PVSolid
{
public:
public: // With description
G4PBooleanSolid( const G4String& pName,
HepRef(G4PVSolid) persSolidA,
HepRef(G4PVSolid) persSolidB );
virtual ~G4PBooleanSolid();
// Constructor and Destructor
virtual G4VSolid* MakeTransientBooleanSolid(
G4VSolid* aSolidA,
G4VSolid* aSolidB ) const = 0;
// Creates a transient boolean solid object.
public: // With Description
// If Solid is made up from a Boolean operation of two solids,
source/persistency/geometry/solids/Boolean/include/G4PDisplacedSolid.ddl
+11 -3
View File
@@ -20,8 +20,13 @@
// * statement, and all its terms. *
// ********************************************************************
//
// Persistent class describing solid placements for boolean operations
//
// $Id: G4PDisplacedSolid.ddl,v 1.5 2001/07/11 10:02:21 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent class describing solid placements for boolean operations
// History:
// 10.11.99 Y.Morita, Initial creation
@@ -37,19 +42,22 @@ class G4VSolid;
class G4PDisplacedSolid
: public G4PVSolid
{
public:
public: // With description
G4PDisplacedSolid ( HepRef(G4PVSolid) persCostituentSolid,
HepRef(G4PAffineTransform) pDirectTransform );
virtual ~G4PDisplacedSolid();
// Constructor and destructor.
G4VSolid* MakeTransientObject() const;
G4VSolid* MakeTransientDisplacedSolid(G4VSolid* aSolid) const;
// Creates a transient G4VSolid object.
virtual G4GeometryType GetEntityType() const
{ return G4String("G4DisplacedSolid"); }
// Returns the G4GeometryType of the solid.
HepRef(G4PVSolid) GetConstituentMovedSolid();
// Returns the pointer of persistent GetConstituentMovedSolid object.
protected:
d_Ref<G4PVSolid> fPtrSolid;
source/persistency/geometry/solids/Boolean/include/G4PIntersectionSolid.ddl
+10 -3
View File
@@ -20,8 +20,13 @@
// * statement, and all its terms. *
// ********************************************************************
//
// Persistent class for description of intersection of two CSG solids
//
// $Id: G4PIntersectionSolid.ddl,v 1.5 2001/07/11 10:02:21 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent class for description of intersection of two CSG solids
// History:
// 10.11.99 Y.Morita, Initial creation
@@ -35,20 +40,22 @@ class G4VSolid;
class G4PIntersectionSolid: public G4PBooleanSolid
{
public:
public: // With description
G4PIntersectionSolid( const G4String& pName,
HepRef(G4PVSolid) persSolidA,
HepRef(G4PVSolid) persSolidB );
virtual ~G4PIntersectionSolid() ;
// Constructor and destructor
G4VSolid* MakeTransientObject() const;
G4VSolid* MakeTransientBooleanSolid(
G4VSolid* aSolidA,
G4VSolid* aSolidB ) const;
// Creates a transient G4IntersectionSolid object.
virtual G4GeometryType GetEntityType() const
{ return G4String("G4IntersectionSolid"); }
// Returns the G4GeometryType of this solid.
protected:
source/persistency/geometry/solids/Boolean/include/G4PSubtractionSolid.ddl
+10 -4
View File
@@ -20,11 +20,15 @@
// * statement, and all its terms. *
// ********************************************************************
//
// Persistent class for description of subtraction of two CSG solids: A - B
//
// $Id: G4PSubtractionSolid.ddl,v 1.5 2001/07/11 10:02:22 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent class for description of subtraction of two CSG solids: A - B
// History:
// 10.11.99 Y.Morita, Initial creation
//
#ifndef G4PSUBTRACTIONSOLID_DDL
#define G4PSUBTRACTIONSOLID_DDL
@@ -37,20 +41,22 @@ class G4VSolid;
class G4PSubtractionSolid
: public G4PBooleanSolid
{
public:
public: // With description
G4PSubtractionSolid( const G4String& pName,
HepRef(G4PVSolid) persSolidA,
HepRef(G4PVSolid) persSolidB );
virtual ~G4PSubtractionSolid() ;
// Constructor and Destructor
G4VSolid* MakeTransientObject() const;
G4VSolid* MakeTransientBooleanSolid(
G4VSolid* aSolidA,
G4VSolid* aSolidB ) const;
// Creates a transient G4SubtractionSolid object.
virtual G4GeometryType GetEntityType() const
{ return G4String("G4SubtractionSolid"); }
// Returns the G4GeometryType of this solid.
protected:
source/persistency/geometry/solids/Boolean/include/G4PUnionSolid.ddl
+10 -4
View File
@@ -20,11 +20,15 @@
// * statement, and all its terms. *
// ********************************************************************
//
// Persistent class for description of intersection of two CSG solids
//
// $Id: G4PUnionSolid.ddl,v 1.5 2001/07/11 10:02:22 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent class for description of intersection of two CSG solids
// History:
// 10.11.99 Y.Morita, Initial creation
//
#ifndef G4PUNIONSOLID_DDL
#define G4PUNIONSOLID_DDL
@@ -37,20 +41,22 @@ class G4VSolid;
class G4PUnionSolid
: public G4PBooleanSolid
{
public:
public: // With description
G4PUnionSolid( const G4String& pName,
HepRef(G4PVSolid) persSolidA,
HepRef(G4PVSolid) persSolidB );
virtual ~G4PUnionSolid() ;
// Constructor and Destructor
G4VSolid* MakeTransientObject() const;
G4VSolid* MakeTransientBooleanSolid(
G4VSolid* aSolidA,
G4VSolid* aSolidB ) const;
// Creates a transient G4UnionSolid object.
virtual G4GeometryType GetEntityType() const
{ return G4String("G4UnionSolid"); }
// Returns the G4GeometryType of this solid.
protected:
source/persistency/geometry/solids/CSG/include/G4PBox.ddl
+13 -8
View File
@@ -21,11 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PBox.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PBox
//
// $Id: G4PBox.ddl,v 1.5 2001/07/11 10:02:22 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4Box solid.
// History:
// 19.06.98 A.Kimura Converted from G4Box.hh
@@ -38,15 +39,19 @@
class G4VSolid;
class G4Box;
class G4PBox : public G4PCSGSolid {
public:
class G4PBox
: public G4PCSGSolid
{
public: // With description
G4PBox(const G4Box* theBox);
virtual ~G4PBox();
// Constructor and Destructor
G4VSolid* MakeTransientObject() const;
// Creates a transient boolean solid object.
// Naming method (pseudo-RTTI : run-time type identification
virtual G4GeometryType GetEntityType() const { return G4String("G4Box"); }
// Returns the G4GeometryType of this solid.
private:
G4double fDx,fDy,fDz;
source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
+11 -9
View File
@@ -21,12 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PCSGSolid.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4CSGSolid
//
// $Id: G4PCSGSolid.ddl,v 1.5 2001/07/11 10:02:23 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4CSGSolid
// History:
// 19.06.98 A.Kimura Converted G4CSGSolid.hh
@@ -36,11 +36,13 @@
#include "G4PersistentSchema.hh"
#include "G4PVSolid.hh"
class G4PCSGSolid : public G4PVSolid {
public:
class G4PCSGSolid
: public G4PVSolid
{
public: // With description
G4PCSGSolid(const G4String& pName);
virtual ~G4PCSGSolid();
// Constructor and Destructor
};
#endif
source/persistency/geometry/solids/CSG/include/G4PCons.ddl
+14 -8
View File
@@ -21,11 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PCons.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4Cons
//
// $Id: G4PCons.ddl,v 1.5 2001/07/11 10:02:23 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4Cons solid.
// History:
// 19.06.98 A.Kimura Converted G4Cons.hh
@@ -38,15 +39,19 @@
class G4Cons;
class G4VSolid;
class G4PCons : public G4PCSGSolid {
public:
class G4PCons
: public G4PCSGSolid
{
public: // With description
G4PCons(const G4Cons* theCons);
virtual ~G4PCons() ;
// Constructor and Destructor
G4VSolid* MakeTransientObject() const;
// Creates a transient boolean solid object.
// Naming method (pseudo-RTTI : run-time type identification
virtual G4GeometryType GetEntityType() const {return G4String("G4Cons");}
// Returns the G4GeometryType of this solid.
private:
@@ -57,3 +62,4 @@ private:
};
#endif
source/persistency/geometry/solids/CSG/include/G4PPara.ddl
+19 -18
View File
@@ -21,15 +21,15 @@
// ********************************************************************
//
//
// $Id: G4PPara.ddl,v 1.5.2.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PPara
//
// $Id: G4PPara.ddl,v 1.7 2001/07/11 10:02:23 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4PPara solid.
// History:
// 19.06.98 A.Kimura Converted G4Para.hh
#ifndef G4PPara_DDL
#define G4PPara_DDL
@@ -41,27 +41,27 @@ class G4VSolid;
#include "G4ThreeVector.hh"
class G4PPara : public G4PCSGSolid {
public:
class G4PPara
: public G4PCSGSolid
{
public: // With description
G4PPara(const G4Para* thePara);
virtual ~G4PPara() ;
// Access functions
// Constructor and Destructor
G4VSolid* MakeTransientObject() const ;
// Creates a transient boolean solid object.
// Get functions
public:
G4ThreeVector GetSymAxis() const {
G4double cosTheta
G4double cosTheta
= 1.0/sqrt(1+fTthetaCphi*fTthetaCphi+fTthetaSphi*fTthetaSphi) ;
return G4ThreeVector(fTthetaCphi*cosTheta,fTthetaSphi*cosTheta,cosTheta) ;
return G4ThreeVector(fTthetaCphi*cosTheta,fTthetaSphi*cosTheta,cosTheta) ;
}
// Naming method (pseudo-RTTI : run-time type identification
public: // With description
virtual G4GeometryType GetEntityType() const {return G4String("G4Para");}
// Returns the G4GeometryType of this solid.
private:
G4double fDx,fDy,fDz;
@@ -69,3 +69,4 @@ private:
};
#endif
source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
+14 -10
View File
@@ -21,11 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PSphere.ddl,v 1.5.2.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PSphere
//
// $Id: G4PSphere.ddl,v 1.7 2001/07/11 10:02:23 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4PSphere solid.
// History:
// 19.06.98 A.Kimura Converted G4Sphere.hh
@@ -40,17 +41,20 @@ class G4Sphere;
#include "G4ThreeVector.hh"
class G4PSphere : public G4PCSGSolid {
public:
class G4PSphere
: public G4PCSGSolid
{
public: // With description
G4PSphere(const G4Sphere* theSphere);
virtual ~G4PSphere() ;
// Constructor and Destructor
G4VSolid* MakeTransientObject() const;
// Creates a transient boolean solid object.
// Naming method (pseudo-RTTI : run-time type identification
virtual G4GeometryType GetEntityType() const {return G4String("G4Sphere");}
// Returns the G4GeometryType of this solid.
private:
G4double fRmin,fRmax,
source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
+15 -9
View File
@@ -21,12 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PTorus.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PTorus
//
// $Id: G4PTorus.ddl,v 1.5 2001/07/11 10:02:23 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4PTorus solid.
// History:
// 19.06.98 A.Kimura Converted G4Torus.hh
@@ -39,18 +39,24 @@
class G4VSolid;
class G4Torus;
class G4PTorus : public G4PCSGSolid {
public:
class G4PTorus
: public G4PCSGSolid
{
public: // With description
G4PTorus(const G4Torus* theTorus);
virtual ~G4PTorus();
// Constructor and Destructor
G4VSolid* MakeTransientObject() const;
// Creates a transient boolean solid object.
public:
void SetAllParameters(G4double pRmin, G4double pRmax, G4double pRtor,
G4double pSPhi, G4double pDPhi);
// Naming method (pseudo-RTTI : run-time type identification
public: // With description
virtual G4GeometryType GetEntityType() const {return G4String("G4Torus");}
// Returns the G4GeometryType of this solid.
protected:
source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
+15 -13
View File
@@ -21,11 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PTrap.ddl,v 1.5.2.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PTrap
//
// $Id: G4PTrap.ddl,v 1.7 2001/07/11 10:02:23 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4PTrap solid.
// History:
// 19.06.98 A.Kimura Converted G4Trap.hh
@@ -46,18 +47,18 @@ struct PTrapSidePlane
// => Ax+By+Cz+D=0
};
class G4PTrap : public G4PCSGSolid {
public:
// The most general constructor for G4Trap
class G4PTrap
: public G4PCSGSolid
{
public: // With description
G4PTrap(const G4Trap* theTrap);
virtual ~G4PTrap() ;
// Constructor and Destructor
// Access functions
G4VSolid* MakeTransientObject() const;
// Creates a transient boolean solid object.
public:
void SetAllParameters ( G4double pDz,
G4double pTheta,
G4double pPhi,
@@ -70,8 +71,9 @@ public:
G4double pDx4,
G4double pAlp2);
// Naming method (pseudo-RTTI : run-time type identification
public: // With description
virtual G4GeometryType GetEntityType() const { return G4String("G4Trap"); }
// Returns the G4GeometryType of this solid.
protected:
source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
+14 -11
View File
@@ -21,11 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PTrd.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PTrd
//
// $Id: G4PTrd.ddl,v 1.5 2001/07/11 10:02:23 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4PTrd solid.
// History:
// 19.06.98 A.Kimura Converted G4Trd.hh
@@ -38,19 +39,21 @@
class G4Trd;
class G4VSolid;
class G4PTrd : public G4PCSGSolid {
public:
class G4PTrd
: public G4PCSGSolid
{
public: // With description
G4PTrd(const G4Trd* theTrd);
virtual ~G4PTrd();
// Constructor and Destructor
G4VSolid* MakeTransientObject() const;
// Creates a transient boolean solid object.
// Naming method (pseudo-RTTI : run-time type identification
virtual G4GeometryType GetEntityType() const {return G4String("G4Trd");}
// Returns the G4GeometryType of this solid.
public:
void CheckAndSetAllParameters (G4double pdx1, G4double pdx2,
G4double pdy1, G4double pdy2,
G4double pdz);
source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
+14 -9
View File
@@ -21,12 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PTubs.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PTubs
//
// $Id: G4PTubs.ddl,v 1.5 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4PTubs solid.
// History:
// 19.06.98 A.Kimura Converted G4Tubs.hh
@@ -39,15 +39,19 @@
class G4VSolid;
class G4Tubs;
class G4PTubs : public G4PCSGSolid {
public:
class G4PTubs
: public G4PCSGSolid
{
public: // With description
G4PTubs(const G4Tubs* theTubs);
virtual ~G4PTubs();
// Constructor and Destructor
G4VSolid* MakeTransientObject() const;
// Creates a transient boolean solid object.
// Naming method (pseudo-RTTI : run-time type identification)
virtual G4GeometryType GetEntityType() const { return G4String("G4Tubs"); }
// Returns the G4GeometryType of this solid.
protected:
@@ -56,3 +60,4 @@ protected:
};
#endif
source/persistency/geometry/solids/CSG/src/G4PBox.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PBox.cc,v 1.2.8.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PBox.cc,v 1.3 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
//
source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PCSGSolid.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PCSGSolid.cc,v 1.3 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// History:
source/persistency/geometry/solids/CSG/src/G4PCons.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PCons.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PCons.cc,v 1.3 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PCons
//
source/persistency/geometry/solids/CSG/src/G4PPara.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PPara.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PPara.cc,v 1.3 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PPara
//
source/persistency/geometry/solids/CSG/src/G4PSphere.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PSphere.cc,v 1.3.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PSphere.cc,v 1.4 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// class G4PSphere
source/persistency/geometry/solids/CSG/src/G4PTorus.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PTorus.cc,v 1.3.4.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PTorus.cc,v 1.4 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// class G4PTorus
source/persistency/geometry/solids/CSG/src/G4PTrap.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PTrap.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PTrap.cc,v 1.3 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PTrap
//
source/persistency/geometry/solids/CSG/src/G4PTrd.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PTrd.cc,v 1.3.4.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PTrd.cc,v 1.4 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// Implementation for G4Trd class
source/persistency/geometry/solids/CSG/src/G4PTubs.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PTubs.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PTubs.cc,v 1.3 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// class G4PTubs
source/persistency/geometry/solids/specific/include/G4PHype.ddl
+13 -42
View File
@@ -21,11 +21,12 @@
// ********************************************************************
//
//
// $Id: G4PHype.ddl,v 1.1.4.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PHype
//
// $Id: G4PHype.ddl,v 1.3 2001/07/11 10:02:24 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Persistent version of G4Hype specific solid.
// History:
// 19.06.98 A.Kimura Converted G4Hype.hh
@@ -38,15 +39,19 @@
class G4VSolid;
class G4Hype;
class G4PHype : public G4PCSGSolid {
public:
class G4PHype
: public G4PCSGSolid
{
public: // With description
G4PHype(const G4Hype* theHype);
virtual ~G4PHype();
// Constructor and Destructor
G4VSolid* MakeTransientObject() const;
// Creates a transient G4Hype object.
virtual G4GeometryType GetEntityType() const {return G4String("G4Hype");}
// Returns the G4GeometryType of this solid.
protected:
// values of hype radius at a given Z
@@ -76,37 +81,3 @@ protected:
#endif
source/persistency/geometry/solids/specific/src/G4PHype.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PHype.cc,v 1.1.4.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PHype.cc,v 1.2 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PHype
//
source/persistency/global/include/G4DatabaseTypes.hh
+3 -3
View File
@@ -21,15 +21,15 @@
// ********************************************************************
//
//
// $Id: G4DatabaseTypes.hh,v 1.3.8.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4DatabaseTypes.hh,v 1.5 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// file description:
//
// This file defines types of database and transaction mode
// supported by G4TransactionManager.
//
// History:
// 99.11.26 Y.Morita Initial version
source/persistency/global/include/G4PersistentSchema.hh
+6 -4
View File
@@ -21,11 +21,13 @@
// ********************************************************************
//
//
// $Id: G4PersistentSchema.hh,v 1.5.8.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
//
// Persistent-capable schema definitions required for ooddlx processor
// $Id: G4PersistentSchema.hh,v 1.7 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// file description:
// Persistent-capable schema definitions required for ooddlx processor
// History:
// 19.11.99 Y.Morita - Created
source/persistency/global/include/G4PersistentTypes.hh
+6 -5
View File
@@ -21,12 +21,13 @@
// ********************************************************************
//
//
// $Id: G4PersistentTypes.hh,v 1.2.4.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
//
//
// Persistent-capable typedefs for Geant4/Persistency category
// $Id: G4PersistentTypes.hh,v 1.4 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// file description:
// Persistent-capable typedefs for Geant4/Persistency category
// History:
// 15.06.98 Y.Morita - Created
source/persistency/global/include/G4Pglobals.hh
+6 -11
View File
@@ -21,12 +21,13 @@
// ********************************************************************
//
//
// $Id: G4Pglobals.hh,v 1.2.2.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
//
//
// Wrapper header file to protect globals.hh from ooddlx
// $Id: G4Pglobals.hh,v 1.5 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// file description:
// Wrapper header file to protect globals.hh from ooddlx
// History:
// 26.10.00 Y.Morita - Created
@@ -92,12 +93,6 @@ typedef char* G4String;
typedef int G4int;
typedef double G4double;
typedef bool G4bool;
template<class T>
class G4RWTPtrVector {};
template<class T>
class G4RWTValOrderedVector {};
template<class T>
class G4RWTPtrOrderedVector {};
#endif
source/persistency/global/include/G4VMaterialMap.hh
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4VMaterialMap.hh,v 1.1.4.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4VMaterialMap.hh,v 1.2 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#ifndef G4VMaterialMap_hh
source/persistency/global/include/G4VPersistentSubDbMan.hh
+10 -9
View File
@@ -21,13 +21,12 @@
// ********************************************************************
//
//
// $Id: G4VPersistentSubDbMan.hh,v 1.3.8.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4VPersistentSubDbMan
//
// Abstract class to be used by G4PersistencyManager
// and G4TransactionManager
// $Id: G4VPersistentSubDbMan.hh,v 1.5 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Abstract class to be used by G4PersistencyManager
// and G4TransactionManager
//
// Member functions:
// =================
@@ -60,7 +59,7 @@
// f_currentContainer = f_container;
// pRun_iterator.scan(f_currentContainer);
// }
//
// History:
// 99.11.25 Y.Morita Initial creation
@@ -95,11 +94,13 @@ class G4VPersistentSubDbMan
inline void SetContainer(HepContainerRef container)
{ f_container = container; }
public:
public: // With description
inline HepDatabaseRef GetDB()
{ return f_DB; }
// Returns the reference pointer of the database
inline HepContainerRef GetContainer()
{ return f_container; }
// Returns the reference pointer of the container
protected:
HepDatabaseRef f_DB;
source/persistency/global/include/G4VPersistentSubMan.hh
+9 -8
View File
@@ -21,13 +21,12 @@
// ********************************************************************
//
//
// $Id: G4VPersistentSubMan.hh,v 1.3.2.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4VPersistentSubMan
//
// Abstract submanager class to be used by G4PersistencyManager
//
// $Id: G4VPersistentSubMan.hh,v 1.5 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
// Class Description:
// Abstract submanager class to be used by G4PersistencyManager
// Member functions:
// =================
// virtual void SetVerboseLevel(G4int verboseLevel)
@@ -61,10 +60,12 @@ class G4VPersistentSubMan
// interface with G4PersistencyManager
inline virtual void SetVerboseLevel(G4int verboseLevel)
{ f_verboseLevel = verboseLevel; }
// Set the verbose level
public:
public: // With description
inline G4int GetVerboseLevel()
{ return f_verboseLevel; };
// Get the current verbose level
protected:
G4int f_verboseLevel;
source/persistency/global/src/G4VMaterialMap.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4VMaterialMap.cc,v 1.2.2.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4VMaterialMap.cc,v 1.3 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "G4VMaterialMap.hh"
source/persistency/global/src/G4VPersistentSubDbMan.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4VPersistentSubDbMan.cc,v 1.3.2.1 2001/06/28 19:11:34 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4VPersistentSubDbMan.cc,v 1.4 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4VPersistentSubDbMan
//
source/persistency/global/src/G4VPersistentSubMan.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4VPersistentSubMan.cc,v 1.2.8.1 2001/06/28 19:11:35 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4VPersistentSubMan.cc,v 1.3 2001/07/11 10:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4VPersistentSubMan
//
source/persistency/management/include/G4PersistencyManager.hh
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistencyManager.hh,v 1.15.4.1 2001/06/28 19:11:35 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistencyManager.hh,v 1.16 2001/07/11 10:02:26 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// History:
// 98.01.08 Y.Morita Initial version
source/persistency/management/include/G4PersistencyMessenger.hh
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistencyMessenger.hh,v 1.4.8.1 2001/06/28 19:11:35 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistencyMessenger.hh,v 1.5 2001/07/11 10:02:26 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// GEANT 4 class header file
source/persistency/management/include/G4TransactionManager.hh
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4TransactionManager.hh,v 1.7.4.1 2001/06/28 19:11:35 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4TransactionManager.hh,v 1.8 2001/07/11 10:02:26 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class description:
source/persistency/management/src/G4PersistencyManager.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistencyManager.cc,v 1.17.2.1 2001/06/28 19:11:35 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistencyManager.cc,v 1.18 2001/07/11 10:02:26 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PersistencyManager
//
source/persistency/management/src/G4PersistencyMessenger.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistencyMessenger.cc,v 1.7.8.1 2001/06/28 19:11:35 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistencyMessenger.cc,v 1.8 2001/07/11 10:02:26 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "G4PersistencyMessenger.hh"
source/persistency/management/src/G4TransactionManager.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4TransactionManager.cc,v 1.7.2.1 2001/06/28 19:11:35 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4TransactionManager.cc,v 1.8 2001/07/11 10:02:26 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4TransactionManager
//
source/persistency/run/include/G4PRun.ddl
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PRun.ddl,v 1.8.4.1 2001/06/28 19:11:36 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PRun.ddl,v 1.9 2001/07/11 10:02:26 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/run/include/G4PersistentRunMan.hh
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentRunMan.hh,v 1.9.4.1 2001/06/28 19:11:36 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentRunMan.hh,v 1.10 2001/07/11 10:02:26 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Class Description:
source/persistency/run/src/G4PRun.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PRun.cc,v 1.6.2.1 2001/06/28 19:11:36 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PRun.cc,v 1.7 2001/07/11 10:02:27 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "G4Run.hh"
source/persistency/run/src/G4PersistentRunMan.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PersistentRunMan.cc,v 1.9.2.1 2001/06/28 19:11:36 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4PersistentRunMan.cc,v 1.10 2001/07/11 10:02:27 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// class G4PersistentRunMan
//